Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 18:39:12 +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: r42968 - head/en_US.ISO8859-1/books/handbook/network-servers
Message-ID:  <201310151839.r9FIdCBu020798@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Tue Oct 15 18:39:12 2013
New Revision: 42968
URL: http://svnweb.freebsd.org/changeset/doc/42968

Log:
  Another dent in this very large chapter. This patch does the following:
  - fixes &os; and most instances of "you"
  - fixes manual page repitition
  - some word-smithing
  - some heading tightening in the NIS section
  - some clarification in the NIS server section

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	Tue Oct 15 16:57:03 2013	(r42967)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 18:39:12 2013	(r42968)
@@ -156,7 +156,7 @@
 	<application>auth</application>, and
 	<application>daytime</application>.</para>
 
-      <para>This section will cover the basics in configuring
+      <para>This section covers the basics in configuring
 	<application>inetd</application> through its command-line
 	options and its configuration file,
 	<filename>/etc/inetd.conf</filename>.</para>
@@ -191,7 +191,7 @@
 
       <para>Like most server daemons, <application>inetd</application>
 	has a number of options that it can be passed in order to
-	modify its behaviour.  See the &man.inetd.8; manual page for
+	modify its behaviour.  Refer to &man.inetd.8; for
 	the full list of options.</para>
 
       <para>Options can be passed to <application>inetd</application>
@@ -207,8 +207,8 @@
 	users may be pleased to note that these parameters usually do
 	not need to be modified.  These options may be useful if
 	an excessive amount of connections are being established.
-	A full list of options can be found in the
-	&man.inetd.8; manual.</para>
+	A full list of options can be found in
+	&man.inetd.8;.</para>
 
       <variablelist>
 	<varlistentry>
@@ -264,7 +264,7 @@
       <title><filename>inetd.conf</filename></title>
 
       <para>Configuration of <application>inetd</application> is
-	done via the file <filename>/etc/inetd.conf</filename>.</para>
+	done by editing <filename>/etc/inetd.conf</filename>.</para>
 
       <para>When a modification is made to
 	<filename>/etc/inetd.conf</filename>,
@@ -515,8 +515,8 @@ server-program-arguments</programlisting
 	<literal>max-child-per-ip</literal> can be used to limit such
 	attacks.</para>
 
-      <para>By default, TCP wrapping is turned on.  Consult the
-	&man.hosts.access.5; manual page for more information on
+      <para>By default, TCP wrapping is turned on.  Consult
+	&man.hosts.access.5; for more information on
 	placing TCP restrictions on various
 	<application>inetd</application> invoked daemons.</para>
     </sect2>
@@ -536,7 +536,7 @@ server-program-arguments</programlisting
 	identity network services, and is configurable to a certain
 	degree, whilst the others are simply on or off.</para>
 
-      <para>Consult the &man.inetd.8; manual page for more in-depth
+      <para>Consult &man.inetd.8; for more in-depth
 	information.</para>
     </sect2>
   </sect1>
@@ -592,8 +592,7 @@ server-program-arguments</programlisting
       </listitem>
 
       <listitem>
-	<para>Removable media storage devices, such as floppy disks
-	  or <acronym>CD-ROM</acronym> drives, can be used by other
+	<para>Removable media storage devices can be used by other
 	  machines on the network.  This reduces the number of devices
 	  throughout the network and provides a centralized location
 	  to manage their security.</para>
@@ -840,7 +839,7 @@ mountd_flags="-r"</programlisting>
 
       <programlisting>server:/home	/mnt	nfs	rw	0	0</programlisting>
 
-      <para>The &man.fstab.5; manual page lists all the available
+      <para>Refer to &man.fstab.5; for a description of all available
 	options.</para>
     </sect2>
 
@@ -870,7 +869,7 @@ rpc_statd_enable="YES"</programlisting>
       <para>If locking is not required on the server, the
 	<acronym>NFS</acronym> client can be configured to lock
 	locally by passing <option>-L</option> to &man.mount.nfs.8;.
