[deployment-guide] Updated the "Samba" section for Fedora 15.

Jaromir Hradilek jhradile at fedoraproject.org
Sat May 21 22:57:47 UTC 2011


commit 6ffd1d829fe34afa24dcb615417da7ad5829e20e
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Sun May 22 00:57:42 2011 +0200

    Updated the "Samba" section for Fedora 15.

 en-US/Samba.xml                        |  995 +++++++++++++-------------------
 en-US/images/samba-nautilus-domain.png |  Bin 0 -> 83671 bytes
 2 files changed, 399 insertions(+), 596 deletions(-)
---
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 9b0b2d6..2f30661 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -18,8 +18,8 @@
       class="registered">Windows</trademark>, Linux, UNIX, and other operating systems together, enabling access to Windows-based file and printer shares. Samba's use of <systemitem class="protocol">SMB</systemitem> allows it to appear as a Windows server to Windows clients.</para>
       <note>
         <title>Installing the samba package</title>
-        <para>In order to use <application>Samba</application>, first ensure the <package>samba</package> package is installed on your system by running, as root:</para>
-        <screen>~]#&#160;<command>yum install samba</command></screen>
+        <para>In order to use <application>Samba</application>, first ensure the <package>samba</package> package is installed on your system by running, as <systemitem class="username">root</systemitem>:</para>
+        <screen><command>yum install samba</command></screen>
         <para>For more information on installing packages with Yum, refer to <xref linkend="sec-Installing"/>.</para>
       </note>
       
