[deployment-guide/comm-rel: 470/727] partially updated the Samba chapter

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 13:04:22 UTC 2010


commit aca86a00173277a53948474c32e7566bea40d065
Author: Martin Prpic <mprpic at redhat.com>
Date:   Tue Aug 24 14:10:08 2010 +0200

    partially updated the Samba chapter

 en-US/Samba.xml |  114 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 68 insertions(+), 46 deletions(-)
---
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 98e46fb..1ea48d0 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -15,7 +15,7 @@
     <see>Samba</see>
   </indexterm>
   <para>
-    <firstterm>Samba</firstterm> is an open source implementation of the Server Message Block (SMB) protocol. It allows the networking of Microsoft <trademark
+    <firstterm>Samba</firstterm> is an open source implementation of the <firstterm>Server Message Block</firstterm> (SMB) protocol. It allows the networking of Microsoft <trademark
       class="registered">Windows</trademark>, Linux, UNIX, and other operating systems together, enabling access to Windows-based file and printer shares. Samba's use of SMB allows it to appear as a Windows server to Windows clients.</para>
   <section
     id="samba-rgs-overview">
@@ -28,13 +28,13 @@
     <para>The third major release of Samba, version 3.0.0, introduced numerous improvements from prior versions, including:</para>
     <itemizedlist>
       <listitem>
-        <para>The ability to join an Active Directory domain by means of LDAP and Kerberos</para>
+        <para>The ability to join an Active Directory domain by means of the <firstterm>Lightweight Directory Access Protocol</firstterm> (LDAP) and <firstterm>Kerberos</firstterm></para>
       </listitem>
       <listitem>
         <para>Built in Unicode support for internationalization</para>
       </listitem>
       <listitem>
-        <para>Support for Microsoft Windows XP Professional client connections to Samba servers without needing local registry hacking</para>
+        <para>Support for all recent Microsoft Windows server and client versions to connect to Samba servers without needing local registry hacking</para>
       </listitem>
       <listitem>
         <para>Two new documents developed by the Samba.org team, which include a 400+ page reference manual, and a 300+ page implementation and integration manual. For more information about these published titles, refer to <xref
@@ -62,20 +62,20 @@
           <para>Authenticate Windows domain logins</para>
         </listitem>
         <listitem>
-          <para>Provide Windows Internet Name Service (WINS) name server resolution</para>
+          <para>Provide <firstterm>Windows Internet Name Service</firstterm> (WINS) name server resolution</para>
         </listitem>
         <listitem>
           <para>Act as a Windows <trademark
-              class="registered">NT</trademark>-style Primary Domain Controller (PDC)</para>
+              class="registered">NT</trademark>-style <firstterm>Primary Domain Controller</firstterm> (PDC)</para>
         </listitem>
         <listitem>
-          <para>Act as a Backup Domain Controller (BDC) for a Samba-based PDC</para>
+          <para>Act as a <firstterm>Backup Domain Controller</firstterm> (BDC) for a Samba-based PDC</para>
         </listitem>
         <listitem>
           <para>Act as an Active Directory domain member server</para>
         </listitem>
         <listitem>
-          <para>Join a Windows NT/2000/2003 PDC</para>
+          <para>Join a Windows NT/2000/2003/2008 PDC</para>
         </listitem>
       </itemizedlist>
       <para>What Samba cannot do:</para>
@@ -107,7 +107,7 @@
         <secondary>daemon</secondary>
         <tertiary>overview</tertiary>
       </indexterm>
-      <para>Samba is comprised of three daemons (<command>smbd</command>, <command>nmbd</command>, and <command>winbindd</command>). Two services (<command>smb</command> and <command>windbind</command>) control how the daemons are started, stopped, and other service-related features. Each daemon is listed in detail, as well as which specific service has control over it.</para>
+      <para>Samba is comprised of three daemons (<command>smbd</command>, <command>nmbd</command>, and <command>winbindd</command>). Three services (<command>smb</command>, <command>nmbd</command>, and <command>winbind</command>) control how the daemons are started, stopped, and other service-related features. These services act as different init scripts. Each daemon is listed in detail below, as well as which specific service has control over it.</para>
       <formalpara
         id="s3-samba-daemon-smbd">
         <title>
