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

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


commit 59546e790efdac7286df51e83c22858bedda100a
Author: Martin Prpic <mprpic at redhat.com>
Date:   Tue Aug 24 18:34:38 2010 +0200

    updated the Samba chapter

 en-US/Samba.xml |  167 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 89 insertions(+), 78 deletions(-)
---
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 1ea48d0..4d79106 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -15,8 +15,15 @@
     <see>Samba</see>
   </indexterm>
   <para>
-    <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>
+    <firstterm>Samba</firstterm> is an open source implementation of the <firstterm>Server Message Block</firstterm> (<systemitem class="protocol">SMB</systemitem>) 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 <systemitem class="protocol">SMB</systemitem> allows it to appear as a Windows server to Windows clients.</para>
+      <note>
+        <title>Note: Installing the <package>samba</package> package</title>
+        <para>In order to use Samba, 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>For more information on installing packages with Yum, refer to <xref linkend="sec-Installing"/>.</para>
+      </note>
+      
   <section
     id="samba-rgs-overview">
     <title>Introduction to Samba</title>
@@ -28,7 +35,7 @@
     <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 the <firstterm>Lightweight Directory Access Protocol</firstterm> (LDAP) and <firstterm>Kerberos</firstterm></para>
+        <para>The ability to join an Active Directory domain by means of the <firstterm>Lightweight Directory Access Protocol</firstterm> (<systemitem class="protocol">LDAP</systemitem>) and <firstterm>Kerberos</firstterm></para>
       </listitem>
       <listitem>
         <para>Built in Unicode support for internationalization</para>
@@ -62,7 +69,7 @@
           <para>Authenticate Windows domain logins</para>
         </listitem>
         <listitem>
-          <para>Provide <firstterm>Windows Internet Name Service</firstterm> (WINS) name server resolution</para>
+          <para>Provide <firstterm>Windows Internet Name Service</firstterm> (<systemitem class="service">WINS</systemitem>) name server resolution</para>
         </listitem>
         <listitem>
           <para>Act as a Windows <trademark
@@ -119,7 +126,7 @@
           <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 SMB protocol. The default ports on which the server listens for SMB traffic are TCP ports 139 and 445.</para>
+        <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>
       <para>The <command>smbd</command> daemon is controlled by the <command>smb</command> service.</para>
       <formalpara
@@ -133,7 +140,7 @@
           <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/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>
+        <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>
       <para>The <command>nmbd</command> daemon is controlled by the <command>nmdb</command> service.</para>
       <formalpara
@@ -147,9 +154,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, 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>
+        <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>
-      <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>
+      <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>Note</title>
         <para>You may refer to <xref
@@ -168,13 +175,13 @@
       <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. Select <guimenu>Places</guimenu> (on the Panel) &gt; <guimenuitem>Network Servers</guimenuitem> to view a list of Samba workgroups on your network. You can also type <userinput>smb:</userinput> in the <guilabel>File</guilabel> &gt; <guilabel>Open Location</guilabel> bar of Nautilus to view the workgroups.</para>
+    <para>You can use <application>Nautilus</application> to view available Samba shares on your network. To view a list of Samba workgroups on your network, select <menuchoice><guimenu>Places</guimenu> <guimenuitem>Network Servers</guimenuitem></menuchoice> from the GNOME panel. 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.</para>
 		<!-- RHEL5:  	ddomingo at redhat.com: above replaces below, panel layout changed, Nautilus changed
 		<para>You can use <application>Nautilus</application> to view available Samba shares on your network. Select <guimenu>&RHSECONDMENU;</guimenu> (on the Panel) &gt; <guimenuitem>Network Servers</guimenuitem> to
 			view a list of Samba workgroups on your network. You can also type <userinput>smb:</userinput> in the <guilabel>Location:</guilabel> bar of Nautilus to view the workgroups.</para>
  -->
     <para>As shown in <xref
-        linkend="fig-samba-nautilus-workgroups"/>, an icon appears for each available SMB workgroup on the network.</para>
+        linkend="fig-samba-nautilus-workgroups"/>, an icon appears for each available <systemitem class="protocol">SMB</systemitem> workgroup on the network.</para>
     <figure
       float="0"
       id="fig-samba-nautilus-workgroups">