@@ -114,47 +114,38 @@
         <tertiary>overview</tertiary>
       </indexterm>
       <para>Samba is comprised of three daemons (<command>smbd</command>, <command>nmbd</command>, and <command>winbindd</command>). Three services (<command>smb</command>, <command>nmb</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="s4-samba-daemon-smbd">
-        <title>
-          <command>smbd</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <secondary>daemon</secondary>
-          <tertiary>smbd</tertiary>
-        </indexterm>
-        <para>The <command>smbd</command> server daemon provides file sharing and printing services to Windows clients. In addition, it is responsible for user authentication, resource locking, and data sharing through the <systemitem class="protocol">SMB</systemitem> protocol. The default ports on which the server listens for <systemitem class="protocol">SMB</systemitem> traffic are <systemitem class="protocol">TCP</systemitem> ports <constant>139</constant> and <constant>445</constant>.</para>
-      </formalpara>
+      <bridgehead id="s4-samba-daemon-smbd">
+        <command>smbd</command>
+      </bridgehead>
+      <indexterm
+        significance="normal">
+        <primary>Samba</primary>
+        <secondary>daemon</secondary>
+        <tertiary>smbd</tertiary>
+      </indexterm>
+      <para>The <command>smbd</command> server daemon provides file sharing and printing services to Windows clients. In addition, it is responsible for user authentication, resource locking, and data sharing through the <systemitem class="protocol">SMB</systemitem> protocol. The default ports on which the server listens for <systemitem class="protocol">SMB</systemitem> traffic are <systemitem class="protocol">TCP</systemitem> ports <constant>139</constant> and <constant>445</constant>.</para>
       <para>The <command>smbd</command> daemon is controlled by the <command>smb</command> service.</para>
-      <formalpara
-        id="s4-samba-daemon-nmbd">
-        <title>
-          <command>nmbd</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <secondary>daemon</secondary>
-          <tertiary>nmbd</tertiary>
-        </indexterm>
-        <para>The <command>nmbd</command> server daemon understands and replies to NetBIOS name service requests such as those produced by SMB/<firstterm>Common Internet File System</firstterm> (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 <systemitem class="protocol">NMB</systemitem> traffic is <systemitem class="protocol">UDP</systemitem> port <systemitem class="constant">137</systemitem>.</para>
-      </formalpara>
+      <bridgehead id="s4-samba-daemon-nmbd">
+        <command>nmbd</command>
+      </bridgehead>
+      <indexterm
+        significance="normal">
+        <primary>Samba</primary>
+        <secondary>daemon</secondary>
+        <tertiary>nmbd</tertiary>
+      </indexterm>
+      <para>The <command>nmbd</command> server daemon understands and replies to NetBIOS name service requests such as those produced by SMB/<firstterm>Common Internet File System</firstterm> (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 <systemitem class="protocol">NMB</systemitem> traffic is <systemitem class="protocol">UDP</systemitem> port <systemitem class="constant">137</systemitem>.</para>
       <para>The <command>nmbd</command> daemon is controlled by the <command>nmb</command> service.</para>
-      <formalpara
-        id="s4-samba-daemon-winbindd">
-        <title>
-          <command>winbindd</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <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, 2003 or Windows Server 2008. This makes Windows user / group information understandable by UNIX platforms. This is achieved by using Microsoft RPC calls, <firstterm>Pluggable Authentication Modules</firstterm> (PAM), and the <firstterm>Name Service Switch</firstterm> (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>
+      <bridgehead id="s4-samba-daemon-winbindd">
+        <command>winbindd</command>
+      </bridgehead>
+      <indexterm
+        significance="normal">
+        <primary>Samba</primary>
+        <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, 2003 or Windows Server 2008. This makes Windows user / group information understandable by UNIX platforms. This is achieved by using Microsoft RPC calls, <firstterm>Pluggable Authentication Modules</firstterm> (PAM), and the <firstterm>Name Service Switch</firstterm> (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>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 chapter.</para>
       <note>
         <title>Obtaining a list of utilities that are shipped with Samba</title>
@@ -174,50 +165,22 @@
       <secondary>share</secondary>
       <tertiary>connecting to with Nautilus</tertiary>
     </indexterm>
-    <para>You can use <application>Nautilus</application> to view available Samba shares on your network. To view a list of Samba workgroups and domains on your network, select <menuchoice><guimenu>Places</guimenu> <guimenuitem>Network</guimenuitem></menuchoice> from the GNOME panel, and select your desired network. You can also type <userinput>smb:</userinput> in the <menuchoice><guimenu>File</guimenu> <guimenuitem>Open Location</guimenuitem></menuchoice> bar of <application>Nautilus</application> to view the workgroups/domains.</para>
-		
-    <para>As shown in <xref
-        linkend="fig-samba-nautilus-workgroups"/>, an icon appears for each available <systemitem class="protocol">SMB</systemitem> workgroup or domain on the network.</para>
-    <figure
-      float="0"
-      id="fig-samba-nautilus-workgroups">
-      <title>SMB Workgroups in Nautilus</title>
+    <para>You can use <application>Nautilus</application> to view available Samba shares on your network. To view a list of Samba workgroups and domains on your network, select <menuchoice><guimenu>Applications</guimenu><guisubmenu>Accessories</guisubmenu><guimenuitem>Files</guimenuitem></menuchoice> from the <guimenu>Activities</guimenu> menu, and click <guimenuitem>Browse Network</guimenuitem> at the sidebar.</para>
+    <figure id="fig-samba-nautilus-workgroups">
+      <title>Browsing a network in Nautilus</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="images/samba_domain.png"
-            format="PNG"
-            scalefit="1"/>
+          <imagedata fileref="images/samba-nautilus-domain.png" format="PNG" scalefit="0" />
         </imageobject>
         <textobject>
-          <para>SMB Workgroups in Nautilus</para>
+          <para>Browsing a network in Nautilus</para>
         </textobject>
       </mediaobject>
     </figure>
-    <para>Double-click one of the workgroup/domain icons to view a list of computers within the workgroup/domain.</para>
-    <figure
-      float="0"
-      id="fig-samba-nautilus-machines">
-      <title>SMB Machines in Nautilus</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata
-            fileref="images/mthelena_host.png"
-            format="PNG"
-            scalefit="1"/>
-        </imageobject>
-        <textobject>
-          <para>SMB Machines in Nautilus</para>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <para>As you can see from <xref
-        linkend="fig-samba-nautilus-machines"/>, an icon exists for each machine within the workgroup. Double-click on an icon to view the Samba shares on the machine. If a username and password combination is required, you are prompted for them.</para>
-    <para>Alternately, you can also specify the Samba server and sharename in the <guilabel>Location:</guilabel> bar for <application>Nautilus</application> using the following syntax (replace <replaceable>&lt;servername&gt;</replaceable> and <replaceable>&lt;sharename&gt;</replaceable> with the appropriate values):</para>
-    <screen>
-<command>smb://<replaceable>&lt;servername&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable>
-      </command>
-    </screen>
+    <para>An icon appears for each available <systemitem class="protocol">SMB</systemitem> workgroup or domain on the network. Double-click one of the workgroup/domain icons to view a list of computers within the workgroup/domain.</para>
+    <para>Each machine within the workgroup is represented by its own icon. Double-click on an icon to view the Samba shares on the machine. If a username and password combination is required, you are prompted for them.</para>
+    <para>Alternately, you can also specify the Samba server and sharename in the <guilabel>Location:</guilabel> bar for <application>Nautilus</application> using the following syntax (replace <replaceable>servername</replaceable> and <replaceable>sharename</replaceable> with the appropriate values):</para>
+    <screen><command>smb://<replaceable>servername</replaceable>/<replaceable>sharename</replaceable></command></screen>
     <section
       id="s3-samba-connect-share-cmdline">
       <title>Command Line</title>
@@ -255,11 +218,8 @@
         </primary>
       </indexterm>
       <para>To connect to a Samba share from a shell prompt, type the following command:</para>
-      <screen>
-<command>~]$&#160;smbclient //<replaceable>&lt;hostname&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable> -U <replaceable>&lt;username&gt;</replaceable>
-        </command>
-      </screen>
-      <para>Replace <replaceable>&lt;hostname&gt;</replaceable> with the hostname or <systemitem class="protocol">IP</systemitem> address of the Samba server you want to connect to, <replaceable>&lt;sharename&gt;</replaceable> with the name of the shared directory you want to browse, and <replaceable>&lt;username&gt;</replaceable> with the Samba username for the system. Enter the correct password or press <keycap>Enter</keycap> if no password is required for the user.</para>
+      <screen><command>smbclient //<replaceable>hostname</replaceable>/<replaceable>sharename</replaceable> -U <replaceable>username</replaceable></command></screen>
+      <para>Replace <replaceable>hostname</replaceable> with the hostname or <systemitem class="protocol">IP</systemitem> address of the Samba server you want to connect to, <replaceable>sharename</replaceable> with the name of the shared directory you want to browse, and <replaceable>username</replaceable> with the Samba username for the system. Enter the correct password or press <keycap>Enter</keycap> if no password is required for the user.</para>
       <para>If you see the <prompt>smb:\&gt;</prompt> prompt, you have successfully logged in. Once you are logged in, type <userinput>help</userinput> for a list of commands. If you wish to browse the contents of your home directory, replace <replaceable>sharename</replaceable> with your username. If the <command>-U</command> switch is not used, the username of the current user is passed to the Samba server.</para>
       <para>To exit <command>smbclient</command>, type <userinput>exit</userinput> at the <prompt>smb:\&gt;</prompt> prompt.</para>
     </section>
@@ -273,12 +233,8 @@
         <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 a directory to mount it to (if it does not already exist), and execute the following command as root:</para>
-      <screen>
-<command>~]#&#160;mount -t cifs //<replaceable>&lt;servername&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable>
-          <replaceable>/mnt/point/</replaceable> -o username=<replaceable>&lt;username&gt;</replaceable>,password=<replaceable>&lt;password&gt;</replaceable>
-        </command>
-      </screen>
+      <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 <systemitem class="username">root</systemitem>:</para>
+      <screen><command>mount -t cifs //<replaceable>servername</replaceable>/<replaceable>sharename</replaceable> <replaceable>/mnt/point/</replaceable> -o username=<replaceable>username</replaceable>,password=<replaceable>password</replaceable></command></screen>
 			<!-- RHEL5:  	tech review: above replaces below
 <screen>
 <command>mount -t cifs -o username=<replaceable>&lt;username&gt;</replaceable> password=<replaceable>&lt;password&gt;</replaceable> //<replaceable>&lt;servername&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable> <replaceable>/mnt/point/</replaceable></command>
@@ -287,12 +243,12 @@
 <screen>
 <command>mount -t  smbfs -o username=<replaceable>&lt;username&gt;</replaceable> //<replaceable>&lt;servername&gt;</replaceable>/<replaceable>&lt;sharename&gt;</replaceable> <replaceable>/mnt/point/</replaceable></command>
 </screen> -->
-      <para>This command mounts <replaceable>&lt;sharename&gt;</replaceable> from <replaceable>&lt;servername&gt;</replaceable> in the local directory <replaceable>/mnt/point/</replaceable>.
+      <para>This command mounts <replaceable>sharename</replaceable> from <replaceable>servername</replaceable> in the local directory <replaceable>/mnt/point/</replaceable>.
       </para>
       <note>
         <title>Installing cifs-utils package</title>
-        <para>The <application>mount.cifs</application> utility is a separate RPM (independent from Samba). In order to use <application>mount.cifs</application>, first ensure the <package>cifs-utils</package> package is installed on your system by running, as root:</para>
-        <screen>~]#&#160;<command>yum install cifs-utils</command></screen>
+        <para>The <application>mount.cifs</application> utility is a separate RPM (independent from Samba). In order to use <application>mount.cifs</application>, first ensure the <package>cifs-utils</package> package is installed on your system by running, as <systemitem class="username">root</systemitem>:</para>
+        <screen><command>yum install cifs-utils</command></screen>
         <para>For more information on installing packages with Yum, refer to <xref linkend="sec-Installing"/>.</para>
         <para>
           Note that the <package>cifs-utils</package> package also contains the <application>cifs.upcall</application> binary called by the kernel in order to perform kerberized CIFS mounts. For more information on <application>cifs.upcall</application>, refer to <command>man cifs.upcall</command>.
@@ -304,9 +260,9 @@
       <warning>
         <title>CIFS servers that require plain text passwords</title>
           <para>
-          Some CIFS servers require plain text passwords for authentication. Support for plain text password authentication can be enabled using the following command:
+          Some CIFS servers require plain text passwords for authentication. Support for plain text password authentication can be enabled using the following command as <systemitem class="username">root</systemitem>:
           </para>
-          <screen>~]# echo 0x37 > /proc/fs/cifs/SecurityFlags</screen>
+          <screen><command>echo 0x37 &gt; /proc/fs/cifs/SecurityFlags</command></screen>
           <para>
             WARNING: This operation can expose passwords by removing password encryption.
           </para>
@@ -547,33 +503,28 @@
         <primary>Samba</primary>
         <secondary>configuration</secondary>
       </indexterm>
-      <para>Samba uses <filename>/etc/samba/smb.conf</filename> as its configuration file. If you change this configuration file, the changes do not take effect until you restart the Samba daemon with the following command, as root:
-      <screen>~]#&#160;<command>service smb restart</command>
-      </screen>
+      <para>Samba uses <filename>/etc/samba/smb.conf</filename> as its configuration file. If you change this configuration file, the changes do not take effect until you restart the Samba daemon with the following command, as <systemitem class="username">root</systemitem>:
+      <screen><command>systemctl restart smb.service</command></screen>
       </para>
       <para>To specify the Windows workgroup and a brief description of the Samba server, edit the following lines in your <filename>/etc/samba/smb.conf</filename> file:</para>