-	Refer to the &man.mount.nfs.8; manual page for further
+	Refer to &man.mount.nfs.8; for further
 	details.</para>
     </sect2>
 
@@ -1009,7 +1008,7 @@ Exports list on foobar:
 	<filename>/etc/amd.conf</filename> defines some of the more
 	advanced features of <application>amd</application>.</para>
 
-      <para>Consult the &man.amd.8; and &man.amd.conf.5; manual pages
+      <para>Consult &man.amd.8; and &man.amd.conf.5;
 	for more information.</para>
     </sect2>
   </sect1>
@@ -1037,7 +1036,7 @@ Exports list on foobar:
       </authorgroup>
     </sect1info>
     -->
-      <title>Network Information System (NIS/YP)</title>
+      <title>Network Information System (<acronym>NIS</acronym>)</title>
 
       <indexterm><primary>NIS</primary></indexterm>
       <indexterm><primary>Solaris</primary></indexterm>
@@ -1071,7 +1070,7 @@ Exports list on foobar:
 	domain to share a common set of configuration files.  This
 	permits a system administrator to set up
 	<acronym>NIS</acronym> client systems with only minimal
-	configuration data and add, remove or modify configuration
+	configuration data and to add, remove, or modify configuration
 	data from a single location.</para>
 
     <sect2>
@@ -1105,9 +1104,9 @@ Exports list on foobar:
 	    <row>
 	      <entry><acronym>NIS</acronym> domain name</entry>
 
-	      <entry>An <acronym>NIS</acronym> master server and all
-		of its clients, including its slave servers, share a
-		<acronym>NIS</acronym> domain name which does not have
+	      <entry><acronym>NIS</acronym> servers and
+		clients share an
+		<acronym>NIS</acronym> domain name.  Typically, this name does not have
 		anything to do with <acronym>DNS</acronym>.</entry>
 	    </row>
 
@@ -1192,7 +1191,7 @@ Exports list on foobar:
 	    clients are stored on the master server.  While it is
 	    possible for one machine to be an <acronym>NIS</acronym>
 	    master server for more than one <acronym>NIS</acronym>
-	    domain, this will not be covered in chapter as it
+	    domain, this type of configuration will not be covered in this chapter as it
 	    assumes a relatively small-scale <acronym>NIS</acronym>
 	    environment.</para>
 	</listitem>
@@ -1233,13 +1232,13 @@ Exports list on foobar:
       <title>Planning Considerations</title>
 
       <para>This section describes a sample <acronym>NIS</acronym>
-	environment which consists of 15 &os; machines and which
-	  currently has no centralized point of administration.  Each
+	environment which consists of 15 &os; machines with
+	  no centralized point of administration.  Each
 	  machine has its own <filename>/etc/passwd</filename> and
 	  <filename>/etc/master.passwd</filename>.  These files are
 	  kept in sync with each other only through manual
 	  intervention.  Currently, when a user is added to the lab,
-	  the process must be repeated on all 15 machines..</para>
+	  the process must be repeated on all 15 machines.</para>
 
 	<para>The configuration of the lab will be as follows:</para>
 
@@ -1288,7 +1287,7 @@ Exports list on foobar:
 	  </tgroup>
 	</informaltable>
 
-	<para>If this is the first time a <acronym>NIS</acronym>
+	<para>If this is the first time an <acronym>NIS</acronym>
 	  scheme is being developed, it should be thoroughly planned
 	  ahead of time.  Regardless of network size, several
 	  decisions need to be made as part of the planning
@@ -1346,14 +1345,14 @@ Exports list on foobar:
       </sect2>
 
       <sect2>
-	<title>Configuring the <acronym>NIS</acronym> Servers</title>
+	<title>Configuring the <acronym>NIS</acronym> Master Server</title>
 
 	<para> The canonical copies of all <acronym>NIS</acronym>
 	  files are stored on the master server.  The databases used
 	  to store the information are called <acronym>NIS</acronym>
 	  maps.  In &os;, these maps are stored in