@@ -209,7 +216,7 @@
       </mediaobject>
     </figure>
     <para>As you can see from <xref
-        linkend="fig-samba-nautilus-machines"/>, there is an icon 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>
+        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>
@@ -237,7 +244,7 @@
           <command>findsmb</command>
         </primary>
       </indexterm>
-      <para>To query the network for Samba servers, use the <command>findsmb</command> command. For each server found, it displays its IP address, NetBIOS name, workgroup name, operating system, and SMB server version.</para>
+      <para>To query the network for Samba servers, use the <command>findsmb</command> command. For each server found, it displays its <systemitem class="protocol">IP</systemitem> address, NetBIOS name, workgroup name, operating system, and <systemitem class="protocol">SMB</systemitem> server version.</para>
       <indexterm
         significance="normal">
         <primary>Samba</primary>
@@ -256,7 +263,7 @@
 <command>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 IP 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>
+      <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>
       <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>
@@ -314,7 +321,7 @@
       <para>To configure Samba using a graphical interface, use the <application>Samba Server Configuration Tool</application>. For command line configuration, skip to <xref
           linkend="s2-samba-configuring-cmdline"/>.</para>
       <para>The <application>Samba Server Configuration Tool</application> is a graphical interface for managing Samba shares, users, and basic server settings. It modifies the configuration files in the <filename>/etc/samba/</filename> directory. Any changes to these files not made using the application are preserved.</para>
-      <para>To use this application, you must be running the X Window System, have root privileges, and have the <filename>system-config-samba</filename> RPM package installed. To start the <application>Samba Server Configuration Tool</application> from the desktop, go to the <guimenu>System</guimenu> (on the Panel) &gt; <guimenuitem>Administration</guimenuitem> &gt; <guimenuitem>Server Settings</guimenuitem> &gt; <guimenuitem>Samba</guimenuitem> or type the command <command>system-config-samba</command> at a shell prompt (for example, in an XTerm or a GNOME terminal).</para>
+      <para>To use this application, you must be running the X Window System, have root privileges, and have the <filename>system-config-samba</filename> RPM package installed. To start the <application>Samba Server Configuration Tool</application> from the desktop, go to the <menuchoice><guimenu>System</guimenu> <guimenuitem>Administration</guimenuitem> <guimenuitem>Server Settings</guimenuitem> <guimenuitem>Samba</guimenuitem></menuchoice> on the GNOME panel or type the <command>system-config-samba</command> command at a shell prompt (for example, in an XTerm or a GNOME terminal).</para>
 			<!-- RHEL5:  	ddomingo at redhat.com: above replaces below; changed path to sambatool
 			<para>To use this application, you must be running the X Window System, have root privileges, and have the <filename>system-config-samba</filename> RPM package installed. To start the <application>Samba Server Configuration
 				Tool</application> from the desktop, go to the <guimenu>Main Menu Button</guimenu> (on the Panel) &gt; <guimenuitem>System Settings</guimenuitem> &gt; <guimenuitem>Server Settings</guimenuitem> &gt;
@@ -352,7 +359,7 @@
           <secondary>graphical configuration</secondary>
           <tertiary>configuring server settings</tertiary>
         </indexterm>
-        <para>The first step in configuring a Samba server is to configure the basic settings for the server and a few security options. After starting the application, select <guimenu>Preferences</guimenu> &gt; <guimenuitem>Server Settings</guimenuitem> from the pulldown menu. The <guilabel>Basic</guilabel> tab is displayed as shown in <xref
+        <para>The first step in configuring a Samba server is to configure the basic settings for the server and a few security options. After starting the application, select <menuchoice><guimenu>Preferences</guimenu> <guimenuitem>Server Settings</guimenuitem></menuchoice> from the pulldown menu. The <guilabel>Basic</guilabel> tab is displayed as shown in <xref
             linkend="fig-samba-basic"/>.</para>
         <figure
           float="0"
@@ -369,7 +376,7 @@
             </textobject>
           </mediaobject>
         </figure>