-      <screen>
-workgroup = <replaceable>WORKGROUPNAME</replaceable>
-server string = <replaceable>BRIEF COMMENT ABOUT SERVER</replaceable>
-      </screen>
+      <programlisting>workgroup = <replaceable>WORKGROUPNAME</replaceable>
+server string = <replaceable>BRIEF COMMENT ABOUT SERVER</replaceable></programlisting>
       <para>Replace <replaceable>WORKGROUPNAME</replaceable> with the name of the Windows workgroup to which this machine should belong. The <replaceable>BRIEF COMMENT ABOUT SERVER</replaceable> is optional and is used as the Windows comment about the Samba system.</para>
       <para>To create a Samba share directory on your Linux system, add the following section to your <filename>/etc/samba/smb.conf</filename> file (after modifying it to reflect your needs and your system):</para>
-      <screen>
-[<replaceable>sharename</replaceable>]
+      <programlisting>[<replaceable>sharename</replaceable>]
 comment = <replaceable>Insert a comment here</replaceable>
 path = <replaceable>/home/share/</replaceable>
 valid users = <replaceable>tfox carole</replaceable>
 public = no
 writable = yes
 printable = no
-create mask = 0765
-</screen>
+create mask = 0765</programlisting>
       <para>The above example allows the users <command>tfox</command> and <command>carole</command> to read and write to the directory <filename>/home/share</filename>, on the Samba server, from a Samba client.</para>
     </section>
     <section
       id="s3-samba-encrypted-passwords">
       <title>Encrypted Passwords</title>
-      <para>Encrypted passwords are enabled by default because it is more secure to do so. To create a user with an encrypted password, use the command <command>smbpasswd -a <replaceable>&lt;username&gt;</replaceable>
+      <para>Encrypted passwords are enabled by default because it is more secure to do so. To create a user with an encrypted password, use the command <command>smbpasswd -a <replaceable>username</replaceable>
         </command>.</para>
       <indexterm
         significance="normal">
@@ -651,31 +602,26 @@ create mask = 0765
       <secondary>service</secondary>
       <tertiary>reloading</tertiary>
     </indexterm>
-    <para>To start a Samba server, type the following command in a shell prompt,  as root:</para>
-<screen>~]#&#160;<command>service smb start</command>
-</screen> 
+    <para>To start a Samba server, type the following command in a shell prompt,  as <systemitem class="username">root</systemitem>:</para>
+<screen><command>systemctl start smb.service</command></screen> 
     <important>
       <title>Setting up a domain member server</title>
       <para>To set up a domain member server, you must first join the domain or Active Directory using the <command>net join</command> command <emphasis>before</emphasis> starting the <command>smb</command> service.</para>
     </important>
-    <para>To stop the server, type the following command in a shell prompt, as root:</para>
-    <screen>~]#&#160;<command>service smb stop</command>
-    </screen> 
+    <para>To stop the server, type the following command in a shell prompt, as <systemitem class="username">root</systemitem>:</para>
+    <screen><command>systemctl stop smb.service</command></screen> 
     <para>The <option>restart</option> option is a quick way of stopping and then starting Samba. This is the most reliable way to make configuration changes take effect after editing the configuration file for Samba. Note that the restart option starts the daemon even if it was not running originally.</para>
-    <para>To restart the server, type the following command in a shell prompt, as root:</para>
-    <screen>~]#&#160;<command>service smb restart</command>
-    </screen> 
+    <para>To restart the server, type the following command in a shell prompt, as <systemitem class="username">root</systemitem>:</para>
+    <screen><command>systemctl restart smb.service</command></screen> 
     <para>The <option>condrestart</option> (<firstterm>conditional restart</firstterm>) option only starts <command>smb</command> on the condition that it is currently running. This option is useful for scripts, because it does not start the daemon if it is not running.</para>
     <note>
       <title>Applying the changes to the configuration</title>
       <para>When the <filename>/etc/samba/smb.conf</filename> file is changed, Samba automatically reloads it after a few minutes. Issuing a manual <command>restart</command> or <command>reload</command> is just as effective.</para>
     </note>
-    <para>To conditionally restart the server, type the following command, as root:</para>
-    <screen>~]#&#160;<command>service smb condrestart</command>
-    </screen> 
-    <para>A manual reload of the <filename>/etc/samba/smb.conf</filename> file can be useful in case of a failed automatic reload by the <command>smb</command> service. To ensure that the Samba server configuration file is reloaded without restarting the service, type the following command, as root:</para>
-    <screen>~]#&#160;<command>service smb reload</command>
-    </screen> 
+    <para>To conditionally restart the server, type the following command, as <systemitem class="username">root</systemitem>:</para>
+    <screen><command>systemctl condrestart smb.service</command></screen> 
+    <para>A manual reload of the <filename>/etc/samba/smb.conf</filename> file can be useful in case of a failed automatic reload by the <command>smb</command> service. To ensure that the Samba server configuration file is reloaded without restarting the service, type the following command, as <systemitem class="username">root</systemitem>:</para>
+    <screen><command>systemctl reload smb.service</command></screen> 
     <para>By default, the <command>smb</command> service does <emphasis>not</emphasis> start automatically at boot time. To configure Samba to start at boot time, use an initscript utility, such as <command>/sbin/chkconfig</command>, <command>/usr/sbin/ntsysv</command>, or the <application>Services Configuration Tool</application> program. Refer to <xref
         linkend="ch-Services_and_Daemons" /> for more information regarding these tools.</para>
   </section>
@@ -716,8 +662,7 @@ create mask = 0765
           <tertiary>Anonymous Read Only example</tertiary>
         </indexterm>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement anonymous read-only file sharing. The <command>security = share</command> parameter makes a share anonymous. Note, security levels for a single Samba server cannot be mixed. The <command>security</command> directive is a global Samba parameter located in the <command>[global]</command> configuration section of the <filename>/etc/samba/smb.conf</filename> file.</para>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 security = share