@@ -135,7 +135,7 @@
         </indexterm>
         <para>The <command>nmbd</command> server daemon understands and replies to NetBIOS name service requests such as those produced by SMB/CIFS in Windows-based systems. These systems include Windows 95/98/ME, Windows NT, Windows 2000, Windows XP, and LanManager clients. It also participates in the browsing protocols that make up the Windows <guilabel>Network Neighborhood</guilabel> view. The default port that the server listens to for NMB traffic is UDP port 137.</para>
       </formalpara>
-      <para>The <command>nmbd</command> daemon is controlled by the <command>smb</command> service.</para>
+      <para>The <command>nmbd</command> daemon is controlled by the <command>nmdb</command> service.</para>
       <formalpara
         id="s3-samba-daemon-winbindd">
         <title>
@@ -147,9 +147,9 @@
           <secondary>daemon</secondary>
           <tertiary>winbindd</tertiary>
         </indexterm>
-        <para>The <command>winbind</command> service resolves user and group information on a server running Windows NT 2000 or Windows Server 2003. This makes Windows user / group information understandable by UNIX platforms. This is achieved by using Microsoft RPC calls, Pluggable Authentication Modules (PAM), and the Name Service Switch (NSS). This allows Windows NT domain users to appear and operate as UNIX users on a UNIX machine. Though bundled with the Samba distribution, the <command>winbind</command> service is controlled separately from the <command>smb</command> service.</para>
+        <para>The <command>winbind</command> service resolves user and group information on a server running Windows NT, 2000, 2003 or Windows Server 2008. This makes Windows user / group information understandable by UNIX platforms. This is achieved by using Microsoft RPC calls, Pluggable Authentication Modules (PAM), and the Name Service Switch (NSS). This allows Windows NT domain users to appear and operate as UNIX users on a UNIX machine. Though bundled with the Samba distribution, the <command>winbind</command> service is controlled separately from the <command>smb</command> service.</para>
       </formalpara>
-      <para>The <command>winbindd</command> daemon is controlled by the <command>winbind</command> service and does not require the <command>smb</command> service to be started in order to operate. Winbindd is also used when Samba is an Active Directory member, and may also be used on a Samba domain controller (to implement nested groups and/or interdomain trust). Because <command>winbind</command> is a client-side service used to connect to Windows NT-based servers, further discussion of <command>winbind</command> is beyond the scope of this manual.</para>
+      <para>The <command>winbindd</command> daemon is controlled by the <command>winbind</command> service and does not require the <command>smb</command> service to be started in order to operate. <command>winbindd</command> is also used when Samba is an Active Directory member, and may also be used on a Samba domain controller (to implement nested groups and/or interdomain trust). Because <command>winbind</command> is a client-side service used to connect to Windows NT-based servers, further discussion of <command>winbind</command> is beyond the scope of this manual.</para>
       <note>
         <title>Note</title>
         <para>You may refer to <xref
@@ -270,7 +270,7 @@
         <tertiary>mounting</tertiary>
       </indexterm>
       <para>Sometimes it is useful to mount a Samba share to a directory so that the files in the directory can be treated as if they are part of the local file system.</para>
-      <para>To mount a Samba share to a directory, create create a directory to mount it to (if it does not already exist), and execute the following command as root:</para>
+      <para>To mount a Samba share to a directory, create a directory to mount it to (if it does not already exist), and execute the following command as root:</para>
       <screen>
 <command>mount -t cifs -o <replaceable>&lt;username&gt;</replaceable>,<replaceable>&lt;password&gt;</replaceable> //<replaceable>&lt;servername&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable>
           <replaceable>/mnt/point/</replaceable>