-        <para>On the <guilabel>Basic</guilabel> tab, specify which workgroup the computer should be in as well as a brief description of the computer. They correspond to the <command>workgroup</command> and <command>server string</command> options in <filename>smb.conf</filename>.</para>
+        <para>On the <guilabel>Basic</guilabel> tab, specify which workgroup the computer should be in as well as a brief description of the computer. They correspond to the <command>workgroup</command> and <command>server string</command> options in the <filename>/etc/samba/smb.conf</filename> file.</para>
         <figure
           float="0"
           id="fig-samba-security">
@@ -393,7 +400,7 @@
             <itemizedlist>
               <listitem>
                 <para>
-                  <guilabel>ADS</guilabel> — The Samba server acts as a domain member in an Active Directory Domain (ADS) realm. For this option, Kerberos must be installed and configured on the server, and Samba must become a member of the ADS realm using the <command>net</command> utility, which is part of the <filename>samba-common</filename> package. Refer to the <command>net</command> man page for details. This option does not configure Samba to be an ADS Controller. Specify the realm of the Kerberos server in the <guilabel>Kerberos Realm</guilabel> field.</para>
+                  <guilabel>ADS</guilabel> — The Samba server acts as a domain member in an Active Directory Domain (ADS) realm. For this option, Kerberos must be installed and configured on the server, and Samba must become a member of the ADS realm using the <command>net</command> utility, which is a part of the <filename>samba-common</filename> package. Refer to the <command>net</command> man page for details. This option does not configure Samba to be an ADS Controller. Specify the realm of the Kerberos server in the <guilabel>Kerberos Realm</guilabel> field.</para>
                 <note>
                   <title>Note</title>
                   <para>The <guilabel>Kerberos Realm</guilabel> field must be supplied in all uppercase letters, such as <command>EXAMPLE.COM</command>.</para>
@@ -410,7 +417,7 @@
               </listitem>
               <listitem>
                 <para>
-                  <guilabel>Server</guilabel> — The Samba server tries to verify the username and password combination by passing them to another Samba server. If it can not, the server tries to verify using the user authentication mode. Specify the NetBIOS name of the other Samba server in the <guilabel>Authentication Server</guilabel> field.</para>
+                  <guilabel>Server</guilabel> — The Samba server tries to verify the username and password combination by passing them to another Samba server. If it cannot, the server tries to verify using the user authentication mode. Specify the NetBIOS name of the other Samba server in the <guilabel>Authentication Server</guilabel> field.</para>
               </listitem>
               <listitem>
                 <para>
@@ -460,8 +467,8 @@
             </textobject>
           </mediaobject>
         </figure>
-        <para>To add a Samba user, select <guimenu>Preferences</guimenu> &gt; <guimenuitem>Samba Users</guimenuitem> from the pulldown menu, and click the <guibutton>Add User</guibutton> button. In the <guilabel>Create New Samba User</guilabel> window select a <guilabel>Unix Username</guilabel> from the list of existing users on the local system.</para>
-        <para>If the user has a different username on a Windows machine and needs to log into the Samba server from the Windows machine, specify that Windows username in the <guilabel>Windows Username</guilabel> field. The <guilabel>Authentication Mode</guilabel> on the <guilabel>Security</guilabel> tab of the <guilabel>Server Settings</guilabel> preferences must be set to <guilabel>User</guilabel> for this option to work.</para>
+        <para>To add a Samba user, select <menuchoice><guimenu>Preferences</guimenu> <guimenuitem>Samba Users</guimenuitem></menuchoice> from the pulldown menu, and click the <guibutton>Add User</guibutton> button. In the <guilabel>Create New Samba User</guilabel> window select a <guilabel>Unix Username</guilabel> from the list of existing users on the local system.</para>
+        <para>If the user has a different username on a Windows machine and needs to log into the Samba server from the Windows machine, specify that Windows username in the <guilabel>Windows Username</guilabel> field. The <guilabel>Authentication Mode</guilabel> in the <guilabel>Security</guilabel> tab of the <guilabel>Server Settings</guilabel> preferences must be set to <guilabel>User</guilabel> for this option to work.</para>
         <para>Also, configure a <guilabel>Samba Password</guilabel> for the Samba User and confirm it by typing it again. Even if you opt to use encrypted passwords for Samba, it is recommended that the Samba passwords for all users are different from their system passwords.</para>
         <para>To edit an existing user, select the user from the list, and click <guibutton>Edit User</guibutton>. To delete an existing Samba user, select the user, and click the <guibutton>Delete User</guibutton> button. Deleting a Samba user does not delete the associated system user account.</para>
         <para>The users are modified immediately after clicking the <guibutton>OK</guibutton> button.</para>
