From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 13:23:29 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 61051EFC;
 Sun, 11 Nov 2012 13:23:29 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 465CC8FC08;
 Sun, 11 Nov 2012 13:23:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABDNTS8094173;
 Sun, 11 Nov 2012 13:23:29 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABDNT3S094172;
 Sun, 11 Nov 2012 13:23:29 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201211111323.qABDNT3S094172@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 11 Nov 2012 13:23:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39979 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 13:23:29 -0000

Author: jkois
Date: Sun Nov 11 13:23:28 2012
New Revision: 39979
URL: http://svnweb.freebsd.org/changeset/doc/39979

Log:
  PR:     www/173432
  
  Add "Support.od.ua" (based in the Ukraine) to the consultant list.
  
  Requested by:   Vladislav V. Prodan (admin@support.od.ua)

Modified:
  head/share/xml/commercial.consult.xml

Modified: head/share/xml/commercial.consult.xml
==============================================================================
--- head/share/xml/commercial.consult.xml	Sat Nov 10 21:02:37 2012	(r39978)
+++ head/share/xml/commercial.consult.xml	Sun Nov 11 13:23:28 2012	(r39979)
@@ -770,6 +770,18 @@
     </description>
   </entry>
 
+  <entry id="Supportodua" category="europe">
+    <name>Support.od.ua</name>
+    <url>http://support.od.ua/</url>
+    <description>
+      Support.od.ua is located in Odessa, Ukraine.  We offer professional
+      FreeBSD and Linux installation, consulting and server solutions for
+      customers in Ukraine, Russian Federation and Kazakhstan.  For more
+      information and contact details please visit our <a
+      href="http://support.od.ua">website</a>.
+    </description>
+  </entry>
+
   <entry id="MediaCenter" category="europe">
     <name>MediaCenter</name>
     <url>http://www.umc.se/</url>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 21:42:33 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0CE00F58;
 Sun, 11 Nov 2012 21:42:33 +0000 (UTC)
 (envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E7D1B8FC15;
 Sun, 11 Nov 2012 21:42:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABLgWLP004002;
 Sun, 11 Nov 2012 21:42:32 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABLgWH3004001;
 Sun, 11 Nov 2012 21:42:32 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201211112142.qABLgWH3004001@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Sun, 11 Nov 2012 21:42:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39980 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 21:42:33 -0000

Author: remko
Date: Sun Nov 11 21:42:32 2012
New Revision: 39980
URL: http://svnweb.freebsd.org/changeset/doc/39980

Log:
  Replace my key with a brand new one, signed by the previous one. The old one
  expired, and updating that didn't result in anything good.

Modified:
  head/share/pgpkeys/remko.key

Modified: head/share/pgpkeys/remko.key
==============================================================================
--- head/share/pgpkeys/remko.key	Sun Nov 11 13:23:28 2012	(r39979)
+++ head/share/pgpkeys/remko.key	Sun Nov 11 21:42:32 2012	(r39980)
@@ -1,70 +1,74 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh remko 6EB8C8C8;
+sh addkey.sh remko 3F774079;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/6EB8C8C8 2010-05-28
-      Key fingerprint = D692 91F9 F4EF D363 7F3F  4D17 9C75 DF7B 6EB8 C8C8
-uid                  Remko Lodder (Remko Lodder's Key) <remko@FreeBSD.org>
-sub   4096R/7532E07C 2012-08-14
+pub   4096R/3F774079 2012-11-11 [expires: 2016-11-11]
+      Key fingerprint = 7EE4 C4AF DCA3 E0B4 479B  A344 7135 8ED6 3F77 4079
+uid                  Remko Lodder <remko@FreeBSD.org>
+sub   4096R/59F38CB0 2012-11-11 [expires: 2016-11-11]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-aeC52ekBQto6mKzZFAsMa+sPhzxXsNmpyywL
-=mQXV
+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
+5sGIhylLEgeij8uoeFOeA1qMqbhYORfYOxE=
+=+q/B
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 22:29:02 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F19A1929;
 Sun, 11 Nov 2012 22:29:01 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CB5798FC14;
 Sun, 11 Nov 2012 22:29:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABMT1fo009288;
 Sun, 11 Nov 2012 22:29:01 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABMT1il009287;
 Sun, 11 Nov 2012 22:29:01 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211112229.qABMT1il009287@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 11 Nov 2012 22:29:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 22:29:02 -0000

Author: eadler
Date: Sun Nov 11 22:29:01 2012
New Revision: 39981
URL: http://svnweb.freebsd.org/changeset/doc/39981

Log:
  Reduce redundant markup and word and other minor problems reported by
  igor.  Limited additional checking was done of the surrounding content.
  
  Approved by:	jkois (mentor, before merge conflict resolution)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 21:42:32 2012	(r39980)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:01 2012	(r39981)
@@ -923,7 +923,7 @@
 		  <para>Where the format is
 		    <literal>html-split</literal>, the files are bundled
 		    up using &man.tar.1;.  The resulting
-		    <filename>.tar</filename> file is then compressed
+		    <filename>.tar</filename> is then compressed
 		    using the compression schemes detailed in the next
 		    point.</para>
 		</listitem>
@@ -986,9 +986,9 @@
 	    appropriate documents into place.</para>
 
 	  <para>For example, the split HTML version of the FAQ,
-	    compressed using &man.bzip2.1;, can be found in the
+	    compressed using &man.bzip2.1;, can be found in
 	    <filename>doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</filename>
-	    file.  To download and uncompress that file you would have
+	    To download and uncompress that file you would have
 	    to do this.</para>
 
 	  <screen>&prompt.root; <userinput>fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</userinput>
@@ -2241,7 +2241,7 @@
 	      drive.  See &man.burncd.8; for details.</para>
 
 	    <para>&os; also supports any SCSI CD-R or CD-RW drives.
-	      Install and use the <command>cdrecord</command> command
+	      Install and use <command>cdrecord</command>
 	      from the ports or packages system, and make sure that you
 	      have the <devicename>pass</devicename> device compiled in
 	      your kernel.</para>
@@ -2766,8 +2766,8 @@ quit</programlisting>
 
 	<answer>
 	  <para>This is usually caused by an interrupt conflict (e.g.,
-	    two boards using the same IRQ).  Boot with the
-	    <option>-c</option> option and change the
+	    two boards using the same IRQ).  Boot with
+	    <option>-c</option> and change the
 	    <devicename>ed0</devicename>/<devicename>de0</devicename>/...
 	    entry to match your board.</para>
 
@@ -3420,9 +3420,9 @@ chip1@pci0:31:5:        class=0x040100 c
 	    <filename>/etc/resolv.conf</filename>.  This will often
 	    cause a delay in <application>SSH</application>, as the
 	    option <literal>UseDNS</literal> is set to
-	    <literal>yes</literal> by default in the
-	    <filename>sshd_config</filename> file in
-	    <filename class="directory">/etc/ssh</filename>.  If this is causing the
+	    <literal>yes</literal> by default in
+	    <filename>/etc/ssh/sshd_config</filename>.
+	    If this is causing the
 	    problem, you will either need to fill in the missing
 	    information in <filename>/etc/resolv.conf</filename> or set
 	    <literal>UseDNS</literal> to <literal>no</literal> in
@@ -3455,7 +3455,7 @@ chip1@pci0:31:5:        class=0x040100 c
 		<varname>MAX_STRAY_LOG</varname> from
 		<literal>5</literal> to <literal>0</literal> in your
 		platform's (e.g., &i386;)
-		<filename>intr_machdep.c</filename> file and rebuild the
+		<filename>intr_machdep.c</filename> and rebuild the
 		new kernel and all the warnings will be
 		suppressed.</para>
 	    </listitem>
@@ -3643,7 +3643,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	  <para>Enter &man.sysinstall.8; and choose
 	    <guimenuitem>Configure</guimenuitem>, then
 	    <guimenuitem>Fdisk</guimenuitem>.  Select the disk the Boot
-	    Manager resided on with the <keycap>Space</keycap> key.
+	    Manager resided on with <keycap>Space</keycap>.
 	    Press <keycap>W</keycap> to write changes to the drive.  A
 	    prompt will appear asking which boot loader to install.
 	    Select this, and it will be restored.</para>
@@ -4439,8 +4439,8 @@ device sio5 at isa? port 0x2b8 tty flags
 		used to build the currently running system (e.g., you
 		are compiling &rel.current;-RELEASE on a
 		&rel2.current;-RELEASE system).  If you are attempting
-		an upgrade, please read the
-		<filename>/usr/src/UPDATING</filename> file, paying
+		an upgrade, please read
+		<filename>/usr/src/UPDATING</filename>, paying
 		particular attention to the <quote>COMMON ITEMS</quote>
 		section at the end.</para>
 	    </listitem>
@@ -4697,8 +4697,8 @@ kern.sched.name: ULE</screen>
 
 	  <para>When you are slicing up your disk, check that the disk
 	    geometry displayed in the FDISK screen is correct (i.e., it
-	    matches the BIOS numbers); if it is wrong, use the
-	    <keycap>G</keycap> key to fix it.  You may have to do this
+	    matches the BIOS numbers); if it is wrong, use
+	    <keycap>G</keycap> to fix it.  You may have to do this
 	    if there is absolutely nothing on the disk, or if the disk
 	    has been moved from another system.  Note that this is only
 	    an issue with the disk that you are going to boot from; &os;
@@ -4965,7 +4965,7 @@ use "disklabel -r" to install initial la
 	    DOS/&windowsnt; partition.  Assuming you name that file
 	    something like <filename>c:\bootsect.bsd</filename>
 	    (inspired by <filename>c:\bootsect.dos</filename>), you can
-	    then edit the <filename>c:\boot.ini</filename> file to come
+	    then edit <filename>c:\boot.ini</filename> to come
 	    up with something like this:</para>
 
 	  <programlisting>[boot loader]
@@ -5461,7 +5461,7 @@ C:\="DOS"</programlisting>
 	    <literal>Avail</literal> columns, usually by a factor of
 	    8%.</para>
 
-	  <para>For more details, look up the <option>-m</option> option
+	  <para>For more details, look up <option>-m</option>
 	    in &man.tunefs.8;.</para>
 	</answer>
       </qandaentry>
@@ -5520,8 +5520,8 @@ C:\="DOS"</programlisting>
       <qandaentry>
 	<question id="root-not-found-cron-errors">
 	  <para>Why do I keep getting messages like <errorname>root: not
-	    found</errorname> after editing my
-	    <filename>crontab</filename> file?</para>
+	    found</errorname> after editing
+	  <filename>/etc/crontab</filename></para>
 	</question>
 
 	<answer>
@@ -5933,7 +5933,8 @@ options    SYSVMSG          # enable for
 	  <para>The error comes from the
 	    <application>Kerberos</application> distributed authentication
 	    system.  The problem is not fatal but annoying.  You can
-	    either run su with the <option>-K</option> option, or
+	    either run <command>su</command> with <option>-K</option>,
+	    or
 	    uninstall <application>Kerberos</application> as described
 	    in the next question.</para>
 	</answer>
@@ -6529,8 +6530,8 @@ EndSection</programlisting>
 	    are running or to read your mail while waiting for an FTP
 	    transfer to finish.  Just do <keycombo
 	      action="simul"><keycap>Alt</keycap><keycap>F2</keycap></keycombo>
-	    (hold down the <keycap>Alt</keycap> key and press the
-	    <keycap>F2</keycap> key), and you will find a login prompt
+	    (hold down <keycap>Alt</keycap> and press
+	    <keycap>F2</keycap>), and you will find a login prompt
 	    waiting for you on the second <quote>virtual
 	    console</quote>!  When you want to go back to the original
 	    session, do <keycombo
@@ -6605,7 +6606,7 @@ ttyvb   "/usr/libexec/getty Pc"         
 	  <para>It is imperative that you completely shut down X Window
 	    if it is running, before running this command.  If you do not,
 	    your system will probably appear to hang or lock up after
-	    executing the <command>kill</command> command.</para>
+	    executing <command>kill</command>.</para>
 	</answer>
       </qandaentry>
 
@@ -6665,8 +6666,8 @@ ttyvb   "/usr/libexec/getty Pc"         
 	    server.</para>
 
 	  <para>If loaded from &man.rc.8;, <command>xdm</command> should
-	    be started without any arguments (i.e., as a daemon).  The
-	    <command>xdm</command> command must start
+	    be started without any arguments (i.e., as a daemon).
+	    <command>xdm</command> must start
 	    <emphasis>after</emphasis> &man.getty.8; runs, or else
 	    <command>getty</command> and <command>xdm</command> will
 	    conflict, locking out the console.  The best way around this
@@ -6677,9 +6678,8 @@ ttyvb   "/usr/libexec/getty Pc"         
 	    <filename>/etc/ttys</filename>, there still is a chance of
 	    conflict between <command>xdm</command> and &man.getty.8;.
 	    One way to avoid this is to add the <literal>vt</literal>
-	    number in the
-	    <filename>/usr/local/lib/X11/xdm/Xservers</filename>
-	    file:</para>
+	    number in
+	    <filename>/usr/local/lib/X11/xdm/Xservers</filename></para>
 
 	  <programlisting>:0 local /usr/local/bin/X vt4</programlisting>
 
@@ -7878,11 +7878,11 @@ default            10.0.0.2           UG
 10.0.0.2           10.0.0.1           UH          0        0      tun0</programlisting>
 
 	  <para>This is assuming that you have used the addresses from
-	    the handbook, the manual page, or from the
-	    <filename>ppp.conf.sample</filename> file.  If you do not
+	    the handbook, the manual page, or from
+	    <filename>ppp.conf.sample</filename>.  If you do not
 	    have a default route, it may be because you forgot to add
-	    the <literal>HISADDR</literal> line to the
-	    <filename>ppp.conf</filename> file.</para>
+	    the <literal>HISADDR</literal> line to
+	    <filename>ppp.conf</filename>.</para>
 
 	  <para>Another reason for the default route line being missing
 	    is that you have mistakenly set up a default router in your
@@ -7906,8 +7906,7 @@ default            10.0.0.2           UG
 
 	<answer>
 	  <para>This error is usually due that the following section is
-	    missing in your <filename>/etc/ppp/ppp.linkup</filename>
-	    file:</para>
+	    missing in your <filename>/etc/ppp/ppp.linkup</filename>:</para>
 
 	  <programlisting>MYADDR:
   delete ALL
@@ -8386,7 +8385,7 @@ set dfilter 3 permit 0/0 0/0</programlis
 	    invoked with <option>-bd -q30m</option>, telling it to run
 	    the queue every 30 minutes) or until a <command>sendmail
 	    <option>-q</option></command> is done (perhaps from your
-	    <filename>ppp.linkup</filename> file).</para>
+	    <filename>ppp.linkup</filename>).</para>
 	</answer>
       </qandaentry>
 
@@ -8741,8 +8740,8 @@ ATDT1234567</programlisting>
 	    if the incoming data is actually a login or shell prompt.
 	    If you have a shell prompt at the remote end, it is possible
 	    to terminate &man.ppp.8; without dropping the line by using
-	    the <command>close lcp</command> command (a following
-	    <command>term</command> command) will reconnect you to the
+	    <command>close lcp</command> (a following
+	    <command>term</command>) will reconnect you to the
 	    shell on the remote machine.</para>
 
 	  <para>If nothing in your log file indicates why the link might
@@ -8762,7 +8761,7 @@ ATDT1234567</programlisting>
 	  <para>If all else fails, send as much information as you can,
 	    including your config files, how you are starting
 	    &man.ppp.8;, the relevant parts of your log file and the