@@ -725,8 +670,7 @@ security = share
 comment = Documentation Samba Server
 path = /export
 read only = Yes
-guest only = Yes
-</screen>
+guest only = Yes</programlisting>
       </section>
       <section
         id="s4-samba-standalone-anonreadwrite">
@@ -742,8 +686,7 @@ guest only = Yes
           <title>Do not use anonymous read/write servers</title>
           <para>Although having an anonymous read/write server is possible, it is not recommended. Any files placed in the share space, regardless of user, are assigned the user/group combination as specified by a generic user (<command>force user</command>) and group (<command>force group</command>) in the <filename>/etc/samba/smb.conf</filename> file.</para>
         </note>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 security = share
@@ -753,8 +696,7 @@ path = /export
 force user = docsbot
 force group = users
 read only = No
-guest ok = Yes
-</screen>
+guest ok = Yes</programlisting>
       </section>
       <section
         id="s4-samba-standalone-anonprint">
@@ -766,8 +708,7 @@ guest ok = Yes
           <tertiary>Anonymous Print Server example</tertiary>
         </indexterm>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement an anonymous print server. Setting <command>browseable</command> to <command>no</command> as shown does not list the printer in Windows <guilabel>Network Neighborhood</guilabel>. Although hidden from browsing, configuring the printer explicitly is possible. By connecting to <command>DOCS_SRV</command> using NetBIOS, the client can have access to the printer if the client is also part of the <command>DOCS</command> workgroup. It is also assumed that the client has the correct local printer driver installed, as the <command>use client driver</command> directive is set to <command>Yes</command>. In this case, the Samba server has no responsibility for sharing printer drivers to the client.</para>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 security = share
@@ -781,8 +722,7 @@ path = /var/spool/samba
 guest ok = Yes
 printable = Yes
 use client driver = Yes
-browseable = Yes
-</screen>
+browseable = Yes</programlisting>
       </section>
       <section
         id="s4-samba-standalone-readwriteall">
@@ -794,8 +734,7 @@ browseable = Yes
           <tertiary>Secure File and Print Server example</tertiary>
         </indexterm>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement a secure read/write print server. Setting the <command>security</command> directive to <command>user</command> forces Samba to authenticate client connections. Notice the <command>[homes]</command> share does not have a <command>force user</command> or <command>force group</command> directive as the <command>[public]</command> share does. The <command>[homes]</command> share uses the authenticated user details for any files created as opposed to the <command>force user</command> and <command>force group</command> in <command>[public]</command>.</para>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 security = user
@@ -822,8 +761,7 @@ create mask = 0600
 guest ok = Yes
 printable = Yes
 use client driver = Yes
-browseable = Yes
-</screen>
+browseable = Yes</programlisting>
       </section>
     </section>
     <section
@@ -846,14 +784,12 @@ browseable = Yes
           <tertiary>Active Directory Member Server example</tertiary>
         </indexterm>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement an Active Directory domain member server. In this example, Samba authenticates users for services being run locally but is also a client of the Active Directory. Ensure that your kerberos <command>realm</command> parameter is shown in all caps (for example <command>realm = EXAMPLE.COM</command>). Since Windows 2000/2003/2008 requires Kerberos for Active Directory authentication, the <command>realm</command> directive is required. If Active Directory and Kerberos are running on different servers, the <command>password server</command> directive may be required to help the distinction.</para>
-        <screen>
-[global]
+        <programlisting>[global]
 realm = EXAMPLE.COM
 security = ADS
 encrypt passwords = yes
 # Optional. Use only if Samba cannot determine the Kerberos server automatically.
-password server = kerberos.example.com
-</screen>
+password server = kerberos.example.com</programlisting>
         <para>In order to join a member server to an Active Directory domain, the following steps must be completed:</para>
         <itemizedlist>
           <listitem>
@@ -869,19 +805,15 @@ 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/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>
+        <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 <systemitem class="username">root</systemitem> on the member server:</para>
+        <screen><command>kinit administrator at EXAMPLE.COM</command></screen>
 				<!-- RHEL5:   ddomingo at redhat.com: above replaces below, less confusion
 <screen>root# <userinput>kinit administrator at EXAMPLE.COM</userinput></screen>
 	 -->
         <para>
 					The <command>kinit</command> command is a Kerberos initialization script that references the Active Directory administrator account and Kerberos realm. Since Active Directory requires Kerberos tickets, <command>kinit</command> obtains and caches a Kerberos ticket-granting ticket for client/server authentication. For more information on Kerberos, the <command>/etc/krb5.conf</command> file, and the <command>kinit</command> command, refer to the <citetitle pubwork="section">Using Kerberos</citetitle> section of the &MAJOROSVER; <citetitle>Managing Single Sign-On and Smart Cards</citetitle> guide.</para> <!-- TBD6: link to the Smart Cards Guide -->
-        <para>To join an Active Directory server (windows1.example.com), type the following command as root on the member server:</para>
-        <screen>
-<userinput>net ads join -S windows1.example.com -U administrator%password</userinput>
-</screen>
+        <para>To join an Active Directory server (windows1.example.com), type the following command as <systemitem class="username">root</systemitem> on the member server:</para>
+        <screen><command>net ads join -S windows1.example.com -U administrator%password</command></screen>
 				<!-- RHEL5:   ddomingo at redhat.com: above replaces below, less confusion
 <screen>root# <userinput>net ads join -S windows1.example.com -U administrator%password</userinput></screen>  -->
         <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>
@@ -900,8 +832,7 @@ password server = kerberos.example.com
           <tertiary>NT4-style Domain Member example</tertiary>
         </indexterm>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement a Windows NT4-based domain member server. Becoming a member server of an NT4-based domain is similar to connecting to an Active Directory. The main difference is NT4-based domains do not use Kerberos in their authentication method, making the <filename>/etc/samba/smb.conf</filename> file simpler. In this instance, the Samba member server functions as a pass through to the NT4-based domain server.</para>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 security = domain
@@ -915,15 +846,12 @@ comment = Data
 path = /export
 force user = docsbot
 force group = users
-guest ok = Yes
-</screen>
+guest ok = Yes</programlisting>
         <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 <filename>/etc/samba/smb.conf</filename> file to convert the server to a Samba-based PDC. If Windows NT-based servers are upgraded to Windows 2000/2003/2008, the <filename>/etc/samba/smb.conf</filename> file is easily modifiable to incorporate the infrastructure change to Active Directory if needed.</para>
         <important>
           <title>Make sure you join the domain before starting Samba</title>
-          <para>After configuring the <filename>/etc/samba/smb.conf</filename> file, join the domain <emphasis>before</emphasis> starting Samba by typing the following command as root:</para>
-          <screen>
-<userinput>net rpc join -U administrator%password</userinput>
-</screen>
+          <para>After configuring the <filename>/etc/samba/smb.conf</filename> file, join the domain <emphasis>before</emphasis> starting Samba by typing the following command as <systemitem class="username">root</systemitem>:</para>
+          <screen><command>net rpc join -U administrator%password</command></screen>
 					<!-- RHEL5:   ddomingo at redhat.com: above replaces below, less confusion
 <screen>root# <userinput>net rpc join -U administrator%password</userinput></screen> -->
         </important>
