From 9c72dd78f25be4a7ffa5af5a242670ec76930d6f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 12 Mar 2005 22:34:38 +0000 Subject: Use new definition of , fixes a bunch of validity errors. (This used to be commit 3eb5c35e47951f320f7c2f4cd478a95f6d48236e) --- docs/manpages/nmbd.8.xml | 8 ++++---- docs/manpages/ntlm_auth.1.xml | 6 +++--- docs/manpages/pdbedit.8.xml | 2 +- docs/manpages/rpcclient.1.xml | 2 +- docs/manpages/smb.conf.5.xml | 20 ++++++++++---------- docs/manpages/smbd.8.xml | 4 ++-- docs/manpages/smbpasswd.8.xml | 2 +- docs/manpages/winbindd.8.xml | 24 ++++++++++++------------ 8 files changed, 34 insertions(+), 34 deletions(-) (limited to 'docs/manpages') diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml index 2bd5385d8b..c7366fcea8 100644 --- a/docs/manpages/nmbd.8.xml +++ b/docs/manpages/nmbd.8.xml @@ -54,7 +54,7 @@ specified it will respond with the IP number of the host it is running on. Its "own NetBIOS name" is by default the primary DNS name of the host it is running on, - but this can be overridden by the netbios name + but this can be overridden by the in &smb.conf;. Thus nmbd will reply to broadcast queries for its own name(s). Additional names for nmbd to respond on can be set @@ -129,7 +129,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 described in smb.conf 5 to resolve any NetBIOS name queries needed by the server. Note that the contents of this file are NOT @@ -201,7 +201,7 @@ and /etc/samba/smb.conf. When run as a WINS server (see the - wins support + parameter in the smb.conf 5 man page), nmbd @@ -210,7 +210,7 @@ wherever Samba was configured to install itself. If nmbd is acting as a - browse master (see the local master + browse master (see the parameter in the smb.conf 5 man page, nmbd will store the browsing database in the file browse.dat diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml index 84799ee75d..85052fb71a 100644 --- a/docs/manpages/ntlm_auth.1.xml +++ b/docs/manpages/ntlm_auth.1.xml @@ -160,7 +160,7 @@ Username The username, expected to be in - Samba's unix charset. + Samba's . Username: bob @@ -170,7 +170,7 @@ Username The user's domain, expected to be in - Samba's unix charset. + Samba's . Domain: WORKGROUP @@ -182,7 +182,7 @@ The fully qualified username, expected to be in Samba's unix charset and qualified with the - winbind separator. + . Full-Username: WORKGROUP\bob diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml index ecb70d917a..041cc75b98 100644 --- a/docs/manpages/pdbedit.8.xml +++ b/docs/manpages/pdbedit.8.xml @@ -257,7 +257,7 @@ retype new password pdbedit does not call the unix password syncronisation - script if unix password sync + script if has been set. It only updates the data in the Samba user database. diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml index 00448dc5bb..1c19878de0 100644 --- a/docs/manpages/rpcclient.1.xml +++ b/docs/manpages/rpcclient.1.xml @@ -54,7 +54,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 line from smb.conf 5. diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages/smb.conf.5.xml index 149ea3d382..57a5d62bc0 100644 --- a/docs/manpages/smb.conf.5.xml +++ b/docs/manpages/smb.conf.5.xml @@ -105,8 +105,8 @@ [foo] - path/home/bar - read onlyread only = no + /home/bar + read only = no The following sample section defines a printable share. @@ -118,10 +118,10 @@ [aprinter] - path/usr/spool/public - read onlyyes - printableyes - guest okyes + /usr/spool/public + yes + yes + yes @@ -188,7 +188,7 @@ [homes] - read onlyno + no An important point is that if guest access is specified @@ -250,9 +250,9 @@ [printers] - path/usr/spool/public - guest okyes - printableyes + /usr/spool/public + yes + yes All aliases given for a printer in the printcap file diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml index 8b7007b1be..3f5755c2da 100644 --- a/docs/manpages/smbd.8.xml +++ b/docs/manpages/smbd.8.xml @@ -136,7 +136,7 @@ -p <port number(s)> port number(s) is a space or comma-separated list of TCP ports smbd should listen on. - The default value is taken from the ports parameter in &smb.conf; + The default value is taken from the parameter in &smb.conf; The default ports are 139 (used for SMB over NetBIOS over TCP) and port 445 (used for plain SMB over TCP). @@ -225,7 +225,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 restrictions smb.conf + by the limitations of the SMB protocol and the smb.conf 5 paramater. When this is set, the following restrictions apply: diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml index 0e41ae9410..fa2ed9e9b8 100644 --- a/docs/manpages/smbpasswd.8.xml +++ b/docs/manpages/smbpasswd.8.xml @@ -313,7 +313,7 @@ This parameter is only available if Samba has been compiled with LDAP support. The -w switch is used to specify the password to be used with the - ldap admin dn. Note that the password is stored in + . 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 diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml index dd98cfd8e5..1ad8a6ff1e 100644 --- a/docs/manpages/winbindd.8.xml +++ b/docs/manpages/winbindd.8.xml @@ -42,8 +42,8 @@ service to smbd, ntlm_auth and the pam_winbind.so PAM module, by managing connections to domain controllers. In this configuraiton the - idmap uid and - idmap gid + and + parameters are not required. (This is known as `netlogon proxy only mode'.) The Name Service Switch allows user @@ -229,25 +229,25 @@ hosts: files wins - winbind separator + - idmap uid + - idmap gid + - idmap backend + - winbind cache time + - winbind enum users + - winbind enum groups + - template homedir + - template shell + - winbind use default domain + -- cgit