[system-administrators-guide] Removing old remarks about tech review of Samba

stephenw stephenw at fedoraproject.org
Fri Mar 7 05:35:20 UTC 2014


commit 4c8c5e14f3729e185ccf2b5239fe91d542d095b3
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Wed Mar 5 21:57:09 2014 +0100

    Removing old remarks about tech review of Samba

 en-US/Samba.xml |  269 ++-----------------------------------------------------
 1 files changed, 7 insertions(+), 262 deletions(-)
---
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 1e2cc24..c475473 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -22,7 +22,7 @@
         <screen><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>
@@ -153,8 +153,6 @@
             linkend="s2-samba-programs"/> for a list of utilities included in the Samba distribution.</para>
       </note>
     </section>
-		<!-- RHEL5:  	ddomingo at redhat.com: why is this not allowing build?
-		<para>Please refer to <xref linkend="s2-samba-programs"/> for a list of utilities included in the Samba distribution.</para>	 -->
   </section>
   <section
     id="s2-samba-connect-share">
@@ -235,14 +233,7 @@
       <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 <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>
-</screen> --><!-- RHEL5:  	ddomingo at redhat.com: above replaces below
-			<para>To mount a Samba share to a directory, create the directory if it does not already exist, and execute the following command as root:</para>
-<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>sharename</replaceable> from <replaceable>servername</replaceable> in the local directory <replaceable>/mnt/point/</replaceable>.
       </para>
       <note>
@@ -296,205 +287,7 @@
       <para>
         To configure Samba using a graphical interface, use one of the available Samba graphical user interfaces. A list of available GUIs can be found at <ulink url="http://www.samba.org/samba/GUI/">http://www.samba.org/samba/GUI/</ulink>.
       </para>
-      <!-- RHEL6 mprpic: system-config-samba deprecated <para>To configure Samba using a graphical interface, use the <application>Samba Server Configuration Tool</application>. For command line configuration, skip to <xref linkend="s3-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 <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>
-      <figure
-        float="0"
-        id="fig-s-c-samba">
-        <title>
-          <application>Samba Server Configuration Tool</application>
-        </title>
-        <mediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/s-c-samba.png"
-              format="PNG"
-              scalefit="1"/>
-          </imageobject>
-          <textobject>
-            <para>
-              <application>Samba Server Configuration Tool</application>
-            </para>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <note>
-        <title>Note</title>
-        <para>The <application>Samba Server Configuration Tool</application> does not display shared printers or the default stanza that allows users to view their own home directories on the Samba server.</para>
-      </note>
-      <section
-        id="s4-samba-gui-server-settings">
-        <title>Configuring Server Settings</title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <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 <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"
-          id="fig-samba-basic">
-          <title>Configuring Basic Server Settings</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata
-                fileref="images/s-c-samba-basic.png"
-                format="PNG"/>
-            </imageobject>
-            <textobject>
-              <para>Configuring Basic Server Settings</para>
-            </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 the <filename>/etc/samba/smb.conf</filename> file.</para>
-        <figure
-          float="0"
-          id="fig-samba-security">
-          <title>Configuring Security Server Settings</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata
-                fileref="images/s-c-samba-security.png"
-                format="PNG"/>
-            </imageobject>
-            <textobject>
-              <para>Configuring Security Server Settings</para>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>The <guilabel>Security</guilabel> tab contains the following options:</para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <guilabel>Authentication Mode</guilabel> — This corresponds to the <command>security</command> option. Select one of the following types of authentication.</para>
-            <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 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>
-                  <para>Using a Samba server as a domain member in an ADS realm assumes proper configuration of Kerberos, including the <filename>/etc/krb5.conf</filename> file.</para>
-                </note>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>Domain</guilabel> — The Samba server relies on a Windows NT Primary or Backup Domain Controller to verify the user. The server passes the username and password to the Controller and waits for it to return. Specify the NetBIOS name of the Primary or Backup Domain Controller in the <guilabel>Authentication Server</guilabel> field.</para>
-                <para>The <guilabel>Encrypted Passwords</guilabel> option must be set to <guilabel>Yes</guilabel> if this is selected.</para>
-              </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 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>
-                  <guilabel>Share</guilabel> — Samba users do not have to enter a username and password combination on a per Samba server basis. They are not prompted for a username and password until they try to connect to a specific shared directory from a Samba server.</para>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>User</guilabel> — (Default) Samba users must provide a valid username and password on a per Samba server basis. Select this option if you want the <guilabel>Windows Username</guilabel> option to work. Refer to <xref
-                    linkend="s4-samba-gui-users"/> for details.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Encrypt Passwords</guilabel> — This option must be enabled if the clients are connecting from a system with Windows 98, Windows NT 4.0 with Service Pack 3, or other more recent versions of Microsoft Windows. The passwords are transfered between the server and the client in an encrypted format instead of as a plain-text word that can be intercepted. This corresponds to the <command>encrypted passwords</command> option. Refer to <xref
-                linkend="s3-samba-encrypted-passwords"/> for more information about encrypted Samba passwords.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Guest Account</guilabel> — When users or guest users log into a Samba server, they must be mapped to a valid user on the server. Select one of the existing usernames on the system to be the guest Samba account. When guests log in to the Samba server, they have the same privileges as this user. This corresponds to the <command>guest account</command> option.</para>
-          </listitem>
-        </itemizedlist>
-        <para>After clicking <guibutton>OK</guibutton>, the changes are written to the configuration file and the daemon is restarted; thus, the changes take effect immediately.</para>
-      </section>
-      <section
-        id="s4-samba-gui-users">
-        <title>Managing Samba Users</title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <secondary>graphical configuration</secondary>
-          <tertiary>managing Samba users</tertiary>
-        </indexterm>
-        <para>The <application>Samba Server Configuration Tool</application> requires that an existing user account be active on the system acting as the Samba server before a Samba user can be added. The Samba user is associated with the existing user account.</para>
-        <figure
-          float="0"
-          id="fig-samba-users">
-          <title>Managing Samba Users</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata
-                fileref="images/s-c-samba-users.png"
-                format="PNG"/>
-            </imageobject>
-            <textobject>
-              <para>Managing Samba Users</para>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <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>
-      </section>
-      <section
-        id="s4-samba-gui-add-share">
-        <title>Adding a Share</title>
-        <indexterm
-          significance="normal">
-          <primary>Samba</primary>
-          <secondary>graphical configuration</secondary>
-          <tertiary>adding a share</tertiary>
-        </indexterm>
-        <para>To create a Samba share, click the <guibutton>Add</guibutton> button from the main Samba configuration window.</para>
-        <figure
-          float="0"
-          id="fig-samba-add-share">
-          <title>Adding a Share</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata
-                fileref="images/s-c-samba-create-share.png"
-                format="PNG"/>
-            </imageobject>
-            <textobject>
-              <para>Adding a Samba Share</para>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>The <guilabel>Basic</guilabel> tab configures the following options:</para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <guilabel>Directory</guilabel> — The directory to share via Samba. The directory must exist before it can be entered here.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Share name</guilabel> — The actual name of the share that is seen from remote machines. By default, it is the same value as <guilabel>Directory</guilabel>, but can be configured.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Descriptions</guilabel> — A brief description of the share.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Writable</guilabel> — Enables users to read and write to the shared directory</para>
-          </listitem>
-          <listitem>
-            <para>
-              <guilabel>Visible</guilabel> — Grants read-only rights to users for the shared directory.</para>
-          </listitem>
-        </itemizedlist>
-        <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>
+          </section>
     <section
       id="s3-samba-configuring-cmdline">
       <title>Command Line Configuration</title>