@@ -854,7 +854,7 @@ password server = kerberos.example.com
             <para>Association of the member server to the Active Directory domain</para>
           </listitem>
         </itemizedlist>
-        <para>To create the machine account and join the Windows 2000/2003 Active Directory, Kerberos must first be initialized for the member server wishing to join the Active Directory domain. To create an administrative Kerberos ticket, type the following command as root on the member server:</para>
+        <para>To create the machine account and join the Windows 2000/2003/2008 Active Directory, Kerberos must first be initialized for the member server wishing to join the Active Directory domain. To create an administrative Kerberos ticket, type the following command as root on the member server:</para>
         <screen>
 <userinput>kinit administrator at EXAMPLE.COM</userinput>
 </screen>
@@ -872,7 +872,7 @@ password server = kerberos.example.com
         <para>Since the machine <command>windows1</command> was automatically found in the corresponding Kerberos realm (the <command>kinit</command> command succeeded), the <command>net</command> command connects to the Active Directory server using its required administrator account and password. This creates the appropriate machine account on the Active Directory and grants permissions to the Samba domain member server to join the domain.</para>
         <note>
           <title>Note</title>
-          <para>Since <command>security = ads</command> and not <command>security = user</command> is used, a local password backend such as <filename>smbpasswd</filename> is not needed. Older clients that do not support <command>security = ads</command> are authenticated as if <command>security = domain</command> had been set. This change does not affect functionality and allows local users not previously in the domain.</para>
+          <para>Since <command>security = ads</command> and not <command>security = user</command> is used, a local password back end such as <filename>smbpasswd</filename> is not needed. Older clients that do not support <command>security = ads</command> are authenticated as if <command>security = domain</command> had been set. This change does not affect functionality and allows local users not previously in the domain.</para>
         </note>
       </section>
       <section
@@ -902,7 +902,7 @@ force user = docsbot
 force group = users
 guest ok = Yes
 </screen>
-        <para>Having Samba as a domain member server can be useful in many situations. There are times where the Samba server can have other uses besides file and printer sharing. It may be beneficial to make Samba a domain member server in instances where Linux-only applications are required for use in the domain environment. Administrators appreciate keeping track of all machines in the domain, even if not Windows-based. In the event the Windows-based server hardware is deprecated, it is quite easy to modify the <command>smb.conf</command> file to convert the server to a Samba-based PDC. If Windows NT-based servers are upgraded to Windows 2000/2003, the <command>smb.conf</command> file is easily modifiable to incorporate the infrastructure change to Active Directory if needed.</para>
+        <para>Having Samba as a domain member server can be useful in many situations. There are times where the Samba server can have other uses besides file and printer sharing. It may be beneficial to make Samba a domain member server in instances where Linux-only applications are required for use in the domain environment. Administrators appreciate keeping track of all machines in the domain, even if not Windows-based. In the event the Windows-based server hardware is deprecated, it is quite easy to modify the <command>smb.conf</command> file to convert the server to a Samba-based PDC. If Windows NT-based servers are upgraded to Windows 2000/2003/2008, the <command>smb.conf</command> file is easily modifiable to incorporate the infrastructure change to Active Directory if needed.</para>
         <important>
           <title>Important</title>
           <para>After configuring the <command>smb.conf</command> file, join the domain <emphasis>before</emphasis> starting Samba by typing the following command as root:</para>
@@ -941,20 +941,20 @@ guest ok = Yes
           <tertiary>PDC using <command>tdbsam</command>
           </tertiary>
         </indexterm>