@@ -960,8 +888,7 @@ guest ok = Yes
             linkend="s2-samba-account-info-dbs"/>. The <command>passdb backend</command> directive controls which back end is to be used for the PDC.</para>
         <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement a <command>tdbsam</command> password database back end.
         </para>
-        <screen>
-[global]
+        <programlisting>[global]
 workgroup = DOCS
 netbios name = DOCS_SRV
 passdb backend = tdbsam
@@ -1001,8 +928,7 @@ domain master = Yes
 	browseable = No
 	guest ok = Yes
 	profile acls = Yes
-# Other resource shares ... ...
-</screen>
+# Other resource shares ... ...</programlisting>
         <para>To provide a functional PDC system which uses the <command>tdbsam</command> follow these steps:</para>
         <orderedlist>
           <listitem>
@@ -1012,11 +938,8 @@ domain master = Yes
           </listitem>
           <listitem>
             <para>
-            Add the root user to the Samba password database.</para>
-<screen>
-<command>~]#&#160;smbpasswd -a root</command>
-Provide the password here.
-</screen>
+            Add the <systemitem class="username">root</systemitem> user to the Samba password database:</para>
+<screen><command>smbpasswd -a root</command></screen>
           </listitem>
           <listitem>
             <para>
@@ -1030,30 +953,24 @@ Provide the password here.
           </listitem>
           <listitem>
             <para>
-              Add groups that users can be members of.
+              Add groups that users can be members of:
             </para>
-<screen>
-<command>~]#&#160;groupadd -f users</command>
-<command>~]#&#160;groupadd -f nobody</command>
-<command>~]#&#160;groupadd -f ntadmins</command>
-</screen>
+<screen><command>groupadd -f users</command>
+<command>groupadd -f nobody</command>
+<command>groupadd -f ntadmins</command></screen>
           </listitem>
           <listitem>
             <para>
-              Associate the UNIX groups with their respective Windows groups.
-<screen>
-<command>~]#&#160;net groupmap add ntgroup="Domain Users" unixgroup=users</command>
-<command>~]#&#160;net groupmap add ntgroup="Domain Guests" unixgroup=nobody</command>
-<command>~]#&#160;net groupmap add ntgroup="Domain Admins" unixgroup=ntadmins</command>
-</screen>
+              Associate the UNIX groups with their respective Windows groups:
+<screen><command>net groupmap add ntgroup="Domain Users" unixgroup=users</command>
+<command>net groupmap add ntgroup="Domain Guests" unixgroup=nobody</command>
+<command>net groupmap add ntgroup="Domain Admins" unixgroup=ntadmins</command></screen>
             </para>
           </listitem>
           <listitem>
             <para>
               Grant access rights to a user or a group. For example, to grant the right to add client machines to the domain on a Samba domain controller, to the members to the Domain Admins group, execute the following command:
-<screen>
-<command>~]#&#160;net rpc rights grant 'DOCS\Domain Admins' SetMachineAccountPrivilege -S PDC -U root</command>
-</screen>
+<screen><command>net rpc rights grant 'DOCS\Domain Admins' SetMachineAccountPrivilege -S PDC -U root</command></screen>
             </para>
           </listitem>
         </orderedlist>
@@ -1205,12 +1122,10 @@ idmap gid = 15000-20000 ...
       </indexterm>
       <para>User-level security is the default setting for Samba. Even if the <command>security = user</command> directive is not listed in the <filename>/etc/samba/smb.conf</filename> file, it is used by Samba. If the server accepts the client's username/password, the client can then mount multiple shares without specifying a password for each instance. Samba can also accept session-based username/password requests. The client maintains multiple authentication contexts by using a unique UID for each logon.</para>
       <para>In the <filename>/etc/samba/smb.conf</filename> file, the <command>security = user</command> directive that sets user-level security is:</para>
-      <screen>
-[GLOBAL]
+      <programlisting>[GLOBAL]
 ...
 security = user
-...
-</screen>
+...</programlisting>
       <para>The following sections describe other implementations of user-level security.</para>
 			<!-- RHEL5:  	ddomingo at redhat.com: moving this closing section tag down, to nest all other User-Level Security modes; also added above para for better transition
 	</section> --><!-- RHEL5:   	ddomingo at redhat.com: <section id="s3-samba-share-level"> used to be here   -->
@@ -1224,13 +1139,11 @@ security = user
           <tertiary>Domain Security Mode</tertiary>
         </indexterm>
         <para>In domain security mode, the Samba server has a machine account (domain security trust account) and causes all authentication requests to be passed through to the domain controllers. The Samba server is made into a domain member server by using the following directives in the <filename>/etc/samba/smb.conf</filename> file:</para>
-        <screen>
-[GLOBAL]
+        <programlisting>[GLOBAL]
 ...
 security = domain
 workgroup = MARKETING
-...
-</screen>
+...</programlisting>
       </section>
       <section
         id="s3-samba-ads-security-mode">
@@ -1243,14 +1156,12 @@ workgroup = MARKETING
         </indexterm>
         <para>If you have an Active Directory environment, it is possible to join the domain as a native Active Directory member. Even if a security policy restricts the use of NT-compatible authentication protocols, the Samba server can join an ADS using Kerberos. Samba in Active Directory member mode can accept Kerberos tickets.</para>
         <para>In the <filename>/etc/samba/smb.conf</filename> file, the following directives make Samba an Active Directory member server:</para>
-        <screen>
-[GLOBAL]
+        <programlisting>[GLOBAL]
 ...
 security = ADS
 realm = EXAMPLE.COM
 password server = kerberos.example.com
-...
-</screen>
+...</programlisting>
       </section>
       <section
         id="s3-samba-server-security-mode">
@@ -1267,14 +1178,12 @@ password server = kerberos.example.com
           <para>It is highly recommended to <emphasis>not</emphasis> use this mode since there are numerous security drawbacks.</para>
         </note>
         <para>In the <filename>/etc/samba/smb.conf</filename>, the following directives enable Samba to operate in server security mode:</para>
-        <screen>
-[GLOBAL]
+        <programlisting>[GLOBAL]
 ...
 encrypt passwords = Yes
 security = server
 password server = "NetBIOS_of_Domain_Controller"
-...
-</screen>
+...</programlisting>
       </section>
 			<!-- RHEL5:   	ddomingo at redhat.com: the following section tag nests all other User-Level Security modes	  -->
     </section>
@@ -1289,12 +1198,10 @@ password server = "NetBIOS_of_Domain_Controller"
       </indexterm>
       <para>With share-level security, the server accepts only a password without an explicit username from the client. The server expects a password for each share, independent of the username. There have been recent reports that Microsoft Windows clients have compatibility issues with share-level security servers. Samba developers strongly discourage use of share-level security.</para>
       <para>In the <filename>/etc/samba/smb.conf</filename> file, the <command>security = share</command> directive that sets share-level security is:</para>
-      <screen>
-[GLOBAL]
+      <programlisting>[GLOBAL]
 ...
 security = share
-...
-</screen>
+...</programlisting>
     </section>
   </section>
   <section
