diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-13 18:25:08 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:46:20 -0500 |
| commit | c97b78b4452ef39ffe28a1427f6f555248a70a1c (patch) | |
| tree | 840ac93686b2f0463b51b9ffcd4e1ce659e909e1 /docs | |
| parent | d74de63ddbf5cf0194a7f9d12e608e6e95da6d6c (diff) | |
| download | samba-c97b78b4452ef39ffe28a1427f6f555248a70a1c.tar.gz samba-c97b78b4452ef39ffe28a1427f6f555248a70a1c.tar.bz2 samba-c97b78b4452ef39ffe28a1427f6f555248a70a1c.zip | |
More validation fixes; building FO-PDF versions of the HOWTO and
the Guide work now!
(This used to be commit 2192c44663d3031cd6c0f228aea4a8cdd2a29a82)
Diffstat (limited to 'docs')
42 files changed, 350 insertions, 362 deletions
diff --git a/docs/Makefile b/docs/Makefile index 8be60d90e5..9f672d93a6 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -172,7 +172,7 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml # PDF thru Fo $(FOPDFDIR)/%.pdf: $(FODIR)/%.fo mkdir -p $(@D) - $(FOP) -q -d $< -pdf $@ + JAVA_OPTS=-Xmx250m $(FOP) -q -d $< -pdf $@ $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml mkdir -p $@/images @@ -226,7 +226,7 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml # Validation verification %-validate: %/index.xml - -$(XMLLINT) --xinclude --noent --postvalid --noout $< + -cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F) # Find undocumented parameters undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml index a22b3825e3..66ffae6eb7 100644 --- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml +++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="simple"> <title>No Frills Samba Servers</title> @@ -192,11 +192,11 @@ <smbconfexample id="draft-smbconf"> <title>Drafting Office &smb.conf; File</title> <smbconfcomment>Global Parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="security">SHARE</smbconfoption> -<smbconfsection>[Plans]</smbconfsection> +<smbconfsection name="[Plans]"/> <smbconfoption name="path">/plans</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -669,7 +669,7 @@ application/octet-stream <smbconfexample id="charity-smbconf"> <title>Charity Administration Office &smb.conf; File</title> <smbconfcomment>Global Parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="security">SHARE</smbconfoption> <smbconfoption name="printing">CUPS</smbconfoption> @@ -678,7 +678,7 @@ application/octet-stream <smbconfoption name="show add printer wizard">No</smbconfoption> <smbconfoption name="wins support">yes</smbconfoption> -<smbconfsection>[FTMFILES]</smbconfsection> +<smbconfsection name="[FTMFILES]"/> <smbconfoption name="comment">Funds Tracking & Management Files</smbconfoption> <smbconfoption name="path">/data/ftmfiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -687,7 +687,7 @@ application/octet-stream <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="nt acl support">No</smbconfoption> -<smbconfsection>[office]</smbconfsection> +<smbconfsection name="[office]"/> <smbconfoption name="comment">General Office Files</smbconfoption> <smbconfoption name="path">/data/officefiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -696,7 +696,7 @@ application/octet-stream <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="nt acl support">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> @@ -1282,26 +1282,26 @@ application/octet-stream <smbconfexample id="acctconf"> <title>Accounting Office Network &smb.conf; File</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">BILLMORE</smbconfoption> <smbconfoption name="printing">CUPS</smbconfoption> <smbconfoption name="printcap name">CUPS</smbconfoption> <smbconfoption name="disable spoolss">Yes</smbconfoption> <smbconfoption name="show add printer wizard">No</smbconfoption> -<smbconfsection>[files]</smbconfsection> +<smbconfsection name="[files]"/> <smbconfoption name="comment">Work area files</smbconfoption> <smbconfoption name="path">/data/%U</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[master]</smbconfsection> +<smbconfsection name="[master]"/> <smbconfoption name="comment">Master work area files</smbconfoption> <smbconfoption name="path">/data</smbconfoption> <smbconfoption name="valid users">alan</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml index 4b007acde2..fde9d71c1d 100644 --- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml +++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="small"> <title>Small Office Networking</title> @@ -642,7 +642,7 @@ hosts: files wins <smbconfexample id="acct2conf"> <title>Accounting Office Network &smb.conf; File &smbmdash; [globals] Section</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">BILLMORE</smbconfoption> <smbconfoption name="passwd chat">*New*Password* \</smbconfoption> <member><parameter>%n\n*Re-enter*new*password* %n\n *Password*changed*</parameter></member> @@ -669,13 +669,13 @@ hosts: files wins <smbconfexample id="acct3conf"> <title>Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section</title> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> @@ -683,19 +683,19 @@ hosts: files wins <smbconfoption name="use client driver">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/data/%U</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="valid users">%G</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[finsvcs]</smbconfsection> +<smbconfsection name="[finsvcs]"/> <smbconfoption name="comment">Financial Service Files</smbconfoption> <smbconfoption name="path">/data/finsvcs</smbconfoption> <smbconfoption name="valid users">%G</smbconfoption> diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml index acbb25d03f..1ea6df9d2a 100644 --- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml +++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="secure"> <title>Secure Office Networking</title> @@ -862,7 +862,7 @@ echo -e "\nNAT firewall done.\n" <smbconfexample id="promisnet"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">PROMISES</smbconfoption> <smbconfoption name="netbios name">DIAMOND</smbconfoption> <smbconfoption name="interfaces">eth1, eth2, lo</smbconfoption> @@ -907,18 +907,18 @@ echo -e "\nNAT firewall done.\n" <smbconfexample id="promisnetsvca"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A</title> -<smbconfsection>[IPC$]</smbconfsection> +<smbconfsection name="[IPC$]"/> <smbconfoption name="path">/tmp</smbconfoption> <smbconfoption name="hosts allow">192.168.1.0/24, 192.168.2.0/24, 127.0.0.1</smbconfoption> <smbconfoption name="hosts deny">0.0.0.0/0</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -927,7 +927,7 @@ echo -e "\nNAT firewall done.\n" <smbconfoption name="default devmode">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -936,23 +936,23 @@ echo -e "\nNAT firewall done.\n" <smbconfexample id="promisnetsvcb"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B</title> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[service]</smbconfsection> +<smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[apps]</smbconfsection> +<smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml index b904d64393..74645bccb7 100644 --- a/docs/Samba-Guide/Chap05-500UserNetwork.xml +++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="Big500users"> <title>The 500-User Office</title> @@ -938,7 +938,7 @@ hosts: files dns wins <smbconfexample id="ch5-massivesmb"> <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename></title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> <smbconfoption name="netbios name">MASSIVE</smbconfoption> <smbconfoption name="interfaces">eth1, lo</smbconfoption> @@ -955,22 +955,22 @@ hosts: files dns wins <smbconfoption name="wins support">Yes</smbconfoption> <smbconfoption name="include">/etc/samba/dc-common.conf</smbconfoption> -<smbconfsection>[IPC$]</smbconfsection> +<smbconfsection name="[IPC$]"/> <smbconfoption name="path">/tmp</smbconfoption> <smbconfoption name="hosts allow">172.16.0.0/16, 127.0.0.1</smbconfoption> <smbconfoption name="hosts deny">0.0.0.0/0</smbconfoption> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[service]</smbconfsection> +<smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[pidata]</smbconfsection> +<smbconfsection name="[pidata]"/> <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -980,7 +980,7 @@ hosts: files dns wins <smbconfexample id="ch5-dc-common"> <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename></title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption> <smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption> <smbconfoption name="logon script">scripts\logon.bat</smbconfoption> @@ -991,19 +991,19 @@ hosts: files dns wins <smbconfoption name="preferred master">Yes</smbconfoption> <smbconfoption name="include">/etc/samba/common.conf</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="locking">No</smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -1013,7 +1013,7 @@ hosts: files dns wins <!-- Three --> <smbconfexample id="ch5-commonsmb"> <title>Common Samba Configuration File: <filename>/etc/samba/common.conf</filename></title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption> <smbconfoption name="log level">1</smbconfoption> <smbconfoption name="syslog">0</smbconfoption> @@ -1034,7 +1034,7 @@ hosts: files dns wins <smbconfoption name="include"> </smbconfoption> <smbconfcomment>Share and Service Definitions are common to all servers</smbconfcomment> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -1043,7 +1043,7 @@ hosts: files dns wins <smbconfoption name="default devmode">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[apps]</smbconfsection> +<smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="admin users">bjordan</smbconfoption> @@ -1054,7 +1054,7 @@ hosts: files dns wins <smbconfexample id="ch5-bldg1-smb"> <title>Server: BLDG1 (Member), File: smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> <smbconfoption name="netbios name">BLDG1</smbconfoption> <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption> @@ -1064,7 +1064,7 @@ hosts: files dns wins <smbconfexample id="ch5-bldg2-smb"> <title>Server: BLDG2 (Member), File: smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> <smbconfoption name="netbios name">BLDG2</smbconfoption> <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption> @@ -1074,7 +1074,7 @@ hosts: files dns wins <smbconfexample id="ch5-dommem-smb"> <title>Common Domain Member Include File: dom-mem.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption> <smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption> <smbconfoption name="preferred master">Yes</smbconfoption> diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml index 55da147007..780f343b1d 100644 --- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml +++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="happy"> <title>Making Happy Users</title> @@ -1847,7 +1847,7 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 <smbconfexample id="ch6-massive-smbconfa"> <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="netbios name">MASSIVE</smbconfoption> @@ -3206,7 +3206,7 @@ smb: \> q <smbconfexample id="ch6-bldg1-smbconf"> <title>LDAP Based &smb.conf; File, Server: BLDG1</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="netbios name">BLDG1</smbconfoption> @@ -3244,7 +3244,7 @@ smb: \> q <smbconfexample id="ch6-bldg2-smbconf"> <title>LDAP Based &smb.conf; File, Server: BLDG2</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="netbios name">BLDG2</smbconfoption> @@ -3281,28 +3281,28 @@ smb: \> q <smbconfexample id="ch6-shareconfa"> <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A</title> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[service]</smbconfsection> +<smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[pidata]</smbconfsection> +<smbconfsection name="[pidata]"/> <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -3312,31 +3312,31 @@ smb: \> q <smbconfexample id="ch6-shareconfb"> <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B</title> -<smbconfsection>[apps]</smbconfsection> +<smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="admin users">bjordan</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="locking">No</smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[profdata]</smbconfsection> +<smbconfsection name="[profdata]"/> <smbconfoption name="comment">Profile Data Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="browseable">yes</smbconfoption> diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml index c349fa3ef7..5b036b5219 100644 --- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml +++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="2000users"> <title>A Distributed 2000 User Network</title> @@ -1151,7 +1151,7 @@ index default sub <smbconfexample id="ch7-massmbconfA"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part A</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption> @@ -1199,31 +1199,31 @@ index default sub <smbconfexample id="ch7-massmbconfB"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part B</title> -<smbconfsection>[IPC$]</smbconfsection> +<smbconfsection name="[IPC$]"/> <smbconfoption name="path">/tmp</smbconfoption> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[service]</smbconfsection> +<smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[pidata]</smbconfsection> +<smbconfsection name="[pidata]"/> <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -1233,32 +1233,32 @@ index default sub <smbconfexample id="ch7-massmbconfC"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part C</title> -<smbconfsection>[apps]</smbconfsection> +<smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="admin users">bjones</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="locking">No</smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[profdata]</smbconfsection> +<smbconfsection name="[profdata]"/> <smbconfoption name="comment">Profile Data Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="write list">root</smbconfoption> @@ -1268,7 +1268,7 @@ index default sub <smbconfexample id="ch7-slvsmbocnfA"> <title>Backup Domain Controller &smb.conf; File &smbmdash; Part A</title> <smbconfcomment># Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="netbios name">BLDG1</smbconfoption> @@ -1301,12 +1301,12 @@ index default sub <smbconfoption name="idmap gid">10000-20000</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[accounts]</smbconfsection> +<smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[service]</smbconfsection> +<smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -1314,43 +1314,43 @@ index default sub <smbconfexample id="ch7-slvsmbocnfB"> <title>Backup Domain Controller &smb.conf; File &smbmdash; Part B</title> -<smbconfsection>[pidata]</smbconfsection> +<smbconfsection name="[pidata]"/> <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[apps]</smbconfsection> +<smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="admin users">bjones</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="locking">No</smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -<smbconfsection>[profdata]</smbconfsection> +<smbconfsection name="[profdata]"/> <smbconfoption name="comment">Profile Data Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml index 63994d84e8..3b4bedee8f 100644 --- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml +++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="nw4migration"> <title>Migrating NetWare 4.11 Server to Samba-3</title> @@ -532,7 +532,7 @@ shadow: files ldap <smbconfexample id="ch8smbconf"> <title>Samba Configuration File &smbmdash; smb.conf Part A</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="netbios name">MASSIVE</smbconfoption> <smbconfoption name="server string">Corp File Server</smbconfoption> @@ -575,13 +575,13 @@ shadow: files ldap <smbconfexample id="ch8smbconf2"> <title>Samba Configuration File &smbmdash; smb.conf Part B</title> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network logon service</smbconfoption> <smbconfoption name="path">/data/samba/netlogon</smbconfoption> <smbconfoption name="write list">"@Domain Admins"</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="comment">Roaming Profile Share</smbconfoption> <smbconfoption name="path">/data/samba/profiles/</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -589,7 +589,7 @@ shadow: files ldap <smbconfoption name="veto files">desktop.ini</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> @@ -598,18 +598,18 @@ shadow: files ldap <smbconfoption name="hide files">desktop.ini</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[software]</smbconfsection> +<smbconfsection name="[software]"/> <smbconfoption name="comment">Software for %a computers</smbconfoption> <smbconfoption name="path">/data/samba/shares/software/%a</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -<smbconfsection>[public]</smbconfsection> +<smbconfsection name="[public]"/> <smbconfoption name="comment">Public Files</smbconfoption> <smbconfoption name="path">/data/samba/shares/public</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -<smbconfsection>[PDF]</smbconfsection> +<smbconfsection name="[PDF]"/> <smbconfoption name="comment">Location of documents printed to PDFCreator printer</smbconfoption> <smbconfoption name="path">/data/samba/shares/pdf</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -617,31 +617,31 @@ shadow: files ldap <smbconfexample id="ch8smbconf3"> <title>Samba Configuration File &smbmdash; smb.conf Part C</title> -<smbconfsection>[EVERYTHING]</smbconfsection> +<smbconfsection name="[EVERYTHING]"/> <smbconfoption name="comment">All shares</smbconfoption> <smbconfoption name="path">/data/samba</smbconfoption> <smbconfoption name="valid users">"@Domain Admins"</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[CDROM]</smbconfsection> +<smbconfsection name="[CDROM]"/> <smbconfoption name="comment">CD-ROM on MASSIVE</smbconfoption> <smbconfoption name="path">/mnt</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers Share</smbconfoption> <smbconfoption name="path">/data/samba/drivers</smbconfoption> <smbconfoption name="write list">root</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/data/samba/spool</smbconfoption> <smbconfoption name="create mask">0644</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[acct_hp8500]</smbconfsection> +<smbconfsection name="[acct_hp8500]"/> <smbconfoption name="comment">"Accounting Color Laser Printer"</smbconfoption> <smbconfoption name="path">/data/samba/spool/private</smbconfoption> <smbconfoption name="valid users">@acct, @acct_admin, @hr, "@Domain Admins",\</smbconfoption> @@ -650,7 +650,7 @@ shadow: files ldap <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="copy">printers</smbconfoption> -<smbconfsection>[plotter]</smbconfsection> +<smbconfsection name="[plotter]"/> <smbconfoption name="comment">Engineering Plotter</smbconfoption> <smbconfoption name="path">/data/samba/spool</smbconfoption> <smbconfoption name="create mask">0644</smbconfoption> @@ -661,12 +661,12 @@ shadow: files ldap <smbconfexample id="ch8smbconf4"> <title>Samba Configuration File &smbmdash; smb.conf Part D</title> -<smbconfsection>[APPS]</smbconfsection> +<smbconfsection name="[APPS]"/> <smbconfoption name="path">/data/samba/shares/Apps</smbconfoption> <smbconfoption name="force group">"Domain Users"</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[ACCT]</smbconfsection> +<smbconfsection name="[ACCT]"/> <smbconfoption name="path">/data/samba/shares/Accounting</smbconfoption> <smbconfoption name="valid users">@acct, "@Domain Admins"</smbconfoption> <smbconfoption name="force group">acct</smbconfoption> @@ -674,24 +674,24 @@ shadow: files ldap <smbconfoption name="create mask">0660</smbconfoption> <smbconfoption name="directory mask">0770</smbconfoption> -<smbconfsection>[ACCT_ADMIN]</smbconfsection> +<smbconfsection name="[ACCT_ADMIN]"/> <smbconfoption name="path">/data/samba/shares/Acct_Admin</smbconfoption> <smbconfoption name="valid users">@”acct_admin”</smbconfoption> <smbconfoption name="force group">acct_admin</smbconfoption> -<smbconfsection>[HR_PR]</smbconfsection> +<smbconfsection name="[HR_PR]"/> <smbconfoption name="path">/data/samba/shares/HR_PR</smbconfoption> <smbconfoption name="valid users">@hr, @acct_admin</smbconfoption> <smbconfoption name="force group">hr</smbconfoption> -<smbconfsection>[ENGR]</smbconfsection> +<smbconfsection name="[ENGR]"/> <smbconfoption name="path">/data/samba/shares/Engr</smbconfoption> <smbconfoption name="valid users">@engr, @receptionist, @truss, "@Domain Admins", cheri</smbconfoption> <smbconfoption name="force group">engr</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="create mask">0770</smbconfoption> -<smbconfsection>[DATA]</smbconfsection> +<smbconfsection name="[DATA]"/> <smbconfoption name="path">/data/samba/shares/DATA</smbconfoption> <smbconfoption name="valid users">@engr, @receptionist, @truss, "@Domain Admins", cheri</smbconfoption> <smbconfoption name="force group">engr</smbconfoption> @@ -702,7 +702,7 @@ shadow: files ldap <smbconfexample id="ch8smbconf5"> <title>Samba Configuration File &smbmdash; smb.conf Part E</title> -<smbconfsection>[X]</smbconfsection> +<smbconfsection name="[X]"/> <smbconfoption name="path">/data/samba/shares/X</smbconfoption> <smbconfoption name="valid users">@engr, @acct</smbconfoption> <smbconfoption name="force group">engr</smbconfoption> @@ -710,18 +710,18 @@ shadow: files ldap <smbconfoption name="create mask">0770</smbconfoption> <smbconfoption name="copy">engr</smbconfoption> -<smbconfsection>[NETWORK]</smbconfsection> +<smbconfsection name="[NETWORK]"/> <smbconfoption name="path">/data/samba/shares/network</smbconfoption> <smbconfoption name="valid users">"@Domain Users"</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="create mask">0770</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -<smbconfsection>[UTILS]</smbconfsection> +<smbconfsection name="[UTILS]"/> <smbconfoption name="path">/data/samba/shares/Utils</smbconfoption> <smbconfoption name="write list">"@Domain Admins"</smbconfoption> -<smbconfsection>[SYS]</smbconfsection> +<smbconfsection name="[SYS]"/> <smbconfoption name="path">/data/samba/shares/SYS</smbconfoption> <smbconfoption name="valid users">chad</smbconfoption> <smbconfoption name="read only">No</smbconfoption> diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml index c09849f9d7..a4827426fc 100644 --- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml +++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="unixclients"> <title>Adding UNIX/LINUX Servers and Clients</title> @@ -671,7 +671,7 @@ Joined domain MEGANET2. <smbconfexample id="ch9-sdmsdc"> <title>Samba Domain Member in Samba Domain Control Context &smbmdash; &smb.conf; File</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="security">DOMAIN</smbconfoption> @@ -697,20 +697,20 @@ Joined domain MEGANET2. <smbconfoption name="printer admin">root</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> @@ -969,7 +969,7 @@ MEGANET2+PIOps:x:10005: <smbconfexample id="ch0-NT4DSDM"> <title>Samba Domain Member Server &smb.conf; File for NT4 Domain</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">MEGANET2</smbconfoption> <smbconfoption name="security">DOMAIN</smbconfoption> @@ -991,20 +991,20 @@ MEGANET2+PIOps:x:10005: <smbconfoption name="hosts allow">192.168.2., 192.168.3., 127.</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> @@ -1641,7 +1641,7 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- <smbconfexample id="ch9-adssdm"> <title>Samba Domain Member &smb.conf; File for Active Directory Membership</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> <smbconfoption name="workgroup">LONDON</smbconfoption> <smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption> @@ -1661,20 +1661,20 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- <smbconfoption name="winbind separator">+</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">SMB Print Spool</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml index 50be790e20..bcd00dbd86 100644 --- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml +++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="kerberos"> <title>Active Directory, Kerberos, and Security</title> @@ -1941,7 +1941,7 @@ other::r-x <para><indexterm> <primary>valid users</primary> </indexterm> - The <parameter>valid users</parameter> did not work on the <smbconfsection>[homes]</smbconfsection>. + The <parameter>valid users</parameter> did not work on the <smbconfsection name="[homes]"/>. Has this functionality been restored yet? </para> @@ -1952,7 +1952,7 @@ other::r-x <primary>meta-service</primary> </indexterm> Yes. This was fixed in Samba-3.0.2. The use of this parameter is strongly recommended as a safeguard - on the <smbconfsection>[homes]</smbconfsection> meta-service. The correct way to specify this is: + on the <smbconfsection name="[homes]"/> meta-service. The correct way to specify this is: <smbconfoption name="valid users">%S</smbconfoption>. </para> diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml index 76dec83d14..7079cc718b 100644 --- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml +++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="DomApps"> <title>Integrating Additional Services</title> @@ -697,7 +697,7 @@ password: XXXXXXXX <smbconfexample id="ch10-smbconf"> <title>Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename></title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">LONDON</smbconfoption> <smbconfoption name="netbios name">W2K3S</smbconfoption> <smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption> diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml index bb72a62cea..9b578b68f0 100644 --- a/docs/Samba-Guide/index.xml +++ b/docs/Samba-Guide/index.xml @@ -10,7 +10,6 @@ <author>&person.jht;</author>
</authorgroup>
<pubdate>March 4, 2005</pubdate>
- <version>20050304</version>
</bookinfo>
<?latex \clearpage ?>
<!--- Leave the commented out lines they are needed for book production.
diff --git a/docs/Samba-HOWTO-Collection/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml index dab3e15fbc..7d4ff18dd7 100644 --- a/docs/Samba-HOWTO-Collection/BDC.xml +++ b/docs/Samba-HOWTO-Collection/BDC.xml @@ -247,7 +247,7 @@ in this manner because reconfiguration of Samba requires changes to the &smb.con <para> Beginning with Version 2.2, Samba officially supports domain logons for all current Windows clients, including Windows NT4, 2003 and XP Professional. For Samba to be enabled as a PDC, some -parameters in the <smbconfsection>[global]</smbconfsection>-section of the &smb.conf; have to be set. +parameters in the <smbconfsection name="[global]"/>-section of the &smb.conf; have to be set. Refer to <link linkend="minimalPDC">following configuration</link> for an example of the minimum required settings. </para> @@ -260,8 +260,8 @@ Refer to <link linkend="minimalPDC">following configuration</link> for an exampl </smbconfexample></para> <para> -Several other things like a <smbconfsection>[homes]</smbconfsection> and a -<smbconfsection>[netlogon]</smbconfsection> share also need to be set along with +Several other things like a <smbconfsection name="[homes]"/> and a +<smbconfsection name="[netlogon]"/> share also need to be set along with settings for the profile path, the user's home drive, and so on. This is not covered in this chapter; for more information please refer to <link linkend="samba-pdc">Domain Control</link>. </para> @@ -519,7 +519,7 @@ done by setting Samba as shown in <link linkend="minim-bdc">the next example</li </smbconfexample></para> <para> -In the <smbconfsection>[global]</smbconfsection>-section of the &smb.conf; of the BDC. This makes the BDC +In the <smbconfsection name="[global]"/>-section of the &smb.conf; of the BDC. This makes the BDC only register the name MIDEARTH<#1c> with the WINS server. This is no problem as the name MIDEARTH<#1c> is a NetBIOS group name that is meant to be registered by more than one machine. The parameter diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml index 145422fe7e..aac9bc4999 100644 --- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml +++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml @@ -158,12 +158,12 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <para><smbconfexample id="cups-exam-simple"> <title>Simplest printing-related smb.conf</title> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <smbconfoption name="load printers">yes</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printcap name">cups</smbconfoption> - <smbconfsection>[printers]</smbconfsection> + <smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="browseable">no</smbconfoption> @@ -205,12 +205,12 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <para><smbconfexample id="overridesettings"> <title>Overriding global CUPS settings for one printer</title> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printcap name">cups</smbconfoption> <smbconfoption name="load printers">yes</smbconfoption> - <smbconfsection>[printers]</smbconfsection> + <smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="public">yes</smbconfoption> @@ -219,7 +219,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <smbconfoption name="printable">yes</smbconfoption> <smbconfoption name="printer admin">root, @ntadmins</smbconfoption> - <smbconfsection>[special_printer]</smbconfsection> + <smbconfsection name="[special_printer]"/> <smbconfoption name="comment">A special printer with his own settings</smbconfoption> <smbconfoption name="path">/var/spool/samba-special</smbconfoption> <smbconfoption name="printing">sysv</smbconfoption> @@ -479,7 +479,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <para> <indexterm><primary>point 'n' print</primary></indexterm> If you want to use the MS-RPC type printing, you must upload the - drivers onto the Samba server first (<smbconfsection>[print$]</smbconfsection> + drivers onto the Samba server first (<smbconfsection name="[print$]"/> share). For a discussion on how to deposit printer drivers on the Samba host (so the Windows clients can download and use them via <quote>Point'n'Print</quote>), please refer to the previous chapter of this @@ -2193,8 +2193,8 @@ simply use <smbconfoption name="printing">sysv</smbconfoption>). <para> Samba <emphasis>must</emphasis> use its own spool directory (it is set by a line similar to <smbconfoption name="path">/var/spool/samba</smbconfoption>, -in the <smbconfsection>[printers]</smbconfsection> or -<smbconfsection>[printername]</smbconfsection> section of +in the <smbconfsection name="[printers]"/> or +<smbconfsection name="[printername]"/> section of &smb.conf;). Samba receives the job in its own spool space and passes it into the spool directory of CUPS (the CUPS spooling directory is set by the <parameter>RequestRoot</parameter> @@ -2428,7 +2428,7 @@ relationship. <indexterm><primary>cupsaddsmb</primary></indexterm> The <command>cupsaddsmb</command> utility (shipped with all current CUPS versions) is an alternate method to transfer printer drivers into the Samba -<smbconfsection>[print$]</smbconfsection> share. Remember, this share is where +<smbconfsection name="[print$]"/> share. Remember, this share is where clients expect drivers deposited and setup for download and installation. It makes the sharing of any (or all) installed CUPS printers quite easy. <command>cupsaddsmb</command> can use the Adobe PostScript driver as @@ -2475,12 +2475,12 @@ Prior to running <command>cupsaddsmb</command>, you need the settings in <para><smbconfexample id="cupsadd-ex"> <title>smb.conf for cupsaddsmb usage</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="load printers">yes</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printcap name">cups</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="browseable">no</smbconfoption> @@ -2490,7 +2490,7 @@ Prior to running <command>cupsaddsmb</command>, you need the settings in <smbconfoption name="writable">no</smbconfoption> <smbconfoption name="printable">yes</smbconfoption> <smbconfoption name="printer admin">root</smbconfoption> - <smbconfsection>[print$]</smbconfsection> + <smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/etc/samba/drivers</smbconfoption> <smbconfoption name="browseable">yes</smbconfoption> @@ -2659,7 +2659,7 @@ native installer and run the installation process on one client once. This will install the drivers (and one Generic PostScript printer) locally on the client. When they are installed, share the Generic PostScript printer. After this, the client's -<smbconfsection>[print$]</smbconfsection> share holds the Adobe files, from +<smbconfsection name="[print$]"/> share holds the Adobe files, from where you can get them with smbclient from the CUPS host. </para> </sect2> @@ -2682,7 +2682,7 @@ area and download the package. Once installed, you can prepare any driver by simply highlighting the printer in the Printer Manager GUI and select <guilabel>Export Driver...</guilabel> from the menu. Of course you need to have prepared Samba beforehand to handle the -driver files; i.e., setup the <smbconfsection>[print$]</smbconfsection> +driver files; i.e., setup the <smbconfsection name="[print$]"/> share, and so on. The ESP Print Pro package includes the CUPS driver files as well as a (licensed) set of Adobe drivers for the Windows 95/98/Me client family. @@ -2698,7 +2698,7 @@ client family. Once you have run the install script (and possibly manually moved the <filename>cups.hlp</filename> file to <filename>/usr/share/cups/drivers/</filename>), the driver is -ready to be put into Samba's <smbconfsection>[print$]</smbconfsection> share (which often maps to +ready to be put into Samba's <smbconfsection name="[print$]"/> share (which often maps to <filename>/etc/samba/drivers/</filename> and contains a subdirectory tree with <emphasis>WIN40</emphasis> and <emphasis>W32X86</emphasis> branches). You do this by running @@ -2716,7 +2716,7 @@ working in an environment where everything is configured for </para></tip> <para> -Once the driver files are in the <smbconfsection>[print$]</smbconfsection> share +Once the driver files are in the <smbconfsection name="[print$]"/> share and are initialized, they are ready to be downloaded and installed by the Windows NT/200x/XP clients. </para> @@ -2849,10 +2849,10 @@ fully fledged CUPS IPP client for Windows NT/200x/XP to be released soon <indexterm><primary>cupsaddsmb</primary></indexterm> <indexterm><primary>point 'n' print</primary></indexterm> The <command>cupsaddsmb</command> command copies the needed files into your -<smbconfsection>[print$]</smbconfsection> share. Additionally, the PPD +<smbconfsection name="[print$]"/> share. Additionally, the PPD associated with this printer is copied from <filename>/etc/cups/ppd/</filename> to -<smbconfsection>[print$]</smbconfsection>. There the files wait for convenient +<smbconfsection name="[print$]"/>. There the files wait for convenient Windows client installations via Point'n'Print. Before we can run the command successfully, we need to be sure that we can authenticate toward Samba. If you have a small network, you are probably using user-level @@ -2965,7 +2965,7 @@ Running command: smbclient //localhost/print\$ -N -U'root%secret' \ <para> If you look closely, you'll discover your root password was transferred unencrypted over the wire, so beware! Also, if you look further, -you'll discover error messages like <?latex \linebreak ?>NT_STATUS_OBJECT_NAME_COLLISION in between. They occur, because the directories WIN40 and W32X86 already existed in the <smbconfsection>[print$]</smbconfsection> driver download share (from a previous driver installation). They are harmless here. +you'll discover error messages like <?latex \linebreak ?>NT_STATUS_OBJECT_NAME_COLLISION in between. They occur, because the directories WIN40 and W32X86 already existed in the <smbconfsection name="[print$]"/> driver download share (from a previous driver installation). They are harmless here. </para> </sect2> @@ -2990,7 +2990,7 @@ TEMPDIR (as defined in <filename>cupsd.conf</filename>).</para></listitem> <listitem><para>Connect via smbclient to the Samba server's - <smbconfsection>[print$]</smbconfsection> share and put the files into the + <smbconfsection name="[print$]"/> share and put the files into the share's WIN40 (for Windows 9x/Me) and W32X86/ (for Windows NT/200x/XP) subdirectories.</para></listitem> <listitem><para> @@ -3236,7 +3236,7 @@ printer should be there. We are providing the driver now).</para></listitem> <listitem><para>Copy all files to - <smbconfsection>[print$]</smbconfsection>.</para></listitem> + <smbconfsection name="[print$]"/>.</para></listitem> <listitem><para> <indexterm><primary>rpcclient</primary><secondary>adddriver</secondary></indexterm> @@ -3443,7 +3443,7 @@ preconditions to complete successfully: <listitem><para>You are connected as <smbconfoption name="printer admin"/> or root (this is <emphasis>not</emphasis> the <quote>Printer Operators</quote> group in NT, but the <emphasis>printer admin</emphasis> group as defined in -the <smbconfsection>[global]</smbconfsection> section of +the <smbconfsection name="[global]"/> section of &smb.conf;).</para></listitem> <listitem><para>Copy all required driver files to @@ -3457,7 +3457,7 @@ to escape the <quote>$</quote>: <command>smbclient //sambaserver/print\$ -U root.</command>)</para></listitem> <listitem><para>The user you're connecting as must be able to write to -the <smbconfsection>[print$]</smbconfsection> share and create +the <smbconfsection name="[print$]"/> share and create subdirectories.</para></listitem> <listitem><para>The printer you are going to setup for the Windows @@ -3532,7 +3532,7 @@ successful. Note the <quote>empty</quote> field between the two commas in the <command>smbpasswd</command> command) for this step and most of the following steps. Alternately, you can authenticate as one of the users from the <quote>write list</quote> as defined in &smb.conf; for -<smbconfsection>[print$]</smbconfsection>. +<smbconfsection name="[print$]"/>. </para> </step> @@ -3591,7 +3591,7 @@ driver installed.</quote> line. Line-breaks and the line-end indicated by <quote>\</quote> have been inserted for readability reasons.) This step is <emphasis>required</emphasis> for the next one to succeed. It makes the driver files physically -present in the <smbconfsection>[print$]</smbconfsection> share. However, clients +present in the <smbconfsection name="[print$]"/> share. However, clients would still not be able to install them, because Samba does not yet treat them as driver files. A client asking for the driver would still be presented with a <quote>not installed here</quote> message. @@ -3614,7 +3614,7 @@ drwxr-sr-x 2 root ntadmin 670 May 16 03:15 3 <para> The driver files now are in the W32X86 architecture <quote>root</quote> of -<smbconfsection>[print$]</smbconfsection>. +<smbconfsection name="[print$]"/>. </para> </step> @@ -3819,7 +3819,7 @@ back. <para> If it does not work it could be a permission problem with the -<smbconfsection>[print$]</smbconfsection> share. +<smbconfsection name="[print$]"/> share. </para> </step> @@ -4927,7 +4927,7 @@ requested by marketing for the mailing, and so on). Samba print files pass through two spool directories. One is the incoming directory managed by Samba, (set in the <smbconfoption name="path">/var/spool/samba</smbconfoption> -directive in the <smbconfsection>[printers]</smbconfsection> section of +directive in the <smbconfsection name="[printers]"/> section of &smb.conf;). The other is the spool directory of your UNIX print subsystem. For CUPS it is normally <filename>/var/spool/cups/</filename>, as set by the <filename>cupsd.conf</filename> @@ -5208,7 +5208,7 @@ Samba.</para> <para>Use <command>smbstatus</command> to check which user you are from Samba's point of view. Do you have the privileges to - write into the <smbconfsection>[print$]</smbconfsection> + write into the <smbconfsection name="[print$]"/> share?</para> </sect2> @@ -5436,12 +5436,12 @@ again.</para></sect2> <para>Have you ever by accident set the CUPS spool directory to the same location? (<parameter>RequestRoot /var/spool/samba/</parameter> in <filename>cupsd.conf</filename> or the other way round: <filename>/var/spool/cups/</filename> is set as -<smbconfoption name="path"/>> in the <smbconfsection>[printers]</smbconfsection> +<smbconfoption name="path"/>> in the <smbconfsection name="[printers]"/> section). These <parameter>must</parameter> be different. Set <!--FIXME--> <parameter>RequestRoot /var/spool/cups/</parameter> in -<filename>cupsd.conf</filename> and <smbconfoption name="path"/> -/var/spool/samba</smbconfoption> in the <smbconfsection>[printers]</smbconfsection> +<filename>cupsd.conf</filename> and <smbconfoption name="path"> +/var/spool/samba</smbconfoption> in the <smbconfsection name="[printers]"/> section of &smb.conf;. Otherwise cupsd will sanitize permissions to its spool directory with each restart and printing will not work reliably.</para></sect2> diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml index ffc79c7dcc..9cf797a702 100644 --- a/docs/Samba-HOWTO-Collection/Diagnosis.xml +++ b/docs/Samba-HOWTO-Collection/Diagnosis.xml @@ -50,14 +50,14 @@ The procedure is similar for other types of clients. <para> It is also assumed you know the name of an available share in your -&smb.conf;. I will assume this share is called <smbconfsection>tmp</smbconfsection>. -You can add a <smbconfsection>tmp</smbconfsection> share like this by adding the +&smb.conf;. I will assume this share is called <smbconfsection name="tmp"/>. +You can add a <smbconfsection name="tmp"/> share like this by adding the lines shown in <link linkend="tmpshare">the next example</link>. </para> <para><smbconfexample id="tmpshare"> <title>smb.conf with [tmp] share</title> -<smbconfsection>[tmp]</smbconfsection> +<smbconfsection name="[tmp]"/> <smbconfoption name="comment">temporary files </smbconfoption> <smbconfoption name="path">/tmp</smbconfoption> <smbconfoption name="read only">yes</smbconfoption> @@ -242,7 +242,7 @@ the &smb.conf; file entries as shown in <link linkend="modif1">the next example< <para> <smbconfexample id="modif1"> <title>Configuration for only allowing connections from a certain subnet</title> -<smbconfsection>[globals]</smbconfsection> +<smbconfsection name="[globals]"/> <member>...</member> <smbconfoption name="hosts deny">ALL</smbconfoption> <smbconfoption name="hosts allow">xxx.xxx.xxx.xxx/yy</smbconfoption> @@ -261,7 +261,7 @@ To solve this problem, change these lines as shown in <link linkend="modif2">the <para> <smbconfexample id="modif2"> <title>Configuration for allowing connections from a certain subnet and localhost</title> -<smbconfsection>[globals]</smbconfsection> +<smbconfsection name="[globals]"/> <member>...</member> <smbconfoption name="hosts deny">ALL</smbconfoption> <smbconfoption name="hosts allow">xxx.xxx.xxx.xxx/yy 127.</smbconfoption> @@ -383,7 +383,7 @@ It is possible to specify the password along with the username as follows: <para> Once you enter the password, you should get the <prompt>smb></prompt> prompt. If you do not, then look at the error message. If it says <quote><errorname>invalid network -name</errorname></quote>, then the service <smbconfsection>tmp</smbconfsection> is not correctly setup in your &smb.conf;. +name</errorname></quote>, then the service <smbconfsection name="tmp"/> is not correctly setup in your &smb.conf;. </para> <para> @@ -503,7 +503,7 @@ and other config lines in &smb.conf; are correct. It's also possible that the server can't work out what user name to connect you as. To see if this is the problem, add the line <smbconfoption name="user">username</smbconfoption> to the -<smbconfsection>[tmp]</smbconfsection> section of +<smbconfsection name="[tmp]"/> section of &smb.conf; where <parameter>username</parameter> is the username corresponding to the password you typed. If you find this fixes things, you may need the username mapping option. diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml index 0a28ac882d..0c7689c32f 100644 --- a/docs/Samba-HOWTO-Collection/DomainMember.xml +++ b/docs/Samba-HOWTO-Collection/DomainMember.xml @@ -368,10 +368,9 @@ Here is an example for a Red Hat Linux system. </para> <para><smbconfblock> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfcomment><...remainder of parameters...></smbconfcomment> -<smbconfoption name="add machine script">/usr/sbin/useradd -d /var/lib/nobody -g 100 \</smbconfoption> -<member><parameter> -s /bin/false -M %u</parameter></member> +<smbconfoption name="add machine script">/usr/sbin/useradd -d /var/lib/nobody -g 100 -s /bin/false -M %u</smbconfoption> </smbconfblock></para> @@ -522,7 +521,7 @@ of your &smb.conf; to read: </para> <para> -Next change the <smbconfoption name="workgroup"/> line in the <smbconfsection>[global]</smbconfsection> +Next change the <smbconfoption name="workgroup"/> line in the <smbconfsection name="[global]"/> section to read: </para> diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 8b8aba656b..2dc995bb5a 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -123,12 +123,12 @@ of the packages that are provided by the operating system vendor, or through oth <para><smbconfexample id="anon-example"> <title>Anonymous Read-Only Server Configuration</title> <smbconfcomment>Global parameters</smbconfcomment> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">HOBBIT</smbconfoption> <smbconfoption name="security">share</smbconfoption> - <smbconfsection>[data]</smbconfsection> + <smbconfsection name="[data]"/> <smbconfoption name="comment">Data</smbconfoption> <smbconfoption name="path">/export</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> @@ -259,12 +259,12 @@ Added user jackb. <para> <smbconfexample id="anon-rw"><title>Modified Anonymous Read-Write smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">HOBBIT</smbconfoption> <smbconfoption name="security">SHARE</smbconfoption> -<smbconfsection>[data]</smbconfsection> +<smbconfsection name="[data]"/> <smbconfoption name="comment">Data</smbconfoption> <smbconfoption name="path">/export</smbconfoption> <smbconfoption name="force user">jackb</smbconfoption> @@ -312,7 +312,7 @@ Added user jackb. <para> <smbconfexample id="anon-print"><title>Anonymous Print Server smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">LUTHIEN</smbconfoption> <smbconfoption name="security">share</smbconfoption> @@ -321,7 +321,7 @@ Added user jackb. <smbconfoption name="show add printer wizard">No</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> @@ -432,7 +432,7 @@ Added user jackb. <smbconfexample id="OfficeServer"> <title>Secure Office Server smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">OLORIN</smbconfoption> <smbconfoption name="printcap name">cups</smbconfoption> @@ -440,13 +440,13 @@ Added user jackb. <smbconfoption name="show add printer wizard">No</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[public]</smbconfsection> +<smbconfsection name="[public]"/> <smbconfoption name="comment">Data</smbconfoption> <smbconfoption name="path">/export</smbconfoption> <smbconfoption name="force user">maryo</smbconfoption> @@ -454,7 +454,7 @@ Added user jackb. <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printer admin">root, maryo</smbconfoption> @@ -644,7 +644,7 @@ smb: \> <userinput>q</userinput> <smbconfexample id="fast-member-server"> <title>Member server smb.conf (globals)</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">VALINOR</smbconfoption> <smbconfoption name="security">DOMAIN</smbconfoption> @@ -661,25 +661,25 @@ smb: \> <userinput>q</userinput> <para> <smbconfexample id="fast-memberserver-shares"> <title>Member server smb.conf (shares and services)</title> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[spytfull]</smbconfsection> +<smbconfsection name="[spytfull]"/> <smbconfoption name="comment">Accounting Application Only</smbconfoption> <smbconfoption name="path">/export/spytfull</smbconfoption> <smbconfoption name="valid users">@Accounts</smbconfoption> <smbconfoption name="admin users">maryo</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> -<smbconfsection>[public]</smbconfsection> +<smbconfsection name="[public]"/> <smbconfoption name="comment">Data</smbconfoption> <smbconfoption name="path">/export/public</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printer admin">root, maryo</smbconfoption> @@ -872,7 +872,7 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <indexterm><primary>pdbedit</primary></indexterm> <smbconfexample id="fast-engoffice-global"> <title>Engineering Office smb.conf (globals)</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">FRODO</smbconfoption> <smbconfoption name="passdb backend">tdbsam</smbconfoption> @@ -882,8 +882,7 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <smbconfoption name="add group script">/usr/sbin/groupadd %g</smbconfoption> <smbconfoption name="delete group script">/usr/sbin/groupdel %g</smbconfoption> <smbconfoption name="add user to group script">/usr/sbin/usermod -G %g %u</smbconfoption> -<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false \</smbconfoption> -<member><parameter> -d /var/lib/nobody %u</parameter></member> +<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /var/lib/nobody %u</smbconfoption> <smbconfcomment>Note: The following specifies the default logon script.</smbconfcomment> <smbconfcomment>Per user logon scripts can be specified in the user account using pdbedit </smbconfcomment> <smbconfoption name="logon script">scripts\logon.bat</smbconfoption> @@ -902,14 +901,14 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <smbconfexample id="fast-engoffice-shares"> <title>Engineering Office smb.conf (shares and services)</title> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> <smbconfcomment>Printing auto-share (makes printers available thru CUPS)</smbconfcomment> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printer admin">root, maryo</smbconfoption> @@ -918,14 +917,14 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="write list">maryo, root</smbconfoption> <smbconfoption name="printer admin">maryo, root</smbconfoption> <smbconfcomment>Needed to support domain logons</smbconfcomment> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="admin users">root, maryo</smbconfoption> @@ -934,14 +933,13 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <smbconfcomment>For profiles to work, create a user directory under the path</smbconfcomment> <smbconfcomment> shown. i.e., mkdir -p /var/lib/samba/profiles/maryo</smbconfcomment> -<smbconfsection>[Profiles]</smbconfsection> +<smbconfsection name="[Profiles]"/> <smbconfoption name="comment">Roaming Profile Share</smbconfoption> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> <smbconfcomment>Other resource (share/printer) definitions would follow below.</smbconfcomment> -<member>...</member> </smbconfexample> </para></step> @@ -991,7 +989,7 @@ net groupmap add ntgroup="QA Team" unixgroup=qateam type=d <step><para> Create the <filename>scripts</filename> directory for use in the - <smbconfsection>[NETLOGON]</smbconfsection> share: + <smbconfsection name="[NETLOGON]"/> share: <screen> &rootprompt;<userinput>mkdir -p /var/lib/samba/netlogon/scripts</userinput> </screen> @@ -1144,7 +1142,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb <smbconfexample id="fast-ldap"> <title>LDAP backend smb.conf for PDC</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">FRODO</smbconfoption> <smbconfoption name="passdb backend">ldapsam:ldap://localhost</smbconfoption> @@ -1154,12 +1152,9 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb <smbconfoption name="delete user script">/usr/local/sbin/smbldap-userdel.pl %u</smbconfoption> <smbconfoption name="add group script">/usr/local/sbin/smbldap-groupadd.pl -p '%g'</smbconfoption> <smbconfoption name="delete group script">/usr/local/sbin/smbldap-groupdel.pl '%g'</smbconfoption> -<smbconfoption name="add user to group script">/usr/local/sbin/ \</smbconfoption> -<member><parameter>smbldap-groupmod.pl -m '%g' '%u'</parameter></member> -<smbconfoption name="delete user from group script">/usr/local/sbin/ \</smbconfoption> -<member><parameter>smbldap-groupmod.pl -x '%g' '%u'</parameter></member> -<smbconfoption name="set primary group script">/usr/local/sbin/ \</smbconfoption> -<member><parameter>smbldap-usermod.pl -g '%g' '%u'</parameter></member> +<smbconfoption name="add user to group script">/usr/local/sbin/smbldap-groupmod.pl -m '%g' '%u'</smbconfoption> +<smbconfoption name="delete user from group script">/usr/local/sbin/smbldap-groupmod.pl -x '%g' '%u'</smbconfoption> +<smbconfoption name="set primary group script">/usr/local/sbin/smbldap-usermod.pl -g '%g' '%u'</smbconfoption> <smbconfoption name="add machine script">/usr/local/sbin/smbldap-useradd.pl -w '%u'</smbconfoption> <smbconfoption name="logon script">scripts\logon.bat</smbconfoption> <smbconfoption name="logon path">\\%L\Profiles\%U</smbconfoption> @@ -1180,7 +1175,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb <smbconfoption name="idmap uid">15000-20000</smbconfoption> <smbconfoption name="idmap gid">15000-20000</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<member>...</member> </smbconfexample> </para></step> @@ -1217,7 +1211,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb <smbconfexample id="fast-bdc"> <title>Remote LDAP BDC smb.conf</title> <smbconfcomment>Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> <smbconfoption name="netbios name">GANDALF</smbconfoption> <smbconfoption name="passdb backend">ldapsam:ldap://frodo.quenya.org</smbconfoption> @@ -1242,7 +1236,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb <smbconfoption name="idmap uid">15000-20000</smbconfoption> <smbconfoption name="idmap gid">15000-20000</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -<member>...</member> </smbconfexample> </para></step> diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 40d00aba05..68459cf2f0 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -525,12 +525,10 @@ exit 0 <para> The &smb.conf; entry for the above script would be something like that in <link linkend="smbgrpadd">the following example</link>. -<smbconfexample id="smbgrpadd"> +<smbconfexample id="smbgrpadd" fragment="1"> <title>Configuration of &smb.conf; for the add group script.</title> -<smbconfsection>[global]</smbconfsection> -<member>...</member> +<smbconfsection name="[global]"/> <smbconfoption name="add group script">/path_to_tool/smbgrpadd.sh "%g"</smbconfoption> -<member>...</member> </smbconfexample> </para> diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml index 04630a111a..60266274af 100644 --- a/docs/Samba-HOWTO-Collection/Install.xml +++ b/docs/Samba-HOWTO-Collection/Install.xml @@ -63,13 +63,13 @@ <smbconfexample id="smbconfminimal"> <title>A minimal smb.conf</title> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <smbconfoption name="workgroup">WKG</smbconfoption> <smbconfoption name="netbios name">MYNAME</smbconfoption> - <smbconfsection>[share1]</smbconfsection> + <smbconfsection name="[share1]"/> <smbconfoption name="path">/tmp</smbconfoption> - <smbconfsection>[share2]</smbconfsection> + <smbconfsection name="[share2]"/> <smbconfoption name="path">/my_shared_folder</smbconfoption> <smbconfoption name="comment">Some random files</smbconfoption> </smbconfexample> @@ -150,10 +150,10 @@ <indexterm><primary>simple configuration</primary></indexterm> <smbconfexample id="simple-example"> <title>Another simple smb.conf File</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">&example.workgroup;</smbconfoption> -<smbconfsection>[homes]</smbconfsection> +<smbconfsection name="[homes]"/> <smbconfoption name="guest ok">no</smbconfoption> <smbconfoption name="read only">no</smbconfoption> </smbconfexample> @@ -161,7 +161,7 @@ <para> This will allow connections by anyone with an account on the server, using either - their login name or <smbconfsection>homes</smbconfsection> as the service name. + their login name or <smbconfsection name="homes"/> as the service name. (Note: The workgroup that Samba should appear in must also be set. The default workgroup name is WORKGROUP.) </para> @@ -172,7 +172,7 @@ <para> For more information about security settings for the - <smbconfsection>[homes]</smbconfsection> share please refer to + <smbconfsection name="[homes]"/> share please refer to <link linkend="securing-samba">Securing Samba</link> chapter. </para> @@ -263,7 +263,7 @@ <para>Typically <replaceable>yourhostname</replaceable> is the name of the host on which &smbd; has been installed. The <replaceable>aservice</replaceable> is any service that has been defined in the &smb.conf; - file. Try your user name if you just have a <smbconfsection>[homes]</smbconfsection> section in the &smb.conf; file.</para> + file. Try your user name if you just have a <smbconfsection name="[homes]"/> section in the &smb.conf; file.</para> <para>Example: If the UNIX host is called <replaceable>bambi</replaceable> and a valid login name is <replaceable>fred</replaceable>, you would type:</para> diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml index 977ef2131e..547a55f43a 100644 --- a/docs/Samba-HOWTO-Collection/IntroSMB.xml +++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <preface id="IntroSMB"> -<chapterinfo> +<prefaceinfo> &author.jht; <pubdate>June 29, 2003</pubdate> -</chapterinfo> +</prefaceinfo> <title>Preface and Introduction</title> diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml index 8224a73c53..4f65b8c0a7 100644 --- a/docs/Samba-HOWTO-Collection/NT4Migration.xml +++ b/docs/Samba-HOWTO-Collection/NT4Migration.xml @@ -178,7 +178,7 @@ Logon scripts can help to ensure that all users gain the share and printer conne Logon scripts can be created on-the-fly so all commands executed are specific to the rights and privileges granted to the user. The preferred controls should be affected through group membership so group information can be used to create a custom logon script using -the <smbconfoption name="root preexec"/> parameters to the <smbconfsection>NETLOGON</smbconfsection> share. +the <smbconfoption name="root preexec"/> parameters to the <smbconfsection name="NETLOGON"/> share. </para> <para> diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml index 654d246300..6470295d66 100644 --- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml +++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml @@ -607,7 +607,7 @@ cross-subnet browsing possible for a workgroup. In a WORKGROUP environment the Domain Master Browser must be a Samba server, and there must only be one Domain Master Browser per workgroup name. To set up a Samba server as a Domain Master Browser, -set the following option in the <smbconfsection>[global]</smbconfsection> section +set the following option in the <smbconfsection name="[global]"/> section of the &smb.conf; file: </para> @@ -620,14 +620,14 @@ of the &smb.conf; file: <para> The Domain Master Browser should preferably be the local master browser for its own subnet. In order to achieve this, set the following -options in the <smbconfsection>[global]</smbconfsection> section of the &smb.conf; +options in the <smbconfsection name="[global]"/> section of the &smb.conf; file as shown in <link linkend="dmbexample">the following example</link>: </para> <para> <smbconfexample id="dmbexample"> <title>Domain Master Browser smb.conf</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain master">yes</smbconfoption> <smbconfoption name="local master">yes</smbconfoption> <smbconfoption name="preferred master">yes</smbconfoption> @@ -645,14 +645,14 @@ a Local Master Browser for the workgroup. Any MS Windows NT/200x/XP machine shou be able to do this, as will Windows 9x/Me machines (although these tend to get rebooted more often, so it is not such a good idea to use these). To make a Samba server a Local Master Browser set the following options in the -<smbconfsection>[global]</smbconfsection> section of the &smb.conf; file as +<smbconfsection name="[global]"/> section of the &smb.conf; file as shown in <link linkend="lmbexample">following example</link>: </para> <para> <smbconfexample id="lmbexample"> <title>Local master browser smb.conf</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain master">no</smbconfoption> <smbconfoption name="local master">yes</smbconfoption> <smbconfoption name="preferred master">yes</smbconfoption> @@ -674,14 +674,14 @@ parameter sets Samba high enough so it should win any browser elections. <para> If you have an NT machine on the subnet that you wish to be the Local Master Browser, you can disable Samba from -becoming a Local Master Browser by setting the following options in the <smbconfsection>[global]</smbconfsection> section of the +becoming a Local Master Browser by setting the following options in the <smbconfsection name="[global]"/> section of the &smb.conf; file as shown in <link linkend="nombexample">following example</link>: </para> <para> <smbconfexample id="nombexample"> <title>smb.conf for not being a Master Browser</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain master">no</smbconfoption> <smbconfoption name="local master">no</smbconfoption> <smbconfoption name="preferred master">no</smbconfoption> @@ -703,14 +703,14 @@ with WINS instead of the PDC. <para> For subnets other than the one containing the Windows NT PDC, you may set up Samba servers as Local Master Browsers as -described. To make a Samba server a Local Master Browser, set the following options in the <smbconfsection>[global]</smbconfsection> section +described. To make a Samba server a Local Master Browser, set the following options in the <smbconfsection name="[global]"/> section of the &smb.conf; file as shown in <link linkend="remsmb">following example</link>: </para> <para> <smbconfexample id="remsmb"> <title>Local Master Browser smb.conf</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain master">no</smbconfoption> <smbconfoption name="local master">yes</smbconfoption> <smbconfoption name="preferred master">yes</smbconfoption> @@ -729,13 +729,13 @@ they are running. For more details on this refer to <link linkend="browse-force- If you have Windows NT machines that are members of the domain on all subnets and you are sure they will always be running, you can disable Samba from taking part in browser elections and ever becoming a Local Master Browser by setting the following options in the -<smbconfsection>[global]</smbconfsection> section of the &smb.conf; file as shown in <link linkend="xremmb">next example</link>: +<smbconfsection name="[global]"/> section of the &smb.conf; file as shown in <link linkend="xremmb">next example</link>: </para> <para> <smbconfexample id="xremmb"> <title>&smb.conf; for not being a master browser</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain master">no</smbconfoption> <smbconfoption name="local master">no</smbconfoption> <smbconfoption name="preferred master">no</smbconfoption> @@ -1007,7 +1007,7 @@ file [global] section. <para> To configure Samba to register with a WINS server just add <smbconfoption name="wins server">a.b.c.d</smbconfoption> -to your &smb.conf; file <smbconfsection>[global]</smbconfsection> section. +to your &smb.conf; file <smbconfsection name="[global]"/> section. </para> <important><para> @@ -1023,7 +1023,7 @@ particularly not using its own IP address. Specifying both will cause &nmbd; to Either a Samba Server or a Windows NT Server machine may be set up as a WINS server. To configure a Samba Server to be a WINS server you must add to the &smb.conf; file on the selected Server the following line to -the <smbconfsection>[global]</smbconfsection> section: +the <smbconfsection name="[global]"/> section: </para> <para> @@ -1071,7 +1071,7 @@ of this WINS server. If your WINS server is a Samba machine, fill in the Samba machine IP address in the <guilabel>Primary WINS Server</guilabel> field of the <guilabel>Control Panel->Network->Protocols->TCP->WINS Server</guilabel> dialogs in Windows 9x/Me or Windows NT/200x. To tell a Samba server the IP address -of the WINS server, add the following line to the <smbconfsection>[global]</smbconfsection> section of +of the WINS server, add the following line to the <smbconfsection name="[global]"/> section of all &smb.conf; files: </para> diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml index 663dcc6fd0..0a0d78fd91 100644 --- a/docs/Samba-HOWTO-Collection/Other-Clients.xml +++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml @@ -103,7 +103,7 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) <sect2> <title>Printer Driver Download for OS/2 Clients</title> - <para>Create a share called <smbconfsection>[PRINTDRV]</smbconfsection> that is + <para>Create a share called <smbconfsection name="[PRINTDRV]"/> that is world-readable. Copy your OS/2 driver files there. The <filename>.EA_</filename> files must still be separate, so you will need to use the original install files and not copy an installed driver from an OS/2 system.</para> @@ -220,7 +220,7 @@ It is presumably a Windows for Workgroups bug.</para> <para> Note that some people have found that setting <parameter>DefaultRcvWindow</parameter> in -the <smbconfsection>[MSTCP]</smbconfsection> section of the +the <smbconfsection name="[MSTCP]"/> section of the <filename>SYSTEM.INI</filename> file under Windows for Workgroups to 3072 gives a big improvement. </para> @@ -310,7 +310,7 @@ releases prior to Samba 2.2.2. <para><smbconfexample id="minimalprofile"> <title>Minimal profile share</title> -<smbconfsection>[profile]</smbconfsection> +<smbconfsection name="[profile]"/> <smbconfoption name="path">/export/profile</smbconfoption> <smbconfoption name="create mask">0600</smbconfoption> <smbconfoption name="directory mask">0700</smbconfoption> diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml index 1a225c8cd7..809d353833 100644 --- a/docs/Samba-HOWTO-Collection/PDC.xml +++ b/docs/Samba-HOWTO-Collection/PDC.xml @@ -429,7 +429,7 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in <link l <para> <smbconfexample id="pdc-example"> <title>smb.conf for being a PDC</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="netbios name"><replaceable>BELERIAND</replaceable></smbconfoption> <smbconfoption name="workgroup"><replaceable>&example.workgroup;</replaceable></smbconfoption> <smbconfoption name="passdb backend">tdbsam</smbconfoption> @@ -444,12 +444,12 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in <link l <smbconfoption name="logon home">\\homeserver\%U\winprofile</smbconfoption> <smbconfoption name="logon script">logon.cmd</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="read only">yes</smbconfoption> <smbconfoption name="write list"><replaceable>ntadmin</replaceable></smbconfoption> -<smbconfsection>[profiles]</smbconfsection> +<smbconfsection name="[profiles]"/> <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">no</smbconfoption> <smbconfoption name="create mask">0600</smbconfoption> @@ -584,11 +584,11 @@ must be set. <smbconfexample id="PDC-config"> <title>smb.conf for being a PDC</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="domain logons">Yes</smbconfoption> <smbconfoption name="domain master">(Yes on PDC, No on BDCs)</smbconfoption> -<smbconfsection>[netlogon]</smbconfsection> +<smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network Logon Service</smbconfoption> <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml index 29bd6d296e..2db2764f42 100644 --- a/docs/Samba-HOWTO-Collection/Passdb.xml +++ b/docs/Samba-HOWTO-Collection/Passdb.xml @@ -422,7 +422,7 @@ Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>ldapsam</secondary></indexterm> <smbconfexample id="idmapbackendexample"> <title>Example configuration with the LDAP idmap backend</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="idmap backend">ldap:ldap://ldap-server.quenya.org:636</smbconfoption> <smbconfcomment>Alternately, this could be specified as:</smbconfcomment> <smbconfoption name="idmap backend">ldap:ldaps://ldap-server.quenya.org</smbconfoption> @@ -660,8 +660,7 @@ backends of the same type. For example, to use two different tdbsam databases: <para> <smbconfblock> - <smbconfoption name="passdb backend">tdbsam:/etc/samba/passdb.tdb \</smbconfoption> - <member><parameter>tdbsam:/etc/samba/old-passdb.tdb</parameter></member> + <smbconfoption name="passdb backend">tdbsam:/etc/samba/passdb.tdb tdbsam:/etc/samba/old-passdb.tdb</smbconfoption> </smbconfblock> </para> @@ -1102,7 +1101,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz <para> <smbconfexample id="confldapex"> <title>Configuration with LDAP</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="security">user</smbconfoption> <smbconfoption name="encrypt passwords">yes</smbconfoption> <smbconfoption name="netbios name">MORIA</smbconfoption> @@ -1502,7 +1501,7 @@ access to attrs=SambaLMPassword,SambaNTPassword </para> <para> - Additional options can be given through the &smb.conf; file in the <smbconfsection>[global]</smbconfsection> section. + Additional options can be given through the &smb.conf; file in the <smbconfsection name="[global]"/> section. Refer to <link linkend="mysqlpbe">the following table</link>. </para> @@ -1591,7 +1590,7 @@ access to attrs=SambaLMPassword,SambaNTPassword <smbconfexample id="mysqlsam"> <title>Example configuration for the MySQL passdb backend</title> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <smbconfoption name="passdb backend">mysql:foo</smbconfoption> <smbconfoption name="foo:mysql user">samba</smbconfoption> <smbconfoption name="foo:mysql password">abmas</smbconfoption> @@ -1701,7 +1700,7 @@ access to attrs=SambaLMPassword,SambaNTPassword <para> <smbconfblock> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <member>...</member> <smbconfoption name="passdb backend">smbpasswd, tdbsam</smbconfoption> <member>...</member> diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml index 8c12c92ede..c4fb0aeaaa 100644 --- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml +++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml @@ -122,7 +122,7 @@ here is incomplete &smbmdash; you are warned. Use the Group Policy Editor to create a policy file that specifies the location of user profiles and/or <filename>My Documents</filename>, and so on. Then save these settings in a file called <filename>Config.POL</filename> that needs to be placed in the - root of the <smbconfsection>[NETLOGON]</smbconfsection> share. If Windows 98 is configured to log onto + root of the <smbconfsection name="[NETLOGON]"/> share. If Windows 98 is configured to log onto the Samba Domain, it will automatically read this file and update the Windows 9x/Me registry of the machine as it logs on. </para> diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml index aa89b1e0ef..1d2fc8eeb6 100644 --- a/docs/Samba-HOWTO-Collection/Printing.xml +++ b/docs/Samba-HOWTO-Collection/Printing.xml @@ -161,7 +161,7 @@ overview of these. As with other parameters, there are Global Level <varlistentry><term>Service Level Parameters</term> <listitem><para> These may be specified in the - <smbconfsection>[global]</smbconfsection> section of &smb.conf;. + <smbconfsection name="[global]"/> section of &smb.conf;. In this case they define the default behavior of all individual or service level shares (provided they do not have a different setting defined for the same parameter, thus overriding the @@ -189,11 +189,11 @@ However, in many environments these are enough to provide a valid <para> <smbconfexample id="simpleprc"> <title>Simple configuration with BSD printing</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="printing">bsd</smbconfoption> <smbconfoption name="load printers">yes</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printable">yes</smbconfoption> <smbconfoption name="public">yes</smbconfoption> @@ -397,7 +397,7 @@ testparm issued two warnings: </para> <itemizedlist> - <listitem><para>We did not specify the <smbconfsection>[printers]</smbconfsection> section as printable.</para></listitem> + <listitem><para>We did not specify the <smbconfsection name="[printers]"/> section as printable.</para></listitem> <listitem><para>We did not tell Samba which spool directory to use.</para></listitem> </itemizedlist> @@ -448,7 +448,7 @@ file to remove all parameters that are set at default. <para><smbconfexample id="extbsdpr"> <title>Extended BSD Printing Configuration</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="printing">bsd</smbconfoption> <smbconfoption name="load printers">yes</smbconfoption> <smbconfoption name="show add printer wizard">yes</smbconfoption> @@ -458,7 +458,7 @@ file to remove all parameters that are set at default. <smbconfoption name="lpq cache time">20</smbconfoption> <smbconfoption name="use client driver">no</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="printable">yes</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> @@ -468,7 +468,7 @@ file to remove all parameters that are set at default. <smbconfoption name="read only">yes</smbconfoption> <smbconfoption name="writable">no </smbconfoption> -<smbconfsection>[my_printer_name]</smbconfsection> +<smbconfsection name="[my_printer_name]"/> <smbconfoption name="comment">Printer with Restricted Access</smbconfoption> <smbconfoption name="path">/var/spool/samba_my_printer</smbconfoption> <smbconfoption name="printer admin">kurt</smbconfoption> @@ -499,11 +499,11 @@ The following is a discussion of the settings from above shown example. <title>The [global] Section</title> <para> -The <smbconfsection>[global]</smbconfsection> section is one of four special -sections (along with [<smbconfsection>[homes]</smbconfsection>, -<smbconfsection>[printers]</smbconfsection> -and <smbconfsection>[print$]</smbconfsection>...). The -<smbconfsection>[global]</smbconfsection> contains all parameters which apply +The <smbconfsection name="[global]"/> section is one of four special +sections (along with [<smbconfsection name="[homes]"/>, +<smbconfsection name="[printers]"/> +and <smbconfsection name="[print$]"/>...). The +<smbconfsection name="[global]"/> contains all parameters which apply to the server as a whole. It is the place for parameters that have only a global meaning. It may also contain service level parameters that then define default settings for all other sections and shares. This way you can simplify @@ -524,7 +524,7 @@ share settings and specify other values). <caution><para>The <smbconfoption name="printing"/> parameter is normally a service level parameter. Since it is included here in the - <smbconfsection>[global]</smbconfsection> section, it will take effect for all + <smbconfsection name="[global]"/> section, it will take effect for all printer shares that are not defined differently. Samba-3 no longer supports the SOFTQ printing system.</para></caution> </listitem></varlistentry> @@ -536,7 +536,7 @@ share settings and specify other values). for browsing. If you use this parameter, you do not need to specify separate shares for each printer. Each automatically created printer share will clone the configuration options found in the - <smbconfsection>[printers]</smbconfsection> section. (The <parameter>load printers + <smbconfsection name="[printers]"/> section. (The <parameter>load printers = no</parameter> setting will allow you to specify each UNIX printer you want to share separately, leaving out some you do not want to be publicly visible and available).</para> @@ -550,7 +550,7 @@ share settings and specify other values). by the <command>net view</command> command). To disable it, you need to explicitly set it to <constant>no</constant> (commenting it out will not suffice). The <parameter>Add Printer Wizard</parameter> lets you upload printer - drivers to the <smbconfsection>[print$]</smbconfsection> share and associate it + drivers to the <smbconfsection name="[print$]"/> share and associate it with a printer (if the respective queue exists before the action), or exchange a printer's driver against any other previously uploaded driver.</para> @@ -627,7 +627,7 @@ man page.) Settings inside this container must be Share Level parameters. <varlistentry><term><smbconfoption name="printable">yes </smbconfoption></term> <listitem><para> - The <smbconfsection>[printers]</smbconfsection> service <emphasis>must</emphasis> + The <smbconfsection name="[printers]"/> service <emphasis>must</emphasis> be declared as printable. If you specify otherwise, smbd will refuse to load at startup. This parameter allows connected clients to open, write to and submit spool files into the directory specified with the <smbconfoption name="path"/> @@ -649,7 +649,7 @@ man page.) Settings inside this container must be Share Level parameters. <listitem><para> Is always set to <constant>no</constant> if <smbconfoption name="printable">yes</smbconfoption>. It makes - the <smbconfsection>[printer]</smbconfsection> share itself invisible in the list of + the <smbconfsection name="[printer]"/> share itself invisible in the list of available shares in a <command>net view</command> command or in the Explorer browse list. (You will of course see the individual printers). </para></listitem> @@ -732,7 +732,7 @@ to a printer with the same name! <varlistentry><term><smbconfoption name="printer admin">kurt </smbconfoption></term> <listitem><para> The printer admin definition is different for this explicitly defined printer share from the general - <smbconfsection>[printers]</smbconfsection> share. It is not a requirement; we + <smbconfsection name="[printers]"/> share. It is not a requirement; we did it to show that it is possible. </para></listitem> </varlistentry> @@ -784,7 +784,7 @@ to a printer with the same name! <title>Print Commands</title> <para> -In each section defining a printer (or in the <smbconfsection>[printers]</smbconfsection> section), +In each section defining a printer (or in the <smbconfsection name="[printers]"/> section), a <parameter>print command</parameter> parameter may be defined. It sets a command to process the files that have been placed into the Samba print spool directory for that printer. (That spool directory was, if you remember, set up with the <smbconfoption name="path"/> parameter). Typically, @@ -940,7 +940,7 @@ sent to the default printer. </para> <para> -If specified in the <smbconfsection>[global]</smbconfsection> section, the print command given will be +If specified in the <smbconfsection name="[global]"/> section, the print command given will be used for any printable service that does not have its own print command specified. If there is neither a specified print command for a printable service nor a global print command, spool files will be created but not processed! Most importantly, print files will not be removed, so they will consume disk space. @@ -949,7 +949,7 @@ but not processed! Most importantly, print files will not be removed, so they wi <para> Printing may fail on some UNIX systems when using the <quote>nobody</quote> account. If this happens, create an alternative guest account and give it the privilege to print. Set up this guest account in the -<smbconfsection>[global]</smbconfsection> section with the <parameter>guest account</parameter> parameter. +<smbconfsection name="[global]"/> section with the <parameter>guest account</parameter> parameter. </para> <para> @@ -963,8 +963,7 @@ is the usual separator for commands in shell scripts: </para> <para><smbconfblock> -<smbconfoption name="print command">echo Printing %s >> \</smbconfoption> -<member><parameter>/tmp/print.log; lpr -P %p %s; rm %s</parameter></member> + <smbconfoption name="print command">echo Printing %s >> /tmp/print.log; lpr -P %p %s; rm %s</smbconfoption> </smbconfblock></para> <para> @@ -1061,11 +1060,11 @@ require that the Samba server possess a valid driver for the printer. This was f </para> <para> -But it is a new capability to install the printer drivers into the <smbconfsection>[print$]</smbconfsection> +But it is a new capability to install the printer drivers into the <smbconfsection name="[print$]"/> share of the Samba server, and a big convenience, too. Then <emphasis>all</emphasis> clients (including 95/98/ME) get the driver installed when they first connect to this printer share. The <emphasis>uploading</emphasis> or <emphasis>depositing</emphasis> of the driver into this -<smbconfsection>[print$]</smbconfsection> share and the following binding of this driver to an existing +<smbconfsection name="[print$]"/> share and the following binding of this driver to an existing Samba printer share can be achieved by different means: </para> @@ -1104,7 +1103,7 @@ system, which is responsible for all further processing, as needed. Versions of Samba prior to 2.2 made it possible to use a share named <parameter>[printer$]</parameter>. This name was taken from the same named service created by Windows 9x/Me clients when a printer was shared by them. Windows 9x/Me printer servers always - have a <smbconfsection>[printer$]</smbconfsection> service that provides read-only access (with + have a <smbconfsection name="[printer$]"/> service that provides read-only access (with no password required) to support printer driver downloads. However, Samba's initial implementation allowed for a parameter named <parameter>printer driver location</parameter> to be used on a per share basis. This specified the location of the driver files associated with @@ -1115,12 +1114,12 @@ system, which is responsible for all further processing, as needed. <para> These parameters, including the <parameter>printer driver file</parameter> parameter, are now removed and cannot be used in installations of Samba-3. The share name - <smbconfsection>[print$]</smbconfsection> is now used for the location of download-able printer - drivers. It is taken from the <smbconfsection>[print$]</smbconfsection> service created + <smbconfsection name="[print$]"/> is now used for the location of download-able printer + drivers. It is taken from the <smbconfsection name="[print$]"/> service created by Windows NT PCs when a printer is shared by them. Windows NT print servers always have a - <smbconfsection>[print$]</smbconfsection> service that provides read-write access (in the context + <smbconfsection name="[print$]"/> service that provides read-write access (in the context of its ACLs) to support printer driver downloads and uploads. This does not mean Windows - 9x/Me clients are now thrown aside. They can use Samba's <smbconfsection>[print$]</smbconfsection> + 9x/Me clients are now thrown aside. They can use Samba's <smbconfsection name="[print$]"/> share support just fine. </para> </sect2> @@ -1130,14 +1129,14 @@ system, which is responsible for all further processing, as needed. <para> In order to support the uploading and downloading of printer driver files, you must first configure a -file share named <smbconfsection>[print$]</smbconfsection>. The public name of this share is hard coded +file share named <smbconfsection name="[print$]"/>. The public name of this share is hard coded in the MS Windows clients. It cannot be renamed since Windows clients are programmed to search for a service of exactly this name if they want to retrieve printer driver files. </para> <para> You should modify the server's file to add the global parameters and create the -<smbconfsection>[print$]</smbconfsection> file share (of course, some of the parameter values, such +<smbconfsection name="[print$]"/> file share (of course, some of the parameter values, such as <smbconfoption name="path"/> are arbitrary and should be replaced with appropriate values for your site). See <link linkend="prtdollar">next example</link>. </para> @@ -1145,14 +1144,14 @@ site). See <link linkend="prtdollar">next example</link>. <para> <smbconfexample id="prtdollar"> <title>[print\$] example</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfcomment>members of the ntadmin group should be able to add drivers and set</smbconfcomment> <smbconfcomment>printer properties. root is implicitly always a 'printer admin'.</smbconfcomment> <smbconfoption name="printer admin">@ntadmin</smbconfoption> <member>...</member> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <member>...</member> -<smbconfsection>[print$]</smbconfsection> +<smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Driver Download Area</smbconfoption> <smbconfoption name="path">/etc/samba/drivers</smbconfoption> <smbconfoption name="browseable">yes</smbconfoption> @@ -1173,7 +1172,7 @@ Of course, you also need to ensure that the directory named by the <title>[print$] Section Parameters</title> <para> -The <smbconfsection>[print$]</smbconfsection> is a special section in &smb.conf;. It contains settings relevant to +The <smbconfsection name="[print$]"/> is a special section in &smb.conf;. It contains settings relevant to potential printer driver download and is used by windows clients for local print driver installation. The following parameters are frequently needed in this share section: </para> @@ -1195,7 +1194,7 @@ The following parameters are frequently needed in this share section: <varlistentry><term><smbconfoption name="browseable">no </smbconfoption></term> <listitem><para> - Makes the <smbconfsection>[print$]</smbconfsection> share invisible to clients from the + Makes the <smbconfsection name="[print$]"/> share invisible to clients from the <guimenu>Network Neighborhood</guimenu>. However, you can still mount it from any client using the <command>net use g:\\sambaserver\print$</command> command in a DOS-box or the <guimenu>Connect network drive menu></guimenu> from Windows Explorer. @@ -1216,7 +1215,7 @@ The following parameters are frequently needed in this share section: validated by the Domain Controller in order to logon to the Windows NT session), then guest access is not necessary. Of course, in a workgroup environment where you just want to print without worrying about silly accounts and security, then configure the share for - guest access. You should consider adding <smbconfoption name="map to guest">Bad User</smbconfoption> in the <smbconfsection>[global]</smbconfsection> section + guest access. You should consider adding <smbconfoption name="map to guest">Bad User</smbconfoption> in the <smbconfsection name="[global]"/> section as well. Make sure you understand what this parameter does before using it. </para></note> </listitem> @@ -1231,7 +1230,7 @@ The following parameters are frequently needed in this share section: <varlistentry><term><smbconfoption name="write list">@ntadmin, root </smbconfoption></term> <listitem><para> - The <smbconfsection>[print$]</smbconfsection> was made read-only by the previous + The <smbconfsection name="[print$]"/> was made read-only by the previous setting so we should create a <parameter>write list</parameter> entry also. UNIX groups (denoted with a leading <quote>@</quote> character). Users listed here are allowed write-access (as an exception to the general public's read-only access), which they need to @@ -1251,17 +1250,17 @@ The following parameters are frequently needed in this share section: <para> In order for a Windows NT print server to support the downloading of driver files by multiple client -architectures, you must create several subdirectories within the <smbconfsection>[print$]</smbconfsection> +architectures, you must create several subdirectories within the <smbconfsection name="[print$]"/> service (i.e., the UNIX directory named by the <smbconfoption name="path"/> parameter). These correspond to each of the supported client architectures. Samba follows this model as -well. Just like the name of the <smbconfsection>[print$]</smbconfsection> share itself, the subdirectories +well. Just like the name of the <smbconfsection name="[print$]"/> share itself, the subdirectories must be exactly the names listed below (you may leave out the subdirectories of architectures you do not need to support). </para> <para> Therefore, create a directory tree below the -<smbconfsection>[print$]</smbconfsection> share for each architecture you wish +<smbconfsection name="[print$]"/> share for each architecture you wish to support like this: </para> @@ -1292,12 +1291,12 @@ to support like this: <para> Of course, the connected account must still have write access to add files to the subdirectories beneath - <smbconfsection>[print$]</smbconfsection>. Remember that all file shares are set to <quote>read-only</quote> by default. + <smbconfsection name="[print$]"/>. Remember that all file shares are set to <quote>read-only</quote> by default. </para> </important> <para> -Once you have created the required <smbconfsection>[print$]</smbconfsection> service and +Once you have created the required <smbconfsection name="[print$]"/> service and associated subdirectories, go to a Windows NT 4.0/200x/XP client workstation. Open <guiicon>Network Neighborhood</guiicon> or <guiicon>My Network Places</guiicon> and browse for the Samba host. Once you have located the server, navigate to its <guiicon>Printers and Faxes</guiicon> folder. You should see @@ -1310,14 +1309,14 @@ an initial listing of printers that matches the printer shares defined on your S <title>Installing Drivers into [print$]</title> <para> -Have you successfully created the <smbconfsection>[print$]</smbconfsection> share in &smb.conf;, and have your forced Samba +Have you successfully created the <smbconfsection name="[print$]"/> share in &smb.conf;, and have your forced Samba to re-read its &smb.conf; file? Good. But you are not yet ready to use the new facility. The client driver files need to be installed into this share. So far it is still an empty share. Unfortunately, it is not enough to just copy the driver files over. They need to be correctly installed so that appropriate records for each driver will exist in the Samba internal databases so it can provide the correct drivers as they are requested from MS Windows clients. And that is a bit tricky, to say the least. We -now discuss two alternative ways to install the drivers into <smbconfsection>[print$]</smbconfsection>: +now discuss two alternative ways to install the drivers into <smbconfsection name="[print$]"/>: </para> <itemizedlist> @@ -1398,7 +1397,7 @@ device settings, please consider the advice given further in <link linkend="inst <title>Installing Print Drivers Using <command>rpcclient</command></title> <para> -The second way to install printer drivers into <smbconfsection>[print$]</smbconfsection> and set them +The second way to install printer drivers into <smbconfsection name="[print$]"/> and set them up in a valid way is to do it from the UNIX command line. This involves four distinct steps: </para> @@ -1408,7 +1407,7 @@ up in a valid way is to do it from the UNIX command line. This involves four dis </para></listitem> <listitem><para> - Deposit the driver files into the <smbconfsection>[print$]</smbconfsection> share's correct subdirectories + Deposit the driver files into the <smbconfsection name="[print$]"/> share's correct subdirectories (possibly by using <command>smbclient</command>). </para></listitem> @@ -1511,7 +1510,7 @@ Windows PC. This PC can also host the Windows 9x/Me drivers, even if it runs on </para> <para> -Since the <smbconfsection>[print$]</smbconfsection> share is usually accessible through the <guiicon>Network +Since the <smbconfsection name="[print$]"/> share is usually accessible through the <guiicon>Network Neighborhood</guiicon>, you can also use the UNC notation from Windows Explorer to poke at it. The Windows 9x/Me driver files will end up in subdirectory <filename>0</filename> of the <filename>WIN40</filename> directory. The full path to access them will be <filename>\\WINDOWSHOST\print$\WIN40\0\</filename>. @@ -1531,7 +1530,7 @@ for this. These types of drivers install into the <quote>3</quote> subdirectory. <para> Now we need to collect all the driver files we identified in our previous step. Where do we get them -from? Well, why not retrieve them from the very PC and the same <smbconfsection>[print$]</smbconfsection> +from? Well, why not retrieve them from the very PC and the same <smbconfsection name="[print$]"/> share that we investigated in our last step to identify the files? We can use <command>smbclient</command> to do this. We will use the paths and names that were leaked to us by <command>getdriver</command>. The listing is edited to include line breaks for readability: @@ -1563,7 +1562,7 @@ exits again. Remember to repeat the procedure for the <application>WIN40</application> architecture should you need to support Windows 9x/Me/XP clients. Remember too, the files for these architectures are in the <filename>WIN40/0/</filename> subdirectory. Once this is complete, we can run <command>smbclient ... -put</command> to store the collected files on the Samba server's <smbconfsection>[print$]</smbconfsection> +put</command> to store the collected files on the Samba server's <smbconfsection name="[print$]"/> share. </para> </sect3> @@ -1572,11 +1571,11 @@ share. <title>Installing Driver Files into [print$]</title> <para> -We are now going to locate the driver files into the <smbconfsection>[print$]</smbconfsection> +We are now going to locate the driver files into the <smbconfsection name="[print$]"/> share. Remember, the UNIX path to this share has been defined previously in your words missing here. You also have created subdirectories for the different Windows client types you want to -support. Supposing your <smbconfsection>[print$]</smbconfsection> share maps to the UNIX path +support. Supposing your <smbconfsection name="[print$]"/> share maps to the UNIX path <filename>/etc/samba/drivers/</filename>, your driver files should now go here: </para> @@ -1596,7 +1595,7 @@ support. Supposing your <smbconfsection>[print$]</smbconfsection> share maps to We again use smbclient to transfer the driver files across the network. We specify the same files and paths as were leaked to us by running <command>getdriver</command> against the original <emphasis>Windows</emphasis> install. However, now we are going to store the files into a -<emphasis>Samba/UNIX</emphasis> print server's <smbconfsection>[print$]</smbconfsection> share. +<emphasis>Samba/UNIX</emphasis> print server's <smbconfsection name="[print$]"/> share. </para> <para><screen> @@ -1705,7 +1704,7 @@ to which print queue(s) these driver files belong. <para> Next, you must tell Samba about the special category of the files you just uploaded into the -<smbconfsection>[print$]</smbconfsection> share. This is done by the <command>adddriver</command> +<smbconfsection name="[print$]"/> share. This is done by the <command>adddriver</command> command. It will prompt Samba to register the driver files into its internal TDB database files. The following command and its output has been edited, again, for readability: </para> @@ -1843,7 +1842,7 @@ status of the files by at least three methods: <para> You will see a listing of all drivers Samba knows about. Your new one should be among them. But it is only listed under the <parameter>[Windows NT x86]</parameter> heading, not under - <smbconfsection>[Windows 4.0]</smbconfsection>, since you didn't install that part. Or did you? + <smbconfsection name="[Windows 4.0]"/>, since you didn't install that part. Or did you? You will see a listing of all drivers Samba knows about. Your new one should be among them. In our example it is named <constant>dm9110</constant>. Note that the third column shows the other installed drivers twice, one time for each supported architecture. Our new driver only shows up @@ -1887,7 +1886,7 @@ Printer Driver mydrivername successfully installed. You will be able to bind that driver to any print queue (however, you are responsible that you associate drivers to queues that make sense with respect to target printers). You cannot run the <command>rpcclient</command> <command>adddriver</command> command repeatedly. Each run consumes the -files you had put into the <smbconfsection>[print$]</smbconfsection> share by moving them into the +files you had put into the <smbconfsection name="[print$]"/> share by moving them into the respective subdirectories. So you must execute an <command>smbclient ... put</command> command before each <command>rpcclient ... adddriver</command> command. </para> @@ -2060,7 +2059,7 @@ Be aware that a valid Device Mode can only be initiated by a set by executing the printer driver program itself. Since Samba cannot execute this Win32 platform driver code, it sets this field initially to NULL (which is not a valid setting for clients to use). Fortunately, most drivers automatically generate the Printer Driver Data that is needed when they are uploaded to the -<smbconfsection>[print$]</smbconfsection> share with the help of the APW or rpcclient. +<smbconfsection name="[print$]"/> share with the help of the APW or rpcclient. </para> <para> @@ -2169,7 +2168,7 @@ command...</guimenuitem> field from the <guimenu>Start</guimenu> menu. <title>Always Make First Client Connection as root or <quote>printer admin</quote></title> <para> -After you installed the driver on the Samba server (in its <smbconfsection>[print$]</smbconfsection> +After you installed the driver on the Samba server (in its <smbconfsection name="[print$]"/> share, you should always make sure that your first client installation completes correctly. Make it a habit for yourself to build the very first connection from a client as <smbconfoption name="printer admin"/>. This is to make sure that: </para> @@ -2363,7 +2362,7 @@ to think about a non-interactive script. <para> If more than one printer is using the same driver, the <command>rpcclient setdriver</command> command can be used to set the driver associated with an installed queue. If the driver is uploaded to -<smbconfsection>[print$]</smbconfsection> once and registered with the printing TDBs, it can be used by +<smbconfsection name="[print$]"/> once and registered with the printing TDBs, it can be used by multiple print queues. In this case, you just need to repeat the <command>setprinter</command> subcommand of <command>rpcclient</command> for every queue (without the need to conduct the <command>adddriver</command> repeatedly). The following is an example of how this could be accomplished: @@ -2481,7 +2480,7 @@ The APW can do various things: <itemizedlist> <listitem><para> - Upload a new driver to the Samba <smbconfsection>[print$]</smbconfsection> share. + Upload a new driver to the Samba <smbconfsection name="[print$]"/> share. </para></listitem> <listitem><para> @@ -2967,7 +2966,7 @@ The second line only works if the printer <emphasis>infotec2105-PS</emphasis> ha print queue on the <constant>cupsserver</constant>, and if the printer drivers have been successfully uploaded (via the <command>APW</command>, <command>smbclient/rpcclient</command>, or <command>cupsaddsmb</command>) -into the <smbconfsection>[print$]</smbconfsection> driver repository of Samba. Some Samba versions +into the <smbconfsection name="[print$]"/> driver repository of Samba. Some Samba versions prior to version 3.0 required a re-start of smbd after the printer install and the driver upload, otherwise the script (or any other client driver download) would fail. </para> @@ -3041,16 +3040,16 @@ follow several paths. Here are possible scenarios for migration: <listitem><para> An existing <filename>printers.def</filename> file (the one specified in the now removed parameter <parameter>printer driver file</parameter>) will no longer work with Samba-3. In 3.0, smbd attempts - to locate a Windows 9x/Me driver files for the printer in <smbconfsection>[print$]</smbconfsection> + to locate a Windows 9x/Me driver files for the printer in <smbconfsection name="[print$]"/> and additional settings in the TDB and only there; if it fails, it will <emphasis>not</emphasis> (as 2.2.x used to do) drop down to using a <filename>printers.def</filename> (and all associated parameters). The make_printerdef tool is removed and there is no backward compatibility for this. </para></listitem> <listitem><para>You need to install a Windows 9x/Me driver into the - <smbconfsection>[print$]</smbconfsection> share for a printer on your Samba + <smbconfsection name="[print$]"/> share for a printer on your Samba host. The driver files will be stored in the <quote>WIN40/0</quote> subdirectory of - <smbconfsection>[print$]</smbconfsection>, and some other settings and information go + <smbconfsection name="[print$]"/>, and some other settings and information go into the printing-related TDBs.</para></listitem> <listitem><para>If you want to migrate an existing diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml index edd977b260..1aa065d1c8 100644 --- a/docs/Samba-HOWTO-Collection/Problems.xml +++ b/docs/Samba-HOWTO-Collection/Problems.xml @@ -232,7 +232,7 @@ If you do post a message to one of the lists, please observe the following guide <listitem><para>Always mention what version of Samba you are using and what operating system it's running under. You should list the relevant sections of - your &smb.conf; file, at least the options in <smbconfsection>[global]</smbconfsection> + your &smb.conf; file, at least the options in <smbconfsection name="[global]"/> that affect PDC support. </para></listitem> diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml index 028762dfc7..8b137dd4ef 100644 --- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml +++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml @@ -75,8 +75,7 @@ For example, to support Windows NT4/200x clients, set the following in the [glob <para> <smbconfblock> -<smbconfoption name="logon path"> </smbconfoption> -<member><parameter>\\profileserver\profileshare\profilepath\%U\moreprofilepath</parameter></member> + <smbconfoption name="logon path"> \\profileserver\profileshare\profilepath\%U\moreprofilepath</smbconfoption> </smbconfblock> This is typically implemented like: @@ -98,7 +97,7 @@ semantics of <quote>%L</quote> and <quote>%N</quote>, as well as <quote>%U</quot <note> <para> MS Windows NT/200x clients at times do not disconnect a connection to a server between logons. It is recommended -to not use the <smbconfsection>homes</smbconfsection> meta-service name as part of the profile share path. +to not use the <smbconfsection name="homes"/> meta-service name as part of the profile share path. </para> </note> </sect3> @@ -115,7 +114,7 @@ on the <command>logon home</command> parameter. <para> By using the logon home parameter, you are restricted to putting Windows 9x/Me profiles in the user's home directory. But wait! There is a trick you can use. If you set the following in the -<smbconfsection>[global]</smbconfsection> section of your &smb.conf; file: +<smbconfsection name="[global]"/> section of your &smb.conf; file: </para> <para><smbconfblock> <smbconfoption name="logon home">\\%L\%U\.profiles</smbconfoption> @@ -229,7 +228,7 @@ When a user first logs in on Windows 9X, the file user.DAT is created, as are fo <filename>Start Menu</filename>, <filename>Desktop</filename>, <filename>Programs</filename>, and <filename>Nethood</filename>. These directories and their contents will be merged with the local versions stored in <filename>c:\windows\profiles\username</filename> on subsequent logins, taking the -most recent from each. You will need to use the <smbconfsection>[global]</smbconfsection> options +most recent from each. You will need to use the <smbconfsection name="[global]"/> options <smbconfoption name="preserve case">yes</smbconfoption>, <smbconfoption name="short preserve case">yes</smbconfoption> and <smbconfoption name="case sensitive">no</smbconfoption> @@ -861,7 +860,7 @@ exists there it will copy this to the workstation to the <filename>C:\Documents under the Windows login name of the user. </para> <note> <para> This path translates, in Samba parlance, to the &smb.conf; -<smbconfsection>[NETLOGON]</smbconfsection> share. The directory should be created at the root +<smbconfsection name="[NETLOGON]"/> share. The directory should be created at the root of this share and must be called <filename>Default User</filename>. </para> </note> @@ -1099,14 +1098,14 @@ setting in &smb.conf;: </para> <smbconfoption name="domain logons">Yes</smbconfoption> </smbconfblock> -<para> There must be a <smbconfsection>[netlogon]</smbconfsection> share that is world readable. It is +<para> There must be a <smbconfsection name="[netlogon]"/> share that is world readable. It is a good idea to add a logon script to pre-set printer and drive connections. There is also a facility for automatically synchronizing the workstation time clock with that of the logon server (another good thing to do). </para> <note><para> To invoke auto-deletion of roaming profile from the local workstation cache (disk storage), use the <application>Group Policy Editor</application> to create a file called <filename>NTConfig.POL</filename> -with the appropriate entries. This file needs to be located in the <smbconfsection>netlogon</smbconfsection> +with the appropriate entries. This file needs to be located in the <smbconfsection name="netlogon"/> share root directory.</para></note> <para> Windows clients need to be members of the domain. Workgroup machines do not use network logons diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml index b7c8882151..a8c2811511 100644 --- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml +++ b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml @@ -62,7 +62,7 @@ access to the UNIX host system. Samba 3.0.11 introduces support for the Windows privilege model. This model allows certain rights to be assigned to a user or group SID. In order to enable this feature, <smbconfoption name="enable privileges">yes</smbconfoption> -must be defined in the <smbconfsection>global</smbconfsection> section of the &smb.conf; file. +must be defined in the <smbconfsection name="global"/> section of the &smb.conf; file. </para> <para> diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml index 1157dcf599..b8d65c08ae 100644 --- a/docs/Samba-HOWTO-Collection/Securing.xml +++ b/docs/Samba-HOWTO-Collection/Securing.xml @@ -53,8 +53,8 @@ Samba may be secured from connections that originate from outside the local netw done using <emphasis>host-based protection</emphasis> (using Samba's implementation of a technology known as <quote>tcpwrappers,</quote> or it may be done be using <emphasis>interface-based exclusion</emphasis> so &smbd; will bind only to specifically permitted interfaces. It is also -possible to set specific share or resource-based exclusions, for example on the <smbconfsection>[IPC$]</smbconfsection> -auto-share. The <smbconfsection>[IPC$]</smbconfsection> share is used for browsing purposes as well as to establish +possible to set specific share or resource-based exclusions, for example on the <smbconfsection name="[IPC$]"/> +auto-share. The <smbconfsection name="[IPC$]"/> share is used for browsing purposes as well as to establish TCP/IP connections. </para> @@ -112,7 +112,7 @@ before someone will find yet another vulnerability. <para> If you want to restrict access to your server to valid users only, then the following - method may be of use. In the &smb.conf; <smbconfsection>[global]</smbconfsection> section put: + method may be of use. In the &smb.conf; <smbconfsection name="[global]"/> section put: </para> <para><smbconfblock> @@ -211,7 +211,7 @@ before someone will find yet another vulnerability. </para> <para><smbconfblock> -<smbconfsection>[IPC$]</smbconfsection> +<smbconfsection name="[IPC$]"/> <smbconfoption name="hosts allow">192.168.115.0/24 127.0.0.1</smbconfoption> <smbconfoption name="hosts deny">0.0.0.0/0</smbconfoption> </smbconfblock></para> @@ -344,7 +344,7 @@ out to be a security problem request are totally convinced that the problem is w <para> Samba allows the behavior you require. Simply put the <smbconfoption name="only user">%S</smbconfoption> - option in the <smbconfsection>[homes]</smbconfsection> share definition. + option in the <smbconfsection name="[homes]"/> share definition. </para> <para> @@ -357,7 +357,7 @@ out to be a security problem request are totally convinced that the problem is w <smbconfblock> <smbconfoption name="valid users">%S</smbconfoption> </smbconfblock> - to the definition of the <smbconfsection>[homes]</smbconfsection> share, as recommended in + to the definition of the <smbconfsection name="[homes]"/> share, as recommended in the &smb.conf; man page. </para> </sect2> diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml index 1505765297..ad1b69e79e 100644 --- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml +++ b/docs/Samba-HOWTO-Collection/StandAloneServer.xml @@ -105,13 +105,13 @@ UNIX system database. This is a simple system to administer. <smbconfexample id="simplynice"> <title>smb.conf for Reference Documentation Server</title> <smbconfcomment> Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">&example.workgroup;</smbconfoption> <smbconfoption name="netbios name">&example.server.samba;</smbconfoption> <smbconfoption name="security">SHARE</smbconfoption> <smbconfoption name="passdb backend">guest</smbconfoption> <smbconfoption name="wins server">192.168.1.1</smbconfoption> -<smbconfsection>[data]</smbconfsection> +<smbconfsection name="[data]"/> <smbconfoption name="comment">Data</smbconfoption> <smbconfoption name="path">/export</smbconfoption> <smbconfoption name="guest only">Yes</smbconfoption> @@ -197,7 +197,7 @@ The contents of the &smb.conf; file is shown in <link linkend="AnonPtrSvr">the n <smbconfexample id="AnonPtrSvr"> <title>&smb.conf; for Anonymous Printing</title> <smbconfcomment> Global parameters</smbconfcomment> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="workgroup">&example.workgroup;</smbconfoption> <smbconfoption name="netbios name">&example.server.samba;</smbconfoption> <smbconfoption name="security">SHARE</smbconfoption> @@ -205,7 +205,7 @@ The contents of the &smb.conf; file is shown in <link linkend="AnonPtrSvr">the n <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printcap name">cups</smbconfoption> -<smbconfsection>[printers]</smbconfsection> +<smbconfsection name="[printers]"/> <smbconfoption name="comment">All Printers</smbconfoption> <smbconfoption name="path">/var/spool/samba</smbconfoption> <smbconfoption name="printer admin">root</smbconfoption> diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml index cf29ef2b7a..a858a38508 100644 --- a/docs/Samba-HOWTO-Collection/Unicode.xml +++ b/docs/Samba-HOWTO-Collection/Unicode.xml @@ -375,14 +375,12 @@ Setting up Japanese charsets is quite difficult. This is mainly because: </para> <smbconfexample><title>VFS CAP</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfcomment>the locale name "CP932" may be different</smbconfcomment> <smbconfoption name="dos charset">CP932</smbconfoption> <smbconfoption name="unix charset">CP932</smbconfoption> -<member>...</member> - -<smbconfsection>[cap-share]</smbconfsection> +<smbconfsection name="[cap-share]"/> <smbconfoption name="vfs option">cap</smbconfoption> </smbconfexample> diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml index 73244b4c8f..b4b87b5521 100644 --- a/docs/Samba-HOWTO-Collection/VFS.xml +++ b/docs/Samba-HOWTO-Collection/VFS.xml @@ -42,7 +42,7 @@ to files and put deleted files in a recycle bin, see <link linkend="vfsrecyc">ne <smbconfexample id="vfsrecyc"> <title>smb.conf with VFS modules</title> - <smbconfsection>[audit]</smbconfsection> + <smbconfsection name="[audit]"/> <smbconfoption name="comment">Audited /data directory</smbconfoption> <smbconfoption name="path">/data</smbconfoption> <smbconfoption name="vfs objects">audit recycle</smbconfoption> @@ -72,7 +72,7 @@ This can be done using a configuration similar to the one shown in <link linkend <smbconfexample id="multimodule"> <title>smb.conf with multiple VFS modules</title> -<smbconfsection>[test]</smbconfsection> +<smbconfsection name="[test]"/> <smbconfoption name="comment">VFS TEST</smbconfoption> <smbconfoption name="path">/data</smbconfoption> <smbconfoption name="writeable">yes</smbconfoption> @@ -505,7 +505,7 @@ This can be done using a configuration similar to the one shown in <link linkend <para> <smbconfexample id="vfsshadow"> <title>Share With shadow_copy VFS</title> - <smbconfsection>[shadow_share]</smbconfsection> + <smbconfsection name="[shadow_share]"/> <smbconfoption name="comment">Shadow Copy Enabled Share</smbconfoption> <smbconfoption name="path">/data/shadow_share</smbconfoption> <smbconfoption name="vfs objects">shadow_copy</smbconfoption> diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 21ed578fa8..bc95cef68a 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -576,10 +576,9 @@ linkend="winbindcfg">the next example</link>, was modified to include the necess </para> <para> -<smbconfexample id="winbindcfg"> +<smbconfexample id="winbindcfg" fragment="1"> <title>smb.conf for Winbind set-up</title> -<smbconfsection>[global]</smbconfsection> -<member><...></member> +<smbconfsection name="[global]"/> <smbconfcomment> separate domain and username with '\', like DOMAIN\username</smbconfcomment> <smbconfoption name="winbind separator">\</smbconfoption> <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment> diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml index 05fffd0457..3a36e2c553 100644 --- a/docs/Samba-HOWTO-Collection/glossary.xml +++ b/docs/Samba-HOWTO-Collection/glossary.xml @@ -81,8 +81,10 @@ <glossterm>Extended Meta-file Format</glossterm> <acronym>EMF</acronym> <glossdef> + <para> An intermediate file format used by Microsoft <?latex \linebreak ?>Windows-based servers and clients. EMF files may be - rendered into a page description language by a print processor. + rendered into a page description language by a print processor. + </para> </glossdef> </glossentry> @@ -176,9 +178,11 @@ <glossterm>Portable Document Format</glossterm> <acronym>PDF</acronym> <glossdef> + <para> A highly compressed document format, based on postscript, used as a document distribution format that is supported by Web browsers as well as many applications. Adobe also distribute an application called <quote>acrobat</quote> which is a PDF reader. + </para> </glossdef> </glossentry> diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml index abf8747968..2aa6b622a2 100644 --- a/docs/Samba-HOWTO-Collection/locking.xml +++ b/docs/Samba-HOWTO-Collection/locking.xml @@ -600,7 +600,7 @@ You can disable oplocks on a per-share basis with the following: <para> <smbconfblock> -<smbconfsection>[acctdata]</smbconfsection> +<smbconfsection name="[acctdata]"/> <smbconfoption name="oplocks">False</smbconfoption> <smbconfoption name="level2 oplocks">False</smbconfoption> </smbconfblock> @@ -669,10 +669,10 @@ enabled on a per-share basis, or globally for the entire server, in the <para> <smbconfexample id="far1"> <title>Share with some files oplocked</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="veto oplock files">/filename.htm/*.txt/</smbconfoption> -<smbconfsection>[share_name]</smbconfsection> +<smbconfsection name="[share_name]"/> <smbconfoption name="veto oplock files">/*.exe/filename.ext/</smbconfoption> </smbconfexample> </para> @@ -702,10 +702,10 @@ the entire server, in the &smb.conf; file as shown in <link linkend="far3"/>. <para> <smbconfexample id="far3"> <title>Configuration with oplock break contention limit</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="oplock break contention limit"> 2 (default)</smbconfoption> -<smbconfsection>[share_name]</smbconfsection> +<smbconfsection name="[share_name]"/> <smbconfoption name="oplock break contention limit"> 2 (default)</smbconfoption> </smbconfexample> </para> diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml index 49a9dc3563..126edd0eb6 100644 --- a/docs/Samba-HOWTO-Collection/msdfs.xml +++ b/docs/Samba-HOWTO-Collection/msdfs.xml @@ -64,11 +64,11 @@ <para> <smbconfexample id="dfscfg"> <title>smb.conf with DFS configured</title> -<smbconfsection>[global]</smbconfsection> +<smbconfsection name="[global]"/> <smbconfoption name="netbios name">&example.server.samba;</smbconfoption> <smbconfoption name="host msdfs ">yes</smbconfoption> -<smbconfsection>[dfs]</smbconfsection> +<smbconfsection name="[dfs]"/> <smbconfoption name="path">/export/dfsroot</smbconfoption> <smbconfoption name="msdfs root">yes</smbconfoption> </smbconfexample> diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml index f3ce457be7..fa87a220ea 100644 --- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml +++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml @@ -587,7 +587,7 @@ complete descriptions of new or modified parameters. </para> <smbconfblock> - <smbconfsection>[global]</smbconfsection> + <smbconfsection name="[global]"/> <member>...</member> <smbconfoption name="idmap backend">ldap:ldap://onterose/</smbconfoption> <smbconfoption name="ldap idmap suffix">ou=idmap,dc=quenya,dc=org</smbconfoption> diff --git a/docs/configure.in b/docs/configure.in index 5eec1688e8..e240373a2d 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -87,7 +87,7 @@ DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages]) DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson]) DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker]) DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify]) -DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fopdf]) +DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fo-pdf]) DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi]) DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo]) DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented]) diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages/smb.conf.5.xml index 57a5d62bc0..4e42e67b50 100644 --- a/docs/manpages/smb.conf.5.xml +++ b/docs/manpages/smb.conf.5.xml @@ -104,7 +104,7 @@ The share is accessed via the share name <quote>foo</quote>:</para> <smbconfexample> - <smbconfsection>[foo]</smbconfsection> + <smbconfsection name="[foo]"/> <smbconfoption name="path">/home/bar</smbconfoption> <smbconfoption name="read only">read only = no</smbconfoption> </smbconfexample> @@ -117,7 +117,7 @@ elsewhere):</para> <smbconfexample> - <smbconfsection>[aprinter]</smbconfsection> + <smbconfsection name="[aprinter]"/> <smbconfoption name="path">/usr/spool/public</smbconfoption> <smbconfoption name="read only">yes</smbconfoption> <smbconfoption name="printable">yes</smbconfoption> @@ -187,7 +187,7 @@ section:</para> <smbconfexample> - <smbconfsection>[homes]</smbconfsection> + <smbconfsection name="[homes]"/> <smbconfoption name="read only">no</smbconfoption> </smbconfexample> @@ -249,7 +249,7 @@ this:</para> <smbconfexample> - <smbconfsection>[printers]</smbconfsection> + <smbconfsection name="[printers]"/> <smbconfoption name="path">/usr/spool/public</smbconfoption> <smbconfoption name="guest ok">yes</smbconfoption> <smbconfoption name="printable">yes</smbconfoption> diff --git a/docs/xslt/upgrade.pl b/docs/xslt/upgrade.pl index 369d76e55d..bcd9d2f6ec 100644 --- a/docs/xslt/upgrade.pl +++ b/docs/xslt/upgrade.pl @@ -6,6 +6,7 @@ undef $/; while(<>) { s/<smbconfoption><name>(.*?)<\/name><value>(.*?)<\/value><\/smbconfoption>/<smbconfoption name=\"\1\">\2<\/smbconfoption>/g; s/<smbconfoption><name>(.*?)<\/name><\/smbconfoption>/<smbconfoption name=\"\1\"\/>/g; + s/<smbconfsection>(.*?)<\/smbconfsection>/<smbconfsection name=\"\1\"\/>/g; s/xmlns:samba=\"http:\/\/samba.org\/common\"/xmlns:samba=\"http:\/\/www.samba.org\/samba\/DTD\/samba-doc\"/g; print $_; } |