-	    output of the <command>netstat -rn</command> command (before
+	    output of <command>netstat -rn</command> (before
 	    and after connecting) to the &a.questions; or the <ulink
 	      url="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</ulink>
 	    news group, and someone should point you in the right
@@ -9054,12 +9053,12 @@ hint.sio.7.irq="12"</programlisting>
 	  <para>When changing modes of the file hierarchies rooted in the
 	    files instead of the files themselves,
 	    you have to use either <option>-H</option> or
-	    <option>-L</option> together with the <option>-R</option>
-	    option to make this work.  See the &man.chmod.1; and
-	    &man.symlink.7; manual pages for more info.</para>
+	    <option>-L</option> together with <option>-R</option>
+	    to make this work.  See &man.chmod.1; and
+	    &man.symlink.7; for more information.</para>
 
 	  <warning>
-	    <para>The <option>-R</option> option does a
+	    <para><option>-R</option> does a
 	      <emphasis>recursive</emphasis> &man.chmod.1;.  Be careful
 	      about specifying directories or symlinks to directories to
 	      &man.chmod.1;.  If you want to change the permissions of a

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 22:29:04 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 18CC392A;
 Sun, 11 Nov 2012 22:29:04 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F28548FC15;
 Sun, 11 Nov 2012 22:29:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABMT3nJ009321;
 Sun, 11 Nov 2012 22:29:03 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABMT3dL009319;
 Sun, 11 Nov 2012 22:29:03 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211112229.qABMT3dL009319@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 11 Nov 2012 22:29:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39982 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 22:29:04 -0000

Author: eadler
Date: Sun Nov 11 22:29:03 2012
New Revision: 39982
URL: http://svnweb.freebsd.org/changeset/doc/39982

Log:
  Modernize the removable-drives FAQ.
  
  Reviewed by:	Richard Yao <ryao@gentoo.org>
  Reviewed by:	koobs.freebsd@gmail.com
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:01 2012	(r39981)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:03 2012	(r39982)
@@ -5125,69 +5125,38 @@ C:\="DOS"</programlisting>
 	</question>
 
 	<answer>
-	  <para>Whether it is a removable drive like a &iomegazip; or an
-	    EZ drive (or even a floppy, if you want to use it that way),
-	    or a new hard disk, once it is installed and recognized by
-	    the system, and you have your cartridge/floppy/whatever
-	    slotted in, things are pretty much the same for all
-	    devices.</para>
+	  <para>If the drive already has a
+	    file system on it, you can use a command like this:</para>
 
-	  <para>(this section is based on <ulink
-	      url="http://www.vmunix.com/mark/FreeBSD/ZIP-FAQ.html">Mark Mayo's ZIP FAQ</ulink>)
-	    </para>
-
-	  <para>If it is a ZIP drive or a floppy, you have already got a
-	    DOS file system on it, you can use a command like this:</para>
-
-	  <screen>&prompt.root; <userinput>mount -t msdosfs /dev/fd0c /floppy</userinput></screen>
-
-	  <para>if it is a floppy, or this:</para>
-
-	  <screen>&prompt.root; <userinput>mount -t msdosfs /dev/da2s4 /zip</userinput></screen>
-
-	  <para>for a ZIP disk with the factory configuration.</para>
-
-	  <para>For other disks, see how they are laid out using
-	    &man.fdisk.8; or &man.sysinstall.8;.</para>
-
-	  <para>The rest of the examples will be for a ZIP drive on
-	    <devicename>da2</devicename>, the third SCSI disk.</para>
-
-	  <para>Unless it is a floppy, or a removable you plan on
-	    sharing with other people, it is probably a better idea to
-	    stick a BSD file system on it.  You will get long filename
-	    support, at least a 2X improvement in performance, and a lot
-	    more stability.  First, you need to redo the DOS-level
-	    partitions/file systems.  You can either use &man.fdisk.8;
-	    or &man.sysinstall.8;, or for a small drive that you do not
-	    want to bother with multiple operating system support on,
-	    just blow away the whole FAT partition table (slices) and
-	    just use the BSD partitioning:</para>
-
-	  <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/rda2 count=2</userinput>
-&prompt.root; <userinput>disklabel -Brw da2 auto</userinput></screen>
+	  <screen>&prompt.root; <userinput>mount /dev/da0s1 /mnt</userinput></screen>
 
-	  <para>You can use &man.disklabel.8; or &man.sysinstall.8; to
-	    create multiple BSD partitions.  You will certainly want to
-	    do this if you are adding swap space on a fixed disk, but it
-	    is probably irrelevant on a removable drive like a
-	    ZIP.</para>
+	  <para>If the drive will only be used with &os;
+	    systems it is better idea to
+	    stick a BSD file system on it, like UFS or ZFS.
+	    You will get long filename
+	    support, at least a 2X improvement in performance,
+	    and a lot more stability.  If the drive will be
+	    used by other operating systems a more portable
+	    choice, such as msdosfs, is better.</para>
+
+	  <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da0 count=2</userinput>
+&prompt.root; <userinput>gpart create -s GPT /dev/da0</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs /dev/da0</userinput></screen>
 
-	  <para>Finally, create a new file system, this one is on our
-	    ZIP drive using the whole disk:</para>
+	  <para>Finally, create a new file system:</para>
 
-	  <screen>&prompt.root; <userinput>newfs /dev/rda2c</userinput></screen>
+	  <screen>&prompt.root; <userinput>newfs /dev/da0p1</userinput></screen>
 
 	  <para>and mount it:</para>
 
-	  <screen>&prompt.root; <userinput>mount /dev/da2c /zip</userinput></screen>
+	  <screen>&prompt.root; <userinput>mount /dev/da0s1 /mnt</userinput></screen>
 
-	  <para>and it is probably a good idea to add a line like this
+	  <para>It is a good idea to add a line
 	    to <filename>/etc/fstab</filename> (see &man.fstab.5;) so
-	    you can just type <command>mount /zip</command> in the
+	    you can just type <command>mount /mnt</command> in the
 	    future:</para>
 
-	  <programlisting>/dev/da2c /zip ffs rw,noauto 0 0</programlisting>
+	  <programlisting>/dev/da0p1 /mnt ufs rw,noauto 0 0</programlisting>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 22:29:06 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 33A1E92D;
 Sun, 11 Nov 2012 22:29:06 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 18E718FC16;
 Sun, 11 Nov 2012 22:29:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABMT5Pp009358;
 Sun, 11 Nov 2012 22:29:05 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABMT5vh009357;
 Sun, 11 Nov 2012 22:29:05 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211112229.qABMT5vh009357@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 11 Nov 2012 22:29:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39983 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 22:29:06 -0000

Author: eadler
Date: Sun Nov 11 22:29:05 2012
New Revision: 39983
URL: http://svnweb.freebsd.org/changeset/doc/39983

Log:
  Fix a couple of seplling msitakes.
  Add comma after e.g.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/man.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/man.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sun Nov 11 22:29:03 2012	(r39982)
+++ head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sun Nov 11 22:29:05 2012	(r39983)
@@ -855,7 +855,7 @@ sub do_man {
         return &man( $1, $2 );
     }
 
-    # download a man hierarchie as gzip'd tar file
+    # download a man hierarchy as gzip'd tar file
     return &download if ( $apropos > 1 );
 
     # empty query
@@ -1649,7 +1649,7 @@ Copyright (c) for man pages by OS vendor
 <li>Get the <a href="$BASE/source">source</a> of the man.cgi script</li>
 <li>Troff macros works only if defined in FreeBSD/groff. OS specific
 macros like `appeared in NetBSD version 1.2' are not supported.</li>
-<li>Some OSs provide only formated manual pages (catpages), e.g. NetBSD
+<li>Some OSs provide only formatted manual pages (catpages), e.g., NetBSD
 and OpenBSD. In this case it is not possible to create Postscript
 and troff output.</li>
 <li>The <a href="http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree?view=markup">

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 22:29:08 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3C8A4970;
 Sun, 11 Nov 2012 22:29:08 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 208F38FC17;
 Sun, 11 Nov 2012 22:29:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABMT8Tr009398;
 Sun, 11 Nov 2012 22:29:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABMT8b9009396;
 Sun, 11 Nov 2012 22:29:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211112229.qABMT8b9009396@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 11 Nov 2012 22:29:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39984 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 22:29:08 -0000

Author: eadler
Date: Sun Nov 11 22:29:07 2012
New Revision: 39984
URL: http://svnweb.freebsd.org/changeset/doc/39984

Log:
  Fix stragling paras, and other minor whitespace issues
  
  Translators may ignore.
  
  Approved by:	jkois (mentor, prior to merge conflict resolution)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:05 2012	(r39983)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:07 2012	(r39984)
@@ -143,8 +143,7 @@
 
 	  <para>For more detailed information on &os;, please see the
 	    <ulink
-	      url="&url.books.handbook;/index.html">&os; Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/index.html">&os; Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -233,8 +232,7 @@
 	    network servers, and just about everything else you might
 	    want.  Most of these applications can be managed through the
 	    <ulink
-	      url="http://www.FreeBSD.org/ports/">Ports Collection</ulink>.
-	    </para>
+	      url="http://www.FreeBSD.org/ports/">Ports Collection</ulink>.</para>
 
 	  <para>If you need to use an application that is only available
 	    on one operating system, you simply cannot replace that
@@ -443,15 +441,13 @@
 	    <emphasis>-STABLE</emphasis> snapshots.</para>
 
 	  <para>Snapshot releases are directly available from <ulink
-	      url="&url.base;/snapshots/">snapshot</ulink>.
-	    </para>
+	      url="&url.base;/snapshots/">snapshot</ulink>.</para>
 
 	  <para>Official snapshots are generated each month on a regular
 	    basis for all actively developed branches.  There are also
 	    daily snapshot builds of the popular &arch.i386; and
 	    &arch.amd64; branches, hosted on <ulink
-	      url="http://snapshots.us.freebsd.org/"></ulink>.
-	    </para>
+	      url="http://snapshots.us.freebsd.org/"></ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -479,8 +475,7 @@
 	      url="&url.articles.releng;/release-proc.html#REL-BRANCH">&os; Release Engineering: Creating the Release Branch</ulink></quote>,
 	    the status of the branches and the upcoming release schedule
 	    can be found on the <ulink
-	      url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.
-	    </para>
+	      url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.</para>
 
 	  <para>The 2.2-STABLE branch was retired with the release of
 	    2.2.8.  The 3-STABLE branch has ended with the release of
@@ -568,15 +563,13 @@
 	<answer>
 	  <para>Every significant release of &os; is available via
 	    anonymous FTP from the <ulink
-	      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/"> &os; FTP site</ulink>:
-	    </para>
+	      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/"> &os; FTP site</ulink>:</para>
 
 	  <itemizedlist>
 	    <listitem>
 	      <para>The latest &rel.stable; release, &rel.current;-RELEASE
 		can be found in the <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.
-		</para>
+		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
 	    </listitem>
 
 	    <listitem>
@@ -591,22 +584,19 @@
 	    <listitem>
 	      <para>The latest &rel2.stable; release, &rel2.current;-RELEASE
 		can be found in the <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.
-		</para>
+		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>The latest &rel3.stable; release, &rel3.current;-RELEASE
 		can be found in the <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel3.current;-RELEASE/">&rel3.current;-RELEASE directory</ulink>.
-		</para>
+		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel3.current;-RELEASE/">&rel3.current;-RELEASE directory</ulink>.</para>
 	    </listitem>
 	  </itemizedlist>
 
 	  <para>Information about obtaining &os; on CD, DVD, and other
 	    media can be found in <ulink
-	      url="&url.books.handbook;/mirrors.html">the Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/mirrors.html">the Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -1147,8 +1137,7 @@
 	  <para>BSD Certification Group, Inc. provides system
 	    administration certifications for DragonFly&nbsp;BSD, &os;, NetBSD,
 	    OpenBSD.  If you are interested in them, visit <ulink
-	      url="http://www.BSDCertification.org">their site</ulink>.
-	    </para>
+	      url="http://www.BSDCertification.org">their site</ulink>.</para>
 
 	  <para>Any other organizations providing training and support
 	    should contact the Project in order to be listed here.</para>
@@ -1252,8 +1241,7 @@
 	  <para>Full instructions on this procedure and a little bit
 	    more about installation issues in general can be found in
 	    the <ulink
-	      url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.
-	    </para>
+	      url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -1302,8 +1290,7 @@
 		it to the floppy <quote>raw</quote>, using the low-level
 		tools (e.g., <command>fdimage</command> or
 		<command>rawrite</command>) described in the <ulink
-		  url="&url.books.handbook;/install.html">installation guide to &os;</ulink>.
-		</para>
+		  url="&url.books.handbook;/install.html">installation guide to &os;</ulink>.</para>
 	    </listitem>
 	  </itemizedlist>
 	</answer>
@@ -1316,8 +1303,7 @@
 
 	<answer>
 	  <para>Installation instructions can be found in the <ulink
-	      url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.
-	    </para>
+	      url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -1823,8 +1809,7 @@
 	  <para>Memory limits depend on the platform used.  On a
 	    standard &i386; install, the limit is 4&nbsp;GB but more
 	    memory can be supported through &man.pae.4;.  See <link
-	      linkend="memory-i386-over-4gb">instructions for using 4&nbsp;GB or more memory on &i386;</link>.
-	    </para>
+	      linkend="memory-i386-over-4gb">instructions for using 4&nbsp;GB or more memory on &i386;</link>.</para>
 
 	  <para>&os;/pc98 has a limit of 4&nbsp;GB memory, and PAE can
 	    not be used with it.  Other architectures supported by &os;
@@ -2145,6 +2130,7 @@
 	      Install <filename role="package">sysutils/devcpu-data</filename>,
 	      then add:</para>
 	    <programlisting>microcode_update_enable="YES"</programlisting>
+
 	    <para>to <filename>/etc/rc.conf</filename></para>
 	  </answer>
 	</qandaentry>
@@ -2179,8 +2165,7 @@
 	    <para>See the complete list in the Hardware Notes for &os;
 	      <ulink url="&rel.current.hardware;">&rel.current;</ulink>
 	      or <ulink
-		url="&rel2.current.hardware;">&rel2.current;</ulink>.
-	      </para>
+		url="&rel2.current.hardware;">&rel2.current;</ulink>.</para>
 	  </answer>
 	</qandaentry>
 
@@ -2447,8 +2432,7 @@
 
 	    <para>For the possible usage of wheels in the X Window
 	      environment, refer to <link
-		linkend="x-and-wheel">that section</link>.
-	      </para>
+		linkend="x-and-wheel">that section</link>.</para>
 	  </answer>
 	</qandaentry>
 
@@ -2486,8 +2470,7 @@ bind ^[[3~ ed-delete-next-char # for xte
 bindkey ^[[3~ delete-char # for xterm</programlisting>
 
 	    <para>For more information, see <ulink
-		url="http://www.ibb.net/~anne/keyboard.html">this page</ulink>.
-	      </para>
+		url="http://www.ibb.net/~anne/keyboard.html">this page</ulink>.</para>
 	  </answer>
 	</qandaentry>
       </qandaset>
@@ -2547,8 +2530,7 @@ bindkey ^[[3~ delete-char # for xterm</p
 
 	  <answer>
 	    <para>See <ulink
-		url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.
-	      </para>
+		url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.</para>
 	  </answer>
 	</qandaentry>
       </qandaset>
@@ -2729,8 +2711,7 @@ ARRE (Auto Read Reallocation Enbld):  1<
 	    address range clash :), by bumping the kernel option
 	    <literal>EISA_SLOTS</literal> to a value of 12.  Configure
 	    and compile a kernel, as described in the <ulink
-	      url="&url.books.handbook;/kernelconfig.html">Handbook entry on configuring the kernel</ulink>.
-	    </para>
+	      url="&url.books.handbook;/kernelconfig.html">Handbook entry on configuring the kernel</ulink>.</para>
 
 	  <para>Of course, this does present you with a chicken-and-egg
 	    problem when installing on such a machine.  In order to work
@@ -2751,9 +2732,8 @@ quit</programlisting>
 
 	  <note>
 	    <para>You cannot use a <literal>dangerously
-	      dedicated</literal> disk with an HP Netserver.  See <link
-		linkend="dedicate">this note</link> for more info.
-	      </para>
+		dedicated</literal> disk with an HP Netserver.  See <link
+		linkend="dedicate">this note</link> for more info.</para>
 	  </note>
 	</answer>
       </qandaentry>
@@ -2906,8 +2886,7 @@ quit</programlisting>
 	    instructions to send a problem report.</para>
 
 	  <para>There is an extensive FAQ on this at <ulink
-	      url="http://www.bitwizard.nl/sig11/">the SIG11 problem FAQ</ulink>.
-	    </para>
+	      url="http://www.bitwizard.nl/sig11/">the SIG11 problem FAQ</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -3143,8 +3122,7 @@ quit</programlisting>
 	<answer>
 	  <para>You can find a detailed answer for this question in the
 	    <ulink
-	      url="&url.books.handbook;/mail-trouble.html#Q26.5.2.">Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/mail-trouble.html#Q26.5.2.">Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -3713,8 +3691,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	<answer>
 	  <para>An answer for this question can be found in the &os;
 	    Glossary, see <ulink
-	      url="&url.books.handbook;/freebsd-glossary.html#LOR-GLOSSARY">LOR</ulink>.
-	    </para>
+	      url="&url.books.handbook;/freebsd-glossary.html#LOR-GLOSSARY">LOR</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -3919,8 +3896,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	      url="http://www.xfce.org/"><application>xfce</application></ulink>.
 	    <application>KDE</application> and
 	    <application>xfce</application> are both in the <ulink
-	      url="&url.base;/ports/index.html">ports system</ulink>.
-	    </para>
+	      url="&url.base;/ports/index.html">ports system</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -4003,8 +3979,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	      <listitem>
 		<para><ulink
-		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;</ulink>
-		  </para>
+		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;</ulink></para>
 	      </listitem>
 	    </varlistentry>
 
@@ -4013,8 +3988,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	      <listitem>
 		<para><ulink
-		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;</ulink>
-		  </para>
+		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;</ulink></para>
 	      </listitem>
 	    </varlistentry>
 
@@ -4023,8 +3997,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	      <listitem>
 		<para><ulink
-		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;</ulink>
-		  </para>
+		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;</ulink></para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -4091,8 +4064,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	<answer>
 	  <para>Yes.  Please see <ulink
-	      url="&url.base;/java/index.html">http://www.FreeBSD.org/java/</ulink>.
-	    </para>
+	      url="&url.base;/java/index.html">http://www.FreeBSD.org/java/</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -4275,8 +4247,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	  <para>The WAV files can then be converted to other formats or
 	    burned onto audio CDs, as described in the <ulink
-	      url="&url.books.handbook;/creating-cds.html">&os; Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/creating-cds.html">&os; Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -4296,8 +4267,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	    <command>pkg2ng</command> then you may remove
 	    <filename>/var/db/pkg/local.sqlite</filename>
 	    and extract
-	    <filename>/var/backups/pkgdb.bak.tbz</filename>.
-	  </para>
+	    <filename>/var/backups/pkgdb.bak.tbz</filename>.</para>
 	</answer>
       </qandaentry>
     </qandaset>
@@ -4315,8 +4285,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	<answer>
 	  <para>Not at all!  Check out the <ulink
-	      url="&url.books.handbook;/kernelconfig.html">kernel config section of the Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/kernelconfig.html">kernel config section of the Handbook</ulink>.</para>
 
 	  <note>
 	    <para>The new <filename>kernel</filename> will be installed
@@ -5074,8 +5043,7 @@ C:\="DOS"</programlisting>
 
 	  <programlisting>title &os; 6.1
 	root <replaceable>(hd0,a)</replaceable>
-	kernel /boot/loader
-	  </programlisting>
+	kernel /boot/loader</programlisting>
 
 	  <para>Where <replaceable>hd0,a</replaceable> points to your
 	    root partition on the first disk.  If you need to specify
@@ -5171,8 +5139,7 @@ C:\="DOS"</programlisting>
 	    that you want to mount.  This is described in the <ulink
 	      url="&url.books.handbook;/creating-cds.html"> Handbook section on optical media</ulink>,
 	    specifically the section <ulink
-	      url="&url.books.handbook;/creating-cds.html#MOUNTING-CD">Using Data CDs</ulink>.
-	    </para>
+	      url="&url.books.handbook;/creating-cds.html#mounting-cd">Using Data CDs</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -5205,8 +5172,7 @@ C:\="DOS"</programlisting>
 	    <ulink
 	      url="&url.books.handbook;/creating-cds.html">creating and using CD-ROMs</ulink>,
 	    specifically the section on <ulink
-	      url="&url.books.handbook;/creating-cds.html#MOUNTING-CD">Using Data CD-ROMs</ulink>.
-	    </para>
+	      url="&url.books.handbook;/creating-cds.html#mounting-cd">Using Data CD-ROMs</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -5222,8 +5188,7 @@ C:\="DOS"</programlisting>
 	    the <ulink
 	      url="&url.books.handbook;/creating-cds.html">Handbook chapter on creating CD-ROMs</ulink>,
 	    particularly the section on <ulink
-	      url="&url.books.handbook;/creating-cds.html#RAWDATA-CD">burning raw data CDs</ulink>.
-	    </para>
+	      url="&url.books.handbook;/creating-cds.html#RAWDATA-CD">burning raw data CDs</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -5625,8 +5590,7 @@ C:\="DOS"</programlisting>
 	  <para>Please see the Handbook section on <ulink
 	      url="&url.books.handbook;/using-localization.html">using localization</ulink>,
 	    specifically the section on <ulink
-	      url="&url.books.handbook;/using-localization.html#SETTING-CONSOLE">console setup</ulink>.
-	    </para>
+	      url="&url.books.handbook;/using-localization.html#setting-console">console setup</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -6138,8 +6102,7 @@ options    SYSVMSG          # enable for
 		<literal>true</literal> in
 		<filename>/etc/make.conf</filename> then rebuild and
 		install &man.ssh.1; (or run
-		<command>make <maketarget>world</maketarget></command>).
-		</para>
+		<command>make <maketarget>world</maketarget></command>).</para>
 	    </listitem>
 
 	    <listitem>
@@ -6201,7 +6164,8 @@ options    SYSVMSG          # enable for
 		<literal>cache</literal> state if the page is known to
 		be clean (unmodified), but that transition is a matter
 		of policy, depending upon the algorithm choice of the VM
-		system maintainer.</para></listitem>
+		system maintainer.</para>
+	    </listitem>
 
 	    <listitem>
 	      <para><literal>Free</literal>: pages without data content,
@@ -6279,8 +6243,7 @@ options    SYSVMSG          # enable for
 	    do so you will need to unset the <literal>schg</literal> flag
 	    first.  See the &man.chflags.1; manual page for more information
 	    (and bear in mind the answer to <link linkend="unsetting-schg">
-	    the question on unsetting the schg flag</link>).
-	  </para>
+	      the question on unsetting the schg flag</link>).</para>
 	</answer>
       </qandaentry>
     </qandaset>
@@ -6504,8 +6467,7 @@ EndSection</programlisting>
 	    waiting for you on the second <quote>virtual
 	    console</quote>!  When you want to go back to the original
 	    session, do <keycombo
-	      action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.
-	    </para>
+	      action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.</para>
 
 	  <para>The default &os; installation has eight virtual consoles
 	    enabled.  <keycombo
@@ -6952,8 +6914,7 @@ Key F15        A        A        Menu Wo
 	  <para>In fact, nVidia provides detailed information on which
 	    card is supported by which driver.  This information is
 	    available directly on their web site: <ulink
-	      url="http://www.nvidia.com/object/IO_32667.html"></ulink>.
-	    </para>
+	      url="http://www.nvidia.com/object/IO_32667.html"></ulink>.</para>
 
 	  <para>For Matrox&nbsp;G200/G400, you should check the
 	    <filename role="package">x11-servers/mga_hal</filename>
@@ -6982,13 +6943,12 @@ Key F15        A        A        Menu Wo
 	    booting</quote>?</para>
 	  </question>
 
-	  <answer>
-	    <para><quote>Diskless booting</quote> means that the &os;
-	      box is booted over a network, and reads the necessary
-	      files from a server instead of its hard disk.  For full
-	      details, please read <ulink
-		url="&url.books.handbook;/network-diskless.html">the Handbook entry on diskless booting</ulink>
-	      </para>
+	<answer>
+	  <para><quote>Diskless booting</quote> means that the &os;
+	    box is booted over a network, and reads the necessary
+	    files from a server instead of its hard disk.  For full
+	    details, please read <ulink
+	      url="&url.books.handbook;/network-diskless.html">the Handbook entry on diskless booting</ulink></para>
 	</answer>
       </qandaentry>
 
@@ -7002,8 +6962,7 @@ Key F15        A        A        Menu Wo
 	  <para>Yes.  Please see the Handbook entry on <ulink
 	      url="&url.books.handbook;/advanced-networking.html">advanced networking</ulink>,
 	    specifically the section on <ulink
-	      url="&url.books.handbook;/network-routing.html">routing and gateways</ulink>.
-	    </para>
+	      url="&url.books.handbook;/network-routing.html">routing and gateways</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -7032,8 +6991,7 @@ Key F15        A        A        Menu Wo
 	    &windows; machine correctly, this should work fine.  For
 	    more information, please see the &man.ppp.8; manual page or
 	    the <ulink
-	      url="&url.books.handbook;/userppp.html">Handbook entry on user PPP</ulink>.
-	    </para>
+	      url="&url.books.handbook;/userppp.html">Handbook entry on user PPP</ulink>.</para>
 
 	  <para>If you are using kernel-mode PPP or have an Ethernet
 	    connection to the Internet, you need to use &man.natd.8;.
@@ -7059,8 +7017,7 @@ Key F15        A        A        Menu Wo
 
 	  <para>For more information on how to use these, please see the
 	    <ulink
-	      url="&url.books.handbook;/ppp-and-slip.html">Handbook chapter on PPP and SLIP</ulink>.
-	    </para>
+	      url="&url.books.handbook;/ppp-and-slip.html">Handbook chapter on PPP and SLIP</ulink>.</para>
 
 	  <para>If you only have access to the Internet through a
 	    <quote>shell account</quote>, you may want to have a look at
@@ -7118,8 +7075,7 @@ Key F15        A        A        Menu Wo
 	  <screen>&prompt.root; <userinput>ifconfig <replaceable>ed0</replaceable> alias <replaceable>172.16.141.5</replaceable> netmask 0xffffff00</userinput></screen>
 
 	  <para>You can read more about this in the &os; <ulink
-	      url="&url.books.handbook;/configtuning-virtual-hosts.html">Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/configtuning-virtual-hosts.html">Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -7185,8 +7141,7 @@ Key F15        A        A        Menu Wo
 	    review &man.exports.5; and the <ulink
 	      url="&url.books.handbook;/network-nfs.html">NFS</ulink>
 	    entry in the Handbook, especially the section on <ulink
-	      url="&url.books.handbook;/network-nfs.html#CONFIGURING-NFS">configuring NFS</ulink>.
-	    </para>
+	      url="&url.books.handbook;/network-nfs.html#CONFIGURING-NFS">configuring NFS</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -7250,8 +7205,7 @@ Key F15        A        A        Menu Wo
 
 	<answer>
 	  <para>See the answer in the &os; <ulink
-	      url="&url.books.handbook;/mail-trouble.html">Handbook</ulink>.
-	    </para>
+	      url="&url.books.handbook;/mail-trouble.html">Handbook</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -7279,8 +7233,7 @@ Key F15        A        A        Menu Wo
 
 	  <para>For further information on configuring a &os; firewall,
 	    see the <ulink
-	      url="&url.books.handbook;/firewalls.html">Handbook chapter</ulink>.
-	    </para>
+	      url="&url.books.handbook;/firewalls.html">Handbook chapter</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -7487,8 +7440,8 @@ Key F15        A        A        Menu Wo
       <qandaentry>
 	<question id="sandbox">
 	  <para>What is a sandbox?</para>
-	</question><answer>
-
+	</question>
+	<answer>
 	  <para><quote>Sandbox</quote> is a security term.  It can mean
 	    two things:</para>
 
@@ -9199,8 +9152,7 @@ hint.sio.7.irq="12"</programlisting>
 	    pronounced <quote>BSD</quote>.</para>
 
 	  <para>You can learn more about the BSD daemon on his <ulink
-	      url="http://www.mckusick.com/beastie/index.html">home page</ulink>.
-	    </para>
+	      url="http://www.mckusick.com/beastie/index.html">home page</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -9220,8 +9172,7 @@ hint.sio.7.irq="12"</programlisting>
 	    given.  If you want to use him commercially, you must
 	    contact &a.mckusick;.  More details are available on the
 	    <ulink
-	      url="http://www.mckusick.com/beastie/index.html">BSD Daemon's home page</ulink>.
-	    </para>
+	      url="http://www.mckusick.com/beastie/index.html">BSD Daemon's home page</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -9245,8 +9196,7 @@ hint.sio.7.irq="12"</programlisting>
 
 	<answer>
 	  <para>Please see the <ulink
-	      url="&url.books.handbook;/freebsd-glossary.html">&os; Glossary</ulink>.
-	    </para>
+	      url="&url.books.handbook;/freebsd-glossary.html">&os; Glossary</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -9595,11 +9545,10 @@ hint.sio.7.irq="12"</programlisting>
 	<answer>
 	  <para>For a list of relevant books, please check the
 	    Handbook's <ulink
-	      url="&url.books.handbook;/bibliography-osinternals.html">Operating System Internals Bibliography</ulink>.
-	    </para>
+	      url="&url.books.handbook;/bibliography-osinternals.html">Operating System Internals Bibliography</ulink>.</para>
 
-	    <para>Additionally, much general &unix; knowledge is directly
-	      applicable to &os;.</para>
+	  <para>Additionally, much general &unix; knowledge is directly
+	    applicable to &os;.</para>
 	</answer>
       </qandaentry>
 
@@ -9689,8 +9638,7 @@ hint.sio.7.irq="12"</programlisting>
 	<answer>
 	  <para>Yes, you can do this <emphasis>without</emphasis>
 	    downloading the whole source tree by using the <ulink
-	      url="&url.books.handbook;/synching.html#ctm">CTM facility</ulink>.
-	    </para>
+	      url="&url.books.handbook;/synching.html#ctm">CTM facility</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -9792,8 +9740,7 @@ hint.sio.7.irq="12"</programlisting>
 	    printer status port for setting addresses, plus that use
 	    that address + <literal>0x800</literal>, and a third I/O
 	    port for reading that can be located anywhere between
-	    <literal>0x200</literal> and <literal>0x3ff</literal>.
-	    </para>
+	    <literal>0x200</literal> and <literal>0x3ff</literal>.</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 11 22:29:10 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5D5BC976;
 Sun, 11 Nov 2012 22:29:10 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 421DC8FC18;
 Sun, 11 Nov 2012 22:29:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABMTATo009432;
 Sun, 11 Nov 2012 22:29:10 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABMTASB009430;
 Sun, 11 Nov 2012 22:29:10 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211112229.qABMTASB009430@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 11 Nov 2012 22:29:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39985 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 22:29:10 -0000

Author: eadler
Date: Sun Nov 11 22:29:09 2012
New Revision: 39985
URL: http://svnweb.freebsd.org/changeset/doc/39985

Log:
  Ports are no longer needed to uncompress these formats.
  
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:07 2012	(r39984)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:09 2012	(r39985)
@@ -905,8 +905,7 @@
 	    </listitem>
 
 	    <listitem>
-	      <para>The compression and packaging scheme.  There are
-		three of these currently in use.</para>
+	      <para>The compression and packaging scheme.</para>
 
 	      <orderedlist>
 		<listitem>
@@ -924,42 +923,11 @@
 		    (i.e., <filename>article.pdf</filename>,
 		    <filename>book.html</filename>, and so on).</para>
 
-		  <para>These files are then compressed using two
-		    compression schemes.</para>
-
-		  <informaltable frame="none" pgwide="1">
-		    <tgroup cols="2">
-		      <thead>
-			<row>
-			  <entry>Scheme</entry>
-
-			  <entry>Description</entry>
-			</row>
-		      </thead>
-
-		      <tbody>
-			<row>
-			  <entry><literal>zip</literal></entry>
-
-			  <entry>The <literal>zip</literal> format.  If you want to
-			    uncompress this on &os; you will need to
-			    install the <filename
-			      role="package">archivers/unzip</filename>
-			    port first.</entry>
-			</row>
-
-			<row>
-			  <entry><literal>bz2</literal></entry>
-
-			  <entry>The <literal>bzip2</literal> format.  Less widespread than
-			    <literal>zip</literal>, but generally gives smaller files.
-			    Install the <filename
-			      role="package">archivers/bzip2</filename>
-			    port to uncompress these files.</entry>
-			</row>
-		      </tbody>
-		    </tgroup>
-		  </informaltable>
+		  <para>These files are then compressed using either
+		    the <literal>zip</literal> or
+		    <literal>bz2</literal> compression schemes.
+		    &man.tar.1; can be used to uncompress these
+		    files.</para>
 
 		  <para>So the &postscript; version of the Handbook,
 		    compressed using <literal>bzip2</literal> will be stored in a file
@@ -982,8 +950,7 @@
 	    to do this.</para>
 
 	  <screen>&prompt.root; <userinput>fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</userinput>
-&prompt.root; <userinput>bzip2 -d book.html-split.tar.bz2</userinput>
-&prompt.root; <userinput>tar xvf book.html-split.tar</userinput></screen>
+&prompt.root; <userinput>tar xvf book.html-split.tar.bz2</userinput></screen>
 
 	  <para>You will be left with a collection of
 	    <filename>.html</filename> files.  The main one is called

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 09:55:25 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AEBD2B5A;
 Mon, 12 Nov 2012 09:55:25 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B1F38FC08;
 Mon, 12 Nov 2012 09:55:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAC9tPcX094518;
 Mon, 12 Nov 2012 09:55:25 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAC9tPkN094517;
 Mon, 12 Nov 2012 09:55:25 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211120955.qAC9tPkN094517@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 12 Nov 2012 09:55:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39986 - head/nl_NL.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 09:55:25 -0000

Author: rene
Date: Mon Nov 12 09:55:25 2012
New Revision: 39986
URL: http://svnweb.freebsd.org/changeset/doc/39986

Log:
  MFen r39632 -> r39972 (and a local fix)

Modified:
  head/nl_NL.ISO8859-1/htdocs/art.xml

Modified: head/nl_NL.ISO8859-1/htdocs/art.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/art.xml	Sun Nov 11 22:29:09 2012	(r39985)
+++ head/nl_NL.ISO8859-1/htdocs/art.xml	Mon Nov 12 09:55:25 2012	(r39986)
@@ -6,7 +6,7 @@
 <!--
      Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/art.xml
-     %SRCID%	39632
+     %SRCID%	39972
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -39,8 +39,8 @@
 	      Daemon" width="191" height="208" border="0"/>&nbsp;</td>
 	</tr>
 	<tr>
-	  <td align="center" colspan="6">Gemaakt door by &a.phk;<br/>Bron:
-	    <a href="http://cvsweb.FreeBSD.org/src/share/examples/BSD_daemon/">/usr/share/examples/BSD_daemon/</a>
+	  <td align="center" colspan="6">Gemaakt door &a.phk;<br/>Bron:
+	    <a href="http://svnweb.freebsd.org/base/head/share/examples/BSD_daemon/">/usr/share/examples/BSD_daemon/</a>
 	    op &os; systemen.</td>
 	</tr>
 	<tr>
@@ -124,7 +124,7 @@
 
     <p>&a.phk;'s afbeelding van de BSD Daemon is uitgebracht onder <q>THE
 	BEER-WARE LICENSE</q>.  Zie de <a
-	href="http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/examples/BSD_daemon/README?content-type=text/plain">README</a>
+	href="http://svnweb.freebsd.org/base/head/share/examples/BSD_daemon/README?view=markup">README</a>
       voor meer informatie.</p>
 
     <h2 id="trademark">Handelsmerken</h2>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 13:59:54 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B95A96A3;
 Mon, 12 Nov 2012 13:59:54 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9EB988FC08;
 Mon, 12 Nov 2012 13:59:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACDxsGS027630;
 Mon, 12 Nov 2012 13:59:54 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACDxsqB027628;
 Mon, 12 Nov 2012 13:59:54 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211121359.qACDxsqB027628@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 12 Nov 2012 13:59:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39987 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 13:59:54 -0000

Author: eadler
Date: Mon Nov 12 13:59:54 2012
New Revision: 39987
URL: http://svnweb.freebsd.org/changeset/doc/39987

Log:
  Even modern versions of mac are graphical.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Nov 12 09:55:25 2012	(r39986)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Nov 12 13:59:54 2012	(r39987)
@@ -248,7 +248,7 @@
 	  <para>If you are migrating to &os; from some other &unix;
 	    environment, you already know most of what you need to.  If
 	    your background is in graphic-driven operating systems such
-	    as &windows; and older versions of &macos;, expect to invest
+	    as &windows; and &macos;, expect to invest
 	    additional time learning the &unix; way of doing things.
 	    This FAQ and the <ulink
 	      url="&url.books.handbook;/index.html">&os; Handbook</ulink>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 18:47:25 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E1A513FF;
 Mon, 12 Nov 2012 18:47:25 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
 [18.9.25.12]) by mx1.freebsd.org (Postfix) with ESMTP id 4C3968FC08;
 Mon, 12 Nov 2012 18:47:24 +0000 (UTC)
X-AuditID: 1209190c-b7f286d000000ee3-0b-50a14309086e
Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id
 ED.47.03811.90341A05; Mon, 12 Nov 2012 13:42:17 -0500 (EST)
To: undisclosed-recipients:;
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qACIgH3J024122;
 Mon, 12 Nov 2012 13:42:17 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACIgFmB022697
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 13:42:17 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACIgELJ000562; Mon, 12 Nov 2012 13:42:14 -0500 (EST)
Date: Mon, 12 Nov 2012 13:42:14 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
Subject: Re: svn commit: r39962 -
 head/en_US.ISO8859-1/articles/committers-guide
In-Reply-To: <201211091214.qA9CE021067305@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211121341450.2164@multics.mit.edu>
References: <201211091214.qA9CE021067305@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42IRYrdT0eV0XhhgsGiHscWPj4eYLG4s2s9k
 sbu/l9mB2WPGp/ksAYxRXDYpqTmZZalF+nYJXBn/XrxgLZhlXPHsWg9rA+MazS5GTg4JAROJ
 C9s+skHYYhIX7q0Hsrk4hAT2MUpcfj0BLCEiICMxd/ZjVojEBkaJC78mMUE4J5gkzt1uYoRw
 Ghglzv7oYAVpYRHQlpj69i5YO5uAisTMNxvBbGaBKIk9SxvBaoQFgiQWTDsJFucUsJLoeLQN
 zOYVcJC4+3UmI4gtJGAp8XrNPhYQW1RAR2L1/iksEDWCEidnPmGBmGkpce7PdbYJjIKzkKRm
 IUktYGRaxSibklulm5uYmVOcmqxbnJyYl5dapGuol5tZopeaUrqJERSsnJI8OxjfHFQ6xCjA
 wajEw8vhvCBAiDWxrLgy9xCjJAeTkihvuv3CACG+pPyUyozE4oz4otKc1OJDjBIczEoivL/v
 ApXzpiRWVqUW5cOkpDlYlMR5L6fc9BcSSE8sSc1OTS1ILYLJynBwKEnwcjsBDRUsSk1PrUjL
 zClBSDNxcIIM5wEa7gxSw1tckJhbnJkOkT/FaMzx+fXch4wcL7sWPWQUYsnLz0uVEue1ACkV
 ACnNKM2DmwZLOK8YxYGeE+aVAqniASYruHmvgFYxAa1avw3kj+KSRISUVAOj4E8O9Sey5rN6
 BXcer0nXb9Ox0UnQWba/IG0ZO4vwj2vV9Zx8kwWXNrmUpDG9iSzfYDQhOED5/MbdTTEeH84v
 XT/N8dXql9O616/784Xpqd+r3t8PVGrtbia/yDzUd6Nttvz19VP6pt2cIt2pcCHnk5BbnWem
 +eNE9Q0lbPELEtt4+gLjZycqsRRnJBpqMRcVJwIA+EK90BMDAAA=
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 18:47:26 -0000

For those wanting more details, 
http://lists.bestpractical.com/pipermail/svk-devel/2009-May/001224.html 
seems like a good place to start.
-Ben Kaduk

On Fri, 9 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Fri Nov  9 12:14:00 2012
> New Revision: 39962
> URL: http://svnweb.freebsd.org/changeset/doc/39962
>
> Log:
>  SVK is no longer actively developed.
>
>  Approved by:	jkois (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/articles/committers-guide/article.xml
>
> Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Nov  9 10:06:11 2012	(r39961)
> +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Nov  9 12:14:00 2012	(r39962)
> @@ -370,7 +370,7 @@
>     <sect2 id="svn-getting-started">
>       <title>Getting Started</title>
>
> -      <para>There are three ways to obtain a working copy of the tree
> +      <para>There are a few ways to obtain a working copy of the tree
> 	from Subversion.  This section will explain them.</para>
>
>       <sect3>
> @@ -466,119 +466,6 @@
> 	  information on how to set one up.</para>
>       </sect3>
>
> -      <sect3>
> -	<title>Checkout from a Local Mirror Using
> -	  <acronym>SVK</acronym></title>
> -
> -	<para>The third alternative is to use <acronym>SVK</acronym>
> -	  to maintain a local mirror.  It is a version control system
> -	  build on top of Subversion's storage engine.  It is
> -	  identical to Subversion in most respects, except that it
> -	  allows for setting up parts of repositories as mirrors of
> -	  other repositories, and keeping local branches for merging
> -	  back into the upstream repositories.  There are extensions
> -	  that allow <acronym>SVK</acronym> to mirror
> -	  Perforce repositories in addition
> -	  to Subversion ones.</para>
> -
> -	<para>Like everything, <acronym>SVK</acronym> has its
> -	  disadvantages, one being that local revision numbers will
> -	  not match upstream revision numbers.  This makes it
> -	  difficult to <command>svk log</command>, <command>svk
> -	    diff</command>, or <command>svk update</command> to an
> -	  arbitrary upstream revision.</para>
> -
> -	<para>To set up a mirror of the &os; repository, do:</para>
> -
> -	<screen>&prompt.user; <userinput>svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base</userinput></screen>
> -
> -	<para>The local <acronym>SVK</acronym> repository will be
> -	  stored in <filename
> -	    class="directory">~/.svk/local/</filename>, but can be
> -	  moved to an alternate location.  If it is moved,
> -	  <filename>~/.svk/config</filename> should be amended
> -	  manually to reflect the move.</para>
> -
> -	<para>Any path can be used, not just the one in the example
> -	  above.  A common pattern is to place mirrors under
> -	  <literal>//mirror</literal>, e.g.,
> -	  <filename
> -	    class="directory">//mirror/freebsd/base/</filename>, and
> -	  local branches under <literal>//local</literal>.</para>
> -
> -	<para>To pull down the contents of the repository to the
> -	  mirror:</para>
> -
> -	<screen>&prompt.user; <userinput>svk sync //freebsd/base</userinput></screen>
> -
> -	<note>
> -	  <para><command>svk sync</command> will take a very long
> -	    time, possibly several days over a slow network
> -	    connection.  &a.peter; has a tarball that can be used to
> -	    jumpstart the mirror, but only if one does not exist
> -	    already.</para>
> -	</note>
> -
> -	<para>To use the tarball referenced above:</para>
> -
> -	<screen>&prompt.user; <userinput>cd ~</userinput>
> -&prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
> -&prompt.user; <userinput>tar xf dot_svk_r179646.tbz2</userinput></screen>
> -
> -	<para>Then edit <filename>~/.svk/config</filename> and replace
> -	  <filename
> -	    class="directory">/scratch/tmp/peter/.svk/local/</filename>
> -	  with the equivalent of <filename
> -	    class="directory">/home/<replaceable>jarjar</replaceable>/.svk/local/</filename>.</para>
> -
> -	<para>You can check out files directly from your mirror, once
> -	  it has been created:</para>
> -
> -	<screen>&prompt.user; <userinput>svk checkout //freebsd/base/head /usr/src</userinput></screen>
> -
> -	<para>Unlike <acronym>SVN</acronym>, <acronym>SVK</acronym>
> -	  does not store metadata or reference copies in the working
> -	  copy.  All metadata is recorded in
> -	  <filename>~/.svk/config</filename>; reference copies are not
> -	  used at all because <acronym>SVK</acronym> always operates
> -	  on a local repository.</para>
> -
> -	<para>When committing from a working copy like the one above,
> -	  <acronym>SVN</acronym> will commit directly to the upstream
> -	  repository, then synchronise the mirror.</para>
> -
> -	<para>However, the <quote>killer app</quote> for
> -	  <acronym>SVK</acronym> is the ability to work without a
> -	  network connection.  To do that, a local branch must be set
> -	  up:</para>
> -
> -	<screen>&prompt.user; <userinput>svk mkdir //local/freebsd</userinput>
> -&prompt.user; <userinput>svk copy //freebsd/base/head //local/freebsd/head</userinput></screen>
> -
> -	<para>Once again, any path can be used, it does not have to
> -	  specifically be the one in the example.</para>
> -
> -	<para>Before use, the local branch has to be synchronized,
> -	  like so:</para>
> -
> -	<screen>&prompt.user; <userinput>svk pull //local/freebsd/head</userinput></screen>
> -
> -	<para>Then check out from the newly created local
> -	  branch:</para>
> -
> -	<screen>&prompt.user; <userinput>svk checkout //local/freebsd/head /usr/src</userinput></screen>
> -
> -	<para>The point of this exercise is showing that it is
> -	  possible to commit work-in-progress to a local branch, and
> -	  only push it to the upstream repository when work is
> -	  complete.  The easy way to push is with <command>svk
> -	    push</command>, but there is a serious disadvantage to it:
> -	  it will push every single commit made to the local branch
> -	  incrementally instead of lumping them all into a single
> -	  commit.  Therefore, using <command>svk smerge</command> is
> -	  preferable.</para>
> -      </sect3>
> -
>       <sect3 id="subversion-primer-base-layout">
> 	<title><literal>RELENG_*</literal> Branches and General
> 	  Layout</title>
>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 18:58:23 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3F807ABE;
 Mon, 12 Nov 2012 18:58:23 +0000 (UTC)
 (envelope-from remko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 229ED8FC0C;
 Mon, 12 Nov 2012 18:58:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACIwNhm081949;
 Mon, 12 Nov 2012 18:58:23 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACIwMLl081948;
 Mon, 12 Nov 2012 18:58:22 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201211121858.qACIwMLl081948@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Mon, 12 Nov 2012 18:58:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39988 - head/en_US.ISO8859-1/books/handbook/geom
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 18:58:23 -0000

Author: remko
Date: Mon Nov 12 18:58:22 2012
New Revision: 39988
URL: http://svnweb.freebsd.org/changeset/doc/39988

Log:
  Update the example used to add a freebsd partition. The example
  was incorrect.
  
  Submitted by:	Venelin Despotov <venelin.despotov@gmail.com>

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

Modified: head/en_US.ISO8859-1/books/handbook/geom/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Mon Nov 12 13:59:54 2012	(r39987)
+++ head/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Mon Nov 12 18:58:22 2012	(r39988)
@@ -346,7 +346,7 @@ Done.</screen>
 	<devicename>ada0</devicename>.</para>
 
       <screen>&prompt.root; <userinput>gpart create -s MBR mirror/gm0</userinput>
-&prompt.root; <userinput>gpart add -t -a 4kfreebsd mirror/gm0</userinput>
+&prompt.root; <userinput>gpart add -t freebsd -a 4k mirror/gm0</userinput>
 &prompt.root; <userinput>gpart show mirror/gm0</userinput>
 =>       63  156301423  mirror/gm0  MBR  (74G)
          63         63                    - free -  (31k)

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 19:05:15 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 538FF118;
 Mon, 12 Nov 2012 19:05:15 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 387248FC0C;
 Mon, 12 Nov 2012 19:05:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACJ5FiM083415;
 Mon, 12 Nov 2012 19:05:15 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACJ5FaY083414;
 Mon, 12 Nov 2012 19:05:15 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201211121905.qACJ5FaY083414@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 12 Nov 2012 19:05:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39989 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 19:05:15 -0000

Author: peter (src committer)
Date: Mon Nov 12 19:05:14 2012
New Revision: 39989
URL: http://svnweb.freebsd.org/changeset/doc/39989

Log:
  Drop "Developers->CVS Repository" from the front-page drop-down.

Modified:
  head/share/xml/header.ent

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Mon Nov 12 18:58:22 2012	(r39988)
+++ head/share/xml/header.ent	Mon Nov 12 19:05:14 2012	(r39989)
@@ -101,7 +101,6 @@
 	<ul>
 	  <li><a href="http://wiki.FreeBSD.org/IdeasPage">Project Ideas</a></li>
 	  <li><a href="http://svnweb.FreeBSD.org">SVN Repository</a></li>
-	  <li><a href="http://cvsweb.FreeBSD.org">CVS Repository</a></li>
 	  <li><a href="http://p4web.FreeBSD.org">Perforce Repository</a></li>
 	</ul>
       </li>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 19:21:44 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8581A990;
 Mon, 12 Nov 2012 19:21:44 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6AD748FC08;
 Mon, 12 Nov 2012 19:21:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACJLiML086749;
 Mon, 12 Nov 2012 19:21:44 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACJLiI6086748;
 Mon, 12 Nov 2012 19:21:44 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201211121921.qACJLiI6086748@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 12 Nov 2012 19:21:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39990 - head/en_US.ISO8859-1/htdocs/internal
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 19:21:44 -0000

Author: peter (src committer)
Date: Mon Nov 12 19:21:44 2012
New Revision: 39990
URL: http://svnweb.freebsd.org/changeset/doc/39990

Log:
  Temporarily put a stub out the user list. This will have to be done
  another way.

Modified:
  head/en_US.ISO8859-1/htdocs/internal/homepage.pl

Modified: head/en_US.ISO8859-1/htdocs/internal/homepage.pl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Mon Nov 12 19:05:14 2012	(r39989)
+++ head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Mon Nov 12 19:21:44 2012	(r39990)
@@ -39,7 +39,8 @@ while(<P>) {
 
 close P;
 if ($#pages < 0) {
-	die "No users found!\n";
+	#die "No users found!\n";
+	push(@pages, "Disabled:disabled");
 }
 
 print "<?xml version='1.0' encoding='iso-8859-1'?>\n";

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 19:58:50 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BFB9FE69;
 Mon, 12 Nov 2012 19:58:50 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
 [18.9.25.12]) by mx1.freebsd.org (Postfix) with ESMTP id 1BA588FC0C;
 Mon, 12 Nov 2012 19:58:49 +0000 (UTC)
X-AuditID: 1209190c-b7f286d000000ee3-de-50a154f76b09
Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id
 F7.CC.03811.7F451A05; Mon, 12 Nov 2012 14:58:47 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qACJwlOq012037;
 Mon, 12 Nov 2012 14:58:47 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACJwj7X006122
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 14:58:46 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACJwiLC001466; Mon, 12 Nov 2012 14:58:44 -0500 (EST)
Date: Mon, 12 Nov 2012 14:58:44 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201211112229.qABMT1il009287@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsUixCmqrPs9ZGGAwbXflhY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK2PLzU7WgqkSFQsnf2dtYPwn1MXI
 ySEhYCIxp3MjI4QtJnHh3nq2LkYuDiGBfYwSZz5NgnI2MEr8O7uLCcI5wSTx69hWRgingVHi
 0bQWdpB+FgFtiRX71rGA2GwCKhIz32xkA7FFgOzv+38ygdjMAlESe5Y2soLYwgIOEot/NAAN
 4uDgFLCSaP4mAGLyAoX3v/AFMYUELCXOr+UBKRYV0JFYvX8K2HBeAUGJkzOfsEAMtJQ49+c6
 2wRGwVlIUrOQpBYwMq1ilE3JrdLNTczMKU5N1i1OTszLSy3SNdTLzSzRS00p3cQIDlhJnh2M
 bw4qHWIU4GBU4uG96bIwQIg1say4MvcQoyQHk5Io77dAoBBfUn5KZUZicUZ8UWlOavEhRgkO
 ZiUR3t93FwQI8aYkVlalFuXDpKQ5WJTEeS+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8KoCI1NI
 sCg1PbUiLTOnBCHNxMEJMpwHaLgMSA1vcUFibnFmOkT+FKOilDivGEhCACSRUZoH1wtLKK8Y
 xYFeEeY1AaniASYjuO5XQIOZgAav3wZydXFJIkJKqoEx4BPfx+c21xdM9vi5I/Dt9ocy6x6k
 3xdfPfNZQ46666KTK4MfvL24PXuDsO/6OPv1+w4end9ScX3x2bkvtOel3Mzlz1ZxsT8m170r
 b4foy7WOef8/POCIl7qc9up8ePGvWKuMp3f7t8bfr+aKd4u7v2nRLL0puQVTzstPqlhkvSRn
 6U25p01qdkosxRmJhlrMRcWJALDcty4DAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 19:58:50 -0000

On Sun, 11 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Sun Nov 11 22:29:01 2012
> New Revision: 39981
> URL: http://svnweb.freebsd.org/changeset/doc/39981
>
> Log:
>  Reduce redundant markup and word and other minor problems reported by
>  igor.  Limited additional checking was done of the surrounding content.
>
>  Approved by:	jkois (mentor, before merge conflict resolution)
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.xml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 21:42:32 2012	(r39980)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:01 2012	(r39981)
> @@ -923,7 +923,7 @@
> 		  <para>Where the format is
> 		    <literal>html-split</literal>, the files are bundled
> 		    up using &man.tar.1;.  The resulting
> -		    <filename>.tar</filename> file is then compressed
> +		    <filename>.tar</filename> is then compressed

This would seem like a candidate where the "redundant" use of "file" 
actually is helpful, since there is not a specific file name given.

> 		    using the compression schemes detailed in the next
> 		    point.</para>
> 		</listitem>
> @@ -8741,8 +8740,8 @@ ATDT1234567</programlisting>
> 	    if the incoming data is actually a login or shell prompt.
> 	    If you have a shell prompt at the remote end, it is possible
> 	    to terminate &man.ppp.8; without dropping the line by using
> -	    the <command>close lcp</command> command (a following
> -	    <command>term</command> command) will reconnect you to the
> +	    <command>close lcp</command> (a following
> +	    <command>term</command>) will reconnect you to the

I have trouble making sense of this sentence; perhaps the close paren is 
misplaced?  Not a bug in your change, but I would have expected it to be 
noticed in pre-commit review.

> 	    shell on the remote machine.</para>
>
> 	  <para>If nothing in your log file indicates why the link might
> @@ -9054,12 +9053,12 @@ hint.sio.7.irq="12"</programlisting>
> 	  <para>When changing modes of the file hierarchies rooted in the
> 	    files instead of the files themselves,
> 	    you have to use either <option>-H</option> or
> -	    <option>-L</option> together with the <option>-R</option>
> -	    option to make this work.  See the &man.chmod.1; and
> -	    &man.symlink.7; manual pages for more info.</para>
> +	    <option>-L</option> together with <option>-R</option>
> +	    to make this work.  See &man.chmod.1; and
> +	    &man.symlink.7; for more information.</para>
>
> 	  <warning>
> -	    <para>The <option>-R</option> option does a
> +	    <para><option>-R</option> does a

My understanding was that we did not like to start sentences with markup.

-Ben Kaduk

> 	      <emphasis>recursive</emphasis> &man.chmod.1;.  Be careful
> 	      about specifying directories or symlinks to directories to
> 	      &man.chmod.1;.  If you want to change the permissions of a
>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 20:14:49 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0B1BBA1;
 Mon, 12 Nov 2012 20:14:49 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
 [18.7.68.36]) by mx1.freebsd.org (Postfix) with ESMTP id 64ACB8FC12;
 Mon, 12 Nov 2012 20:14:47 +0000 (UTC)
X-AuditID: 12074424-b7fce6d000000925-8a-50a157847c7a
Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id
 CB.FF.02341.48751A05; Mon, 12 Nov 2012 15:09:40 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qACK9ekd013157;
 Mon, 12 Nov 2012 15:09:40 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACK9cGc007956
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 15:09:39 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACK9bJI001574; Mon, 12 Nov 2012 15:09:37 -0500 (EST)
Date: Mon, 12 Nov 2012 15:09:37 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39982 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201211112229.qABMT3dL009319@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211121506000.2164@multics.mit.edu>
References: <201211112229.qABMT3dL009319@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMIsWRmVeSWpSXmKPExsUixCmqrNsSvjDA4OVTG4sfHw8xWez6O4fZ
 4sai/UwWu/t7mR1YPGZ8ms8SwBjFZZOSmpNZllqkb5fAlbHm2Dr2glOKFf+PPGZrYOyU6mLk
 5JAQMJF4++4hE4QtJnHh3nq2LkYuDiGBfYwSl+Z/YYFwNjBKfN73jgnCOcEksfrRIlYIp4FR
 Yl7bErB+FgFtiW8rbzKD2GwCKhIz32xkA7FFgOzv+3+C1TALREnsWdrICmILCzhIHHkxgwXE
 5hSwkli07wZYLy9QfNmzd2C9QgKWEv9vXQCrERXQkVi9fwoLRI2gxMmZT1ggZlpKnPtznW0C
 o+AsJKlZSFILGJlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrr5WaW6KWmlG5iBIUtu4vKDsbm
 Q0qHGAU4GJV4eA3cFwYIsSaWFVfmHmKU5GBSEuX9FggU4kvKT6nMSCzOiC8qzUktPsQowcGs
 JML7++6CACHelMTKqtSifJiUNAeLkjjv9ZSb/kIC6YklqdmpqQWpRTBZGQ4OJQlelzCgoYJF
 qempFWmZOSUIaSYOTpDhPEDDzUBqeIsLEnOLM9Mh8qcYFaXEeZ1BEgIgiYzSPLheWFp5xSgO
 9IowbyRIFQ8wJcF1vwIazAQ0eP02kKuLSxIRUlINjAb+Aa1Ptnu9uvJTSv1hqManzClrjab4
 h2o1Lkv8cfd86kSRwy3Zm8+djjndqeZwrc307NNL2hbHy0/8PX20O+CjzKzM1XdvfQsNOPJs
 6pKW4PdO7q5npOJ7Q5cZMTQGSPhJcllHaj74lMzU2lF2cuG30276hx7WZmeobXtu5+ghY6BY
 LjlnohJLcUaioRZzUXEiAIl4N3QGAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 20:14:49 -0000

On Sun, 11 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Sun Nov 11 22:29:03 2012
> New Revision: 39982
> URL: http://svnweb.freebsd.org/changeset/doc/39982
>
> Log:
>  Modernize the removable-drives FAQ.
>
>  Reviewed by:	Richard Yao <ryao@gentoo.org>
>  Reviewed by:	koobs.freebsd@gmail.com
>  Approved by:	bcr (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.xml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:01 2012	(r39981)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:03 2012	(r39982)
> @@ -5125,69 +5125,38 @@ C:\="DOS"</programlisting>

The question is unfortunately cut off; "I have a new removable drive, how 
do I use it?"

> 	</question>
>
> 	<answer>
> -	  <para>Whether it is a removable drive like a &iomegazip; or an
> -	    EZ drive (or even a floppy, if you want to use it that way),
> -	    or a new hard disk, once it is installed and recognized by
> -	    the system, and you have your cartridge/floppy/whatever
> -	    slotted in, things are pretty much the same for all
> -	    devices.</para>
> +	  <para>If the drive already has a
> +	    file system on it, you can use a command like this:</para>
>
> -	  <para>(this section is based on <ulink
> -	      url="http://www.vmunix.com/mark/FreeBSD/ZIP-FAQ.html">Mark Mayo's ZIP FAQ</ulink>)
> -	    </para>
> -
> -	  <para>If it is a ZIP drive or a floppy, you have already got a
> -	    DOS file system on it, you can use a command like this:</para>
> -
> -	  <screen>&prompt.root; <userinput>mount -t msdosfs /dev/fd0c /floppy</userinput></screen>
> -
> -	  <para>if it is a floppy, or this:</para>
> -
> -	  <screen>&prompt.root; <userinput>mount -t msdosfs /dev/da2s4 /zip</userinput></screen>
> -
> -	  <para>for a ZIP disk with the factory configuration.</para>
> -
> -	  <para>For other disks, see how they are laid out using
> -	    &man.fdisk.8; or &man.sysinstall.8;.</para>
> -
> -	  <para>The rest of the examples will be for a ZIP drive on
> -	    <devicename>da2</devicename>, the third SCSI disk.</para>
> -
> -	  <para>Unless it is a floppy, or a removable you plan on
> -	    sharing with other people, it is probably a better idea to
> -	    stick a BSD file system on it.  You will get long filename
> -	    support, at least a 2X improvement in performance, and a lot
> -	    more stability.  First, you need to redo the DOS-level
> -	    partitions/file systems.  You can either use &man.fdisk.8;
> -	    or &man.sysinstall.8;, or for a small drive that you do not
> -	    want to bother with multiple operating system support on,
> -	    just blow away the whole FAT partition table (slices) and
> -	    just use the BSD partitioning:</para>
> -
> -	  <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/rda2 count=2</userinput>
> -&prompt.root; <userinput>disklabel -Brw da2 auto</userinput></screen>
> +	  <screen>&prompt.root; <userinput>mount /dev/da0s1 /mnt</userinput></screen>
>

Last I checked, our mount.8 did not have magic to guess the file system 
type; a new removable media is unlikely to come preformatted with a 
FreeBSD UFS file system on it, so this command would not work.  The '-t 
msdosfs' seems like a better bet.

> -	  <para>You can use &man.disklabel.8; or &man.sysinstall.8; to
> -	    create multiple BSD partitions.  You will certainly want to
> -	    do this if you are adding swap space on a fixed disk, but it
> -	    is probably irrelevant on a removable drive like a
> -	    ZIP.</para>
> +	  <para>If the drive will only be used with &os;
> +	    systems it is better idea to
> +	    stick a BSD file system on it, like UFS or ZFS.

And this block no longer has meaning, since "better idea" can only be with 
respect to the previous example, which currently assumes ... a BSD file 
system.

-Ben Kaduk

> +	    You will get long filename
> +	    support, at least a 2X improvement in performance,
> +	    and a lot more stability.  If the drive will be
> +	    used by other operating systems a more portable
> +	    choice, such as msdosfs, is better.</para>
> +
[trim]

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 20:16:42 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1DC6E119;
 Mon, 12 Nov 2012 20:16:42 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
 [18.7.68.36]) by mx1.freebsd.org (Postfix) with ESMTP id 824458FC08;
 Mon, 12 Nov 2012 20:16:41 +0000 (UTC)
X-AuditID: 12074424-b7fce6d000000925-f8-50a15928c074
Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id
 6E.60.02341.82951A05; Mon, 12 Nov 2012 15:16:40 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qACKGem5001337;
 Mon, 12 Nov 2012 15:16:40 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACKGchw008930
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 15:16:39 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACKGboB001715; Mon, 12 Nov 2012 15:16:37 -0500 (EST)
Date: Mon, 12 Nov 2012 15:16:37 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39984 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201211112229.qABMT8b9009396@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211121513210.2164@multics.mit.edu>
References: <201211112229.qABMT8b9009396@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEIsWRmVeSWpSXmKPExsUixG6noqsRuTDAoK9b2+LHx0NMFrv+zmG2
 uLFoP5PF7v5eZgcWjxmf5rMEMEZx2aSk5mSWpRbp2yVwZcxYN5u54J1AxfQr01kaGLfxdjFy
 cEgImEjcXKPWxcgJZIpJXLi3nq2LkYtDSGAfo8SDD7cYIZwNjBLzv/5ggnBOMElMPDQHKtPA
 KDGrYT8zSD+LgLbE74fLWUBsNgEViZlvNrKB2CJA9vf9P5lAbGaBKIk9SxtZQWxhAQeJ+c9e
 MoLYnAJWEi+WXgLr5QWKn37XCFYvJGApsf/SB7AaUQEdidX7p0DVCEqcnPmEBWKmpcS5P9fZ
 JjAKzkKSmoUktYCRaRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZw0Lqo7GBs
 PqR0iFGAg1GJh9fAfWGAEGtiWXFl7iFGSQ4mJVHe1WFAIb6k/JTKjMTijPii0pzU4kOMEhzM
 SiK8v+8uCBDiTUmsrEotyodJSXOwKInzXk+56S8kkJ5YkpqdmlqQWgSTleHgUJLglYsAGipY
 lJqeWpGWmVOCkGbi4AQZzgM0PASkhre4IDG3ODMdIn+KUVFKnHdFOFBCACSRUZoH1wtLKq8Y
 xYFeEeZtBKniASYkuO5XQIOZgAav3wZydXFJIkJKqoFx4aTU98WVHxneu86YICL1NC3liNua
 Q0cEvNtydf2VOwMmBxhVB/zJFnrN8+lTfMXHR2wMJgquUW8unUsVLf19gOnZx2+TD6hzdBqc
 2POaZfk9v4Wc+u8MFi9ve5lhtvuQCOdZX5ey86KHv7H5HFad8V1Z40/Xi9DT1SbZBuY1PZxC
 /guWmaUpsRRnJBpqMRcVJwIAyZCNtAUDAAA=
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 20:16:42 -0000

On Sun, 11 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Sun Nov 11 22:29:07 2012
> New Revision: 39984
> URL: http://svnweb.freebsd.org/changeset/doc/39984
>
> Log:
>  Fix stragling paras, and other minor whitespace issues
>
>  Translators may ignore.
>
>  Approved by:	jkois (mentor, prior to merge conflict resolution)
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.xml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:05 2012	(r39983)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:07 2012	(r39984)
> @@ -6279,8 +6243,7 @@ options    SYSVMSG          # enable for
> 	    do so you will need to unset the <literal>schg</literal> flag
> 	    first.  See the &man.chflags.1; manual page for more information
> 	    (and bear in mind the answer to <link linkend="unsetting-schg">
> -	    the question on unsetting the schg flag</link>).
> -	  </para>
> +	      the question on unsetting the schg flag</link>).</para>

This seems to introduce a whitespace issue, as the indentation is no 
longer consistent with the rest of the paragraph.  pine doesn't make clear 
which is using tabs (if either), so I can't say offhand whether the whole 
paragraph should be reindented or this line fixed.

> 	</answer>
>       </qandaentry>
>     </qandaset>
> @@ -6504,8 +6467,7 @@ EndSection</programlisting>
> 	    waiting for you on the second <quote>virtual
> 	    console</quote>!  When you want to go back to the original
> 	    session, do <keycombo
> -	      action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.
> -	    </para>
> +	      action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.</para>
>

This line is also inconsistent with the surrounding paragraph, even though 
the leading whitespace seems unchanged in this commit.

> 	  <para>The default &os; installation has eight virtual consoles
> 	    enabled.  <keycombo

Possibly there are others thad are hidden by line-wrapping.

-Ben Kaduk

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 20:19:53 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 339FD18E;
 Mon, 12 Nov 2012 20:19:53 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
 [18.7.68.36]) by mx1.freebsd.org (Postfix) with ESMTP id 497CE8FC13;
 Mon, 12 Nov 2012 20:19:52 +0000 (UTC)
X-AuditID: 12074424-b7fce6d000000925-bc-50a159e731e2
Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id
 B6.90.02341.7E951A05; Mon, 12 Nov 2012 15:19:51 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qACKJpRY030717;
 Mon, 12 Nov 2012 15:19:51 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACKJnTT009454
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 15:19:50 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACKJmAw001854; Mon, 12 Nov 2012 15:19:48 -0500 (EST)
Date: Mon, 12 Nov 2012 15:19:48 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39985 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201211112229.qABMTASB009430@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211121518280.2164@multics.mit.edu>
References: <201211112229.qABMTASB009430@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIIsWRmVeSWpSXmKPExsUixG6nrvs8cmGAwdLZxhY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK2P1gmOsBZt4KzZNt2lg7ODuYuTk
 kBAwkXg4aR8zhC0mceHeejYQW0hgH6PE/H1SXYxcQPYGRolXr4+zQDgnmCQmTn3OBuE0MEqs
 mDOfHaSFRUBbYtepXUwgNpuAisTMNxvBRokA2d/3/wSLMwtESexZ2sgKYgsLOEgc3/sNLM4p
 YCVx8OQ/RhCbFyi+7+NrVogzLCV63x5kAbFFBXQkVu+fwgJRIyhxcuYTFoiZlhLn/lxnm8Ao
 OAtJahaS1AJGplWMsim5Vbq5iZk5xanJusXJiXl5qUW65nq5mSV6qSmlmxjBIeuisoOx+ZDS
 IUYBDkYlHl4D94UBQqyJZcWVuYcYJTmYlER5V4cBhfiS8lMqMxKLM+KLSnNSiw8xSnAwK4nw
 /r67IECINyWxsiq1KB8mJc3BoiTOez3lpr+QQHpiSWp2ampBahFMVoaDQ0mCd2oE0FDBotT0
 1Iq0zJwShDQTByfIcB6g4SEgNbzFBYm5xZnpEPlTjIpS4rwJIAkBkERGaR5cLyylvGIUB3pF
 mLcIpIoHmI7gul8BDWYCGrx+G8jVxSWJCCmpBsa09f8tnszO3HYvTP/DgqvXy12TvfdrVcbt
 MZ2a4fOl7B8rZ07a1MwVHxmULUTXfNVkic/Ui+/5ljjx0Jb2KKXb2tobrrs/SBSbeF2x/tHG
 3hOpMn1XWfese7/hyuQg6WNX2VTcfO+eNczSitZimfAmUn9z8+o83xORjAbLd3mrJCT9WZK1
 mEOJpTgj0VCLuag4EQCHInmjBAMAAA==
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 20:19:53 -0000

On Sun, 11 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Sun Nov 11 22:29:09 2012
> New Revision: 39985
> URL: http://svnweb.freebsd.org/changeset/doc/39985
>
> Log:
>  Ports are no longer needed to uncompress these formats.
>
>  Approved by:	jkois (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.xml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:07 2012	(r39984)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:09 2012	(r39985)
> @@ -924,42 +923,11 @@
[trim]
> -		    </tgroup>
> -		  </informaltable>
> +		  <para>These files are then compressed using either
> +		    the <literal>zip</literal> or
> +		    <literal>bz2</literal> compression schemes.
> +		    &man.tar.1; can be used to uncompress these
> +		    files.</para>
>
> 		  <para>So the &postscript; version of the Handbook,
> 		    compressed using <literal>bzip2</literal> will be stored in a file
> @@ -982,8 +950,7 @@
> 	    to do this.</para>
>
> 	  <screen>&prompt.root; <userinput>fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</userinput>
> -&prompt.root; <userinput>bzip2 -d book.html-split.tar.bz2</userinput>
> -&prompt.root; <userinput>tar xvf book.html-split.tar</userinput></screen>
> +&prompt.root; <userinput>tar xvf book.html-split.tar.bz2</userinput></screen>

Hmm, relying on the new magic to assume 'z' if needed.  Maybe the above 
note should say that tar will automatically detect that there is 
compression and the appropriate format?

-Ben Kaduk

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 22:50:26 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D985B4F2
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:50:26 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
 [209.85.217.182])
 by mx1.freebsd.org (Postfix) with ESMTP id 4B74F8FC0C
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:50:25 +0000 (UTC)
Received: by mail-lb0-f182.google.com with SMTP id gg13so1727538lbb.13
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 14:50:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=gjBpsdRt4R2cFEnZiqa+CCHuzkhrJP0+NNhPZPbKeUE=;
 b=RPMMNpXe0/rIiqDjo2OjAJIfxZX8N9JqhMl14ObGClqUx8I0CmsN8O/BZRMsHNENF6
 +ru6AvzSrrxMGJMdxL/rjTFfLboXmUR3wg1rdcjPm1xSqBurx1Skz3xCPIsfDXBP57Ef
 T1WnZiPPO9qMlqpzHiTyb0F/0i2JKwssWdkIo=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=gjBpsdRt4R2cFEnZiqa+CCHuzkhrJP0+NNhPZPbKeUE=;
 b=oAsClIUBj871ExBhJvb4NR+IvZ1jQWu37OEW4/RJwkLCWKZmkAlDyO2vpLTC+3PyAX
 HRLzSLc67aLyAKmh6faYEpOGBu+W6KWo3P4bJ3Cip4o4E0hAP80+SCG+3YbghBp+nTrj
 aiklgn7TUDGZEoYFGhoP/jm5wdL1NVKFNQ1VVYf9+XgBZkwBrsI7jKyN55BbZ+tCn/+k
 8paHGmHxoERAyG1nSiusIquiHTTh95fRM8Fxs9xom21FrCE1AsZHVogwIQuYBGeVvaqy
 UWwW5DGKHSbWEjButOrcSTXdUghcwTagc1HJ0XYt380HHoP0VVQai874VUdjAE4IzF5L
 2CMg==
Received: by 10.112.37.7 with SMTP id u7mr8507696lbj.30.1352760624945; Mon, 12
 Nov 2012 14:50:24 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Mon, 12 Nov 2012 14:49:54 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
 <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 12 Nov 2012 17:49:54 -0500
X-Google-Sender-Auth: XRiXFjmJZD4ftgtJOuJt6R6QJ4s
Message-ID: <CAF6rxgnn_B0BZsxM51OQpa_Q2rzEApaj9OG5R0sTGKDuOp65iA@mail.gmail.com>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQny5xB9YG9O+RfSLWJOpmnx22rkQ4avSCX5szOOh1SrHZa2lkxVrf0ieySSVzlpEiV9LXgs
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 22:50:26 -0000

On 12 November 2012 14:58, Benjamin Kaduk <kaduk@mit.edu> wrote:
> On Sun, 11 Nov 2012, Eitan Adler wrote:
>
>> Author: eadler
>> Date: Sun Nov 11 22:29:01 2012
>> New Revision: 39981
>> URL: http://svnweb.freebsd.org/changeset/doc/39981
>>
>> Log:
>>  Reduce redundant markup and word and other minor problems reported by
>>  igor.  Limited additional checking was done of the surrounding content.
>>
>>  Approved by:   jkois (mentor, before merge conflict resolution)
>>
>> Modified:
>>  head/en_US.ISO8859-1/books/faq/book.xml
>>
>> Modified: head/en_US.ISO8859-1/books/faq/book.xml
>>
>> ==============================================================================
>> --- head/en_US.ISO8859-1/books/faq/book.xml     Sun Nov 11 21:42:32 2012
>> (r39980)
>> +++ head/en_US.ISO8859-1/books/faq/book.xml     Sun Nov 11 22:29:01 2012
>> (r39981)
>> @@ -923,7 +923,7 @@
>>                   <para>Where the format is
>>                     <literal>html-split</literal>, the files are bundled
>>                     up using &man.tar.1;.  The resulting
>> -                   <filename>.tar</filename> file is then compressed
>> +                   <filename>.tar</filename> is then compressed
>
>
> This would seem like a candidate where the "redundant" use of "file"
> actually is helpful, since there is not a specific file name given.

Perhaps.   I'll send a patch to bcr & jkois.


>> -           the <command>close lcp</command> command (a following
>> -           <command>term</command> command) will reconnect you to the
>> +           <command>close lcp</command> (a following
>> +           <command>term</command>) will reconnect you to the
>
>
> I have trouble making sense of this sentence; perhaps the close paren is
> misplaced?  Not a bug in your change, but I would have expected it to be
> noticed in pre-commit review.

Note the commit message: ""Limited additional checking was done of the
surrounding content.""
I noticed quite a few things, but few of which I felt I wanted to fix
in this iteration.


>>           <warning>
>> -           <para>The <option>-R</option> option does a
>> +           <para><option>-R</option> does a
>
>
> My understanding was that we did not like to start sentences with markup.

I did not know this.  Can you propose some alternative wording?


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 22:53:12 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D1FAC659
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:53:12 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
 [209.85.217.182])
 by mx1.freebsd.org (Postfix) with ESMTP id 3BF458FC12
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:53:12 +0000 (UTC)
Received: by mail-lb0-f182.google.com with SMTP id gg13so1729201lbb.13
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 14:53:11 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=soAYmsw7NZ1uaUYMSV5EceLyaukWUMpRPsApYiZ7DKQ=;
 b=sYNHsK2gHD3FsDQpQ/oDMSPYuM6ABWF++KqNibEgQkIsrq6nYczNXGF+YYr/On+KjJ
 PNp/S2wA9QjwFzKo0+YCWYekh/sgJzz3e5FH6JkFqeoi0hnoDm6plM9g2a1EbAKdqBKC
 3BQ0pSLBOG6XRS+BIonfU6bF14XgLi2yi5u/I=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=soAYmsw7NZ1uaUYMSV5EceLyaukWUMpRPsApYiZ7DKQ=;
 b=hCwg0mVxxbVHOTK1NrObc59laNlRSRXzzwJAXur0nS8wNooiWq7HWh19HGdYwdQOQM
 oq01lEiq8nh95QOfs9ha9IQ4oiO4hLozMjLw2K80Ae1uY7tKWtL0jiGQH5Z1eVieFGD6
 IIwUO4sYvq1CL93Fs/hSGUC/GbfoooVEFNtCh0eSc9psvW6FXHTNWtluJz2EJbfALb/G
 u/EIIUQM3zbs7dXWYJEfApL2J23zn4D/V20q2FpnCWyEjt57Bb2aHu/gRfoGgBJYV2Li
 DdCpc8VVostmSB6m2WvhDHbjAYaEWQMxt5nOdz0olArliB8yKTDmV5p+GWl4Ds602eIy
 gCWA==
Received: by 10.152.144.70 with SMTP id sk6mr5795441lab.27.1352760791073; Mon,
 12 Nov 2012 14:53:11 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Mon, 12 Nov 2012 14:52:40 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211121513210.2164@multics.mit.edu>
References: <201211112229.qABMT8b9009396@svn.freebsd.org>
 <alpine.GSO.1.10.1211121513210.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 12 Nov 2012 17:52:40 -0500
X-Google-Sender-Auth: 065NyzSIUDYwB1aGmnTtNT-DZmw
Message-ID: <CAF6rxgkP2Na4oG-LkiL544K=bbevcRoKTKajcXOE0GTsKQbWuQ@mail.gmail.com>
Subject: Re: svn commit: r39984 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQlaA3LNVgKj3vC7x+0r5bCKEd1jG8bB6E2d52U16PMKq9A1nVSuju+5YJDid0Dn78s+/5Yc
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 22:53:13 -0000

On 12 November 2012 15:16, Benjamin Kaduk <kaduk@mit.edu> wrote:
>> Modified: head/en_US.ISO8859-1/books/faq/book.xml
>> linkend="unsetting-schg">
>> -           the question on unsetting the schg flag</link>).
>> -         </para>
>> +             the question on unsetting the schg flag</link>).</para>
>
>
> This seems to introduce a whitespace issue, as the indentation is no longer
> consistent with the rest of the paragraph.  pine doesn't make clear which is
> using tabs (if either), so I can't say offhand whether the whole paragraph
> should be reindented or this line fixed.

The FAQ is largely a mess. I have a number of outstanding patches
which attempt to bring some order.
I appreciate the reviews on my patches but please be aware that the
current version is several patches behind.

Comments on FAQ content are very much appreciated here though:
http://wiki.freebsd.org/ThwackAFaq as I have few content changes in
the pipeline as of now.


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 22:57:05 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5E2C26DB
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:57:05 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id C4FCF8FC15
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:57:04 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so51150lah.13
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 14:57:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=zGBsxhGY6ZwDklJ4FwrcSaIcPGfB/4wAULCmLYRJIiI=;
 b=jdIawskx6N+QysCGpfGNvjjeBG2FbgcKEqdRn1kLf0gpd/2xsxZ0HegehGGXOPIlfm
 VGWSR3Qocg0lXvuoc6AUeGE2njlLlzsNYdT90Fj82Gk1Ng2M16y7+fOShF7MycthUfAm
 s2z5r5lW/EEZjmB3WsO1rwuJ5DExkDOxTj41I=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=zGBsxhGY6ZwDklJ4FwrcSaIcPGfB/4wAULCmLYRJIiI=;
 b=eNgtbF6iBPoJwR78EtXPgZvKOfD+Sorf65NioHCtqKFq8Yi9GNbYX4hQLgYMI2OGI/
 rSWgR5ICvUjDLNLNgEjSVpyChF0rifKzpcZnzQgIm3iXzWfUVgsnpFc46f2j420kTiUG
 VkTfxMOef7cXO5bqIEpx2ntpHLljIVv6fXAXtljhgdBwVQDVRMMkDUpkXETMgxhQDwUq
 Fp53DzVfvv9vBONrZXMZmLErw5d5T6A5Xv0WZpU7VUKaVmVH5oKRVvkDP6dij6SVIqJp
 qNIPQwg0J4oiqJ4Cy/wocxR9mftUsjpkH+YWuM9tMX9seLYYqhpxjAEkm1fGevwX81Mz
 fZLA==
Received: by 10.152.106.171 with SMTP id gv11mr19921174lab.26.1352761023286;
 Mon, 12 Nov 2012 14:57:03 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Mon, 12 Nov 2012 14:56:32 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211121518280.2164@multics.mit.edu>
References: <201211112229.qABMTASB009430@svn.freebsd.org>
 <alpine.GSO.1.10.1211121518280.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 12 Nov 2012 17:56:32 -0500
X-Google-Sender-Auth: VsI_tQZaYdA9WpF_dZgoGEnQcLU
Message-ID: <CAF6rxg=ZE3y4vh=CyeQWNEJ+wF4mcP1k4K8dbRmgMn4V+is4KA@mail.gmail.com>
Subject: Re: svn commit: r39985 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQkUIbOTFKrsUxMgJZAvUf9bMB2QvjJR/tJab+lrvwjpoT4Kmd+aBJ9t1L7Ot/k5lj8QGpmz
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 22:57:05 -0000

On 12 November 2012 15:19, Benjamin Kaduk <kaduk@mit.edu> wrote:
> Hmm, relying on the new magic to assume 'z' if needed.  Maybe the above note
> should say that tar will automatically detect that there is compression and
> the appropriate format?

Patch sent to mentor.



-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 22:59:30 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 216068BD
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:59:30 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
 [209.85.217.182])
 by mx1.freebsd.org (Postfix) with ESMTP id 8359F8FC12
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 22:59:29 +0000 (UTC)
Received: by mail-lb0-f182.google.com with SMTP id gg13so1732898lbb.13
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 14:59:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=XWpvrskgbX9UNJEY3UuXZqX7itVOX0UEIys/HjsQRi0=;
 b=i80UF0A51KXK8qIndN2X6wLDtEElufm01+8gUXuBM8lpg+3Pato5U8eE9oAx5c5XaL
 UZATFy5khCF4wLorY/xltCWdUhgmmbOGPaYVNDSc2iSF156Ng+G/EorNd00GWsJHhzbe
 mnRi7aIrosSEoD6YJtPPo363yZJxzKzoCEU60=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=XWpvrskgbX9UNJEY3UuXZqX7itVOX0UEIys/HjsQRi0=;
 b=jdfQvPV+BLi4z576Ho+c5UpI4vJU6RPVApa6yleyS6X6o8sv2zBcyatx6ohHK8HfIR
 i4usNHRNtsxd0QRoOA/WbnQ1tL+I/CIKZUZ3RmDqyu2GfKnhR+TEVvuzY9vBWL67IaWG
 kS+ZfPynOxXxb4q9aCk+/3N8x4EwhffKLWpm8Po5N/LR884i1bPhB7hSDm3lbbF9sUB0
 VPmOsQ265plcAEzFMSxdd+N44dTYSWzb+ItC3ul6ml37Fy97ZKDLzgdrchGT/FLn63fs
 b5tTSrQ7VQa4eEnclQ50qcZTvIBqmJZ8tWkxqKPa07CxtDPOP8yGylgsMlk4GT3tEeJJ
 jhZQ==
Received: by 10.152.131.200 with SMTP id oo8mr19570937lab.34.1352761168344;
 Mon, 12 Nov 2012 14:59:28 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Mon, 12 Nov 2012 14:58:58 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211121506000.2164@multics.mit.edu>
References: <201211112229.qABMT3dL009319@svn.freebsd.org>
 <alpine.GSO.1.10.1211121506000.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 12 Nov 2012 17:58:58 -0500
X-Google-Sender-Auth: nSVkpZdVBmlPoGwhPeguILSEdJA
Message-ID: <CAF6rxgnjCD9RvCymu8hTY=JWS2SNsKyTgnQ7cL5Y-dRriah+dA@mail.gmail.com>
Subject: Re: svn commit: r39982 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQnijTZJ/cukWLkSRm08EpBnff5uPA/JzpYmJ4uV9ArKL3W1/X2FBuAWhaQVt2oM34wqjj0w
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 22:59:30 -0000

On 12 November 2012 15:09, Benjamin Kaduk <kaduk@mit.edu> wrote:
> On Sun, 11 Nov 2012, Eitan Adler wrote:
>
>> Author: eadler
>> Date: Sun Nov 11 22:29:03 2012
>> New Revision: 39982
>> URL: http://svnweb.freebsd.org/changeset/doc/39982
>>
>> Log:
>>  Modernize the removable-drives FAQ.
>>
>>  Reviewed by:   Richard Yao <ryao@gentoo.org>
>>  Reviewed by:   koobs.freebsd@gmail.com
>>  Approved by:   bcr (mentor)
>>
>> Modified:
>>  head/en_US.ISO8859-1/books/faq/book.xml
>>
>> Modified: head/en_US.ISO8859-1/books/faq/book.xml
>>
>> ==============================================================================
>> --- head/en_US.ISO8859-1/books/faq/book.xml     Sun Nov 11 22:29:01 2012
>> (r39981)
>> +++ head/en_US.ISO8859-1/books/faq/book.xml     Sun Nov 11 22:29:03 2012
>> (r39982)
>> @@ -5125,69 +5125,38 @@ C:\="DOS"</programlisting>
>
>
> The question is unfortunately cut off; "I have a new removable drive, how do
> I use it?"

patches sent to mentor.


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 23:14:08 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AFBACCDD;
 Mon, 12 Nov 2012 23:14:08 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
 [18.9.25.12]) by mx1.freebsd.org (Postfix) with ESMTP id 0CFD78FC12;
 Mon, 12 Nov 2012 23:14:07 +0000 (UTC)
X-AuditID: 1209190c-b7f286d000000ee3-14-50a182be2fb9
Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id
 07.F6.03811.EB281A05; Mon, 12 Nov 2012 18:14:06 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qACNE6DN017732;
 Mon, 12 Nov 2012 18:14:06 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACNE4ji010168
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 18:14:05 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACNE32E004080; Mon, 12 Nov 2012 18:14:03 -0500 (EST)
Date: Mon, 12 Nov 2012 18:14:03 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <CAF6rxgnn_B0BZsxM51OQpa_Q2rzEApaj9OG5R0sTGKDuOp65iA@mail.gmail.com>
Message-ID: <alpine.GSO.1.10.1211121809090.2164@multics.mit.edu>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
 <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
 <CAF6rxgnn_B0BZsxM51OQpa_Q2rzEApaj9OG5R0sTGKDuOp65iA@mail.gmail.com>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEIsWRmVeSWpSXmKPExsUixCmqrbuvaWGAwZmFNhY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK2Pxm2amgvncFRNm97E2MB7h6GLk
 5JAQMJG4vqGXHcIWk7hwbz0biC0ksI9R4tK2qC5GLiB7A6PE2dk9rBDOCSaJPV0djBBVDYwS
 3/apg9gsAtoSj15eBouzCahIzHyzEWySCJD9ff9PJhCbWSBKYs/SRlYQW1jAQWLxjwawek6B
 QIm5ez6xgNi8QPGD996xQyzbzCjx4vpksPNEBXQkVu+fAlUkKHFy5hMWiKGWEuf+XGebwCg4
 C0lqFpLUAkamVYyyKblVurmJmTnFqcm6xcmJeXmpRbqGermZJXqpKaWbGMFBK8mzg/HNQaVD
 jAIcjEo8vDddFgYIsSaWFVfmHmKU5GBSEuUtrwQK8SXlp1RmJBZnxBeV5qQWH2KU4GBWEuE1
 rwfK8aYkVlalFuXDpKQ5WJTEeS+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8FY0AjUKFqWmp1ak
 ZeaUIKSZODhBhvMADc8FqeEtLkjMLc5Mh8ifYlSUEuctAUkIgCQySvPgemFJ5RWjONArwrxd
 IFU8wIQE1/0KaDAT0OD12xaADC5JREhJNTDufhDrN6Vm47+iOYtWrjfJXxYtX14cbTjxUraq
 ofSDC1ol36Ywf2E68PNrguXSullvnk/+75I38XHp/QoN7kXbaydkJ21/13xmou2Sc91fd80/
 dlUuw15OUTXMdpWP3R2tScWnVcKD5+07sOra4SfLczincgdIttwMji5cvKR/wfJdLbtOHyhP
 UWIpzkg01GIuKk4EAFnXSu0FAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 23:14:08 -0000

On Mon, 12 Nov 2012, Eitan Adler wrote:

> On 12 November 2012 14:58, Benjamin Kaduk <kaduk@mit.edu> wrote:
>
>>> -           the <command>close lcp</command> command (a following
>>> -           <command>term</command> command) will reconnect you to the
>>> +           <command>close lcp</command> (a following
>>> +           <command>term</command>) will reconnect you to the
>>
>>
>> I have trouble making sense of this sentence; perhaps the close paren is
>> misplaced?  Not a bug in your change, but I would have expected it to be
>> noticed in pre-commit review.
>
> Note the commit message: ""Limited additional checking was done of the
> surrounding content.""

I did see that, yes.

> I noticed quite a few things, but few of which I felt I wanted to fix
> in this iteration.

Hopefully nothing gets lost; with a lot of changes pending to this file it 
could be exciting.

>>>           <warning>
>>> -           <para>The <option>-R</option> option does a
>>> +           <para><option>-R</option> does a
>>
>>
>> My understanding was that we did not like to start sentences with markup.
>
> I did not know this.  Can you propose some alternative wording?

Well, it may not be a fully settled point; possibly someone else wants to 
chime in on the matter.

As far as rewording, I would try "Using <option>-R</option> causes 
&man.chmod.1 to act <emphasis>recursively</emphasis>."

-Ben

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 23:21:10 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0457AEEE;
 Mon, 12 Nov 2012 23:21:09 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU
 [18.7.68.34]) by mx1.freebsd.org (Postfix) with ESMTP id 62CE68FC08;
 Mon, 12 Nov 2012 23:21:09 +0000 (UTC)
X-AuditID: 12074422-b7f746d0000008cc-c1-50a1833221cd
Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
 by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP id
 CA.FC.02252.23381A05; Mon, 12 Nov 2012 18:16:02 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qACNG2qY016653;
 Mon, 12 Nov 2012 18:16:02 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qACNG0qh010414
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 12 Nov 2012 18:16:01 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qACNFxp3004108; Mon, 12 Nov 2012 18:15:59 -0500 (EST)
Date: Mon, 12 Nov 2012 18:15:59 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39984 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <CAF6rxgkP2Na4oG-LkiL544K=bbevcRoKTKajcXOE0GTsKQbWuQ@mail.gmail.com>
Message-ID: <alpine.GSO.1.10.1211121815350.2164@multics.mit.edu>
References: <201211112229.qABMT8b9009396@svn.freebsd.org>
 <alpine.GSO.1.10.1211121513210.2164@multics.mit.edu>
 <CAF6rxgkP2Na4oG-LkiL544K=bbevcRoKTKajcXOE0GTsKQbWuQ@mail.gmail.com>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsUixG6nrmvUvDDA4OISLYsfHw8xWez6O4fZ
 4sai/UwWu/t7mR1YPGZ8ms8SwBjFZZOSmpNZllqkb5fAlbHw8A3GgqVMFU1Tb7M2MD5h7GLk
 4JAQMJFY8Mqji5ETyBSTuHBvPVsXIxeHkMA+Rokt21pYIZwNjBJT/9xiA6kSEjjBJHF4WwVE
 ooFRYvLqdrBJLALaEg336kBq2ARUJGa+2QhWLwJkf9//kwnEZhaIktiztJEVxBYWcJCY/+wl
 WCunQKDErHVeIGFeoPD3Vw+g9m5mlPh04RjYHFEBHYnV+6ewQBQJSpyc+YQFYqalxLk/19km
 MArOQpKahSS1gJFpFaNsSm6Vbm5iZk5xarJucXJiXl5qka6pXm5miV5qSukmRnDAuijtYPx5
 UOkQowAHoxIP7w2XhQFCrIllxZW5hxglOZiURHnLK4FCfEn5KZUZicUZ8UWlOanFhxglOJiV
 RHjN64FyvCmJlVWpRfkwKWkOFiVx3mspN/2FBNITS1KzU1MLUotgsjIcHEoSvB8agRoFi1LT
 UyvSMnNKENJMHJwgw3mAhq8EqeEtLkjMLc5Mh8ifYlSUEuf9CpIQAElklObB9cISyitGcaBX
 hHmPgVTxAJMRXPcroMFMQIPXb1sAMrgkESEl1cAYsemb+akzzjwXDzlOvvU8dN/kv2u8gmbF
 iJ/68ejV+fePrxyM3i+u/f9wcp96SUB+8Qw7WSXd7mdPLA0bzr+ceuCw0f4XTsfF+hqunAnk
 F3eVPOYo8zvruGx8fsgkIy4Z/cmaUzZ9F/r48sWeeSp7hU1D+B8t/bbMzeardrOj5JG/M1aI
 Fm8RVGIpzkg01GIuKk4EACwlWDgDAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 23:21:10 -0000

On Mon, 12 Nov 2012, Eitan Adler wrote:

> Comments on FAQ content are very much appreciated here though:
> http://wiki.freebsd.org/ThwackAFaq as I have few content changes in
> the pipeline as of now.

It is on the todo list, but I have a bit of a backlog to deal with, first.

-Ben

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 23:22:25 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BB865F58
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 23:22:25 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id 29AEC8FC08
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 23:22:24 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so66125lah.13
 for <svn-doc-head@freebsd.org>; Mon, 12 Nov 2012 15:22:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=buSweXkEbXsdpi6PIQ3Uq4V8KpBhGw0FMnmgX8rv/mQ=;
 b=pD8rMyqmF+X1qYWS+G2Qefp3mhv/cltsITbCRc20KByQCXPe2O2ocFhUckV5icPd2g
 vzTI1zxLI8nJwUSwnKKsLEtyurrCc9zmbV61yDddT+l8neB+92a0WKcfdnu9MZyKgv3Y
 ZAENyXrNCsgw/fowUHMpzBgLCRNISpOe4U5m4=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=buSweXkEbXsdpi6PIQ3Uq4V8KpBhGw0FMnmgX8rv/mQ=;
 b=J5/bzUmgeVyT5s7YPvEWT7eIefZ6uwX6rEXkTLNcKc0UHtijucnTnnVMhYEEmUG8dU
 M0q6yRidYgEC066PU5d71MLwp9mTSUujAxsg9H7H2wAGfmUQlCAmCS6MO5subqAuNrao
 H1tOwndaqmQ4kfBZe3dWnpjC/MDrv59qlJuG7E3j3ACCm2psrZVrJ7LB/9m/ExxFCuvz
 1MwRxx3rfXfW7QyrJhODO5RWy4yp5nqkYGz10MFOzwPKwofxP0xOkI6mWl6dKMzjltJg
 1b95552VPzsO0M3+VnDzaVLqclx4PFiFXQ4Be3JUnhUUueUNPdW2xAm7nQxFG/EeI/fV
 Lekw==
Received: by 10.112.37.7 with SMTP id u7mr8534470lbj.30.1352762543816; Mon, 12
 Nov 2012 15:22:23 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Mon, 12 Nov 2012 15:21:52 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211121809090.2164@multics.mit.edu>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
 <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
 <CAF6rxgnn_B0BZsxM51OQpa_Q2rzEApaj9OG5R0sTGKDuOp65iA@mail.gmail.com>
 <alpine.GSO.1.10.1211121809090.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 12 Nov 2012 18:21:52 -0500
X-Google-Sender-Auth: I5YTPgvBxAuzYYuj3yr-2x8rrDA
Message-ID: <CAF6rxgnSn3W4KCtg-No1yRxUb3dtuo8d0Om8fayV+e9k8yZ_OQ@mail.gmail.com>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQkw8oeOcJWb6kCY3nteG8+U9SrzVvbPSQTIV4V8jA2tGSRA6GXwz9SSI++OoqtBQs2lAMD6
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 23:22:25 -0000

On 12 November 2012 18:14, Benjamin Kaduk <kaduk@mit.edu> wrote:
> Hopefully nothing gets lost; with a lot of changes pending to this file it
> could be exciting.

My goal is to make this file good enough that other doc committers,
and more importantly, new contributors start supplying patches.
Ideally someone else will step up and start contributing content.

>
> Well, it may not be a fully settled point; possibly someone else wants to
> chime in on the matter.
>
> As far as rewording, I would try "Using <option>-R</option> causes
> &man.chmod.1 to act <emphasis>recursively</emphasis>."

I like this should it need to be changed.  Anyone want to comment?


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 12 23:37:45 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 86AA9450;
 Mon, 12 Nov 2012 23:37:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 532CB8FC15;
 Mon, 12 Nov 2012 23:37:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACNbjkZ033140;
 Mon, 12 Nov 2012 23:37:45 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACNbjwe033139;
 Mon, 12 Nov 2012 23:37:45 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211122337.qACNbjwe033139@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 12 Nov 2012 23:37:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39991 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 23:37:45 -0000

Author: gjb
Date: Mon Nov 12 23:37:44 2012
New Revision: 39991
URL: http://svnweb.freebsd.org/changeset/doc/39991

Log:
  Test commit.  Please ignore.

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov 13 05:49:50 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9D2B91C5;
 Tue, 13 Nov 2012 05:49:50 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 803418FC0C;
 Tue, 13 Nov 2012 05:49:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD5nohr091953;
 Tue, 13 Nov 2012 05:49:50 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAD5no9s091952;
 Tue, 13 Nov 2012 05:49:50 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201211130549.qAD5no9s091952@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 13 Nov 2012 05:49:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39992 - head/en_US.ISO8859-1/htdocs/internal
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 05:49:50 -0000

Author: peter (src committer)
Date: Tue Nov 13 05:49:50 2012
New Revision: 39992
URL: http://svnweb.freebsd.org/changeset/doc/39992

Log:
  Hack to point to a list updated on freefall.

Modified:
  head/en_US.ISO8859-1/htdocs/internal/homepage.pl

Modified: head/en_US.ISO8859-1/htdocs/internal/homepage.pl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Mon Nov 12 23:37:44 2012	(r39991)
+++ head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Tue Nov 13 05:49:50 2012	(r39992)
@@ -2,6 +2,10 @@
 
 # $FreeBSD$
 
+print "<?xml version='1.0' encoding='iso-8859-1'?>\n";
+print "<li><a href=\"http://people.FreeBSD.org/homepage.html\">FreeBSD Developer home page list</a>\n";
+exit 0;
+
 $homepagedir = 'public_html';
 @index = ('index.html', 'index.cgi');
 $noindex = '.noindex';

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov 13 05:50:59 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D42562F4;
 Tue, 13 Nov 2012 05:50:59 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B90E48FC15;
 Tue, 13 Nov 2012 05:50:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD5oxop092164;
 Tue, 13 Nov 2012 05:50:59 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAD5oxHV092163;
 Tue, 13 Nov 2012 05:50:59 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201211130550.qAD5oxHV092163@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 13 Nov 2012 05:50:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39993 - head/en_US.ISO8859-1/htdocs/internal
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 05:50:59 -0000

Author: peter (src committer)
Date: Tue Nov 13 05:50:59 2012
New Revision: 39993
URL: http://svnweb.freebsd.org/changeset/doc/39993

Log:
  Close <li>

Modified:
  head/en_US.ISO8859-1/htdocs/internal/homepage.pl

Modified: head/en_US.ISO8859-1/htdocs/internal/homepage.pl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Tue Nov 13 05:49:50 2012	(r39992)
+++ head/en_US.ISO8859-1/htdocs/internal/homepage.pl	Tue Nov 13 05:50:59 2012	(r39993)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 print "<?xml version='1.0' encoding='iso-8859-1'?>\n";
-print "<li><a href=\"http://people.FreeBSD.org/homepage.html\">FreeBSD Developer home page list</a>\n";
+print "<li><a href=\"http://people.FreeBSD.org/homepage.html\">FreeBSD Developer home page list</a></li>\n";
 exit 0;
 
 $homepagedir = 'public_html';

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov 13 20:15:09 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 32F8BDEA;
 Tue, 13 Nov 2012 20:15:09 +0000 (UTC)
 (envelope-from marc@blackend.org)
Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [IPv6:2a01:e0c:1:1599::15])
 by mx1.freebsd.org (Postfix) with ESMTP id D55278FC0C;
 Tue, 13 Nov 2012 20:15:04 +0000 (UTC)
Received: from emphyrio.blackend.org (unknown [88.179.1.53])
 by smtp6-g21.free.fr (Postfix) with ESMTP id 7499F82259;
 Tue, 13 Nov 2012 21:14:57 +0100 (CET)
Received: from emphyrio.blackend.org (localhost [127.0.0.1])
 by emphyrio.blackend.org (8.14.5/8.14.4) with ESMTP id qADKEtCR001534;
 Tue, 13 Nov 2012 21:14:55 +0100 (CET)
 (envelope-from marc@emphyrio.blackend.org)
Received: (from marc@localhost)
 by emphyrio.blackend.org (8.14.5/8.14.4/Submit) id qADKEtvO001533;
 Tue, 13 Nov 2012 21:14:55 +0100 (CET) (envelope-from marc)
Date: Tue, 13 Nov 2012 21:14:55 +0100
From: Marc Fonvieille <blackend@FreeBSD.org>
To: Warren Block <wblock@wonkity.com>
Subject: Re: svn commit: r39872 - head/en_US.ISO8859-1/books/handbook/config
Message-ID: <20121113201455.GA1460@emphyrio.blackend.org>
References: <201210310241.q9V2f3rx030600@svn.freebsd.org>
 <20121102091029.GA1463@emphyrio.blackend.org>
 <alpine.BSF.2.00.1211020730100.36572@wonkity.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.BSF.2.00.1211020730100.36572@wonkity.com>
X-Useless-Header: blackend.org
X-Operating-System: FreeBSD 8.3-STABLE
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org, Warren Block <wblock@FreeBSD.org>
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 20:15:09 -0000

On Fri, Nov 02, 2012 at 07:55:06AM -0600, Warren Block wrote:
> On Fri, 2 Nov 2012, Marc Fonvieille wrote:
> 
> >> -    <para>The <filename>rc.conf</filename> file can then be
> >> +    <para><filename>rc.conf</filename>can then be
> >
> > (a whitespace is missing before the "can")
> 
> Whoops, so it is.  I'll fix that.
> 
> > Regarding this change, you are just reverting what was decided years
> > ago to avoid having a sentence beginning without a capital letter.  The
> > same applies to the manual pages with "The .Nm utility/whatever..." thing.
> > Respecting this principle has been a huge work...
> 
> My apologies, I was not aware of that; could you point me to the 
> discussion?
> 

If memories are good freebsd-doc archives and CVS commits should keep
a track of that (and many manual pages).

> >>        distributed to every system using <command>rsync</command> or a
> >> -      similar program, while the <filename>rc.conf.local</filename>
> >> -      file remains unique.</para>
> >> +      similar program, while <filename>rc.conf.local</filename>
> >> +      remains unique.</para>
> >>
> >>      <para>Upgrading the system using &man.sysinstall.8; or
> >> -      <command>make world</command> will not overwrite the
> >> -      <filename>rc.conf</filename> file, so system configuration
> >> +      <command>make world</command> will not overwrite
> >> +      <filename>rc.conf</filename>, so system configuration
> >>        information will not be lost.</para>
> > [...]
> >
> > These changes are necessary?  Till now it's what we used to do and we
> > never got any complaints.
> 
> The FDP style guide says to avoid redundant phrases, giving filenames as 
> one specific example:
> 
> http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/writing-style.html
> 
>    Avoid redundant phrases
> 
>    Try not to use redundant phrases.  In particular, "the command", "the
>    file", and "man command" are probably redundant.
> 
>    These two examples show this for commands.  The second example is
>    preferred.
> 
>    Use the command cvsup to update your sources.
> 
>    Use cvsup to update your sources.
> 
>    These two examples show this for filenames.  The second example is
>    preferred.
> 
>    ... in the filename /etc/rc.local...
> 
>    ... in /etc/rc.local...
> 
> Sometimes it is useful to point out that a filename refers to a file (as 
> opposed to a directory, say), but most of the time it is redundant, just 
> adding more words with no additional meaning.

Hmm I'm not sure to really see what is redundant in for example "add
this parameter in the rc.conf file", it's even often used in many
languages but I'm not an en_US expert...  It's not clearly stated in the
FDP: "probably redundant".  And I feel no one could come and say "it's
not correct, you write like a 7 years old kid", so we may avoid "thousand"
lines of changes for something like that.

-- 
Marc

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov 13 20:20:49 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5902D183;
 Tue, 13 Nov 2012 20:20:49 +0000 (UTC)
 (envelope-from marc@blackend.org)
Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [IPv6:2a01:e0c:1:1599::15])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A7258FC14;
 Tue, 13 Nov 2012 20:20:44 +0000 (UTC)
Received: from emphyrio.blackend.org (unknown [88.179.1.53])
 by smtp6-g21.free.fr (Postfix) with ESMTP id 5AFA9822E8;
 Tue, 13 Nov 2012 21:20:37 +0100 (CET)
Received: from emphyrio.blackend.org (localhost [127.0.0.1])
 by emphyrio.blackend.org (8.14.5/8.14.4) with ESMTP id qADKKZuM001554;
 Tue, 13 Nov 2012 21:20:35 +0100 (CET)
 (envelope-from marc@emphyrio.blackend.org)
Received: (from marc@localhost)
 by emphyrio.blackend.org (8.14.5/8.14.4/Submit) id qADKKZgA001553;
 Tue, 13 Nov 2012 21:20:35 +0100 (CET) (envelope-from marc)
Date: Tue, 13 Nov 2012 21:20:35 +0100
From: Marc Fonvieille <blackend@freebsd.org>
To: Benjamin Kaduk <kaduk@MIT.EDU>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
Message-ID: <20121113202035.GB1460@emphyrio.blackend.org>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
 <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
X-Useless-Header: blackend.org
X-Operating-System: FreeBSD 8.3-STABLE
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org, Eitan Adler <eadler@freebsd.org>
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 20:20:49 -0000

On Mon, Nov 12, 2012 at 02:58:44PM -0500, Benjamin Kaduk wrote:
> On Sun, 11 Nov 2012, Eitan Adler wrote:
> 
> > Author: eadler
> > Date: Sun Nov 11 22:29:01 2012
> > New Revision: 39981
> > URL: http://svnweb.freebsd.org/changeset/doc/39981
> >
> > Log:
> >  Reduce redundant markup and word and other minor problems reported by
> >  igor.  Limited additional checking was done of the surrounding content.
> >
> >  Approved by:	jkois (mentor, before merge conflict resolution)
> >
> > Modified:
> >  head/en_US.ISO8859-1/books/faq/book.xml
> >
> > Modified: head/en_US.ISO8859-1/books/faq/book.xml
> > ==============================================================================
> > --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 21:42:32 2012	(r39980)
> > +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov 11 22:29:01 2012	(r39981)
> > @@ -923,7 +923,7 @@
> > 		  <para>Where the format is
> > 		    <literal>html-split</literal>, the files are bundled
> > 		    up using &man.tar.1;.  The resulting
> > -		    <filename>.tar</filename> file is then compressed
> > +		    <filename>.tar</filename> is then compressed
> 
> This would seem like a candidate where the "redundant" use of "file" 
> actually is helpful, since there is not a specific file name given.
>
[...]

Well, can we avoid all these sort of changes?  They are necessary?

[...]
> > +	    to make this work.  See &man.chmod.1; and
> > +	    &man.symlink.7; for more information.</para>
> >
> > 	  <warning>
> > -	    <para>The <option>-R</option> option does a
> > +	    <para><option>-R</option> does a
> 
> My understanding was that we did not like to start sentences with markup.
> 

Same here, again "redundant" useless sweep...

Please guys, stop these silly "redundant" commits.

-- 
Marc

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov 14 15:24:00 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B46CA313;
 Wed, 14 Nov 2012 15:24:00 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 by mx1.freebsd.org (Postfix) with ESMTP id 75E748FC16;
 Wed, 14 Nov 2012 15:24:00 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.5/8.14.5) with ESMTP id qAEFNsRP053887;
 Wed, 14 Nov 2012 08:23:54 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id qAEFNsLf053884;
 Wed, 14 Nov 2012 08:23:54 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Wed, 14 Nov 2012 08:23:54 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Marc Fonvieille <blackend@FreeBSD.org>
Subject: Re: svn commit: r39872 -
 head/en_US.ISO8859-1/books/handbook/config
In-Reply-To: <20121113201455.GA1460@emphyrio.blackend.org>
Message-ID: <alpine.BSF.2.00.1211140722240.53496@wonkity.com>
References: <201210310241.q9V2f3rx030600@svn.freebsd.org>
 <20121102091029.GA1463@emphyrio.blackend.org>
 <alpine.BSF.2.00.1211020730100.36572@wonkity.com>
 <20121113201455.GA1460@emphyrio.blackend.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (wonkity.com [127.0.0.1]); Wed, 14 Nov 2012 08:23:54 -0700 (MST)
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org, Warren Block <wblock@FreeBSD.org>
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 15:24:01 -0000

On Tue, 13 Nov 2012, Marc Fonvieille wrote:

> On Fri, Nov 02, 2012 at 07:55:06AM -0600, Warren Block wrote:
>> On Fri, 2 Nov 2012, Marc Fonvieille wrote:
>>
>>>> -    <para>The <filename>rc.conf</filename> file can then be
>>>> +    <para><filename>rc.conf</filename>can then be
>>>
>>> (a whitespace is missing before the "can")
>>
>> Whoops, so it is.  I'll fix that.
>>
>>> Regarding this change, you are just reverting what was decided years
>>> ago to avoid having a sentence beginning without a capital letter.  The
>>> same applies to the manual pages with "The .Nm utility/whatever..." thing.
>>> Respecting this principle has been a huge work...
>>
>> My apologies, I was not aware of that; could you point me to the
>> discussion?
>>
>
> If memories are good freebsd-doc archives and CVS commits should keep
> a track of that (and many manual pages).

I was hoping for something more specific, a discussion that would help 
me understand the reasoning and why it is not documented.

>>>>        distributed to every system using <command>rsync</command> or a
>>>> -      similar program, while the <filename>rc.conf.local</filename>
>>>> -      file remains unique.</para>
>>>> +      similar program, while <filename>rc.conf.local</filename>
>>>> +      remains unique.</para>
>>>>
>>>>      <para>Upgrading the system using &man.sysinstall.8; or
>>>> -      <command>make world</command> will not overwrite the
>>>> -      <filename>rc.conf</filename> file, so system configuration
>>>> +      <command>make world</command> will not overwrite
>>>> +      <filename>rc.conf</filename>, so system configuration
>>>>        information will not be lost.</para>
>>> [...]
>>>
>>> These changes are necessary?  Till now it's what we used to do and we
>>> never got any complaints.
>>
>> The FDP style guide says to avoid redundant phrases, giving filenames as
>> one specific example:
>>
>> http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/writing-style.html
>>
>>    Avoid redundant phrases
>>
>>    Try not to use redundant phrases.  In particular, "the command", "the
>>    file", and "man command" are probably redundant.
>>
>>    These two examples show this for commands.  The second example is
>>    preferred.
>>
>>    Use the command cvsup to update your sources.
>>
>>    Use cvsup to update your sources.
>>
>>    These two examples show this for filenames.  The second example is
>>    preferred.
>>
>>    ... in the filename /etc/rc.local...
>>
>>    ... in /etc/rc.local...
>>
>> Sometimes it is useful to point out that a filename refers to a file (as
>> opposed to a directory, say), but most of the time it is redundant, just
>> adding more words with no additional meaning.
>
> Hmm I'm not sure to really see what is redundant in for example "add
> this parameter in the rc.conf file", it's even often used in many
> languages but I'm not an en_US expert...

The filename renders differently, indicating that it is a file.  Even in 
ASCII, "edit rc.conf" is more clear than "edit the rc.conf file"

An analogy:

   "the rc.conf file" = if (n != 0)
   "rc.conf"          = if (n)

> It's not clearly stated in the FDP: "probably redundant".  And I feel 
> no one could come and say "it's not correct, you write like a 7 years 
> old kid", so we may avoid "thousand" lines of changes for something 
> like that.

It's not wrong, it's just redundant, repetitive, superfluous.  And it's 
not always redundant, just most of the time.  That's what the FDP 
statement is saying: if you need to tell the reader that the filename is 
a file instead of something else, *then* use the word "file". 
Otherwise, leave it to the markup.

My last commit for these, the most I've ever changed, was about 34 
lines.

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov 14 15:56:01 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 524D7B8B
 for <svn-doc-head@freebsd.org>; Wed, 14 Nov 2012 15:56:01 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
 [209.85.217.182])
 by mx1.freebsd.org (Postfix) with ESMTP id B10E98FC15
 for <svn-doc-head@freebsd.org>; Wed, 14 Nov 2012 15:56:00 +0000 (UTC)
Received: by mail-lb0-f182.google.com with SMTP id gg13so655561lbb.13
 for <svn-doc-head@freebsd.org>; Wed, 14 Nov 2012 07:55:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=nldtTXXXqxjVY/7BxR/Jmdoy8WPok6MLvGyP4OhOOc8=;
 b=j49WVG2Qf2MlkLNFuf/9qM1B1tOpUf0k8DdqrBZcFXWj+yW/fnURs+93zM5A3bW1Td
 uFzDxLu5Zn2wbo2OCyEkwU9vCSLulo9idJnkOwK8K47wvLTUTXr/EYvP/B5PD3t7I8yp
 9Qx4T8KMs5JTXFJQnUukowhLCHiL4DVUCjSAs=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=nldtTXXXqxjVY/7BxR/Jmdoy8WPok6MLvGyP4OhOOc8=;
 b=TJ34rP/Zl21LxC3lJc7t7UAMJnA21NZ683iD2UmvDja0QF9KFs9d57/Kuvq/geHn+i
 5yIBLtPxFxDb0pYsE3WY0pjMOKczC9Zn0aGqGNSp5ZindezuEVVmJmJZq8JfFwRbvsFW
 QrGQE0Lb8CDBkpd52i7gCQUTmYovFI/ofv1mIulqsALXcewJa61/Ow1OgJjV4A60c/oa
 v7Z8iWxzpl4WSjq3JZBVSYMfUVWCTtulX3I2ShiHx3cMqL3l/qOpYInORBTHHsTkleay
 9+WFD4ULLtp6B7z+5wfES++MnLHt1PJFapfvdx3fWNIXgRiQea0Unlpaa4WxmvCG6Cyp
 VP1g==
Received: by 10.152.102.234 with SMTP id fr10mr25645290lab.28.1352908554087;
 Wed, 14 Nov 2012 07:55:54 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.25.166 with HTTP; Wed, 14 Nov 2012 07:55:23 -0800 (PST)
In-Reply-To: <20121113202035.GB1460@emphyrio.blackend.org>
References: <201211112229.qABMT1il009287@svn.freebsd.org>
 <alpine.GSO.1.10.1211121456040.2164@multics.mit.edu>
 <20121113202035.GB1460@emphyrio.blackend.org>
From: Eitan Adler <eadler@freebsd.org>
Date: Wed, 14 Nov 2012 10:55:23 -0500
X-Google-Sender-Auth: Wip1CnZBsCmmwsu0awUfo2EBq5E
Message-ID: <CAF6rxgmZ-gfLJe_NQz9p0kfJkO-tY57ZYuSDojDE1yN+sHQsog@mail.gmail.com>
Subject: Re: svn commit: r39981 - head/en_US.ISO8859-1/books/faq
To: Marc Fonvieille <blackend@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQk69/nWwhzlxkOQ4wDuoMAvPFbDNSGEdbjF380OFzyvYUgXbQ8MgDP3/4wu+xAFcXRMPsbV
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org, Benjamin Kaduk <kaduk@mit.edu>
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 15:56:01 -0000

> Well, can we avoid all these sort of changes?  They are necessary?

With regard to the FAQ in particular: it is a mess.  I am trying to
whack it into shape in terms of both style and content.   I have quite
a few pending patches for the FAQ serves only to avoid looking for
this issue in future edits.


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 02:31:45 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D3769A3;
 Thu, 15 Nov 2012 02:31:45 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7DB228FC0C;
 Thu, 15 Nov 2012 02:31:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAF2Vjin097182;
 Thu, 15 Nov 2012 02:31:45 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAF2VjDV097181;
 Thu, 15 Nov 2012 02:31:45 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201211150231.qAF2VjDV097181@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 15 Nov 2012 02:31:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39994 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 02:31:46 -0000

Author: adamw (ports committer)
Date: Thu Nov 15 02:31:45 2012
New Revision: 39994
URL: http://svnweb.freebsd.org/changeset/doc/39994

Log:
  Update my key.

Modified:
  head/share/pgpkeys/adamw.key

Modified: head/share/pgpkeys/adamw.key
==============================================================================
--- head/share/pgpkeys/adamw.key	Tue Nov 13 05:50:59 2012	(r39993)
+++ head/share/pgpkeys/adamw.key	Thu Nov 15 02:31:45 2012	(r39994)
@@ -1,35 +1,55 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh adamw 42C743FD;
+sh addkey.sh adamw C57CF3A8;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/42C743FD 2002-10-12 Adam Weinberger <adam@vectors.cx>
-     Key fingerprint = A980 3F2E 80A8 9619 9D1C  82E8 A3C2 8CD9 42C7 43FD
-sub  1024g/15D67628 2002-10-12
+pub   2048D/C57CF3A8 2012-11-15
+      Key fingerprint = CCD9 F28A BD1D 50A1 8D08  18A7 F48B B195 C57C F3A8
+uid                  Adam Weinberger (FreeBSD) <adamw@FreeBSD.org>
+uid                  Adam Weinberger (adamw.org) <adamw@adamw.org>
+sub   2048g/9C6D0E30 2012-11-15
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (FreeBSD)
 
-mQGiBD2neE8RBADgkTfNUPbm3AVnVPn/Ds5lDO89yKowW3ULixWqJ6Mti+7sIQ6y
-A4v5/dlUODTH0sdL4Cl3q36pCOP13IIq7o14h4YOjMhdMhsv43678VYK0PvR70hK
-/PxqIRV3lQsP2g8LihKLpRy6sHleIXu1hRLbIBI6/iJTmFcENQfivyHpBwCg31J6
-6jew1OrTLlB76aWmmRJIlVkEAII7j0gAqV/zjR16sAsfiCSHSg9A8RGBmC67zUfK
-PxnrLiw0gqyrt77YnXvANGWDdIMHEZrcDBrb8ciSO8agBO2+/7mOVDVDU5I/SJRi
-rfJTQvFphcnOe7F3MaxdfA/vZE9woXq4JLXfnmcgUAey4iYB2QbV/+v1HBo6wys6
-qyDXBACMsXFWZbDNDwUZBxGVS66bLwpZ/UhWqkrAyvK/7M/HQjkFTUUX2fSTPnWh
-AkcA82asPxQFTdbd7BOs4JnXUY4m+wfP3pzGaCbgL6WYumRjvmvkmeyZtFD+2wxL
-nu/F3oO9PC2f4mGa6E928BLy2bRCV75L0OMmbR5Fd0Z+95k3kLQhQWRhbSBXZWlu
-YmVyZ2VyIDxhZGFtQHZlY3RvcnMuY3g+iFkEExECABkFAj2neE8ECwcDAgMVAgMD
-FgIBAh4BAheAAAoJEKPCjNlCx0P9I7UAmQGWPEjqlXfxptWgb5WKskfl+rkkAJwI
-OSvOdiBFM7/EBBgn9pUQ/6PVUrkBDQQ9p3haEAQAzc17FQj9ePY4tW2+nWiQzj8I
-GVG+8fsVwFhDb4hFcpJxPiR3/J07tU4iyKek/qUiOQdW/dI30vm3rOSIUa3r9iaj
-OaJilRVDO3ErUCdcrJjGf+fTWZFa8t2TLwOooyV8tJ5IUYLwJ8s7/3OpwWh1pfCQ
-qxGACCiXeKQo0a9jxJcAAwUD/35x0sm6jV2OZaHxX/JteeLu1hJOE4hc8oRqiE93
-4j8frz33jIsRFpKJ+H28LXtRmVXtVTdq3RuHll5JRCMG+IPLT3Tns/d0L90twpOj
-4r+2BFIK6SYE6JYngf+J5clwve3vE7Y/b8NbSawEApvVxdrpsevGH0Sn5MSdiukm
-EkJviEYEGBECAAYFAj2neFoACgkQo8KM2ULHQ/1NRgCeJ6ZJYvc1oOUBdEKd7SoH
-rFA6N/8An3A9ukQlZm3lPMutMia2vnsb108k
-=0qTN
+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
+IpuNrKfM7zuBiw==
+=yHIG
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 07:35:12 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 56AD8BEB;
 Thu, 15 Nov 2012 07:35:12 +0000 (UTC)
 (envelope-from taras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32B508FC08;
 Thu, 15 Nov 2012 07:35:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAF7ZC5M044171;
 Thu, 15 Nov 2012 07:35:12 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAF7ZCTl044170;
 Thu, 15 Nov 2012 07:35:12 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201211150735.qAF7ZCTl044170@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Thu, 15 Nov 2012 07:35:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39995 - head/ru_RU.KOI8-R/books/handbook/mail
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 07:35:12 -0000

Author: taras
Date: Thu Nov 15 07:35:11 2012
New Revision: 39995
URL: http://svnweb.freebsd.org/changeset/doc/39995

Log:
  MFen:
  + handbook/mail/chapter.xml               r37308  --> r39631

Modified:
  head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml

Modified: head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Thu Nov 15 02:31:45 2012	(r39994)
+++ head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Thu Nov 15 07:35:11 2012	(r39995)
@@ -5,7 +5,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mail/chapter.xml,v 1.36 2007/06/22 11:41:08 den Exp $
 
-     Original revision: r37308
+     Original revision: r39631
 -->
 
 <chapter id="mail">
@@ -576,7 +576,7 @@ procmail: "|/usr/local/bin/procmail"</pr
 
     <para>æÏÒÍÁÔ ÆÁÊÌÁ ÐÒÏÓÔ; ÉÍÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÌÅ×Á ÏÔ Ä×ÏÅÔÏÞÉÑ
       ÓÏÐÏÓÔÁ×ÌÑÅÔÓÑ ÎÁÚÎÁÞÅÎÉÀ(ÑÍ) ÓÐÒÁ×Á.  ÷ ÐÅÒ×ÏÍ ÐÒÉÍÅÒÅ
-      ÐÒÏÉÚ×ÏÄÉÔÓÑ ÐÒÏÓÔÏÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ
+      ÐÒÏÉÚ×ÏÄÉÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ
       <username>root</username> ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ
       <username>localuser</username>, ÄÌÑ ËÏÔÏÒÏÇÏ ÚÁÔÅÍ ÏÐÑÔØ ÂÕÄÅÔ
       ÐÒÏÉÚ×ÅÄÅÎ ÐÏÉÓË × ÂÁÚÅ ÄÁÎÎÙÈ ÓÉÎÏÎÉÍÏ×.  åÓÌÉ ÓÏ×ÐÁÄÅÎÉÊ ÎÅ
@@ -814,7 +814,7 @@ sendmail_msp_queue_enable="NO"</programl
 	ÆÁÊÌ <filename>/etc/mail/mailer.conf</filename> ×ÙÇÌÑÄÉÔ
 	ÐÒÉÍÅÒÎÏ ÔÁË:</para>
 
-<programlisting>sendmail	 /usr/libexec/sendmail/sendmail
+      <programlisting>sendmail	/usr/libexec/sendmail/sendmail
 send-mail	/usr/libexec/sendmail/sendmail
 mailq		/usr/libexec/sendmail/sendmail
 newaliases	/usr/libexec/sendmail/sendmail
@@ -836,7 +836,7 @@ purgestat	/usr/libexec/sendmail/sendmail
 	×ÍÅÓÔÏ <application>sendmail</application>, ÏÔÒÅÄÁËÔÉÒÕÊÔÅ
 	<filename>/etc/mail/mailer.conf</filename> ÔÁË:</para>
 
-<programlisting>sendmail	 /usr/local/supermailer/bin/sendmail-compat
+      <programlisting>sendmail	/usr/local/supermailer/bin/sendmail-compat
 send-mail	/usr/local/supermailer/bin/sendmail-compat
 mailq		/usr/local/supermailer/bin/mailq-compat
 newaliases	/usr/local/supermailer/bin/newaliases-compat
@@ -1408,7 +1408,7 @@ if-bus.UUCP                   uucp-dom:i
       ÍÁÒÛÒÕÔÙ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ, ÚÁÐÏÍÎÉÔÅ ÐÁÒÁÍÅÔÒ
       <application>sendmail</application> <option>-bt</option>.  ó ÜÔÉÍ
       ÐÁÒÁÍÅÔÒÏÍ <application>sendmail</application> ÚÁÐÕÓËÁÅÔÓÑ ×
-      <emphasis>ÒÅÖÉÍÅ ÔÅÓÔÉÒÏ×ÁÎÉÑ ÁÄÒÅÓÁ</emphasis>; ÐÒÏÓÔÏ ××ÅÄÉÔÅ
+      <emphasis>ÒÅÖÉÍÅ ÔÅÓÔÉÒÏ×ÁÎÉÑ ÁÄÒÅÓÁ</emphasis>; ××ÅÄÉÔÅ
       <literal>3,0</literal> É ÁÄÒÅÓ, ËÏÔÏÒÙÊ ×Ù ÈÏÔÉÔÅ ÐÒÏÔÅÓÔÉÒÏ×ÁÔØ.
       ÷ ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÅ ÐÏÑ×ÉÔÓÑ ÓÏÏÂÝÅÎÉÅ Ï ÉÓÐÏÌØÚÕÅÍÏÍ ×ÎÕÔÒÅÎÎÅÍ
       ÐÏÞÔÏ×ÏÍ ÁÇÅÎÔÅ, ÈÏÓÔÅ ÎÁÚÎÁÞÅÎÉÑ, Ó ËÏÔÏÒÙÍ ×ÙÚÙ×ÁÅÔÓÑ ÜÔÏÔ ÁÇÅÎÔ,
@@ -1683,11 +1683,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	  ÓÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>ëÏÍÐÉÌÑÃÉÑ <application>sendmail</application> ÄÏÌÖÎÁ ÐÒÏÊÔÉ
 	  ÂÅÚ ÐÒÏÂÌÅÍ, ÅÓÌÉ <filename>/usr/src</filename> ÎÅ ÂÙÌ ÓÉÌØÎÏ
@@ -1790,8 +1790,8 @@ define(`confAUTH_MECHANISMS', `GSSAPI DI
 	ÏÂÓÕÖÄÁÔØÓÑ ÄÁÌÅÅ × ÜÔÏÊ ÇÌÁ×Å (<xref
 	linkend="mail-fetchmail"/>).</para>
 
-      <para>äÌÑ ÏÔÐÒÁ×ËÉ É ÐÏÌÕÞÅÎÉÑ ÐÏÞÔÙ ÐÒÏÓÔÏ ×ÙÐÏÌÎÉÔÅ ËÏÍÁÎÄÕ
-	<command>mail</command>, ËÁË × ÜÔÏÍ ÐÒÉÍÅÒÅ:</para>
+      <para>äÌÑ ÏÔÐÒÁ×ËÉ É ÐÏÌÕÞÅÎÉÑ ÐÏÞÔÙ ×ÙÐÏÌÎÉÔÅ
+	<command>mail</command>:</para>
 
       <screen>&prompt.user; <userinput>mail</userinput></screen>
 
@@ -1934,7 +1934,7 @@ EOT</screen>
 	</imageobject>
       </mediaobject>
 
-      <para>äÌÑ ÞÔÅÎÉÑ ÐÏÞÔÙ ÐÒÏÓÔÏ ×ÙÂÅÒÉÔÅ ÓÏÏÂÝÅÎÉÅ Ó ÐÏÍÏÝØÀ ËÌÁ×ÉÛ
+      <para>äÌÑ ÞÔÅÎÉÑ ÐÏÞÔÙ ×ÙÂÅÒÉÔÅ ÓÏÏÂÝÅÎÉÅ Ó ÐÏÍÏÝØÀ ËÌÁ×ÉÛ
 	ÎÁ×ÉÇÁÃÉÉ É ÎÁÖÍÉÔÅ <keycap>Enter</keycap>.  ðÒÉÍÅÒ
 	<application>mutt</application>, ÏÔÏÂÒÁÖÁÀÝÅÇÏ ÓÏÏÂÝÅÎÉÅ, ÐÏËÁÚÁÎ
 	ÎÉÖÅ:</para>
@@ -2018,7 +2018,7 @@ EOT</screen>
 	ÏÐÒÅÄÅÌÉÔØ ËÏÌÉÞÅÓÔ×Ï ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÒÁÂÏÔÁÀÝÉÈ Ó ÉÈ ÐÏÞÔÏ×ÙÍ
 	ËÌÉÅÎÔÏÍ.  äÌÑ ÏÔÐÒÁ×ËÉ ÁÎÏÎÉÍÎÏÇÏ ÓÏÏÂÝÅÎÉÑ ÎÁÖÍÉÔÅ
 	<keycap>Enter</keycap>, ÉÌÉ <keycap>E</keycap> ÄÌÑ ×ÙÈÏÄÁ
-	ÉÚ ÉÚ ÐÒÉ×ÅÔÓÔ×ÉÑ ÂÅÚ ÏÔÐÒÁ×ËÉ ÁÎÏÎÉÍÎÏÇÏ ÓÏÏÂÝÅÎÉÑ.  ðÒÉÍÅÒ
+	ÉÚ ÐÒÉ×ÅÔÓÔ×ÉÑ ÂÅÚ ÏÔÐÒÁ×ËÉ ÁÎÏÎÉÍÎÏÇÏ ÓÏÏÂÝÅÎÉÑ.  ðÒÉÍÅÒ
 	ÐÒÉ×ÅÔÓÔ×ÉÑ ÐÏËÁÚÁÎ ÎÉÖÅ:</para>
 
       <mediaobject>

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 07:41:34 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C44DAF8B;
 Thu, 15 Nov 2012 07:41:34 +0000 (UTC)
 (envelope-from taras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A94E08FC13;
 Thu, 15 Nov 2012 07:41:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAF7fYa4044968;
 Thu, 15 Nov 2012 07:41:34 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAF7fYv6044967;
 Thu, 15 Nov 2012 07:41:34 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201211150741.qAF7fYv6044967@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Thu, 15 Nov 2012 07:41:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39996 - head/ru_RU.KOI8-R/books/handbook/mail
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 07:41:35 -0000

Author: taras
Date: Thu Nov 15 07:41:34 2012
New Revision: 39996
URL: http://svnweb.freebsd.org/changeset/doc/39996

Log:
  + bring formatting closer to FDP style requirements.  No content changes
    were made.

Modified:
  head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml

Modified: head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Thu Nov 15 07:35:11 2012	(r39995)
+++ head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Thu Nov 15 07:41:34 2012	(r39996)
@@ -13,26 +13,36 @@
     <authorgroup>
       <author>
        <firstname>Bill</firstname>
+
        <surname>Lloyd</surname>
+
        <contrib>ïÒÉÇÉÎÁÌØÎÕÀ ×ÅÒÓÉÀ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
       </author>
     </authorgroup>
+
     <authorgroup>
       <author>
        <firstname>Jim</firstname>
+
        <surname>Mock</surname>
+
        <contrib>ðÅÒÅÐÉÓÁÌ </contrib>
        <!-- 2 Dec 1999 -->
       </author>
     </authorgroup>
+
     <authorgroup>
       <author>
 	<firstname>áÌÅËÓÅÊ</firstname>
+
 	<surname>äÏËÕÞÁÅ×</surname>
+
 	<contrib>ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË: </contrib>
       </author>
+
       <author>
 	<firstname>äÅÎÉÓ</firstname>
+
 	<surname>ðÅÐÌÉÎ</surname>
       </author>
     </authorgroup>
@@ -43,7 +53,9 @@
   <sect1 id="mail-synopsis">
     <title>ëÒÁÔËÉÊ ÏÂÚÏÒ</title>
 
-    <indexterm><primary>email</primary></indexterm>
+    <indexterm>
+      <primary>email</primary>
+    </indexterm>
 
     <para><quote>üÌÅËÔÒÏÎÎÁÑ ÐÏÞÔÁ</quote> ÎÁÚÙ×ÁÅÍÁÑ ÔÁËÖÅ email, Ñ×ÌÑÅÔÓÑ
       ÎÁ ÓÅÇÏÄÎÑÛÎÉÊ ÄÅÎØ ÏÄÎÉÍ ÉÚ ÓÁÍÙÈ ÐÏÐÕÌÑÒÎÙÈ ÓÒÅÄÓÔ× Ó×ÑÚÉ.  üÔÁ ÇÌÁ×Á
@@ -113,7 +125,6 @@
       </listitem>
 
       <listitem>
-
 	<para>ëÁË ÚÁÇÒÕÚÉÔØ ÐÏÞÔÕ Ó ÕÄÁÌÅÎÎÏÇÏ <acronym>POP</acronym> ÉÌÉ
 	  <acronym>IMAP</acronym> ÓÅÒ×ÅÒÁ.</para>
       </listitem>
@@ -142,15 +153,22 @@
 	  ÓÔÏÒÏÎÎÉÈ ÒÁÚÒÁÂÏÔÞÉËÏ× (<xref linkend="ports"/>).</para>
       </listitem>
     </itemizedlist>
-
   </sect1>
 
   <sect1 id="mail-using">
     <title>éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ</title>
 
-    <indexterm><primary>POP</primary></indexterm>
-    <indexterm><primary>IMAP</primary></indexterm>
-    <indexterm><primary>DNS</primary></indexterm>
+    <indexterm>
+      <primary>POP</primary>
+    </indexterm>
+
+    <indexterm>
+      <primary>IMAP</primary>
+    </indexterm>
+
+    <indexterm>
+      <primary>DNS</primary>
+    </indexterm>
 
     <para>÷ ÒÁÂÏÔÅ ÐÏÞÔÏ×ÏÊ ÓÉÓÔÅÍÙ ÚÁÄÅÊÓÔ×Ï×ÁÎÙ ÐÑÔØ ÏÓÎÏ×ÎÙÈ ÞÁÓÔÅÊ:
       <link linkend="mail-mua">ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ</link>
@@ -177,21 +195,29 @@
 
     <sect2 id="mail-mta">
       <title>ðÏÞÔÏ×ÙÊ ÄÁÅÍÏÎ</title>
+
       <indexterm>
 	<primary>ÐÏÞÔÏ×ÙÅ ÄÁÅÍÏÎÙ</primary>
-       <secondary><application>sendmail</application></secondary>
+
+	<secondary><application>sendmail</application></secondary>
       </indexterm>
+
       <indexterm>
 	<primary>ÐÏÞÔÏ×ÙÅ ÄÁÅÍÏÎÙ</primary>
-       <secondary><application>postfix</application></secondary>
+
+	<secondary><application>postfix</application></secondary>
       </indexterm>
+
       <indexterm>
 	<primary>ÐÏÞÔÏ×ÙÅ ÄÁÅÍÏÎÙ</primary>
-       <secondary><application>qmail</application></secondary>
+
+	<secondary><application>qmail</application></secondary>
       </indexterm>
+
       <indexterm>
 	<primary>ÐÏÞÔÏ×ÙÅ ÄÁÅÍÏÎÙ</primary>
-       <secondary><application>exim</application></secondary>
+
+	<secondary><application>exim</application></secondary>
       </indexterm>
 
       <para>&os; ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÏÓÔÁ×ÌÑÅÔÓÑ Ó
@@ -264,9 +290,11 @@ FreeBSD.org mail is handled (pri=10) by 
 
     <sect2 id="mail-receive">
       <title>ðÏÌÕÞÅÎÉÅ ÐÏÞÔÙ</title>
+
       <indexterm>
 	<primary>email</primary>
-       <secondary>ÐÏÌÕÞÅÎÉÅ</secondary>
+
+	<secondary>ÐÏÌÕÞÅÎÉÅ</secondary>
       </indexterm>
 
       <para>ðÏÌÕÞÅÎÉÅ ÐÏÞÔÙ ÄÌÑ ×ÁÛÅÇÏ ÄÏÍÅÎÁ ×ÙÐÏÌÎÑÅÔ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ.
@@ -285,8 +313,14 @@ FreeBSD.org mail is handled (pri=10) by 
 	<title>äÏÓÔÕÐ Ë ÕÄÁÌÅÎÎÙÍ ÐÏÞÔÏ×ÙÍ ÑÝÉËÁÍ ÐÏ ÐÒÏÔÏËÏÌÁÍ
 	  <acronym>POP</acronym> É <acronym>IMAP</acronym></title>
 
-	<indexterm><primary>POP</primary></indexterm>
-	<indexterm><primary>IMAP</primary></indexterm>
+	<indexterm>
+	  <primary>POP</primary>
+	</indexterm>
+
+	<indexterm>
+	  <primary>IMAP</primary>
+	</indexterm>
+
 	<para>äÌÑ ÕÄÁÌÅÎÎÏÇÏ ÄÏÓÔÕÐÁ Ë ÐÏÞÔÏ×ÙÍ ÑÝÉËÁÍ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ
 	  ÄÏÓÔÕÐ Ë <acronym>POP</acronym> ÉÌÉ <acronym>IMAP</acronym>
 	  ÓÅÒ×ÅÒÕ.  <!-- ÉÚÂÙÔÏÞÎÏ: üÔÉ ÐÒÏÔÏËÏÌÙ ÏÂÅÓÐÅÞÉ×ÁÀÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ
@@ -315,7 +349,6 @@ FreeBSD.org mail is handled (pri=10) by 
 	      ÄÌÑ ÍÉÎÉÍÉÚÁÃÉÉ ÏÂßÅÍÁ ÐÅÒÅÄÁ×ÁÅÍÙÈ ÍÅÖÄÕ ËÌÉÅÎÔÏÍ É ÓÅÒ×ÅÒÏÍ
 	      ÄÁÎÎÙÈ.</para>
 	  </listitem>
-
 	</itemizedlist>
 
 	<para>äÌÑ ÕÓÔÁÎÏ×ËÉ <acronym>POP</acronym> ÉÌÉ
@@ -330,28 +363,27 @@ FreeBSD.org mail is handled (pri=10) by 
 	      <acronym>IMAP</acronym> ÓÅÒ×ÅÒÙ ÈÏÒÏÛÏ ÉÚ×ÅÓÔÎÙ É ÍÏÇÕÔ ÂÙÔØ
 	      ÐÒÉ×ÅÄÅÎÙ × ËÁÞÅÓÔ×Å ÐÒÉÍÅÒÁ:</para>
 
-	      <itemizedlist>
-		<listitem>
-		  <para><application>qpopper</application>;</para>
-		</listitem>
-
-		<listitem>
-		  <para><application>teapop</application>;</para>
-		</listitem>
-
-		<listitem>
-		  <para><application>imap-uw</application>;</para>
-		</listitem>
-
-		<listitem>
-		  <para><application>courier-imap</application>;</para>
-		</listitem>
-
-		<listitem>
-		  <para><application>dovecot</application>;</para>
-		</listitem>
-	      </itemizedlist>
-
+	    <itemizedlist>
+	      <listitem>
+		<para><application>qpopper</application>;</para>
+	      </listitem>
+
+	      <listitem>
+		<para><application>teapop</application>;</para>
+	      </listitem>
+
+	      <listitem>
+		<para><application>imap-uw</application>;</para>
+	      </listitem>
+
+	      <listitem>
+		<para><application>courier-imap</application>;</para>
+	      </listitem>
+
+	      <listitem>
+		<para><application>dovecot</application>;</para>
+	      </listitem>
+	    </itemizedlist>
 	  </step>
 
 	  <step>
@@ -393,7 +425,10 @@ FreeBSD.org mail is handled (pri=10) by 
 
     <sect2 id="mail-host">
       <title>ðÏÞÔÏ×ÙÊ ÈÏÓÔ</title>
-      <indexterm><primary>ÐÏÞÔÏ×ÙÊ ÈÏÓÔ</primary></indexterm>
+
+      <indexterm>
+	<primary>ÐÏÞÔÏ×ÙÊ ÈÏÓÔ</primary>
+      </indexterm>
 
       <para>ðÏÞÔÏ×ÙÊ ÈÏÓÔ ÜÔÏ ÓÅÒ×ÅÒ, ËÏÔÏÒÙÊ ÏÔ×ÅÞÁÅÔ ÚÁ ÏÔÐÒÁ×ËÕ É ÐÏÌÕÞÅÎÉÅ
 	ÐÏÞÔÙ ÄÌÑ ×ÁÛÅÇÏ ËÏÍÐØÀÔÅÒÁ, É ×ÏÚÍÏÖÎÏ, ÄÌÑ ×ÓÅÊ ×ÁÛÅÊ ÓÅÔÉ.</para>
@@ -405,11 +440,14 @@ FreeBSD.org mail is handled (pri=10) by 
       <authorgroup>
 	<author>
 	  <firstname>Christopher</firstname>
+
 	  <surname>Shumway</surname>
+
 	  <contrib>ðÒÅÄÏÓÔÁ×ÉÌ </contrib>
 	</author>
       </authorgroup>
     </sect1info>
+
     <title>îÁÓÔÒÏÊËÁ <application>sendmail</application></title>
 
     <indexterm>
@@ -432,98 +470,106 @@ FreeBSD.org mail is handled (pri=10) by 
     <indexterm>
       <primary><filename>/etc/mail/access</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/aliases</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/local-host-names</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/mailer.conf</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/mailertable</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/sendmail.cf</filename></primary>
     </indexterm>
+
     <indexterm>
       <primary><filename>/etc/mail/virtusertable</filename></primary>
     </indexterm>
+
     <informaltable frame="none" pgwide="1">
       <tgroup cols="2">
 	<thead>
 	  <row>
 	    <entry>éÍÑ ÆÁÊÌÁ</entry>
+
 	    <entry>îÁÚÎÁÞÅÎÉÅ</entry>
 	  </row>
 	</thead>
+
 	<tbody>
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/access</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/access</filename></entry>
+
 	    <entry>æÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏÓÔÕÐÁ
 	      <application>sendmail</application></entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/aliases</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/aliases</filename></entry>
+
 	    <entry>óÉÎÏÎÉÍÙ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ×</entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/local-host-names</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/local-host-names</filename></entry>
+
 	    <entry>óÐÉÓÏË ÈÏÓÔÏ×, ÄÌÑ ËÏÔÏÒÙÈ
 	      <application>sendmail</application> ÐÒÉÎÉÍÁÅÔ ÐÏÞÔÕ</entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/mailer.conf</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/mailer.conf</filename></entry>
+
 	    <entry>îÁÓÔÒÏÊËÉ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÙ</entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/mailertable</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/mailertable</filename></entry>
+
 	    <entry>ôÁÂÌÉÃÁ ÄÏÓÔÁ×ËÉ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÙ</entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/sendmail.cf</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/sendmail.cf</filename></entry>
+
 	    <entry>ïÓÎÏ×ÎÏÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ
 	      <application>sendmail</application></entry>
 	  </row>
+
 	  <row>
-	    <entry>
-	      <filename>/etc/mail/virtusertable</filename>
-	    </entry>
+	    <entry><filename>/etc/mail/virtusertable</filename></entry>
+
 	    <entry>ôÁÂÌÉÃÙ ×ÉÒÔÕÁÌØÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ É ÄÏÍÅÎÏ×</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </informaltable>
 
-  <sect2>
-    <title><filename>/etc/mail/access</filename></title>
+    <sect2>
+      <title><filename>/etc/mail/access</filename></title>
 
-    <para>âÁÚÁ ÄÁÎÎÙÈ ÄÏÓÔÕÐÁ ÏÐÒÅÄÅÌÑÅÔ ÓÐÉÓÏË ÈÏÓÔÏ× ÉÌÉ IP ÁÄÒÅÓÏ×,
-      ÉÍÅÀÝÉÈ ÄÏÓÔÕÐ Ë ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÓÅÒ×ÅÒÕ, Á ÔÁËÖÅ ÔÉÐ
-      ÐÒÅÄÏÓÔÁ×ÌÑÅÍÏÇÏ ÄÏÓÔÕÐÁ.  èÏÓÔÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ ËÁË
-      <option>OK</option>, <option>REJECT</option>, <option>RELAY</option>
-      ÉÌÉ ÐÒÏÓÔÏ ÐÅÒÅÄÁÎÙ ÐÒÏÃÅÄÕÒÅ ÏÂÒÁÂÏÔËÉ ÏÛÉÂÏË
-      <application>sendmail</application> Ó ÚÁÄÁÎÎÙÍ ÓÏÏÂÝÅÎÉÅÍ ÏÂ ÏÛÉÂËÅ.
-      èÏÓÔÁÍ, ÐÅÒÅÞÉÓÌÅÎÎÙÍ Ó ÐÁÒÁÍÅÔÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ <option>OK</option>,
-      ÒÁÚÒÅÛÅÎÏ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÙ ÎÁ ÜÔÏÔ ÈÏÓÔ, ÅÓÌÉ ÁÄÒÅÓ ÎÁÚÎÁÞÅÎÉÑ ÐÏÞÔÙ
-      ÐÒÉÎÁÄÌÅÖÉÔ ÌÏËÁÌØÎÏÊ ÍÁÛÉÎÅ.  ÷ÓÅ ÐÏÞÔÏ×ÙÅ ÓÏÅÄÉÎÅÎÉÑ ÏÔ ÈÏÓÔÏ×,
-      ÐÅÒÅÞÉÓÌÅÎÎÙÈ Ó ÐÁÒÁÍÅÔÒÏÍ <option>REJECT</option>, ÏÔÂÒÁÓÙ×ÁÀÔÓÑ.
-      äÌÑ ÈÏÓÔÏ×, ÐÅÒÅÞÉÓÌÅÎÎÙÈ Ó ÐÁÒÁÍÅÔÒÏÍ <option>RELAY</option>,
-      ÒÁÚÒÅÛÅÎÁ ÐÅÒÅÄÁÞÁ ÞÅÒÅÚ ÜÔÏÔ ÓÅÒ×ÅÒ ÐÏÞÔÙ Ó ÌÀÂÙÍ ÁÄÒÅÓÏÍ
-      ÎÁÚÎÁÞÅÎÉÑ.</para>
+      <para>âÁÚÁ ÄÁÎÎÙÈ ÄÏÓÔÕÐÁ ÏÐÒÅÄÅÌÑÅÔ ÓÐÉÓÏË ÈÏÓÔÏ× ÉÌÉ IP ÁÄÒÅÓÏ×,
+	ÉÍÅÀÝÉÈ ÄÏÓÔÕÐ Ë ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÓÅÒ×ÅÒÕ, Á ÔÁËÖÅ ÔÉÐ
+	ÐÒÅÄÏÓÔÁ×ÌÑÅÍÏÇÏ ÄÏÓÔÕÐÁ.  èÏÓÔÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ ËÁË
+	<option>OK</option>, <option>REJECT</option>, <option>RELAY</option>
+	ÉÌÉ ÐÒÏÓÔÏ ÐÅÒÅÄÁÎÙ ÐÒÏÃÅÄÕÒÅ ÏÂÒÁÂÏÔËÉ ÏÛÉÂÏË
+	<application>sendmail</application> Ó ÚÁÄÁÎÎÙÍ ÓÏÏÂÝÅÎÉÅÍ ÏÂ ÏÛÉÂËÅ.
+	èÏÓÔÁÍ, ÐÅÒÅÞÉÓÌÅÎÎÙÍ Ó ÐÁÒÁÍÅÔÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ <option>OK</option>,
+	ÒÁÚÒÅÛÅÎÏ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÙ ÎÁ ÜÔÏÔ ÈÏÓÔ, ÅÓÌÉ ÁÄÒÅÓ ÎÁÚÎÁÞÅÎÉÑ ÐÏÞÔÙ
+	ÐÒÉÎÁÄÌÅÖÉÔ ÌÏËÁÌØÎÏÊ ÍÁÛÉÎÅ.  ÷ÓÅ ÐÏÞÔÏ×ÙÅ ÓÏÅÄÉÎÅÎÉÑ ÏÔ ÈÏÓÔÏ×,
+	ÐÅÒÅÞÉÓÌÅÎÎÙÈ Ó ÐÁÒÁÍÅÔÒÏÍ <option>REJECT</option>, ÏÔÂÒÁÓÙ×ÁÀÔÓÑ.
+	äÌÑ ÈÏÓÔÏ×, ÐÅÒÅÞÉÓÌÅÎÎÙÈ Ó ÐÁÒÁÍÅÔÒÏÍ <option>RELAY</option>,
+	ÒÁÚÒÅÛÅÎÁ ÐÅÒÅÄÁÞÁ ÞÅÒÅÚ ÜÔÏÔ ÓÅÒ×ÅÒ ÐÏÞÔÙ Ó ÌÀÂÙÍ ÁÄÒÅÓÏÍ
+	ÎÁÚÎÁÞÅÎÉÑ.</para>
 
       <example>
 	<title>îÁÓÔÒÏÊËÁ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏÓÔÕÐÁ
@@ -536,145 +582,144 @@ okay.cyberspammer.com           OK
 128.32                          RELAY</programlisting>
       </example>
 
-    <para>÷ ÜÔÏÍ ÐÒÉÍÅÒÅ ÐÒÉ×ÅÄÅÎÙ ÐÑÔØ ÚÁÐÉÓÅÊ.  ë ÏÔÐÒÁ×ÉÔÅÌÑÍ, ÞÅÊ ÁÄÒÅÓ
-      ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÚÁÐÉÓÉ × ÌÅ×ÏÊ ÞÁÓÔÉ ÔÁÂÌÉÃÙ, ÐÒÉÍÅÎÑÅÔÓÑ ÐÒÁ×ÉÌÏ
-      ÚÁÐÉÓÁÎÎÏÅ × ÐÒÁ×ÏÊ ÞÁÓÔÉ ÔÁÂÌÉÃÙ.  ÷ ÐÅÒ×ÙÈ Ä×ÕÈ ÐÒÉÍÅÒÁÈ
-      ËÏÄ ÏÛÉÂËÉ ÂÕÄÅÔ ÐÅÒÅÄÁÎ ÐÒÏÃÅÄÕÒÅ ÏÂÒÁÂÏÔËÅ ÏÛÉÂÏË
-      <application>sendmail</application>.  ÷ ÜÔÏÍ ÓÌÕÞÁÅ ÎÁ ÕÄÁÌÅÎÎÏÍ ÈÏÓÔÅ
-      ÂÕÄÅÔ ÐÏÌÕÞÅÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ ÐÏÞÔÁ
-      ÏÔÂÒÁÓÙ×ÁÅÔÓÑ ÐÏÞÔÁ ÏÔ ÏÐÒÅÄÅÌÅÎÎÏÇÏ ÈÏÓÔÁ,
-      <hostid>another.source.of.spam</hostid>.  ÷ ÞÅÔ×ÅÒÔÏÍ ÐÒÉÍÅÒÅ
-      ÒÁÚÒÅÛÁÅÔÓÑ ÐÒÉÅÍ ÐÏÞÔÙ ÏÔ ÈÏÓÔÁ <hostid
-      role="fqdn">okay.cyberspammer.com</hostid>, ÉÍÑ ËÏÔÏÒÏÇÏ ÂÏÌÅÅ ÔÏÞÎÏ
-      ÓÏ×ÐÁÄÁÅÔ Ó ÜÔÏÊ ÚÁÐÉÓØÀ, ÞÅÍ Ó <hostid
-      role="domainname">cyberspammer.com</hostid> × ÐÒÉÍÅÒÅ ×ÙÛÅ.  ðÒÉ ÂÏÌÅÅ
-      ÔÏÞÎÏÍ ÓÏ×ÐÁÄÅÎÉÉ ÐÒÁ×ÉÌÁ ÐÅÒÅÚÁÐÉÓÙ×ÁÀÔÓÑ.  ÷ ÐÏÓÌÅÄÎÅÍ ÐÒÉÍÅÒÅ
-      ÒÁÚÒÅÛÁÅÔÓÑ ÐÅÒÅÓÙÌËÁ ÐÏÞÔÙ ÏÔ ÈÏÓÔÏ× Ó IP ÁÄÒÅÓÁÍÉ, ÎÁÞÉÎÁÀÝÉÍÉÓÑ
-      Ó <hostid>128.32</hostid>.  üÔÉ ÈÏÓÔÙ ÓÍÏÇÕÔ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÕ ÞÅÒÅÚ
-      ÜÔÏÔ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ ÄÌÑ ÄÒÕÇÉÈ ÐÏÞÔÏ×ÙÈ ÓÅÒ×ÅÒÏ×.</para>
-
-    <para>ðÏÓÌÅ ÉÚÍÅÎÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ
-      ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÚÁÐÕÓÔÉÔØ <command>make</command> × ËÁÔÁÌÏÇÅ
-      <filename>/etc/mail/</filename>.</para>
-   </sect2>
-
-   <sect2>
-    <title><filename>/etc/mail/aliases</filename></title>
-
-    <para>âÁÚÁ ÄÁÎÎÙÈ ÓÉÎÏÎÉÍÏ× ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË ×ÉÒÔÕÁÌØÎÙÈ ÐÏÞÔÏ×ÙÈ
-      ÑÝÉËÏ×, ÐÒÉÎÁÄÌÅÖÁÝÉÈ ÄÒÕÇÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ, ÆÁÊÌÁÍ, ÐÒÏÇÒÁÍÍÁÍ, ÉÌÉ
-      ÄÒÕÇÉÍ ÓÉÎÏÎÉÍÁÍ.  ÷ÏÔ ÎÅÓËÏÌØËÏ ÐÒÉÍÅÒÏ×, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ
-      ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ <filename>/etc/mail/aliases</filename>:</para>
+      <para>÷ ÜÔÏÍ ÐÒÉÍÅÒÅ ÐÒÉ×ÅÄÅÎÙ ÐÑÔØ ÚÁÐÉÓÅÊ.  ë ÏÔÐÒÁ×ÉÔÅÌÑÍ, ÞÅÊ ÁÄÒÅÓ
+	ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÚÁÐÉÓÉ × ÌÅ×ÏÊ ÞÁÓÔÉ ÔÁÂÌÉÃÙ, ÐÒÉÍÅÎÑÅÔÓÑ ÐÒÁ×ÉÌÏ
+	ÚÁÐÉÓÁÎÎÏÅ × ÐÒÁ×ÏÊ ÞÁÓÔÉ ÔÁÂÌÉÃÙ.  ÷ ÐÅÒ×ÙÈ Ä×ÕÈ ÐÒÉÍÅÒÁÈ
+	ËÏÄ ÏÛÉÂËÉ ÂÕÄÅÔ ÐÅÒÅÄÁÎ ÐÒÏÃÅÄÕÒÅ ÏÂÒÁÂÏÔËÅ ÏÛÉÂÏË
+	<application>sendmail</application>.  ÷ ÜÔÏÍ ÓÌÕÞÁÅ ÎÁ ÕÄÁÌÅÎÎÏÍ ÈÏÓÔÅ
+	ÂÕÄÅÔ ÐÏÌÕÞÅÎÏ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ ÐÏÞÔÁ
+	ÏÔÂÒÁÓÙ×ÁÅÔÓÑ ÐÏÞÔÁ ÏÔ ÏÐÒÅÄÅÌÅÎÎÏÇÏ ÈÏÓÔÁ,
+	<hostid>another.source.of.spam</hostid>.  ÷ ÞÅÔ×ÅÒÔÏÍ ÐÒÉÍÅÒÅ
+	ÒÁÚÒÅÛÁÅÔÓÑ ÐÒÉÅÍ ÐÏÞÔÙ ÏÔ ÈÏÓÔÁ <hostid
+	role="fqdn">okay.cyberspammer.com</hostid>, ÉÍÑ ËÏÔÏÒÏÇÏ ÂÏÌÅÅ ÔÏÞÎÏ
+	ÓÏ×ÐÁÄÁÅÔ Ó ÜÔÏÊ ÚÁÐÉÓØÀ, ÞÅÍ Ó <hostid
+	role="domainname">cyberspammer.com</hostid> × ÐÒÉÍÅÒÅ ×ÙÛÅ.  ðÒÉ ÂÏÌÅÅ
+	ÔÏÞÎÏÍ ÓÏ×ÐÁÄÅÎÉÉ ÐÒÁ×ÉÌÁ ÐÅÒÅÚÁÐÉÓÙ×ÁÀÔÓÑ.  ÷ ÐÏÓÌÅÄÎÅÍ ÐÒÉÍÅÒÅ
+	ÒÁÚÒÅÛÁÅÔÓÑ ÐÅÒÅÓÙÌËÁ ÐÏÞÔÙ ÏÔ ÈÏÓÔÏ× Ó IP ÁÄÒÅÓÁÍÉ, ÎÁÞÉÎÁÀÝÉÍÉÓÑ
+	Ó <hostid>128.32</hostid>.  üÔÉ ÈÏÓÔÙ ÓÍÏÇÕÔ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÕ ÞÅÒÅÚ
+	ÜÔÏÔ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ ÄÌÑ ÄÒÕÇÉÈ ÐÏÞÔÏ×ÙÈ ÓÅÒ×ÅÒÏ×.</para>
+
+      <para>ðÏÓÌÅ ÉÚÍÅÎÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ
+	×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÚÁÐÕÓÔÉÔØ <command>make</command> × ËÁÔÁÌÏÇÅ
+	<filename>/etc/mail/</filename>.</para>
+    </sect2>
+
+    <sect2>
+      <title><filename>/etc/mail/aliases</filename></title>
+
+      <para>âÁÚÁ ÄÁÎÎÙÈ ÓÉÎÏÎÉÍÏ× ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË ×ÉÒÔÕÁÌØÎÙÈ ÐÏÞÔÏ×ÙÈ
+	ÑÝÉËÏ×, ÐÒÉÎÁÄÌÅÖÁÝÉÈ ÄÒÕÇÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ, ÆÁÊÌÁÍ, ÐÒÏÇÒÁÍÍÁÍ, ÉÌÉ
+	ÄÒÕÇÉÍ ÓÉÎÏÎÉÍÁÍ.  ÷ÏÔ ÎÅÓËÏÌØËÏ ÐÒÉÍÅÒÏ×, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ
+	ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ <filename>/etc/mail/aliases</filename>:</para>
 
       <example>
 	<title>Mail Aliases</title>
-    <programlisting>root: localuser
+
+	<programlisting>root: localuser
 ftp-bugs: joe,eric,paul
 bit.bucket:  /dev/null
 procmail: "|/usr/local/bin/procmail"</programlisting>
       </example>
 
-    <para>æÏÒÍÁÔ ÆÁÊÌÁ ÐÒÏÓÔ; ÉÍÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÌÅ×Á ÏÔ Ä×ÏÅÔÏÞÉÑ
-      ÓÏÐÏÓÔÁ×ÌÑÅÔÓÑ ÎÁÚÎÁÞÅÎÉÀ(ÑÍ) ÓÐÒÁ×Á.  ÷ ÐÅÒ×ÏÍ ÐÒÉÍÅÒÅ
-      ÐÒÏÉÚ×ÏÄÉÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ
-      <username>root</username> ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ
-      <username>localuser</username>, ÄÌÑ ËÏÔÏÒÏÇÏ ÚÁÔÅÍ ÏÐÑÔØ ÂÕÄÅÔ
-      ÐÒÏÉÚ×ÅÄÅÎ ÐÏÉÓË × ÂÁÚÅ ÄÁÎÎÙÈ ÓÉÎÏÎÉÍÏ×.  åÓÌÉ ÓÏ×ÐÁÄÅÎÉÊ ÎÅ
-      ÏÂÎÁÒÕÖÉÔÓÑ, ÓÏÏÂÝÅÎÉÅ ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÏ ÌÏËÁÌØÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ
-      <username>localuser</username>.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ ÐÒÉ×ÅÄÅÎ
-      ÓÐÉÓÏË ÒÁÓÓÙÌËÉ.  ðÏÞÔÁ ÎÁ ÁÄÒÅÓ <username>ftp-bugs</username>
-      ÒÁÓÓÙÌÁÅÔÓÑ ÎÁ ÔÒÉ ÌÏËÁÌØÎÙÈ ÐÏÞÔÏ×ÙÈ ÑÝÉËÁ: <username>joe</username>,
-      <username>eric</username> É <username>paul</username>. ïÂÒÁÔÉÔÅ
-      ×ÎÉÍÁÎÉÅ, ÞÔÏ ÕÄÁÌ£ÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÍÏÖÅÔ ÂÙÔØ ÚÁÄÁÎ × ×ÉÄÅ
-      <email>user@example.com</email>.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ
-      ÐÏËÁÚÁÎÁ ÚÁÐÉÓØ ÐÏÞÔÙ × ÆÁÊÌ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ
-      <filename>/dev/null</filename>.  é × ÐÏÓÌÅÄÎÅÍ ÐÒÉÍÅÒÅ ÐÏËÁÚÁÎÏ
-      ÏÔÐÒÁ×ÌÅÎÉÅ ÐÏÞÔÙ ÐÒÏÇÒÁÍÍÅ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÐÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ
-      ÐÅÒÅÐÒÁ×ÌÑÅÔÓÑ ÞÅÒÅÚ ËÁÎÁÌ &unix; ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×ÈÏÄ
-      <filename>/usr/local/bin/procmail</filename>.</para>
-
-    <para>ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÚÁÐÕÓÔÉÔØ
-      <command>make</command> × ËÁÔÁÌÏÇÅ <filename>/etc/mail/</filename>
-      ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ.</para>
-  </sect2>
-
-  <sect2>
-    <title><filename>/etc/mail/local-host-names</filename></title>
-
-    <para>÷ ÜÔÏÍ ÆÁÊÌÅ ÎÁÈÏÄÉÔÓÑ ÓÐÉÓÏË ÉÍÅÎ ÈÏÓÔÏ×, ÐÒÉÎÉÍÁÅÍÙÈ
-      ÐÒÏÇÒÁÍÍÏÊ &man.sendmail.8; × ËÁÞÅÓÔ×Å ÌÏËÁÌØÎÙÈ.  ðÏÍÅÓÔÉÔÅ ×
-      ÜÔÏÔ ÆÁÊÌ ÌÀÂÙÅ ÄÏÍÅÎÙ ÉÌÉ ÈÏÓÔÙ, ÄÌÑ ËÏÔÏÒÙÈ
-      <application>sendmail</application> ÄÏÌÖÅÎ ÐÒÉÎÉÍÁÔØ ÐÏÞÔÕ.
-      îÁÐÒÉÍÅÒ, ÅÓÌÉ ÜÔÏÔ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ ÄÏÌÖÅÎ ÐÒÉÎÉÍÁÔØ ÐÏÞÔÕ ÄÌÑ
-      ÄÏÍÅÎÁ <hostid role="domainname">example.com</hostid> É ÈÏÓÔÁ
-      <hostid role="fqdn">mail.example.com</hostid>, ÅÇÏ ÆÁÊÌ
-      <filename>local-host-names</filename> ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÐÒÉÍÅÒÎÏ
-      ÔÁË:</para>
+      <para>æÏÒÍÁÔ ÆÁÊÌÁ ÐÒÏÓÔ; ÉÍÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÌÅ×Á ÏÔ Ä×ÏÅÔÏÞÉÑ
+	ÓÏÐÏÓÔÁ×ÌÑÅÔÓÑ ÎÁÚÎÁÞÅÎÉÀ(ÑÍ) ÓÐÒÁ×Á.  ÷ ÐÅÒ×ÏÍ ÐÒÉÍÅÒÅ
+	ÐÒÏÉÚ×ÏÄÉÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ
+	<username>root</username> ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ
+	<username>localuser</username>, ÄÌÑ ËÏÔÏÒÏÇÏ ÚÁÔÅÍ ÏÐÑÔØ ÂÕÄÅÔ
+	ÐÒÏÉÚ×ÅÄÅÎ ÐÏÉÓË × ÂÁÚÅ ÄÁÎÎÙÈ ÓÉÎÏÎÉÍÏ×.  åÓÌÉ ÓÏ×ÐÁÄÅÎÉÊ ÎÅ
+	ÏÂÎÁÒÕÖÉÔÓÑ, ÓÏÏÂÝÅÎÉÅ ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÏ ÌÏËÁÌØÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ
+	<username>localuser</username>.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ ÐÒÉ×ÅÄÅÎ
+	ÓÐÉÓÏË ÒÁÓÓÙÌËÉ.  ðÏÞÔÁ ÎÁ ÁÄÒÅÓ <username>ftp-bugs</username>
+	ÒÁÓÓÙÌÁÅÔÓÑ ÎÁ ÔÒÉ ÌÏËÁÌØÎÙÈ ÐÏÞÔÏ×ÙÈ ÑÝÉËÁ: <username>joe</username>,
+	<username>eric</username> É <username>paul</username>.  ïÂÒÁÔÉÔÅ
+	×ÎÉÍÁÎÉÅ, ÞÔÏ ÕÄÁÌ£ÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÍÏÖÅÔ ÂÙÔØ ÚÁÄÁÎ × ×ÉÄÅ
+	<email>user@example.com</email>.  ÷ ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ
+	ÐÏËÁÚÁÎÁ ÚÁÐÉÓØ ÐÏÞÔÙ × ÆÁÊÌ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ
+	<filename>/dev/null</filename>.  é × ÐÏÓÌÅÄÎÅÍ ÐÒÉÍÅÒÅ ÐÏËÁÚÁÎÏ
+	ÏÔÐÒÁ×ÌÅÎÉÅ ÐÏÞÔÙ ÐÒÏÇÒÁÍÍÅ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÐÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ
+	ÐÅÒÅÐÒÁ×ÌÑÅÔÓÑ ÞÅÒÅÚ ËÁÎÁÌ &unix; ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×ÈÏÄ
+	<filename>/usr/local/bin/procmail</filename>.</para>
+
+      <para>ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÚÁÐÕÓÔÉÔØ
+	<command>make</command> × ËÁÔÁÌÏÇÅ <filename>/etc/mail/</filename>
+	ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ.</para>
+    </sect2>
+
+    <sect2>
+      <title><filename>/etc/mail/local-host-names</filename></title>
+
+      <para>÷ ÜÔÏÍ ÆÁÊÌÅ ÎÁÈÏÄÉÔÓÑ ÓÐÉÓÏË ÉÍÅÎ ÈÏÓÔÏ×, ÐÒÉÎÉÍÁÅÍÙÈ
+	ÐÒÏÇÒÁÍÍÏÊ &man.sendmail.8; × ËÁÞÅÓÔ×Å ÌÏËÁÌØÎÙÈ.  ðÏÍÅÓÔÉÔÅ ×
+	ÜÔÏÔ ÆÁÊÌ ÌÀÂÙÅ ÄÏÍÅÎÙ ÉÌÉ ÈÏÓÔÙ, ÄÌÑ ËÏÔÏÒÙÈ
+	<application>sendmail</application> ÄÏÌÖÅÎ ÐÒÉÎÉÍÁÔØ ÐÏÞÔÕ.
+	îÁÐÒÉÍÅÒ, ÅÓÌÉ ÜÔÏÔ ÐÏÞÔÏ×ÙÊ ÓÅÒ×ÅÒ ÄÏÌÖÅÎ ÐÒÉÎÉÍÁÔØ ÐÏÞÔÕ ÄÌÑ
+	ÄÏÍÅÎÁ <hostid role="domainname">example.com</hostid> É ÈÏÓÔÁ
+	<hostid role="fqdn">mail.example.com</hostid>, ÅÇÏ ÆÁÊÌ
+	<filename>local-host-names</filename> ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÐÒÉÍÅÒÎÏ
+	ÔÁË:</para>
 
-    <programlisting>example.com
+      <programlisting>example.com
 mail.example.com</programlisting>
 
-    <para>ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÚÁÐÕÓÔÉÔØ
-      &man.sendmail.8;, ÞÔÏÂÙ ÏÎ ÓÍÏÇ ÐÅÒÅÞÉÔÁÔØ ÉÚÍÅÎÅÎÉÑ.</para>
+      <para>ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÚÁÐÕÓÔÉÔØ
+	&man.sendmail.8;, ÞÔÏÂÙ ÏÎ ÓÍÏÇ ÐÅÒÅÞÉÔÁÔØ ÉÚÍÅÎÅÎÉÑ.</para>
+    </sect2>
 
-  </sect2>
+    <sect2>
+      <title><filename>/etc/mail/sendmail.cf</filename></title>
 
-  <sect2>
-    <title><filename>/etc/mail/sendmail.cf</filename></title>
+      <para>ïÓÎÏ×ÎÏÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ <application>sendmail</application>,
+	<filename>sendmail.cf</filename> ÕÐÒÁ×ÌÑÅÔ ÏÂÝÉÍ ÐÏ×ÅÄÅÎÉÅÍ
+	<application>sendmail</application>, ×ËÌÀÞÁÑ ×ÓÅ, ÏÔ ÐÅÒÅÚÁÐÉÓÉ
+	ÐÏÞÔÏ×ÙÈ ÁÄÒÅÓÏ× ÄÏ ÏÔÐÒÁ×ËÉ ÕÄÁÌÅÎÎÙÍ ÓÅÒ×ÅÒÁÍ ÓÏÏÂÝÅÎÉÊ ÏÂ
+	ÏÔËÁÚÅ ÏÔ ÐÅÒÅÓÙÌËÉ ÐÏÞÔÙ.  ëÏÎÅÞÎÏ, ÆÁÊÌ ÎÁÓÔÒÏÊËÉ Ó ÔÁËÉÍ
+	ÍÎÏÇÏÏÂÒÁÚÉÅÍ ×ÏÚÍÏÖÎÏÓÔÅÊ ÏÞÅÎØ ÓÌÏÖÅÎ É ÐÏÄÒÏÂÎÏÅ ÅÇÏ ÏÐÉÓÁÎÉÅ
+	×ÙÈÏÄÉÔ ÚÁ ÒÁÍËÉ ÄÁÎÎÏÇÏ ÒÁÚÄÅÌÁ.  ë ÓÞÁÓÔØÀ, ÄÌÑ ÓÔÁÎÄÁÒÔÎÙÈ
+	ÐÏÞÔÏ×ÙÈ ÓÅÒ×ÅÒÏ× ÉÚÍÅÎÑÔØ ÜÔÏÔ ÆÁÊÌ ÐÒÉÄÅÔÓÑ ÎÅ ÞÁÓÔÏ.</para>
+
+      <para>ïÓÎÏ×ÎÏÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ <application>sendmail</application>
+	ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ ÉÚ ÍÁËÒÏÓÁ &man.m4.1;, ÏÐÒÅÄÅÌÑÀÝÅÇÏ ×ÏÚÍÏÖÎÏÓÔÉ
+	É ÐÏ×ÅÄÅÎÉÅ <application>sendmail</application>.  ðÏÄÒÏÂÎÅÅ
+	ÜÔÏÔ ÐÒÏÃÅÓÓ ÏÐÉÓÁÎ × ÆÁÊÌÅ
+	<filename>/usr/src/contrib/sendmail/cf/README</filename>.</para>
 
-    <para>ïÓÎÏ×ÎÏÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ <application>sendmail</application>,
-      <filename>sendmail.cf</filename> ÕÐÒÁ×ÌÑÅÔ ÏÂÝÉÍ ÐÏ×ÅÄÅÎÉÅÍ
-      <application>sendmail</application>, ×ËÌÀÞÁÑ ×ÓÅ, ÏÔ ÐÅÒÅÚÁÐÉÓÉ
-      ÐÏÞÔÏ×ÙÈ ÁÄÒÅÓÏ× ÄÏ ÏÔÐÒÁ×ËÉ ÕÄÁÌÅÎÎÙÍ ÓÅÒ×ÅÒÁÍ ÓÏÏÂÝÅÎÉÊ ÏÂ
-      ÏÔËÁÚÅ ÏÔ ÐÅÒÅÓÙÌËÉ ÐÏÞÔÙ.  ëÏÎÅÞÎÏ, ÆÁÊÌ ÎÁÓÔÒÏÊËÉ Ó ÔÁËÉÍ
-      ÍÎÏÇÏÏÂÒÁÚÉÅÍ ×ÏÚÍÏÖÎÏÓÔÅÊ ÏÞÅÎØ ÓÌÏÖÅÎ É ÐÏÄÒÏÂÎÏÅ ÅÇÏ ÏÐÉÓÁÎÉÅ
-      ×ÙÈÏÄÉÔ ÚÁ ÒÁÍËÉ ÄÁÎÎÏÇÏ ÒÁÚÄÅÌÁ.  ë ÓÞÁÓÔØÀ, ÄÌÑ ÓÔÁÎÄÁÒÔÎÙÈ
-      ÐÏÞÔÏ×ÙÈ ÓÅÒ×ÅÒÏ× ÉÚÍÅÎÑÔØ ÜÔÏÔ ÆÁÊÌ ÐÒÉÄÅÔÓÑ ÎÅ ÞÁÓÔÏ.</para>
-
-    <para>ïÓÎÏ×ÎÏÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ <application>sendmail</application>
-      ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ ÉÚ ÍÁËÒÏÓÁ &man.m4.1;, ÏÐÒÅÄÅÌÑÀÝÅÇÏ ×ÏÚÍÏÖÎÏÓÔÉ
-      É ÐÏ×ÅÄÅÎÉÅ <application>sendmail</application>.  ðÏÄÒÏÂÎÅÅ
-      ÜÔÏÔ ÐÒÏÃÅÓÓ ÏÐÉÓÁÎ × ÆÁÊÌÅ
-      <filename>/usr/src/contrib/sendmail/cf/README</filename>.</para>
-
-    <para>äÌÑ ÐÒÉÍÅÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ ÐÏÓÌÅ ÐÒÁ×ËÉ ÆÁÊÌÁ ÎÅÏÂÈÏÄÉÍÏ
-      ÐÅÒÅÚÁÐÕÓÔÉÔØ <application>sendmail</application>.</para>
-  </sect2>
-
-  <sect2>
-    <title><filename>/etc/mail/virtusertable</filename></title>
-
-    <para>æÁÊÌ <filename>virtusertable</filename> ÓÏÐÏÓÔÁ×ÌÑÅÔ ×ÉÒÔÕÁÌØÎÙÅ
-      ÐÏÞÔÏ×ÙÅ ÄÏÍÅÎÙ É ÐÏÞÔÏ×ÙÅ ÑÝÉËÉ ÒÅÁÌØÎÙÍ ÐÏÞÔÏ×ÙÍ ÑÝÉËÁÍ.  üÔÉ
-      ÐÏÞÔÏ×ÙÅ ÑÝÉËÉ ÍÏÇÕÔ ÂÙÔØ ÌÏËÁÌØÎÙÍÉ, ÕÄÁÌÅÎÎÙÍÉ, ÓÉÎÏÎÉÍÁÍÉ,
-      ÏÐÒÅÄÅÌÅÎÎÙÍÉ × <filename>/etc/mail/aliases</filename>, ÉÌÉ
-      ÆÁÊÌÁÍÉ.</para>
+      <para>äÌÑ ÐÒÉÍÅÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ ÐÏÓÌÅ ÐÒÁ×ËÉ ÆÁÊÌÁ ÎÅÏÂÈÏÄÉÍÏ
+	ÐÅÒÅÚÁÐÕÓÔÉÔØ <application>sendmail</application>.</para>
+    </sect2>
 
-    <example>
+    <sect2>
+      <title><filename>/etc/mail/virtusertable</filename></title>
+
+      <para>æÁÊÌ <filename>virtusertable</filename> ÓÏÐÏÓÔÁ×ÌÑÅÔ ×ÉÒÔÕÁÌØÎÙÅ
+	ÐÏÞÔÏ×ÙÅ ÄÏÍÅÎÙ É ÐÏÞÔÏ×ÙÅ ÑÝÉËÉ ÒÅÁÌØÎÙÍ ÐÏÞÔÏ×ÙÍ ÑÝÉËÁÍ.  üÔÉ
+	ÐÏÞÔÏ×ÙÅ ÑÝÉËÉ ÍÏÇÕÔ ÂÙÔØ ÌÏËÁÌØÎÙÍÉ, ÕÄÁÌÅÎÎÙÍÉ, ÓÉÎÏÎÉÍÁÍÉ,
+	ÏÐÒÅÄÅÌÅÎÎÙÍÉ × <filename>/etc/mail/aliases</filename>, ÉÌÉ
+	ÆÁÊÌÁÍÉ.</para>
+
+      <example>
 	<title>ðÒÉÍÅÒ ÔÁÂÌÉÃÙ ×ÉÒÔÕÁÌØÎÏÇÏ ÄÏÍÅÎÁ</title>
 
-    <programlisting>root@example.com                root
+	<programlisting>root@example.com                root
 postmaster@example.com          postmaster@noc.example.net
 @example.com                    joe</programlisting>
       </example>
 
-    <para>÷ ÐÒÉÍÅÒÅ ×ÙÛÅ ÍÙ ×ÉÄÉÍ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÁÄÒÅÓÏ× ÄÌÑ ÄÏÍÅÎÁ
-      <hostid role="domainname">example.com</hostid>.  ðÏÞÔÁ
-      ÏÂÒÁÂÁÔÙ×ÁÅÔÓÑ ÐÏ ÐÅÒ×ÏÍÕ ÓÏ×ÐÁÄÅÎÉÀ Ó ÚÁÐÉÓØÀ × ÜÔÏÍ ÆÁÊÌÅ.
-      ðÅÒ×ÁÑ ÚÁÐÉÓØ ÓÏÐÏÓÔÁ×ÌÑÅÔ ÁÄÒÅÓ <email>root@example.com</email>
-      ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ <username>root</username>.
-      ÷ÔÏÒÁÑ ÚÁÐÉÓØ ÓÏÐÏÓÔÁ×ÌÑÅÔ <email>postmaster@example.com</email>
-      ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ <username>postmaster</username>
-      ÎÁ ÈÏÓÔÅ <hostid role="fqdn">noc.example.net</hostid>.  îÁËÏÎÅÃ,
-      ÄÏ ÜÔÏÇÏ ÍÏÍÅÎÔÁ ÁÄÒÅÓ × ÄÏÍÅÎÅ <hostid
-      role="domainname">example.com</hostid> ÎÅ ÓÏ×ÐÁÌ ÎÉ Ó ÏÄÎÉÍ ÉÚ
-      ÐÒÅÄÙÄÕÝÉÈ, ÂÕÄÅÔ ÐÒÉÍÅÎÅÎÏ ÐÏÓÌÅÄÎÅÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ, × ËÏÔÏÒÏÍÕ
-      ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ×ÓÑËÏÅ ÄÒÕÇÏÅ ÐÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ, ÏÔÐÒÁ×ÌÅÎÎÏÅ ÎÁ ÌÀÂÏÊ
-      ÁÄÒÅÓ × <hostid role="domainname">example.com</hostid>.  üÔÏ ÓÏÏÂÝÅÎÉÅ
-      ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÏ × ÌÏËÁÌØÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË
-      <username>joe</username>.</para>
-
-  </sect2>
+      <para>÷ ÐÒÉÍÅÒÅ ×ÙÛÅ ÍÙ ×ÉÄÉÍ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ ÁÄÒÅÓÏ× ÄÌÑ ÄÏÍÅÎÁ
+	<hostid role="domainname">example.com</hostid>.  ðÏÞÔÁ
+	ÏÂÒÁÂÁÔÙ×ÁÅÔÓÑ ÐÏ ÐÅÒ×ÏÍÕ ÓÏ×ÐÁÄÅÎÉÀ Ó ÚÁÐÉÓØÀ × ÜÔÏÍ ÆÁÊÌÅ.
+	ðÅÒ×ÁÑ ÚÁÐÉÓØ ÓÏÐÏÓÔÁ×ÌÑÅÔ ÁÄÒÅÓ <email>root@example.com</email>
+	ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ <username>root</username>.
+	÷ÔÏÒÁÑ ÚÁÐÉÓØ ÓÏÐÏÓÔÁ×ÌÑÅÔ <email>postmaster@example.com</email>
+	ÌÏËÁÌØÎÏÍÕ ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ <username>postmaster</username>
+	ÎÁ ÈÏÓÔÅ <hostid role="fqdn">noc.example.net</hostid>.  îÁËÏÎÅÃ,
+	ÄÏ ÜÔÏÇÏ ÍÏÍÅÎÔÁ ÁÄÒÅÓ × ÄÏÍÅÎÅ <hostid
+	role="domainname">example.com</hostid> ÎÅ ÓÏ×ÐÁÌ ÎÉ Ó ÏÄÎÉÍ ÉÚ
+	ÐÒÅÄÙÄÕÝÉÈ, ÂÕÄÅÔ ÐÒÉÍÅÎÅÎÏ ÐÏÓÌÅÄÎÅÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ, × ËÏÔÏÒÏÍÕ
+	ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ×ÓÑËÏÅ ÄÒÕÇÏÅ ÐÏÞÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ, ÏÔÐÒÁ×ÌÅÎÎÏÅ ÎÁ ÌÀÂÏÊ
+	ÁÄÒÅÓ × <hostid role="domainname">example.com</hostid>.  üÔÏ ÓÏÏÂÝÅÎÉÅ
+	ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÏ × ÌÏËÁÌØÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË
+	<username>joe</username>.</para>
+    </sect2>
   </sect1>
 
   <sect1 id="mail-changingmta">
@@ -682,21 +727,29 @@ postmaster@example.com          postmast
       <authorgroup>
 	<author>
 	  <firstname>Andrew</firstname>
+
 	  <surname>Boothman</surname>
+
 	  <contrib>îÁÐÉÓÁÌ </contrib>
 	</author>
       </authorgroup>
+
       <authorgroup>
 	<author>
 	  <firstname>Gregory</firstname>
+
 	  <surname>Neil Shapiro</surname>
+
 	  <contrib>éÎÆÏÒÍÁÃÉÑ ÐÏÌÕÞÅÎÁ ÉÚ ÐÉÓÅÍ, ÎÁÐÉÓÁÎÎÙÈ </contrib>
 	</author>
       </authorgroup>
     </sect1info>
+
     <title>õÓÔÁÎÏ×ËÁ ÄÒÕÇÏÊ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÙ</title>
+
     <indexterm>
       <primary>email</primary>
+
       <secondary>ÚÁÍÅÎÁ mta</secondary>
     </indexterm>
 
@@ -737,41 +790,41 @@ postmaster@example.com          postmast
     <sect2 id="mail-disable-sendmail">
       <title>ïÔËÌÀÞÅÎÉÅ <application>sendmail</application></title>
 
-	<warning>
-	  <para>åÓÌÉ ×Ù ÏÔËÌÀÞÉÔÅ ÓÅÒ×ÉÓ ÉÓÈÏÄÑÝÅÊ ÐÏÞÔÙ
-	    <application>sendmail</application>, ÎÅÏÂÈÏÄÉÍÏ
-	    ÚÁÍÅÎÉÔØ ÅÇÏ ÁÌØÔÅÒÎÁÔÉ×ÎÏÊ ÓÉÓÔÅÍÏÊ
-	    ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ.  åÓÌÉ ×Ù ÎÅ ÓÄÅÌÁÅÔÅ ÜÔÏÇÏ, ÓÉÓÔÅÍÎÙÅ ÐÒÏÇÒÁÍÍÙ,
-	    ÔÁËÉÅ ËÁË &man.periodic.8;, ÎÅ ÓÍÏÇÕÔ ÏÔÐÒÁ×ÌÑÔØ ÓÏÏÂÝÅÎÉÑ
-	    ÐÏ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÅ ËÁË ÏÂÙÞÎÏ.  íÎÏÇÉÅ ÐÒÏÇÒÁÍÍÙ × ×ÁÛÅÊ
-	    ÓÉÓÔÅÍÅ ÍÏÇÕÔ ÔÒÅÂÏ×ÁÔØ ÎÁÌÉÞÉÑ ÆÕÎËÃÉÏÎÉÒÕÀÝÅÊ
-	    <application>sendmail</application>-ÓÏ×ÍÅÓÔÉÍÏÊ ÓÉÓÔÅÍÙ.
-	    åÓÌÉ ÐÒÉÌÏÖÅÎÉÑ ÂÕÄÕÔ ÐÒÏÄÏÌÖÁÔØ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÇÒÁÍÍÕ
-	    <application>sendmail</application> ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÞÔÙ
-	    ÐÏÓÌÅ ÔÏÇÏ, ËÁË ×٠ţ ÏÔËÌÀÞÉÌÉ, ÐÏÞÔÁ ÍÏÖÅÔ ÐÏÐÁÓÔØ ×
-	    ÎÅÁËÔÉ×ÎÕÀ ÏÞÅÒÅÄØ <application>sendmail</application> É ÎÉËÏÇÄÁ
-	    ÎÅ ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÁ.</para>
-	</warning>
+      <warning>
+	<para>åÓÌÉ ×Ù ÏÔËÌÀÞÉÔÅ ÓÅÒ×ÉÓ ÉÓÈÏÄÑÝÅÊ ÐÏÞÔÙ
+	  <application>sendmail</application>, ÎÅÏÂÈÏÄÉÍÏ
+	  ÚÁÍÅÎÉÔØ ÅÇÏ ÁÌØÔÅÒÎÁÔÉ×ÎÏÊ ÓÉÓÔÅÍÏÊ
+	  ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ.  åÓÌÉ ×Ù ÎÅ ÓÄÅÌÁÅÔÅ ÜÔÏÇÏ, ÓÉÓÔÅÍÎÙÅ ÐÒÏÇÒÁÍÍÙ,
+	  ÔÁËÉÅ ËÁË &man.periodic.8;, ÎÅ ÓÍÏÇÕÔ ÏÔÐÒÁ×ÌÑÔØ ÓÏÏÂÝÅÎÉÑ
+	  ÐÏ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÅ ËÁË ÏÂÙÞÎÏ.  íÎÏÇÉÅ ÐÒÏÇÒÁÍÍÙ × ×ÁÛÅÊ
+	  ÓÉÓÔÅÍÅ ÍÏÇÕÔ ÔÒÅÂÏ×ÁÔØ ÎÁÌÉÞÉÑ ÆÕÎËÃÉÏÎÉÒÕÀÝÅÊ
+	  <application>sendmail</application>-ÓÏ×ÍÅÓÔÉÍÏÊ ÓÉÓÔÅÍÙ.
+	  åÓÌÉ ÐÒÉÌÏÖÅÎÉÑ ÂÕÄÕÔ ÐÒÏÄÏÌÖÁÔØ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÇÒÁÍÍÕ
+	  <application>sendmail</application> ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÞÔÙ
+	  ÐÏÓÌÅ ÔÏÇÏ, ËÁË ×٠ţ ÏÔËÌÀÞÉÌÉ, ÐÏÞÔÁ ÍÏÖÅÔ ÐÏÐÁÓÔØ ×
+	  ÎÅÁËÔÉ×ÎÕÀ ÏÞÅÒÅÄØ <application>sendmail</application> É ÎÉËÏÇÄÁ
+	  ÎÅ ÂÕÄÅÔ ÄÏÓÔÁ×ÌÅÎÁ.</para>
+      </warning>
 
-	  <para>äÌÑ ÐÏÌÎÏÇÏ ÏÔËÌÀÞÅÎÉÑ
-	  <application>sendmail</application>, ×ËÌÀÞÁÑ ÓÅÒ×ÉÓ ÉÓÈÏÄÑÝÅÊ
-	  ÐÏÞÔÙ, ÉÓÐÏÌØÚÕÊÔÅ</para>
+      <para>äÌÑ ÐÏÌÎÏÇÏ ÏÔËÌÀÞÅÎÉÑ
+	<application>sendmail</application>, ×ËÌÀÞÁÑ ÓÅÒ×ÉÓ ÉÓÈÏÄÑÝÅÊ
+	ÐÏÞÔÙ, ÉÓÐÏÌØÚÕÊÔÅ</para>
 
-	 <programlisting>sendmail_enable="NO"
+      <programlisting>sendmail_enable="NO"
 sendmail_submit_enable="NO"
 sendmail_outbound_enable="NO"
 sendmail_msp_queue_enable="NO"</programlisting>
 
-	<para>× <filename>/etc/rc.conf.</filename></para>
+      <para>× <filename>/etc/rc.conf</filename>.</para>
 
-	<para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÏÔËÌÀÞÉÔØ ÔÏÌØËÏ ÓÅÒ×ÉÓ ×ÈÏÄÑÝÅÊ ÐÏÞÔÙ
-	  <application>sendmail</application>, ÕÓÔÁÎÏ×ÉÔÅ</para>
+      <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÏÔËÌÀÞÉÔØ ÔÏÌØËÏ ÓÅÒ×ÉÓ ×ÈÏÄÑÝÅÊ ÐÏÞÔÙ
+	<application>sendmail</application>, ÕÓÔÁÎÏ×ÉÔÅ</para>
 
-	  <programlisting>sendmail_enable="NO"</programlisting>
+      <programlisting>sendmail_enable="NO"</programlisting>
 
-	<para>× <filename>/etc/rc.conf</filename>.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
-	  Ï ÐÁÒÁÍÅÔÒÁÈ ÚÁÐÕÓËÁ <application>sendmail</application>
-	  ÄÏÓÔÕÐÎÁ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.rc.sendmail.8;.</para>
+      <para>× <filename>/etc/rc.conf</filename>.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+	Ï ÐÁÒÁÍÅÔÒÁÈ ÚÁÐÕÓËÁ <application>sendmail</application>
+	ÄÏÓÔÕÐÎÁ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.rc.sendmail.8;.</para>
     </sect2>
 
     <sect2>
@@ -785,7 +838,6 @@ sendmail_msp_queue_enable="NO"</programl
 
       <para>ó ÜÔÏÇÏ ÍÏÍÅÎÔÁ íôá ÂÕÄÅÔ ÚÁÐÕÓËÁÔØÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ×Ï ×ÒÅÍÑ
 	ÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ.</para>
-
     </sect2>
 
     <sect2>
@@ -842,88 +894,94 @@ mailq		/usr/local/supermailer/bin/mailq-
 newaliases	/usr/local/supermailer/bin/newaliases-compat
 hoststat	/usr/local/supermailer/bin/hoststat-compat
 purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
+    </sect2>
 
-	</sect2>
-
-	<sect2>
-	  <title>úÁÐÕÓË ÎÏ×ÏÊ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÙ</title>
+    <sect2>
+      <title>úÁÐÕÓË ÎÏ×ÏÊ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÙ</title>
 
-	<para>ëÁË ÔÏÌØËÏ ×Ù ×ÓÅ ÎÁÓÔÒÏÉÌÉ, ÐÏÔÒÅÂÕÅÔÓÑ ÉÌÉ ÕÎÉÞÔÏÖÉÔØ
-	  ÐÒÏÃÅÓÓ <application>sendmail</application>, ËÏÔÏÒÙÊ ÕÖÅ ÎÅ
-	  ÎÕÖÅÎ É ÚÁÐÕÓÔÉÔØ ÎÏ×ÕÀ ÐÏÞÔÏ×ÕÀ ÐÒÏÇÒÁÍÍÕ, ÉÌÉ ÐÒÏÓÔÏ ÐÅÒÅÇÒÕÚÉÔØ
-	  ÓÉÓÔÅÍÕ.  ðÅÒÅÚÁÇÒÕÚËÁ ÔÁËÖÅ ÄÁÓÔ ×ÁÍ ×ÏÚÍÏÖÎÏÓÔØ ÐÒÏ×ÅÒÉÔØ,
-	  ÐÒÁ×ÉÌØÎÏ ÌÉ ÎÁÓÔÒÏÅÎÁ ÓÉÓÔÅÍÁ ÄÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÚÁÐÕÓËÁ
-	  MTA ÐÒÉ ÚÁÇÒÕÚËÅ.</para>
-      </sect2>
-    </sect1>
+      <para>ëÁË ÔÏÌØËÏ ×Ù ×ÓÅ ÎÁÓÔÒÏÉÌÉ, ÐÏÔÒÅÂÕÅÔÓÑ ÉÌÉ ÕÎÉÞÔÏÖÉÔØ
+	ÐÒÏÃÅÓÓ <application>sendmail</application>, ËÏÔÏÒÙÊ ÕÖÅ ÎÅ
+	ÎÕÖÅÎ É ÚÁÐÕÓÔÉÔØ ÎÏ×ÕÀ ÐÏÞÔÏ×ÕÀ ÐÒÏÇÒÁÍÍÕ, ÉÌÉ ÐÒÏÓÔÏ ÐÅÒÅÇÒÕÚÉÔØ
+	ÓÉÓÔÅÍÕ.  ðÅÒÅÚÁÇÒÕÚËÁ ÔÁËÖÅ ÄÁÓÔ ×ÁÍ ×ÏÚÍÏÖÎÏÓÔØ ÐÒÏ×ÅÒÉÔØ,
+	ÐÒÁ×ÉÌØÎÏ ÌÉ ÎÁÓÔÒÏÅÎÁ ÓÉÓÔÅÍÁ ÄÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÚÁÐÕÓËÁ
+	MTA ÐÒÉ ÚÁÇÒÕÚËÅ.</para>
+    </sect2>
+  </sect1>
 
   <sect1 id="mail-trouble">
     <title>ðÏÉÓË É ÕÓÔÒÁÎÅÎÉÅ ÎÅÉÓÐÒÁ×ÎÏÓÔÅÊ</title>
+
     <indexterm>
       <primary>email</primary>
+
       <secondary>ÕÓÔÒÁÎÅÎÉÅ ÎÅÉÓÐÒÁ×ÎÏÓÔÅÊ</secondary>
     </indexterm>
 
     <qandaset>
       <qandaentry>
 	<question>
-	<para>ðÏÞÅÍÕ Ñ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØ FQDN ÄÌÑ ÈÏÓÔÏ× ×ÎÅ ÍÏÅÊ ÐÏÄÓÅÔÉ?</para>
+	  <para>ðÏÞÅÍÕ Ñ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØ FQDN ÄÌÑ ÈÏÓÔÏ× ×ÎÅ ÍÏÅÊ
+	    ÐÏÄÓÅÔÉ?</para>
 	</question>
 
 	<answer>
-	<para>÷Ù, ×ÉÄÉÍÏ, ÏÂÎÁÒÕÖÉÌÉ, ÞÔÏ ÈÏÓÔ, Ë ËÏÔÏÒÏÍÕ ×Ù ÏÂÒÁÔÉÌÉÓØ,
-	  ÏËÁÚÁÌÓÑ ÎÁ ÓÁÍÏÍ ÄÅÌÅ × ÄÒÕÇÏÍ ÄÏÍÅÎÅ; ÎÁÐÒÉÍÅÒ, ÅÓÌÉ ×Ù
-	  ÎÁÈÏÄÉÔÅÓØ × ÄÏÍÅÎÅ <hostid role="fqdn">foo.bar.edu</hostid> É
-	  ÈÏÔÉÔÅ ÏÂÒÁÔÉÔØÓÑ Ë ÈÏÓÔÕ <hostid>mumble</hostid> × ÄÏÍÅÎÅ <hostid
-	  role="domainname">bar.edu</hostid>, ÔÏ ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÅÇÏ ÐÏÌÎÏÅ
-	  ÄÏÍÅÎÎÏÅ ÉÍÑ, <hostid role="fqdn">mumble.bar.edu</hostid>, Á ÎÅ
-	  ÐÒÏÓÔÏ <hostid>mumble</hostid>.</para>
-
-    <indexterm><primary>BIND</primary></indexterm>
-	<para>ôÒÁÄÉÃÉÏÎÎÏ, ÐÒÏÇÒÁÍÍÁ ÒÁÚÒÅÛÅÎÉÑ ÉÍÅÎ BSD BIND ÐÏÚ×ÏÌÑÌÁ ÜÔÏ
-	  ÄÅÌÁÔØ.  ïÄÎÁËÏ, ÔÅËÕÝÁÑ ×ÅÒÓÉÑ <application>BIND</application>,
-	  ÐÏÓÔÁ×ÌÑÅÍÁÑ Ó FreeBSD, ÂÏÌØÛÅ ÎÅ ÄÏÂÁ×ÌÑÅÔ ÉÍÅÎÁ ÄÏÍÅÎÏ×,
-	  ÏÔÌÉÞÁÀÝÉÈÓÑ ÏÔ ÔÏÇÏ, × ËÏÔÏÒÏÍ ×Ù ÎÁÈÏÄÉÔÅÓØ, ÄÌÑ ÎÅ ÐÏÌÎÏÓÔØÀ
-	  ÕËÁÚÁÎÎÙÈ ÉÍÅÎ ÈÏÓÔÏ×.  ôÏ ÅÓÔØ, ÉÍÑ <hostid>mumble</hostid> ÂÕÄÅÔ
-	  ÏÐÏÚÎÁÎ ËÁË <hostid role="fqdn">mumble.foo.bar.edu</hostid> ÉÌÉ
-	  ÂÕÄÅÔ ÉÓËÁÔØÓÑ × ËÏÒÎÅ×ÏÍ ÄÏÍÅÎÅ.</para>
-
-	<para>üÔÏ ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏ×ÅÄÅÎÉÑ, ÐÒÉ ËÏÔÏÒÏÍ ÐÏÉÓË
-	  ÐÒÏÄÏÌÖÁÌÓÑ × ÄÏÍÅÎÁÈ <hostid
-	  role="domainname">mumble.bar.edu</hostid> É <hostid
-	  role="domainname">mumble.edu</hostid>.  åÓÌÉ ×ÁÍ ÉÎÔÅÒÅÓÎÙ ÐÒÉÞÉÎÙ
-	  ÏÂßÑ×ÌÅÎÉÑ ÔÁËÏÇÏ ÐÏ×ÅÄÅÎÉÑ ÐÌÏÈÏÊ ÐÒÁËÔÉËÏÊ É ÄÁÖÅ ÏÛÉÂËÏÊ ×
-	  ÂÅÚÏÐÁÓÎÏÓÔÉ, ÏÂÒÁÔÉÔÅÓØ Ë RFC 1535.</para>
+	  <para>÷Ù, ×ÉÄÉÍÏ, ÏÂÎÁÒÕÖÉÌÉ, ÞÔÏ ÈÏÓÔ, Ë ËÏÔÏÒÏÍÕ ×Ù ÏÂÒÁÔÉÌÉÓØ,
+	    ÏËÁÚÁÌÓÑ ÎÁ ÓÁÍÏÍ ÄÅÌÅ × ÄÒÕÇÏÍ ÄÏÍÅÎÅ; ÎÁÐÒÉÍÅÒ, ÅÓÌÉ ×Ù
+	    ÎÁÈÏÄÉÔÅÓØ × ÄÏÍÅÎÅ <hostid role="fqdn">foo.bar.edu</hostid> É
+	    ÈÏÔÉÔÅ ÏÂÒÁÔÉÔØÓÑ Ë ÈÏÓÔÕ <hostid>mumble</hostid> × ÄÏÍÅÎÅ <hostid
+	    role="domainname">bar.edu</hostid>, ÔÏ ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÅÇÏ ÐÏÌÎÏÅ
+	    ÄÏÍÅÎÎÏÅ ÉÍÑ, <hostid role="fqdn">mumble.bar.edu</hostid>, Á ÎÅ
+	    ÐÒÏÓÔÏ <hostid>mumble</hostid>.</para>
 
-	<para>èÏÒÏÛÉÍ ÒÅÛÅÎÉÅÍ ÂÕÄÅÔ ÐÏÍÅÓÔÉÔØ ÓÔÒÏËÕ
+	  <indexterm>
+	    <primary>BIND</primary>
+	  </indexterm>
+
+	  <para>ôÒÁÄÉÃÉÏÎÎÏ, ÐÒÏÇÒÁÍÍÁ ÒÁÚÒÅÛÅÎÉÑ ÉÍÅÎ BSD BIND ÐÏÚ×ÏÌÑÌÁ ÜÔÏ
+	    ÄÅÌÁÔØ.  ïÄÎÁËÏ, ÔÅËÕÝÁÑ ×ÅÒÓÉÑ <application>BIND</application>,
+	    ÐÏÓÔÁ×ÌÑÅÍÁÑ Ó FreeBSD, ÂÏÌØÛÅ ÎÅ ÄÏÂÁ×ÌÑÅÔ ÉÍÅÎÁ ÄÏÍÅÎÏ×,
+	    ÏÔÌÉÞÁÀÝÉÈÓÑ ÏÔ ÔÏÇÏ, × ËÏÔÏÒÏÍ ×Ù ÎÁÈÏÄÉÔÅÓØ, ÄÌÑ ÎÅ ÐÏÌÎÏÓÔØÀ
+	    ÕËÁÚÁÎÎÙÈ ÉÍÅÎ ÈÏÓÔÏ×.  ôÏ ÅÓÔØ, ÉÍÑ <hostid>mumble</hostid> ÂÕÄÅÔ
+	    ÏÐÏÚÎÁÎ ËÁË <hostid role="fqdn">mumble.foo.bar.edu</hostid> ÉÌÉ
+	    ÂÕÄÅÔ ÉÓËÁÔØÓÑ × ËÏÒÎÅ×ÏÍ ÄÏÍÅÎÅ.</para>
+
+	  <para>üÔÏ ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏ×ÅÄÅÎÉÑ, ÐÒÉ ËÏÔÏÒÏÍ ÐÏÉÓË
+	    ÐÒÏÄÏÌÖÁÌÓÑ × ÄÏÍÅÎÁÈ <hostid
+	    role="domainname">mumble.bar.edu</hostid> É <hostid
+	    role="domainname">mumble.edu</hostid>.  åÓÌÉ ×ÁÍ ÉÎÔÅÒÅÓÎÙ ÐÒÉÞÉÎÙ
+	    ÏÂßÑ×ÌÅÎÉÑ ÔÁËÏÇÏ ÐÏ×ÅÄÅÎÉÑ ÐÌÏÈÏÊ ÐÒÁËÔÉËÏÊ É ÄÁÖÅ ÏÛÉÂËÏÊ ×
+	    ÂÅÚÏÐÁÓÎÏÓÔÉ, ÏÂÒÁÔÉÔÅÓØ Ë RFC 1535.</para>
+
+	  <para>èÏÒÏÛÉÍ ÒÅÛÅÎÉÅÍ ÂÕÄÅÔ ÐÏÍÅÓÔÉÔØ ÓÔÒÏËÕ</para>
 
 	  <programlisting>search foo.bar.edu bar.edu</programlisting>
 
-	  ×ÍÅÓÔÏ ÒÁÎÅÅ ÉÓÐÏÌØÚÕÅÍÏÊ:
+	  <para>×ÍÅÓÔÏ ÒÁÎÅÅ ÉÓÐÏÌØÚÕÅÍÏÊ:</para>
 
 	  <programlisting>domain foo.bar.edu</programlisting>
 
-	  × ÆÁÊÌ <filename>/etc/resolv.conf</filename>.  ïÄÎÁËÏ
-	  ÕÄÏÓÔÏ×ÅÒØÔÅÓØ, ÞÔÏ ÐÏÒÑÄÏË ÐÏÉÓËÁ ÎÅ ÎÁÒÕÛÁÅÔ <quote>ÇÒÁÎÉÃ
-	  ÐÏÌÎÏÍÏÞÉÊ ÍÅÖÄÕ ÌÏËÁÌØÎÙÍ É ×ÎÅÛÎÉÍ ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÅÍ</quote>, ×
-	  ÔÅÒÍÉÎÏÌÏÇÉÉ RFC 1535.</para>
+	  <para>× ÆÁÊÌ <filename>/etc/resolv.conf</filename>.  ïÄÎÁËÏ
+	    ÕÄÏÓÔÏ×ÅÒØÔÅÓØ, ÞÔÏ ÐÏÒÑÄÏË ÐÏÉÓËÁ ÎÅ ÎÁÒÕÛÁÅÔ <quote>ÇÒÁÎÉÃ
+	    ÐÏÌÎÏÍÏÞÉÊ ÍÅÖÄÕ ÌÏËÁÌØÎÙÍ É ×ÎÅÛÎÉÍ ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÅÍ</quote>, ×
+	    ÔÅÒÍÉÎÏÌÏÇÉÉ RFC 1535.</para>
 	</answer>
       </qandaentry>
 
       <qandaentry>
 	<question>
+	  <para><application>sendmail</application> ×ÙÄÁÅÔ ÏÛÉÂËÕ
+	    <errorname>mail loops back to myself</errorname></para>
+
 	  <indexterm>
 	    <primary>MX record</primary>
 	  </indexterm>
-
-	<para><application>sendmail</application> ×ÙÄÁÅÔ ÏÛÉÂËÕ
-	  <errorname>mail loops back to myself</errorname></para>
 	</question>
 
 	<answer>
-	<para>÷ FAQ ÐÏ <application>sendmail</application> ÄÁÎ ÓÌÅÄÕÀÝÉÊ ÏÔ×ÅÔ:</para>
+	  <para>÷ FAQ ÐÏ <application>sendmail</application> ÄÁÎ ÓÌÅÄÕÀÝÉÊ
+	    ÏÔ×ÅÔ:</para>
 
-	<programlisting>ñ ÐÏÌÕÞÁÀ ÔÁËÉÅ ÓÏÏÂÝÅÎÉÑ ÏÂ ÏÛÉÂËÅ:
+	  <programlisting>ñ ÐÏÌÕÞÁÀ ÔÁËÉÅ ÓÏÏÂÝÅÎÉÑ ÏÂ ÏÛÉÂËÅ:
 
 553 MX list for domain.net points back to relay.domain.net
 554 &lt;user@domain.net&gt;... Local configuration error
@@ -941,82 +999,87 @@ role="domainname">domain.net</hostid> × 
 FETURE(use_cw_file)) ÉÌÉ ÄÏÂÁ×ØÔÅ <quote>Cw domain.net</quote> × ÆÁÊÌ
 <filename>/etc/mail/sendmail.cf</filename>.</programlisting>
 
-	<para>FAQ ÐÏ <application>sendmail</application> ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ
-	  <ulink url="http://www.sendmail.org/faq/"></ulink> É ÒÅËÏÍÅÎÄÕÅÔÓÑ
-	  ÐÒÏÞÅÓÔØ ÅÇÏ ÐÒÉ ÖÅÌÁÎÉÉ ÐÒÏÉÚ×ÅÓÔÉ ÎÅËÏÔÏÒÙÅ
-	  <quote>ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÉÑ</quote> ÎÁÓÔÒÏÅË ÐÏÞÔÏ×ÏÊ ÓÉÓÔÅÍÙ.</para>
+	  <para>FAQ ÐÏ <application>sendmail</application> ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ
+	    <ulink url="http://www.sendmail.org/faq/"></ulink> É ÒÅËÏÍÅÎÄÕÅÔÓÑ
+	    ÐÒÏÞÅÓÔØ ÅÇÏ ÐÒÉ ÖÅÌÁÎÉÉ ÐÒÏÉÚ×ÅÓÔÉ ÎÅËÏÔÏÒÙÅ
+	    <quote>ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÉÑ</quote> ÎÁÓÔÒÏÅË ÐÏÞÔÏ×ÏÊ ÓÉÓÔÅÍÙ.</para>
 	</answer>
       </qandaentry>
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
+	  <para>ëÁË ÏÒÇÁÎÉÚÏ×ÁÔØ ÒÁÂÏÔÕ ÐÏÞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ ÐÒÉ ËÏÍÍÕÔÉÒÕÅÍÏÍ
+	    ÓÏÅÄÉÎÅÎÉÉ Ó éÎÔÅÒÎÅÔ?</para>
 
-	<para>ëÁË ÏÒÇÁÎÉÚÏ×ÁÔØ ÒÁÂÏÔÕ ÐÏÞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ ÐÒÉ ËÏÍÍÕÔÉÒÕÅÍÏÍ ÓÏÅÄÉÎÅÎÉÉ
-	  Ó éÎÔÅÒÎÅÔ?</para>
+	  <indexterm>
+	    <primary>PPP</primary>
+	  </indexterm>
 	</question>
 
 	<answer>
-	<para>÷Ù ÈÏÔÉÔÅ ÐÏÄËÌÀÞÉÔØ Ë ÉÎÔÅÒÎÅÔ ËÏÍÐØÀÔÅÒ Ó FreeBSD, ÒÁÂÏÔÁÀÝÉÊ
-	  × ÌÏËÁÌØÎÏÊ ÓÅÔÉ.  ëÏÍÐØÀÔÅÒ Ó FreeBSD ÂÕÄÅÔ ÐÏÞÔÏ×ÙÍ ÛÌÀÚÏÍ
-	  ÄÌÑ ÌÏËÁÌØÎÏÊ ÓÅÔÉ.  PPP ÓÏÅÄÉÎÅÎÉÅ ÎÅ ×ÙÄÅÌÅÎÎÏÅ.</para>
+	  <para>÷Ù ÈÏÔÉÔÅ ÐÏÄËÌÀÞÉÔØ Ë ÉÎÔÅÒÎÅÔ ËÏÍÐØÀÔÅÒ Ó FreeBSD, ÒÁÂÏÔÁÀÝÉÊ
+	    × ÌÏËÁÌØÎÏÊ ÓÅÔÉ.  ëÏÍÐØÀÔÅÒ Ó FreeBSD ÂÕÄÅÔ ÐÏÞÔÏ×ÙÍ ÛÌÀÚÏÍ
+	    ÄÌÑ ÌÏËÁÌØÎÏÊ ÓÅÔÉ.  PPP ÓÏÅÄÉÎÅÎÉÅ ÎÅ ×ÙÄÅÌÅÎÎÏÅ.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
+	  <indexterm>
+	    <primary>UUCP</primary>
+	  </indexterm>
+
+	  <indexterm>
+	    <primary>MX record</primary>
+	  </indexterm>
 
-	<para>óÕÝÅÓÔ×ÕÅÔ ËÁË ÍÉÎÉÍÕÍ Ä×Á ÐÕÔÉ, ÞÔÏÂÙ ÓÄÅÌÁÔØ ÜÔÏ.  ïÄÉÎ ÓÐÏÓÏÂ
-	  ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ UUCP.</para>
+	  <para>óÕÝÅÓÔ×ÕÅÔ ËÁË ÍÉÎÉÍÕÍ Ä×Á ÐÕÔÉ, ÞÔÏÂÙ ÓÄÅÌÁÔØ ÜÔÏ.  ïÄÉÎ
+	    ÓÐÏÓÏ ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ UUCP.</para>
 
-	<para>äÒÕÇÏÊ ÓÐÏÓÏ ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏÓÔÏÑÎÎÏ ÒÁÂÏÔÁÀÝÅÇÏ ÉÎÔÅÒÎÅÔ
-	  ÓÅÒ×ÅÒÁ ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ×ÔÏÒÉÞÎÏÇÏ MX ÓÅÒ×ÉÓÁ ×ÁÛÅÇÏ ÄÏÍÅÎÁ.
-	  îÁÐÒÉÍÅÒ, ÄÏÍÅÎ ×ÁÛÅÊ ËÏÍÐÁÎÉÉ <hostid
-	  role="domainname">example.com</hostid>, É ÐÒÏ×ÁÊÄÅÒ ÉÎÔÅÒÎÅÔ
-	  ÎÁÓÔÒÏÉÌ <hostid role="domainname">example.net</hostid>
-	  ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ×ÔÏÒÉÞÎÏÇÏ MX ÓÅÒ×ÉÓÁ:</para>
+	  <para>äÒÕÇÏÊ ÓÐÏÓÏ ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏÓÔÏÑÎÎÏ ÒÁÂÏÔÁÀÝÅÇÏ ÉÎÔÅÒÎÅÔ
+	    ÓÅÒ×ÅÒÁ ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ×ÔÏÒÉÞÎÏÇÏ MX ÓÅÒ×ÉÓÁ ×ÁÛÅÇÏ ÄÏÍÅÎÁ.
+	    îÁÐÒÉÍÅÒ, ÄÏÍÅÎ ×ÁÛÅÊ ËÏÍÐÁÎÉÉ <hostid
+	    role="domainname">example.com</hostid>, É ÐÒÏ×ÁÊÄÅÒ ÉÎÔÅÒÎÅÔ
+	    ÎÁÓÔÒÏÉÌ <hostid role="domainname">example.net</hostid>
+	    ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ×ÔÏÒÉÞÎÏÇÏ MX ÓÅÒ×ÉÓÁ:</para>
 
-	<programlisting>example.com.          MX        10      example.com.
+	  <programlisting>example.com.          MX        10      example.com.
                       MX        20      example.net.</programlisting>
 
-	<para>ôÏÌØËÏ ÏÄÉÎ ÈÏÓÔ ÄÏÌÖÅÎ ÂÙÔØ ÕËÁÚÁÎ × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ
-	  ÐÏÌÕÞÁÔÅÌÑ (ÄÏÂÁ×ØÔÅ ÚÁÐÉÓØ <literal>Cw example.com</literal> × ÆÁÊÌ
-	  <filename>/etc/mail/sendmail.cf</filename> ÎÁ ÍÁÛÉÎÅ
-	  <hostid role="domainname">example.com</hostid>).</para>
-
-	<para>ëÏÇÄÁ ÐÒÏÇÒÁÍÍÁ <command>sendmail</command> (ÓÏ ÓÔÏÒÏÎÙ
-	  ÏÔÐÒÁ×ÉÔÅÌÑ) <quote>ÚÁÈÏÞÅÔ</quote> ÄÏÓÔÁ×ÉÔØ ÐÏÞÔÕ, ÏÎÁ
-	  ÐÏÐÙÔÁÅÔÓÑ ÓÏÅÄÉÎÉÔØÓÑ Ó ×ÁÛÉÍ ÈÏÓÔÏÍ (<hostid
-	  role="domainname">example.com</hostid>) ÞÅÒÅÚ ÍÏÄÅÍÎÏÅ ÐÏÄËÌÀÞÅÎÉÅ.
-	  óËÏÒÅÅ ×ÓÅÇÏ, ÅÊ ÜÔÏ ÎÅ ÕÄÁÓÔÓÑ (×Ù,
-	  ×ÅÒÏÑÔÎÅÅ ×ÓÅÇÏ, ÎÅ ÂÕÄÅÔÅ ÐÏÄËÌÀÞÅÎÙ Ë ÉÎÔÅÒÎÅÔ).
-	  ðÒÏÇÒÁÍÍÁ <application>sendmail</application>
-	  Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÅÒÅÊÄÅÔ ËÏ ×ÔÏÒÉÞÎÏÍÕ MX ÓÅÒ×ÅÒÕ, Ô.Å. ×ÁÛÅÍÕ ÐÒÏ×ÁÊÄÅÒÕ
-	  (<hostid role="domainname">example.net</hostid>).
-	  ÷ÔÏÒÉÞÎÙÊ MX ÓÅÒ×ÅÒ ÂÕÄÅÔ ÐÅÒÉÏÄÉÞÅÓËÉ ÐÙÔÁÔØÓÑ ÓÏÅÄÉÎÉÔØÓÑ Ó
-	  ×ÁÛÉÍ ÈÏÓÔÏÍ É ÄÏÓÔÁ×ÉÔØ ÐÏÞÔÕ ÎÁ ÏÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ MX
-	  (<hostid role="domainname">example.com</hostid>).</para>
+	  <para>ôÏÌØËÏ ÏÄÉÎ ÈÏÓÔ ÄÏÌÖÅÎ ÂÙÔØ ÕËÁÚÁÎ × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ
+	    ÐÏÌÕÞÁÔÅÌÑ (ÄÏÂÁ×ØÔÅ ÚÁÐÉÓØ <literal>Cw example.com</literal> ×
+	    ÆÁÊÌ <filename>/etc/mail/sendmail.cf</filename> ÎÁ ÍÁÛÉÎÅ
+	    <hostid role="domainname">example.com</hostid>).</para>
+
+	  <para>ëÏÇÄÁ ÐÒÏÇÒÁÍÍÁ <command>sendmail</command> (ÓÏ ÓÔÏÒÏÎÙ
+	    ÏÔÐÒÁ×ÉÔÅÌÑ) <quote>ÚÁÈÏÞÅÔ</quote> ÄÏÓÔÁ×ÉÔØ ÐÏÞÔÕ, ÏÎÁ
+	    ÐÏÐÙÔÁÅÔÓÑ ÓÏÅÄÉÎÉÔØÓÑ Ó ×ÁÛÉÍ ÈÏÓÔÏÍ (<hostid
+	    role="domainname">example.com</hostid>) ÞÅÒÅÚ ÍÏÄÅÍÎÏÅ ÐÏÄËÌÀÞÅÎÉÅ.
+	    óËÏÒÅÅ ×ÓÅÇÏ, ÅÊ ÜÔÏ ÎÅ ÕÄÁÓÔÓÑ (×Ù,
+	    ×ÅÒÏÑÔÎÅÅ ×ÓÅÇÏ, ÎÅ ÂÕÄÅÔÅ ÐÏÄËÌÀÞÅÎÙ Ë ÉÎÔÅÒÎÅÔ).
+	    ðÒÏÇÒÁÍÍÁ <application>sendmail</application>
+	    Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÅÒÅÊÄÅÔ ËÏ ×ÔÏÒÉÞÎÏÍÕ MX ÓÅÒ×ÅÒÕ, Ô.Å. ×ÁÛÅÍÕ
+	    ÐÒÏ×ÁÊÄÅÒÕ (<hostid role="domainname">example.net</hostid>).
+	    ÷ÔÏÒÉÞÎÙÊ MX ÓÅÒ×ÅÒ ÂÕÄÅÔ ÐÅÒÉÏÄÉÞÅÓËÉ ÐÙÔÁÔØÓÑ ÓÏÅÄÉÎÉÔØÓÑ Ó
+	    ×ÁÛÉÍ ÈÏÓÔÏÍ É ÄÏÓÔÁ×ÉÔØ ÐÏÞÔÕ ÎÁ ÏÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ MX
+	    (<hostid role="domainname">example.com</hostid>).</para>
 
-	<para>÷Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÌÅÄÕÀÝÉÍ ÓÃÅÎÁÒÉÅÍ, ÞÔÏÂÙ ÚÁÂÉÒÁÔØ
-	  ÐÏÞÔÕ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ ×Ù ×ÈÏÄÉÔÅ × ÓÉÓÔÅÍÕ:</para>
+	  <para>÷Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÌÅÄÕÀÝÉÍ ÓÃÅÎÁÒÉÅÍ, ÞÔÏÂÙ ÚÁÂÉÒÁÔØ
+	    ÐÏÞÔÕ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ ×Ù ×ÈÏÄÉÔÅ × ÓÉÓÔÅÍÕ:</para>
 
-	<programlisting>#!/bin/sh
+	  <programlisting>#!/bin/sh

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 15:19:52 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 377641BAD;
 Thu, 15 Nov 2012 15:19:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1D2F28FC19;
 Thu, 15 Nov 2012 15:19:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFFJpcH006461;
 Thu, 15 Nov 2012 15:19:51 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFFJpcu006459;
 Thu, 15 Nov 2012 15:19:51 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211151519.qAFFJpcu006459@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 15:19:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40001 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 15:19:52 -0000

Author: gjb
Date: Thu Nov 15 15:19:51 2012
New Revision: 40001
URL: http://svnweb.freebsd.org/changeset/doc/40001

Log:
  Put a notice on the front page about cluster maintenance.

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl	Thu Nov 15 14:40:21 2012	(r40000)
+++ head/en_US.ISO8859-1/htdocs/index.xsl	Thu Nov 15 15:19:51 2012	(r40001)
@@ -64,6 +64,13 @@
 				  href="&base;/about.html"
 				  title="Learn More">Learn More</a>
 
+				<p>The &os; cluster is undergoing
+				  maintenance which may interfere
+				  with some services such as the
+				  GNATS PR system.  We apologize for
+				  any inconvenience this may
+				  cause.</p>
+
 				  </div> <!-- TXTFRONTFEATURELINK -->
 			  </div> <!-- FRONTFEATURECONTENT -->
 		  </div> <!-- FRONTFEATURELEFT -->

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 21:03:37 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3739EA43;
 Thu, 15 Nov 2012 21:03:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1C9048FC08;
 Thu, 15 Nov 2012 21:03:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFL3a96055359;
 Thu, 15 Nov 2012 21:03:36 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFL3aww055358;
 Thu, 15 Nov 2012 21:03:36 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152103.qAFL3aww055358@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 21:03:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40011 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 21:03:37 -0000

Author: gjb
Date: Thu Nov 15 21:03:36 2012
New Revision: 40011
URL: http://svnweb.freebsd.org/changeset/doc/40011

Log:
  Attempt to fix ports searching from the FreeBSD website.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 20:54:04 2012	(r40010)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 21:03:36 2012	(r40011)
@@ -114,7 +114,7 @@ sub init_variables {
     $remotePrefixHtml = "$hsty_base/ports";
 
     # CVS Web interface
-    $remotePrefixCvs = 'http://cvsweb.FreeBSD.org/ports';
+    $remotePrefixCvs = 'http://svnweb.FreeBSD.org/ports/head';
 
     # Ports documentation
     $portsDesc = "$hsty_base/ports/";

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 22:04:37 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 96885EE1;
 Thu, 15 Nov 2012 22:04:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B5298FC14;
 Thu, 15 Nov 2012 22:04:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFM4bAJ063374;
 Thu, 15 Nov 2012 22:04:37 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFM4bil063372;
 Thu, 15 Nov 2012 22:04:37 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152204.qAFM4bil063372@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 22:04:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40012 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 22:04:37 -0000

Author: gjb
Date: Thu Nov 15 22:04:37 2012
New Revision: 40012
URL: http://svnweb.freebsd.org/changeset/doc/40012

Log:
  Link to the actual revision log page.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 21:03:36 2012	(r40011)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:04:37 2012	(r40012)
@@ -370,7 +370,7 @@ sub out {
 qq[<a href="$remotePrefixFtpPackages{$remotePrefixFtpPackagesDefault}/$version.$packageExt">Package</a> <b>:</b>\n];
     }
 
-    print qq[<a href="$l">Changes</a> <b>:</b>\n];
+    print qq[<a href="$l/?view=log">Changes</a> <b>:</b>\n];
     print qq[<a href="$pathDownload">Download</a><br />\n];
 
     print qq{<i>Maintained by:</i> <a href="mailto:$email}

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 22:06:50 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D12D4137;
 Thu, 15 Nov 2012 22:06:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B54848FC12;
 Thu, 15 Nov 2012 22:06:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFM6o2b063803;
 Thu, 15 Nov 2012 22:06:50 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFM6ox9063802;
 Thu, 15 Nov 2012 22:06:50 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152206.qAFM6ox9063802@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 22:06:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40013 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 22:06:51 -0000

Author: gjb
Date: Thu Nov 15 22:06:50 2012
New Revision: 40013
URL: http://svnweb.freebsd.org/changeset/doc/40013

Log:
  Remove the tarball download link.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:04:37 2012	(r40012)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:06:50 2012	(r40013)
@@ -370,8 +370,7 @@ sub out {
 qq[<a href="$remotePrefixFtpPackages{$remotePrefixFtpPackagesDefault}/$version.$packageExt">Package</a> <b>:</b>\n];
     }
 
-    print qq[<a href="$l/?view=log">Changes</a> <b>:</b>\n];
-    print qq[<a href="$pathDownload">Download</a><br />\n];
+    print qq[<a href="$l/?view=log">Changes</a> <br />\n];
 
     print qq{<i>Maintained by:</i> <a href="mailto:$email}
       . (

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 22:29:06 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7CC964E4;
 Thu, 15 Nov 2012 22:29:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5EAB58FC13;
 Thu, 15 Nov 2012 22:29:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFMT67R066891;
 Thu, 15 Nov 2012 22:29:06 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFMT6VB066890;
 Thu, 15 Nov 2012 22:29:06 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152229.qAFMT6VB066890@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 22:29:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40014 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 22:29:06 -0000

Author: gjb
Date: Thu Nov 15 22:29:05 2012
New Revision: 40014
URL: http://svnweb.freebsd.org/changeset/doc/40014

Log:
  Use svnweb for displaying pkg-descr, instead of relying on local
  file copies.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:06:50 2012	(r40013)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:29:05 2012	(r40014)
@@ -361,7 +361,7 @@ sub out {
       qq{<dt><b><a name="$version"></a><a href="$l">$version</a></b></dt>\n};
     print qq{<dd>}, &escapeHTML($comment), qq{<br />\n};
 
-    print qq[<a href="$url?$descfile">Long description</a> <b>:</b>\n];
+    print qq[<a href="$l?$descfile?revision=HEAD&view=markup">Long description</a> <b>:</b>\n];
     print qq[<a href="$pds?$pathB">Sources</a> <b>:</b>\n];
 
   # Link package in "default" arch/release. Verify it's existence on ftp-master.

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 22:36:45 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1D1F9A3E;
 Thu, 15 Nov 2012 22:36:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 026918FC12;
 Thu, 15 Nov 2012 22:36:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFMaiUB067999;
 Thu, 15 Nov 2012 22:36:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFMaiZZ067998;
 Thu, 15 Nov 2012 22:36:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152236.qAFMaiZZ067998@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 22:36:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40015 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 22:36:45 -0000

Author: gjb
Date: Thu Nov 15 22:36:44 2012
New Revision: 40015
URL: http://svnweb.freebsd.org/changeset/doc/40015

Log:
  Fix URL for 'Long description' from last commit.
  Ugh...

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:29:05 2012	(r40014)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:36:44 2012	(r40015)
@@ -361,7 +361,7 @@ sub out {
       qq{<dt><b><a name="$version"></a><a href="$l">$version</a></b></dt>\n};
     print qq{<dd>}, &escapeHTML($comment), qq{<br />\n};
 
-    print qq[<a href="$l?$descfile?revision=HEAD&view=markup">Long description</a> <b>:</b>\n];
+    print qq[<a href="$l/pkg-descr?revision=HEAD&view=markup">Long description</a> <b>:</b>\n];
     print qq[<a href="$pds?$pathB">Sources</a> <b>:</b>\n];
 
   # Link package in "default" arch/release. Verify it's existence on ftp-master.

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov 15 22:46:40 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8DB01D1E;
 Thu, 15 Nov 2012 22:46:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 730A68FC12;
 Thu, 15 Nov 2012 22:46:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFMkeBY069252;
 Thu, 15 Nov 2012 22:46:40 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFMkeiE069251;
 Thu, 15 Nov 2012 22:46:40 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211152246.qAFMkeiE069251@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 15 Nov 2012 22:46:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40016 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 22:46:40 -0000

Author: gjb
Date: Thu Nov 15 22:46:40 2012
New Revision: 40016
URL: http://svnweb.freebsd.org/changeset/doc/40016

Log:
  Remove the 'Sources' link.  It is redundant with the main
  port version link.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:36:44 2012	(r40015)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Thu Nov 15 22:46:40 2012	(r40016)
@@ -362,7 +362,6 @@ sub out {
     print qq{<dd>}, &escapeHTML($comment), qq{<br />\n};
 
     print qq[<a href="$l/pkg-descr?revision=HEAD&view=markup">Long description</a> <b>:</b>\n];
-    print qq[<a href="$pds?$pathB">Sources</a> <b>:</b>\n];
 
   # Link package in "default" arch/release. Verify it's existence on ftp-master.
     if ( $packages{"$version.$packageExt"} ) {

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov 16 09:47:15 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 030D74AC;
 Fri, 16 Nov 2012 09:47:15 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DCBE18FC08;
 Fri, 16 Nov 2012 09:47:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAG9lE4H059355;
 Fri, 16 Nov 2012 09:47:14 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAG9lEF0059354;
 Fri, 16 Nov 2012 09:47:14 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211160947.qAG9lEF0059354@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 16 Nov 2012 09:47:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40027 - head/nl_NL.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2012 09:47:15 -0000

Author: rene
Date: Fri Nov 16 09:47:14 2012
New Revision: 40027
URL: http://svnweb.freebsd.org/changeset/doc/40027

Log:
  MFen r39669 -> r40001

Modified:
  head/nl_NL.ISO8859-1/htdocs/index.xsl

Modified: head/nl_NL.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/index.xsl	Fri Nov 16 02:08:09 2012	(r40026)
+++ head/nl_NL.ISO8859-1/htdocs/index.xsl	Fri Nov 16 09:47:14 2012	(r40027)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/index.xsl
-     %SRCID%	39669
+     %SRCID%	40001
 -->
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
@@ -59,6 +59,12 @@
 				  gebruikt.</p>
 				<div id="txtfrontfeaturelink">
 				&raquo;<a href="&base;/about.html" title="Meer weten">Meer weten</a>
+
+				  <p>Op het &os;-cluster zijn momenteel
+				    onderhoudswerkzaamheden gaande die sommige
+				    diensten zoals het GNATS PR-systeem kunnen
+				    verstoren.  Onze excuses voor enig ongemak
+				    dat dit kan veroorzaken.</p>
 				</div> <!-- TXTFRONTFEATURELINK -->
 			</div> <!-- FRONTFEATURECONTENT -->
 		</div> <!-- FRONTFEATURELEFT -->

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov 16 15:43:27 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CC6B87CC;
 Fri, 16 Nov 2012 15:43:27 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 96F958FC12;
 Fri, 16 Nov 2012 15:43:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAGFhRiG015620;
 Fri, 16 Nov 2012 15:43:27 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAGFhRab015618;
 Fri, 16 Nov 2012 15:43:27 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201211161543.qAGFhRab015618@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 16 Nov 2012 15:43:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40033 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2012 15:43:27 -0000

Author: kwm (ports committer)
Date: Fri Nov 16 15:43:27 2012
New Revision: 40033
URL: http://svnweb.freebsd.org/changeset/doc/40033

Log:
  Add OSVERSION bumps:
  
  1000022 for IPv4 stack switched to network byte order for
  	    IP packet header storage.
  1000023 for jitter buffer for USB serial driver code.
  1000024 for clang the default compile on i386 and amd64.
  
  Reviewed by:	eadler@

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Fri Nov 16 15:25:01 2012	(r40032)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Fri Nov 16 15:43:27 2012	(r40033)
@@ -15827,6 +15827,32 @@ Reference: &lt;http://www.freebsd.org/po
 		<svnref>241519</svnref>,
 		<svnref>241897</svnref>).</entry>
 	    </row>
+
+	    <row>
+	      <entry>1000022</entry>
+	      <entry>October 22, 2012</entry>
+	      <entry>10-CURRENT after the entire IPv4 stack switched
+		to network byte order for IP packet header storage
+		(rev <svnref>241913</svnref>).</entry>
+	    </row>
+
+	    <row>
+	      <entry>1000023</entry>
+	      <entry>November 5, 2012</entry>
+	      <entry>10-CURRENT after jitter buffer in the common USB
+		serial driver code, to temporarily store characters
+		if the TTY buffer is full.  Add flow stop and start
+		signals when this happens (rev
+		<svnref>242619</svnref>).</entry>
+	    </row>
+
+	    <row>
+	      <entry>1000024</entry>
+	      <entry>November 5, 2012</entry>
+	      <entry>10-CURRENT after clang was made the default
+		compiler on i386 and amd64
+		(rev <svnref>242624</svnref>).</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </table>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov 16 17:56:06 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 710D4FC8;
 Fri, 16 Nov 2012 17:56:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5625A8FC15;
 Fri, 16 Nov 2012 17:56:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAGHu6uZ036288;
 Fri, 16 Nov 2012 17:56:06 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAGHu6MY036286;
 Fri, 16 Nov 2012 17:56:06 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211161756.qAGHu6MY036286@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 16 Nov 2012 17:56:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40040 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2012 17:56:06 -0000

Author: gjb
Date: Fri Nov 16 17:56:05 2012
New Revision: 40040
URL: http://svnweb.freebsd.org/changeset/doc/40040

Log:
  Unbreak in-Handbook pkg-descr links by using svnweb.

Modified:
  head/share/xml/freebsd-html.dsl

Modified: head/share/xml/freebsd-html.dsl
==============================================================================
--- head/share/xml/freebsd-html.dsl	Fri Nov 16 17:28:21 2012	(r40039)
+++ head/share/xml/freebsd-html.dsl	Fri Nov 16 17:56:05 2012	(r40040)
@@ -272,10 +272,10 @@
 	  (let*	((class		(attribute-string (normalize "role"))))
 	    (cond
 	     ((equal? class "package")
-	      (let* ((urlurl	"http://www.FreeBSD.org/cgi/url.cgi")
-		     (href	(string-append urlurl "?ports/"
+	      (let* ((urlurl	"http://svnweb.FreeBSD.org/")
+		     (href	(string-append urlurl "ports/head/"
 					       (data (current-node))
-					       "/pkg-descr")))
+					       "/pkg-descr?revision=HEAD")))
 		(create-link (list (list "HREF" href)) ($mono-seq$))))
 	     (else ($mono-seq$)))))
 

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov 16 17:57:21 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4BF87182;
 Fri, 16 Nov 2012 17:57:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30DB98FC08;
 Fri, 16 Nov 2012 17:57:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAGHvLGP036550;
 Fri, 16 Nov 2012 17:57:21 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAGHvL29036548;
 Fri, 16 Nov 2012 17:57:21 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211161757.qAGHvL29036548@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 16 Nov 2012 17:57:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40041 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2012 17:57:21 -0000

Author: gjb
Date: Fri Nov 16 17:57:20 2012
New Revision: 40041
URL: http://svnweb.freebsd.org/changeset/doc/40041

Log:
  Default view to text, since it loads far faster than the markup version.

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/ports.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/ports.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Fri Nov 16 17:56:05 2012	(r40040)
+++ head/en_US.ISO8859-1/htdocs/cgi/ports.cgi	Fri Nov 16 17:57:20 2012	(r40041)
@@ -361,7 +361,7 @@ sub out {
       qq{<dt><b><a name="$version"></a><a href="$l">$version</a></b></dt>\n};
     print qq{<dd>}, &escapeHTML($comment), qq{<br />\n};
 
-    print qq[<a href="$l/pkg-descr?revision=HEAD&view=markup">Long description</a> <b>:</b>\n];
+    print qq[<a href="$l/pkg-descr?revision=HEAD">Long description</a> <b>:</b>\n];
 
   # Link package in "default" arch/release. Verify it's existence on ftp-master.
     if ( $packages{"$version.$packageExt"} ) {

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 05:26:13 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 93651230;
 Sat, 17 Nov 2012 05:26:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 761408FC08;
 Sat, 17 Nov 2012 05:26:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAH5QDHj035817;
 Sat, 17 Nov 2012 05:26:13 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAH5QDME035815;
 Sat, 17 Nov 2012 05:26:13 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201211170526.qAH5QDME035815@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 17 Nov 2012 05:26:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40050 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 05:26:13 -0000

Author: pgj (ports committer)
Date: Sat Nov 17 05:26:13 2012
New Revision: 40050
URL: http://svnweb.freebsd.org/changeset/doc/40050

Log:
  - Add information on how to update the source code using Subversion, and
    therefore deprecate CVS and CVSup as ways of updating.
  
  Reviewed by:	gavin, brd, eadler
  Approved by:	gjb

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Fri Nov 16 19:50:44 2012	(r40049)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Sat Nov 17 05:26:13 2012	(r40050)
@@ -70,6 +70,7 @@
       <listitem>
 	<para>How to keep your system up to date with
 	  <application>freebsd-update</application>,
+	  <application>Subversion</application>,
 	  <application>CVSup</application>,
 	  <application>CVS</application>, or
 	  <application>CTM</application>.</para>
@@ -82,7 +83,7 @@
 
       <listitem>
 	<para>How to keep your documentation up to date with
-	  <application>CVSup</application> or documentation
+	  <application>Subversion</application> or documentation
 	  ports<!--, and <application>Docsnap</application>-->.</para>
       </listitem>
 
@@ -112,15 +113,10 @@
     </itemizedlist>
 
     <note>
-      <para>Throughout this chapter, the <command>cvsup</command>
-	command is used to obtain and update &os; sources.  To use it,
-	you will need to install the port or the package for
-	<filename role="package">net/cvsup</filename> (if you do not
-	want to install the graphical <command>cvsup</command> client,
-	you can just install the port
-	<filename>net/cvsup-without-gui</filename>).  You may wish to
-	substitute this with &man.csup.1;, which is part of the base
-	system.</para>
+      <para>Throughout this chapter, the <command>svn</command> command
+	is used to obtain and update &os; sources.  To use it, you will
+	need to install the port or the package for <filename
+	role="package">devel/subversion</filename>.</para>
     </note>
   </sect1>
 
@@ -1405,10 +1401,13 @@ Fetching 133 new ports or files... done.
 	  <listitem>
 	    <para>Grab the sources from a &os;
 	      <link linkend="mirrors">mirror site</link>.  You can do
-	      this in one of two ways:</para>
+	      this in one of three ways:</para>
 
 	    <orderedlist>
 	      <indexterm>
+		<primary><command>svn</command></primary>
+	      </indexterm>
+	      <indexterm>
 		<primary><command>cvsup</command></primary>
 	      </indexterm>
 	      <indexterm>
@@ -1422,21 +1421,33 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
+		<para>Use the <link linkend="svn">svn</link> program to
+		  check out the desired development or release branch.
+		  This is the recommended method, providing access to
+		  &os; development as it occurs.  The preferred URL
+		  prefix for <application>Subversion</application>
+		  checkout of the -CURRENT base system is
+		  <literal>http://svn.freebsd.org/base/head/</literal>;
+		  because of the size of the repository, it is
+		  recommended that only desired subtrees be checked out.
+		  </para>
+	      </listitem>
+
+	      <listitem>
 		<para>Use the <link linkend="cvsup">cvsup</link>
 		  program with the <filename>supfile</filename> named
 		  <filename>standard-supfile</filename> available from
 		  <filename>/usr/share/examples/cvsup</filename>.
-		  This is the most recommended method, since it allows
-		  you to grab the entire collection once and then only
-		  what has changed from then on.  Many people run
-		  <command>cvsup</command> from
-		  <command>cron</command> and keep their sources
-		  up-to-date automatically.  You have to customize the
-		  sample <filename>supfile</filename> above, and
-		  configure
+		  You have to customize the sample
+		  <filename>supfile</filename> above, and configure
 		  <link linkend="cvsup">cvsup</link> for your
 		  environment.</para>
 
+		<warning>
+		  <para><command>cvsup</command> has been deprecated by
+		  the Project, and is not recommended.</para>
+		</warning>
+
 		<note>
 		  <para>The sample
 		    <filename>standard-supfile</filename> is intended
@@ -1473,9 +1484,8 @@ Fetching 133 new ports or files... done.
 		  which again increases the chance of it not working
 		  for fairly long periods of time.  We recommend using
 		  <application><link
-		    linkend="cvsup">CVSup</link></application> for
-		  anybody with a 9600&nbsp;bps modem or faster
-		  connection.</para>
+		    linkend="svn">Subversion</link></application> for
+		    any system with Internet connectivity.</para>
 	      </listitem>
 	    </orderedlist>
 	  </listitem>
@@ -1599,8 +1609,8 @@ Fetching 133 new ports or files... done.
 
 	    <para>Join the relevant <application>SVN</application>
 	      list for the branch you are tracking.  For example, if
-	      you are tracking the 7-STABLE branch, join the
-	      &a.svn-src-stable-7.name; list. This will allow you to
+	      you are tracking the 9-STABLE branch, join the
+	      &a.svn-src-stable-9.name; list. This will allow you to
 	      view the commit log entry for each change as it is made,
 	      along with any pertinent information on possible
 	      side-effects.</para>
@@ -1629,10 +1639,13 @@ Fetching 133 new ports or files... done.
 	      &os; and wish to upgrade via sources then you can easily
 	      do so from &os;
 	      <link linkend="mirrors">mirror site</link>.  This can be
-	      done in one of two ways:</para>
+	      done in one of three ways:</para>
 
 	    <orderedlist>
 	      <indexterm>
+		<primary><command>svn</command></primary>
+	      </indexterm>
+	      <indexterm>
 		<primary><command>cvsup</command></primary>
 	      </indexterm>
 	      <indexterm>
@@ -1641,24 +1654,42 @@ Fetching 133 new ports or files... done.
 	      <indexterm>
 		<primary>-STABLE</primary>
 		<secondary>syncing with
-		  <application>CVSup</application></secondary>
+		  <application>Subversion</application></secondary>
 	      </indexterm>
 
 	      <listitem>
+		<para>Use the <link linkend="svn">svn</link> program to
+		  check out the desired development or release branch.
+		  This is the recommended method, providing access to
+		  &os; development as it occurs.  Branch names include
+		  <literal>head</literal> for the current development
+		  head, and branches identified in <ulink
+		  url="&url.base;/releng/"/>, such as
+		  <literal>stable/9</literal> or
+		  <literal>stable/9.0</literal>.  The preferred URL
+		  prefix for <application>Subversion</application>
+		  checkout of the base system is
+		  <literal>http://svn.freebsd.org/base/</literal>;
+		  because of the size of the repository, it is
+		  recommended that only desired subtrees be checked out.
+		  </para>
+	      </listitem>
+
+	      <listitem>
 		<para>Use the <link linkend="cvsup">cvsup</link>
 		  program with the <filename>supfile</filename> named
 		  <filename>stable-supfile</filename> from the
 		  directory
 		  <filename>/usr/share/examples/cvsup</filename>.
-		  This is the most recommended method, since it allows
-		  you to grab the entire collection once and then only
-		  what has changed from then on.  Many people run
-		  <command>cvsup</command> from
-		  <command>cron</command> to keep their sources
-		  up-to-date automatically.  You have to customize the
+		  You have to customize the
 		  sample <filename>supfile</filename> above, and
 		  configure <link linkend="cvsup">cvsup</link> for
 		  your environment.</para>
+
+		<warning>
+		  <para><command>cvsup</command> has been deprecated by
+		    the Project, and is not recommended.</para>
+		</warning>
 	      </listitem>
 
 	      <listitem>
@@ -1713,6 +1744,7 @@ Fetching 133 new ports or files... done.
       connection to stay up-to-date with any given area of the &os;
       project sources, or all areas, depending on what interests you.
       The primary services we offer are
+      <link linkend="svn">Subversion</link>,
       <link linkend="anoncvs">Anonymous CVS</link>,
       <link linkend="cvsup">CVSup</link>, and
       <link linkend="ctm">CTM</link>.</para>
@@ -1734,25 +1766,25 @@ Fetching 133 new ports or files... done.
       <secondary>anonymous</secondary>
     </indexterm>
 
-    <para><application>Anonymous CVS</application> and
-      <application>CVSup</application> use the
-      <emphasis>pull</emphasis> model of updating sources.  In the
-      case of <application>CVSup</application> the user (or a
-      <command>cron</command> script) invokes the
-      <command>cvsup</command> program, and it interacts with a
-      <command>cvsupd</command> server somewhere to bring your files
-      up-to-date.  The updates you receive are up-to-the-minute and
+    <para><application>Subversion</application>, <application>Anonymous
+      CVS</application> and <application>CVSup</application> use the
+      <emphasis>pull</emphasis> model of updating sources.  For
+      <application>Subversion</application>,
+      the user (or a <command>cron</command> script) invokes the
+      <command>svn</command> program, and it brings files up-to-date.
+      <application>Subversion</application> is the preferred means of
+      updating local source trees.
+      <command>cvsup</command> and <command>cvs</command> work under
+      similar principles, but are now deprecated in favour of Subversion.
+      The updates you receive are up-to-the-minute and
       you get them when, and only when, you want them.  You can easily
       restrict your updates to the specific files or directories that
       are of interest to you.  Updates are generated on the fly by the
       server, according to what you have and what you want to have.
-      <application>Anonymous CVS</application> is quite a bit more
-      simplistic than <application>CVSup</application> in that it is
-      just an extension to <application>CVS</application> which allows
-      it to pull changes directly from a remote CVS repository.
-      <application>CVSup</application> can do this far more
-      efficiently, but <application>Anonymous CVS</application> is
-      easier to use.</para>
+      Unless the reason is truly compelling,
+      <application>Subversion</application> should be used in preference
+      to other synchronization mechanisms, which have been deprecated
+      and will be discontinued in the future.</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Fri Nov 16 19:50:44 2012	(r40049)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Nov 17 05:26:13 2012	(r40050)
@@ -245,331 +245,18 @@
       <xref linkend="burncd"/>, burncd.</para>
   </sect1>
 
-  <sect1 id="mirrors-svn">
-    <title>Subversion Sites</title>
-
-    <indexterm>
-      <primary>svn</primary>
-    </indexterm>
-
-    <para>As of July 2012, &os; uses
-      <ulink url="http://subversion.apache.org/">Subversion</ulink>
-      (<emphasis>svn</emphasis>) as the primary version control system
-      for storing all of &os;'s source code, documentation, and the
-      Ports Collection.</para>
-
-    <note>
-      <para>Subversion is generally a developer tool.  Most users
-	should use
-	<link linkend="updating-upgrading-freebsdupdate">FreeBSD
-	  Update</link> to update the &os; base system, and
-	<link linkend="updating-upgrading-portsnap">Portsnap</link>
-	to update the &os; Ports Collection.</para>
-    </note>
-
-    <para>The &os; svn mirror network is still in its early days, and
-      will likely change.  Do not count on this list of mirrors being
-      static.  In particular, the SSL certificates of the servers will
-      likely change at some point.</para>
-
-    <para>In Subversion, URLs are used to designate a repository,
-      taking the form of <literal>protocol://hostname/path</literal>.
-      Mirrors may support different protocols as specified below.  The
-      first component of the path is the &os; repository to access.
-      There are three different repositories, <literal>base</literal>
-      for the &os; base system source code, <literal>ports</literal>
-      for the Ports Collection, and <literal>doc</literal> for
-      documentation.  For example, the URL
-      <literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
-      specifies the main branch of the ports repository on the
-      <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror,
-      using the svn protocol.</para>
-
-    <para>All mirrors carry all repositories.</para>
-
-    <para>The master &os; Subversion server,
-      <hostid role="fqdn">svn.FreeBSD.org</hostid>, is publicly
-      accessible, read-only.  That may change in the future, so users
-      are encouraged to use one of the official mirrors.  To view the
-      &os; Subversion repositories through a browser, use <ulink
-	url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
-
-    <informaltable>
-      <tgroup cols="4">
-	<colspec colwidth="3*"/>
-	<colspec colwidth="1*"/>
-	<colspec colwidth="2*"/>
-	<colspec colwidth="10*"/>
-	<thead>
-	  <row>
-	    <entry>Name</entry>
-
-	    <entry>Protocols</entry>
-
-	    <entry>Location</entry>
-
-	    <entry>SSL fingerprint</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><hostid
-		role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
-
-	    <entry>svn, <ulink
-		url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
-	      <ulink
-		url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
-
-	    <entry>USA, California</entry>
-
-	    <entry>SHA1
-	      <literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><hostid
-		role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
-
-	    <entry>svn, <ulink
-		url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
-	      <ulink
-		url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
-
-	    <entry>USA, New Jersey</entry>
-
-	    <entry>SHA1
-	      <literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </informaltable>
-  </sect1>
 
   <sect1 id="anoncvs">
-    <title>Anonymous CVS</title>
+    <title>Anonymous CVS (Deprecated)</title>
 
     <sect2>
-      <title><anchor id="anoncvs-intro"/>Introduction</title>
-
-      <indexterm>
-	<primary>CVS</primary>
-	<secondary>anonymous</secondary>
-      </indexterm>
-
-      <para>Anonymous CVS (or, as it is otherwise known,
-	<emphasis>anoncvs</emphasis>) is a feature provided by the CVS
-	utilities bundled with &os; for synchronizing with a remote
-	CVS repository.  Among other things, it allows users of &os;
-	to perform, with no special privileges, read-only CVS
-	operations against one of the &os; project's official anoncvs
-	servers.  To use it, one simply sets the
-	<envar>CVSROOT</envar> environment variable to point at the
-	appropriate anoncvs server, provides the well-known password
-	<quote>anoncvs</quote> with the <command>cvs login</command>
-	command, and then uses the &man.cvs.1; command to access it
-	like any local repository.</para>
+      <title>Warning</title>
 
-      <note>
-	<para>The <command>cvs login</command> command, stores the
-	  passwords that are used for authenticating to the CVS server
-	  in a file called <filename>.cvspass</filename> in your
-	  <envar>HOME</envar> directory.  If this file does not exist,
-	  you might get an error when trying to use
-	  <command>cvs login</command> for the first time.  Just make
-	  an empty <filename>.cvspass</filename> file, and retry to
-	  login.</para>
-      </note>
-
-      <para>While it can also be said that the
-	<link linkend="cvsup">CVSup</link> and
-	<emphasis>anoncvs</emphasis> services both perform essentially
-	the same function, there are various trade-offs which can
-	influence the user's choice of synchronization methods.  In a
-	nutshell, <application>CVSup</application> is much more
-	efficient in its usage of network resources and is by far the
-	most technically sophisticated of the two, but at a price.  To
-	use <application>CVSup</application>, a special client must
-	first be installed and configured before any bits can be
-	grabbed, and then only in the fairly large chunks which
-	<application>CVSup</application> calls
-	<emphasis>collections</emphasis>.</para>
-
-      <para><application>Anoncvs</application>, by contrast, can be
-	used to examine anything from an individual file to a specific
-	program (like <command>ls</command> or
-	<command>grep</command>) by referencing the CVS module name.
-	Of course, <application>anoncvs</application> is also only
-	good for read-only operations on the CVS repository, so if it
-	is your intention to support local development in one
-	repository shared with the &os; project bits then
-	<application>CVSup</application> is really your only
-	option.</para>
-    </sect2>
-
-    <sect2>
-      <title><anchor id="anoncvs-usage"/>Using Anonymous CVS</title>
-
-      <para>Configuring &man.cvs.1; to use an Anonymous CVS repository
-	is a simple matter of setting the <envar>CVSROOT</envar>
-	environment variable to point to one of the &os; project's
-	<emphasis>anoncvs</emphasis> servers.  At the time of this
-	writing, the following servers are available:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><emphasis>France</emphasis>:
-	    :pserver:anoncvs@anoncvs.fr.FreeBSD.org:/home/ncvs
-	    (For pserver mode, use <command>cvs login</command> and
-	    enter the password <quote>anoncvs</quote> when prompted.
-	    For ssh, no password is required.)</para>
-	</listitem>
-	<!--
-	<listitem>
-	  <para><emphasis>Japan</emphasis>:
-	    :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs
-	    (Use <command>cvs login</command> and enter the password
-	    <quote>anoncvs</quote> when prompted.)</para>
-	</listitem>
-	-->
-	<listitem>
-	  <para><emphasis>Taiwan</emphasis>:
-	    :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
-	    (For pserver mode, use <command>cvs login</command> and
-	    enter any password when prompted. For ssh, no password
-	    is required.)</para>
-
-	  <programlisting>SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub
-SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
-
-	</listitem>
-	<!--
-	<listitem>
-	  <para><emphasis>USA</emphasis>:
-	    anoncvs@anoncvs1.FreeBSD.org:/home/ncvs (For ssh, use ssh
-	    version 2 and no password is required.)</para>
-
-	  <programlisting>SSH2 HostKey: 2048 53:1f:15:a3:72:5c:43:f6:44:0e:6a:e9:bb:f8:01:62 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
-
-	</listitem>
-	-->
-      </itemizedlist>
-
-      <para>Since CVS allows one to <quote>check out</quote> virtually
-	any version of the &os; sources that ever existed (or, in some
-	cases, will exist), you need to be familiar with the revision
-	(<option>-r</option>) flag to &man.cvs.1; and what some of the
-	permissible values for it in the &os; Project repository
-	are.</para>
-
-      <para>There are two kinds of tags, revision tags and branch
-	tags.  A revision tag refers to a specific revision.  Its
-	meaning stays the same from day to day.  A branch tag, on the
-	other hand, refers to the latest revision on a given line of
-	development, at any given time.  Because a branch tag does not
-	refer to a specific revision, it may mean something different
-	tomorrow than it means today.</para>
-
-      <para><xref linkend="cvs-tags"/> contains revision tags that
-	users might be interested in.  Again, none of these are valid
-	for the Ports Collection since the Ports Collection does not
-	have multiple branches of development.</para>
-
-      <para>When you specify a branch tag, you normally receive the
-	latest versions of the files on that line of development.  If
-	you wish to receive some past version, you can do so by
-	specifying a date with the <option>-D date</option> flag.  See
-	the &man.cvs.1; manual page for more details.</para>
-    </sect2>
-
-    <sect2>
-      <title>Examples</title>
-
-      <para>While it really is recommended that you read the manual
-	page for &man.cvs.1; thoroughly before doing anything, here
-	are some quick examples which essentially show how to use
-	Anonymous CVS:</para>
-
-      <example>
-	<title>Checking Out Something from -CURRENT
-	  (&man.ls.1;):</title>
-
-	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
-&prompt.user; <userinput>cvs login</userinput>
-<emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co ls</userinput></screen>
-      </example>
-
-      <example>
-	<title>Using SSH to Check Out the <filename>src/</filename>
-	  Tree:</title>
-
-	<screen>&prompt.user; <userinput>cvs -d anoncvs@anoncvs1.FreeBSD.org:/home/ncvs co src</userinput>
-The authenticity of host 'anoncvs1.freebsd.org (216.87.78.137)' can't be established.
-DSA key fingerprint is 53:1f:15:a3:72:5c:43:f6:44:0e:6a:e9:bb:f8:01:62.
-Are you sure you want to continue connecting (yes/no)? <userinput>yes</userinput>
-Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hosts.</screen>
-      </example>
-
-      <example>
-	<title>Checking Out the Version of &man.ls.1; in the 8-STABLE
-	  Branch:</title>
-
-	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
-&prompt.user; <userinput>cvs login</userinput>
-<emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co -rRELENG_8 ls</userinput></screen>
-      </example>
-
-      <example>
-	<title>Creating a List of Changes (as Unified Diffs) to
-	  &man.ls.1;</title>
-
-	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
-&prompt.user; <userinput>cvs login</userinput>
-<emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs rdiff -u -rRELENG_8_0_0_RELEASE -rRELENG_8_1_0_RELEASE ls</userinput></screen>
-      </example>
-
-      <example>
-	<title>Finding Out What Other Module Names Can Be
-	  Used:</title>
-
-	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
-&prompt.user; <userinput>cvs login</userinput>
-<emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co modules</userinput>
-&prompt.user; <userinput>more modules/modules</userinput></screen>
-      </example>
-    </sect2>
-
-    <sect2>
-      <title>Other Resources</title>
-
-      <para>The following additional resources may be helpful in
-	learning CVS:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><ulink
-	      url="http://users.csc.calpoly.edu/~gfisher/classes/308/handouts/cvs-basics.html">CVS
-	    Tutorial</ulink> from California Polytechnic State
-	    University.</para>
-	</listitem>
-
-	<listitem>
-	  <para><ulink url="http://www.nongnu.org/cvs/">CVS
-	      Home</ulink>, the CVS development and support
-	    community.</para>
-	</listitem>
-
-	<listitem>
-	  <para><ulink
-	      url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVSweb</ulink>
-	    is the &os; Project web interface for CVS.</para>
-	</listitem>
-      </itemizedlist>
+      <warning>
+	<para>CVS has been deprecated by the project, and its use is not
+	  recommended.  <application>Subversion</application> should be
+	  used instead.</para>
+      </warning>
     </sect2>
   </sect1>
 
@@ -933,12 +620,234 @@ Warning: Permanently added 'anoncvs1.fre
     </sect2>
   </sect1>
 
+  <sect1 id="svn">
+    <title>Using <application>Subversion</application></title>
+
+    <sect2 id="svn-intro">
+      <title>Introduction</title>
+
+      <para>As of July 2012, &os; uses <ulink
+	  url="http://subversion.apache.org/">Subversion</ulink>
+	(<emphasis>svn</emphasis>) as the primary version control system
+	for storing all of &os;'s source code, documentation, and the
+	Ports Collection.</para>
+
+      <note>
+	<para>Subversion is generally a developer tool.  Most users
+	  should use <link
+	  linkend="updating-upgrading-freebsdupdate">FreeBSD
+	    Update</link> to update the &os; base system, and <link
+	  linkend="updating-upgrading-portsnap">Portsnap</link> to
+	  update the &os; Ports Collection.</para>
+      </note>
+
+      <para>In <application>Subversion</application>, URLs are used to
+	designate a repository, taking the form of
+	<replaceable>protocol://hostname/path</replaceable>.  Mirrors may
+	support different protocols as specified below.  The first
+	component of the path is the &os; repository to access.  There
+	are three different repositories, <literal>base</literal> for
+	the &os; base system source code, <literal>ports</literal> for
+	the Ports Collection, and <literal>doc</literal> for
+	documentation.  For example, the URL
+	<literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
+	specifies the main branch of the ports repository on the <hostid
+	role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror, using the
+	<literal>svn</literal> protocol.</para>
+    </sect2>
+
+    <sect2 id="svn-install">
+      <title>Installation</title>
+
+      <para><application>Subversion</application> must be installed
+	before it can be used to check out the contents of any of the
+	repositories.  If a copy of the ports tree is already present,
+	one can install <application>Subversion</application> like
+	this:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/devel/subversion</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>If the ports tree is not available,
+	<application>Subversion</application> can be installed as a
+	package:</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r subversion</userinput></screen>
+
+      <para>If <application>pkgng</application> is being used to manage
+	packages, <application>Subversion</application> can be installed
+	with it instead:</para>
+
+      <screen>&prompt.root; <userinput>pkg install devel/subversion</userinput></screen>
+    </sect2>
+
+    <sect2 id="svn-usage">
+      <title>Running <application>Subversion</application></title>
+
+      <para>The <command>svn</command> command can be used to fetch a
+	clean copy of the sources from a given repository by
+	typing:</para>
+
+      <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/<replaceable>repository</replaceable>/<replaceable>branch</replaceable></literal> <replaceable>root</replaceable></userinput></screen>
+
+      <para>where:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para><replaceable>repository</replaceable> is one of the
+	    Project repositories, i.e.  <literal>base</literal>,
+	    <literal>ports</literal>, or <literal>doc</literal>.</para>
+	</listitem>
+
+	<listitem>
+	  <para><replaceable>branch</replaceable> depends on the
+	    repository used.  <literal>ports</literal> and
+	    <literal>doc</literal> are mostly updated in the
+	    <literal>head</literal> branch, while
+	    <literal>base</literal> maintains the latest version of
+	    -CURRENT under <literal>head</literal> and the respective
+	    latest versions of the -STABLE branches under
+	    <literal>stable/8</literal> (for
+	    8.<replaceable>x</replaceable>) and
+	    <literal>stable/9</literal>
+	    (9.<replaceable>x</replaceable>).</para>
+	</listitem>
+
+	<listitem>
+	  <para><replaceable>root</replaceable> is the target directory
+	    where the contents of the specified branch should be placed.
+	    This is usually <filename
+	    class="directory">/usr/ports</filename> for
+	    <literal>ports</literal>, <filename
+	    class="directory">/usr/src</filename> for
+	    <literal>base</literal>, and <filename
+	    class="directory">/usr/doc</filename> for
+	    <literal>doc</literal>.</para>
+	</listitem>
+      </itemizedlist>
+
+      <para>Note that the initial download of the sources may take a
+	while.  Let it run until it completes.</para>
+
+      <para>Future updates of the downloaded sources may be fetched by
+	running:</para>
+
+      <screen>&prompt.root; <userinput>svn update <replaceable>root</replaceable></userinput></screen>
+
+      <para>After checking out the sources, an alternative way of
+	updating the documentation is supported by the
+	<filename>Makefile</filename> of the <filename
+	class="directory"><replaceable>root</replaceable></filename>
+	directory by running:</para>
+
+      <screen>&prompt.root; <userinput>cd <replaceable>root</replaceable></userinput>
+&prompt.root; <userinput>make update SVN_UPDATE=yes</userinput></screen>
+    </sect2>
+
+    <sect2>
+      <title>For More Information</title>
+
+      <para>For other information about using
+	<application>Subversion</application>, please see the
+	<quote>Subversion Book</quote>, titled <ulink
+	url="http://svnbook.red-bean.com/">Version Control with
+	Subversion</ulink>, or the <ulink
+	url="http://subversion.apache.org/docs/">Subversion
+	Documentation</ulink>.</para>
+    </sect2>
+
+    <sect2 id="svn-mirrors">
+      <title><application>Subversion</application> Sites</title>
+
+      <indexterm>
+	<primary>svn</primary>
+      </indexterm>
+
+      <para>All mirrors carry all repositories.</para>
+
+      <para>The master &os; <application>Subversion</application>
+	server, <hostid role="fqdn">svn.FreeBSD.org</hostid>, is publicly
+	accessible, read-only.  That may change in the future, so users
+	are encouraged to use one of the official mirrors.  To view the
+	&os; <application>Subversion</application> repositories through
+	a browser, use <ulink
+	  url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
+
+      <note>
+	<para>The &os; svn mirror network is still in its early days, and
+	  will likely change.  Do not count on this list of mirrors being
+	  static.  In particular, the SSL certificates of the servers will
+	  likely change at some point.</para>
+      </note>
+
+      <informaltable>
+	<tgroup cols="4">
+	  <colspec colwidth="3*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="2*"/>
+	  <colspec colwidth="10*"/>
+	  <thead>
+	    <row>
+	      <entry>Name</entry>
+
+	      <entry>Protocols</entry>
+
+	      <entry>Location</entry>
+
+	      <entry>SSL fingerprint</entry>
+	    </row>
+	  </thead>
+
+	  <tbody>
+	    <row>
+	      <entry><hostid
+		  role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
+
+	      <entry>svn, <ulink
+		  url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
+		<ulink
+		  url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
+
+	      <entry>USA, California</entry>
+
+	      <entry>SHA1
+		<literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
+	    </row>
+
+	    <row>
+	      <entry><hostid
+		  role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
+
+	      <entry>svn, <ulink
+		  url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
+		<ulink
+		  url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
+
+	      <entry>USA, New Jersey</entry>
+
+	      <entry>SHA1
+		<literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </informaltable>
+
+    </sect2>
+  </sect1>
+
   <sect1 id="cvsup">
-    <title>Using CVSup</title>
+    <title>Using CVSup (Deprecated)</title>
 
     <sect2 id="cvsup-intro">
       <title>Introduction</title>
 
+      <warning>
+	<para><command>cvsup</command> has been deprecated by the
+	  project, and its use is not recommended.
+	  <application>Subversion</application> should be used
+	  instead.</para>
+      </warning>
+
       <para><application>CVSup</application> is a software package for
 	distributing and updating source trees from a master CVS
 	repository on a remote server host.  The &os; sources are
@@ -2485,6 +2394,12 @@ doc/zh_*</programlisting>
   <sect1 id="cvs-tags">
     <title>CVS Tags</title>
 
+    <warning>
+      <para>CVS has been deprecated by the project, and its use is not
+	recommended.  <application>Subversion</application> should be
+	used instead.</para>
+    </warning>
+
     <para>When obtaining or updating sources using
       <application>cvs</application> or
       <application>CVSup</application>, a revision tag must be

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 06:02:41 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EC9EF436;
 Sat, 17 Nov 2012 06:02:41 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CFA428FC08;
 Sat, 17 Nov 2012 06:02:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAH62fL8041006;
 Sat, 17 Nov 2012 06:02:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAH62fGU041005;
 Sat, 17 Nov 2012 06:02:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211170602.qAH62fGU041005@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 17 Nov 2012 06:02:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40051 -
 head/en_US.ISO8859-1/books/arch-handbook/driverbasics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 06:02:42 -0000

Author: eadler
Date: Sat Nov 17 06:02:41 2012
New Revision: 40051
URL: http://svnweb.freebsd.org/changeset/doc/40051

Log:
  Remove ancient example code from the architecture handbook.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml

Modified: head/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml	Sat Nov 17 05:26:13 2012	(r40050)
+++ head/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml	Sat Nov 17 06:02:41 2012	(r40051)
@@ -208,171 +208,7 @@ KMOD=skeleton
 
     <para>This simple example pseudo-device remembers whatever values
       you write to it and can then supply them back to you when you
-      read from it.  Two versions are shown, one for &os;&nbsp;4.X and
-      one for &os;&nbsp;5.X.</para>
-
-    <example>
-      <title>Example of a Sample Echo Pseudo-Device Driver for
-        &os;&nbsp;4.X</title>
-
-      <programlisting>/*
- * Simple `echo' pseudo-device KLD
- *
- * Murray Stokely
- */
-
-#define MIN(a,b) (((a) &lt; (b)) ? (a) : (b))
-
-#include &lt;sys/types.h&gt;
-#include &lt;sys/module.h&gt;
-#include &lt;sys/systm.h&gt;  /* uprintf */
-#include &lt;sys/errno.h&gt;
-#include &lt;sys/param.h&gt;  /* defines used in kernel.h */
-#include &lt;sys/kernel.h&gt; /* types used in module initialization */
-#include &lt;sys/conf.h&gt;   /* cdevsw struct */
-#include &lt;sys/uio.h&gt;    /* uio struct */
-#include &lt;sys/malloc.h&gt;
-
-#define BUFFERSIZE 256
-
-/* Function prototypes */
-d_open_t	echo_open;
-d_close_t	echo_close;
-d_read_t	echo_read;
-d_write_t	echo_write;
-
-/* Character device entry points */
-static struct cdevsw echo_cdevsw = {
-	echo_open,
-	echo_close,
-	echo_read,
-	echo_write,
-	noioctl,
-	nopoll,
-	nommap,
-	nostrategy,
-	"echo",
-	33,              /* reserved for lkms - /usr/src/sys/conf/majors */
-	nodump,
-	nopsize,
-	D_TTY,
-	-1
-};
-
-typedef struct s_echo {
-	char msg[BUFFERSIZE];
-	int len;
-} t_echo;
-
-/* vars */
-static dev_t sdev;
-static int count;
-static t_echo *echomsg;
-
-MALLOC_DECLARE(M_ECHOBUF);
-MALLOC_DEFINE(M_ECHOBUF, "echobuffer", "buffer for echo module");
-
-/*
- * This function is called by the kld[un]load(2) system calls to
- * determine what actions to take when a module is loaded or unloaded.
- */
-
-static int
-echo_loader(struct module *m, int what, void *arg)
-{
-	int err = 0;
-
-	switch (what) {
-	case MOD_LOAD:                /* kldload */
-		sdev = make_dev(<literal>&amp;</literal>echo_cdevsw,
-		    0,
-		    UID_ROOT,
-		    GID_WHEEL,
-		    0600,
-		    "echo");
-		/* kmalloc memory for use by this driver */
-		MALLOC(echomsg, t_echo *, sizeof(t_echo), M_ECHOBUF, M_WAITOK);
-		printf("Echo device loaded.\n");
-		break;
-	case MOD_UNLOAD:
-		destroy_dev(sdev);
-		FREE(echomsg,M_ECHOBUF);
-		printf("Echo device unloaded.\n");
-		break;
-	default:
-		err = EOPNOTSUPP;
-		break;
-	}
-	return(err);
-}
-
-int
-echo_open(dev_t dev, int oflags, int devtype, struct proc *p)
-{
-	int err = 0;
-
-	uprintf("Opened device \"echo\" successfully.\n");
-	return(err);
-}
-
-int
-echo_close(dev_t dev, int fflag, int devtype, struct proc *p)
-{
-	uprintf("Closing device \"echo.\"\n");
-	return(0);
-}
-
-/*
- * The read function just takes the buf that was saved via
- * echo_write() and returns it to userland for accessing.
- * uio(9)
- */
-
-int
-echo_read(dev_t dev, struct uio *uio, int ioflag)
-{
-	int err = 0;
-	int amt;
-
-	/*
-	 * How big is this read operation?  Either as big as the user wants,
-	 * or as big as the remaining data
-	 */
-	amt = MIN(uio-&gt;uio_resid, (echomsg-&gt;len - uio-&gt;uio_offset &gt; 0) ?
-	    echomsg-&gt;len - uio-&gt;uio_offset : 0);
-	if ((err = uiomove(echomsg-&gt;msg + uio-&gt;uio_offset,amt,uio)) != 0) {
-		uprintf("uiomove failed!\n");
-	}
-	return(err);
-}
-
-/*
- * echo_write takes in a character string and saves it
- * to buf for later accessing.
- */
-
-int
-echo_write(dev_t dev, struct uio *uio, int ioflag)
-{
-	int err = 0;
-
-	/* Copy the string in from user memory to kernel memory */
-	err = copyin(uio-&gt;uio_iov-&gt;iov_base, echomsg-&gt;msg,
-	    MIN(uio-&gt;uio_iov-&gt;iov_len, BUFFERSIZE - 1));
-
-	/* Now we need to null terminate, then record the length */
-	*(echomsg-&gt;msg + MIN(uio-&gt;uio_iov-&gt;iov_len, BUFFERSIZE - 1)) = 0;
-	echomsg-&gt;len = MIN(uio-&gt;uio_iov-&gt;iov_len, BUFFERSIZE);
-
-	if (err != 0) {
-		uprintf("Write failed: bad address!\n");
-	}
-	count++;
-	return(err);
-}
-
-DEV_MODULE(echo,echo_loader,NULL);</programlisting>
-    </example>
+      read from it.</para>
 
     <example>
       <title>Example of a Sample Echo Pseudo-Device Driver for

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 10:02:23 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78E5D7A3;
 Sat, 17 Nov 2012 10:02:23 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5E8E58FC12;
 Sat, 17 Nov 2012 10:02:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHA2N99076029;
 Sat, 17 Nov 2012 10:02:23 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHA2N2C076027;
 Sat, 17 Nov 2012 10:02:23 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201211171002.qAHA2N2C076027@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sat, 17 Nov 2012 10:02:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40052 - head/en_US.ISO8859-1/htdocs/news
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 10:02:23 -0000

Author: gavin
Date: Sat Nov 17 10:02:22 2012
New Revision: 40052
URL: http://svnweb.freebsd.org/changeset/doc/40052

Log:
  Add page detailing the FreeBSD infrastructure security compromise,
  announced November 2012.
  
  Approved by:	core, so (simon, blanket)

Added:
  head/en_US.ISO8859-1/htdocs/news/2012-compromise.xml   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/htdocs/news/Makefile

Added: head/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/news/2012-compromise.xml	Sat Nov 17 10:02:22 2012	(r40052)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "FreeBSD.org intrusion announced November 17th 2012">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>&title;</title>
+
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+  </head>
+
+  <body class="navinclude.about">
+
+    <table class="tblbasic">
+      <tbody>
+      <tr>
+	<td><h2 align="center"><a name="announce">Security Incident on
+	    FreeBSD Infrastructure</a></h2>
+
+	  <b>From:</b> FreeBSD Security Officer &lt;security-officer@FreeBSD.org&gt;<br />
+	  <b>To:</b> FreeBSD Security &lt;FreeBSD-security@FreeBSD.org&gt;<br />
+	  <b>Bcc:</b> freebsd-announce@freebsd.org, freebsd-security-notifications@FreeBSD.org<br />
+	  <b>Reply-To:</b> secteam@FreeBSD.org<br />
+	  <b>Subject:</b> Security Incident on FreeBSD Infrastructure<br />
+
+	  <p>On Sunday 11th of November, an intrusion was detected on two
+	    machines within the FreeBSD.org cluster.  The affected machines
+	    were taken offline for analysis.  Additionally, a large portion
+	    of the remaining infrastructure machines were also taken offline
+	    as a precaution.</p>
+
+	  <p>We have found no evidence of any modifications that would put
+	    any end user at risk.  However, we do urge all users to read the
+	    report available at
+	    <a href="/news/2012-compromise.html">http://www.freebsd.org/news/2012-compromise.html</a>
+	    and decide on any required actions themselves.  We will continue
+	    to update that page as further information becomes known.  We do
+	    not currently believe users have been affected given current
+	    forensic analysis, but we will provide updated information if
+	    this changes.</p>
+   
+	  <p>As a result of this event, a number of operational security
+	    changes are being made at the FreeBSD Project, in order to
+	    further improve our resilience to potential attacks.  We plan,
+	    therefore, to more rapidly deprecate a number of legacy services,
+	    such as cvsup distribution of FreeBSD source, in favour of our
+	    more robust Subversion, freebsd-update, and portsnap models.</p>
+
+	  <p>More information is available at
+	    <a href="/news/2012-compromise.html">http://wwww.freebsd.org/news/2012-compromise.html</a></p>
+
+	  <p>Saturday November 17th, 2012</p>
+	</td>
+      </tr>
+      </tbody>
+    </table>
+    <br />
+
+    <h2><a name="toc">Table of Contents</a></h2>
+
+    <ul>
+      <li><a href="#announce">Announcement</a></li>
+      <li><a href="#details">Initial Details</a></li>
+      <li><a href="#impact">What is the Impact?</a></li>
+      <li><a href="#done">What has FreeBSD.org done about this?</a></li>
+      <li><a href="#recommend">Recommendations</a></li>
+    </ul>
+
+    <p>More details will be added here as they become available.</p>
+
+    <h2><a name="details">Initial details</a></h2>
+
+    <p>On Sunday 11th November 2012, two machines within the FreeBSD.org
+      infrastructure were found to have been compromised.  These machines
+      were head nodes for the legacy third-party package building
+      infrastructure.  It is believed that the compromise may have occurred
+      as early as the 19th September 2012.</p>
+
+    <p>The compromise is believed to have occurred due to the leak of an
+      SSH key from a developer who legitimately had access to the machines
+      in question, and was not due to any vulnerability or code exploit
+      within FreeBSD.</p>
+
+    <p>To understand the impact of this compromise, you must first
+      understand that the FreeBSD operating system is divided into two
+      parts: the "base" maintained by the FreeBSD community, and a large
+      collection of third-party "packages" distributed by the Project.
+      The kernel, system libraries, compiler, core command-line tools
+      (e.g., SSH client), and daemons (e.g., sshd(8)) are all in the
+      "base".  Most information in this advisory refers only to
+      third-party packages distributed by the Project.</p>
+
+    <p>No part of the base FreeBSD system has been put at risk.  At no
+      point has the intruder modified any part of the FreeBSD base system
+      software in any way.  However, the attacker had access sufficient
+      to potentially allow the compromise of third-party packages.  No
+      evidence of this has been found during in-depth analysis, however
+      the FreeBSD Project is taking an extremely conservative view on this
+      and is working on the assumption that third-party packages generated
+      and distributed within a specific window could theoretically have
+      been modified.</p>
+
+    <h2><a name="impact">What is the Impact?</a></h2>
+
+    <p>If you are running a system that has had no third-party packages
+      installed or updated on it between the 19th September and 11th
+      November 2012, you have no reason to worry.</p>
+
+    <p>The Source, Ports and Documentation Subversion repositories have been
+      audited, and we are confident that no changes have been made to them.
+      Any users relying on them for updates have no reason to worry.</p>
+
+    <p>We have verified the state of FreeBSD packages and releases currently
+      available on ftp.FreeBSD.org.  All package sets for existing versions
+      of FreeBSD and all available releases have been validated and we can
+      confirm that the currently available packages and releases have not
+      been modified in any way.</p>
+
+    <p>A package set for the upcoming FreeBSD 9.1-RELEASE had been uploaded
+      to the FTP distribution sites in preparation for 9.1-RELEASE.  We are
+      unable to verify the integrity of this package set, and therefore it
+      has been removed and will be rebuilt.  Please note that as these
+      packages were for a future release, the standard <q>pkg_add -r</q>
+      tools to install packages could not have downloaded these packages
+      unless they were requested explicitly.</p>
+
+    <p>We unfortunately cannot guarantee the integrity of any packages
+      available for installation between 19th September 2012 and 11th
+      November 2012, or of any ports compiled from trees obtained via any
+      means other than through svn.freebsd.org or one of its mirrors.
+      Although we have no evidence to suggest any tampering took place
+      and believe such interference is unlikely, we have to recommend you
+      consider reinstalling any machine from scratch, using trusted
+      sources.</p>
+
+    <p>We can confirm that the freebsd-update(8) binary upgrade mechanism is
+      unaffected, as it uses an entirely separate infrastructure.  We have
+      also verified that the most recently-available portsnap(8) snapshot
+      matches the ports Subversion repository, and so can be fully trusted.
+      Please note that as a precaution, newer portsnap(8) snapshots are
+      currently not being generated.</p>
+
+    <h2><a name="done">What has FreeBSD.org done about this?</a></h2>
+
+    <p>As soon as the incident came to light, the FreeBSD Cluster
+      Administration team took the following actions:</p>
+
+    <ul>
+      <li>Power down the compromised machines.</li>
+      <li>Power down all machines on which the attacker may have had
+        access.</li>
+      <li>Audit the SVN and Perforce repositories to:
+	<ul>
+	  <li>Verify that there had been no server intrusion.</li>
+	  <li>Verify that no malicious commits had been made to the
+	    repository.</li>
+	  <li>Verify that the SVN repository exactly matched a known-clean
+	    off-site copy.</li>
+	  </ul>
+	</li>
+      <li>Verify that all FreeBSD base release media and install files on
+	the master FTP distribution sites are clean.</li>
+      <li>Verify all package sets available have checksums that match
+	known-good copies stored off-site.</li>
+      <li>The package set built for the upcoming 9.1-RELEASE did not have
+	an offsite backup to verify against.  These have been deleted, and
+	will be rebuilt before 9.1 is released.</li>
+      <li>All suspect machines are being either reinstalled, retired, or
+	thoroughly audited before being brought back online.</li>
+    </ul>
+
+    <h2><a name="recommend">At this time, we recommend:</a></h2>
+
+    <ul>
+      <li>If you use the already-deprecated cvsup/csup distribution
+	mechanisms, you should stop now.</li>
+      <li>If you were using cvsup/csup for ports, you should switch to
+	portsnap(8) right away.  ports developers should be using
+	Subversion already.  Further information on preferred mechanisms
+	for obtaining and updating the ports tree can be found at
+	<a href="/doc/handbook/ports-using.html">
+	  http://www.freebsd.org/doc/handbook/ports-using.html</a></li>
+      <li>If you were using cvs/anoncvs/cvsup/csup for src, you should
+	consider either freebsd-update(8) for signed binary distribution
+	or Subversion for source.  Please see the chapter on <a
+	  href="/doc/handbook/updating-upgrading.html">updating
+	FreeBSD from source</a> in the handbook.  Further details on
+	using Subversion and a list of official mirrors can be found
+	at <a href="/doc/handbook/svn.html">
+	  http://www.freebsd.org/doc/handbook/svn.html</a></li>
+      <li>If you use portsnap(8), you should <tt>portsnap fetch &amp;&amp;
+	portsnap extract</tt> to the most recent snapshot.  The most recent
+	portsnap(8) snapshot has been verified to exactly match the audited
+	Subversion repository.  Please note that as a precaution, portsnap(8)
+	updates have been suspended temporarily.</li>
+      <li>Follow best practice security policies to determine how your
+	organization may be affected.</li>
+      <li>Conduct an audit of your system that uses FreeBSD.org provided
+	binary packages. Anything that may have been installed during the
+	affected period should be considered suspect.  Although we have no
+	evidence of any tampering of any packages, you may wish to consider
+	rebuilding any affected machine from scratch, or if that is not
+	possible, rebuild your ports/packages.</li>
+      </ul>
+
+    <p>If you have any further questions about this announcement, please
+      contact the <a href="mailto:FreeBSD-security@FreeBSD.org">
+	FreeBSD-security@FreeBSD.org</a> mailing list, or for questions
+      where public mailing list distribution is inappropriate,
+      please contact the <a href="mailto:secteam@FreeBSD.org">FreeBSD
+	Security Team</a>.</p>
+
+    <p>This page will be updated as further information is known.</p>
+  </body>
+</html>

Modified: head/en_US.ISO8859-1/htdocs/news/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/Makefile	Sat Nov 17 06:02:41 2012	(r40051)
+++ head/en_US.ISO8859-1/htdocs/news/Makefile	Sat Nov 17 10:02:22 2012	(r40052)
@@ -24,6 +24,9 @@ DOCS+= press-rel-9.xml
 # The yearly State of the Union address
 DOCS+= sou1999.xml
 
+# Details of the FreeBSD.org 2012 Infrastructure compromise
+DOCS+= 2012-compromise.xml
+
 INDEXLINK= news.html
 
 DEPENDSET.DEFAULT=	transtable news press

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 10:30:32 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B689A404;
 Sat, 17 Nov 2012 10:30:32 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9CAD88FC08;
 Sat, 17 Nov 2012 10:30:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHAUWpv080679;
 Sat, 17 Nov 2012 10:30:32 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHAUWxt080678;
 Sat, 17 Nov 2012 10:30:32 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201211171030.qAHAUWxt080678@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sat, 17 Nov 2012 10:30:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40053 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 10:30:32 -0000

Author: gavin
Date: Sat Nov 17 10:30:32 2012
New Revision: 40053
URL: http://svnweb.freebsd.org/changeset/doc/40053

Log:
  Add newsflash relating to recent FreeBSD Infrastructure Security alert.
  
  Approved by:	core, so (simon, blanket)

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sat Nov 17 10:02:22 2012	(r40052)
+++ head/share/xml/news.xml	Sat Nov 17 10:30:32 2012	(r40053)
@@ -34,6 +34,22 @@
       <name>11</name>
 
       <day>
+	<name>17</name>
+
+	<event>
+	  <title>Security Incident on FreeBSD Infrastructure</title>
+
+	  <p>On Sunday 11th of November, an intrusion was detected on
+	    two machines within the FreeBSD.org cluster. We have found
+	    no evidence of any modifications that would put any end user
+	    at risk. However, we do urge all users to read the report
+	    available at <a href="/news/2012-compromise.html">
+	      http://www.freebsd.org/news/2012-compromise.html</a> and
+	    decide on any required actions themselves.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>5</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 11:03:58 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EA20B187;
 Sat, 17 Nov 2012 11:03:58 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B5E558FC15;
 Sat, 17 Nov 2012 11:03:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHB3wv5085709;
 Sat, 17 Nov 2012 11:03:58 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHB3wdq085708;
 Sat, 17 Nov 2012 11:03:58 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201211171103.qAHB3wdq085708@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sat, 17 Nov 2012 11:03:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40054 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 11:03:59 -0000

Author: gavin
Date: Sat Nov 17 11:03:58 2012
New Revision: 40054
URL: http://svnweb.freebsd.org/changeset/doc/40054

Log:
  Replace the note regarding issues with GNATS etc with a link to the
  report page on the recent infrastructure security issue.
  
  Approved by:	core, so (simon, blanket)

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl	Sat Nov 17 10:30:32 2012	(r40053)
+++ head/en_US.ISO8859-1/htdocs/index.xsl	Sat Nov 17 11:03:58 2012	(r40054)
@@ -63,15 +63,39 @@
 				  id="txtfrontfeaturelink"> &#187;<a
 				  href="&base;/about.html"
 				  title="Learn More">Learn More</a>
+				  </div> <!-- TXTFRONTFEATURELINK -->
 
-				<p>The &os; cluster is undergoing
-				  maintenance which may interfere
-				  with some services such as the
-				  GNATS PR system.  We apologize for
-				  any inconvenience this may
-				  cause.</p>
+				  <div
+				    style="width:640px; margin: 16px 16px 16px 32px; auto">
+
+				    <h1>Security Warning</h1>
+
+				    <p align="justify">On Sunday
+				      11th of November, an intrusion
+				      was detected on two machines
+				      within the FreeBSD.org cluster.
+				      The affected machines were taken
+				      offline for analysis.
+				      Additionally, a large portion of
+				      the remaining infrastructure
+				      machines were also taken offline
+				      as a precaution.</p>
+
+				    <p align="justify">We have found
+				      no evidence of any modifications
+				      that would put any end user at
+				      risk, and as a result we do not
+				      believe that any end users have
+				      been affected.  However, we do
+				      urge all users to read the <a
+					href="&base;/news/2012-compromise.html">
+					report</a> and decide on any
+				      required actions themselves.
+				      We will continue to update that
+				      page as further information
+				      becomes known.</p>
+				  </div>
 
-				  </div> <!-- TXTFRONTFEATURELINK -->
 			  </div> <!-- FRONTFEATURECONTENT -->
 		  </div> <!-- FRONTFEATURELEFT -->
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 15:27:12 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0BFB21D9;
 Sat, 17 Nov 2012 15:27:12 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E66AE8FC12;
 Sat, 17 Nov 2012 15:27:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHFRBHG028079;
 Sat, 17 Nov 2012 15:27:11 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHFRBR5028078;
 Sat, 17 Nov 2012 15:27:11 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201211171527.qAHFRBR5028078@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sat, 17 Nov 2012 15:27:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40055 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 15:27:12 -0000

Author: ehaupt (ports committer)
Date: Sat Nov 17 15:27:11 2012
New Revision: 40055
URL: http://svnweb.freebsd.org/changeset/doc/40055

Log:
  Update my key

Modified:
  head/share/pgpkeys/ehaupt.key

Modified: head/share/pgpkeys/ehaupt.key
==============================================================================
--- head/share/pgpkeys/ehaupt.key	Sat Nov 17 11:03:58 2012	(r40054)
+++ head/share/pgpkeys/ehaupt.key	Sat Nov 17 15:27:11 2012	(r40055)
@@ -1,41 +1,63 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh ehaupt C06D09BE;
+sh ./addkey.sh ehaupt 329A273C;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/C06D09BE 2010-09-24 [expires: 2011-09-24]
-      Key fingerprint = CC88 5081 78D1 39C3 B467  865A 348E F6CC C06D 09BE
+pub   3072D/329A273C 2012-11-17 [expires: 2013-11-17]
+      Key fingerprint = 920C A49A 5A23 F9E3 4EB0  4387 AB90 5C56 329A 273C
 uid                  Emanuel Haupt <ehaupt@FreeBSD.org>
-sub   2048R/F658659F 2010-09-24 [expires: 2011-09-24]
+sub   3072g/70183B96 2012-11-17 [expires: 2013-11-17]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBEyc9+EBCAC5T1xdwPOdncmPh/T+n7l1azphl7haKdpfIrAdCaJFxQIHFqde
-S4hpq/+KKUDAVOGTCn/Cvz0GPd00EgOiR4gBxhQKYSFnVoEGVxxPUX+r9ABZs6fc
-8FCP1enBhlHfuO0pwt2139vagEQC30MlOr35OMVYlB+2tX+CVe5yVZU6S0ZA1u3H
-YHnGHpFweC/VmTFmwVV7g8OtsV0uC7VxWiNLITSmUYyJ2L0B8Lkne2lFzWnUMtC1
-PnOzRFiioM62jiWWLUwHP2vcky838rQ4ICnzpHPvkZv+/YvXsFni/z/hCa3Oqu0O
-zSofjPu60NtNzZdB4F3bVEdWwRWGYzDvjQJ/ABEBAAG0IkVtYW51ZWwgSGF1cHQg
-PGVoYXVwdEBGcmVlQlNELm9yZz6JAT4EEwECACgFAkyc9+ECGwMFCQHhM4AGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEDSO9szAbQm+S7UH/AnqrRmTZwHIq1VB
-aawX61ejWxfoY1glx4jEG82AEp6MsEMc9p+wIBpwE4ww+trRqdlDmBqsrL5PBdHu
-MxVW3zlH7KLIkjUj7lWJw6Ifhq05bqh1+KbLOb2iM+8h3k65IH1nVjnCwAqVX8Ev
-CGa46w4kKOqCcmYDgbYJFYm3b8dwy4TO1haMfsN1zbcUgKgWa63l0TIcns4Ux5pK
-ZEF9iV1uJ5GHXyLl4vqdaYtGd6Tj2pO90zfLPUWAXpI23/q1X4CrsDOD8kDpjT6v
-JuRfQOiwkjpVEOgo2btLArX9Tvu2tmPFbstvwUaZByf0V03c19DVasg33vOaYOcr
-UsTxfZS5AQ0ETJz34QEIAMBygTWtv/grv0Z6U7WoWqRtbH++8jb1reZezLaw81sP
-O6wf0f37VxZi9SzTgLcyLx4bJ4vYHKD9QcvzE8Q6szLayMg5tIVVL8roonmLjFgC
-JdGVOBwsgLWpZ/gE/xBIB2kHaNcr87HMYkZmz8JHsUNFJh0mV0cgWxNzezcH+NCy
-NyKH5qtb6PNSR5u6IOqkqhX7vWRRawYcedI8IM62VZO8nob8kXcOwrYxYh3KJhVl
-URaWRdZnznFGBTQXt3md/EsBFB90O3dsfuBxH9M95oNnKa/VaTD0gRHHyysaLbmk
-ukd1zvxSxlPRVCaYDTgU/ndl2HxsrTkA2y8qCUKm2V0AEQEAAYkBJQQYAQIADwUC
-TJz34QIbDAUJAeEzgAAKCRA0jvbMwG0JvkHWB/4pW83qa4YmXI1FdD44/jlVHvPC
-gU+fGmvaG1/1zD3oJd8C4502VdrUvyOc/NtQ9Bgjku51OvzwfIQYiYFY9Aq+xBAz
-2FQQAKj6JaIzx4DQD53AnoWo3UqA34Wtn+YUZzv6zfnXIpJw2QnL4tFyY0WNFJuF
-r9j4JZYYZEwsUbL73EcRRJqbVpJMRgE2P7CmiJYFDxygx276pBTUv2jSO9zWK3Hi
-pwxY7Q1YlRzSfRN0TLb49A85DZWG2OqDIVJew2+fP+wjHQndNF6xuINNkZ9K7hyr
-i+WSZkZBLbU2Uk3tyfAHoO8OywmSK2vKYFjmYpkqiyx530/oOqSiSoOPrLfW
-=7z/9
+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
+=MqAu
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 17:30:20 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4300F9FF;
 Sat, 17 Nov 2012 17:30:20 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1ECB08FC0C;
 Sat, 17 Nov 2012 17:30:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHHUJHN047903;
 Sat, 17 Nov 2012 17:30:19 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHHUJ13047902;
 Sat, 17 Nov 2012 17:30:19 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201211171730.qAHHUJ13047902@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 17 Nov 2012 17:30:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40056 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 17:30:20 -0000

Author: kib (src committer)
Date: Sat Nov 17 17:30:19 2012
New Revision: 40056
URL: http://svnweb.freebsd.org/changeset/doc/40056

Log:
  Commit my new key, signed with the old one.

Modified:
  head/share/pgpkeys/kib.key

Modified: head/share/pgpkeys/kib.key
==============================================================================
--- head/share/pgpkeys/kib.key	Sat Nov 17 15:27:11 2012	(r40055)
+++ head/share/pgpkeys/kib.key	Sat Nov 17 17:30:19 2012	(r40056)
@@ -1,53 +1,95 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh kib DD4C6F88;
+sh ./addkey.sh kib C1BCAD41;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/DD4C6F88 2004-07-29
-      Key fingerprint = 39DA E615 A45C 111D 777B  3AD0 0B7F 8C04 DD4C 6F88
-uid                  Konstantin Belousov <kib@freebsd.org>
-uid                  Konstantin Belousov <konstantin.belousov@zoral.com.ua>
-uid                  Kostik Belousov <kostikbel@ukr.net>
-uid                  Kostik Belousov <kostikbel@gmail.com>
-sub   2048g/18488597 2004-07-29
+pub   4096R/C1BCAD41 2012-11-17
+      Key fingerprint = 7DE0 3388 64AC 53C3 7B88  3A79 90C2 B92B C1BC AD41
+uid                  Konstantin Belousov <kib@FreeBSD.org>
+uid                  Konstantin Belousov <kostikbel@gmail.com>
+uid                  Konstantin Belousov <kib@kib.kiev.ua>
+sub   4096R/3BBC8F64 2012-11-17
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEEIq/MRBADOl8+kLZyTRb2xRJmgwq0a0xIPuQxBvUa3Ac7T2d3r0mCXQAni
-MG6IoSxnTGhZd8JRMya03RNAEFDFIxozgBh7tWOBfCxWB5KHS6F2PfXoWpHz6APL
-9d1eSu8qMMJ0aHCk5icZdhMWlviFMwyl2x+VhJKsxpRbrU1hbWd27x6ouwCg+AD7
-cPohqZoWEAlbS9Pc0elxsq0EAJw4lcIrlUCc7Z9G0e92HXc4IyeTswv5is/yDz9g
-7LUyp1qJbqggV2LGtjTqit1ldccIB4D4N7afokMQiye1zAyntpPcef+oIBf4zFr0
-KmSnG0IgaUm8fpZJ/qumOkU8GX2SYiKUQtMQ1xdbnCQaRdOjC796C7PKgK7QDD7+
-qbLhBAC2ysSQZ824HHS1EN48NlV25vV9HBIag1VwUVmO7IVGHdxZKFfnyXrtiQmq
-wpb3okcsCls5x1QQsT54095kP20UrYDHho8yndB1bPRlLnAhtJQpGVTQ7P44ab1A
-SxIcp+gvgIoHFKRVsj949uhn7vcbzJEe15whWTj06WckVmuCL7Q2S29uc3RhbnRp
-biBCZWxvdXNvdiA8a29uc3RhbnRpbi5iZWxvdXNvdkB6b3JhbC5jb20udWE+iGAE
-ExECACAFAkM9SpYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRALf4wE3Uxv
-iJ7ZAKCj7lMo10TeSyCYE3Y6/dr9RnqAtwCfZro6JLEIqa60+ef1NyHxscvQ0ce0
-I0tvc3RpayBCZWxvdXNvdiA8a29zdGlrYmVsQHVrci5uZXQ+iF4EExECAB4FAkEI
-q/MCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQC3+MBN1Mb4jQewCeJmg8ftV4
-x7l2AoSAPsIDoQgXZFkAn0v/zBXhfjFoDcMK0cJTyPhYm4vptCVLb3N0aWsgQmVs
-b3Vzb3YgPGtvc3Rpa2JlbEBnbWFpbC5jb20+iGAEExECACAFAkM9SmQCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRALf4wE3UxviMLdAKD2lvxZqIpK4J8s7f5g
-HZ/BeoqkLgCeMoiVpODH3W1jp7WmIAcPTX27OEe0JUtvbnN0YW50aW4gQmVsb3Vz
-b3YgPGtpYkBmcmVlYnNkLm9yZz6IYAQTEQIAIAUCRIECYwIbAwYLCQgHAwIEFQII
-AwQWAgMBAh4BAheAAAoJEAt/jATdTG+IhlkAoIR7laQrFh1QrZlIG95dj2oFOwDa
-AJ9rpiIgeCaPJZKediKAWDCaJ81IXLkCDQRBCKwAEAgAksTzLKLHecQ1G1mHaw0D
-5E4YmadGDnx/K4abjzzINUP033VgKdMXe3ocJOI4YeALGzhoFAjj3s5VvFqgUL8B
-8xBn5r2vSGLe1WZCZmq5kzfls7E1I6TSQSRqIm2CRBYzSAFaqs5uaOPGMZ+fSfYO
-W11wtIChNJBDVhO5YgRKJlxhMCaLTTH6qB1ZCrSswIFLgApssTUHcHW32eh9qxQW
-U7XD7MjMbkbr1Ig1scaGkjUGLoIHboqFYDS8sLMaJp/RUyflAbzizL3vI7G3i4jP
-zBLPrWnnhVDPWGJptuPedyFU2ZtgX4E+txP9yDoOrcjBgJEj5JAO+nTMIoabxtXR
-lwADBQf+JdFUtGznzSmMgjfjW1N1cuM8xe2JBA1TRx6Bg3Kn6bVixmpRBOxQ3gtl
-k+o2dOHZtPtB22J9IMsc72fAFHpDqogm5ADN+PdtHsjWYS4U64Pg008VYc+IWSXx
-fqLLRK3luwDFn9mpvgcWc8yue8Di4jZ+SojNtmvSSRofm8ruf+6uJS6EPUz9dzH2
-PcMqhI0+nJMn20Zeq4g84g4G2KUEo1Y+ruL4iUUQcVRTWIBHw4jkFdGdMG5z/2Ao
-myeZ35IoHFJF3NoY/H6/ZrBe2D2qbY4CsrvCutUEKIKtJqTHSB80pJS7hdlSH269
-3SSIuof00KCuWbrWQvGp3Mpx9kp76IhJBBgRAgAJBQJBCKwAAhsMAAoJEAt/jATd
-TG+I/pEAnA+MZs48oSlZF452F1xW9q75hhGVAKCzW5aFbJsAnJClz8JS27TynnPd
-CQ==
-=EJ3p
+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
+Z3HzdaVN+w==
+=+dQH
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 17 19:22:37 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4D6AFC32;
 Sat, 17 Nov 2012 19:22:37 +0000 (UTC)
 (envelope-from deischen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32A1E8FC0C;
 Sat, 17 Nov 2012 19:22:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHJMbJO066944;
 Sat, 17 Nov 2012 19:22:37 GMT
 (envelope-from deischen@svn.freebsd.org)
Received: (from deischen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHJMbt4066941;
 Sat, 17 Nov 2012 19:22:37 GMT
 (envelope-from deischen@svn.freebsd.org)
Message-Id: <201211171922.qAHJMbt4066941@svn.freebsd.org>
From: Daniel Eischen <deischen@FreeBSD.org>
Date: Sat, 17 Nov 2012 19:22:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40057 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 19:22:37 -0000

Author: deischen (src,ports committer)
Date: Sat Nov 17 19:22:36 2012
New Revision: 40057
URL: http://svnweb.freebsd.org/changeset/doc/40057

Log:
  Add my PGP key.

Added:
  head/share/pgpkeys/deischen.key   (contents, props changed)
Modified:
  head/share/pgpkeys/pgpkeys-developers.xml
  head/share/pgpkeys/pgpkeys.ent

Added: head/share/pgpkeys/deischen.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/deischen.key	Sat Nov 17 19:22:36 2012	(r40057)
@@ -0,0 +1,63 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh deischen 7D15560B;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   4096R/7D15560B 2012-11-17
+      Key fingerprint = 0039 2133 69CA 14D3 236A  E331 361A 68B2 7D15 560B
+uid                  Daniel Eischen <deischen@FreeBSD.org>
+sub   4096R/A51F81F7 2012-11-17
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+bwlGxw==
+=J3ZL
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Sat Nov 17 17:30:19 2012	(r40056)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Sat Nov 17 19:22:36 2012	(r40057)
@@ -416,6 +416,11 @@
       &pgpkey.peadar;
     </sect2>
 
+    <sect2 id="pgpkey-deischen">
+      <title>&a.deischen;</title>
+      &pgpkey.deischen;
+    </sect2>
+
     <sect2 id="pgpkey-josef">
       <title>&a.josef;</title>
       &pgpkey.josef;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Sat Nov 17 17:30:19 2012	(r40056)
+++ head/share/pgpkeys/pgpkeys.ent	Sat Nov 17 19:22:36 2012	(r40057)
@@ -92,6 +92,7 @@
 <!ENTITY pgpkey.dcs SYSTEM "dcs.key">
 <!ENTITY pgpkey.dd SYSTEM "dd.key">
 <!ENTITY pgpkey.decke SYSTEM "decke.key">
+<!ENTITY pgpkey.deischen SYSTEM "deischen.key">
 <!ENTITY pgpkey.delphij SYSTEM "delphij.key">
 <!ENTITY pgpkey.demon SYSTEM "demon.key">
 <!ENTITY pgpkey.den SYSTEM "den.key">