Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Apr 2014 14:26:28 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r44427 - head/en_US.ISO8859-1/books/handbook/network-servers
Message-ID:  <201404031426.s33EQScb017878@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Thu Apr  3 14:26:28 2014
New Revision: 44427
URL: http://svnweb.freebsd.org/changeset/doc/44427

Log:
  Editorial review of Samba chapter.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Apr  3 14:15:46 2014	(r44426)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Apr  3 14:26:28 2014	(r44427)
@@ -4967,16 +4967,33 @@ DocumentRoot /www/someotherdomain.tld
     </indexterm>
 
     <para><application>Samba</application> is a popular open source
-      software package that provides file and print services for
-      &microsoft.windows; clients.  Such clients can connect to and
-      use &os; filespace as if it was a local disk drive, or
-      &os; printers as if they were local printers.</para>
-
-    <para><application>Samba</application> software packages should
-      be included on the &os; installation media.  If they were not
-      installed when first installing &os;, then they may be
-      installed from the <package>net/samba36</package> port or
-      package.</para>
+      software package that provides file and print services using the
+      <acronym>SMB/CIFS</acronym> protocol.  This protocol is built
+      into &microsoft.windows; systems.  It can be added to
+      non-&microsoft.windows; systems by installing the 
+      <application>Samba</application> client libraries.  The protocol
+      allows clients to access
+      shared data and printers.  These shares can be mapped as a local disk drive and
+      shared printers can be used as if they were local printers.</para>
+
+    <para>On &os;, the <application>Samba</application> client
+      libraries can be installed using the
+      <package>net/samba-libsmbclient</package> port or package.  The
+      client provides the ability for a &os; system to access
+      <acronym>SMB/CIFS</acronym> shares in a &microsoft.windows;
+      network.</para>
+
+    <para>A &os; system can also be configured to act as a
+      <application>Samba</application> server.  This allows the
+      administrator to create <acronym>SMB/CIFS</acronym> shares on
+      the &os; system which can be accessed by clients running
+      &microsoft.windows; or the <application>Samba</application>
+      client libraries.  In order to configure a
+      <application>Samba</application> server on &os;, the 
+      <package>net/samba36</package> port or
+      package must first be installed.  The rest of this section
+      provides an overview of how to configure a
+      <application>Samba</application> server on &os;.</para>
 
 <!-- mention LDAP, Active Directory, WinBIND, ACL, Quotas, PAM, .. -->
 
@@ -5006,10 +5023,9 @@ DocumentRoot /www/someotherdomain.tld
 	<para>The Samba Web Administration Tool (SWAT) runs as a
 	  daemon from <application>inetd</application>.  Therefore,
 	  <application>inetd</application> must be enabled as shown in
-	  <xref linkend="network-inetd"/>, and the following line in
-	  <filename>/etc/inetd.conf</filename> should be uncommented
-	  before <application>swat</application> can be used to
-	  configure <application>Samba</application>:</para>
+	  <xref linkend="network-inetd"/>.  To enable
+	  <application>swat</application>, uncomment the following line in
+	  <filename>/etc/inetd.conf</filename>:</para>
 
 	<programlisting>swat   stream  tcp     nowait/400      root    /usr/local/sbin/swat    swat</programlisting>
 
@@ -5017,21 +5033,20 @@ DocumentRoot /www/someotherdomain.tld
 	  the <application>inetd</application> configuration must be
 	  reloaded after this configuration file is changed.</para>
 
-	<para>Once <application>swat</application> has been enabled in
-	  <filename>inetd.conf</filename>, a web browser may be used
+	<para>Once <application>swat</application> has been enabled,
+	  use a web browser
 	  to connect to <uri
 	    xlink:href="http://localhost:901">http://localhost:901</uri>.
-	  At first login, the system <systemitem
-	    class="username">root</systemitem> account must be
-	  used.</para>
+	  At first login, enter the credentials for <systemitem
+	    class="username">root</systemitem>.</para>
 
 <!-- XXX screenshots go here, loader is creating them
      XXXTR: I'll believe it when I see it.  -->
 
-	<para>Once successfully logging on to the main
-	  <application>Samba</application> configuration page, the
-	  system documentation will be available, or configuration may
-	  begin by clicking on the <guimenu>Globals</guimenu> tab.
+	<para>Once logged in, the main
+	  <application>Samba</application> configuration page and the
+	  system documentation will be available.  Begin configuration
+	  by clicking on the <guimenu>Globals</guimenu> tab.
 	  The <guimenu>Globals</guimenu> section corresponds to the
 	  variables that are set in the <literal>[global]</literal>
 	  section of
@@ -5041,8 +5056,8 @@ DocumentRoot /www/someotherdomain.tld
       <sect3>
 	<title>Global Settings</title>
 
-	<para>Whether <application>swat</application> is being used or
-	  <filename>/usr/local/etc/smb.conf</filename> is being edited
+	<para>Whether <application>swat</application> is used or
+	  <filename>/usr/local/etc/smb.conf</filename> is edited
 	  directly, the first directives encountered when configuring
 	  <application>Samba</application> are:</para>
 
@@ -5051,7 +5066,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>workgroup</literal></term>
 
 	    <listitem>
-	      <para>NT Domain-Name or Workgroup-Name for the computers
+	      <para>The domain name or workgroup name for the computers
 		that will be accessing this server.</para>
 	    </listitem>
 	  </varlistentry>
@@ -5060,7 +5075,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>netbios name</literal></term>
 
 	    <listitem>