@@ -518,7 +525,7 @@
 						<para><guilabel>Basic Permissions</guilabel> &mdash; Whether users should only be able to read the files in the shared directory or whether they should be able to read and write to the shared directory.</para>
 					</listitem> -->
         </itemizedlist>
-        <para>On the <guilabel>Access</guilabel> tab, select whether to allow only specified users to access the share or whether to allow all Samba users to access the share. If you select to allow access to specific users, select the users from the list of available Samba users.</para>
+        <para>In the <guilabel>Access</guilabel> tab, select whether to allow only specified users to access the share or whether to allow all Samba users to access the share. If you select to allow access to specific users, select the users from the list of available Samba users.</para>
         <para>The share is added immediately after clicking <guibutton>OK</guibutton>.</para>
       </section>
     </section>
@@ -530,14 +537,17 @@
         <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 command <command>service smb restart</command>.</para>
-      <para>To specify the Windows workgroup and a brief description of the Samba server, edit the following lines in your <filename>smb.conf</filename> file:</para>
+      <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>
+      <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>
       <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 <command>smb.conf</command> file (after modifying it to reflect your needs and your 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>]
 comment = <replaceable>Insert a comment here</replaceable>
@@ -631,43 +641,38 @@ create mask = 0765
       <secondary>service</secondary>
       <tertiary>reloading</tertiary>
     </indexterm>
-    <para>To start a Samba server, type the following command in a shell prompt while logged in as root:</para>
-    <screen>
-<command>/sbin/service smb start</command>
-    </screen>
+    <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> 
     <important>
       <title>Important</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 while logged in as root:</para>
-    <screen>
-<command>/sbin/service smb stop</command>
-    </screen>
+    <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>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 while logged in as root:</para>
-    <screen>
-<command> /sbin/service smb restart </command>
-    </screen>
+    <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>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>Note</title>
-      <para>When the <command>smb.conf</command> 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>
+      <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>
-<command> /sbin/service smb condrestart </command>
-    </screen>
-    <para>A manual reload of the <command>smb.conf</command> 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>
-<command> /sbin/service smb reload </command>
-    </screen>
+    <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>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-Controlling_Access_to_Services"/> for more information regarding these tools.</para>
   </section>
 	<!-- RHEL5:   ddomingo at redhat.com: config guide used to be here, moved to before "Starting & Stopping"  -->
   <section
     id="s1-samba-servers">
-    <title>Samba Server Types and the <command>smb.conf</command> File</title>
+    <title>Samba Server Types and the <filename>smb.conf</filename> File</title>
     <indexterm
       significance="normal">
       <primary>Samba</primary>
@@ -679,7 +684,7 @@ create mask = 0765
       <secondary>Server Types</secondary>
     </indexterm>
     <para>Samba configuration is straightforward. All modifications to Samba are done in the <filename>/etc/samba/smb.conf</filename> configuration file. Although the default <filename>smb.conf</filename> file is well documented, it does not address complex topics such as LDAP, Active Directory, and the numerous domain controller implementations.</para>
-    <para>The following sections describe the different ways a Samba server can be configured. Keep in mind your needs and the changes required to the <filename>smb.conf</filename> file for a successful configuration.</para>
+    <para>The following sections describe the different ways a Samba server can be configured. Keep in mind your needs and the changes required to the <filename>/etc/samba/smb.conf</filename> file for a successful configuration.</para>
     <section
       id="s2-samba-standalone">
       <title>Stand-alone Server</title>
@@ -700,7 +705,7 @@ create mask = 0765
           <secondary>smb.conf</secondary>
           <tertiary>Anonymous Read Only example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> 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 <command>smb.conf</command> file.</para>
+        <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]
 workgroup = DOCS