@@ -1423,7 +1330,7 @@ security = share
         </term>
         <listitem>
           <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 such as the <application>Red Hat Directory Server</application> or an <application>OpenLDAP Server</application>. LDAP databases are light-weight and scalable, and as such are preferred by large enterprises. Installation and configuration of directory servers is beyond the scope of this chapter. For more information on the <application>Red Hat Directory Server</application>, refer to the <citetitle>Red Hat Directory Server 8.2 Deployment Guide</citetitle><!-- TBD6: link to the Red Hat Directory Server 8.2 DG -->. For more information on LDAP, refer to <xref linkend="s1-OpenLDAP" />.</para>
-          <para>If you are upgrading from a previous version of Samba to 3.0, note that the OpenLDAP schema file (<filename>/usr/share/doc/samba-<replaceable>&lt;version&gt;</replaceable>/LDAP/samba.schema</filename>) and the Red Hat Directory Server schema file (<filename>/usr/share/doc/samba-<replaceable>&lt;version&gt;</replaceable>/LDAP/samba-schema-FDS.ldif</filename>)  have changed. These files contain the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> back end needs in order to function properly.</para>
+          <para>If you are upgrading from a previous version of Samba to 3.0, note that the OpenLDAP schema file (<filename>/usr/share/doc/samba-<replaceable>version</replaceable>/LDAP/samba.schema</filename>) and the Red Hat Directory Server schema file (<filename>/usr/share/doc/samba-<replaceable>version</replaceable>/LDAP/samba-schema-FDS.ldif</filename>)  have changed. These files contain the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> back end needs 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 one of these schema file. Refer to <xref
               linkend="s3-ldap-configuration-schema"/> for directions on how to do this.</para>
           <note>
@@ -1554,10 +1461,8 @@ os level = 0</screen>
       <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/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>/etc/samba/smb.conf</filename> file in which the Samba server is serving as a WINS server:</para>
-      <screen>
-[global]
-wins support = Yes
-</screen>
+      <programlisting>[global]
+wins support = Yes</programlisting>
       <note>
         <title>Using WINS</title>
         <para>All servers (including Samba) should connect to a WINS server to resolve NetBIOS names. Without WINS, browsing only occurs on the local subnet. Furthermore, even if a domain-wide list is somehow obtained, hosts <!-- RHEL5:  are not resolvable  --> cannot be resolved for the client without WINS.</para>
@@ -1586,8 +1491,7 @@ wins support = Yes
         <tertiary>CUPS smb.conf</tertiary>
       </indexterm>
       <para>The following example shows a very basic <filename>/etc/samba/smb.conf</filename> configuration for CUPS support:</para>
-      <screen>
-[global]
+      <programlisting>[global]
 load printers = Yes
 printing = cups
 printcap name = cups
@@ -1604,8 +1508,7 @@ printer admin = @ntadmins
 comment = Printer Drivers Share
 path = /var/lib/samba/drivers
 write list = ed, john
-printer admin = ed, john
-</screen>
+printer admin = ed, john</programlisting>
       <para><!-- RHEL5:  More complicated  -->Other printing configurations are also possible. To add additional security and privacy for printing confidential documents, users can have their own print spooler not located in a public path. If a job fails, other users would not have access to the file.</para>
       <para>The <command>print$</command> directive contains printer drivers for clients to access if not available locally. The <command>print$</command> directive is optional and may not be required depending on the organization.</para>
       <para>Setting <command>browseable</command> to <command>Yes</command> enables the printer to be viewed in the Windows Network Neighborhood, provided the Samba server is set up correctly in the domain/workgroup.</para>
@@ -1619,33 +1522,26 @@ printer admin = ed, john
       <primary>Samba</primary>
       <secondary>Programs</secondary>
     </indexterm>
-    <formalpara
-      id="s3-samba-programs-findsmb">
-      <title>
-        <filename>findsmb</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>findsmb</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>findsmb</command> program</primary>
-      </indexterm>
-      <para>
-        <command>findsmb <replaceable>&lt;subnet_broadcast_address&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-findsmb">
+      <filename>findsmb</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>findsmb</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>findsmb</command> program</primary>
+    </indexterm>
+    <screen><command>findsmb <replaceable>subnet_broadcast_address</replaceable></command></screen>
     <para>The <command>findsmb</command> program is a Perl script which reports information about <systemitem class="protocol">SMB</systemitem>-aware systems on a specific subnet. If no subnet is specified the local subnet is used. Items displayed include <systemitem class="protocol">IP</systemitem> address, NetBIOS name, workgroup or domain name, operating system, and version.</para>
     <para>The following example shows the output of executing <command>findsmb</command> as any valid user on a system:</para>
-    <screen>
-<userinput>~]$&#160;findsmb</userinput>
+    <screen>~]$ <command>findsmb</command>
 IP ADDR       NETBIOS NAME  WORKGROUP/OS/VERSION
 ------------------------------------------------------------------
 10.1.59.25    VERVE         [MYGROUP] [Unix] [Samba 3.0.0-15]
@@ -1656,8 +1552,7 @@ IP ADDR       NETBIOS NAME  WORKGROUP/OS/VERSION
 10.1.57.141   JAWS         +[KWIKIMART] [Unix] [Samba 2.2.7a-security-rollup-fix]
 10.1.56.159   FRED         +[MYGROUP] [Unix] [Samba 3.0.0-14.3E]
 10.1.59.192   LEGION       *[MYGROUP] [Unix] [Samba 2.2.7-security-rollup-fix]
-10.1.56.205   NANCYN       +[MYGROUP] [Unix] [Samba 2.2.7a-security-rollup-fix]
-</screen>
+10.1.56.205   NANCYN       +[MYGROUP] [Unix] [Samba 2.2.7a-security-rollup-fix]</screen>
 		<!-- RHEL5:  	</section> --><!-- RHEL5:  	peer review: cut!
 		<formalpara id="s3-samba-programs-make_smbcodepage">
 			<title><filename>make_smbcodepage</filename></title>
@@ -1687,34 +1582,27 @@ IP ADDR       NETBIOS NAME  WORKGROUP/OS/VERSION
 			<para><command>make_unicodemap <replaceable>&lt;codepage_number&gt; &lt;inputfile&gt; &lt;outputfile&gt;</replaceable></command></para>
 		</formalpara>
 			<para>The <command>make_unicodemap</command> program compiles binary Unicode files from text files so Samba can display non-ASCII character sets. This obsolete program was part of the internationalization features of previous versions of Samba which are now included with the current release of Samba.</para> --><!-- RHEL5:  	</section> -->