-	  <filename>/var/yp/[domain name]</filename> where
-	  <filename>[domain name]</filename> is the name of the
+	  <filename>/var/yp/[domainname]</filename> where
+	  <filename>[domainname]</filename> is the name of the
 	  <acronym>NIS</acronym> domain.  Since multiple domains are
 	  supported, it is possible to have several directories, one
 	  for each domain.  Each domain will have its own independent
@@ -1367,10 +1366,6 @@ Exports list on foobar:
 	  database file, and transmitting data from the database back
 	  to the client.</para>
 
-	<sect3>
-	  <title>Setting Up a <acronym>NIS</acronym> Master
-	    Server</title>
-
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>server configuration</secondary>
@@ -1408,11 +1403,25 @@ Exports list on foobar:
 	    </step>
 	  </procedure>
 
-	  <para>Depending on the <acronym>NIS</acronym> setup,
-	    additional entries may be required.  Refer to <xref
-	      linkend="network-nis-server-is-client"/> if the
-	    <acronym>NIS</acronym> server is also an
-	    <acronym>NIS</acronym> clients.</para>
+      <para>Care must be taken
+	in a multi-server domain
+	where the server machines are also <acronym>NIS</acronym>
+	clients.  It is generally a good idea to force the servers to
+	bind to themselves rather than allowing them to broadcast bind
+	requests and possibly become bound to each other.  Strange
+	failure modes can result if one server goes down and others
+	are dependent upon it.  Eventually, all the clients will time
+	out and attempt to bind to other servers, but the delay
+	involved can be considerable and the failure mode is still
+	present since the servers might bind to each other all over
+	again.</para>
+
+      <para>A server that is also a client can be forced to bind to a particular server by
+	adding these additional lines to
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>nis_client_enable="YES" # run client stuff as well
+nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
 
 	  <para>After saving the edits, type
 	    <command>/etc/netstart</command> to restart the network
@@ -1422,7 +1431,6 @@ Exports list on foobar:
 	    &man.ypserv.8;:</para>
 
 	  <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
-	</sect3>
 
 	<sect3>
 	  <title>Initializing the <acronym>NIS</acronym>
@@ -1432,13 +1440,12 @@ Exports list on foobar:
 	    <primary>NIS</primary>
 	    <secondary>maps</secondary>
 	  </indexterm>
-	  <para><acronym>NIS</acronym> maps are database files stored
-	    in <filename class="directory">/var/yp</filename>.  They
-	    are generated from configuration files in <filename
+	  <para><acronym>NIS</acronym> maps
+	    are generated from the configuration files in <filename
 	      class="directory">/etc</filename> on the
 	    <acronym>NIS</acronym> master, with one exception:
 	    <filename>/etc/master.passwd</filename>.  This is to
-	    prevent the propagation passwords to all the servers in
+	    prevent the propagation of passwords to all the servers in
 	    the <acronym>NIS</acronym> domain.  Therefore, before the
 	    <acronym>NIS</acronym> maps are initialized, configure the
 	    primary password files:</para>
@@ -1457,7 +1464,7 @@ Exports list on foobar:
 	      group or world readable by setting its permissions to
 	      <literal>600</literal>.</para></note>
 
-	  <para>When this task has been completed, it is time to
+	  <para>After completing this task,
 	    initialize the <acronym>NIS</acronym> maps.  &os; includes
 	    the &man.ypinit.8; script to do this.  When generating
 	    maps for the master server, include
@@ -1488,25 +1495,21 @@ Is this correct?  [y/n: y] <userinput>y<
 NIS Map update completed.
 ellington has been setup as an YP master server without any errors.</screen>
 