-	      <para>This sets the NetBIOS name by which a
+	      <para>The NetBIOS name by which a
 		<application>Samba</application> server is known.
 		By default it is the same as the first component of
 		the host's <acronym>DNS</acronym> name.</para>
@@ -5071,7 +5086,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>server string</literal></term>
 
 	    <listitem>
-	      <para>This sets the string that will be displayed with
+	      <para>The string that will be displayed with
 		the <command>net view</command> command and some other
 		networking tools that seek to display descriptive text
 		about the server.</para>
@@ -5085,7 +5100,7 @@ DocumentRoot /www/someotherdomain.tld
 
 	<para>Two of the most important settings in
 	  <filename>/usr/local/etc/smb.conf</filename> are the
-	  security model chosen, and the backend password format for
+	  security model and the backend password format for
 	  client users.  The following directives control these
 	  options:</para>
 
@@ -5094,11 +5109,11 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>security</literal></term>
 
 	    <listitem>
-	      <para>The two most common options here are
+	      <para>The two most common options are
 		<literal>security = share</literal> and
 		<literal>security = user</literal>.  If the clients
 		use usernames that are the same as their usernames on
-		the &os; machine then user level security should be
+		the &os; machine, user level security should be
 		used.  This is the default security policy and it
 		requires clients to first log on before they can
 		access shared resources.</para>
@@ -5133,74 +5148,59 @@ DocumentRoot /www/someotherdomain.tld
 	  backend is used, the
 	  <filename>/usr/local/etc/samba/smbpasswd</filename> file
 	  must be created to allow <application>Samba</application> to
-	  authenticate clients.  To provide the &unix; user accounts
+	  authenticate clients.  To provide &unix; user accounts
 	  access from &windows; clients, use the following
-	  command:</para>
+	  command to add each required user to that file:</para>
 
-	<screen>&prompt.root; <userinput>smbpasswd -a username</userinput></screen>
+	<screen>&prompt.root; <userinput>smbpasswd -a <replaceable>username</replaceable></userinput></screen>
 
 	<note>
 	  <para>The recommended backend is now
-	    <literal>tdbsam</literal>, and the following command
-	    should be used to add user accounts:</para>
+	    <literal>tdbsam</literal>.  If this backend is selected, use the following command
+	    to add user accounts:</para>
 
 	  <screen>&prompt.root; <userinput>pdbedit -a -u <replaceable>username</replaceable></userinput></screen>
 	</note>
 
-	<para>Please see the <link
+	<para>This section has only mentioned the most commonly used
+	  settings.  Refer to the <link
 	    xlink:href="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/">Official
-	    Samba HOWTO</link> for additional information about
-	  configuration options.  With the basics outlined here, the
-	  minimal required start running
-	  <application>Samba</application> will be explained.  Other
-	  documentation should be consulted in addition to the
-	  information here.</para>
+	    Samba HOWTO</link> for additional information about the
+	  available configuration options.</para>
       </sect3>
     </sect2>
 
     <sect2>
       <title>Starting <application>Samba</application></title>
 
-      <para>The <package>net/samba36</package> port adds a new startup
-	script, which can be used to control
-	<application>Samba</application>.  To enable this script, so
-	that it can be used for example to start, stop or restart
-	<application>Samba</application>, add the following line to
-	the <filename>/etc/rc.conf</filename> file:</para>
+      <para>To enable
+	<application>Samba</application> at boot time, add the following line to
+	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>samba_enable="YES"</programlisting>
 
-      <para>Or, for fine grain control:</para>
+      <para>Alternately, its services can be started separately:</para>
 
       <programlisting>nmbd_enable="YES"</programlisting>
 
       <programlisting>smbd_enable="YES"</programlisting>
 
-      <note>
-	<para>This will also configure
-	  <application>Samba</application> to automatically start at
-	  system boot time.</para>
-      </note>
-
-      <para>It is possible then to start
-	<application>Samba</application> at any time by typing:</para>
+      <para>To start
+	<application>Samba</application> now:</para>
 
       <screen>&prompt.root; <userinput>service samba start</userinput>
 Starting SAMBA: removing stale tdbs :
 Starting nmbd.
 Starting smbd.</screen>
 
-      <para>Please refer to <xref linkend="configtuning-rcd"/> for
-	more information about using rc scripts.</para>
-
-      <para><application>Samba</application> actually consists of
-	three separate daemons.  Notice that both the
+      <para><application>Samba</application> consists of
+	three separate daemons.  Both the
 	<application>nmbd</application> and
-	<application>smbd</application> daemons are started by the
-	<filename>samba</filename> script.  If winbind,
-	name resolution services were enabled in
+	<application>smbd</application> daemons are started by
+	<varname>samba_enable</varname>.  If winbind
+	name resolution services are enabled in
 	<filename>smb.conf</filename>,
-	the <application>winbindd</application> daemon will be
+	the <application>winbindd</application> daemon is
 	started as well.</para>
 
       <para><application>Samba</application> may be stopped at any
@@ -5211,8 +5211,8 @@ Starting smbd.</screen>
       <para><application>Samba</application> is a complex software
 	suite with functionality that allows broad integration with
 	&microsoft.windows; networks.  For more information about
-	functionality beyond the basic installation described here,
-	please see <uri
+	functionality beyond the basic configuration described here,
+	refer to <uri
 	  xlink:href="http://www.samba.org">http://www.samba.org</uri>.</para>;
     </sect2>
   </sect1>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404031426.s33EQScb017878>