-    <formalpara
-      id="s3-samba-programs-net">
-      <title>
-        <filename>net</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>net</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>net</command> program</primary>
-      </indexterm>
-      <para>
-        <command>net <replaceable>&lt;protocol&gt; &lt;function&gt; &lt;misc_options&gt; &lt;target_options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
-    <para>The <command>net</command> utility is similar to the <command>net</command> utility used for Windows and MS-DOS. The first argument is used to specify the protocol to use when executing a command. The <command><replaceable>&lt;protocol&gt;</replaceable>
+    <bridgehead id="s3-samba-programs-net">
+      <filename>net</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>net</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>net</command> program</primary>
+    </indexterm>
+    <screen><command>net <replaceable>protocol function misc_options target_options</replaceable></command></screen>
+    <para>The <command>net</command> utility is similar to the <command>net</command> utility used for Windows and MS-DOS. The first argument is used to specify the protocol to use when executing a command. The <command><replaceable>protocol</replaceable>
       </command> option can be <command>ads</command>, <command>rap</command>, or <command>rpc</command> for specifying the type of server connection. Active Directory uses <command>ads</command>, Win9x/NT3 uses <command>rap</command>, and Windows NT4/2000/2003/2008 uses <command>rpc</command>. If the protocol is omitted, <command>net</command> automatically tries to determine it.</para>
     <para>The following example displays a list the available shares for a host named <command>wakko</command>:</para>
-    <screen>
-<userinput>~]$&#160;net -l share -S wakko</userinput>
+    <screen>~]$ <command>net -l share -S wakko</command>
 Password:
 Enumerating shared resources (exports) on remote server:
 Share name   Type     Description
@@ -1722,77 +1610,59 @@ Share name   Type     Description
 data         Disk     Wakko data share
 tmp          Disk     Wakko tmp share
 IPC$         IPC      IPC Service (Samba Server)
-ADMIN$       IPC      IPC Service (Samba Server)
-</screen>
+ADMIN$       IPC      IPC Service (Samba Server)</screen>
     <para>The following example displays a list of Samba users for a host named <command>wakko</command>:</para>
-    <screen>
-<userinput>~]$&#160;net -l user -S wakko</userinput>
+    <screen>~]$ <command>net -l user -S wakko</command>
 root password:
 User name             Comment
 -----------------------------
 andriusb              Documentation
 joe                   Marketing
-lisa                  Sales
-</screen>
+lisa                  Sales</screen>
 		<!-- RHEL5:  	</section> -->
-    <formalpara
-      id="s3-samba-programs-nmblookup">
-      <title>
-        <filename>nmblookup</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>nmblookup</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>nmblookup</command> program</primary>
-      </indexterm>
-      <para>
-        <command>nmblookup <replaceable>&lt;options&gt; &lt;netbios_name&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-nmblookup">
+      <filename>nmblookup</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>nmblookup</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>nmblookup</command> program</primary>
+    </indexterm>
+    <screen><command>nmblookup <replaceable>options netbios_name</replaceable></command></screen>
     <para>The <command>nmblookup</command> program resolves NetBIOS names into <systemitem class="protocol">IP</systemitem> addresses. The program broadcasts its query on the local subnet until the target machine replies.</para>
     <para>Here is an example:</para>
-    <screen>
-<userinput>~]$&#160;nmblookup trek</userinput>
+    <screen>~]$ <command>nmblookup trek</command>
 querying trek on 10.1.59.255
-10.1.56.45 trek&lt;00&gt;
-</screen>
+10.1.56.45 trek&lt;00&gt;</screen>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-pdbedit">
-      <title>
-        <filename>pdbedit</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>pdbedit</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>pdbedit</command> program</primary>
-      </indexterm>
-      <para>
-        <command>pdbedit <replaceable>&lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-pdbedit">
+      <filename>pdbedit</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>pdbedit</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>pdbedit</command> program</primary>
+    </indexterm>
+    <screen><command>pdbedit <replaceable>options</replaceable></command></screen>
     <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>~]$&#160;pdbedit -a kristin</userinput>
+    <screen>~]$ <command>pdbedit -a kristin</command>
 new password:
 retype new password:
 Unix username:        kristin
@@ -1842,111 +1712,83 @@ lisa:504:
 kristin:506:
 <userinput>~]$&#160;pdbedit -x joe</userinput>
 <userinput>~]$&#160;pdbedit -L</userinput>
-andriusb:505: lisa:504: kristin:506:
-</screen>
+andriusb:505: lisa:504: kristin:506:</screen>
 		<!-- RHEL5:  	</section> -->
-    <formalpara
-      id="s3-samba-programs-rpcclient">
-      <title>
-        <filename>rpcclient</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>rpcclient</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>rpcclient</command> program</primary>
-      </indexterm>
-      <para>
-        <command>rpcclient <replaceable>&lt;server&gt; &lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-rpcclient">
+      <filename>rpcclient</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>rpcclient</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>rpcclient</command> program</primary>
+    </indexterm>
+    <screen><command>rpcclient <replaceable>server options</replaceable></command></screen>
     <para>The <command>rpcclient</command> program issues administrative commands using Microsoft RPCs, which provide access to the Windows administration graphical user interfaces (GUIs) for systems management. This is most often used by advanced users that understand the full complexity of Microsoft RPCs.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbcacls">
-      <title>
-        <filename>smbcacls</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbcacls</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbcacls</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbcacls <replaceable>&lt;//server/share&gt; &lt;filename&gt; &lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbcacls">
+      <filename>smbcacls</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbcacls</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbcacls</command> program</primary>
+    </indexterm>
+    <screen><command>smbcacls <replaceable>//server/share filename options</replaceable></command></screen>
     <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="s3-samba-programs-smbclient">
-      <title>
-        <filename>smbclient</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbclient</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbclient</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbclient <replaceable>&lt;//server/share&gt; &lt;password&gt; &lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbclient">
+      <filename>smbclient</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbclient</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbclient</command> program</primary>
+    </indexterm>
+    <screen><command>smbclient <replaceable>//server/share password options</replaceable></command></screen>
     <para>The <command>smbclient</command> program is a versatile UNIX client which provides functionality similar to <command>ftp</command>.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbcontrol">
-      <title>
-        <filename>smbcontrol</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbcontrol</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbcontrol</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbcontrol -i <replaceable>&lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
-    <para>
-      <command>smbcontrol <replaceable>&lt;options&gt; &lt;destination&gt; &lt;messagetype&gt; &lt;parameters&gt;</replaceable>
-      </command>
-    </para>
+    <bridgehead id="s3-samba-programs-smbcontrol">
+      <filename>smbcontrol</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbcontrol</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbcontrol</command> program</primary>
+    </indexterm>
+    <screen><command>smbcontrol -i <replaceable>options</replaceable></command></screen>
+    <screen><command>smbcontrol <replaceable>options destination messagetype parameters</replaceable></command></screen>
     <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="s3-samba-programs-smbgroupedit">
@@ -1980,133 +1822,102 @@ andriusb:505: lisa:504: kristin:506:
 			<para>For example:</para>
 <screen><userinput>smbmount //wakko/html /mnt/html -o username=kristin</userinput> Password: <userinput>&lt;password&gt;</userinput> [root at yakko /]# <userinput>ls -l /mnt/html</userinput> total 0 -rwxr-xr-x    1 root     root            0 Jan 29 08:09 index.html</screen>
 		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbpasswd">
-      <title>
-        <filename>smbpasswd</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbpasswd</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbpasswd</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbpasswd <replaceable>&lt;options&gt; &lt;username&gt; &lt;password&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbpasswd">
+      <filename>smbpasswd</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbpasswd</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbpasswd</command> program</primary>
+    </indexterm>
+    <screen><command>smbpasswd <replaceable>options username password</replaceable></command></screen>
     <para>The <command>smbpasswd</command> program manages encrypted passwords. This program can be run by a superuser to change any user's password as well as by an ordinary user to change their own Samba password.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbspool">