-	  <para>At this point, <command>ypinit</command> should have
-	    created <filename>/var/yp/Makefile</filename> from
-	    <filename>/var/yp/Makefile.dist</filename>.  When created,
-	    this file assumes that the operating environment is a
-	    single server <acronym>NIS</acronym> system with only &os;
-	    machines.  Since <literal>test-domain</literal> has a
-	    slave server as well, edit
-	    <filename>/var/yp/Makefile</filename> as well:</para>
-
-	  <screen>ellington&prompt.root; <userinput>vi /var/yp/Makefile</userinput></screen>
-
-	  <para>You should comment out the line that says</para>
+	  <para>This will
+	    create <filename>/var/yp/Makefile</filename> from
+	    <filename>/var/yp/Makefile.dist</filename>.  By default,
+	    this file assumes that the environment has a
+	    single <acronym>NIS</acronym> server with only &os;
+	    clients.  Since <literal>test-domain</literal> has a
+	    slave server, edit this line in
+	    <filename>/var/yp/Makefile</filename> so that it begins with a 
+	    comment (<literal>#</literal>):</para>
 
 	  <programlisting>NOPUSH = "True"</programlisting>
-
-	  <para>(if it is not commented out already).</para>
 	</sect3>
+      </sect2>
 
-	<sect3>
+	<sect2>
 	  <title>Setting up a <acronym>NIS</acronym> Slave
 	    Server</title>
 
@@ -1515,15 +1518,14 @@ ellington has been setup as an YP master
 	    <secondary>slave server</secondary>
 	  </indexterm>
 	  <para>Setting up an <acronym>NIS</acronym> slave server is
-	    even more simple than setting up the master.  Log on to
-	    the slave server and edit the file
-	    <filename>/etc/rc.conf</filename> as you did before.  The
-	    only difference is that we now must use the
-	    <option>-s</option> option when running
-	    <command>ypinit</command>.  The <option>-s</option> option
-	    requires the name of the <acronym>NIS</acronym> master be
-	    passed to it as well, so our command line looks
-	    like:</para>
+	    simpler than setting up the master.  Log on to
+	    the slave server and edit
+	    <filename>/etc/rc.conf</filename> as before.  This
+	    time, include
+	    <option>-s</option> when running
+	    <command>ypinit</command>.  This option
+	    requires the name of the <acronym>NIS</acronym> master, as 
+	    seen in this example:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
 
@@ -1605,9 +1607,9 @@ Remember to update map ypservers on elli
 	<para>Now, run the command <command>/etc/netstart</command>
 	  on the slave server as well, which again starts the NIS
 	  server.</para>
-      </sect3>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Setting Up a <acronym>NIS</acronym> Client</title>
 
 	<para>An <acronym>NIS</acronym> client establishes what is
@@ -1639,7 +1641,7 @@ Remember to update map ypservers on elli
 	  <secondary>client configuration</secondary>
 	</indexterm>
 
-	<para>Setting up a FreeBSD machine to be a
+	<para>Setting up a &os; machine to be a
 	  <acronym>NIS</acronym> client is fairly
 	  straightforward.</para>
 
@@ -1708,7 +1710,6 @@ nis_client_enable="YES"</programlisting>
 	<para>After completing these steps, the command,
 	  <command>ypcat passwd</command>, should show the
 	  server's passwd map.</para>
-      </sect3>
     </sect2>
 
     <sect2>
@@ -2350,35 +2351,6 @@ TWO       (,hotel,test-domain)
 	servers still in use today.</para>
     </sect2>
 
-    <sect2 id="network-nis-server-is-client">
-      <title><acronym>NIS</acronym> Servers That Are Also
-	<acronym>NIS</acronym> Clients</title>
-
-      <para>Care must be taken when running
-	<application>ypserv</application> in a multi-server domain
-	where the server machines are also <acronym>NIS</acronym>
-	clients.  It is generally a good idea to force the servers to
-	bind to themselves rather than allowing them to broadcast bind
-	requests and possibly become bound to each other.  Strange
-	failure modes can result if one server goes down and others
-	are dependent upon it.  Eventually all the clients will time
-	out and attempt to bind to other servers, but the delay
-	involved can be considerable and the failure mode is still
-	present since the servers might bind to each other all over
-	again.</para>
-
-      <para>A host may be forced to bind to a particular server by
-	running <command>ypbind</command> with the <option>-S</option>
-	flag.  Add the following lines to
-	<filename>/etc/rc.conf</filename> to enable this feature
-	during every system boot:</para>
-
-      <programlisting>nis_client_enable="YES" # run client stuff as well
-nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
-
-      <para>See &man.ypbind.8; for further information.</para>
-    </sect2>
-
     <sect2>
       <title>Password Formats</title>
 
@@ -2663,9 +2635,9 @@ TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</pro
 
       <para>There will be a prompt for entering the password and,
 	if the process does not fail, a password hash will be added
-	to the end of <filename>slapd.conf</filename>.  The
+	to the end of <filename>slapd.conf</filename>.
 	<command>slappasswd</command> understands several hashing
-	formats, refer to the manual page for more information.</para>
+	formats, refer to its manual page for more information.</para>
 
       <para>Edit
 	<filename>/usr/local/etc/openldap/slapd.conf</filename> and
@@ -2831,7 +2803,7 @@ result: 0 Success
     <para>DHCP, the Dynamic Host Configuration Protocol, describes
       the means by which a system can connect to a network and
       obtain the necessary information for communication upon that
-      network.  FreeBSD uses the OpenBSD <command>dhclient</command>
+      network.  &os; uses the OpenBSD <command>dhclient</command>
       taken from OpenBSD&nbsp;3.7.  All information here regarding
       <command>dhclient</command> is for use with either of the ISC
       or OpenBSD DHCP clients.  The DHCP server is the one included
@@ -2840,12 +2812,12 @@ result: 0 Success
     <para>This section describes both the client-side components of
       the ISC and OpenBSD DHCP client and server-side components of
       the ISC DHCP system.  The client-side program,
-      <command>dhclient</command>, comes integrated within FreeBSD,
+      <command>dhclient</command>, comes integrated within &os;,
       and the server-side portion is available from the <filename
-      role="package">net/isc-dhcp42-server</filename> port.  The
+      role="package">net/isc-dhcp42-server</filename> port.  Refer to
       &man.dhclient.8;, &man.dhcp-options.5;, and
-      &man.dhclient.conf.5; manual pages, in addition to the
-      references below, are useful resources.</para>
+      &man.dhclient.conf.5;, in addition to the
+      references below, for more information.</para>
 
     <sect2>
       <title>How It Works</title>
@@ -2869,7 +2841,7 @@ result: 0 Success
     </sect2>
 
     <sect2>
-      <title>FreeBSD Integration</title>
+      <title>&os; Integration</title>
 
       <para>&os; fully integrates the OpenBSD DHCP client,
 	<command>dhclient</command>.  DHCP client support is provided
@@ -2998,24 +2970,23 @@ dhclient_flags=""</programlisting>
 	  <para><command>dhclient</command> requires a configuration
 	    file, <filename>/etc/dhclient.conf</filename>.  Typically
 	    the file contains only comments, the defaults being
-	    reasonably sane.  This configuration file is described by
-	    the &man.dhclient.conf.5; manual page.</para>
+	    reasonably sane.  This configuration file is described in
+	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient</filename></para>
 
-	  <para><command>dhclient</command> is statically linked and
-	    resides in <filename>/sbin</filename>.  The
-	    &man.dhclient.8; manual page gives more information about
-	    <command>dhclient</command>.</para>
+	  <para>More information
+	    about
+	    <command>dhclient</command> can be found in &man.dhclient.8;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
 	  <para><command>dhclient-script</command> is the
-	    FreeBSD-specific DHCP client configuration script.  It
+	    &os;-specific DHCP client configuration script.  It
 	    is described in &man.dhclient-script.8;, but should not
 	    need any user modification to function properly.</para>
 	</listitem>
@@ -3047,7 +3018,7 @@ dhclient_flags=""</programlisting>
 	<title>What This Section Covers</title>
 
 	<para>This section provides information on how to configure a
-	  FreeBSD system to act as a DHCP server using the ISC
+	  &os; system to act as a DHCP server using the ISC
 	  (Internet Systems Consortium) implementation of the DHCP
 	  server.</para>
 
@@ -3235,10 +3206,9 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	    <para><application>dhcpd</application> is statically
 	      linked and resides in
-	      <filename>/usr/local/sbin</filename>.  The &man.dhcpd.8;
-	      manual page installed with the port gives more
+	      <filename>/usr/local/sbin</filename>.   More
 	      information about
-	      <application>dhcpd</application>.</para>
+	      <application>dhcpd</application> can be found in &man.dhcpd.8;.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3251,8 +3221,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      needs to contain all the information that should be
 	      provided to clients that are being serviced, along with
 	      information regarding the operation of the server.  This
-	      configuration file is described by the
-	      &man.dhcpd.conf.5; manual page installed by the
+	      configuration file is described in
+	      &man.dhcpd.conf.5;, which is installed by the
 	      port.</para>
 	  </listitem>
 
@@ -3260,9 +3230,9 @@ dhcpd_ifaces="dc0"</programlisting>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
 
 	    <para>The DHCP server keeps a database of leases it has
-	      issued in this file, which is written as a log.  The
-	      manual page &man.dhcpd.leases.5;, installed by the
-	      port gives a slightly longer description.</para>
+	      issued in this file, which is written as a log.  The port installs
+	      &man.dhcpd.leases.5;, which
+	      gives a slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3274,8 +3244,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      separate network.  If this functionality is required,
 	      then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      port.  The &man.dhcrelay.8; manual page provided with
-	      the port contains more detail.</para>
+	      port.  The port installs &man.dhcrelay.8;, which provides
+	      more detail.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
@@ -3592,13 +3562,13 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <programlisting>named_enable="YES"</programlisting>
 
-      <para>There are obviously many configuration options for
+      <para>There are many configuration options for
 	<filename>/etc/namedb/named.conf</filename> that are beyond
-	the scope of this document.  There are other startup options
-	for <application>named</application> on &os;, take a look at
+	the scope of this document.  Other startup options
+	for <application>named</application> on &os; can be found in
 	the <literal>named_<replaceable>*</replaceable></literal>
-	flags in <filename>/etc/defaults/rc.conf</filename> and
-	consult the &man.rc.conf.5; manual page.  The
+	flags in <filename>/etc/defaults/rc.conf</filename> and in
+	&man.rc.conf.5;.  The
 	<xref linkend="configtuning-rcd"/> section is also a good
 	read.</para>
     </sect2>
@@ -4931,7 +4901,7 @@ DocumentRoot /www/someotherdomain.tld
 
       <para>There are many different <application>Apache</application>
 	modules available to add functionality to the basic server.
-	The FreeBSD Ports Collection provides an easy way to install
+	The &os; Ports Collection provides an easy way to install
 	<application>Apache</application> together with some of the
 	more popular add-on modules.</para>
 
@@ -5220,7 +5190,7 @@ DocumentRoot /www/someotherdomain.tld
       software, <application>ftpd</application>, in the base system.
       This makes setting up and administering an
       <acronym role="File Transfer Protocol">FTP</acronym> server on
-      FreeBSD very straightforward.</para>
+      &os; very straightforward.</para>
 
     <sect2>
       <title>Configuration</title>
@@ -5239,9 +5209,8 @@ DocumentRoot /www/someotherdomain.tld
 	of some users without preventing them completely from using
 	FTP.  This can be accomplished with the
 	<filename>/etc/ftpchroot</filename> file.  This file lists
-	users and groups subject to FTP access restrictions.  The
-	&man.ftpchroot.5; manual page has all of the details so it
-	will not be described in detail here.</para>
+	users and groups subject to FTP access restrictions.  Refer to
+	&man.ftpchroot.5; for more details.</para>
 
       <indexterm>
 	<primary>FTP</primary>
@@ -5297,7 +5266,7 @@ DocumentRoot /www/someotherdomain.tld
 
       <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
-      <para>You can now log on to the FTP server by typing:</para>
+      <para>Log on to the FTP server by typing:</para>
 
       <screen>&prompt.user; <userinput>ftp localhost</userinput></screen>
     </sect2>
@@ -5772,8 +5741,8 @@ driftfile /var/db/ntp.drift</programlist
 	  <para>This will also prevent access from the server to any
 	    servers listed in the local configuration.  If there is a
 	    need to synchronise the NTP server with an external NTP
-	    server, allow only that specific server.  See the
-	    &man.ntp.conf.5; manual for more information.</para>
+	    server, allow only that specific server.  Refer to
+	    &man.ntp.conf.5; for more information.</para>
 	</note>
 
 	<para>To allow machines within the network to synchronize
@@ -5937,8 +5906,8 @@ driftfile /var/db/ntp.drift</programlist
 
       <note>
 	<para>More information on various supported and available
-	  <emphasis>facilities</emphasis> may be found in the
-	  &man.syslog.conf.5; manual page.</para>
+	  <emphasis>facilities</emphasis> may be found in
+	  &man.syslog.conf.5;.</para>
       </note>
 
       <para>Once added, all <literal>facility</literal> messages will
@@ -5962,8 +5931,8 @@ syslogd_flags="-a logclient.example.com 
 
       <para>Multiple <option>-a</option> options may be specified to
 	allow logging from multiple clients.  <acronym>IP</acronym>
-	addresses and whole netblocks may also be specified, see the
-	&man.syslog.3; manual page for a full list of possible
+	addresses and whole netblocks may also be specified.  Refer to
+	&man.syslog.3; for a full list of possible
 	options.</para>
 
       <para>Finally, the log file should be created.  The method used
@@ -6037,8 +6006,8 @@ syslogd_flags="-s -v -v"</programlisting
 	Facilities are accompanied with a priority or level, which
 	is used to mark how important a log message is.  The most
 	common will be the <literal>warning</literal> and
-	<literal>info</literal>.  Please refer to the &man.syslog.3;
-	manual page for a full list of available facilities and
+	<literal>info</literal>.  Refer to &man.syslog.3;
+	for a full list of available facilities and
 	priorities.</para>
 
       <para>The logging server must be defined in the client's
@@ -6350,9 +6319,9 @@ target iqn.2012-06.com.example:target0 {
       <note>
 	<para>The current iSCSI initiator is supported starting with
 	  &os; 10.0-RELEASE.  To use iSCSI initiator available in
-	  older versions, refer to the <ulink
-	    url="http://www.freebsd.org/cgi/man.cgi?query=iscontrol&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscontrol(8)</ulink>;
-	  manual page.  This chapter only applies to the new
+	  older versions, refer to <ulink
+	    url="http://www.freebsd.org/cgi/man.cgi?query=iscontrol&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscontrol(8)</ulink>.
+	  This chapter only applies to the new
 	  initiator.</para>
       </note>
 
@@ -6393,8 +6362,8 @@ target iqn.2012-06.com.example:target0 {
 iqn.2012-06.com.example:target0                 10.10.10.10     Connected: da0</programlisting>
 
 	<para>This means the iSCSI session was successfully
-	  established, and you have <filename>/dev/da0</filename>
-	  representing the attached LUN.  Should the target
+	  established, where <filename>/dev/da0</filename>
+	  represents the attached LUN.  Should the target
 	  ("iqn.2012-06.com.example:target0") export more than one
 	  LUN, there will be multiple device nodes in the <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=iscsictl&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscictl(8)</ulink>;
@@ -6452,7 +6421,7 @@ iqn.2012-06.com.example:target0         
 
 	<para>The first line ("t0") specifies a nickname for the
 	  configuration file section, used at the initiator side to
-	  specify which configuration you want to use.  The following
+	  specify which configuration to use.  The following
 	  lines specify various parameters used during connection
 	  - target address and name are mandatory; others are
 	  optional; in this case they specify CHAP username and



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