@@ -722,10 +727,10 @@ guest only = Yes
           <secondary>smb.conf</secondary>
           <tertiary>Anonymous Read/Write example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> file shows a sample configuration needed to implement anonymous read/write file sharing. To enable anonymous read/write file sharing, set the <command>read only</command> directive to <command>no</command>. The <command>force user</command> and <command>force group</command> directives are also added to enforce the ownership of any newly placed files specified in the share.</para>
+        <para>The following <filename>/etc/samba/smb.conf</filename> file shows a sample configuration needed to implement anonymous read/write file sharing. To enable anonymous read/write file sharing, set the <command>read only</command> directive to <command>no</command>. The <command>force user</command> and <command>force group</command> directives are also added to enforce the ownership of any newly placed files specified in the share.</para>
         <note>
           <title>Note</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>smb.conf</filename> file.</para>
+          <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]
@@ -750,7 +755,7 @@ guest ok = Yes
           <secondary>smb.conf</secondary>
           <tertiary>Anonymous Print Server example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> 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>
+        <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]
 workgroup = DOCS
@@ -778,7 +783,7 @@ browseable = Yes
           <secondary>smb.conf</secondary>
           <tertiary>Secure File and Print Server example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> 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>
+        <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]
 workgroup = DOCS
@@ -830,7 +835,7 @@ browseable = Yes
           <secondary>smb.conf</secondary>
           <tertiary>Active Directory Member Server example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> 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 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>
+        <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]
 realm = EXAMPLE.COM
@@ -842,7 +847,7 @@ password server = kerberos.example.com
         <para>In order to join a member server to an Active Directory domain, the following steps must be completed:</para>
         <itemizedlist>
           <listitem>
-            <para>Configuration of the <filename>smb.conf</filename> file on the member server</para>
+            <para>Configuration of the <filename>/etc/samba/smb.conf</filename> file on the member server</para>
           </listitem>
           <listitem>
             <para>Configuration of Kerberos, including the <filename>/etc/krb5.conf</filename> file, on the member server</para>
@@ -884,7 +889,7 @@ password server = kerberos.example.com
           <secondary>smb.conf</secondary>
           <tertiary>NT4-style Domain Member example</tertiary>
         </indexterm>
-        <para>The following <command>smb.conf</command> 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 <command>smb.conf</command> file simpler. In this instance, the Samba member server functions as a pass through to the NT4-based domain server.</para>
+        <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]
 workgroup = DOCS
@@ -902,17 +907,17 @@ 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/2008, 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 <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>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>
+          <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>
 					<!-- RHEL5:   ddomingo at redhat.com: above replaces below, less confusion
 <screen>root# <userinput>net rpc join -U administrator%password</userinput></screen> -->
         </important>
-        <para>Note that the <option>-S</option> option, which specifies the domain server hostname, does not need to be stated in the <command>net rpc join</command> command. Samba uses the hostname specified by the <command>workgroup</command> directive in the <filename>smb.conf</filename> file instead of it being stated explicitly.</para>
+        <para>Note that the <option>-S</option> option, which specifies the domain server hostname, does not need to be stated in the <command>net rpc join</command> command. Samba uses the hostname specified by the <command>workgroup</command> directive in the <filename>/etc/samba/smb.conf</filename> file instead of it being stated explicitly.</para>
       </section>
     </section>
     <section
@@ -943,6 +948,8 @@ guest ok = Yes
         </indexterm>
         <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>
+        <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]
 workgroup = DOCS
@@ -1050,7 +1057,7 @@ idmap gid = 15000-20000 ...
 					<secondary>smb.conf</secondary>
 					<tertiary>BDC using LDAP</tertiary>
 				</indexterm>
-				<para>A BDC is an integral part of any enterprise Samba/LDAP solution. The <command>smb.conf</command> files between the PDC and BDC are virtually identical except for the <command>domain master</command> directive. Make sure
+				<para>A BDC is an integral part of any enterprise Samba/LDAP solution. The <filename>/etc/samba/smb.conf</filename> files between the PDC and BDC are virtually identical except for the <command>domain master</command> directive. Make sure
 					the PDC has a value of <command>Yes</command> and the BDC has a value of <command>No</command>. If you have multiple BDCs for a PDC, the <command>os level</command> directive is useful in setting the BDC
 					election priority. The higher the value, the higher the server priority for connecting clients.</para>
 				<note>
