[system-administrators-guide] Samba: Removing very old hidden text

stephenw stephenw at fedoraproject.org
Tue Aug 12 05:30:25 UTC 2014


commit 5fe563a7bd52b8273cc8b30436725f685b42936b
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Mon Aug 11 23:44:55 2014 +0200

    Samba: Removing very old hidden text

 en-US/Samba.xml |   90 +------------------------------------------------------
 1 files changed, 1 insertions(+), 89 deletions(-)
---
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index b201af5..d9ad9f7 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -243,7 +243,6 @@
       </warning>
     </section>
   </section>
-	<!-- RHEL5:   ddomingo at redhat.com: moved SAMBA config guide to here	  -->
   <section
     id="s2-samba-configuring">
     <title>Configuring a Samba Server</title>
@@ -1100,8 +1099,8 @@ security = share
         </listitem>
       </varlistentry>
     </variablelist>
-		<!-- RHEL5:  	tech review: cut (closing tag)	</section> -->
   </section>
+
   <section
     id="s2-samba-network-browsing">
     <title>Samba Network Browsing</title>
@@ -1117,52 +1116,8 @@ 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>
-
     <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="s3-samba-workgroup-browsing">
-			<title>Workgroup Browsing</title>
-			<indexterm significance="normal">
-				<primary>Samba</primary>
-				<secondary>Network Browsing</secondary>
-				<tertiary>Workgroup Browsing</tertiary>
-			</indexterm>
-			<para>For each workgroup, there must be one and only one domain master browser. You can have one local master browser per subnet without a domain master browser, but this results in isolated workgroups unable to see each other. To resolve NetBIOS names in
-				cross-subnet workgroups, WINS is required.</para>
-			<note>
-				<title>Note</title>
-				<para>The Domain Master Browser can be the same machine as the WINS server.</para>
-			</note>
-			<para>There can only be one domain master browser per workgroup name. Here is an example of the <filename>smb.conf</filename> file in which the Samba server is a domain master browser:</para>
-<screen>[global]
-domain master = Yes
-local master = Yes
-preferred master = Yes
-os level = 35</screen>
-			<para>Next is an example of the <filename>smb.conf</filename> file in which the Samba server is a local master browser:</para>
-<screen>[global]
-domain master = no
-local master = Yes
-preferred master = Yes
-os level = 35</screen>
-			<para>The <command>os level</command> directive operates as a priority system for master browsers in a subnet. Setting different values ensures master browsers do not conflict with each other for authority.</para>
-			<note><title>Tip</title>
-				<para>Lowering the <command>os level</command> directive results in Samba conflicting with other master browsers on the same subnet. The higher the value, the higher the priority. The highest a Windows server can operate at is 32. This is a
-					good way of tuning multiple local master browsers.</para>
-			</note>
-			<para>There are instances when a Windows NT machine on the subnet could be the local master browser. The following is an example <filename>smb.conf</filename> configuration in which the Samba server is not serving in any browsing capacity:</para>
-<screen>[global]
-domain master = no
-local master = no
-preferred master = no
-os level = 0</screen>
-			<warning>
-				<title>Warning</title>
-				<para>Having multiple local master browsers result in each server competing for browsing election requests. Make sure there is only one local master browser per subnet.</para>
-			</warning>
-		</section>
-	 -->
     <section
       id="s3-samba-domain-browsing">
       <title>Domain Browsing</title>
@@ -1347,7 +1302,6 @@ User name             Comment
 andriusb              Documentation
 joe                   Marketing
 lisa                  Sales</screen>
-		<!-- RHEL5:  	</section> -->
     <bridgehead id="s3-samba-programs-nmblookup">
       <filename>nmblookup</filename>
     </bridgehead>
@@ -1371,7 +1325,6 @@ lisa                  Sales</screen>
 <userinput>~]$&nbsp;nmblookup trek</userinput>
 querying trek on 10.1.59.255
 10.1.56.45 trek&lt;00&gt;</screen>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-pdbedit">
       <filename>pdbedit</filename>
     </bridgehead>
@@ -1442,7 +1395,6 @@ kristin:506:
 <userinput>~]$&#160;pdbedit -x joe</userinput>
 <userinput>~]$&#160;pdbedit -L</userinput>
 andriusb:505: lisa:504: kristin:506:</screen>
-		<!-- RHEL5:  	</section> -->
     <bridgehead id="s3-samba-programs-rpcclient">
       <filename>rpcclient</filename>
     </bridgehead>
@@ -1461,7 +1413,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>rpcclient <replaceable>server options</replaceable></command></screen>
     <para>The <command>rpcclient</command> program issues administrative commands using Microsoft RPCs, which provide access to the Windows administration graphical user interfaces (GUIs) for systems management. This is most often used by advanced users that understand the full complexity of Microsoft RPCs.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-smbcacls">
       <filename>smbcacls</filename>
     </bridgehead>
@@ -1480,7 +1431,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>smbcacls <replaceable>//server/share filename options</replaceable></command></screen>
     <para>The <command>smbcacls</command> program modifies Windows ACLs on files and directories shared by a Samba server or a Windows server.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-smbclient">
       <filename>smbclient</filename>
     </bridgehead>