-        <para>The simplest and most common implementation of a Samba PDC uses the <command>tdbsam</command> password database backend. Planned to replace the aging <command>smbpasswd</command> backend, <command>tdbsam</command> has numerous improvements that are explained in more detail in <xref
-            linkend="s1-samba-account-info-dbs"/>. The <command>passdb backend</command> directive controls which backend is to be used for the PDC.</para>
+        <para>The simplest and most common implementation of a Samba PDC uses the new default <command>tdbsam</command> password database back end. Replacing the aging <command>smbpasswd</command> back end, <command>tdbsam</command> has numerous improvements that are explained in more detail in <xref
+            linkend="s1-samba-account-info-dbs"/>. The <command>passdb backend</command> directive controls which back end is to be used for the PDC.</para>
         <screen>
 [global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 passdb backend = tdbsam
 security = user
-add user script = /usr/sbin/useradd -m %u
-delete user script = /usr/sbin/userdel -r %u
-add group script = /usr/sbin/groupadd %g
-delete group script = /usr/sbin/groupdel %g
-add user to group script = /usr/sbin/usermod -G %g %u
-add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null  -g machines %u
+add user script = /usr/sbin/useradd -m "%u"
+delete user script = /usr/sbin/userdel -r "%u"
+add group script = /usr/sbin/groupadd "%g"
+delete group script = /usr/sbin/groupdel "%g"
+add user to group script = /usr/sbin/usermod -G "%g" "%u"
+add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null  -g machines "%u"
 # The following specifies the default logon script
 # Per user logon scripts can be specified in the user
 # account using pdbedit logon script = logon.bat
@@ -988,7 +988,7 @@ domain master = Yes
 </screen>
         <note>
           <title>Note</title>
-          <para>If you need more than one domain controller or have more than 250 users, do <emphasis>not</emphasis> use a <command>tdbsam</command> authentication backend. LDAP is recommended in these cases.</para>
+          <para>If you need more than one domain controller or have more than 250 users, do <emphasis>not</emphasis> use a <command>tdbsam</command> authentication back end. LDAP is recommended in these cases.</para>
         </note>
       </section>
 			<!-- RHEL5:  	tech edit: cut these!
@@ -1227,15 +1227,15 @@ security = share
       <primary>Samba</primary>
       <secondary>Account Information Databases</secondary>
     </indexterm>
-    <para>The latest release of Samba offers many new features including new password database backends not previously available. Samba version 3.0.0 fully supports all databases used in previous versions of Samba. However, although supported, many backends may not be suitable for production use.</para>
-    <para>The following is a list different backends you can use with Samba. Other backends not listed here may also be available.</para>
+    <para>The latest release of Samba offers many new features including new password database back ends not previously available. Samba version 3.0.0 fully supports all databases used in previous versions of Samba. However, although supported, many back ends may not be suitable for production use.</para>
+    <para>The following is a list different back ends you can use with Samba. Other back ends not listed here may also be available.</para>
 		<!-- RHEL5:  	tech review: merge 2 sections!
 	<section id="s2-samba-backwardcompat-backends">
 			<title>Backward Compatible Backends</title> -->
     <indexterm
       significance="normal">
       <primary>Samba</primary>
-      <secondary>Backward Compatible Database Backends</secondary>
+      <secondary>Backward Compatible Database Back Ends</secondary>
     </indexterm>
     <indexterm
       significance="normal">
@@ -1262,7 +1262,7 @@ security = share
     <indexterm
       significance="normal">
       <primary>Samba</primary>
-      <secondary>New Database Backends</secondary>
+      <secondary>New Database Back Ends</secondary>
     </indexterm>
     <indexterm
       significance="normal">
@@ -1300,7 +1300,7 @@ security = share
       <varlistentry>
         <term>Plain Text</term>
         <listitem>
-          <para>Plain text backends are nothing more than the <command>/etc/passwd</command> type backends. With a plain text backend, all usernames and passwords are sent unencrypted between the client and the Samba server. This method is very unsecure and is not recommended for use by any means. It is possible that different Windows clients connecting to the Samba server with plain text passwords cannot support such an authentication method.</para>
+          <para>Plain text back ends are nothing more than the <command>/etc/passwd</command> type back ends. With a plain text back end, all usernames and passwords are sent unencrypted between the client and the Samba server. This method is very unsecure and is not recommended for use by any means. It is possible that different Windows clients connecting to the Samba server with plain text passwords cannot support such an authentication method.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1308,7 +1308,7 @@ security = share
           <command>smbpasswd</command>
         </term>
         <listitem>
-          <para>A popular backend used in previous Samba packages, the <command>smbpasswd</command> backend utilizes a plain ASCII text layout that includes the MS Windows LanMan and NT account, and encrypted password information. The <command>smbpasswd</command> backend lacks the storage of the Windows NT/2000/2003 SAM extended controls. The <command>smbpasswd</command> backend is not recommended because it does not scale well or hold any Windows information, such as RIDs for NT-based groups. The <command>tdbsam</command> backend solves these issues for use in a smaller database (250 users), but is still not an enterprise-class solution. <!-- RHEL5:  	tech review: cut!
+          <para>A popular back end used in previous Samba packages, the <command>smbpasswd</command> back end utilizes a plain ASCII text layout that includes the MS Windows LanMan and NT account, and encrypted password information. The <command>smbpasswd</command> back end lacks the storage of the Windows NT/2000/2003 SAM extended controls. The <command>smbpasswd</command> back end is not recommended because it does not scale well or hold any Windows information, such as RIDs for NT-based groups. The <command>tdbsam</command> back end solves these issues for use in a smaller database (250 users), but is still not an enterprise-class solution. <!-- RHEL5:  	tech review: cut!
 							<warning>
 								<title>Warning</title>
 								<para>This type of backend may be deprecated for future releases and replaced by the <command>tdbsam</command> backend, which does include the SAM extended controls.</para>
@@ -1321,7 +1321,7 @@ security = share
           <command>ldapsam_compat</command>
         </term>
         <listitem>
-          <para>The <command>ldapsam_compat</command> backend allows continued OpenLDAP support for use with upgraded versions of Samba. This option normally used when migrating to Samba 3.0.</para>
+          <para>The <command>ldapsam_compat</command> back end allows continued OpenLDAP support for use with upgraded versions of Samba. This option is normally used when migrating to Samba 3.0.</para>
         </listitem>
       </varlistentry>
 			<!-- RHEL5:  	tech review: merge!
@@ -1335,8 +1335,8 @@ security = share
           <command>tdbsam</command>
         </term>
         <listitem>
-          <para>The <command>tdbsam</command> backend provides an ideal database backend for local servers, servers that do not need built-in database replication, and servers that do not require the scalability or complexity of LDAP. The <command>tdbsam</command> backend includes all of the <command>smbpasswd</command> database information as well as the previously-excluded SAM information. The inclusion of the extended SAM data allows Samba to implement the same account and system access controls as seen with Windows NT/2000/2003-based systems.</para>
-          <para>The <command>tdbsam</command> backend is recommended for 250 users at most. Larger organizations should require Active Directory or LDAP integration due to scalability and possible network infrastructure concerns.</para>
+          <para>The new default <command>tdbsam</command> password back end provides an ideal database back end for local servers, servers that do not need built-in database replication, and servers that do not require the scalability or complexity of LDAP. The <command>tdbsam</command> back end includes all of the <command>smbpasswd</command> database information as well as the previously-excluded SAM information. The inclusion of the extended SAM data allows Samba to implement the same account and system access controls as seen with Windows NT/2000/2003/2008-based systems.</para>
+          <para>The <command>tdbsam</command> back end is recommended for 250 users at most. Larger organizations should require Active Directory or LDAP integration due to scalability and possible network infrastructure concerns.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1344,29 +1344,31 @@ security = share
           <command>ldapsam</command>
         </term>
         <listitem>
-          <para>The <command>ldapsam</command> backend provides an optimal distributed account installation method for Samba. LDAP is optimal because of its ability to replicate its database to any number of servers using the OpenLDAP <command>slurpd</command> daemon. LDAP databases are light-weight and scalable, and as such are preferred by large enterprises.</para>
-          <para>If you are upgrading from a previous version of Samba to 3.0, note that the <filename>/usr/share/doc/samba-<replaceable>&lt;version&gt;</replaceable>/LDAP/samba.schema</filename> has changed. This file contains the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> backend will need in order to function properly.</para>
-          <para>As such, if you are using the <command>ldapsam</command> backend for your Samba server, you will need to configure <command>slapd</command> to include this schema file. Refer to <xref
+          <para>The <command>ldapsam</command> back end provides an optimal distributed account installation method for Samba. LDAP is optimal because of its ability to replicate its database to any number of servers using the OpenLDAP <command>slurpd</command> daemon. LDAP databases are light-weight and scalable, and as such are preferred by large enterprises.</para>
+          <para>If you are upgrading from a previous version of Samba to 3.0, note that the <filename>/usr/share/doc/samba-<replaceable>&lt;version&gt;</replaceable>/LDAP/samba.schema</filename> has changed. This file contains the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> back end will need in order to function properly.</para>
+          <para>As such, if you are using the <command>ldapsam</command> back end for your Samba server, you will need to configure <command>slapd</command> to include this schema file. Refer to <xref
               linkend="s1-ldap-files-schemas"/> for directions on how to do this.</para>
           <note>
             <title>Note</title>
-            <para>You will need to have the <filename>openldap-server</filename> package installed if you want to use the <command>ldapsam</command> backend.</para>
+            <para>You will need to have the <filename>openldap-server</filename> package installed if you want to use the <command>ldapsam</command> back end.</para>
           </note>
 					<!-- RHEL5:  	tech review: cut!
 							perfect for most organizations, especially large enterprises. LDAP is definitely the "wave of the future" with regards to Samba. Improvements to LDAP are
 							constantly being added into Samba such as easing installation and configuration issues.</para> -->
         </listitem>
       </varlistentry>
-      <varlistentry>
+<!-- RHEL6 mprpic: mysqlsam passdb module has been unmaintained and got removed from samba
+	entirely.
+	      <varlistentry>
         <term>
           <command>mysqlsam</command>
         </term>
         <listitem>
           <para>The <command>mysqlsam</command> backend uses a MySQL-based database backend. This is useful for sites that already implement MySQL. At present, <command>mysqlsam</command> is now packed in a module separate from Samba, and as such is not officially supported by Samba.</para>
-					<!-- RHEL5:  	ddomingo at redhat.com: above replaces below as per fenlason at redhat.com
-						<para>The <command>mysqlsam</command> backend uses a MySQL-based database backend. This is useful for sites that already implement MySQL.</para> -->
+					RHEL5:  	ddomingo at redhat.com: above replaces below as per fenlason at redhat.com
+						<para>The <command>mysqlsam</command> backend uses a MySQL-based database backend. This is useful for sites that already implement MySQL.</para>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 			<!-- RHEL5:  	ddomingo at redhat.com: removed, as per fenlason at redhat.com
 				<varlistentry>
 					<term><command>xmlsam</command></term>
@@ -1472,7 +1474,7 @@ os level = 0</screen>
         <tertiary>WINS</tertiary>
       </indexterm>
       <para>Either a Samba server or a Windows NT server can function as a WINS server. When a WINS server is used with NetBIOS enabled, UDP unicasts can be routed which allows name resolution across networks. Without a WINS server, the UDP broadcast is limited to the local subnet and therefore cannot be routed to other subnets, workgroups, or domains. If WINS replication is necessary, do not use Samba as your primary WINS server, as Samba does not currently support WINS replication.</para>
-      <para>In a mixed NT/2000/2003 server and Samba environment, it is recommended that you use the Microsoft WINS capabilities. In a Samba-only environment, it is recommended that you use <emphasis>only one</emphasis> Samba server for WINS.</para>
+      <para>In a mixed NT/2000/2003/2008 server and Samba environment, it is recommended that you use the Microsoft WINS capabilities. In a Samba-only environment, it is recommended that you use <emphasis>only one</emphasis> Samba server for WINS.</para>
       <para>The following is an example of the <filename>smb.conf</filename> file in which the Samba server is serving as a WINS server:</para>
       <screen>
 [global]
@@ -1514,7 +1516,6 @@ printcap name = cups
 [printers]
 comment = All Printers
 path = /var/spool/samba
-printer = IBMInfoP
 browseable = No
 public = Yes
 guest ok = Yes
@@ -1710,7 +1711,7 @@ querying trek on 10.1.59.255
         </command>
       </para>
     </formalpara>
-    <para>The <command>pdbedit</command> program manages accounts located in the SAM database. All backends are supported including <filename>smbpasswd</filename>, LDAP, NIS+, and the <filename>tdb</filename> database library.</para>
+    <para>The <command>pdbedit</command> program manages accounts located in the SAM database. All back ends are supported including <filename>smbpasswd</filename>, LDAP, and the <filename>tdb</filename> database library.</para>
     <para>The following are examples of adding, deleting, and listing users:</para>
     <screen>
 <userinput>pdbedit -a kristin</userinput>
@@ -1814,7 +1815,7 @@ andriusb:505: lisa:504: kristin:506:
         </command>
       </para>
     </formalpara>
-    <para>The <command>smbcacls</command> program modifies Windows ACLs on files and directories shared by the Samba server.</para>
+    <para>The <command>smbcacls</command> program modifies Windows ACLs on files and directories shared by a Samba server or a Windows server.</para>
 		<!-- RHEL5:  		</section> -->
     <formalpara
       id="s2-samba-programs-smbclient">
@@ -1868,7 +1869,7 @@ andriusb:505: lisa:504: kristin:506:
       <command>smbcontrol <replaceable>&lt;options&gt; &lt;destination&gt; &lt;messagetype&gt; &lt;parameters&gt;</replaceable>
       </command>
     </para>
-    <para>The <command>smbcontrol</command> program sends control messages to running <command>smbd</command> or <command>nmbd</command> daemons. Executing <command>smbcontrol -i</command> runs commands interactively until a blank line or a 'q' is entered.</para>
+    <para>The <command>smbcontrol</command> program sends control messages to running <command>smbd</command>, <command>nmbd</command>, or <command>winbindd</command> daemons. Executing <command>smbcontrol -i</command> runs commands interactively until a blank line or a <parameter>'q'</parameter> is entered.</para>
 		<!-- RHEL5:  		</section> --><!-- RHEL5:  	tech review: remove!
 		<formalpara id="s2-samba-programs-smbgroupedit">
 			<title><filename>smbgroupedit</filename></title>
@@ -2131,7 +2132,28 @@ Press enter to see a dump of your service definitions
         <listitem>
           <para>
             <filename>/usr/share/doc/samba-&lt;<replaceable>version-number</replaceable>&gt;/</filename> — All additional files included with the Samba distribution. This includes all helper scripts, sample configuration files, and documentation.</para>
+            <note>
+              <title>Note: Installing the samba-doc package</title>
+              <para>In order to the Samba documentation, first ensure the samba-doc package is installed on your system by running, as root:</para>
+              <screen>~]#&#160;<command>yum install samba-doc</command></screen>
+              <para>For more information on installing packages with Yum, refer to <xref linkend="sec-Installing"/>.</para>
+            </note>
           <para>This directory also contains online versions of <citetitle>The Official Samba-3 HOWTO-Collection</citetitle> and <citetitle>Samba-3 by Example</citetitle>, both of which are cited below.</para>
+          <para>
+            Refer to the following man pages for detailed information:
+          </para>
+          <itemizedlist>
+            <listitem>
+              <para>
+                man Y
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                man X
+              </para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
     </section>


More information about the docs-commits mailing list