@@ -556,12 +349,7 @@ create mask = 0765</programlisting>
         <primary>Windows XP</primary>
         <secondary>connecting to shares using Samba</secondary>
       </indexterm>
-			<!-- RHEL5:
-			<para>The Microsoft SMB Protocol originally used plain text passwords. However, Windows NT 4.0 with Service Pack 3 or higher, Windows 98, Windows 2000, Windows ME, and Windows XP require encrypted Samba passwords. To use Samba between a Linux system and a system running one of these Windows operating systems, you can either edit your Windows registry to use plaintext passwords or configure Samba on your Linux system to use encrypted passwords. If you choose to modify your Windows registry, you must do so for all of your Windows machines &mdash; however, this is risky and may cause further conflicts. It is recommended that you use encrypted passwords for better security and reliability.</para>
-			 --><!-- RHEL5:  	ddomingo at redhat.com: above replaces below
-			<para>The Microsoft SMB Protocol originally used plain text passwords. However, Windows NT 4.0 with Service Pack 3 or higher, Windows 98, Windows 2000, Windows ME, and Windows XP require encrypted Samba passwords. To use Samba between a Linux system and a
-				system running one of these Windows operating systems, you can either edit your Windows registry to use plaintext passwords or configure Samba on your Linux system to use encrypted passwords. If you choose to modify your registry, you must do so for
-				all of your Windows machines &mdash; this is risky and may cause further conflicts. It is recommended that you use encrypted passwords for better security.</para> -->
+
       <indexterm
         significance="normal">
         <primary>Samba</primary>
@@ -624,7 +412,6 @@ create mask = 0765</programlisting>
     <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 a service manager such as <command>systemctl</command>. Refer to <xref linkend="ch-Services_and_Daemons" /> for more information regarding this tool.</para>
   </section>