@@ -1499,7 +1449,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>smbclient <replaceable>//server/share password options</replaceable></command></screen>
     <para>The <command>smbclient</command> program is a versatile UNIX client which provides functionality similar to <command>ftp</command>.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-smbcontrol">
       <filename>smbcontrol</filename>
     </bridgehead>
@@ -1519,38 +1468,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     <screen><command>smbcontrol -i <replaceable>options</replaceable></command></screen>
     <screen><command>smbcontrol <replaceable>options destination messagetype parameters</replaceable></command></screen>
     <para>The <command>smbcontrol</command> program sends control messages to running <command>smbd</command>, <command>nmbd</command>, or <command>winbindd</command> daemons. Executing <command>smbcontrol -i</command> runs commands interactively until a blank line or a <parameter>'q'</parameter> is entered.</para>
-		<!-- RHEL5:  		</section> --><!-- RHEL5:  	tech review: remove!
-		<formalpara id="s3-samba-programs-smbgroupedit">
-			<title><filename>smbgroupedit</filename></title>
-			<indexterm significance="normal">
-				<primary>Samba</primary>
-				<secondary>Programs</secondary>
-				<tertiary><command>smbgroupedit</command>
-				</tertiary>
-			</indexterm>
-			<indexterm significance="normal">
-				<primary><command>smbgroupedit</command> program</primary>
-			</indexterm>
-			<para><command>smbgroupedit <replaceable>&lt;options&gt;</replaceable></command></para>
-		</formalpara>
-			<para>The <command>smbgroupedit</command> program maps between Linux groups and Windows groups. It also allows a Linux group to be a domain group.</para> --><!-- RHEL5:  		</section> --><!-- RHEL5:  	ddomingo at redhat.com: smbmount is gone! as per fenlason at redhat.com
-		<section id="s3-samba-programs-smbmount">
-			<title><filename>smbmount</filename></title>
-			<indexterm significance="normal">
-				<primary>Samba</primary>
-				<secondary>Programs</secondary>
-				<tertiary><command>smbmount</command>
-				</tertiary>
-			</indexterm>
-			<indexterm significance="normal">
-				<primary><command>smbmount</command> program</primary>
-			</indexterm>
-			<para><command>smbmount <replaceable>&lt;//server/share&gt; &lt;mount_point&gt; &lt;-o options&gt;</replaceable></command></para>
-			<para>The <command>smbmount</command> program uses the low-level <command>smbmnt</command> program to mount an smbfs file system (Samba share). The <command>mount -t smbfs <replaceable>&lt;//server/share&gt;
-				&lt;mount_point&gt; &lt;-o options&gt;</replaceable></command> command also works.</para>
-			<para>For example:</para>
-<screen><userinput>smbmount //wakko/html /mnt/html -o username=kristin</userinput> Password: <userinput>&lt;password&gt;</userinput> [root at yakko /]# <userinput>ls -l /mnt/html</userinput> total 0 -rwxr-xr-x    1 root     root            0 Jan 29 08:09 index.html</screen>
-		</section> -->
     <bridgehead id="s3-samba-programs-smbpasswd">
       <filename>smbpasswd</filename>
     </bridgehead>
@@ -1568,7 +1485,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
         <command>smbpasswd</command> program</primary>
     </indexterm>
     <screen><command>smbpasswd <replaceable>options username password</replaceable></command></screen>
-		<!-- RHEL5:  		</section> -->
     <para>The <command>smbpasswd</command> program manages encrypted passwords. This program can be run by a superuser to change any user's password and also by an ordinary user to change their own Samba password.</para>
     <bridgehead id="s3-samba-programs-smbspool">
       <filename>smbspool</filename>
@@ -1588,7 +1504,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>smbspool <replaceable>job user title copies options filename</replaceable></command></screen>
     <para>The <command>smbspool</command> program is a CUPS-compatible printing interface to Samba. Although designed for use with CUPS printers, <command>smbspool</command> can work with non-CUPS printers as well.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-smbstatus">
       <filename>smbstatus</filename>
     </bridgehead>
@@ -1607,7 +1522,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>smbstatus <replaceable>options</replaceable></command></screen>
     <para>The <command>smbstatus</command> program displays the status of current connections to a Samba server.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-smbtar">
       <filename>smbtar</filename>
     </bridgehead>
@@ -1626,7 +1540,6 @@ andriusb:505: lisa:504: kristin:506:</screen>
     </indexterm>
     <screen><command>smbtar <replaceable>options</replaceable></command></screen>
     <para>The <command>smbtar</command> program performs backup and restores of Windows-based share files and directories to a local tape archive. Though similar to the <command>tar</command> command, the two are not compatible.</para>
-		<!-- RHEL5:  		</section> -->
     <bridgehead id="s3-samba-programs-testparm">
       <filename>testparm</filename>
     </bridgehead>
@@ -1719,7 +1632,6 @@ Press enter to see a dump of your service definitions
     </indexterm>
     <screen><command>wbinfo <replaceable>options</replaceable></command></screen>
     <para>The <command>wbinfo</command> program displays information from the <command>winbindd</command> daemon. The <command>winbindd</command> daemon must be running for <command>wbinfo</command> to work.</para>
-		<!-- RHEL5:  		</section> -->
   </section>
   <section
     id="s2-samba-resources">


More information about the docs-commits mailing list