From a2e3ba6e1281a7d3693173679ec7fb28898df319 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Aug 2003 17:36:25 +0000 Subject: Merge over book changes into 3_0 CVS (This used to be commit d8fe4a81fb0d4972b2331b3d5fc4890244b44c33) --- docs/docbook/manpages/editreg.1.xml | 9 +++---- docs/docbook/manpages/findsmb.1.xml | 9 +++---- docs/docbook/manpages/lmhosts.5.xml | 9 +++---- docs/docbook/manpages/net.8.xml | 9 +++---- docs/docbook/manpages/nmbd.8.xml | 30 +++++++++-------------- docs/docbook/manpages/nmblookup.1.xml | 9 +++---- docs/docbook/manpages/ntlm_auth.1.xml | 9 +++---- docs/docbook/manpages/pdbedit.8.xml | 9 +++---- docs/docbook/manpages/profiles.1.xml | 9 +++---- docs/docbook/manpages/rpcclient.1.xml | 12 ++++----- docs/docbook/manpages/samba.7.xml | 9 +++---- docs/docbook/manpages/smbcacls.1.xml | 9 +++---- docs/docbook/manpages/smbclient.1.xml | 9 +++---- docs/docbook/manpages/smbcontrol.1.xml | 9 +++---- docs/docbook/manpages/smbcquotas.1.xml | 9 +++---- docs/docbook/manpages/smbd.8.xml | 27 +++++++++----------- docs/docbook/manpages/smbmnt.8.xml | 9 +++---- docs/docbook/manpages/smbmount.8.xml | 9 +++---- docs/docbook/manpages/smbpasswd.5.xml | 17 ++++++------- docs/docbook/manpages/smbpasswd.8.xml | 16 +++++------- docs/docbook/manpages/smbsh.1.xml | 9 +++---- docs/docbook/manpages/smbspool.8.xml | 9 +++---- docs/docbook/manpages/smbstatus.1.xml | 10 +++----- docs/docbook/manpages/smbtar.1.xml | 15 ++++++------ docs/docbook/manpages/smbtree.1.xml | 9 +++---- docs/docbook/manpages/smbumount.8.xml | 9 +++---- docs/docbook/manpages/swat.8.xml | 9 +++---- docs/docbook/manpages/tdbbackup.8.xml | 9 +++---- docs/docbook/manpages/testparm.1.xml | 11 ++++----- docs/docbook/manpages/testprns.1.xml | 11 ++++----- docs/docbook/manpages/vfstest.1.xml | 9 +++---- docs/docbook/manpages/wbinfo.1.xml | 9 +++---- docs/docbook/manpages/winbindd.8.xml | 45 +++++++++++++++++----------------- 33 files changed, 176 insertions(+), 225 deletions(-) (limited to 'docs/docbook/manpages') diff --git a/docs/docbook/manpages/editreg.1.xml b/docs/docbook/manpages/editreg.1.xml index 3427552356..0a6b36bcf0 100644 --- a/docs/docbook/manpages/editreg.1.xml +++ b/docs/docbook/manpages/editreg.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/findsmb.1.xml b/docs/docbook/manpages/findsmb.1.xml index e5ec26c4df..8a89b2ce24 100644 --- a/docs/docbook/manpages/findsmb.1.xml +++ b/docs/docbook/manpages/findsmb.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/lmhosts.5.xml b/docs/docbook/manpages/lmhosts.5.xml index 12d69a7e56..7e1988c121 100644 --- a/docs/docbook/manpages/lmhosts.5.xml +++ b/docs/docbook/manpages/lmhosts.5.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/net.8.xml b/docs/docbook/manpages/net.8.xml index 582ad5e6e7..117fdb5818 100644 --- a/docs/docbook/manpages/net.8.xml +++ b/docs/docbook/manpages/net.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/nmbd.8.xml b/docs/docbook/manpages/nmbd.8.xml index a98d189839..056c12e342 100644 --- a/docs/docbook/manpages/nmbd.8.xml +++ b/docs/docbook/manpages/nmbd.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -134,8 +133,7 @@ NetBIOS lmhosts file. The lmhosts file is a list of NetBIOS names to IP addresses that is loaded by the nmbd server and used via the name - resolution mechanism name resolve - order described in smb.conf + resolution mechanism name resolve order described in smb.conf 5 to resolve any NetBIOS name queries needed by the server. Note that the contents of this file are NOT @@ -174,9 +172,7 @@ If the server is to be run by the inetd meta-daemon, this file must contain suitable startup information for the - meta-daemon. See the install document - for details. + meta-daemon. @@ -187,9 +183,7 @@ If running the server as a daemon at startup, this file will need to contain an appropriate startup - sequence for the server. See the "How to Install and Test SAMBA" document - for details. + sequence for the server. @@ -198,8 +192,7 @@ meta-daemon inetd, this file must contain a mapping of service name (e.g., netbios-ssn) to service port (e.g., 139) and protocol type (e.g., tcp). - See the "How to Install and Test SAMBA" - document for details. + @@ -212,7 +205,7 @@ and /etc/samba/smb.conf. When run as a WINS server (see the - wins support + wins support parameter in the smb.conf 5 man page), nmbd @@ -221,8 +214,7 @@ wherever Samba was configured to install itself. If nmbd is acting as a - browse master (see the local master + browse master (see the local master parameter in the smb.conf 5 man page, nmbd will store the browsing database in the file browse.dat @@ -278,7 +270,7 @@ 1, and the Internet RFC's rfc1001.txt, rfc1002.txt. In addition the CIFS (formerly SMB) specification is available - as a link from the Web page + as a link from the Web page http://samba.org/cifs/. diff --git a/docs/docbook/manpages/nmblookup.1.xml b/docs/docbook/manpages/nmblookup.1.xml index 3da0649dd5..14df0066f5 100644 --- a/docs/docbook/manpages/nmblookup.1.xml +++ b/docs/docbook/manpages/nmblookup.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/ntlm_auth.1.xml b/docs/docbook/manpages/ntlm_auth.1.xml index a37b5b3b7d..77794f0f3f 100644 --- a/docs/docbook/manpages/ntlm_auth.1.xml +++ b/docs/docbook/manpages/ntlm_auth.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/pdbedit.8.xml b/docs/docbook/manpages/pdbedit.8.xml index 3da6177756..8647631f63 100644 --- a/docs/docbook/manpages/pdbedit.8.xml +++ b/docs/docbook/manpages/pdbedit.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/profiles.1.xml b/docs/docbook/manpages/profiles.1.xml index 1dbff39efa..3ae823f634 100644 --- a/docs/docbook/manpages/profiles.1.xml +++ b/docs/docbook/manpages/profiles.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/rpcclient.1.xml b/docs/docbook/manpages/rpcclient.1.xml index 688eef14e8..98795f1775 100644 --- a/docs/docbook/manpages/rpcclient.1.xml +++ b/docs/docbook/manpages/rpcclient.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -58,8 +57,7 @@ server NetBIOS name of Server to which to connect. The server can be any SMB/CIFS server. The name is - resolved using the - name resolve order line from smb.conf + resolved using the name resolve order line from smb.conf 5. diff --git a/docs/docbook/manpages/samba.7.xml b/docs/docbook/manpages/samba.7.xml index 1339f0bb87..fb7c837c5e 100644 --- a/docs/docbook/manpages/samba.7.xml +++ b/docs/docbook/manpages/samba.7.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbcacls.1.xml b/docs/docbook/manpages/smbcacls.1.xml index ab4fe517eb..bb57ab563d 100644 --- a/docs/docbook/manpages/smbcacls.1.xml +++ b/docs/docbook/manpages/smbcacls.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbclient.1.xml b/docs/docbook/manpages/smbclient.1.xml index 8e52e878dd..0b8a6bce95 100644 --- a/docs/docbook/manpages/smbclient.1.xml +++ b/docs/docbook/manpages/smbclient.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbcontrol.1.xml b/docs/docbook/manpages/smbcontrol.1.xml index 7bcb7420ba..af6054de58 100644 --- a/docs/docbook/manpages/smbcontrol.1.xml +++ b/docs/docbook/manpages/smbcontrol.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbcquotas.1.xml b/docs/docbook/manpages/smbcquotas.1.xml index 90166beaf1..341778ccfa 100644 --- a/docs/docbook/manpages/smbcquotas.1.xml +++ b/docs/docbook/manpages/smbcquotas.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbd.8.xml b/docs/docbook/manpages/smbd.8.xml index 0566c67fcb..ded41f995f 100644 --- a/docs/docbook/manpages/smbd.8.xml +++ b/docs/docbook/manpages/smbd.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -144,8 +143,8 @@ file will be created for informational and debug messages from the running server. The log file generated is never removed by the server although - its size may be controlled by the max log size + its size may be controlled by the + max log size option in the smb.conf 5 file. Beware: If the directory specified does not exist, smbd @@ -192,8 +191,7 @@ If the server is to be run by the inetd meta-daemon, this file must contain suitable startup information for the - meta-daemon. See the "How to Install and Test SAMBA" - document for details. + meta-daemon. @@ -204,8 +202,7 @@ If running the server as a daemon at startup, this file will need to contain an appropriate startup - sequence for the server. See the "How to Install and Test SAMBA" - document for details. + sequence for the server. @@ -214,8 +211,7 @@ meta-daemon inetd, this file must contain a mapping of service name (e.g., netbios-ssn) to service port (e.g., 139) and protocol type (e.g., tcp). - See the "How to Install and Test SAMBA" - document for details. + @@ -265,8 +261,7 @@ Samba uses PAM for authentication (when presented with a plaintext password), for account checking (is this account disabled?) and for session management. The degree too which samba supports PAM is restricted - by the limitations of the SMB protocol and the obey - pam restricions smb.conf + by the limitations of the SMB protocol and the obey pam restrictions smb.conf 5 paramater. When this is set, the following restrictions apply: @@ -352,7 +347,7 @@ 1, and the Internet RFC's rfc1001.txt, rfc1002.txt. In addition the CIFS (formerly SMB) specification is available - as a link from the Web page + as a link from the Web page http://samba.org/cifs/. diff --git a/docs/docbook/manpages/smbmnt.8.xml b/docs/docbook/manpages/smbmnt.8.xml index 86596f3ded..0495fa5be0 100644 --- a/docs/docbook/manpages/smbmnt.8.xml +++ b/docs/docbook/manpages/smbmnt.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbmount.8.xml b/docs/docbook/manpages/smbmount.8.xml index f3f7d1a99b..0017c99cd5 100644 --- a/docs/docbook/manpages/smbmount.8.xml +++ b/docs/docbook/manpages/smbmount.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbpasswd.5.xml b/docs/docbook/manpages/smbpasswd.5.xml index c3bd654564..cb6a6070bd 100644 --- a/docs/docbook/manpages/smbpasswd.5.xml +++ b/docs/docbook/manpages/smbpasswd.5.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -140,9 +139,9 @@ account has no password (the passwords in the fields LANMAN Password Hash and NT Password Hash are ignored). Note that this will only allow users to log on with no password if the - null passwords parameter is set in the smb.conf - 5 config file. + null passwords parameter is set in the + smb.conf + 5 config file. D - This means the account is disabled and no SMB/CIFS logins will be allowed for this user. @@ -199,7 +198,7 @@ The original Samba man pages were written by Karl Auer. The man page sources were converted to YODL format (another - excellent piece of Open Source software, available at + excellent piece of Open Source software, available at ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 release by Jeremy Allison. The conversion to DocBook for Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 diff --git a/docs/docbook/manpages/smbpasswd.8.xml b/docs/docbook/manpages/smbpasswd.8.xml index 37f617e46a..3ee3a9e12e 100644 --- a/docs/docbook/manpages/smbpasswd.8.xml +++ b/docs/docbook/manpages/smbpasswd.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -318,8 +317,7 @@ has been configured to use the experimental --with-ldapsam option. The -w switch is used to specify the password to be used with the - ldap admin - dn. Note that the password is stored in + ldap admin dn. Note that the password is stored in the secrets.tdb and is keyed off of the admin's DN. This means that if the value of ldap admin dn ever changes, the password will need to be @@ -370,9 +368,7 @@ allow "localhost" access to the smbd. In addition, the smbpasswd command is only useful if Samba - has been set up to use encrypted passwords. See the document - "LanMan and NT Password Encryption in Samba" in the docs directory for details - on how to do this. + has been set up to use encrypted passwords. diff --git a/docs/docbook/manpages/smbsh.1.xml b/docs/docbook/manpages/smbsh.1.xml index 1bd29917b9..948d586589 100644 --- a/docs/docbook/manpages/smbsh.1.xml +++ b/docs/docbook/manpages/smbsh.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbspool.8.xml b/docs/docbook/manpages/smbspool.8.xml index 340c7ffff2..ec62a0d5df 100644 --- a/docs/docbook/manpages/smbspool.8.xml +++ b/docs/docbook/manpages/smbspool.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbstatus.1.xml b/docs/docbook/manpages/smbstatus.1.xml index 657175bf48..1e96b39263 100644 --- a/docs/docbook/manpages/smbstatus.1.xml +++ b/docs/docbook/manpages/smbstatus.1.xml @@ -1,10 +1,8 @@ - - %globalentities; + + %globalentities; ]> - diff --git a/docs/docbook/manpages/smbtar.1.xml b/docs/docbook/manpages/smbtar.1.xml index 40c915f1f6..c773937844 100644 --- a/docs/docbook/manpages/smbtar.1.xml +++ b/docs/docbook/manpages/smbtar.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -222,13 +221,13 @@ by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. - Ricky Poulten +Ricky Poulten wrote the tar extension and this man page. The smbtar - script was heavily rewritten and improved by Martin Kraemer. Many thanks to everyone who suggested extensions, improvements, bug fixes, etc. The man page sources were converted to YODL format (another - excellent piece of Open Source software, available at + excellent piece of Open Source software, available at ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 release by Jeremy Allison. The conversion to DocBook for Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for diff --git a/docs/docbook/manpages/smbtree.1.xml b/docs/docbook/manpages/smbtree.1.xml index 05f0256b87..9ed2ed4ed8 100644 --- a/docs/docbook/manpages/smbtree.1.xml +++ b/docs/docbook/manpages/smbtree.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/smbumount.8.xml b/docs/docbook/manpages/smbumount.8.xml index 665ffdceb3..d8feb8e938 100644 --- a/docs/docbook/manpages/smbumount.8.xml +++ b/docs/docbook/manpages/smbumount.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/swat.8.xml b/docs/docbook/manpages/swat.8.xml index ad6829c3a6..c0579a9f1f 100644 --- a/docs/docbook/manpages/swat.8.xml +++ b/docs/docbook/manpages/swat.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/tdbbackup.8.xml b/docs/docbook/manpages/tdbbackup.8.xml index c8c5b7e33d..e5f060b101 100644 --- a/docs/docbook/manpages/tdbbackup.8.xml +++ b/docs/docbook/manpages/tdbbackup.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/testparm.1.xml b/docs/docbook/manpages/testparm.1.xml index 085a645a88..84ead17234 100644 --- a/docs/docbook/manpages/testparm.1.xml +++ b/docs/docbook/manpages/testparm.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -182,7 +181,7 @@ The original Samba man pages were written by Karl Auer. The man page sources were converted to YODL format (another - excellent piece of Open Source software, available at + excellent piece of Open Source software, available at ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 release by Jeremy Allison. The conversion to DocBook for Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 diff --git a/docs/docbook/manpages/testprns.1.xml b/docs/docbook/manpages/testprns.1.xml index 2afeba22d3..50584f5a18 100644 --- a/docs/docbook/manpages/testprns.1.xml +++ b/docs/docbook/manpages/testprns.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -138,7 +137,7 @@ The original Samba man pages were written by Karl Auer. The man page sources were converted to YODL format (another - excellent piece of Open Source software, available at + excellent piece of Open Source software, available at ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 release by Jeremy Allison. The conversion to DocBook for Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 diff --git a/docs/docbook/manpages/vfstest.1.xml b/docs/docbook/manpages/vfstest.1.xml index baf45fb0e4..28b543dd81 100644 --- a/docs/docbook/manpages/vfstest.1.xml +++ b/docs/docbook/manpages/vfstest.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/wbinfo.1.xml b/docs/docbook/manpages/wbinfo.1.xml index 2e35f4d4db..728e4f166a 100644 --- a/docs/docbook/manpages/wbinfo.1.xml +++ b/docs/docbook/manpages/wbinfo.1.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> diff --git a/docs/docbook/manpages/winbindd.8.xml b/docs/docbook/manpages/winbindd.8.xml index 202354e2e9..d63c8e06e3 100644 --- a/docs/docbook/manpages/winbindd.8.xml +++ b/docs/docbook/manpages/winbindd.8.xml @@ -1,8 +1,7 @@ - - %globalentities; + + %globalentities; ]> @@ -207,24 +206,24 @@ group: files winbind [global] section of smb.conf. - - winbind separator - - idmap uid - - idmap gid - - winbind cache time - - winbind enum users - - winbind enum groups - - template homedir - - template shell - - winbind use default domain + + winbind separator + + idmap uid + + idmap gid + + winbind cache time + + winbind enum users + + winbind enum groups + + template homedir + + template shell + + winbind use default domain -- cgit