@@ -1114,8 +1121,7 @@ idmap gid = 15000-20000 ...
       <secondary>Security Modes</secondary>
     </indexterm>
     <para>There are only two types of security modes for Samba, <emphasis>share-level</emphasis> and <emphasis>user-level</emphasis>, which are collectively known as <emphasis><firstterm>security levels</firstterm>
-      </emphasis>. Share-level security can only be implemented in one way, while user-level security can be implemented in one of four different ways. The different ways of implementing a security level are called <emphasis><firstterm>security modes</firstterm>
-      </emphasis>.</para>
+      </emphasis>. Share-level security can only be implemented in one way, while user-level security can be implemented in one of four different ways. The different ways of implementing a security level are called <emphasis><firstterm>security modes</firstterm></emphasis>.</para>
     <section
       id="s2-samba-user-level">
       <title>User-Level Security</title>
@@ -1125,8 +1131,8 @@ idmap gid = 15000-20000 ...
         <secondary>Security Modes</secondary>
         <tertiary>User Level Security</tertiary>
       </indexterm>
-      <para>User-level security is the default setting for Samba. Even if the <command>security = user</command> directive is not listed in the <command>smb.conf</command> 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 <command>smb.conf</command>, the <command>security = user</command> directive that sets user-level security is:</para>
+      <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]
 ...
@@ -1145,7 +1151,7 @@ security = user
           <secondary>Security Modes</secondary>
           <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 <command>smb.conf</command>:</para>
+        <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]
 ...
@@ -1164,7 +1170,7 @@ workgroup = MARKETING
           <tertiary>Active Directory Security Mode</tertiary>
         </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 <command>smb.conf</command>, the following directives make Samba an Active Directory member server:</para>
+        <para>In the <filename>/etc/samba/smb.conf</filename> file, the following directives make Samba an Active Directory member server:</para>
         <screen>
 [GLOBAL]
 ...
@@ -1188,7 +1194,7 @@ password server = kerberos.example.com
           <title>Note</title>
           <para>It is highly recommended to <emphasis>not</emphasis> use this mode since there are numerous security drawbacks.</para>
         </note>
-        <para>In <filename>smb.conf</filename>, the following directives enable Samba to operate in server security mode:</para>
+        <para>In the <filename>/etc/samba/smb.conf</filename>, the following directives enable Samba to operate in server security mode:</para>
         <screen>
 [GLOBAL]
 ...
@@ -1210,7 +1216,7 @@ password server = "NetBIOS_of_Domain_Controller"
         <tertiary>Share-Level Security</tertiary>
       </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 <filename>smb.conf</filename>, the <command>security = share</command> directive that sets share-level security is:</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]
 ...
@@ -1399,7 +1405,7 @@ security = share
 		<para><firstterm>Network browsing</firstterm> is a concept that enables Windows and Samba servers to appear in the Windows <guilabel>Network Neighborhood</guilabel>. Inside the <guilabel>Network Neighborhood</guilabel>, icons
 			are represented as servers and if opened, the server's shares and printers that are available are displayed.</para>
 		  -->
-    <para>Network browsing capabilities require NetBIOS over TCP/IP. NetBIOS-based networking uses broadcast (UDP) messaging to accomplish browse list management. Without NetBIOS and WINS as the primary method for TCP/IP hostname resolution, other methods such as static files (<filename>/etc/hosts</filename>) or DNS, must be used.</para>
+    <para>Network browsing capabilities require NetBIOS over <systemitem class="protocol">TCP</systemitem>/<systemitem class="protocol">IP</systemitem>. NetBIOS-based networking uses broadcast (<systemitem class="protocol">UDP</systemitem>) messaging to accomplish browse list management. Without NetBIOS and WINS as the primary method for <systemitem class="protocol">TCP</systemitem>/<systemitem class="protocol">IP</systemitem> hostname resolution, other methods such as static files (<filename>/etc/hosts</filename>) or <systemitem class="protocol">DNS</systemitem>, must be used.</para>
     <para>A domain master browser collates the browse lists from local master browsers on all subnets so that browsing can occur between workgroups and subnets. Also, the domain master browser should preferably be the local master browser for its own subnet.</para>
 		<!-- RHEL5:  	tech review: cut! less trouble!
 		<section id="s2-samba-workgroup-browsing">