-      <title>
-        <filename>smbspool</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbspool</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbspool</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbspool <replaceable>&lt;job&gt; &lt;user&gt; &lt;title&gt; &lt;copies&gt; &lt;options&gt; &lt;filename&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbspool">
+      <filename>smbspool</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbspool</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbspool</command> program</primary>
+    </indexterm>
+    <screen><command>smbspool <replaceable>job user title copies options filename</replaceable></command></screen>
     <para>The <command>smbspool</command> program is a CUPS-compatible printing interface to Samba. Although designed for use with CUPS printers, <command>smbspool</command> can work with non-CUPS printers as well.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbstatus">
-      <title>
-        <filename>smbstatus</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbstatus</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbstatus</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbstatus <replaceable>&lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbstatus">
+      <filename>smbstatus</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbstatus</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbstatus</command> program</primary>
+    </indexterm>
+    <screen><command>smbstatus <replaceable>options</replaceable></command></screen>
     <para>The <command>smbstatus</command> program displays the status of current connections to a Samba server.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-smbtar">
-      <title>
-        <filename>smbtar</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>smbtar</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>smbtar</command> program</primary>
-      </indexterm>
-      <para>
-        <command>smbtar <replaceable>&lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-smbtar">
+      <filename>smbtar</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>smbtar</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>smbtar</command> program</primary>
+    </indexterm>
+    <screen><command>smbtar <replaceable>options</replaceable></command></screen>
     <para>The <command>smbtar</command> program performs backup and restores of Windows-based share files and directories to a local tape archive. Though similar to the <command>tar</command> command, the two are not compatible.</para>
 		<!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-testparm">
-      <title>
-        <filename>testparm</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>testparm</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>testparm</command> program</primary>
-      </indexterm>
-      <para>
-        <command>testparm <replaceable>&lt;options&gt; &lt;filename&gt; &lt;hostname IP_address&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-testparm">
+      <filename>testparm</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>testparm</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>testparm</command> program</primary>
+    </indexterm>
+    <screen><command>testparm <replaceable>options filename hostname IP_address</replaceable></command></screen>
     <para>The <command>testparm</command> program checks the syntax of the <filename>/etc/samba/smb.conf</filename> file. If your <filename>/etc/samba/smb.conf</filename> file is in the default location (<filename>/etc/samba/smb.conf</filename>) you do not need to specify the location. Specifying the hostname and IP address to the <command>testparm</command> program verifies that the <filename>hosts.allow</filename> and <filename>host.deny</filename> files are configured correctly. The <command>testparm</command> program also displays a summary of your <filename>/etc/samba/smb.conf</filename> file and the server's role (stand-alone, domain, etc.) after testing. This is convenient when debugging as it excludes comments and concisely presents information for experienced administrators to read.</para>
     <para>For example:</para>
-    <screen>
-<userinput>~]$&#160;testparm</userinput>
+    <screen>~]$ <command>testparm</command>
 Load smb config files from /etc/samba/smb.conf
 Processing section "[homes]"
 Processing section "[printers]"
@@ -2144,8 +1955,7 @@ Press enter to see a dump of your service definitions
 	force user = andriusb
 	force group = users
 	read only = No
-	guest only = Yes
-</screen>
+	guest only = Yes</screen>
 		<!-- RHEL5:  		</section> --><!-- RHEL5:  	tech review: cut!
 		<formalpara id="s3-samba-programs-testprns">
 			<title><filename>testprns</filename></title>
@@ -2162,29 +1972,23 @@ Press enter to see a dump of your service definitions
 		</formalpara>
 			<para>The <command>testprns</command> program checks if <option>printername</option> is valid and exists in the <filename>printcap</filename>. If the <option>printcapname</option> is not specified, the default specified in the
 				Samba or <filename>printcap</filename> configuration files is used.</para> --><!-- RHEL5:  		</section> -->
-    <formalpara
-      id="s3-samba-programs-wbinfo">
-      <title>
-        <filename>wbinfo</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>Samba</primary>
-        <secondary>Programs</secondary>
-        <tertiary>
-          <command>wbinfo</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>wbinfo</command> program</primary>
-      </indexterm>
-      <para>
-        <command>wbinfo <replaceable>&lt;options&gt;</replaceable>
-        </command>
-      </para>
-    </formalpara>
+    <bridgehead id="s3-samba-programs-wbinfo">
+      <filename>wbinfo</filename>
+    </bridgehead>
+    <indexterm
+      significance="normal">
+      <primary>Samba</primary>
+      <secondary>Programs</secondary>
+      <tertiary>
+        <command>wbinfo</command>
+      </tertiary>
+    </indexterm>
+    <indexterm
+      significance="normal">
+      <primary>
+        <command>wbinfo</command> program</primary>
+    </indexterm>
+    <screen><command>wbinfo <replaceable>options</replaceable></command></screen>
     <para>The <command>wbinfo</command> program displays information from the <command>winbindd</command> daemon. The <command>winbindd</command> daemon must be running for <command>wbinfo</command> to work.</para>
 		<!-- RHEL5:  		</section> -->
   </section>
@@ -2208,44 +2012,43 @@ Press enter to see a dump of your service definitions
       </indexterm>
       <itemizedlist>
         <listitem>
-        <note>
-              <title>Installing the samba-doc package</title>
-              <para>In order to use the <application>Samba</application> documentation, first ensure the <package>samba-doc</package> 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><filename>/usr/share/doc/samba-<replaceable>version-number</replaceable>/</filename> — All additional files included with the Samba distribution. This includes all helper scripts, sample configuration files, and documentation. 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>
+          <note>
+            <title>Make sure you have the samba-doc package installed</title>
+            <para>In order to use the <application>Samba</application> documentation, first ensure the <package>samba-doc</package> package is installed on your system by running, as <systemitem class="username">root</systemitem>:</para>
+            <screen><command>yum install samba-doc</command></screen>
+            <para>For more information on installing packages with Yum, refer to <xref linkend="sec-Installing"/>.</para>
+          </note>
+        </listitem>
+      </itemizedlist>
+      <para>
+        Refer to the following manual pages for detailed information specific <application>Samba</application> features:
+      </para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            <command>smb.conf</command>
+          </para>
+        </listitem>
+        <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. 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>
+            <command>samba</command> 
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <command>smbd</command>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <command>nmbd</command>
+          </para>
+        </listitem>
+        <listitem>
           <para>
-            Refer to the following man pages for detailed information specific <application>Samba</application> features:
+            <command>winbind</command>
           </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <command>smb.conf</command>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <command>samba</command> 
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <command>smbd</command>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <command>nmbd</command>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <command>winbind</command>
-              </para>
-            </listitem>
-          </itemizedlist>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/en-US/images/samba-nautilus-domain.png b/en-US/images/samba-nautilus-domain.png
new file mode 100644
index 0000000..3b8e5a9
Binary files /dev/null and b/en-US/images/samba-nautilus-domain.png differ


More information about the docs-commits mailing list