-	<!-- RHEL5:   ddomingo at redhat.com: config guide used to be here, moved to before "Starting & Stopping"  -->
   <section
     id="s2-samba-servers">
     <title>Samba Server Types and the <filename>smb.conf</filename> File</title>
@@ -806,15 +593,10 @@ password server = kerberos.example.com</programlisting>
         </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 <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 Red Hat Enterprise Linux 6 <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 <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>
         <note>
           <title>The security option</title>
@@ -851,8 +633,6 @@ guest ok = Yes</programlisting>
           <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 <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>
         <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>
@@ -1126,8 +906,6 @@ idmap gid = 15000-20000 ...
 security = user
 ...</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   -->
       <section
         id="s3-samba-domain-security-mode">
         <title>Domain Security Mode (User-Level Security)</title>
@@ -1184,7 +962,6 @@ security = server
 password server = "NetBIOS_of_Domain_Controller"
 ...</programlisting>
       </section>
-			<!-- RHEL5:   	ddomingo at redhat.com: the following section tag nests all other User-Level Security modes	  -->
     </section>
     <section
       id="s3-samba-share-level">
@@ -1336,31 +1113,8 @@ security = share
             <title>Make sure the openldap-server package is installed</title>
             <para>You need to have the <filename>openldap-server</filename> package installed if you want to use the <command>ldapsam</command> back end.</para>
           </note>
-					<!-- RHEL5:  	tech review: cut!
-							perfect for most organizations, especially large enterprises. LDAP is definitely the "wave of the future" with regards to Samba. Improvements to LDAP are
-							constantly being added into Samba such as easing installation and configuration issues.</para> -->
         </listitem>
       </varlistentry>
-<!-- RHEL6 mprpic: mysqlsam passdb module has been unmaintained and got removed from samba
-	entirely.
-	      <varlistentry>
-        <term>
-          <command>mysqlsam</command>
-        </term>
-        <listitem>
-          <para>The <command>mysqlsam</command> backend uses a MySQL-based database backend. This is useful for sites that already implement MySQL. At present, <command>mysqlsam</command> is now packed in a module separate from Samba, and as such is not officially supported by Samba.</para>
-					RHEL5:  	ddomingo at redhat.com: above replaces below as per fenlason at redhat.com
-						<para>The <command>mysqlsam</command> backend uses a MySQL-based database backend. This is useful for sites that already implement MySQL.</para>
-        </listitem>
-      </varlistentry> -->
-			<!-- RHEL5:  	ddomingo at redhat.com: removed, as per fenlason at redhat.com
-				<varlistentry>
-					<term><command>xmlsam</command></term>
-					<listitem>
-						<para>The <command>xmlsam</command> backend uses account and password data that are stored in an XML formatted file. This method can be useful for migration of different backend databases or backups.</para>
-					</listitem>
-				</varlistentry>
-				 -->
     </variablelist>
 		<!-- RHEL5:  	tech review: cut (closing tag)	</section> -->
   </section>
@@ -1379,10 +1133,7 @@ security = share
     </indexterm>
     <para>
       <firstterm>Network browsing</firstterm> 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>
-		<!-- RHEL5:  	ddomingo at redhat.com: above replaces below, less awkwardness
-		<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 <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!
@@ -1438,9 +1189,6 @@ os level = 0</screen>
         <tertiary>Domain Browsing</tertiary>
       </indexterm>
       <para>By default, a Windows server PDC for a domain is also the domain master browser for that domain. A Samba server must <emphasis>not</emphasis> be set up as a domain master server in this type of situation</para>
-			<!-- 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>/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
@@ -1464,7 +1212,7 @@ os level = 0</screen>
 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>
+        <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 cannot be resolved for the client without WINS.</para>
       </note>
     </section>
   </section>
@@ -1477,9 +1225,6 @@ wins support = Yes</programlisting>
       <secondary>CUPS Printing Support</secondary>
     </indexterm>
     <para>Samba allows client machines to share printers connected to the Samba server. In addition, Samba also allows client machines to send documents built in Linux to Windows printer shares. Although there are other printing systems that function with &MAJOROS;, CUPS (Common UNIX Print System) is the recommended printing system due to its close integration with Samba.</para>
-		<!-- RHEL5:  	ddomingo at redhat.com: above replaces below, less awkwardness
-		<para>Samba allows client machines to share printers connected to the Samba server, as well as send Linux documents to Windows printer shares. Although there are other printing systems that function with &MAJOROS;, CUPS (Common UNIX Print System) is the recommended printing system due to its close integration with Samba.</para>
-		  -->
     <section
       id="s3-samba-cups-smb.conf">
       <title>Simple <filename>smb.conf</filename> Settings</title>
@@ -1508,7 +1253,7 @@ comment = Printer Drivers Share
 path = /var/lib/samba/drivers
 write list = ed, john
 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>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>
     </section>


More information about the docs-commits mailing list