@@ -1457,11 +1463,11 @@ os level = 0</screen>
 			<!-- RHEL5:  	peer review: above replaces below, also Windows NT is now Windows server
 			<para>By default, a Windows NT PDC for a domain is also the domain master browser for that domain. A Samba server must be set up as a domain master server in this type of situation. Network browsing may fail if the Samba server is running WINS along with
 				other domain controllers in operation.</para> -->
-      <para>For subnets that do not include the Windows server PDC, a Samba server can be implemented as a local master browser. Configuring the <filename>smb.conf</filename> for a local master browser (or no browsing at all) in a domain controller environment is the same as workgroup configuration.</para>
+      <para>For subnets that do not include the Windows server PDC, a Samba server can be implemented as a local master browser. Configuring the <filename>/etc/samba/smb.conf</filename> file for a local master browser (or no browsing at all) in a domain controller environment is the same as workgroup configuration.</para>
     </section>
     <section
       id="s2-samba-wins">
-      <title>WINS (Windows Internetworking Name Server)</title>
+      <title>WINS (Windows Internet Name Server)</title>
       <indexterm
         significance="normal">
         <primary>Samba</primary>
@@ -1475,7 +1481,7 @@ os level = 0</screen>
       </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/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>
+      <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
@@ -1507,7 +1513,7 @@ wins support = Yes
         <secondary>CUPS Printing Support</secondary>
         <tertiary>CUPS smb.conf</tertiary>
       </indexterm>
-      <para>The following example shows a very basic <filename>smb.conf</filename> configuration for CUPS support:</para>
+      <para>The following example shows a very basic <filename>/etc/samba/smb.conf</filename> configuration for CUPS support:</para>
       <screen>
 [global]
 load printers = Yes
@@ -1529,7 +1535,7 @@ write list = ed, john
 printer admin = ed, john
 </screen>
       <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> share contains printer drivers for clients to access if not available locally. The <command>print$</command> share is optional and may not be required depending on the organization.</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>
     </section>
   </section>
@@ -1564,7 +1570,7 @@ printer admin = ed, john
         </command>
       </para>
     </formalpara>
-    <para>The <command>findsmb</command> program is a Perl script which reports information about SMB-aware systems on a specific subnet. If no subnet is specified the local subnet is used. Items displayed include IP address, NetBIOS name, workgroup or domain name, operating system, and version.</para>
+    <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>findsmb</userinput>
@@ -1633,7 +1639,7 @@ IP ADDR       NETBIOS NAME  WORKGROUP/OS/VERSION
       </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>
-      </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 uses <command>rpc</command>. If the protocol is omitted, <command>net</command> automatically tries to determine it.</para>
+      </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>net -l share -S wakko</userinput>
@@ -1680,7 +1686,7 @@ lisa                  Sales
         </command>
       </para>
     </formalpara>
-    <para>The <command>nmblookup</command> program resolves NetBIOS names into IP addresses. The program broadcasts its query on the local subnet until the target machine replies.</para>
+    <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>nmblookup trek</userinput>
@@ -2025,7 +2031,7 @@ andriusb:505: lisa:504: kristin:506:
         </command>
       </para>
     </formalpara>
-    <para>The <command>testparm</command> program checks the syntax of the <filename>smb.conf</filename> file. If your <filename>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>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>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>testparm</userinput>
@@ -2145,7 +2151,7 @@ Press enter to see a dump of your service definitions
           <itemizedlist>
             <listitem>
               <para>
-                man Y
+                <command>man smb.conf</command>
               </para>
             </listitem>
             <listitem>
@@ -2153,6 +2159,11 @@ Press enter to see a dump of your service definitions
                 man X
               </para>
             </listitem>
+            <listitem>
+              <para>
+                man Y
+              </para>
+            </listitem>
           </itemizedlist>
         </listitem>
       </itemizedlist>


More information about the docs-commits mailing list