From owner-svn-doc-head@FreeBSD.ORG  Sun Feb 24 01:11:16 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DDF949C5;
 Sun, 24 Feb 2013 01:11:16 +0000 (UTC)
 (envelope-from gkeramidas@gmail.com)
Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45])
 by mx1.freebsd.org (Postfix) with ESMTP id A7AC7D48;
 Sun, 24 Feb 2013 01:11:15 +0000 (UTC)
Received: by mail-wg0-f45.google.com with SMTP id dq12so1522264wgb.12
 for <multiple recipients>; Sat, 23 Feb 2013 17:11:14 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:sender:date:from:to:cc:subject:message-id:references
 :mime-version:content-type:content-disposition
 :content-transfer-encoding:in-reply-to;
 bh=sh3WAgK8z/TFfQ815YlGVtfYXd8hrezBWZgtstem12c=;
 b=CENc4C8MPshjtZZb4nSXRDngFjBWKUT/MVzxiNCPAgR8oahjq9l3J+xSvgMd9n2vYS
 0vedhQ0xSwh9A7c5cPWbv6ySzuwpaU53eHyrLtJRoFpQd9zeGgA62ioU5Bm38jNN4+iM
 mYIxAp2iX0IE5fGovCqadcF4RVny8FLlNHB6lNekOZHJp7sFYBVryX6b51JwBJfdX8Br
 pj1QuiHnOQxPxxnFhFmSOc3DqeW7sB88+2mLFG2fRBXqeMqh6MO++UFzYBDfdUvT6sy5
 WNKJd8qBP3wqEu+UF8P5R2tHNsaj4mEDP78PIuwsJ7lcP1mHyD37xlYHsXDE/aj54oNO
 7FfQ==
X-Received: by 10.194.58.202 with SMTP id t10mr11378267wjq.4.1361668274705;
 Sat, 23 Feb 2013 17:11:14 -0800 (PST)
Received: from saturn (217-162-217-29.dynamic.hispeed.ch. [217.162.217.29])
 by mx.google.com with ESMTPS id du2sm6556163wib.0.2013.02.23.17.11.12
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Sat, 23 Feb 2013 17:11:13 -0800 (PST)
Sender: Giorgos Keramidas <gkeramidas@gmail.com>
Date: Sun, 24 Feb 2013 02:11:09 +0100
From: Giorgos Keramidas <keramida@FreeBSD.org>
To: Eitan Adler <eadler@FreeBSD.org>
Subject: Re: svn commit: r40985 - head/en_US.ISO8859-1/htdocs/projects
Message-ID: <20130224011108.GB10994@saturn>
References: <201302161636.r1GGaMOI055230@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <201302161636.r1GGaMOI055230@svn.freebsd.org>
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: Sun, 24 Feb 2013 01:11:17 -0000

On 2013-02-16 16:36, Eitan Adler <eadler@FreeBSD.org> wrote:
> Author: eadler
> Date: Sat Feb 16 16:36:22 2013
> New Revision: 40985
> URL: http://svnweb.freebsd.org/changeset/doc/40985
> 
> Log:
>   Remove ancient things.

Slightly belated comments.  I just caught up with doc-commit email
though, so please bear with me.

> Modified: head/en_US.ISO8859-1/htdocs/projects/newbies.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Sat Feb 16 16:36:19 2013	(r40984)
> +++ head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Sat Feb 16 16:36:22 2013	(r40985)
> @@ -78,13 +78,6 @@
>            <a href="http://www.awfulhak.org/ppp.html">ppp page</a>
>            for links to the other valuable information and the latest updates.</p></li>
>  
> -      <li><p><a name="cfbsd" href="http://www.lemis.com/grog/Documentation/CFBSD/">The
> -	    Complete &os;</a> by Greg Lehey, published by O'Reilly.
> -	  This book assumes minimal UNIX experience and takes the
> -	  beginner step by step through each stage from installation to
> -	  everything you need to know to set up and run a &os; system. You
> -	  also get to understand what you are doing and why.</p></li>

This is still a book that is available online and may serve a useful
purpose for people who are entirely new to BSD.  Maybe we should have a
section for 'historical documentation' and move this book there?

> -      <li><p>The main newsgroup for &os; is <a
> -	    href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a>.
> -	  You might want to keep an eye on <a
> -	    href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
> -	  as well.</p></li>

I still use comp.unix.bsd.freebsd.misc and it is moderately active.  It
doesn't have the traffic that it used to have a decade ago, but I think
removing it altogether is a bit bad.

For example here's what I saw this morning when I opened the group:

,-----------------------------------------------------------------------
| . 2013-02-22  Andrew Falanga       (    0) Re: Trouble making an EFI System Partition on my USB thumb drive
| . 2013-02-23  Torfinn Ingolfsen    (   11) ╰─▶ Re: Trouble making an EFI System Partition on my USB thumb drive
| . 2013-02-22  Tim Daneliuk         (   50) [ANN]: ’tsshbatch’, Batch ssh Tool, Version 1.137 Released
`------------------------------------------------------------------------

So there are still a few people who find the newsgroups useful.  On the
other hand maybe new users are now completely disconnected from Usenet
and newsgroups and this is just me being an old-fart.

I'm not entirely sure if I want to keep *all* references to Usenet
groups.  But seeing 'comp.unix.bsd.freebsd.misc' go made me a bit sad.

From owner-svn-doc-head@FreeBSD.ORG  Sun Feb 24 16:58:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A2B537B2;
 Sun, 24 Feb 2013 16:58:05 +0000 (UTC) (envelope-from dru@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 7D93E9AD;
 Sun, 24 Feb 2013 16:58:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1OGw5Me010325;
 Sun, 24 Feb 2013 16:58:05 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1OGw5KI010324;
 Sun, 24 Feb 2013 16:58:05 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302241658.r1OGw5KI010324@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Sun, 24 Feb 2013 16:58:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41037 - head/en_US.ISO8859-1/books/handbook/users
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, 24 Feb 2013 16:58:05 -0000

Author: dru
Date: Sun Feb 24 16:58:04 2013
New Revision: 41037
URL: http://svnweb.freebsd.org/changeset/doc/41037

Log:
  Minor rewording.
  
  Submitted by:  bjk, wblock
  Approved by:  gjb

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

Modified: head/en_US.ISO8859-1/books/handbook/users/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/users/chapter.xml	Sat Feb 23 14:50:24 2013	(r41036)
+++ head/en_US.ISO8859-1/books/handbook/users/chapter.xml	Sun Feb 24 16:58:04 2013	(r41037)
@@ -156,9 +156,9 @@
 
 	<listitem>
 	  <para>By default &os; does not force users to change their
-	    passwords periodically.  This can be enforced on a
-	    per-user basis, forcing some or all users to change their
-	    passwords after a certain amount of time has
+	    passwords periodically.  Password expiration can be
+	    enforced on a per-user basis, forcing some or all users to
+	    change their passwords after a certain amount of time has
 	    elapsed.</para>
 	</listitem>
       </varlistentry>
@@ -683,9 +683,10 @@ passwd: done</screen>
       <secondary>quotas</secondary>
     </indexterm>
     <indexterm><primary>disk quotas</primary></indexterm>
-    <para>Disk quotas limit disk usage to users and provide a way to
-      quickly check that usage without calculating it every time.
-      Quotas are discussed in <link linkend="quotas"></link>.</para>
+    <para>Disk quotas limit the amount of disk space available to
+      users and provide a way to quickly check that usage without
+      calculating it every time.  Quotas are discussed in <link
+	linkend="quotas"></link>.</para>
 
     <para>The other resource limits include ways to limit the amount
       of CPU, memory, and other resources a user may consume.  These
@@ -705,7 +706,7 @@ passwd: done</screen>
       identifier and <replaceable>value</replaceable> is an arbitrary
       string which is processed accordingly depending on the
       <replaceable>name</replaceable>.  Setting up login classes and
-      capabilities is rather straight-forward and is also described in
+      capabilities is rather straightforward and is also described in
       &man.login.conf.5;.</para>
 
     <note>
@@ -825,8 +826,8 @@ passwd: done</screen>
 	  <para>The maximum amount of memory a process may request
 	    to be locked into main memory using &man.mlock.2;.  Some
 	    system-critical programs, such as &man.amd.8;, lock into
-	    main memory so that in the event of being swapped out,
-	    they do not contribute to disk thrashing.</para>
+	    main memory so that if the system begins to swap, they do
+	    not contribute to disk thrashing.</para>
 	</listitem>
       </varlistentry>
 
@@ -852,7 +853,7 @@ passwd: done</screen>
 	  <indexterm><primary>limiting users</primary>
 	    <secondary>openfiles</secondary>
 	  </indexterm>
-	  <para>The maximum amount of files a process may have open.
+	  <para>The maximum number of files a process may have open.
 	    In &os;, files are used to represent sockets and IPC
 	    channels, so be careful not to set this too low.  The
 	    system-wide limit for this is defined by the

From owner-svn-doc-head@FreeBSD.ORG  Sun Feb 24 22:19:55 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 48CCB42C;
 Sun, 24 Feb 2013 22:19:55 +0000 (UTC)
 (envelope-from keramida@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 2BF718EF;
 Sun, 24 Feb 2013 22:19:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1OMJsLq008154;
 Sun, 24 Feb 2013 22:19:54 GMT
 (envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1OMJsbV008153;
 Sun, 24 Feb 2013 22:19:54 GMT
 (envelope-from keramida@svn.freebsd.org)
Message-Id: <201302242219.r1OMJsbV008153@svn.freebsd.org>
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Sun, 24 Feb 2013 22:19:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41038 - 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, 24 Feb 2013 22:19:55 -0000

Author: keramida
Date: Sun Feb 24 22:19:53 2013
New Revision: 41038
URL: http://svnweb.freebsd.org/changeset/doc/41038

Log:
  Expand a bit the description of a LOR and what witness does
  
  While here try to explain a bit why a deadlock could happen when
  witness(4) reports a ’lock order reversal’ and why ’reversal’ is
  an important part of the deadlock-related warning.
  
  Approved by:    gjb (mentor)
  Reviewed by:   eadler

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 Feb 24 16:58:04 2013	(r41037)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Feb 24 22:19:53 2013	(r41038)
@@ -2494,18 +2494,37 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	<answer>
 	  <para>The &os; kernel uses a number of resource locks to
-	    arbitrate contention for certain resources.  A run-time
-	    lock diagnostic system found in &os.current; kernels
-	    (but removed for releases), called &man.witness.4;,
-	    detects the potential for deadlocks due to locking errors.
-	    (It is possible to get false positives, as &man.witness.4;
-	    is slightly conservative.) A true positive report
-	    indicates that "if you were unlucky, a deadlock would have
-	    happened here">.</para>
-
-	  <para>Problematic <acronym>LOR</acronym>s tend to get fixed
-	    quickly, so check &a.current.url; before posting to the
-	    mailing lists.</para>
+	    arbitrate contention for certain resources.  When multiple
+	    kernel threads try to obtain multiple resource locks,
+	    there's always the potential for a deadlock,
+	    where two threads have each obtained one of the locks and
+	    blocks forever waiting for the other thread to release one
+	    of the other locks.  This sort of locking problem can be
+	    avoided if all threads obtain the locks in the same
+	    order.</para>
+
+	  <para>A run-time lock diagnostic system called &man.witness.4;,
+	    enabled in &os.current; and disabled by default for stable
+	    branches and releases, detects the potential for deadlocks due to
+	    locking errors, including errors caused by obtaining multiple
+	    resource locks with a different order from different parts of the
+	    kernel.  The &man.witness.4; framework tries to detect this
+	    problem as it happens, and reports it by printing a message to the
+	    system console about a <errorname>lock order reversal</errorname>
+	    (often referred to also as <acronym>LOR</acronym>).</para>
+
+	  <para>It is possible to get false positives, as &man.witness.4;
+	    is conservative.  A true positive report <emphasis>does
+	      not</emphasis> mean that a system is dead-locked; instead
+	    it should be understood as a warning of the form <quote>if
+	      you were unlucky, a deadlock would have happened
+	      here</quote>.</para>
+
+	  <note>
+	    <para>Problematic <acronym>LOR</acronym>s tend to get fixed
+	      quickly, so check &a.current.url; before posting to the
+	      mailing lists.</para>
+	  </note>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 25 14:08:47 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EA289D37;
 Mon, 25 Feb 2013 14:08:47 +0000 (UTC)
 (envelope-from issyl0@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 DC615EAA;
 Mon, 25 Feb 2013 14:08:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1PE8lwc095239;
 Mon, 25 Feb 2013 14:08:47 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1PE8ltu095238;
 Mon, 25 Feb 2013 14:08:47 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201302251408.r1PE8ltu095238@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Mon, 25 Feb 2013 14:08:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41039 - head/en_US.ISO8859-1/htdocs/advocacy
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, 25 Feb 2013 14:08:48 -0000

Author: issyl0
Date: Mon Feb 25 14:08:47 2013
New Revision: 41039
URL: http://svnweb.freebsd.org/changeset/doc/41039

Log:
  Link to the list of status reports from the advocacy page of the website.
  
  Approved by:	gabor (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/advocacy/index.xml

Modified: head/en_US.ISO8859-1/htdocs/advocacy/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/advocacy/index.xml	Sun Feb 24 22:19:53 2013	(r41038)
+++ head/en_US.ISO8859-1/htdocs/advocacy/index.xml	Mon Feb 25 14:08:47 2013	(r41039)
@@ -29,6 +29,11 @@
     <h2>Web resources</h2>
 
     <ul>
+	<li><p><a href="&base;/news/status/status.html">FreeBSD quarterly status reports</a></p>
+
+	<p>Quarterly status reports detailing activity within and surrounding FreeBSD.</p>
+    </ul>
+    <ul>
 	<li><p><a href="whyusefreebsd.html">Why Use FreeBSD?</a></p>
 
 	<p>Explanations given by existing users as to why FreeBSD should

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 25 14:14:55 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E4820EDE;
 Mon, 25 Feb 2013 14:14:55 +0000 (UTC)
 (envelope-from issyl0@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 D45B1EE9;
 Mon, 25 Feb 2013 14:14:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1PEEtCa097873;
 Mon, 25 Feb 2013 14:14:55 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1PEEt0n097872;
 Mon, 25 Feb 2013 14:14:55 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201302251414.r1PEEt0n097872@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Mon, 25 Feb 2013 14:14:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41040 - head/en_US.ISO8859-1/htdocs/news/status
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, 25 Feb 2013 14:14:56 -0000

Author: issyl0
Date: Mon Feb 25 14:14:55 2013
New Revision: 41040
URL: http://svnweb.freebsd.org/changeset/doc/41040

Log:
  There will be four status reports in 2012, not three.
  
  Hat:	monthly
  Approved by:	gabor (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml	Mon Feb 25 14:08:47 2013	(r41039)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml	Mon Feb 25 14:14:55 2013	(r41040)
@@ -16,7 +16,7 @@ Report//EN" "http://www.FreeBSD.org/XML/
       2012.  This quarter was highlighted by having a new Core Team
       elected, which took office on July 11th to start its work with a
       relatively high number of new members.  Note that this is the
-      second of the three reports planned for 2012.</p>
+      second of the four reports planned for 2012.</p>
 
     <p>Thanks to all the reporters for the excellent work! This report
       contains 17 entries and we hope you enjoy reading it.</p>

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 25 14:15:42 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9463BF5A;
 Mon, 25 Feb 2013 14:15:42 +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 864B4EFC;
 Mon, 25 Feb 2013 14:15:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1PEFg6s098042;
 Mon, 25 Feb 2013 14:15:42 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1PEFgGf098041;
 Mon, 25 Feb 2013 14:15:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201302251415.r1PEFgGf098041@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 25 Feb 2013 14:15:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41041 - head/en_US.ISO8859-1/htdocs/advocacy
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, 25 Feb 2013 14:15:42 -0000

Author: gjb
Date: Mon Feb 25 14:15:41 2013
New Revision: 41041
URL: http://svnweb.freebsd.org/changeset/doc/41041

Log:
  Fix build.

Modified:
  head/en_US.ISO8859-1/htdocs/advocacy/index.xml

Modified: head/en_US.ISO8859-1/htdocs/advocacy/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/advocacy/index.xml	Mon Feb 25 14:14:55 2013	(r41040)
+++ head/en_US.ISO8859-1/htdocs/advocacy/index.xml	Mon Feb 25 14:15:41 2013	(r41041)
@@ -31,7 +31,7 @@
     <ul>
 	<li><p><a href="&base;/news/status/status.html">FreeBSD quarterly status reports</a></p>
 
-	<p>Quarterly status reports detailing activity within and surrounding FreeBSD.</p>
+	<p>Quarterly status reports detailing activity within and surrounding FreeBSD.</p></li>
     </ul>
     <ul>
 	<li><p><a href="whyusefreebsd.html">Why Use FreeBSD?</a></p>

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 25 17:17:39 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E2E5259C;
 Mon, 25 Feb 2013 17:17:39 +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 B78549CD;
 Mon, 25 Feb 2013 17:17:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1PHHdQ2052218;
 Mon, 25 Feb 2013 17:17:39 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1PHHb4O052204;
 Mon, 25 Feb 2013 17:17:37 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201302251717.r1PHHb4O052204@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Mon, 25 Feb 2013 17:17:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41042 - in head/ru_RU.KOI8-R/articles: cups custom-gcc
 cvs-freebsd fbsd-from-scratch fonts gjournal-desktop laptop pr-guidelines
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, 25 Feb 2013 17:17:40 -0000

Author: taras
Date: Mon Feb 25 17:17:37 2013
New Revision: 41042
URL: http://svnweb.freebsd.org/changeset/doc/41042

Log:
  MFen:
  + articles/cups/article.xml                   r36335  --> r39632
  + articles/custom-gcc/article.xml             r34679  --> r39632
  + articles/cvs-freebsd/article.xml            r32632  --> r39632
  + articles/fbsd-from-scratch/article.xml      r33355  --> r39632
  + articles/fonts/article.xml                  r38183  --> r39632
  + articles/gjournal-desktop/article.xml       r34581  --> r39632
  + articles/laptop/article.xml                 r29400  --> r39632
  + articles/pr-guidelines/article.xml          r38826  --> r39632

Modified:
  head/ru_RU.KOI8-R/articles/cups/article.xml
  head/ru_RU.KOI8-R/articles/custom-gcc/article.xml
  head/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
  head/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
  head/ru_RU.KOI8-R/articles/fonts/article.xml
  head/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
  head/ru_RU.KOI8-R/articles/laptop/article.xml
  head/ru_RU.KOI8-R/articles/pr-guidelines/article.xml

Modified: head/ru_RU.KOI8-R/articles/cups/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/cups/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/cups/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -11,7 +11,7 @@
 
      $FreeBSD$
 
-     Original revision: r36335
+     Original revision: r39632
 -->
 
 <!--
@@ -22,7 +22,7 @@ Translation:	Taras Korenko,
 <article lang="ru">
   <articleinfo>
     <title>õÎÉ×ÅÒÓÁÌØÎÁÑ óÉÓÔÅÍÁ ðÅÞÁÔÉ Unix ÎÁ FreeBSD</title>
-    <pubdate>$FreeBSD$</pubdate>
+
     <authorgroup>
       <author>
 	<firstname>Chess</firstname>
@@ -38,6 +38,8 @@ Translation:	Taras Korenko,
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
@@ -85,7 +87,7 @@ Translation:	Taras Korenko,
       Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ ÐÏÌØÚÏ×ÁÔÅÌÑ <username>root</username> ÓÌÅÄÕÀÝÕÀ
       ËÏÍÁÎÄÕ:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups &amp;&amp; make install clean</userinput></screen>
 
     <para>äÌÑ ÕÓÔÁÎÏ×ËÉ <application>CUPS</application> ÉÓÐÏÌØÚÕÑ ÐÁËÅÔ,
       ÚÁÐÕÓÔÉÔÅ ÎÁ ×ÙÐÏÌÎÅÎÉÅ ÔÁËÕÀ ËÏÍÁÎÄÕ:</para>

Modified: head/ru_RU.KOI8-R/articles/custom-gcc/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/custom-gcc/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/custom-gcc/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -8,7 +8,7 @@
 <!--
     The FreeBSD Russian Documentation Project
     $FreeBSD$
-    Original revision: r34679
+    Original revision: r39632
 -->
 
 <!-- ðÅÒÅ×ÏÄ: ëÏÒÅÎËÏ ôÁÒÁÓ -->
@@ -109,7 +109,7 @@
       ×ÅÒÓÉÉ <application>GCC</application></title>
 
     <para>äÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÔÒÅÂÕÅÍÏÊ ×ÅÒÓÉÉ <application>GCC</application>,
-      ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÉÚ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× &os, ÔÒÅÂÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ
+      ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÉÚ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× &os;, ÔÒÅÂÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ
       ËÏÎÆÉÇÕÒÁÃÉÑ ÓÉÓÔÅÍÙ.</para>
 
     <sect2 id="adjusting-make.conf">

Modified: head/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -10,7 +10,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml,v 1.9 2006/02/05 17:43:22 marck Exp $
 
-     Original revision: r32632
+     Original revision: r39632
 -->
 
 <article lang="ru">
@@ -35,6 +35,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;

Modified: head/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -11,7 +11,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml,v 1.5 2005/06/12 13:52:24 gad Exp $
 
-     Original revision: r33355
+     Original revision: r39632
 -->
 
 <article lang="ru">
@@ -485,9 +485,9 @@ Do you wish to delete what is left of /v
     <para>îÁ ÓÁÍÏÍ ÄÅÌÅ ×Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÎÅËÏÔÏÒÙÅ ËÏÍÁÎÄÙ ÏÂÏÌÏÞËÉ É ÎÅ ÂÙÔØ
       ÏÇÒÁÎÉÞÅÎÎÙÍÉ ÐÒÏÓÔÙÍÉ ×ÙÚÏ×ÁÍÉ <command>make</command>:</para>
 
-    <programlisting>java jdk16            echo true > files/license.sh; make install BATCH=yes < /dev/null
+    <programlisting>java jdk16            echo true &gt; files/license.sh; make install BATCH=yes &lt; /dev/null
 print acroread8       yes accept | make install PAGER=ls
-x11-fonts gnu-unifont make install && mkfontdir /usr/local/lib/X11/fonts/local
+x11-fonts gnu-unifont make install &amp;&amp; mkfontdir /usr/local/lib/X11/fonts/local
 news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install</programlisting>
 
     <para>÷ ÐÅÒ×ÙÈ Ä×ÕÈ ÓÔÒÏÞËÁÈ ÐÒÏÉÌÌÀÓÔÒÉÒÏ×ÁÎÏ, ËÁË ÒÁÂÏÔÁÔØ Ó ÐÏÒÔÁÍÉ,

Modified: head/ru_RU.KOI8-R/articles/fonts/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/fonts/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/fonts/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -11,7 +11,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fonts/article.xml,v 1.5 2005/12/06 17:56:24 gad Exp $
 
-     Original revision: r38183
+     Original revision: r39632
 -->
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
@@ -58,6 +58,8 @@
 
     <pubdate>7 Á×ÇÕÓÔÁ 1996</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.adobe;
@@ -68,8 +70,6 @@
       &tm-attrib.general;
     </legalnotice>
 
-    <releaseinfo>$FreeBSD$</releaseinfo>
-
     <abstract>
       <para>üÔÏÔ ÄÏËÕÍÅÎÔ ÓÏÄÅÒÖÉÔ ÏÐÉÓÁÎÉÅ ÒÁÚÌÉÞÎÙÈ ÆÁÊÌÏ× ÛÒÉÆÔÏ×, ËÏÔÏÒÙÅ
         ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó FreeBSD É ÄÒÁÊ×ÅÒÏÍ ÓÉÓÔÅÍÎÏÊ ËÏÎÓÏÌÉ, ÓÉÓÔÅÍÏÊ

Modified: head/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -8,7 +8,7 @@
 <!--
   The FreeBSD Russian Documentation Project
   $FreeBSD$
-  Original revision: r34581
+  Original revision: r39632
 -->
 
 <!-- ðÅÒÅ×ÏÄ: ôÁÒÁÓ ëÏÒÅÎËÏ -->
@@ -25,13 +25,13 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>2008</year>
       <holder role="mailto:manolis@FreeBSD.org">Manolis Kiagias</holder>
     </copyright>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <legalnotice id="trademarks" role="trademarks">

Modified: head/ru_RU.KOI8-R/articles/laptop/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/laptop/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/laptop/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -10,15 +10,13 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/laptop/article.xml,v 1.15 2007/05/15 07:58:44 gad Exp $
 
-     Original revision: r29400
+     Original revision: r39632
 -->
 
 <article lang="ru">
   <articleinfo>
     <title>FreeBSD ÎÁ ÌÜÐÔÏÐÁÈ</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para><literal>ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË ÷ÉÔÁÌÉÊ âÏÇÄÁÎÏ×</literal></para>
       <para>FreeBSD, ÚÁ ÎÅËÏÔÏÒÙÍ ÉÓËÌÀÞÅÎÉÅÍ, ÐÒÅËÒÁÓÎÏ ÒÁÂÏÔÁÅÔ ÎÁ
@@ -34,6 +32,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 

Modified: head/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/pr-guidelines/article.xml	Mon Feb 25 14:15:41 2013	(r41041)
+++ head/ru_RU.KOI8-R/articles/pr-guidelines/article.xml	Mon Feb 25 17:17:37 2013	(r41042)
@@ -12,7 +12,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pr-guidelines/article.xml,v 1.4 2005/12/16 20:08:02 gad Exp $
 
-     Original revision: r38826
+     Original revision: r39632
 -->
 
 <!--
@@ -220,11 +220,16 @@
       </glossentry>
 
       <glossentry>
-	<glossterm>repocopy</glossterm>
+	<glossterm>repocopy (ÕÓÔÁÒÅ×ÛÅÅ)</glossterm>
 
 	<glossdef>
 	  <para>òÅÛÅÎÉÅ ÐÒÏÂÌÅÍÙ ÚÁ×ÉÓÉÔ ÏÔ ÚÁ×ÅÒÛÅÎÉÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ
 	    ÒÅÐÏÚÉÔÏÒÉÑ (×ÎÕÔÒÅÎÎÉÅ ÏÐÅÒÁÃÉÉ ÒÅÐÏÚÉÔÏÒÉÑ CVS).</para>
+
+	  <para>õÞÉÔÙ×ÁÑ ÔÏ, ÞÔÏ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ ×ÓÅ ÒÅÐÏÚÉÔÏÒÉÉ ÉÓÐÏÌØÚÕÀÔ
+	    Subversion, × ÜÔÏÍ ÓÏÓÔÏÑÎÉÉ ÂÏÌÅÅ ÎÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ.  ÷ Subversion
+	    ÉÚÎÁÞÁÌØÎÏ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ É ÐÅÒÅÍÅÝÅÎÉÑ
+	    ÆÁÊÌÏ×.</para>
 	</glossdef>
       </glossentry>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue Feb 26 04:30:00 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 31242584
 for <svn-doc-head@freebsd.org>; Tue, 26 Feb 2013 04:30:00 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43])
 by mx1.freebsd.org (Postfix) with ESMTP id C05E5BD7
 for <svn-doc-head@freebsd.org>; Tue, 26 Feb 2013 04:29:59 +0000 (UTC)
Received: by mail-wg0-f43.google.com with SMTP id e12so2972358wge.34
 for <svn-doc-head@freebsd.org>; Mon, 25 Feb 2013 20:29:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=X0KxR5wAAzvdxdGB+VAFb8OiQcL92eIIsAgJwYH4hvU=;
 b=Vp1nc6sjkoDG4A3QxPQNjyvYNLyypVW2M1FAKT/OGL0LskUWX0oi65WPnlYynS9ueb
 65x3ofVo6ruRuG81B0q/8ahbS3+NUZmyKgabV6mH/hKmRNolPbuXXG1F5vhUl/T4oMwx
 j15G0F7ExCgwZCCs08BgqPvQXn9JVWZEwq7yk=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received: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=X0KxR5wAAzvdxdGB+VAFb8OiQcL92eIIsAgJwYH4hvU=;
 b=A+jJtWB9Bc2PfwtgCMjtRGNK5p1opBL5loFcabFcJDVIWMFBCuORQ8/Cf5heJW/2CB
 7su4I6bijLBYkfp3FBOFc7EaJEC87E1R9c9YKE3hAARnYzTyJE9ZgnpwBHwbnFeSJ5eQ
 t71J2Xde0r0tBJEvuxycoP/5tnUB/Fm6JmyHHmlcBqCqbu2v2sC+jZVoVGvFkKDxjGOV
 o5WH4XXQ6q6ha2gYWoHm8oQ0ZuPLRUYAx5KmJr3tLxIxPoBRjztJsgAKPIFL8ZCiNUtg
 4No0hFELJ+uIsEBbnXUtiR0NJymFr53/BBNYye1QHpmB6EgxXopTX0DT+ONBei3IdDCI
 oVJA==
X-Received: by 10.180.93.234 with SMTP id cx10mr16571109wib.34.1361852998692; 
 Mon, 25 Feb 2013 20:29:58 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.194.122.201 with HTTP; Mon, 25 Feb 2013 20:29:27 -0800 (PST)
In-Reply-To: <20130224011108.GB10994@saturn>
References: <201302161636.r1GGaMOI055230@svn.freebsd.org>
 <20130224011108.GB10994@saturn>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 25 Feb 2013 23:29:27 -0500
X-Google-Sender-Auth: BqE-K0tmEq4MItyIIbG9lMKHF0s
Message-ID: <CAF6rxgkVwVpYE6quGU=-c_P3+7SLN8TX-0A0fn4Y4LfDe_AT5g@mail.gmail.com>
Subject: Re: svn commit: r40985 - head/en_US.ISO8859-1/htdocs/projects
To: Giorgos Keramidas <keramida@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQnKbuCO0qIEvBwIvNyNpzCiCzy5DRtzPmGS2rgrKAAmWOMPXtTEoWgO3JjitejMoR+6KWKD
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: Tue, 26 Feb 2013 04:30:00 -0000

On 23 February 2013 20:11, Giorgos Keramidas <keramida@freebsd.org> wrote:
> This is still a book that is available online and may serve a useful
> purpose for people who are entirely new to BSD.  Maybe we should have a
> section for 'historical documentation' and move this book there?

We have http://docs.freebsd.org/doc/.  Maintaining older documentation
that contains larges amounts of dated information (as any book > N
years will) is not useful IMHO.  Perhaps I am wrong?

>> -      <li><p>The main newsgroup for &os; is <a
>> -         href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a>.
>> -       You might want to keep an eye on <a
>> -         href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
>> -       as well.</p></li>
>
> I still use comp.unix.bsd.freebsd.misc and it is moderately active.  It
> doesn't have the traffic that it used to have a decade ago, but I think
> removing it altogether is a bit bad.
>
...
> I'm not entirely sure if I want to keep *all* references to Usenet
> groups.  But seeing 'comp.unix.bsd.freebsd.misc' go made me a bit sad.

So it seems this one in particular is active.  I have no objection to
restoring it.  I thought it was dead (and I checked at the time, my
news mirror must have been outdated).


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

From owner-svn-doc-head@FreeBSD.ORG  Tue Feb 26 05:59:16 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 666A53B5;
 Tue, 26 Feb 2013 05:59:16 +0000 (UTC)
 (envelope-from beech@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 418DEE9E;
 Tue, 26 Feb 2013 05:59:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1Q5xFFm085459;
 Tue, 26 Feb 2013 05:59:15 GMT (envelope-from beech@svn.freebsd.org)
Received: (from beech@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1Q5xFEb085458;
 Tue, 26 Feb 2013 05:59:15 GMT (envelope-from beech@svn.freebsd.org)
Message-Id: <201302260559.r1Q5xFEb085458@svn.freebsd.org>
From: Beech Rintoul <beech@FreeBSD.org>
Date: Tue, 26 Feb 2013 05:59:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41047 - 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: Tue, 26 Feb 2013 05:59:16 -0000

Author: beech (ports committer)
Date: Tue Feb 26 05:59:15 2013
New Revision: 41047
URL: http://svnweb.freebsd.org/changeset/doc/41047

Log:
  Add new key

Modified:
  head/share/pgpkeys/beech.key   (contents, props changed)

Modified: head/share/pgpkeys/beech.key
==============================================================================
--- head/share/pgpkeys/beech.key	Mon Feb 25 20:19:29 2013	(r41046)
+++ head/share/pgpkeys/beech.key	Tue Feb 26 05:59:15 2013	(r41047)
@@ -1,35 +1,50 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh beech ECBFDC44;
+sh addkey.sh beech 68DFAE1F;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/ECBFDC44 2011-08-29
-      Key fingerprint = 6921 47CC 8B61 7C02 70EF  4D00 16B4 EAB7 ECBF DC44
+pub   2048D/68DFAE1F 2013-02-26
+      Key fingerprint = D58B 3E9D B0E3 E081 EC6F  69D9 CDA3 51DD 68DF AE1F
 uid                  Beech Rintoul <beech@freebsd.org>
-sub   1024g/F1FD1C3D 2011-08-29
+sub   2048g/960F45D9 2013-02-26
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBE5b5cQRBADUMThWYK/+cy0IO39D+w5sREzc5rvsCh8Ia0n7EIh7BqL0LrO2
-AGRjImOC2GCDdXNTS84RD+/TwonAOWK6tLn4wDTuYJQqi/0Z3IrPob7jKKwhK4o8
-zVwb4XLLWKTV+nfKbeUfcrp7eeD0mDRX3YJ1b0piT8AFkLjqQGiF4L7VrwCgkO8C
-uIffCwAV6oAFo+taWxeNQNcD/3luZVyWCffbWXHAYuXIBCwX3/9ehSqS1u7RL88b
-2xD0D9ZAaXC3kiv/ccu1ZSUx+olq2uHTHfFRdeoH26OOS1yMD9x0oyyY/hfpiWHU
-MOG4ZMkV0M+vdIGKOyCoQj13bUYgEYxoOT2FR8rjMWtdy7kgyJrVk0k5b3px9Jd2
-qGlMA/9eqgeEQuZsXoX1mT/0ZgDp4PRxnQ6RJ174HPM4zgG3bhEiAhUAz56NSCR5
-mKq5Lj2FqWq8jlb7mVD+hL/taKIBBAGBjaXhotkTY0Lhpp0SzgVtkDGsmgKxlqfh
-ZQqLC4cgTLsqAYQOt0IqlK54cLkwwm21VeO6q4Mo0HSiuLVdUrQhQmVlY2ggUmlu
-dG91bCA8YmVlY2hAZnJlZWJzZC5vcmc+iGIEExECACIFAk5b5cQCGwMGCwkIBwMC
-BhUIAgkKCwQWAgMBAh4BAheAAAoJEBa06rfsv9xEs0oAnRCR2Md2jKcIx8F2WPDM
-sQAaSqlzAJ4h+qVgOzfFULS50q+1kvB/PJ3C6bkBDQROW+XEEAQAp1lE3HT9kFTH
-XeaNi+IMfaorNcaYkHmGwqHuTiKXTWDmhbUEIqT8jsPcRVF1etw7gK7l5eNilQsE
-qHd9IgBx4SfP/j3rl6wH9tYx53013NZTrDcR8C37+9HhFO2xwHMCXEk+4rSkyBZ4
-D62qtZeiYouL6Y2vfhEsYJcy1tgRWocAAwUD/3RQo+7vgIMIGbQVcGcQNFKHLj6/
-WMSVDIuRj5fm22TYnqTVBbOUOEEXXPnops5+K0X9sv6QXFb2mqkPQR2Hed1RNIdo
-vp834XCFS6frYNdc1ulPSAevsFwBR9ub9fQS7Ca7m98n16M7xIl2QTktQQl/RuGb
-fIIHpH2i7AuB+RcKiEkEGBECAAkFAk5b5cQCGwwACgkQFrTqt+y/3ETvMwCfQk/G
-2zlUtzB5mYNsSNNHflFIGSoAniU7mn15Z82cwMAE75DMhQKaBHYD
-=Fb+t
+mQMuBFEsS9ARCACeJJ0k7CU+53G9GGNcDfJil1iS3QZlgIgCRXnH6zkyWrwCOL0V
+JeGa3EzIvYGyQy+nunwmSmfVSpn5bZYu9S0feACLPVOXs5bHIm8TwEhq2xZkTdtb
+uZXe8+TSqRYqo9rE0szZ1+8zMTvuv8VWlSV5bfSsZad3BexdVvVSY7VXT3ew9KuZ
+PsKikkjNFkEuNYjx1rbNwoAG2hN78oeyZVRF+M4oascxT54Rk3QohS3NgFhI/GFZ
+eJsplVUyQhBjfjs7TETCQ3rdNnJSz/7YYXQVmlh+m+XL8z3Vwh8PDPUeqy3rNwTd
+KFaCU/yFLXCE+WP55FRxb8fHoYvUrTW5MGunAQD29x/4HoFP2ulTV4VLN2bnRK5R
+yS++Ijwt35E8DBdcNwgAhN+AyGnql+bA4BvbJQ6LUejNyAXM/3mmGIgho/58cDrJ
+oYbonXk10FTrNMUurSuCS7VaVl9lPux/Rvhy8XhzGtqTe7B6BmM3i4C9VQr98u9U
+LxkdA6nCZoe0oNZcaNRQWusCiSkb2w7h9IbUVPfgrQrmd80U+uFhTNg0aCGDfhfV
+Ihpp1Y8WQa1zNSElBBAwVO2+g2rXFnzUrFIrwV3dYA498t6lHB75ByF9YXhzkuv3
+TzZgj8mnZiFhXUx7mlaKeEbP1Me+QzvWFRW0nXizwzNwf8Bho+fgLCO/SG83WNml
+XiTFUMHP6nzicwwc0S+YuzxM+6/8FkCJqzubPzETAwf/fIdH/cC2blP8jQJxXrPf
+3raotWPqk2F8EbdpLBIpz4YJ1nwTDbboPDFdDK6/8rvvLA2VLZ8dSOyHZYy80gni
+gzA6uPMbFW7q9xftBRW2kaNaUAkRyaBG2S/CvX+7IYD/OmU7YN7gpEP4mAZ7BWeE
+A+RAEvUByrUqhsGeeX6oMT0JMq/8C+mz1o6Coza9QqPznJdTv8tHW9avgnFu3nHT
+TeWbn/RHkhDvbV4X0hu9CoHrVdOFqvnPqSBKaVQsTM15ZynKoMELK+Uk4jey/DyJ
+HdTwzQgch8yCC6GbMHrowgpf04CJN9Ov3/uKBFXU3/DMuFc0oiXpIfE/DC1WzYMY
+rrQhQmVlY2ggUmludG91bCA8YmVlY2hAZnJlZWJzZC5vcmc+iHoEExEIACIFAlEs
+S9ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEM2jUd1o364faYEA/Am4
+DBaFHTlgOdZGzqYqMqIsdGhOHH+d2EpnsC1mDW/NAQCjwSwHZYMf0cv00Y1rbjvk
++Iageuyp6rIOdiQ0Pksc1rkCDQRRLEvQEAgAp8Q394Hz77rS0OB/sc8klQcOfEAi
+HsEnYjYBm1VIP5GMhShC9mzzw9Je0kCMdWLHWBXc1VsyMcH15luy+rwJBr2YgVwV
+mK5gml/jOSc9dm58YoUXikKO3dJ44kM5JSxfLDfLMDH4TTTmEyGf7RyFlxWO7VVa
+qAz6bsmklHbGxXRC4lGTYF8+4vGJYlc7Y/GaV+mC39hfDaXho1w1O1SpcvKBZWsb
+k0oHgGzlNl5gn1S00ZOjusXHtkUtGsHj8tPGXurBW7aac5iRwMbLbcOy7aD368oV
+kSGUGjHcx1Z9u4O/g3uPUdnsXsI/N7HYLb6dMpumAl/IwEjFXwju/Jxr0wADBgf/
+SNK1Nsg0a97MAci9O1Qp57awCrWB73hNwGw+qC3xSduWmlS4MLZH+DGocv9JOHhW
+d180tTf081svVnWYURaubWsI5N6vgywcXkYt+yvqUcLvttQXYeJS2jTL+1vRErkp
+oEueYzJhZ+sVk+0gG+R6dtsWSwWWXYQ1LdlVeXhbbVWqs3kvGq5IQP0ZngvC8OsC
+tCat6hzTEIlbhSVErdKsrVBYMELZWleJX5RcbX9rPykTJqyH/2bANBAT8uLROHAk
+pQ4rnQD3TeCSmP0pDYT4TWAcpxe69aU/a6p591kW0CI7dSZVHrao6q+hmHLWDk4K
+ELGLyiM/IaOrKyDBPi8C/IhhBBgRCAAJBQJRLEvQAhsMAAoJEM2jUd1o364fA+cB
+ALaWj7vG0OqUqGgLxCdSZw6bCME/vU/TNRmn0IgAYOQTAQDe/sdsNUs/MzFJi0re
+0roDMXVUSkNFP4PN4u5jyuzVBQ==
+=EWeR
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Tue Feb 26 11:07:22 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2B527CBC;
 Tue, 26 Feb 2013 11:07:22 +0000 (UTC)
 (envelope-from rodrigc@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 1D8B1CB7;
 Tue, 26 Feb 2013 11:07:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QB7LjX079734;
 Tue, 26 Feb 2013 11:07:21 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QB7LPR079733;
 Tue, 26 Feb 2013 11:07:21 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <201302261107.r1QB7LPR079733@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Tue, 26 Feb 2013 11:07:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41049 - head/en_US.ISO8859-1/articles/releng
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, 26 Feb 2013 11:07:22 -0000

Author: rodrigc (src committer)
Date: Tue Feb 26 11:07:21 2013
New Revision: 41049
URL: http://svnweb.freebsd.org/changeset/doc/41049

Log:
  Reviewed by: gjb rwatson
  
  Add warning to document to reflect that content is outdated.
  The FreeBSD releng team will update this document with updated content.

Modified:
  head/en_US.ISO8859-1/articles/releng/article.xml

Modified: head/en_US.ISO8859-1/articles/releng/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/releng/article.xml	Tue Feb 26 09:43:12 2013	(r41048)
+++ head/en_US.ISO8859-1/articles/releng/article.xml	Tue Feb 26 11:07:21 2013	(r41049)
@@ -47,6 +47,16 @@
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
+      <para>
+        <warning>
+          <para>2013/02/26: This document is outdated and does not
+            accurately describe the current release procedures of the
+            &os; Release Engineering team.  The &os; Release
+            Engineering team is currently reviewing this document and
+            will publish updated content soon.
+          </para>
+        </warning>
+      </para>
       <para>This paper describes the approach used by the &os;
         release engineering team to make production quality releases
         of the &os; Operating System.  It details the methodology

From owner-svn-doc-head@FreeBSD.ORG  Tue Feb 26 13:13:17 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1A1DC68A;
 Tue, 26 Feb 2013 13:13:17 +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 F28551F6;
 Tue, 26 Feb 2013 13:13:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QDDGWm018485;
 Tue, 26 Feb 2013 13:13:16 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QDDGrP018481;
 Tue, 26 Feb 2013 13:13:16 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201302261313.r1QDDGrP018481@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Tue, 26 Feb 2013 13:13:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41050 - in head/ru_RU.KOI8-R/articles: contributing
 geom-class hubs problem-reports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Tue, 26 Feb 2013 14:24:11 +0000
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, 26 Feb 2013 13:13:17 -0000

Author: taras
Date: Tue Feb 26 13:13:15 2013
New Revision: 41050
URL: http://svnweb.freebsd.org/changeset/doc/41050

Log:
  MFen:
  + articles/contributing/article.xml           r34267  --> r40773
  + articles/geom-class/article.xml             r38183  --> r40540
  + articles/hubs/article.xml                   r38826  --> r39701
  + articles/problem-reports/article.xml        r33563  --> r39655

Modified:
  head/ru_RU.KOI8-R/articles/contributing/article.xml
  head/ru_RU.KOI8-R/articles/geom-class/article.xml
  head/ru_RU.KOI8-R/articles/hubs/article.xml
  head/ru_RU.KOI8-R/articles/problem-reports/article.xml

Modified: head/ru_RU.KOI8-R/articles/contributing/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/contributing/article.xml	Tue Feb 26 11:07:21 2013	(r41049)
+++ head/ru_RU.KOI8-R/articles/contributing/article.xml	Tue Feb 26 13:13:15 2013	(r41050)
@@ -11,7 +11,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/contributing/article.xml,v 1.3 2006/03/28 16:40:29 gad Exp $
 
-     Original revision: r34267
+     Original revision: r40773
 -->
 
 <article lang='ru'>
@@ -97,7 +97,7 @@
 	<listitem>
 	  <para>ðÅÒÉÏÄÉÞÅÓËÉ ÞÉÔÁÊÔÅ FAQ É òÕËÏ×ÏÄÓÔ×Ï.  åÓÌÉ ÞÔÏ-ÔÏ ÏÐÉÓÁÎÏ
 	    ÐÌÏÈÏ, ÕÓÔÁÒÅÌÏ ÉÌÉ ÄÁÖÅ ÐÏÌÎÏÓÔØÀ ÎÅÐÒÁ×ÉÌØÎÏ, ÄÁÊÔÅ ÎÁÍ ÚÎÁÔØ.
-	    åÝ£ ÌÕÞÛÅ, ÅÓÌÉ ×Ù ÐÒÉÛÌ£ÔÅ ÎÁÍ ÉÓÐÒÁ×ÌÅÎÉÅ (×ÙÕÞÉÔØ SGML ÎÅ ÔÁË
+	    åÝ£ ÌÕÞÛÅ, ÅÓÌÉ ×Ù ÐÒÉÛÌ£ÔÅ ÎÁÍ ÉÓÐÒÁ×ÌÅÎÉÅ (×ÙÕÞÉÔØ Docbook ÎÅ ÔÁË
 	    ÓÌÏÖÎÏ, ÎÏ É ÐÒÏÔÉ× ÐÏÓÌÁÎÉÊ × ÆÏÒÍÁÔÅ ASCII ÎÉËÔÏ ×ÏÚÒÁÖÁÔØ ÎÅ
 	    ÂÕÄÅÔ).</para>
 	</listitem>
@@ -236,7 +236,7 @@
     <sect2>
       <title>÷ÙÂÅÒÉÔÅ ÏÄÉÎ ÉÚ ÐÕÎËÔÏ× ÓÏ ÓÔÒÁÎÉÞËÉ <quote>ÉÄÅÊ</quote></title>
 
-      <para><ulink url="&url.base;/projects/ideas/">óÐÉÓÏË ÐÒÏÅËÔÏ×
+      <para><ulink url="http://wiki.freebsd.org/IdeasPage">óÐÉÓÏË ÐÒÏÅËÔÏ×
 	É ÉÄÅÊ ÄÌÑ ÄÏÂÒÏ×ÏÌØÃÅ×</ulink> ÔÁËÖÅ ÄÏÓÔÕÐÅÎ ÄÌÑ ÌÀÄÅÊ,
 	ÖÅÌÁÀÝÉÈ ÐÏÍÏÞØ ÐÒÏÅËÔÕ &os;.  óÐÉÓÏË ÐÏÓÔÏÑÎÎÏ ÏÂÎÏ×ÌÑÅÔÓÑ É
 	ÓÏÄÅÒÖÉÔ ÐÕÎËÔÙ, ËÁË ÄÌÑ ÐÒÏÇÒÁÍÍÉÓÔÏ×, ÔÁË É ÄÌÑ ÎÅ
@@ -341,10 +341,7 @@
 
       <para>ðÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ ÆÏÒÍÁÔÏÍ &man.diff.1; ÄÌÑ ÐÏÓÙÌËÉ ÐÁÔÞÅÊ Ñ×ÌÑÅÔÓÑ
 	ÕÎÉÆÉÃÉÒÏ×ÁÎÎÁÑ ×ÙÄÁÞÁ, ÓÏÚÄÁ×ÁÅÍÁÑ ËÏÍÁÎÄÏÊ <command>diff
-	-u</command>.  ïÄÎÁËÏ ÄÌÑ ÐÁÔÞÅÊ, ËÏÔÏÒÙÅ ÓÕÝÅÓÔ×ÅÎÎÏ ÉÚÍÅÎÑÀÔ ËÁËÏÊ-ÔÏ
-	ÂÌÏË ËÏÄÁ, ËÏÎÔÅËÓÔÎÙÊ ÆÏÒÍÁÔ, ÓÏÚÄÁ×ÁÅÍÙÊ ËÏÍÁÎÄÏÊ <command>diff
-	-c</command>, ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÂÏÌÅÅ ÞÉÔÁÅÍÙÍ É ÐÏÜÔÏÍÕ ÂÏÌÅÅ
-	ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ.</para>
+	-u</command>.</para>
 
       <indexterm>
 	<primary><command>diff</command></primary>
@@ -352,27 +349,16 @@
 
       <para>ë ÐÒÉÍÅÒÕ:</para>
 
-      <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
-      <para>ÉÌÉ</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
-      <para>ÂÕÄÕÔ ÓÏÚÄÁ×ÁÔØ ÔÁËÏÊ ÎÁÂÏÒ ËÏÎÔÅËÓÔÎÙÈ diff-ÆÁÊÌÏ× ÄÌÑ ÄÁÎÎÏÇÏ
-	ÆÁÊÌÁ Ó ÉÓÈÏÄÎÙÍ ÔÅËÓÔÏÍ ÉÌÉ ÃÅÌÏÊ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ×.</para>
-
-      <para>ðÏÄÏÂÎÙÍ ÖÅ ÏÂÒÁÚÏÍ</para>
-
       <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
 
       <para>ÉÌÉ</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
 
-      <para>ÓÄÅÌÁÀÔ ÔÏ ÖÅ ÓÁÍÏÅ, ÎÏ × ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÍ diff-ÆÏÒÍÁÔÅ.</para>
+      <para>ÓÏÚÄÁÓÔ ÎÁÂÏÒ ÐÁÔÞÅÊ × ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÍ ÆÏÒÍÁÔÅ ÄÌÑ ËÏÎËÒÅÔÎÏÇÏ
+	ÆÁÊÌÁ Ó ÉÓÈÏÄÎÙÍ ÔÅËÓÔÏÍ ÉÌÉ ÄÌÑ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ×.</para>
 
-      <para>äÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ËÉ ÐÏ
-	ËÏÍÁÎÄÅ &man.diff.1;.</para>
+      <para>äÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ × &man.diff.1;.</para>
 
       <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÐÏÌÕÞÉÌÉ ÎÁÂÏÒ diff-ÆÁÊÌÏ× (ËÏÔÏÒÙÅ ×Ù ÍÏÖÅÔÅ
 	ÐÒÏÔÅÓÔÉÒÏ×ÁÔØ ËÏÍÁÎÄÏÊ	&man.patch.1;), ×Ù ÄÏÌÖÎÙ ÐÒÉÓÌÁÔØ ÉÈ ÄÌÑ
@@ -395,10 +381,10 @@
 	&man.uuencode.1;.  ðÒÉÎÉÍÁÀÔÓÑ ÔÁËÖÅ É ÁÒÈÉ×Ù, ÓÏÚÄÁÎÎÙÅ ÐÒÏÇÒÁÍÍÏÊ
 	&man.shar.1;.</para>
 
-      <para>åÓÌÉ ×ÁÛÅ ÉÚÍÅÎÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÓÏÍÎÉÔÅÌØÎÙÍ
-	(ÎÁÐÒÉÍÅÒ, ×Ù ÎÅ Õ×ÅÒÅÎÙ × ÏÔÓÕÔÓÔ×ÉÉ ÌÉÃÅÎÚÉÏÎÎÙÈ ÏÇÒÁÎÉÞÅÎÉÊ
-	ÏÔÎÏÓÉÔÅÌØÎÏ ÅÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÉÌÉ ÐÒÏÓÔÏ ÎÅ ÇÏÔÏ×Ù ×ÙÐÕÓÔÉÔØ ÅÇÏ ÂÅÚ
-	ÔÝÁÔÅÌØÎÏÊ ÐÒÏ×ÅÒËÉ, ÔÏ ×Ù ÄÏÌÖÎÙ ÐÏÓÌÁÔØ ÅÇÏ ÎÁÐÒÑÍÕÀ × ÓÐÉÓÏË
+      <para>åÓÌÉ ×ÁÛÅ ÉÚÍÅÎÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÓÏÍÎÉÔÅÌØÎÙÍ,
+	ÎÁÐÒÉÍÅÒ, ×Ù ÎÅ Õ×ÅÒÅÎÙ × ÏÔÓÕÔÓÔ×ÉÉ ÌÉÃÅÎÚÉÏÎÎÙÈ ÏÇÒÁÎÉÞÅÎÉÊ
+	ÏÔÎÏÓÉÔÅÌØÎÏ ÅÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ, ÔÏ ×Ù ÄÏÌÖÎÙ ÐÏÓÌÁÔØ ÅÇÏ ÎÁÐÒÑÍÕÀ
+	× ÓÐÉÓÏË
 	ÒÁÓÓÙÌËÉ &a.core;, Á ÎÅ ÞÅÒÅÚ &man.send-pr.1;.  ÷ ÓÐÉÓËÅ ÒÁÓÓÙÌËÉ
 	&a.core; ÕÞÁÓÔ×ÕÅÔ ÇÏÒÁÚÄÏ ÍÅÎØÛÅÅ ËÏÌÉÞÅÓÔ×Ï ÌÀÄÅÊ, ËÏÔÏÒÙÅ ×ÙÐÏÌÎÑÀÔ
 	ÏÓÎÏ×ÎÕÀ ÅÖÅÄÎÅ×ÎÕÀ ÒÁÂÏÔÕ ÎÁÄ FreeBSD.  úÁÍÅÔØÔÅ, ÞÔÏ ÜÔÁ ÇÒÕÐÐÁ
@@ -501,7 +487,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	&#36;Id&#36;</programlisting>
+	&dollar;&os;&dollar;</programlisting>
 
       <para>äÌÑ ×ÁÛÅÇÏ ÕÄÏÂÓÔ×Á ËÏÐÉÑ ÜÔÏÇÏ ÔÅËÓÔÁ ÒÁÚÍÅÝÅÎÁ × ÆÁÊÌÅ
 	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.
@@ -531,8 +517,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	<para>æÉÎÁÎÓÏ×ÁÑ ÐÏÍÏÝØ ÍÏÖÅÔ ÂÙÔØ ÎÁÐÒÁ×ÌÅÎÁ × ×ÉÄÅ ÞÅËÏ× ÎÁ ÁÄÒÅÓ:
 	  <address>
 	    The FreeBSD Foundation
-	    <street>7321 Brockway Dr.</street>
-	    <city>Boulder</city>, <state>CO</state> <postcode>80303</postcode>
+	    <street>P.O. Box 20247</street>
+	    <city>Boulder</city>,
+	    <state>CO</state> <postcode>80308</postcode>
 	    <country>USA</country>
 	  </address>
 	</para>
@@ -561,16 +548,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	  url="&url.base;/donations/">òÕËÏ×ÏÄÓÔ×Õ ãÅÎÔÒÁ
 	  ÐÏÖÅÒÔ×Ï×ÁÎÉÊ</ulink>.</para>
       </sect3>
-
-      <sect3>
-	<title>ðÏÍÏÝØ × ×ÉÄÅ ÄÏÓÔÕÐÁ × Internet</title>
-
-	<para>íÙ ×ÓÅÇÄÁ ×ÏÓÐÏÌØÚÕÅÍÓÑ ÎÏ×ÙÍ ÚÅÒËÁÌÉÒÕÀÝÉÍ ÓÅÒ×ÅÒÏÍ ÄÌÑ FTP, WWW
-	  ÉÌÉ <command>cvsup</command>.  åÓÌÉ ×Ù ÚÁÈÏÔÉÔÅ ×ÙÓÔÕÐÉÔØ × ÒÏÌÉ
-	  ÔÁËÏÇÏ ÚÅÒËÁÌÁ, ÐÏÖÁÌÕÊÓÔÁ, ÏÂÒÁÔÉÔÅÓØ Ë ÓÔÁÔØÅ Ï <ulink
-	  url="&url.articles.hubs;/index.html">ÚÅÒËÁÌÉÒÏ×ÁÎÉÉ FreeBSD</ulink>
-	  ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÌÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.</para>
-      </sect3>
     </sect2>
   </sect1>
 </article>

Modified: head/ru_RU.KOI8-R/articles/geom-class/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/geom-class/article.xml	Tue Feb 26 11:07:21 2013	(r41049)
+++ head/ru_RU.KOI8-R/articles/geom-class/article.xml	Tue Feb 26 13:13:15 2013	(r41050)
@@ -9,7 +9,7 @@
     The FreeBSD Russian Documentation Project
     $FreeBSD$
     $FreeBSDru$
-    Original revision: r38183
+    Original revision: r40540
 -->
 
 <!-- ðÅÒÅ×ÏÄ: ôÁÒÁÓ ëÏÒÅÎËÏ -->
@@ -111,7 +111,8 @@
 	<listitem>
 	  <para>óÔÒÁÎÉÃÁ ÓÐÒÁ×ÏÞÎÉËÁ &man.style.9; &mdash; ÄÏËÕÍÅÎÔÉÒÕÅÔ
 	    ÓÏÇÌÁÛÅÎÉÑ Ï ÓÔÉÌÅ ÏÆÏÒÍÌÅÎÉÑ ËÏÄÁ, ËÏÔÏÒÙÅ ÏÂÑÚÁÎÙ ÂÙÔØ ÓÏÂÌÀÄÅÎÙ
-	    ÅÓÌÉ ×Ù ÐÌÁÎÉÒÕÅÔÅ ÐÅÒÅÄÁÔØ ×ÁÛ ËÏÄ × CVS-ÄÒÅ×Ï FreeBSD.</para>
+	    ÅÓÌÉ ×Ù ÐÌÁÎÉÒÕÅÔÅ ÐÅÒÅÄÁÔØ ×ÁÛ ËÏÄ × Subversion ÒÅÐÏÚÉÔÏÒÉÊ
+	    FreeBSD.</para>
 	</listitem>
       </itemizedlist>
     </sect2>

Modified: head/ru_RU.KOI8-R/articles/hubs/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/hubs/article.xml	Tue Feb 26 11:07:21 2013	(r41049)
+++ head/ru_RU.KOI8-R/articles/hubs/article.xml	Tue Feb 26 13:13:15 2013	(r41050)
@@ -10,7 +10,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.xml,v 1.21 2007/05/15 18:39:34 gad Exp $
 
-     Original revision: r38826
+     Original revision: r39701
 -->
 
 <article lang="ru">
@@ -166,14 +166,11 @@
       <para>üÔÉ ÔÒÅÂÏ×ÁÎÉÑ × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÏÐÒÅÄÅÌÑÀÔÓÑ ÍÁËÓÉÍÁÌØÎÙÍ ÏÖÉÄÁÅÍÙÍ
 	ËÏÌÉÞÅÓÔ×ÏÍ ËÌÉÅÎÔÏ× (ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ ÓÅÒ×ÅÒÁ).
 	ôÁËÖÅ, ÎÁ ÔÒÅÂÕÅÍÙÅ ÒÅÓÕÒÓÙ ×ÌÉÑÅÔ ÓÐÉÓÏË ÓÅÒ×ÉÓÏ×, ËÏÔÏÒÙÅ ×Ù ÂÕÄÅÔÅ
-	ÐÒÅÄÏÓÔÁ×ÌÑÔØ.  úÅÒËÁÌÏ FTP É/ÉÌÉ HTTP ÎÅ ÔÒÅÂÕÀÔ ÏÓÏÂÅÎÎÏ ÍÎÏÇÏ
-	ÒÅÓÕÒÓÏ×; ÚÎÁÞÉÔÅÌØÎÏ ÂÏÌØÛÅ ÐÁÍÑÔÉ É ×ÙÞÉÓÌÉÔÅÌØÎÏÊ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ
-	ÐÏÔÒÅÂÌÑÀÔ CVSup, rsync ÉÌÉ AnonCVS.  ïÓÏÂÅÎÎÏ "ÐÒÏÖÏÒÌÉ×ÙÍ" ÐÏ ÐÁÍÑÔÉ
-	Ñ×ÌÑÅÔÓÑ rsync; CVSup ÔÒÅÂÕÅÔ ÄÏÓÔÁÔÏÞÎÏÊ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ
-	ÐÒÏÃÅÓÓÏÒÁ.  äÌÑ ÐÒÅÄÏÓÔÁ×ÌÅÎÉÑ ÄÏÓÔÕÐÁ ÐÏ AnonCVS ÈÏÒÏÛÅÊ ÉÄÅÅÊ ÂÕÄÅÔ
-	ÓÏÚÄÁÎÉÅ ×ÉÒÔÕÁÌØÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ × ÐÁÍÑÔÉ (MFS) ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ
-	300 MB ÒÁÚÍÅÒÏÍ, ÔÁË ÞÔÏ ÕÞÔÉÔÅ ÜÔÏ ÐÒÉ ÐÌÁÎÉÒÏ×ÁÎÉÉ.  ÷ÏÔ ÎÅËÏÔÏÒÙÅ
-	ÓÏ×ÅÔÙ ÐÏ ËÏÎÆÉÇÕÒÁÃÉÉ ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ ÓÅÒ×ÅÒÁ:</para>
+	ÐÒÅÄÏÓÔÁ×ÌÑÔØ.  úÅÒËÁÌÁ FTP É/ÉÌÉ HTTP ÎÅ ÔÒÅÂÕÀÔ ÏÓÏÂÅÎÎÏ ÍÎÏÇÏ
+	ÒÅÓÕÒÓÏ×.  âÕÄØÔÅ ÎÁ ÞÅËÕ, ÅÓÌÉ ÐÌÁÎÉÒÕÅÔÅ ÐÒÅÄÏÓÔÁ×ÌÑÔØ rsync.
+	÷ÙÂÏÒ rsync ÍÏÖÅÔ ÉÍÅÔØ ÏÇÒÏÍÎÏÅ ×ÌÉÑÎÉÅ ÎÁ ÔÒÅÂÏ×ÁÎÉÑ Ë ÁÐÐÁÒÁÔÎÙÍ
+	ÒÅÓÕÒÓÁÍ, ÐÏÓËÏÌØËÕ rsync ÐÒÉÚÎÁÎ "ÐÒÏÖÏÒÌÉ×ÙÍ" ÐÏ ÐÁÍÑÔÉ.
+	÷ÏÔ ÎÅËÏÔÏÒÙÅ ÓÏ×ÅÔÙ ÐÏ ËÏÎÆÉÇÕÒÁÃÉÉ ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ ÓÅÒ×ÅÒÁ:</para>
 
       <para>äÌÑ ÕÍÅÒÅÎÎÏ ÐÏÓÅÝÁÅÍÏÇÏ ÓÁÊÔÁ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÅÇÏ
 	<application>Rsync</application>, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÃÅÓÓÏÒ

Modified: head/ru_RU.KOI8-R/articles/problem-reports/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/problem-reports/article.xml	Tue Feb 26 11:07:21 2013	(r41049)
+++ head/ru_RU.KOI8-R/articles/problem-reports/article.xml	Tue Feb 26 13:13:15 2013	(r41050)
@@ -10,7 +10,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/problem-reports/article.xml,v 1.20 2006/04/05 04:28:40 gad Exp $
 
-     Original revision: r33563
+     Original revision: r39655
 -->
 
 <article lang="ru">
@@ -21,7 +21,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
@@ -96,7 +95,7 @@
       <emphasis>ÎÅ</emphasis> Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÙÍ ÄÅÊÓÔ×ÉÅÍ, Á ÔÏÌØËÏ
       ÐÒÉ×ÏÄÉÔ Ë ÒÁÚÏÞÁÒÏ×ÁÎÉÀ ×ÁÓ É ÒÁÚÒÁÂÏÔÞÉËÏ×.  é ÎÁÏÂÏÒÏÔ, ÅÓÔØ ÓÌÕÞÁÉ,
       ËÏÇÄÁ ÍÏÖÅÔ ÂÙÔØ ÎÕÖÎÏ ÐÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ Ï ÞÅÍ-ÔÏ, ÎÅ Ñ×ÌÑÀÝÅÍÓÑ
-      ÏÛÉÂËÏÊ&mdash;Ë ÐÒÉÍÅÒÕ, ÚÁÐÒÏÓ ÎÁ ÄÏÒÁÂÏÔËÕ ÉÌÉ ÒÁÓÛÉÒÅÎÉÅ
+      ÏÛÉÂËÏÊ &mdash; Ë ÐÒÉÍÅÒÕ, ÚÁÐÒÏÓ ÎÁ ÄÏÒÁÂÏÔËÕ ÉÌÉ ÒÁÓÛÉÒÅÎÉÅ
       ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ.</para>
 
     <para>îÏ ËÁË ÖÅ ÏÐÒÅÄÅÌÉÔØ, ÞÔÏ Ñ×ÌÑÅÔÓÑ ÏÛÉÂËÏÊ, Á ÞÔÏ ÎÅÔ?  ðÒÏÓÔÙÍ
@@ -112,12 +111,6 @@
 
     <itemizedlist>
       <listitem>
-	<para>úÁÐÒÏÓÙ ÎÁ ÒÁÓÛÉÒÅÎÉÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ.  ïÂÙÞÎÏ ÈÏÒÏÛÅÊ ÉÄÅÅÊ
-	  Ñ×ÌÑÅÔÓÑ ÏÚ×ÕÞÉ×ÁÎÉÅ ÜÔÏÇÏ × ÓÐÉÓËÁÈ ÒÁÓÓÙÌËÉ ÄÏ ÔÏÇÏ, ËÁË ÐÏÓÙÌÁÔØ
-	  ÓÏÏÂÝÅÎÉÅ Ï ÐÒÏÂÌÅÍÅ.</para>
-      </listitem>
-
-      <listitem>
 	<para>õ×ÅÄÏÍÌÅÎÉÅ Ï ÏÂÎÏ×ÌÅÎÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ËÏÔÏÒÏÅ
 	  ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÓÔÏÒÏÎÎÉÍÉ ÒÁÚÒÁÂÏÔÞÉËÁÍÉ (× ÏÓÎÏ×ÎÏÍ ÐÏÒÔÙ, ÎÏ ÔÁËÖÅ
 	  É ËÏÍÐÏÎÅÎÔÙ ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÙ, ÒÁÚÒÁÂÁÔÙ×ÁÅÍÙÅ ÓÔÏÒÏÎÎÉÍÉ
@@ -282,7 +275,7 @@
 	<para>äÌÑ ÏÓÎÏ×ÎÏÇÏ ËÏÄÁ &os; ×Ù ÄÏÌÖÎÙ ÔÝÁÔÅÌØÎÏ ÉÚÕÞÉÔØ ÓÏÄÅÒÖÉÍÏÅ
 	  ÆÁÊÌÁ <filename>/usr/src/UPDATING</filename> ÉÌÉ ÅÇÏ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ
 	  ÐÏ ÁÄÒÅÓÕ <ulink
-	  url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/UPDATING"></ulink>.
+	  url="http://svnweb.freebsd.org/base/head/UPDATING?view=log"></ulink>.
 	  (åÓÌÉ ×Ù ÐÅÒÅÈÏÄÉÔÅ Ó ÏÄÎÏÊ ×ÅÒÓÉÉ ÎÁ ÄÒÕÇÕÀ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ×Ù
 	  ÏÂÎÏ×ÌÑÅÔÅÓØ ÄÏ &os.current;, ÔÏ × ÜÔÏÍ ÆÁÊÌÅ ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÍÎÏÇÏ
 	  ×ÁÖÎÏÊ ÉÎÆÏÒÍÁÃÉÉ).</para>
@@ -291,9 +284,9 @@
 	  ÏÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ <filename>/usr/ports/UPDATING</filename>
 	  (ÉÚÍÅÎÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ÉÎÄÉ×ÉÄÕÁÌØÎÙÈ ÐÏÒÔÏ×) ÉÌÉ Ë
 	  <filename>/usr/ports/CHANGES</filename> (ÉÚÍÅÎÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ×ÓÅÊ
-	  ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×).  ïÎÉ ÔÁËÖÅ ÄÏÓÔÕÐÎÙ ÞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ CVSweb: <ulink
-	  url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/UPDATING"></ulink> É
-	  <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/CHANGES"></ulink>.</para>
+	  ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×).  ïÎÉ ÔÁËÖÅ ÄÏÓÔÕÐÎÙ ÞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ svnweb: <ulink
+	  url="http://svnweb.freebsd.org/ports/head/UPDATING?view=log"></ulink>
+	  É <ulink url="http://svnweb.freebsd.org/ports/head/CHANGES?view=log"></ulink>.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -378,12 +371,11 @@
 	        (ÓÕÝÅÓÔ×ÕÅÔ ÓÐÅÃÉÁÌØÎÏÅ ÐÏÌÅ ÄÌÑ ÅÇÏ ×ËÌÀÞÅÎÉÑ, ÓÍÏÔÒÉÔÅ ÎÉÖÅ)
 	        É ÎÁ ËÁËÏÊ ÁÒÈÉÔÅËÔÕÒÅ.  óÏÏÂÝÉÔÅ, ÉÓÐÏÌØÚÕÅÔÅ ÌÉ ×Ù release
 	        ×ÅÒÓÉÀ (ÕÓÔÁÎÏ×ÉÌÉ Ó ËÏÍÐÁËÔ-ÄÉÓËÁ ÌÉÂÏ ÚÁÇÒÕÚÉÌÉ) ÉÌÉ ÓËÁÞÁÌÉ
-	        Å£ Ó ÐÏÍÏÝØÀ &man.cvsup.1; (ÅÓÌÉ ÔÁË, ÔÏ ËÁË ÄÁ×ÎÏ ×Ù
-	        ÏÂÎÏ×ÌÑÌÉÓØ).  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÊÔÅ &os.current;, ÔÏ ÐÅÒ×ÙÊ
-		×ÏÐÒÏÓ, ËÏÔÏÒÙÊ ×ÁÍ ÍÏÇÕÔ ÚÁÄÁÔØ, ÂÕÄÅÔ ÐÒÏ ÄÁÔÕ ÐÏÓÌÅÄÎÅÇÏ
-		ÏÂÎÏ×ÌÅÎÉÑ, ÔÁË ËÁË ÉÓÐÒÁ×ÌÅÎÉÑ ÄÌÑ ÜÔÏÊ ×ÅÔËÉ ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ
-		(ÏÓÏÂÅÎÎÏ ÄÌÑ ÓÅÒØ£ÚÎÙÈ ÐÒÏÂÌÅÍ) ÐÏÑ×ÌÑÔØÓÑ ÓÌÉÛËÏÍ
-		ÂÙÓÔÒÏ.</para>
+	        Å£ Ó ÐÏÍÏÝØÀ Subversion (É ÅÓÌÉ ÔÁË, ÔÏ ÓÏÏÂÝÉÔÅ ÎÏÍÅÒ
+		ÒÅ×ÉÚÉÉ).  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ &os.current;, ÔÏ ÐÅÒ×ÙÊ ×ÏÐÒÏÓ,
+		ËÏÔÏÒÙÊ ×ÁÍ ÍÏÇÕÔ ÚÁÄÁÔØ, ÂÕÄÅÔ ÐÒÏ ÎÏÍÅÒ ÒÅ×ÉÚÉÉ, ÔÁË ËÁË
+		ÉÓÐÒÁ×ÌÅÎÉÑ ÄÌÑ ÜÔÏÊ ×ÅÔËÉ (ÏÓÏÂÅÎÎÏ × ÓÌÕÞÁÅ ÓÅÒØ£ÚÎÙÈ
+		ÐÒÏÂÌÅÍ) ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ ÐÏÑ×ÌÑÔØÓÑ ÓÌÉÛËÏÍ ÂÙÓÔÒÏ.</para>
 	    </listitem>
 
 	    <listitem>
@@ -600,13 +592,13 @@
 	<option>-c</option> ÉÌÉ <option>-u</option> ×ÍÅÓÔÅ Ó ËÏÍÁÎÄÏÊ
 	&man.diff.1; ÄÌÑ ÓÏÚÄÁÎÉÑ ËÏÎÔÅËÓÔÎÏÇÏ ÉÌÉ ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÇÏ diff-ÆÁÊÌÁ
 	(ÕÎÉÆÉÃÉÒÏ×ÁÎÎÙÊ ÆÏÒÍÁÔ ÐÒÅÄÐÏÞÔÉÔÅÌÅÎ),
-	É ÏÂÑÚÁÔÅÌØÎÏ ÕËÁÖÉÔÅ ÔÏÞÎÙÅ ÎÏÍÅÒÁ ×ÅÒÓÉÊ CVS ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ×Ù
+	É ÏÂÑÚÁÔÅÌØÎÏ ÕËÁÖÉÔÅ ÔÏÞÎÙÅ ÎÏÍÅÒÁ SVN ÒÅ×ÉÚÉÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ×Ù
 	ÉÚÍÅÎÑÌÉ, ÞÔÏÂÙ ÒÁÚÒÁÂÏÔÞÉËÉ, ËÏÔÏÒÙÅ ÂÕÄÕÔ ÞÉÔÁÔØ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ,
 	ÓÍÏÇÌÉ ÌÅÇËÏ ÅÇÏ ÐÒÉÍÅÎÉÔØ.  äÌÑ ÐÒÏÂÌÅÍ, Ó×ÑÚÁÎÎÙÈ Ó ÑÄÒÏÍ ÉÌÉ Ó
-	ÂÁÚÏ×ÙÍÉ ÕÔÉÌÉÔÁÍÉ ÐÒÅÄÐÏÞÔÉÔÅÌØÎÅÅ ÂÕÄÅÔ ÐÁÔÞ ÏÔÎÏÓÉÔÅÌØÎÏ ×ÅÔËÉ
-	&os.current; (ÉÌÉ HEAD CVS), Ô.Ë. ×ÅÓØ ÎÏ×ÙÊ ËÏÄ ÄÏÌÖÅÎ ÂÙÔØ ÓÎÁÞÁÌÁ
-	ÐÒÏÔÅÓÔÉÒÏ×ÁÎ × ÎÅÊ.  ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ ËÏÄ ÂÕÄÅÔ
-	ÉÎÔÅÇÒÉÒÏ×ÁÎ × ×ÅÔ×Ø &os.stable;.</para>
+	ÂÁÚÏ×ÙÍÉ ÕÔÉÌÉÔÁÍÉ, ÐÒÅÄÐÏÞÔÉÔÅÌØÎÅÅ ÂÕÄÅÔ ÐÁÔÞ ÏÔÎÏÓÉÔÅÌØÎÏ ×ÅÔËÉ
+	&os.current; (ÉÌÉ Subversion-×ÅÔËÉ HEAD), ÔÁË ËÁË ×ÅÓØ ÎÏ×ÙÊ ËÏÄ
+	ÄÏÌÖÅÎ ÂÙÔØ ÓÎÁÞÁÌÁ ÐÒÏÔÅÓÔÉÒÏ×ÁÎ × ÎÅÊ.  ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ
+	ËÏÄ ÂÕÄÅÔ ÉÎÔÅÇÒÉÒÏ×ÁÎ × ×ÅÔ×Ø &os.stable;.</para>
 
       <para>åÓÌÉ ×Ù ×ÓÔÁ×ÌÑÅÔÅ ÐÁÔÞ × ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ, ÕÞÔÉÔÅ, ÞÔÏ ÎÅËÏÔÏÒÙÅ
 	ÐÏÞÔÏ×ÙÅ ÐÒÏÇÒÁÍÍÙ ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ ÚÁÍÅÎÑÔØ ÔÁÂÕÌÑÃÉÉ ÓÅÒÉÅÊ ÐÒÏÂÅÌÏ×,
@@ -675,9 +667,8 @@
 	<listitem>
 	  <para><emphasis>Confidential:</emphasis> ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÚÁÐÏÌÎÅÎÏ ËÁË
 	    <literal>no</literal>, ÅÇÏ ÉÚÍÅÎÅÎÉÅ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ, ÔÁË ËÁË ÎÅÔ
-	    ÔÁËÏÇÏ ÐÏÎÑÔÉÑ, ËÁË ËÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ Ï
-	    ÐÒÏÂÌÅÍÅ&mdash;ÂÁÚÁ ÄÁÎÎÙÈ PR ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏ ×ÓÅÍÕ ÍÉÒÕ
-	    ÐÏÓÒÅÄÓÔ×ÏÍ <application>CVSup</application>.</para>
+	    ÔÁËÏÇÏ ÐÏÎÑÔÉÑ, ËÁË ËÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ Ï ÐÒÏÂÌÅÍÅ &mdash;
+	    ÂÁÚÁ ÄÁÎÎÙÈ PR ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏ ×ÓÅÍÕ ÍÉÒÕ.</para>
 	</listitem>
       </itemizedlist>
 
@@ -925,7 +916,7 @@
 	  </itemizedlist>
 
 	  <para>÷ÏÔ ÔÅËÕÝÉÊ ÐÅÒÅÞÅÎØ ËÁÔÅÇÏÒÉÊ (×ÚÑÔ ÉÚ
-	    <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/gnu/usr.bin/send-pr/categories"></ulink>):</para>
+	    <ulink url="http://svnweb.freebsd.org/base/head/gnu/usr.bin/send-pr/categories"></ulink>):</para>
 
 	  <itemizedlist>
 	    <listitem>
@@ -934,11 +925,6 @@
 	    </listitem>
 
 	    <listitem>
-	      <para><literal>alpha:</literal> ÐÒÏÂÌÅÍÙ, ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ
-		ÐÌÁÔÆÏÒÍÙ Alpha.</para>
-	    </listitem>
-
-	    <listitem>
 	      <para><literal>amd64:</literal> ÐÒÏÂÌÅÍÙ, ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ
 		ÐÌÁÔÆÏÒÍÙ AMD64.</para>
 	    </listitem>

From owner-svn-doc-head@FreeBSD.ORG  Tue Feb 26 16:52:43 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AD2AFB11;
 Tue, 26 Feb 2013 16:52:43 +0000 (UTC) (envelope-from dru@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 9371DF7C;
 Tue, 26 Feb 2013 16:52:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QGqh8H085520;
 Tue, 26 Feb 2013 16:52:43 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QGqhPY085519;
 Tue, 26 Feb 2013 16:52:43 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302261652.r1QGqhPY085519@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 26 Feb 2013 16:52:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41051 - head/en_US.ISO8859-1/books/handbook/linuxemu
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, 26 Feb 2013 16:52:43 -0000

Author: dru
Date: Tue Feb 26 16:52:43 2013
New Revision: 41051
URL: http://svnweb.freebsd.org/changeset/doc/41051

Log:
  Initial pass through chapter which does some tightening, modernizing, and fixes "you" and &os;.
  This chapter still needs a lot of testing and modernization. The ulink/xref tags need further review as well.
  
  Approved by:  gjb (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Tue Feb 26 13:13:15 2013	(r41050)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Tue Feb 26 16:52:43 2013	(r41051)
@@ -28,7 +28,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>Linux Binary Compatibility</title>
+  <title>&linux; Binary Compatibility</title>
 
   <sect1 id="linuxemu-synopsis">
     <title>Synopsis</title>
@@ -40,58 +40,40 @@
       <secondary>Linux</secondary>
     </indexterm>
 
-    <para>FreeBSD provides binary compatibility with several other
-      &unix; like operating systems, including Linux.  At this point,
-      you may be asking yourself why exactly, does
-      FreeBSD need to be able to run Linux binaries?  The answer to
-      that question is quite simple.  Many companies and developers
-      develop only for Linux, since it is the latest <quote>hot
-	thing</quote> in the computing world.  That leaves the rest
-      of us FreeBSD users bugging these same companies and developers
-      to put out native FreeBSD versions of their applications.  The
-      problem is, that most of these companies do not really realize
-      how many people would use their product if there were FreeBSD
-      versions too, and most continue to only develop for Linux.
-      So what is a FreeBSD user to do?  This is where the Linux binary
-      compatibility of FreeBSD comes into play.</para>
-
-    <para>In a nutshell, the compatibility allows FreeBSD users to
-      run about 90% of all Linux applications without modification.
-      This includes applications such as
-      <application>&staroffice;</application>, the Linux version of
-      <application>&adobe;&nbsp;&acrobat;</application>,
-      <application>&realplayer;</application>,
-      <application>&oracle;</application>,
-      <application>Doom</application>,
-      <application>Quake</application>, and more.  It is also reported
-      that in some situations, Linux binaries perform better on
-      FreeBSD than they do under Linux.</para>
-
-    <para>There are, however, some Linux-specific operating system
-      features that are not supported under FreeBSD.  Linux binaries
-      will not work on FreeBSD if they overly use &i386; specific
+    <para>&os; provides binary compatibility with &linux;, allowing
+      users to install and run &linux; binaries on a &os; system.
+      Many companies and developers develop only for &linux;, and
+      binary compatibility allows &os; users to run about 90% of all
+      &linux; applications without modification.  This includes
+      productivity applications, games, and more.  It has even been
+      reported that, in some situations, &linux; binaries perform
+      better on &os; than they do on &linux;.</para>
+
+    <para>However, some &linux;-specific operating system features
+      are not supported under &os;.  For example, &linux; binaries
+      will not work on &os; if they overly use &i386; specific
       calls, such as enabling virtual 8086 mode.</para>
 
     <para>After reading this chapter, you will know:</para>
     <itemizedlist>
       <listitem>
-	<para>How to enable Linux binary compatibility on your
+	<para>How to enable &linux; binary compatibility on a &os;
 	  system.</para>
       </listitem>
 
       <listitem>
-	<para>How to install additional Linux shared
+	<para>How to install additional &linux; shared
 	  libraries.</para>
       </listitem>
 
       <listitem>
-	<para>How to install Linux applications on your FreeBSD
+	<para>How to install &linux; applications on a &os;
 	  system.</para>
       </listitem>
 
       <listitem>
-	<para>The implementation details of Linux compatibility in
-	  FreeBSD.</para>
+	<para>The implementation details of &linux; compatibility in
+	  &os;.</para>
       </listitem>
     </itemizedlist>
 
@@ -99,8 +81,8 @@
 
     <itemizedlist>
       <listitem>
-	<para>Know how to install additional third-party
-	  software (<xref linkend="ports"/>).</para>
+	<para>Know how to install <link linkend="ports">additional
+	    third-party software</link>.</para>
       </listitem>
     </itemizedlist>
 
@@ -109,25 +91,43 @@
   <sect1 id="linuxemu-lbc-install">
     <title>Installation</title>
 
-    <indexterm><primary>KLD (kernel loadable
-	object)</primary></indexterm>
+    <indexterm><primary>Ports Collection</primary></indexterm>
 
-    <para>Linux binary compatibility is not turned on by default.  The
-      easiest way to enable this functionality is to load the
-      <literal>linux</literal> KLD object (<quote>Kernel LoaDable
-      object</quote>).  You can load this module by typing the
-      following as <username>root</username>:</para>
+    <para>&linux; libararies are not installed on &os; by default
+      and &linux; binary compatibility is not enabled by default.
+      &linux; libraries can be installed using the &os; Ports
+      Collection.  Alternately, &linux; libraries can be installed
+      <link linkend="linuxemu-libs-manually">manually</link>.</para>
+
+    <para>Using the Ports Collection is by far the easiest way to
+      install &linux; libraries.  On a &os;&nbsp;8.0 or higher
+      system, install the following port:</para>
 
-    <screen>&prompt.root; <userinput>kldload linux</userinput></screen>
+    <screen>&prompt.root; <userinput>cd
+/usr/ports/emulators/linux_base-f10</userinput> &prompt.root; <userinput>make install distclean</userinput></screen>
 
-    <para>If you would like Linux compatibility to always be enabled,
-      then you should add the following line to
+	<note>
+	  <para>On &os; systems prior to &os;&nbsp;8.0, instead
+	    install the <filename
+	      role="package">emulators/linux_base-fc4</filename>
+	    port.</para>
+	</note>
+
+	<para>Once the port is installed, enable &linux; binary
+	  compatibility by loading the <literal>linux</literal>
+	  module.  Type the following as
+	  <username>root</username>:</para>
+
+	<screen>&prompt.root; <userinput>kldload linux</userinput></screen>
+
+    <para>In order for &linux; compatibility to always be enabled at
+      boot time, add the following line to
       <filename>/etc/rc.conf</filename>:</para>
 
     <programlisting>linux_enable="YES"</programlisting>
 
-    <para>The &man.kldstat.8; command can be used to verify that the
-      KLD is loaded:</para>
+    <para>To verify that the module is loaded, use
+      &man.kldstat.8;:</para>
 
     <screen>&prompt.user; <userinput>kldstat</userinput>
 Id Refs Address    Size     Name
@@ -139,112 +139,59 @@ Id Refs Address    Size     Name
       <secondary>COMPAT_LINUX</secondary>
     </indexterm>
 
-    <para>If for some reason you do not want to or cannot load the
-      KLD, then you may statically link Linux binary compatibility
-      into the kernel by adding <literal>options
-	COMPAT_LINUX</literal> to your kernel configuration file.
-      Then install your new kernel as described in
-      <xref linkend="kernelconfig"/>.</para>
-
-    <sect2>
-      <title>Installing Linux Runtime Libraries</title>
-
-      <indexterm>
-	<primary>Linux</primary>
-	<secondary>installing Linux libraries</secondary>
-      </indexterm>
-
-      <para>This can be done one of two ways, either by using the
-	<link linkend="linuxemu-libs-port">linux_base</link> port, or
-	by installing them <link
-	linkend="linuxemu-libs-manually">manually</link>.</para>
-
-    <sect3 id="linuxemu-libs-port">
-      <title>Installing Using the linux_base Port</title>
-
-      <indexterm><primary>Ports Collection</primary></indexterm>
-
-      <para>This is by far the easiest method to use when installing
-	the runtime libraries.  It is just like installing any other
-	port from the <link linkend="ports">Ports
-	  Collection</link>:</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base-f10</userinput>
-&prompt.root; <userinput>make install distclean</userinput></screen>
-
-	<note>
-	  <para>On &os; systems prior to &os;&nbsp;8.0, you will have
-	    to use the <filename
-	      role="package">emulators/linux_base-fc4</filename> port
-	    instead of <filename
-	      role="package">emulators/linux_base-f10</filename>.</para>
-	</note>
-
-	<para>You should now have working Linux binary compatibility.
-	  Some programs may complain about incorrect minor versions
-	  of the system libraries.  In general, however, this does
-	  not seem to be a problem.</para>
-
-	<note><para>There may be multiple versions of the <filename
-	    role="package">emulators/linux_base</filename> port
-	  available, corresponding to different versions of various
-	  Linux distributions.  You should install the port most
-	  closely resembling the requirements of the Linux
-	  applications you would like to install.</para></note>
-
-      </sect3>
-
-      <sect3 id="linuxemu-libs-manually">
-	<title>Installing Libraries Manually</title>
-
-	<para>If you do not have the <quote>ports</quote> collection
-	  installed, you can install the libraries by hand instead.
-	  You will need the Linux shared libraries that the program
-	  depends on and the runtime linker.  Also, you will need to
-	  create a <quote>shadow root</quote> directory,
-	  <filename>/compat/linux</filename>, for Linux libraries
-	  on your FreeBSD system.  Any shared libraries opened by
-	  Linux programs run under FreeBSD will look in this tree
-	  first.  So, if a Linux program loads, for example,
-	  <filename>/lib/libc.so</filename>, FreeBSD will first try
-	  to open <filename>/compat/linux/lib/libc.so</filename>,
-	  and if that does not exist, it will then try
-	  <filename>/lib/libc.so</filename>.  Shared libraries should
-	  be installed in the shadow tree
-	  <filename>/compat/linux/lib</filename> rather than the paths
-	  that the Linux <command>ld.so</command> reports.</para>
-
-	<para>Generally, you will need to look for the shared
-	  libraries that Linux binaries depend on only the first few
-	  times that you install a Linux program on your FreeBSD
-	  system.  After a while, you will have a sufficient set of
-	  Linux shared libraries on your system to be able to run
-	  newly imported Linux binaries without any extra work.</para>
-      </sect3>
+    <para>Users who prefer to statically link &linux; binary
+      compatibility into the kernel should add <literal>options
+	COMPAT_LINUX</literal> to the custom kernel configuration
+      file.  Compile and install the new kernel as described in <link
+	linkend="kernelconfig"></link>.</para>
+
+    <sect2 id="linuxemu-libs-manually">
+      <title>Installing Libraries Manually</title>
+
+      <para>While using the Ports Collection is recommended, &linux;
+	libraries can be installed manually.  The &linux; shared
+	libraries required by a program and the runtime linker
+	should be copied to <filename
+	  class="directory">/compat/linux</filename>.  Any shared
+	libraries opened by &linux; programs run under &os; will
+	look in this directory first.  For example, if a &linux;
+	program loads <filename>/lib/libc.so</filename>, &os; will
+	first try to open
+	<filename>/compat/linux/lib/libc.so</filename>, and if that
+	does not exist, it will then try
+	<filename>/lib/libc.so</filename>.  Shared libraries should
+	be installed to <filename
+	  class="directory">/compat/linux/lib</filename> rather than
+	to the paths that the &linux; <command>ld.so</command>
+	reports.</para>
+
+      <para>Generally, one will need to look for the shared
+	libraries that &linux; binaries depend on only the first few
+	times that a &linux; program is installed on &os;.  After a
+	while, there will be a sufficient set of &linux; shared
+	libraries on the system to be able to run newly imported
+	&linux; binaries without any extra work.</para>
 
       <sect3>
 	<title>How to Install Additional Shared Libraries</title>
 
 	<indexterm><primary>shared libraries</primary></indexterm>
 
-	<para>What if you install the <filename>linux_base</filename>
-	  port and your application still complains about missing
-	  shared libraries?  How do you know which shared libraries
-	  Linux binaries need, and where to get them?  Basically,
-	  there are 2 possibilities (when following these instructions
-	  you will need to be <username>root</username> on your
-	  FreeBSD system).</para>
-
-	<para>If you have access to a Linux system, see what shared
-	  libraries the application needs, and copy them to your
-	  FreeBSD system.  Look at the following example:</para>
+	<para>If the <literal>linux_base</literal> port is installed
+	  and an application still complains about missing shared
+	  libraries, there are two methods <username>root</username>
+	  can use to determine which shared libraries the &linux;
+	  binaries need.</para>
+
+	<para>If a &linux; system is available, determine which shared
+	  libraries the application needs, and copy them to the &os;
+	  system.</para>
 
 	<informalexample>
-	  <para>Let us assume you used FTP to get the Linux binary
-	    of <application>Doom</application>, and put it on a Linux
-	    system you have access to.  You then can check which
-	    shared libraries it needs by running
-	    <command>ldd linuxdoom</command>, like so:</para>
+	  <para>In this example, FTP was used to download the &linux;
+	    binary of <application>Doom</application> on a &linux;
+	    system .  To check which shared libraries it needs, run
+	    <command>ldd linuxdoom</command>:</para>
 
 	  <screen>&prompt.user; <userinput>ldd linuxdoom</userinput>
 libXt.so.3 (DLL Jump 3.1) =&gt; /usr/X11/lib/libXt.so.3.1.0
@@ -252,12 +199,11 @@ libX11.so.3 (DLL Jump 3.1) =&gt; /usr/X1
 libc.so.4 (DLL Jump 4.5pl26) =&gt; /lib/libc.so.4.6.29</screen>
 
 	  <indexterm><primary>symbolic links</primary></indexterm>
-	  <para>You would need to get all the files from the last
-	    column, and put them under
-	    <filename>/compat/linux</filename>, with the names in
-	    the first column as symbolic links pointing to them.
-	    This means you eventually have these files on your
-	    FreeBSD system:</para>
+	  <para>Copy all the files in the last column into
+	    <filename class="directory">/compat/linux</filename> on
+	    the &os; system, with the names in the first column as
+	    symbolic links pointing to them.  This example will result
+	    in the following files on the &os; system:</para>
 
 	  <screen>/compat/linux/usr/X11/lib/libXt.so.3.1.0
 /compat/linux/usr/X11/lib/libXt.so.3 -&gt; libXt.so.3.1.0
@@ -268,33 +214,31 @@ libc.so.4 (DLL Jump 4.5pl26) =&gt; /lib/
 
 	  <blockquote>
 	    <note>
-	      <para>Note that if you already have a Linux shared
-		library with a matching major revision number to the
-		first column of the <command>ldd</command> output,
-		you will not need to copy the file named in the last
-		column to your system, the one you already have should
-		work.  It is advisable to copy the shared library
-		anyway if it is a newer version, though.  You can
-		remove the old one, as long as you make the symbolic
-		link point to the new one.  So, if you have these
-		libraries on your system:</para>
+	      <para>If a &linux; shared library already exists with a
+		matching major revision number to the first column of
+		the <command>ldd</command> output, it does not need to
+		be copied to the file named in the last column, as the
+		existing library should work.  It is advisable to copy
+		the shared library if it is a newer version, though.
+		The old one can be removed, as long as the symbolic
+		link points to the new one.  For example, these
+		libraries exist on the system:</para>
 
 	      <screen>/compat/linux/lib/libc.so.4.6.27
 /compat/linux/lib/libc.so.4 -&gt; libc.so.4.6.27</screen>
 
-	      <para>and you find a new binary that claims to require a
-		later version according to the output of
+	      <para>and a binary claims to require a later version
+		according to the output of
 		<command>ldd</command>:</para>
 
 	      <screen>libc.so.4 (DLL Jump 4.5pl26) -&gt; libc.so.4.6.29</screen>
 
 	      <para>If it is only one or two versions out of date
-		in the trailing digit then do not worry about copying
-		<filename>/lib/libc.so.4.6.29</filename> too, because
+		in the trailing digit, do not worry about copying
+		<filename>/lib/libc.so.4.6.29</filename>, because
 		the program should work fine with the slightly older
-		version.  However, if you like, you can decide to
-		replace the <filename>libc.so</filename> anyway, and
-		that should leave you with:</para>
+		version.  However, it is safe to replace the
+		<filename>libc.so</filename>:</para>
 
 	      <screen>/compat/linux/lib/libc.so.4.6.29
 /compat/linux/lib/libc.so.4 -&gt; libc.so.4.6.29</screen>
@@ -304,10 +248,9 @@ libc.so.4 (DLL Jump 4.5pl26) =&gt; /lib/
 	  <blockquote>
 	    <note>
 	      <para>The symbolic link mechanism is
-		<emphasis>only</emphasis> needed for Linux binaries.
-		The FreeBSD runtime linker takes care of looking for
-		matching major revision numbers itself and you do not
-		need to worry about it.</para>
+		<emphasis>only</emphasis> needed for &linux; binaries
+		as the &os; runtime linker takes care of looking for
+		matching major revision numbers.</para>
 	    </note>
 	  </blockquote>
 	</informalexample>
@@ -315,7 +258,7 @@ libc.so.4 (DLL Jump 4.5pl26) =&gt; /lib/
     </sect2>
 
     <sect2>
-      <title>Installing Linux ELF Binaries</title>
+      <title>Installing &linux; ELF Binaries</title>
 
       <indexterm>
 	<primary>Linux</primary>
@@ -323,69 +266,71 @@ libc.so.4 (DLL Jump 4.5pl26) =&gt; /lib/
       </indexterm>
 
       <para>ELF binaries sometimes require an extra step of
-	<quote>branding</quote>.  If you attempt to run an unbranded
-	ELF binary, you will get an error message like the
+	<quote>branding</quote>.  If an unbranded ELF binary is
+	executed, it will generate an error message like the
 	following:</para>
 
       <screen>&prompt.user; <userinput>./my-linux-elf-binary</userinput>
 ELF binary type not known
 Abort</screen>
 
-      <para>To help the FreeBSD kernel distinguish between a FreeBSD
-	ELF binary and a Linux binary, use the &man.brandelf.1;
-	utility.</para>
+      <para>To help the &os; kernel distinguish between a &os;
+	ELF binary and a &linux; binary, use &man.brandelf.1;:</para>
 
       <screen>&prompt.user; <userinput>brandelf -t Linux my-linux-elf-binary</userinput></screen>
 
       <indexterm><primary>GNU toolchain</primary></indexterm>
-      <para>The GNU toolchain now places the appropriate branding
-	information into ELF binaries automatically, so this step
-	should become increasingly unnecessary in the future.</para>
+      <para>Since the GNU toolchain places the appropriate branding
+	information into ELF binaries automatically, this step is
+	usually not necessary.</para>
     </sect2>
 
     <sect2>
-      <title>Installing a Random Linux RPM Based Application</title>
-
-      <para>FreeBSD has its own package database and it is used to
-	track all ports (&linux; ports as well).  So the &linux; RPM
-	database is not used (not supported).</para>
+      <title>Installing a &linux; RPM Based Application</title>
 
-      <para>However if you need to install a random &linux;
-	RPM-based application it can be achieved by:</para>
+      <para>&os; uses its own package database to track all software
+	installed from the Ports Collection.  However, the &linux; RPM
+	database is not supported.</para>
+
+      <para>In order to install a &linux; RPM-based application, first
+	install the <filename
+	  role="package">archivers/rpm2cpio</filename> package or
+	port.  Once installed, <username>root</username> can use this
+	command to install a <filename>.rpm</filename> as
+	follows:</para>
 
       <screen>&prompt.root; <userinput>cd /compat/linux</userinput>
 &prompt.root; <userinput>rpm2cpio -q &lt; /path/to/linux.archive.rpm | cpio -id</userinput></screen>
 
-      <para>Then brandelf installed ELF binaries (not libraries!).
-	You will not be able to do a clean uninstall, but it may
-	help you to do tests.</para>
+      <para>If necessary, <command>brandelf</command> the installed
+	ELF binaries, but <emphasis>not</emphasis> the libraries.
+	Note that this will prevent a clean uninstall.</para>
     </sect2>
 
     <sect2>
       <title>Configuring the Hostname Resolver</title>
 
-      <para>If DNS does not work or you get this message:</para>
+      <para>If DNS does not work or this error appears:</para>
 
       <screen>resolv+: "bind" is an invalid keyword resolv+:
 "hosts" is an invalid keyword</screen>
 
-      <para>You will need to configure a
-	<filename>/compat/linux/etc/host.conf</filename> file
-	containing:</para>
+      <para>Configure
+	<filename>/compat/linux/etc/host.conf</filename> as
+	follows:</para>
 
       <programlisting>order hosts, bind
 multi on</programlisting>
 
-      <para>The order here specifies that
+      <para>This order specifies that
 	<filename>/etc/hosts</filename> is searched first and DNS
 	is searched second.  When
-	<filename>/compat/linux/etc/host.conf</filename> is not
-	installed, Linux applications find FreeBSD's
+	<filename>/compat/linux/etc/host.conf</filename> does not
+	exist, &linux; applications use
 	<filename>/etc/host.conf</filename> and complain about the
-	incompatible FreeBSD syntax.  You should remove
-	<literal>bind</literal> if you have not configured a name
-	server using the <filename>/etc/resolv.conf</filename>
-	file.</para>
+	incompatible &os; syntax.  Remove
+	<literal>bind</literal> if a name server is not configured
+	using <filename>/etc/resolv.conf</filename>.</para>
     </sect2>
   </sect1>
 
@@ -406,47 +351,46 @@ multi on</programlisting>
       <secondary><application>Mathematica</application></secondary>
     </indexterm>
 
-    <para>This document describes the process of installing the Linux
-      version of <application>&mathematica; 5.X</application> onto
-      a FreeBSD system.</para>
-
-    <para>The Linux version of
-      <application>&mathematica;</application>
-      or <application>&mathematica; for Students</application> can
-      be ordered directly from Wolfram at
-      <ulink url="http://www.wolfram.com/"></ulink>.</para>
+    <para>This section describes the process of installing the
+      &linux; version of <application>&mathematica; 5.X</application>
+      onto a &os; system.  <application>&mathematica;</application>
+      is a commercial, computational software program used in
+      scientific, engineering, and mathematical fields.  It is
+      available from <ulink
+	url="http://www.wolfram.com/mathematica/">Wolfram
+	Research</ulink>.</para>
 
     <sect2>
       <title>Running the &mathematica; Installer</title>
 
-      <para>First, you have to tell &os; that
-	<application>&mathematica;</application>'s Linux
-	binaries use the Linux ABI.  The easiest way to do so is to
-	set the default ELF brand
-	to Linux for all unbranded binaries with the command:</para>
+      <para>First, tell &os; that
+	<application>&mathematica;</application>'s &linux;
+	binaries use the &linux; Application Binary Interface
+	<acronym>ABI</acronym>.  The easiest way to do this is to
+	set the default ELF brand to &linux; for all unbranded
+	binaries with the command:</para>
 
       <screen>&prompt.root; <userinput>sysctl kern.fallback_elf_brand=3</userinput></screen>
 
-      <para>This will make &os; assume that unbranded ELF binaries
-	use the Linux ABI and so you should be able to run the
-	installer straight from the CDROM.</para>
+      <para>&os; will now assume that unbranded ELF binaries
+	use the &linux; <acronym>ABI</acronym> which should allow the
+	installer to execute from the CDROM.</para>
 
-      <para>Now, copy the file <filename>MathInstaller</filename> to
-	your hard drive:</para>
+      <para>Copy the <filename>MathInstaller</filename> to the hard
+	drive:</para>
 
       <screen>&prompt.root; <userinput>mount /cdrom</userinput>
 &prompt.root; <userinput>cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/</userinput></screen>
 
-      <para>and in this file, replace <literal>/bin/sh</literal> in
-	the first line by <literal>/compat/linux/bin/sh</literal>.
-	This makes sure that the installer is executed by the Linux
+      <para>In this file, replace <literal>/bin/sh</literal> in
+	the first line with <literal>/compat/linux/bin/sh</literal>.
+	This ensures that the installer is executed by the &linux;
 	version of &man.sh.1;.  Next, replace all occurrences of
-	<literal>Linux)</literal> by <literal>FreeBSD)</literal> with
-	a text editor or the script below in the next section.  This
-	tells the <application>&mathematica;</application> installer,
-	who calls <command>uname -s</command> to determine the
-	operating system, to treat &os; as a Linux-like operating
-	system.  Invoking <command>MathInstaller</command> will now
+	<literal>Linux)</literal> with <literal>FreeBSD)</literal>
+	using a text editor or the script below in the next section.
+	This tells the <application>&mathematica;</application>
+	installer, to treat &os; as a &linux;-like operating
+	system.  Invoking <command>MathInstaller</command> should now
 	install <application>&mathematica;</application>.</para>
     </sect2>
 
@@ -455,17 +399,17 @@ multi on</programlisting>
 
       <para>The shell scripts that
 	<application>&mathematica;</application> created during
-	installation have to be modified before you can use them.
-	If you chose <filename
+	installation have to be modified before use.  When using
+	<filename
 	  class="directory">/usr/local/bin</filename> as the directory
-	to place the
-	<application>&mathematica;</application> executables in, you
-	will find symlinks in this directory to files called
-	<filename>math</filename>, <filename>mathematica</filename>,
+	for the <application>&mathematica;</application>
+	executables, symlinks in this directory will point to files
+	called <filename>math</filename>,
+	<filename>mathematica</filename>,
 	<filename>Mathematica</filename>, and
 	<filename>MathKernel</filename>.  In each of these, replace
-	<literal>Linux)</literal> by <literal>FreeBSD)</literal> with
-	a text editor or the following shell script:</para>
+	<literal>Linux)</literal> with <literal>FreeBSD)</literal>
+	using a text editor or the following shell script:</para>
 
       <programlisting>#!/bin/sh
 cd /usr/local/bin
@@ -478,90 +422,85 @@ done</programlisting>
     </sect2>
 
     <sect2>
-      <title>Obtaining Your &mathematica; Password</title>
+      <title>Obtaining a &mathematica; Password</title>
 
       <indexterm>
 	<primary>Ethernet</primary>
 	<secondary>MAC address</secondary>
       </indexterm>
 
-      <para>When you start <application>&mathematica;</application>
-	for the first time, you will be asked for a password.  If you
-	have not yet obtained a password from Wolfram, run the program
+      <para>When <application>&mathematica;</application> is started
+	for the first time, it will ask for a password.  If a password
+	had not yet been obtained from Wolfram Research, run
 	<command>mathinfo</command> in the installation directory to
-	obtain your <quote>machine ID</quote>.  This machine ID is
-	based solely on the MAC address of your first Ethernet card,
-	so you cannot run your copy of
-	<application>&mathematica;</application> on different
-	machines.</para>
-
-      <para>When you register with Wolfram, either by email, phone
-	or fax, you will give them the <quote>machine ID</quote> and
-	they will respond with a corresponding password consisting
-	of groups of numbers.</para>
+	obtain the <quote>machine ID</quote>.  This machine ID is
+	based solely on the MAC address of the first Ethernet card,
+	as the copy of <application>&mathematica;</application> cannot
+	run on different machines.</para>
+
+      <para>When registering with Wolfram Research, provide the
+	<quote>machine ID</quote> and they will respond with a
+	corresponding password consisting of groups of numbers.</para>
     </sect2>
 
     <sect2>
       <title>Running the &mathematica; Frontend over a Network</title>
 
       <para><application>&mathematica;</application> uses some special
-	fonts to display characters not
-	present in any of the standard font sets (integrals, sums,
-	Greek letters, etc.).  The X protocol requires these fonts
-	to be install <emphasis>locally</emphasis>.  This means you
-	will have to copy these fonts from the CDROM or from a host
-	with <application>&mathematica;</application> installed to
-	your local machine.  These fonts are normally stored in
-	<filename>/cdrom/Unix/Files/SystemFiles/Fonts</filename> on
-	the CDROM, or
-	<filename>/usr/local/mathematica/SystemFiles/Fonts</filename>
-	on your hard drive.  The actual fonts are in the
-	subdirectories <filename>Type1</filename> and
-	<filename>X</filename>.  There are several ways to use them,
-	as described below.</para>
-
-      <para>The first way is to copy them into one of the existing
-	font directories in
-	<filename>/usr/X11R6/lib/X11/fonts</filename>.  This will
-	require editing the <filename>fonts.dir</filename> file,
-	adding the font names to it, and changing the number of fonts
-	on the first line.  Alternatively, you should also just be
-	able to run &man.mkfontdir.1; in the directory you have copied
-	them to.</para>
+	fonts to display characters not present in any of the standard
+	font sets.  <application>Xorg</application> requires these
+	fonts to be installed locally.  This means that these fonts
+	need to be copied from the CDROM or from a host with
+	<application>&mathematica;</application> installed to the
+	local machine.  These fonts are normally stored in
+	<filename
+	  class="directory">/cdrom/Unix/Files/SystemFiles/Fonts</filename>
+	on the CDROM, or <filename
+	  class="directory">/usr/local/mathematica/SystemFiles/Fonts</filename>
+	on the hard drive.  The actual fonts are in the subdirectories
+	<filename class="directory">Type1</filename> and
+	<filename class="directory">X</filename>.  There are several
+	ways to use them, as described below.</para>
+
+      <para>The first way is to copy the fonts into one of the
+	existing font directories in <filename
+	  class="directory">/usr/local/lib/X11/fonts</filename> then
+	running &man.mkfontdir.1; within the directory containing the
+	new fonts.</para>
 
       <para>The second way to do this is to copy the directories to
-	<filename>/usr/X11R6/lib/X11/fonts</filename>:</para>
+	<filename
+	  class="directory">/usr/local/lib/X11/fonts</filename>:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts</userinput>
 &prompt.root; <userinput>mkdir X</userinput>
 &prompt.root; <userinput>mkdir MathType1</userinput>
 &prompt.root; <userinput>cd /cdrom/Unix/Files/SystemFiles/Fonts</userinput>
-&prompt.root; <userinput>cp X/* /usr/X11R6/lib/X11/fonts/X</userinput>
-&prompt.root; <userinput>cp Type1/* /usr/X11R6/lib/X11/fonts/MathType1</userinput>
-&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/X</userinput>
+&prompt.root; <userinput>cp X/* /usr/local/lib/X11/fonts/X</userinput>
+&prompt.root; <userinput>cp Type1/* /usr/local/lib/X11/fonts/MathType1</userinput>
+&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/X</userinput>
 &prompt.root; <userinput>mkfontdir</userinput>
 &prompt.root; <userinput>cd ../MathType1</userinput>
 &prompt.root; <userinput>mkfontdir</userinput></screen>
 
-      <para>Now add the new font directories to your font path:</para>
+      <para>Now add the new font directories to the font path:</para>
 
-      <screen>&prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/X</userinput>
-&prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/MathType1</userinput>
+      <screen>&prompt.root; <userinput>xset fp+ /usr/local/lib/X11/fonts/X</userinput>
+&prompt.root; <userinput>xset fp+ /usr/local/lib/X11/fonts/MathType1</userinput>
 &prompt.root; <userinput>xset fp rehash</userinput></screen>
 
-      <para>If you are using the <application>&xorg;</application>
-	server, you can have these font directories loaded
-	automatically by adding them to your
-	<filename>xorg.conf</filename> file.</para>
+      <para>When using the <application>&xorg;</application> server,
+	these font directories can be loaded automatically by adding
+	them to <filename>/etc/X11/xorg.conf</filename>.</para>
 
       <indexterm><primary>fonts</primary></indexterm>
 
-      <para>If you <emphasis>do not</emphasis> already have a
-	directory called
-	<filename>/usr/X11R6/lib/X11/fonts/Type1</filename>, you
-	can change the name of the <filename>MathType1</filename>
-	directory in the example above to
-	<filename>Type1</filename>.</para>
+      <para>If <filename
+	  class="directory">/usr/local/lib/X11/fonts/Type1</filename>
+	does not already exist, change the name of the <filename
+	  class="directory">MathType1</filename> directory in the
+	example above to <filename
+	  class="directory">Type1</filename>.</para>
     </sect2>
   </sect1>
 
@@ -593,11 +532,11 @@ done</programlisting>
 
     <para><application>&maple;</application> is a commercial
       mathematics program similar to
-      <application>&mathematica;</application>.  You must purchase
-      this software from <ulink
-	url="http://www.maplesoft.com/"></ulink> and then register
-      there for a license file.  To install this software on FreeBSD,
-      please follow these simple steps.</para>
+      <application>&mathematica;</application>.  This software must be
+      purchased and licensed from <ulink
+	url="http://www.maplesoft.com/products/maple/">Maplesoft</ulink>.
+      To install the &linux; version of this software on &os;, follow
+      these steps.</para>
 
     <procedure>
       <step><para>Execute the <filename>INSTALL</filename> shell
@@ -607,23 +546,25 @@ done</programlisting>
 	might be <filename
 	  class="directory">/usr/local/maple</filename>.</para></step>
 
-      <step><para>If you have not done so, order a license for
-	<application>&maple;</application> from Maple Waterloo
-	Software (<ulink
-	  url="http://register.maplesoft.com/"></ulink>) and copy it
-	to
-	  <filename>/usr/local/maple/license/license.dat</filename>.</para></step>
-
-	<step><para>Install the <application>FLEXlm</application>
-	  license manager by running the
+      <step>
+	<para>Copy the license to
+	  <filename>/usr/local/maple/license/license.dat</filename>.</para>
+      </step>
+
+      <step>
+	<para>Install the <application>FLEXlm</application> license
+	  manager by running the
 	  <filename>INSTALL_LIC</filename> install shell script that
-	  comes with <application>&maple;</application>.  Specify the
-	  primary hostname for your machine for the license
-	  server.</para></step>
+	  comes with <application>&maple;</application>.  Specify
+	  the primary hostname for the machine for the license
+	  server.</para>
+      </step>
 
-	<step><para>Patch the
+      <step>
+	<para>Patch
 	  <filename>/usr/local/maple/bin/maple.system.type</filename>
-	  file with the following:</para>
+	  with the following:</para>
+
 	<programlisting>   ----- snip ------------------
 *** maple.system.type.orig      Sun Jul  8 16:35:33 2001
 --- maple.system.type   Sun Jul  8 16:35:51 2001
@@ -639,12 +580,11 @@ done</programlisting>
         # We have two Linux implementations, one for Red Hat and
    ----- snip end of patch -----</programlisting>
 
-	<para>Please note that after the
-	  <literal>"FreeBSD"|\</literal> no other whitespace should
-	  be present.</para>
+	<para>Note that no whitespace should be present after
+	  <literal>"FreeBSD"|\</literal>.</para>
 
 	<para>This patch instructs <application>&maple;</application>
-	  to recognize <quote>FreeBSD</quote> as a type of Linux
+	  to recognize &os; as a type of &linux;
 	  system.  The <filename>bin/maple</filename> shell script
 	  calls the <filename>bin/maple.system.type</filename> shell
 	  script which in turn calls <command>uname -a</command> to
@@ -660,7 +600,7 @@ done</programlisting>
 	<programlisting>   ----- snip ------------
 
 #! /bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 PATH=${PATH}:/usr/local/maple/bin:/usr/local/maple/FLEXlm/UNIX/LINUX
 export PATH
 
@@ -685,14 +625,14 @@ exit 0
    ----- snip ------------</programlisting></step>
 
 
-      <step><para>Test-start
-	<application>&maple;</application>:</para>
+      <step><para>Test that
+	<application>&maple;</application> starts:</para>
 
       <screen>&prompt.user; <userinput>cd /usr/local/maple/bin</userinput>
 &prompt.user; <userinput>./xmaple</userinput></screen>
 
-	<para>You should be up and running.  Make sure to write
-	  Maplesoft to let them know you would like a native FreeBSD
+	<para>Once everything is working, consider writing
+	  Maplesoft to let them know you would like a native &os;
 	  version!</para></step>
       </procedure>
 
@@ -700,14 +640,8 @@ exit 0
 	<title>Common Pitfalls</title>
 
 	<itemizedlist>
-	  <listitem><para>The <application>FLEXlm</application>
-	    license manager can be a difficult tool to work with.
-	    Additional documentation on the subject can be found at
-	    <ulink
-	      url="http://www.globetrotter.com/"></ulink>.</para></listitem>
-
-	  <listitem><para><command>lmgrd</command> is known to be very
-	    picky about the license file and to core dump if there
+	  <listitem><para><command>lmgrd</command> is known to be
+	    picky about the license file and to dump core if there
 	    are any problems.  A correct license file should look
 	    like this:</para>
 
@@ -724,12 +658,15 @@ FEATURE Maple maplelmg 2000.0831 permane
          ISSUED=11-may-2000 NOTICE=" Technische Universitat Wien" \
          SN=XXXXXXXXX</programlisting>
 
-	  <note><para>Serial number and key 'X''ed out.
-	    <hostid>chillig</hostid> is a hostname.</para></note>
-
-	  <para>Editing the license file works as long as you do not
-	    touch the <quote>FEATURE</quote> line (which is protected
-	    by the license key).</para></listitem>
+	  <note>
+	    <para>In this example, the serial number and key were
+	      replaced with <literal>X</literal>.
+	      <hostid>chillig</hostid> is the hostname.</para>
+	  </note>
+
+	  <para>Editing the license file works as long as the
+	    <quote>FEATURE</quote> line is not edited.  That line is
+	    protected by the license key.</para></listitem>
 	</itemizedlist>
       </sect2>
     </sect1>
@@ -752,41 +689,38 @@ FEATURE Maple maplelmg 2000.0831 permane
       <secondary><application>MATLAB</application></secondary>
     </indexterm>
 
-    <para>This document describes the process of installing the Linux
-      version of <application>&matlab; version 6.5</application> onto
-      a &os; system.  It works quite well, with the exception of the
-      <application>&java.virtual.machine;</application> (see
-      <xref linkend="matlab-jre"/>).</para>
-
-    <para>The Linux version of <application>&matlab;</application>
-      can be ordered directly from The MathWorks at <ulink
-	url="http://www.mathworks.com"></ulink>.  Make sure you also
-      get the license file or instructions how to create it.  While
-      you are there, let them know you would like a native &os;
-      version of their software.</para>
+    <para>This document describes the process of installing the
+      &linux; version of <application>&matlab; version
+	6.5</application> onto a &os; system.  It works quite well,
+      with the exception of the
+      <application>&java.virtual.machine;</application> which is
+      described further in <link linkend="matlab-jre"></link>.</para>
+
+    <para>The &linux; version of <application>&matlab;</application>
+      can be purchased and licensed from <ulink
+	url="http://www.mathworks.com/products/matlab/">
+	MathWorks</ulink>.  Consider letting the company know that
+      you would like a native &os; version of this software.</para>
 
     <sect2>
       <title>Installing &matlab;</title>
 
-      <para>To install <application>&matlab;</application>, do the
-	following:</para>
+      <para>To install <application>&matlab;</application>:</para>
 
       <procedure>
 	<step>
-	  <para>Insert the installation CD and mount it.
-	    Become <username>root</username>, as recommended by the
-	    installation script.  To start the installation script
-	    type:</para>
+	  <para>Become <username>root</username>, as recommended by
+	    the installation script.  Insert the installation CD and
+	    mount it.  To start the installation script type:</para>
 
 	  <screen>&prompt.root; <userinput>/compat/linux/bin/sh /cdrom/install</userinput></screen>
 
 	  <tip>
-	    <para>The installer is graphical.  If you get errors about
-	      not being able to open a display, type
-	      <command>setenv HOME
+	    <para>The installer is graphical.  If it is not able to
+	      open a display, type <command>setenv HOME
 		~<replaceable>USER</replaceable></command>,
-	      where <replaceable>USER</replaceable> is the user you
-	      did a &man.su.1; as.</para>
+	      where <replaceable>USER</replaceable> is the user who
+	      ran &man.su.1;.</para>
 	  </tip>
 	</step>
 
@@ -798,22 +732,20 @@ FEATURE Maple maplelmg 2000.0831 permane
 
 	  <tip>
 	    <para>For easier typing on the rest of the installation
-	      process, type this at your shell prompt:
-	      <command>set
-		  MATLAB=/compat/linux/usr/local/matlab</command></para>
+	      process, type this at the shell prompt: <command>set
+		MATLAB=/compat/linux/usr/local/matlab</command>.</para>
 	  </tip>
 	</step>
 
 	<step>
-	  <para>Edit the license file as instructed when
-	    obtaining the <application>&matlab;</application>
-	      license.</para>
+	  <para>Edit the license file as instructed when obtaining
+	    the <application>&matlab;</application> license.</para>
 
 	  <tip>
-	    <para>You can prepare this file in advance using your
-	      favorite editor, and copy it to
+	    <para>This file can be prepared in advance using an
+	      editor, and copied to
 	      <filename>$MATLAB/license.dat</filename> before the
-	      installer asks you to edit it.</para>
+	      installer asks to edit it.</para>
 	  </tip>
 	</step>
 
@@ -822,9 +754,9 @@ FEATURE Maple maplelmg 2000.0831 permane
 	</step>
       </procedure>
 
-      <para>At this point your <application>&matlab;</application>
+      <para>At this point the <application>&matlab;</application>
 	installation is complete.  The following steps apply
-	<quote>glue</quote> to connect it to your &os; system.</para>
+	<quote>glue</quote> to connect it to the &os; system.</para>
     </sect2>
 
     <sect2>
@@ -840,12 +772,12 @@ FEATURE Maple maplelmg 2000.0831 permane
 	</step>
 
 	<step>
-	  <para>Create a startup file at
+	  <para>Create a startup file named
 	    <filename>/usr/local/etc/rc.d/flexlm</filename>.  The
 	    example below is a modified version of the distributed
 	    <filename>$MATLAB/etc/rc.lm.glnx86</filename>.  The
-	    changes are file locations, and startup of the license
-	    manager under Linux emulation.</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 20:38:17 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C9DC4C4E;
 Wed, 27 Feb 2013 20:38:17 +0000 (UTC) (envelope-from dru@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 BABEFDCF;
 Wed, 27 Feb 2013 20:38:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RKcHt2095380;
 Wed, 27 Feb 2013 20:38:17 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RKcHQb095379;
 Wed, 27 Feb 2013 20:38:17 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302272038.r1RKcHQb095379@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 27 Feb 2013 20:38:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41052 - head/en_US.ISO8859-1/books/handbook/serialcomms
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: Wed, 27 Feb 2013 20:38:17 -0000

Author: dru
Date: Wed Feb 27 20:38:17 2013
New Revision: 41052
URL: http://svnweb.freebsd.org/changeset/doc/41052

Log:
  First pass at this chapter. This patch addresses the following:
  
  - &os;, you, and please
  
  - fix xref, acronym, and directory tags (still needs ulink review)
  
  - removed redundant warning, leaving only first instance; this warning can be removed altogether once 7.x is EOL at end of month
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Tue Feb 26 16:52:43 2013	(r41051)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Wed Feb 27 20:38:17 2013	(r41052)
@@ -13,31 +13,28 @@
 
     <indexterm><primary>serial communications</primary></indexterm>
 
-    <para>&unix; has always had support for serial communications.  In
-      fact, the very first &unix; machines relied on serial lines for
-      user input and output.  Things have changed a lot from the days
-      when the average <quote>terminal</quote> consisted of a
-      10-character-per-second serial printer and a keyboard.  This
-      chapter will cover some of the ways in which FreeBSD uses serial
-      communications.</para>
+    <para>&unix; has always had support for serial communications as
+      the very first &unix; machines relied on serial lines for user
+      input and output.  Things have changed a lot from the days
+      when the average terminal consisted of a 10-character-per-second
+      serial printer and a keyboard.  This chapter covers some of the
+      ways serial communications can be used on &os;.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>How to connect terminals to your FreeBSD
-	  system.</para>
+	<para>How to connect terminals to a &os; system.</para>
       </listitem>
       <listitem>
-	<para>How to use a modem to dial out to remote
-	  hosts.</para>
+	<para>How to use a modem to dial out to remote hosts.</para>
       </listitem>
       <listitem>
-	<para>How to allow remote users to login to your
-	  system with a modem.</para>
+	<para>How to allow remote users to login to a &os; system
+	  with a modem.</para>
       </listitem>
       <listitem>
-	<para>How to boot your system from a serial console.</para>
+	<para>How to boot a &os; system from a serial console.</para>
       </listitem>
     </itemizedlist>
 
@@ -45,17 +42,16 @@
 
     <itemizedlist>
       <listitem>
-	<para>Know how to configure and install a new kernel (<xref
-	    linkend="kernelconfig"/>).</para>
+	<para>Know how to <link linkend="kernelconfig"> configure and
+	    install a custom kernel</link>.</para>
       </listitem>
       <listitem>
-	<para>Understand &unix; permissions and processes (<xref
-	    linkend="basics"/>).</para>
+	<para>Understand <link linkend="basics"> &os; permissions
+	    and processes</link>.</para>
       </listitem>
       <listitem>
 	<para>Have access to the technical manual for the serial
-	  hardware (modem or multi-port card) that you would like to
-	  use with FreeBSD.</para>
+	  hardware to be used with &os;.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -82,30 +78,30 @@
       <variablelist>
 	<indexterm><primary>bits-per-second</primary></indexterm>
 	<varlistentry>
-	  <term>bps</term>
+	  <term><acronym>bps</acronym></term>
 	  <listitem>
-	    <para>Bits per Second &mdash; the rate at which data is
-	      transmitted</para>
+	    <para>Bits per Second (<acronym>bps</acronym>) is the rate
+	      at which data is transmitted.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>DTE</term>
+	  <term><acronym>DTE</acronym></term>
 	  <listitem>
 	    <indexterm><primary>DTE</primary></indexterm>
 
-	    <para>Data Terminal Equipment &mdash; for example, your
-	      computer</para>
+	    <para>An example of a Data Terminal Equipment
+	      (<acronym>DTE</acronym>) is a computer.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>DCE</term>
+	  <term><acronym>DCE</acronym></term>
 	  <listitem>
 	    <indexterm><primary>DCE</primary></indexterm>
 
-	    <para>Data Communications Equipment &mdash; your
-	      modem</para>
+	    <para>An example of a Data Communications Equipment
+	      (<acronym>DTE</acronym>) is a modem.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -115,8 +111,9 @@
 	  <listitem>
 	    <indexterm><primary>RS-232C cables</primary></indexterm>
 
-	    <para>EIA standard for hardware serial
-	      communications</para>
+	    <para>The original standard for hardware serial
+	      communications.  It is now usually referred to as
+	      <acronym>TIA</acronym>-232</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -124,28 +121,26 @@
       <para>When talking about communications data rates, this section
 	does not use the term <quote>baud</quote>.  Baud refers to the
 	number of electrical state transitions that may be made in a
-	period of time, while <quote>bps</quote> (bits per second) is
-	the <emphasis>correct</emphasis> term to use (at least it does
-	not seem to bother the curmudgeons quite as much).</para>
+	period of time, while <acronym>bps</acronym> is the
+	<emphasis>correct</emphasis> term to use.</para>
     </sect2>
 
     <sect2 id="serial-cables-ports">
       <title>Cables and Ports</title>
 
-      <para>To connect a modem or terminal to your FreeBSD system, you
-	will need a serial port on your computer and the proper cable
-	to connect to your serial device.  If you are already familiar
-	with your hardware and the cable it requires, you can safely
-	skip this section.</para>
+      <para>To connect a modem or serial terminal to a &os; system, a
+	serial port on the computer and the proper cable to connect to
+	the serial device are needed.  Users who are already familiar
+	with serial hardware and cabling can safely skip this
+	section.</para>
 
       <sect3 id="term-cables">
 	<title>Cables</title>
 
 	<para>There are several different kinds of serial cables.  The
-	  two most common types for our purposes are null-modem cables
-	  and standard (<quote>straight</quote>) RS-232 cables.  The
-	  documentation for your hardware should describe the type of
-	  cable required.</para>
+	  two most common types are null-modem cables and standard
+	  RS-232 cables.  The documentation for the hardware should
+	  describe the type of cable required.</para>
 
 	<sect4 id="term-cables-null">
 	  <title>Null-modem Cables</title>
@@ -160,16 +155,15 @@
 	    <quote>Transmitted Data</quote> pin on one end goes to the
 	    <quote>Received Data</quote> pin on the other end.</para>
 
-	  <para>You can also construct your own null-modem cable for
-	    use with terminals (e.g., for quality purposes).  This
-	    table shows the RS-232C <link
-	      linkend="serialcomms-signal-names">signals</link>
-	    and the pin numbers on a DB-25 connector.  Note that the
-	    standard also calls for a straight-through pin 1 to pin 1
-	    <emphasis>Protective Ground</emphasis> line, but it is
-	    often omitted.  Some terminals work OK using only pins 2,
-	    3 and 7, while others require different configurations
-	    than the examples shown below.</para>
+	  <para>A null-modem cable can be constructed for use with
+	    terminals.  The following table shows the RS-232C <link
+	      linkend="serialcomms-signal-names">signal names</link>
+	    and the pin numbers on a DB-25 connector.  While the
+	    standard calls for a straight-through pin 1 to pin 1
+	    <emphasis>Protective Ground</emphasis> line, it is often
+	    omitted.  Some terminals work using only pins 2, 3, and
+	    7, while others require different configurations than
+	    the examples shown below.</para>
 
 	  <table frame="none" pgwide="1">
 	    <title>DB-25 to DB-25 Null-Modem Cable</title>
@@ -261,8 +255,8 @@
 	    </tgroup>
 	  </table>
 
-	  <para>Here are two other schemes more common
-	    nowadays.</para>
+	  <para>The next two tables show two other common
+	    schemes.</para>
 
 	  <table frame="none" pgwide="1">
 	    <title>DB-9 to DB-9 Null-Modem Cable</title>
@@ -451,10 +445,9 @@
 	      and a long wire to the other single pin.</para>
 	  </note>
 
-	  <para>The above designs seems to be the most popular.  In
-	    another variation (explained in the book <emphasis>RS-232
-	      Made Easy</emphasis>) SG connects to SG, TD connects to
-	    RD, RTS and CTS connect to DCD, DTR connects to DSR, and
+	  <para>The above designs seem to be the most popular.  In
+	    another variation, SG connects to SG, TD connects to RD,
+	    RTS and CTS connect to DCD, DTR connects to DSR, and
 	    vice-versa.</para>
 	</sect4>
 
@@ -464,11 +457,11 @@
 	  <indexterm><primary>RS-232C cables</primary></indexterm>
 
 	  <para>A standard serial cable passes all of the RS-232C
-	    signals straight through.  That is, the <quote>Transmitted
+	    signals straight through.  The <quote>Transmitted
 	      Data</quote> pin on one end of the cable goes to the
 	    <quote>Transmitted Data</quote> pin on the other end.
-	    This is the type of cable to use to connect a modem to
-	    your FreeBSD system, and is also appropriate for some
+	    This is the type of cable used to connect a modem to
+	    the &os; system, and is also appropriate for some
 	    terminals.</para>
 	</sect4>
       </sect3>
@@ -477,61 +470,61 @@
 	<title>Ports</title>
 
 	<para>Serial ports are the devices through which data is
-	  transferred between the FreeBSD host computer and the
+	  transferred between the &os; host computer and the
 	  terminal.  This section describes the kinds of ports that
-	  exist and how they are addressed in FreeBSD.</para>
+	  exist and how they are addressed in &os;.</para>
 
 	<sect4 id="term-portkinds">
 	  <title>Kinds of Ports</title>
 
-	  <para>Several kinds of serial ports exist.  Before you
-	    purchase or construct a cable, you need to make sure it
-	    will fit the ports on your terminal and on the FreeBSD
+	  <para>Several kinds of serial ports exist.  Before
+	    purchasing or constructing a cable, make sure it will
+	    fit the ports on the terminal and on the &os;
 	    system.</para>
 
-	  <para>Most terminals will have DB-25 ports.  Personal
-	    computers, including PCs running FreeBSD, will have DB-25
-	    or DB-9 ports.  If you have a multiport serial card for
-	    your PC, you may have RJ-12 or RJ-45 ports.</para>
+	  <para>Most terminals have DB-25 ports.  Personal computers
+	    may have DB-25 or DB-9 ports.  A multiport serial card may
+	    have RJ-12 or RJ-45 ports.</para>
 
 	  <para>See the documentation that accompanied the hardware
-	    for specifications on the kind of port in use.  A visual
-	    inspection of the port often works too.</para>
+	    for specifications on the kind of port or visually verify
+	    the type of port.</para>
 	</sect4>
 
 	<sect4 id="term-portnames">
 	  <title>Port Names</title>
 
-	  <para>In FreeBSD, you access each serial port through an
-	    entry in the <filename>/dev</filename> directory.  There
-	    are two different kinds of entries:</para>
+	  <para>In &os;, each serial port is accessed through an
+	    entry in <filename class="directory">/dev</filename>.
+	    There are two different kinds of entries:</para>
 
 	  <itemizedlist>
 	    <listitem>
 	      <para>Call-in ports are named
 		<filename>/dev/ttyu<replaceable>N</replaceable></filename>
 		where <replaceable>N</replaceable> is the port number,
-		starting from zero.  Generally, you use the call-in
-		port for terminals.  Call-in ports require that the
-		serial line assert the data carrier detect (DCD)
-		signal to work correctly.</para>
+		starting from zero.  Generally, the call-in port is
+		used for terminals.  Call-in ports require that the
+		serial line assert the Data Carrier Detect
+		(<acronym>DCD</acronym>) signal to work
+		correctly.</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>Call-out ports are named
 		<filename>/dev/cuau<replaceable>N</replaceable></filename>.
-		You usually do not use the call-out port for
-		terminals, just for modems.  You may use the call-out
-		port if the serial cable or the terminal does not
-		support the carrier detect signal.</para>
+		Call-out ports are usually not used for terminals, but
+		are used for modems.  The call-out port can be used if
+		the serial cable or the terminal does not support the
+		carrier detect signal.</para>
 	    </listitem>
 	  </itemizedlist>
 
-	  <para>If you have connected a terminal to the first serial
-	    port(<devicename>COM1</devicename> in &ms-dos;), then you
-	    will use <filename>/dev/ttyu0</filename> to refer to the
+	  <para>If a terminal is connected to the first serial
+	    port(<devicename>COM1</devicename>), use
+	    <filename>/dev/ttyu0</filename> to refer to the
 	    terminal.  If the terminal is on the second serial port
-	    (also known as <devicename>COM2</devicename>), use
+	    (<devicename>COM2</devicename>), use
 	    <filename>/dev/ttyu1</filename>, and so forth.</para>
 
 	</sect4>
@@ -541,25 +534,25 @@
     <sect2>
       <title>Kernel Configuration</title>
 
-      <para>FreeBSD supports four serial ports by default.  In the
+      <para>&os; supports four serial ports by default.  In the
 	&ms-dos; world, these are known as
 	<devicename>COM1</devicename>,
 	<devicename>COM2</devicename>,
 	<devicename>COM3</devicename>, and
-	<devicename>COM4</devicename>.  FreeBSD currently supports
+	<devicename>COM4</devicename>.  &os; currently supports
 	<quote>dumb</quote> multiport serial interface cards, such as
-	the BocaBoard 1008 and 2016, as well as more
-	intelligent multi-port cards such as those made by Digiboard
-	and Stallion Technologies.  However, the default kernel only
-	looks for the standard COM ports.</para>
-
-      <para>To see if your kernel recognizes any of your serial ports,
-	watch for messages while the kernel is booting, or use the
-	<command>/sbin/dmesg</command> command to replay the kernel's
-	boot messages.  In particular, look for messages that start
-	with the characters <literal>uart</literal> if you use
-	&os;&nbsp;8.0 or higher, or <literal>sio</literal> for
-	&os;&nbsp;7.4 or older.</para>
+	the BocaBoard 1008 and 2016, as well as more intelligent
+	multi-port cards such as those made by Digiboard and Stallion
+	Technologies.  However, the default kernel only looks for the
+	standard COM ports.</para>
+
+      <para>To see if the kernel recognizes the serial ports,
+	watch for messages while the kernel is booting, or use
+	<command>/sbin/dmesg</command> to replay the kernel's
+	boot messages.  Look for messages that start with the
+	characters <literal>uart</literal> for &os;&nbsp;8.0 or
+	higher, or <literal>sio</literal> for &os;&nbsp;7.4 or
+	older.</para>
 
       <tip><para>To view just the messages that have the word
 	<literal>uart</literal> or <literal>sio</literal> depending
@@ -570,7 +563,7 @@
       </tip>
 
       <para>For example, on a &os;&nbsp;7.<replaceable>X</replaceable>
-	system with four serial ports, these are the serial-port
+	system with four serial ports, these are the serial port
 	specific kernel boot messages:</para>
 
       <screen>sio0 at 0x3f8-0x3ff irq 4 on isa
@@ -582,31 +575,30 @@ sio2: type 16550A
 sio3 at 0x2e8-0x2ef irq 9 on isa
 sio3: type 16550A</screen>
 
-      <para>If your kernel does not recognize all of your serial
-	ports, you will probably need to configure your kernel
-	in the <filename>/boot/device.hints</filename> file.  You can
-	also comment-out or completely remove lines for devices you
-	do not have.</para>
-
-      <para>Please refer to the &man.sio.4; manual page for
-	more information on serial ports and multiport boards
-	configuration.  Be careful if you are using a configuration
-	file that was previously used for a different version of
-	FreeBSD because the device flags and the syntax have changed
-	between versions.</para>
+      <para>If the kernel does not recognize all of the serial
+	ports, configure <filename>/boot/device.hints</filename>.
+	When editing this file, one can comment out or completely
+	remove lines for devices that do not exist on the
+	system.</para>
+
+      <para>Refer to &man.sio.4; for more information on
+	configuring serial ports and multiport boards.  When using a
+	configuration file that was previously used for a different
+	version of &os; be aware that the device flags and the syntax
+	may have changed between versions.</para>
 
       <note>
 	<para><literal>port IO_COM1</literal> is a substitution for
 	  <literal>port 0x3f8</literal>, <literal>IO_COM2</literal> is
 	  <literal>0x2f8</literal>, <literal>IO_COM3</literal> is
 	  <literal>0x3e8</literal>, and <literal>IO_COM4</literal> is
-	  <literal>0x2e8</literal>, which are fairly common port
-	  addresses for their respective serial ports; interrupts 4,
-	  3, 5, and 9 are fairly common interrupt request lines.  Also
-	  note that regular serial ports <emphasis>cannot</emphasis>
-	  share interrupts on ISA-bus PCs (multiport boards have
+	  <literal>0x2e8</literal>.  These are fairly common port
+	  addresses for their respective serial ports and interrupts
+	  4, 3, 5, and 9 are fairly common interrupt request lines.
+	  Regular serial ports <emphasis>cannot</emphasis> share
+	  interrupts on ISA-bus PCs.  Multiport boards have
 	  on-board electronics that allow all the 16550A's on the
-	  board to share one or two interrupt request lines).</para>
+	  board to share one or two interrupt request lines.</para>
       </note>
 
     </sect2>
@@ -615,13 +607,13 @@ sio3: type 16550A</screen>
       <title>Device Special Files</title>
 
       <para>Most devices in the kernel are accessed through
-	<quote>device special files</quote>, which are located in the
-	<filename>/dev</filename> directory.  The
+	<quote>device special files</quote> which are located in
+	<filename>/dev class="directory"</filename>.  The
 	<devicename>sio</devicename> devices are accessed through the
 	<filename>/dev/ttyu<replaceable>N</replaceable></filename>
 	(dial-in) and
 	<filename>/dev/cuau<replaceable>N</replaceable></filename>
-	(call-out) devices.  FreeBSD also provides initialization
+	(call-out) devices.  &os; also provides initialization
 	devices
 	(<filename>/dev/ttyu<replaceable>N</replaceable>.init</filename>
 	and
@@ -635,9 +627,9 @@ sio3: type 16550A</screen>
 	such as <literal>crtscts</literal> for modems which use
 	<literal>RTS/CTS</literal> signaling for flow control.  The
 	locking devices are used to lock flags on ports to prevent
-	users or programs changing certain parameters; see the manual
-	pages &man.termios.4;, &man.sio.4;, and &man.stty.1; for
-	information on the terminal settings, locking and initializing
+	users or programs changing certain parameters.  Refer to
+	&man.termios.4;, &man.sio.4;, and &man.stty.1; for
+	information on terminal settings, locking and initializing
 	devices, and setting terminal options, respectively.</para>
     </sect2>
 
@@ -651,20 +643,20 @@ sio3: type 16550A</screen>
       <para>The
 	<devicename>ttyu<replaceable>N</replaceable></devicename> (or
 	<devicename>cuau<replaceable>N</replaceable></devicename>)
-	device is the regular device you will want to open for your
-	applications.  When a process opens the device, it will have a
-	default set of terminal I/O settings.  You can see these
-	settings with the command</para>
+	is the regular device to open for applications.  When a
+	process opens the device, it will have a default set of
+	terminal I/O settings.  These settings can be viewed with the
+	command:</para>
 
       <screen>&prompt.root; <userinput>stty -a -f /dev/ttyu1</userinput></screen>
 
-      <para>When you change the settings to this device, the settings
-	are in effect until the device is closed.  When it is
-	reopened, it goes back to the default set.  To make changes to
-	the default set, you can open and adjust the settings of the
+      <para>When the settings are changed for a device, the settings
+	are in effect until the device is closed.  When the device is
+	reopened, it goes back to the default set.  To permanently
+	change the default set, open and adjust the settings of the
 	<quote>initial state</quote> device.  For example, to turn on
 	<option>CLOCAL</option> mode, 8 bit communication, and
-	<option>XON/XOFF</option> flow control by default for
+	<option>XON/XOFF</option> flow control for
 	<devicename>ttyu5</devicename>, type:</para>
 
     <screen>&prompt.root; <userinput>stty -f /dev/ttyu5.init clocal cs8 ixon ixoff</userinput></screen>
@@ -674,8 +666,8 @@ sio3: type 16550A</screen>
 	<secondary><filename>rc.serial</filename></secondary>
       </indexterm>
 
-      <para>System-wide initialization of the serial devices is
-	controlled in <filename>/etc/rc.d/serial</filename>.  This
+      <para>System-wide initialization of serial devices is
+	controlled by <filename>/etc/rc.d/serial</filename>.  This
 	file affects the default settings of serial devices.</para>
 
       <para>To prevent certain settings from being changed by an
@@ -689,9 +681,8 @@ sio3: type 16550A</screen>
 	<devicename>ttyu5</devicename> and tries to change the speed
 	of the port will be stuck with 57600&nbsp;bps.</para>
 
-      <para>Naturally, you should make the initial state and lock
-	state devices writable only by the <username>root</username>
-	account.</para>
+      <para>The initial state and lock state devices should only be
+	writable by <username>root</username>.</para>
     </sect2>
   </sect1>
 
@@ -708,120 +699,85 @@ sio3: type 16550A</screen>
     </sect1info>
     <title>Terminals</title>
 
-    <warning>
-      <para>As of &os; 8.0, device nodes for serial ports have been
-	renamed from
-	<filename>/dev/cuad<replaceable>N</replaceable></filename> to
-	<filename>/dev/cuau<replaceable>N</replaceable></filename> and
-	from
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename> to
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename>.
-	&os;&nbsp;7.X users will have to adapt the following
-	documentation according to these changes.</para>
-    </warning>
-
     <indexterm><primary>terminals</primary></indexterm>
 
     <para>Terminals provide a convenient and low-cost way to access
-      your FreeBSD system when you are not at the computer's console
-      or on a connected network.  This section describes how to use
-      terminals with FreeBSD.</para>
+      a &os; system when not at the computer's console or on a
+      connected network.  This section describes how to use terminals
+      with &os;.</para>
 
     <sect2 id="term-uses">
       <title>Uses and Types of Terminals</title>
 
       <para>The original &unix; systems did not have consoles.
-	Instead, people logged in and ran programs through terminals
-	that were connected to the computer's serial ports.  It is
-	quite similar to using a modem and terminal software to dial
-	into a remote system to do text-only work.</para>
-
-      <para>Today's PCs have consoles capable of high quality
-	graphics, but the ability to establish a login session on a
-	serial port still exists in nearly every &unix; style
-	operating system today; FreeBSD is no exception.  By using a
-	terminal attached to an unused serial port, you can log in and
-	run any text program that you would normally run on the
-	console or in an <command>xterm</command> window in the X
-	Window System.</para>
-
-      <para>For the business user, you can attach many terminals to a
-	FreeBSD system and place them on your employees' desktops.
-	For a home user, a spare computer such as an older IBM PC or a
-	&macintosh; can be a terminal wired into a more powerful
-	computer running FreeBSD. You can turn what might otherwise be
-	a single-user computer into a powerful multiple user
-	system.</para>
-
-      <para>For FreeBSD, there are three kinds of terminals:</para>
+	Instead, users logged in and ran programs through terminals
+	that were connected to the computer's serial ports.</para>
 
-      <itemizedlist>
-	<listitem>
-	  <para><link linkend="term-dumb">Dumb terminals</link></para>
-	</listitem>
-
-	<listitem>
-	  <para><link linkend="term-pcs">PCs acting as
-	      terminals</link></para>
-	</listitem>
-
-	<listitem>
-	  <para><link linkend="term-x">X terminals</link></para>
-	</listitem>
-      </itemizedlist>
-
-      <para>The remaining subsections describe each kind.</para>
+      <para>The ability to establish a login session on a serial port
+	still exists in nearly every &unix;-like operating system
+	today, including &os;.  By using a terminal attached to an
+	unused serial port, a user can log in and run any text program
+	that can normally be run on the console or in an
+	<command>xterm</command> window.</para>
+
+      <para>Many terminals can be attached to a &os; system.  An older
+	spare computer can be used as a terminal wired into a more
+	powerful computer running &os;.  This can turn what might
+	otherwise be a single-user computer into a powerful multiple
+	user system.</para>
+
+      <para>This section describes three kinds of terminals supported
+	by &os;: dumb terminals, computers acting as terminals, and X
+	terminals.</para>
 
       <sect3 id="term-dumb">
 	<title>Dumb Terminals</title>
 
-	<para>Dumb terminals are specialized pieces of hardware that
-	  let you connect to computers over serial lines.  They are
-	  called <quote>dumb</quote> because they have only enough
-	  computational power to display, send, and receive text.  You
-	  cannot run any programs on them.  It is the computer to
-	  which you connect them that has all the power to run text
+	<para>Dumb terminals are specialized hardware that connect to
+	  computers over serial lines.  They are called
+	  <quote>dumb</quote> because they have only enough
+	  computational power to display, send, and receive text.  No
+	  programs can be run on these devices.  Dumb terminals
+	  connect to a computer that has all the power to run text
 	  editors, compilers, email, games, and so forth.</para>
 
 	<para>There are hundreds of kinds of dumb terminals made by
-	  many manufacturers, including Digital Equipment
-	  Corporation's VT-100 and Wyse's WY-75.  Just about any kind
-	  will work with FreeBSD. Some high-end terminals can even
-	  display graphics, but only certain software packages can
-	  take advantage of these advanced features.</para>
+	  many manufacturers, and just about any kind will work with
+	  &os;.  Some high-end terminals can even display graphics,
+	  but only certain software packages can take advantage of
+	  these advanced features.</para>
 
 	<para>Dumb terminals are popular in work environments where
-	  workers do not need access to graphical applications such as
-	  those provided by the X Window System.</para>
+	  workers do not need access to graphical applications.</para>
       </sect3>
 
       <sect3 id="term-pcs">
-	<title>PCs Acting as Terminals</title>
+	<title>Computers Acting as Terminals</title>
 
 	<para>If a <link linkend="term-dumb">dumb terminal</link> has
-	  just enough ability to display, send, and receive text, then
-	  certainly any spare personal computer can be a dumb
-	  terminal.  All you need is the proper cable and some
-	  <emphasis>terminal emulation</emphasis> software to run on
-	  the computer.</para>
-
-	<para>Such a configuration is popular in homes.  For example,
-	  if your spouse is busy working on your FreeBSD system's
-	  console, you can do some text-only work at the same time
-	  from a less powerful personal computer hooked up as a
-	  terminal to the FreeBSD system.</para>
+	  just enough ability to display, send, and receive text,
+	  any spare computer can be a dumb terminal.  All that is
+	  needed is the proper cable and some <emphasis>terminal
+	    emulation</emphasis> software to run on the
+	  computer.</para>
+
+	<para>This configuration can be useful.  For example, if one
+	  user is busy working at the &os; system's console, another
+	  user can do some text-only work at the same time from a
+	  less powerful personal computer hooked up as a terminal to
+	  the &os; system.</para>
 
 	<para>There are at least two utilities in the base-system of
 	  &os; that can be used to work through a serial connection:
 	  &man.cu.1; and &man.tip.1;.</para>
 
 	<para>To connect from a client system that runs &os; to the
-	  serial connection of another system, you can use:</para>
+	  serial connection of another system, use:</para>
 
 	<screen>&prompt.root; <userinput>cu -l <replaceable>serial-port-device</replaceable></userinput></screen>
 
 	<para>Where <quote>serial-port-device</quote> is the name of a
-	  special device file denoting a serial port of your system.
+	  special device file denoting a serial port on the system.
 	  These device files are called
 	  <devicename>/dev/cuau<replaceable>N</replaceable></devicename>.</para>
 
@@ -830,17 +786,13 @@ sio3: type 16550A</screen>
 
 	<note>
 	  <para>Note that device numbers in &os; start from zero and
-	    not one (like they do, for instance in &ms-dos;-derived
-	    systems).  This means that what &ms-dos;-based systems
-	    call <devicename>COM1</devicename> is usually
+	    not one.  This means that <devicename>COM1</devicename> is
 	    <filename>/dev/cuau0</filename> in &os;.</para>
 	</note>
 
 	<note>
-	  <para>Some people prefer to use other programs, available
-	    through the Ports Collection.  The Ports include quite a
-	    few utilities which can work in ways similar to &man.cu.1;
-	    and &man.tip.1;, i.e., <filename
+	  <para>Some people prefer to use other programs available
+	    through the Ports Collection, such as <filename
 	      role="package">comms/minicom</filename>.</para>
 	</note>
       </sect3>
@@ -854,48 +806,44 @@ sio3: type 16550A</screen>
 	  being relegated to text-only applications, they can display
 	  any X application.</para>
 
-	<para>We introduce X terminals just for the sake of
-	  completeness.  However, this chapter does
-	  <emphasis>not</emphasis> cover setup, configuration, or use
-	  of X terminals.</para>
+	<para>This chapter does <emphasis>not</emphasis> cover the
+	  setup, configuration, or use of X terminals.</para>
       </sect3>
     </sect2>
 
     <sect2 id="term-config">
       <title>Configuration</title>
 
-      <para>This section describes what you need to configure on your
-	FreeBSD system to enable a login session on a terminal.  It
-	assumes you have already configured your kernel to support the
-	serial port to which the terminal is connected&mdash;and that
-	you have connected it.</para>
-
-      <para>Recall from <xref linkend="boot"/> that the
-	<command>init</command> process is responsible for all process
-	control and initialization at system startup.  One of the
-	tasks performed by <command>init</command> is to read the
-	<filename>/etc/ttys</filename> file and start a
+      <para>This section describes how to configure a &os; system to
+	enable a login session on a terminal.  It assumes that the
+	kernel is configured to support the serial port to which the
+	terminal is connected and that the terminal is
+	connected.</para>
+
+      <para>The <command>init</command> process is responsible for all
+	process control and initialization at system startup.  One of
+	the tasks performed by <command>init</command> is to read
+	<filename>/etc/ttys</filename> and start a
 	<command>getty</command> process on the available terminals.
 	The <command>getty</command> process is responsible for
 	reading a login name and starting the <command>login</command>
 	program.</para>
 
-      <para>Thus, to configure terminals for your FreeBSD system the
-	following steps should be taken as
-	<username>root</username>:</para>
+      <para>To configure terminals for a &os; system, the following
+	steps should be taken as <username>root</username>:</para>
 
       <procedure>
 	<step>
 	  <para>Add a line to <filename>/etc/ttys</filename> for the
-	    entry in the <filename>/dev</filename> directory for the
-	    serial port if it is not already there.</para>
+	    entry in <filename class="directory">/dev</filename> for
+	    the serial port if it is not already there.</para>
 	</step>
 
 	<step>
 	  <para>Specify that <command>/usr/libexec/getty</command>
 	    be run on the port, and specify the appropriate
-	    <replaceable>getty</replaceable> type from the
-	    <filename>/etc/gettytab</filename> file.</para>
+	    <replaceable>getty</replaceable> type from
+	    <filename>/etc/gettytab</filename>.</para>
 	</step>
 
 	<step>
@@ -912,53 +860,53 @@ sio3: type 16550A</screen>
 	</step>
 
 	<step>
-	  <para>Force <command>init</command> to reread the
-	    <filename>/etc/ttys</filename> file.</para>
+	  <para>Force <command>init</command> to reread
+	    <filename>/etc/ttys</filename>.</para>
 	</step>
       </procedure>
 
-      <para>As an optional step, you may wish to create a custom
+      <para>As an optional step, create a custom
 	<replaceable>getty</replaceable> type for use in step 2 by
-	making an entry in <filename>/etc/gettytab</filename>.  This
-	chapter does not explain how to do so; you are encouraged to
-	see the &man.gettytab.5; and the &man.getty.8; manual pages
-	for more information.</para>
+	making an entry in <filename>/etc/gettytab</filename>.  For
+	more information, refer to &man.gettytab.5; and
+	&man.getty.8;.</para>
 
       <sect3 id="term-etcttys">
 	<title>Adding an Entry to
 	  <filename>/etc/ttys</filename></title>
 
-	<para>The <filename>/etc/ttys</filename> file lists all of the
-	  ports on your FreeBSD system where you want to allow logins.
-	  For example, the first virtual console
-	  <devicename>ttyv0</devicename> has an entry in this file.
-	  You can log in on the console using this entry.  This
-	  file also contains entries for the other virtual consoles,
-	  serial ports, and pseudo-ttys.  For a hardwired terminal,
-	  just list the serial port's <filename>/dev</filename> entry
-	  without the <filename>/dev</filename> part (for example,
+	<para><filename>/etc/ttys</filename> lists all of the ports
+	  on the &os; system which allow logins.  For example, the
+	  first virtual console,
+	  <devicename>ttyv0</devicename>, has an entry in this file,
+	  allowing logins on the console.  This file also contains
+	  entries for the other virtual consoles, serial ports, and
+	  pseudo-ttys.  For a hardwired terminal,
+	  list the serial port's <filename
+	    class="directory">/dev</filename> entry without the
+	  <literal>/dev</literal> part.  For example,
 	  <filename>/dev/ttyv0</filename> would be listed as
-	  <devicename>ttyv0</devicename>).</para>
+	  <literal>ttyv0</literal>.</para>
 
-	<para>A default FreeBSD install includes an
-	  <filename>/etc/ttys</filename> file with support for the
+	<para>A default &os; install includes an
+	  <filename>/etc/ttys</filename> with support for the
 	  first four serial ports: <devicename>ttyu0</devicename>
-	  through <devicename>ttyu3</devicename>.  If you are
-	  attaching a terminal to one of those ports, you do not need
-	  to add another entry.</para>
+	  through <devicename>ttyu3</devicename>.  When
+	  attaching a terminal to one of those ports, this file does
+	  not need to be edited.</para>
 
 	<example id="ex-etc-ttys">
 	  <title>Adding Terminal Entries to
 	    <filename>/etc/ttys</filename></title>
 
-	  <para>Suppose we would like to connect two terminals to the
-	    system: a Wyse-50 and an old 286 IBM PC running
+	  <para>This example configures two terminals: a Wyse-50 and
+	    an old 286 IBM PC running
 	    <application>Procomm</application> terminal software
-	    emulating a VT-100 terminal.  We connect the Wyse to the
-	    second serial port and the 286 to the sixth serial port (a
-	    port on a multiport serial card).  The corresponding
-	    entries in the <filename>/etc/ttys</filename> file would
-	    look like this:</para>
+	    emulating a VT-100 terminal.  The Wyse is connected to the
+	    second serial port and the 286 to the sixth serial port on
+	    a multiport serial card.  The corresponding entries in
+	    <filename>/etc/ttys</filename> would look like
+	    this:</para>
 
 	  <programlisting>ttyu1<co
 	      id="co-ttys-line1col1"/>  "/usr/libexec/getty std.38400"<co
@@ -972,57 +920,56 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	    <callout arearefs="co-ttys-line1col1">
 	      <para>The first field normally specifies the name of
 		the terminal special file as it is found in
-		<filename>/dev</filename>.</para>
+		<filename class="directory">/dev</filename>.</para>
 	    </callout>
 
 	    <callout arearefs="co-ttys-line1col2">
 	      <para>The second field is the command to execute for
 		this line, which is usually &man.getty.8;.
 		<command>getty</command> initializes and opens the
-		line, sets the speed, prompts for a user name and then
-		executes the &man.login.1; program.</para>
+		line, sets the speed, prompts for a user name, and
+		then executes &man.login.1;.</para>
 
 	      <para>The <command>getty</command> program accepts one
 		(optional) parameter on its command line, the
 		<replaceable>getty</replaceable> type.  A
 		<replaceable>getty</replaceable> type configures
-		characteristics on the terminal line, like bps rate
-		and parity.  The <command>getty</command> program
-		reads these characteristics from the file
-		<filename>/etc/gettytab</filename>.</para>
-
-	      <para>The file <filename>/etc/gettytab</filename>
-		contains lots of entries for terminal lines both old
-		and new.  In almost all cases, the entries that start
-		with the text <literal>std</literal> will work for
-		hardwired terminals.  These entries ignore parity.
-		There is a <literal>std</literal> entry for each bps
-		rate from 110 to 115200.  Of course, you can add your
-		own entries to this file.  The &man.gettytab.5; manual
-		page provides more information.</para>
+		characteristics on the terminal line, like
+		<acronym>bps</acronym> rate and parity.
+		<command>getty</command> reads these characteristics
+		from <filename>/etc/gettytab</filename>.</para>
+
+	      <para><filename>/etc/gettytab</filename> contains many
+		entries for terminal lines, both old and new.  In
+		almost all cases, the entries that start with the
+		text <literal>std</literal> will work for hardwired
+		terminals as these entries ignore parity.  There is
+		a <literal>std</literal> entry for each
+		<acronym>bps</acronym> rate from 110 to 115200.
+		&man.gettytab.5; provides more information.</para>
 
 	      <para>When setting the <replaceable>getty</replaceable>
-		type in the <filename>/etc/ttys</filename> file, make
-		sure that the communications settings on the terminal
+		type in <filename>/etc/ttys</filename>, make sure
+		that the communications settings on the terminal
 		match.</para>
 
-	      <para>For our example, the Wyse-50 uses no parity and
+	      <para>For this example, the Wyse-50 uses no parity and
 		connects at 38400&nbsp;bps.  The 286&nbsp;PC uses no
 		parity and connects at 19200&nbsp;bps.</para>
 	    </callout>
 
 	    <callout arearefs="co-ttys-line1col3">
 	      <para>The third field is the type of terminal usually
-		connected to that tty line.  For dial-up ports,
+		connected to that terminal line.  For dial-up ports,
 		<literal>unknown</literal> or
-		<literal>dialup</literal> is typically used in this
-		field since users may dial up with practically any
-		type of terminal or software.  For hardwired
-		terminals, the terminal type does not change, so you
-		can put a real terminal type from the &man.termcap.5;
-		database file in this field.</para>
+		<literal>dialup</literal> is typically used since
+		users may dial up with practically any type of
+		terminal or software.  Since the terminal type does
+		not change for hardwired terminals, a real terminal
+		type from &man.termcap.5; can be used in this
+		field.</para>
 
-	      <para>For our example, the Wyse-50 uses the real
+	      <para>For this example, the Wyse-50 uses the real
 		terminal type while the 286 PC running
 		<application>Procomm</application> will be set to
 		emulate at VT-100. </para>
@@ -1030,30 +977,31 @@ ttyu5   "/usr/libexec/getty std.19200"  
 
 	    <callout arearefs="co-ttys-line1col4">
 	      <para>The fourth field specifies if the port should be
-		enabled.  Putting <literal>on</literal> here will have
-		the <command>init</command> process start the program
-		in the second field, <command>getty</command>.  If you
-		put <literal>off</literal> in this field, there will
-		be no <command>getty</command>, and hence no logins on
-		the port.</para>
+		enabled.  If set to <literal>on</literal>, the
+		<command>init</command> process will start the program
+		in the second field, <command>getty</command>.  If
+		this field is set to <literal>off</literal>, there
+		will be no <command>getty</command>, and hence no
+		logins on the port.</para>
 	    </callout>
 
 	    <callout arearefs="co-ttys-line1col5">
 	      <para>The final field is used to specify whether the
-		port is secure.  Marking a port as secure means that
-		you trust it enough to allow the
-		<username>root</username> account (or any account with
-		a user ID of 0) to login from that port.  Insecure
-		ports do not allow <username>root</username> logins.
-		On an insecure port, users must login from
-		unprivileged accounts and then use &man.su.1; or a
-		similar mechanism to gain superuser privileges.</para>
-
-	      <para>It is highly recommended that you use
-		<quote>insecure</quote>
-		even for terminals that are behind locked doors.  It
-		is quite easy to login and use <command>su</command>
-		if you need superuser privileges.</para>
+		port is secure.  Marking a port as
+		<literal>secure</literal> means that it is trusted
+		enough to allow <username>root</username>, or any
+		account with a <acronym>UID</acronym> of 0, to login
+		from that port.  Insecure ports do not allow
+		<username>root</username> logins.  On an insecure
+		port, users must login from unprivileged accounts and
+		then use &man.su.1; or a similar mechanism to gain
+		superuser privileges.</para>
+
+	      <para>It is highly recommended to use
+		<literal>insecure</literal>, even for terminals that
+		are behind locked doors.  It is quite easy to login
+		and use <command>su</command> when superuser
+		privileges are needed.</para>
 	    </callout>
 	  </calloutlist>
 	</example>
@@ -1063,34 +1011,34 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	<title>Force <command>init</command> to Reread
 	  <filename>/etc/ttys</filename></title>
 
-	<para>After making the necessary changes to the
-	  <filename>/etc/ttys</filename> file you should send a SIGHUP
+	<para>After making any changes to
+	  <filename>/etc/ttys</filename>, send a SIGHUP
 	  (hangup) signal to the <command>init</command> process to
-	  force it to re-read its configuration file.  For
-	  example:</para>
+	  force it to re-read its configuration file:</para>
 
 	<screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen>
 
 	<note>
 	  <para><command>init</command> is always the first process
-	    run on a system, therefore it will always have PID
-	    1.</para>
+	    run on a system, therefore it will always have a process
+	    ID of 1.</para>
 	</note>
 
 	<para>If everything is set up correctly, all cables are in
 	  place, and the terminals are powered up, then a
 	  <command>getty</command> process should be running on each
-	  terminal and you should see login prompts on your terminals
-	  at this point.</para>
+	  terminal and login prompts should be available on each
+	  terminal.</para>
       </sect3>

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 21:23:55 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7134EA7C;
 Wed, 27 Feb 2013 21:23:55 +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 62DF68A;
 Wed, 27 Feb 2013 21:23:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RLNtH3010193;
 Wed, 27 Feb 2013 21:23:55 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RLNthQ010192;
 Wed, 27 Feb 2013 21:23:55 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302272123.r1RLNthQ010192@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 27 Feb 2013 21:23:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41053 - 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: Wed, 27 Feb 2013 21:23:55 -0000

Author: eadler
Date: Wed Feb 27 21:23:54 2013
New Revision: 41053
URL: http://svnweb.freebsd.org/changeset/doc/41053

Log:
  Update to OptionsNG
  
  PR:		docs/176455
  Submitted by:	jgh
  Approved by:	bcr (mentor)

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	Wed Feb 27 20:38:17 2013	(r41052)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Wed Feb 27 21:23:54 2013	(r41053)
@@ -5749,13 +5749,17 @@ GNU_CONFIGURE=	yes</programlisting>
 
 	<programlisting>GNU_CONFIGURE=		yes
 
-.if !defined(WITHOUT_NLS)
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
-.endif</programlisting>
+.endif
+
+.include &lt;bsd.port.mk&gt;</programlisting>
 
 	<para>The next item on your to-do list is to arrange so that
 	  the message catalog files are included in the packing list

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 21:23:58 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4559AA7F;
 Wed, 27 Feb 2013 21:23:58 +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 35D258C;
 Wed, 27 Feb 2013 21:23:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RLNw2G010232;
 Wed, 27 Feb 2013 21:23:58 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RLNwuA010231;
 Wed, 27 Feb 2013 21:23:58 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302272123.r1RLNwuA010231@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 27 Feb 2013 21:23:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41054 - head/en_US.ISO8859-1/books/handbook/cutting-edge
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: Wed, 27 Feb 2013 21:23:58 -0000

Author: eadler
Date: Wed Feb 27 21:23:57 2013
New Revision: 41054
URL: http://svnweb.freebsd.org/changeset/doc/41054

Log:
  Fix a bunch of grammos and typos
  
  PR:		docs/176451
  Submitted by:	Tom <trh411@gmail.com>
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/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	Wed Feb 27 21:23:54 2013	(r41053)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb 27 21:23:57 2013	(r41054)
@@ -1813,8 +1813,8 @@ Fetching 133 new ports or files... done.
 	up-to-date, refer to <xref linkend="synching"/> for detailed
 	help about synchronizing to a newer version.</para>
 
-      <para>Updating the system from source is a more subtle than
-	it might initially seem to be, and the &os; developers have
+      <para>Updating the system from source is a more subtle process
+        than it might initially seem to be, and the &os; developers have
 	found it necessary over the years to change the recommended
 	approach fairly dramatically as new kinds of unavoidable
 	dependencies come to light.  The rest of this section
@@ -1858,7 +1858,7 @@ Fetching 133 new ports or files... done.
 	</listitem>
 
 	<listitem>
-	  <para>Some configuration changes must be done before the new
+	  <para>Some configuration changes must be made before the new
 	    world is installed, but others might break the old world.
 	    Hence, two different configuration upgrade steps are
 	    generally needed.</para>
@@ -1946,7 +1946,7 @@ Fetching 133 new ports or files... done.
 	  <para><command>mergemaster</command></para>
 
 	  <para>Repeated to update the remaining configuration files,
-	    not that the new world is on disk.</para>
+	    now that the new world is on disk.</para>
 	</listitem>
 
 	<listitem>
@@ -2217,7 +2217,7 @@ Script done, &hellip;</screen>
 	<para><emphasis>Do not</emphasis> save the output in <filename
 	    class="directory">/tmp</filename> as this directory may be
 	  cleared at next reboot.  A better place to save the file is
-	  <filename class="directory">/var/tmp</filename>or in
+	  <filename class="directory">/var/tmp</filename> or in
 	  <username>root</username>'s home directory.</para>
       </sect3>
 
@@ -2234,8 +2234,7 @@ Script done, &hellip;</screen>
 	<para>To rebuild the world, use &man.make.1;.  This command
 	  reads instructions from the <filename>Makefile</filename>,
 	  which describes how the programs that comprise &os; should
-	  be rebuilt and the order in which they should be
-	  built.</para>
+	  be built and the order in which they should be built.</para>
 
 	<para>The general format of the command is as follows:</para>
 
@@ -2542,7 +2541,7 @@ Script done, &hellip;</screen>
       <sect3>
 	<title>Manual Update</title>
 
-	<para>To instead perform the update manually, do not just copy
+	<para>To perform the update manually instead, do not just copy
 	  over the files from
 	  <filename class="directory">/usr/src/etc</filename> to
 	  <filename class="directory">/etc</filename> and expect it to
@@ -2580,7 +2579,7 @@ Script done, &hellip;</screen>
 
 	<para>Next, build a dummy set of directories to install the
 	  new <filename class="directory">/etc</filename> and other
-	  files into.  <filename
+	  files into <filename
 	    class="directory">/var/tmp/root</filename> is a reasonable
 	  choice:</para>
 
@@ -2898,7 +2897,7 @@ Building everything..
 	      <listitem>
 		<para>Turn off profiling by setting
 		  <quote>NO_PROFILE=true</quote> in
-		  <filename>/etc/make.conf</filename>).</para>
+		  <filename>/etc/make.conf</filename>.</para>
 	      </listitem>
 
 	      <listitem>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 21:24:00 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 883D8A82;
 Wed, 27 Feb 2013 21:24:00 +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 754F28D;
 Wed, 27 Feb 2013 21:24:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RLO08v010274;
 Wed, 27 Feb 2013 21:24:00 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RLO0FP010273;
 Wed, 27 Feb 2013 21:24:00 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302272124.r1RLO0FP010273@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 27 Feb 2013 21:24:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41055 - head/en_US.ISO8859-1/books/handbook/kernelconfig
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: Wed, 27 Feb 2013 21:24:00 -0000

Author: eadler
Date: Wed Feb 27 21:23:59 2013
New Revision: 41055
URL: http://svnweb.freebsd.org/changeset/doc/41055

Log:
  Remove 'apm' from the kernel config chapter.   It is not commonly used
  anymore.
  
  Noted by:	bcr
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Feb 27 21:23:57 2013	(r41054)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Feb 27 21:23:59 2013	(r41055)
@@ -1019,17 +1019,6 @@ device          sc</programlisting>
       enable support for AGP and AGP GART for boards which have these
       features.</para>
 
-    <indexterm>
-      <primary>APM</primary>
-    </indexterm>
-
-    <programlisting># Power management support (see NOTES for more options)
-#device          apm</programlisting>
-
-    <para>Advanced Power Management (<acronym>APM</acronym> support.
-      Useful for laptops, although this is disabled in
-      <filename>GENERIC</filename> by default.</para>
-
     <programlisting># Add suspend/resume support for the i8254.
 device           pmtimer</programlisting>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 21:24:02 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C8A52AB9;
 Wed, 27 Feb 2013 21:24:02 +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 BA81C8E;
 Wed, 27 Feb 2013 21:24:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RLO2Us010322;
 Wed, 27 Feb 2013 21:24:02 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RLO22o010321;
 Wed, 27 Feb 2013 21:24:02 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302272124.r1RLO22o010321@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 27 Feb 2013 21:24:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41056 - head/en_US.ISO8859-1/books/handbook/printing
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: Wed, 27 Feb 2013 21:24:02 -0000

Author: eadler
Date: Wed Feb 27 21:24:02 2013
New Revision: 41056
URL: http://svnweb.freebsd.org/changeset/doc/41056

Log:
  Fix minor whitespace issue.
  
  Prompted by:	gavin
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Wed Feb 27 21:23:59 2013	(r41055)
+++ head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Wed Feb 27 21:24:02 2013	(r41056)
@@ -179,7 +179,7 @@
       <title>Why You Should Use the Spooler</title>
 
       <para>The spooler still provides benefit on a single-user system
-      and should be used because:</para>
+	and should be used because:</para>
 
       <itemizedlist>
 	<listitem>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 27 22:36:27 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A06A4837;
 Wed, 27 Feb 2013 22:36:27 +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 5FD5B7B1;
 Wed, 27 Feb 2013 22:36:27 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r1RMaQ09057453;
 Wed, 27 Feb 2013 15:36:26 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r1RMaQtu057450;
 Wed, 27 Feb 2013 15:36:26 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Wed, 27 Feb 2013 15:36:26 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Eitan Adler <eadler@FreeBSD.org>
Subject: Re: svn commit: r41054 -
 head/en_US.ISO8859-1/books/handbook/cutting-edge
In-Reply-To: <201302272123.r1RLNwuA010231@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1302271528400.57262@wonkity.com>
References: <201302272123.r1RLNwuA010231@svn.freebsd.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, 27 Feb 2013 15:36:26 -0700 (MST)
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: Wed, 27 Feb 2013 22:36:27 -0000

On Wed, 27 Feb 2013, Eitan Adler wrote:

> Author: eadler
> Date: Wed Feb 27 21:23:57 2013
> New Revision: 41054
> URL: http://svnweb.freebsd.org/changeset/doc/41054
>
> Log:
>  Fix a bunch of grammos and typos
>
>  PR:		docs/176451
>  Submitted by:	Tom <trh411@gmail.com>
>  Approved by:	bcr (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/books/handbook/cutting-edge/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	Wed Feb 27 21:23:54 2013	(r41053)
> +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb 27 21:23:57 2013	(r41054)
...
> @@ -2580,7 +2579,7 @@ Script done, &hellip;</screen>
>
> 	<para>Next, build a dummy set of directories to install the
> 	  new <filename class="directory">/etc</filename> and other
> -	  files into.  <filename
> +	  files into <filename
> 	    class="directory">/var/tmp/root</filename> is a reasonable
> 	  choice:</para>

That results in

   "Next, build a dummy set of directories to install the new /etc and
    other files into /var/tmp/root is a reasonable choice:"

I would suggest just modifying the first sentence:

   "Build a temporary set of directories into which the new
    <filename class="directory">/etc</filename> and other files can be
    installed."

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 02:18:04 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 21BC474A
 for <svn-doc-head@freebsd.org>; Thu, 28 Feb 2013 02:18:04 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45])
 by mx1.freebsd.org (Postfix) with ESMTP id B2F0A219
 for <svn-doc-head@freebsd.org>; Thu, 28 Feb 2013 02:18:03 +0000 (UTC)
Received: by mail-wg0-f45.google.com with SMTP id dq12so1057174wgb.12
 for <svn-doc-head@freebsd.org>; Wed, 27 Feb 2013 18:18:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=SxRM9JXpSOZNvIGH/eMqUAdb0nrtBp+S3XOi/mZq5hg=;
 b=OVsilJUwKE7OgDSk2uCF8qoEvVZyT3tbXxQ8xuQUqL0KDtwzcdNrJRAFU7U2AzLXEC
 5Op03jrKH4HdHk2FIhinF2JYOOV3aBn+lSTWMdwpcHRTyLCr+JvbcEbdjMnhfc4PrRkB
 sAn1h5dAAUxZ6k1iuJT6f0Bzf402rbcaZuaHg=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received: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=SxRM9JXpSOZNvIGH/eMqUAdb0nrtBp+S3XOi/mZq5hg=;
 b=GeoUCQGIZAcRnnIqAq5PCD3LNae0aCumA73xDwC+hk56Xesmjx2BCAqZBsAl9N+CFG
 3csb0G2Tz5Dhec496bnQp2n4c/F4g0pQMNM0YFwLv5bh3HQ/ZIcgBHTD4lSrIptu38WJ
 Sc4yAD+zqCtm8sgh4kP9chmS/I8TfjK/Hbp35Fw8OeidCFW3YThvlj+28YK9rYXsrPKM
 lX7wIgwEjFiDSr2Vbr3B/UUXwWnrvi2RCMafGEvRhulWv0fNoAT4AvWKzDJVotf6Heps
 KEYoQ5su8bSd59iOQwGFD9rTL10n2huz/G0xWAyK/aRz1G0xEow/kzQn2isR7zq4lJBl
 JQFw==
X-Received: by 10.194.133.198 with SMTP id pe6mr7395201wjb.9.1362017882321;
 Wed, 27 Feb 2013 18:18:02 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.194.122.201 with HTTP; Wed, 27 Feb 2013 18:17:32 -0800 (PST)
In-Reply-To: <alpine.BSF.2.00.1302271528400.57262@wonkity.com>
References: <201302272123.r1RLNwuA010231@svn.freebsd.org>
 <alpine.BSF.2.00.1302271528400.57262@wonkity.com>
From: Eitan Adler <eadler@freebsd.org>
Date: Wed, 27 Feb 2013 21:17:32 -0500
X-Google-Sender-Auth: icG_OEIVW52qz0ct2a1Hxf35_Bs
Message-ID: <CAF6rxgnourp+qu8aAXrf6vjFua0Ls9LOov0Lqg3ojUFLQWa4Ug@mail.gmail.com>
Subject: Re: svn commit: r41054 -
 head/en_US.ISO8859-1/books/handbook/cutting-edge
To: Warren Block <wblock@wonkity.com>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQmvXnjJrBCr0JfFqFgB0+R0iWYmNbPDOmGOGQEiHnhJySqHg8o/AM8wIozpDGzRpoX8J+Di
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: Thu, 28 Feb 2013 02:18:04 -0000

On 27 February 2013 17:36, Warren Block <wblock@wonkity.com> wrote:
> I would suggest just modifying the first sentence:
>
>   "Build a temporary set of directories into which the new
>    <filename class="directory">/etc</filename> and other files can be
>    installed."

I prefer a colon at the end, but patch sent to mentors.  Thanks!

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

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 03:32:02 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EED32A5A;
 Thu, 28 Feb 2013 03:32:02 +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 86346777;
 Thu, 28 Feb 2013 03:32:02 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r1S3W10m059199;
 Wed, 27 Feb 2013 20:32:01 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r1S3W142059196;
 Wed, 27 Feb 2013 20:32:01 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Wed, 27 Feb 2013 20:32:01 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r41054 -
 head/en_US.ISO8859-1/books/handbook/cutting-edge
In-Reply-To: <CAF6rxgnourp+qu8aAXrf6vjFua0Ls9LOov0Lqg3ojUFLQWa4Ug@mail.gmail.com>
Message-ID: <alpine.BSF.2.00.1302272030210.59191@wonkity.com>
References: <201302272123.r1RLNwuA010231@svn.freebsd.org>
 <alpine.BSF.2.00.1302271528400.57262@wonkity.com>
 <CAF6rxgnourp+qu8aAXrf6vjFua0Ls9LOov0Lqg3ojUFLQWa4Ug@mail.gmail.com>
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, 27 Feb 2013 20:32:01 -0700 (MST)
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: Thu, 28 Feb 2013 03:32:03 -0000

On Wed, 27 Feb 2013, Eitan Adler wrote:

> On 27 February 2013 17:36, Warren Block <wblock@wonkity.com> wrote:
>> I would suggest just modifying the first sentence:
>>
>>   "Build a temporary set of directories into which the new
>>    <filename class="directory">/etc</filename> and other files can be
>>    installed."
>
> I prefer a colon at the end, but patch sent to mentors.  Thanks!

I meant to leave the second sentence, which does end in a colon.  But 
now that you mention it, that second sentence is not really needed.

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 07:01:48 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 870B0A65;
 Thu, 28 Feb 2013 07:01:48 +0000 (UTC) (envelope-from jgh@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 6FC93EB2;
 Thu, 28 Feb 2013 07:01:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1S71mh1087553;
 Thu, 28 Feb 2013 07:01:48 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1S71moJ087552;
 Thu, 28 Feb 2013 07:01:48 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201302280701.r1S71moJ087552@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 28 Feb 2013 07:01:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41057 - head/en_US.ISO8859-1/articles/contributors
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, 28 Feb 2013 07:01:48 -0000

Author: jgh (ports committer)
Date: Thu Feb 28 07:01:47 2013
New Revision: 41057
URL: http://svnweb.freebsd.org/changeset/doc/41057

Log:
  - add John Mehr for net/svnup
  
  PR:		176381

Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Feb 27 21:24:02 2013	(r41056)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Feb 28 07:01:47 2013	(r41057)
@@ -4918,6 +4918,11 @@
     </listitem>
 
     <listitem>
+      <para>John Mehr
+	<email>jcm@visi.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>John Merryweather Cooper
 	<email>jmcoopr@webmail.bmi.net</email></para>
     </listitem>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 07:28:22 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E5E91DDE;
 Thu, 28 Feb 2013 07:28:22 +0000 (UTC) (envelope-from jmg@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 D3B4BF86;
 Thu, 28 Feb 2013 07:28:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1S7SMrC094602;
 Thu, 28 Feb 2013 07:28:22 GMT (envelope-from jmg@svn.freebsd.org)
Received: (from jmg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1S7SMAX094601;
 Thu, 28 Feb 2013 07:28:22 GMT (envelope-from jmg@svn.freebsd.org)
Message-Id: <201302280728.r1S7SMAX094601@svn.freebsd.org>
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Thu, 28 Feb 2013 07:28:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41058 -
 head/en_US.ISO8859-1/books/developers-handbook/l10n
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, 28 Feb 2013 07:28:23 -0000

Author: jmg (src committer)
Date: Thu Feb 28 07:28:22 2013
New Revision: 41058
URL: http://svnweb.freebsd.org/changeset/doc/41058

Log:
  add missing x...  S_ISDIR doesn't set errno, and err uses it, errx
  doesn't...

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

Modified: head/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml	Thu Feb 28 07:01:47 2013	(r41057)
+++ head/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml	Thu Feb 28 07:28:22 2013	(r41058)
@@ -240,7 +240,7 @@ printf(getstr(1));
 #include &lt;err.h&gt;
 ...
 if (!S_ISDIR(st.st_mode))
-	err(1, "argument is not a directory");
+	errx(1, "argument is not a directory");
 	  </programlisting>
 
 	  <para>This can be transformed to print an error message by

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 13:14:14 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CCB086C8;
 Thu, 28 Feb 2013 13:14:14 +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 B4FC0342;
 Thu, 28 Feb 2013 13:14:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SDEExI001196;
 Thu, 28 Feb 2013 13:14:14 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SDEE1m001195;
 Thu, 28 Feb 2013 13:14:14 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302281314.r1SDEE1m001195@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 28 Feb 2013 13:14:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41060 - in head/en_US.ISO8859-1/htdocs: . tutorials
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, 28 Feb 2013 13:14:14 -0000

Author: eadler
Date: Thu Feb 28 13:14:14 2013
New Revision: 41060
URL: http://svnweb.freebsd.org/changeset/doc/41060

Log:
  Remove vendors, availability, tutorial redirects which don't add much value.
  
  Discussed on:	-doc
  Approved by:	jkois (mentor)

Deleted:
  head/en_US.ISO8859-1/htdocs/availability.xml
  head/en_US.ISO8859-1/htdocs/tutorials/
  head/en_US.ISO8859-1/htdocs/vendors.html
Modified:
  head/en_US.ISO8859-1/htdocs/Makefile

Modified: head/en_US.ISO8859-1/htdocs/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/Makefile	Thu Feb 28 08:16:08 2013	(r41059)
+++ head/en_US.ISO8859-1/htdocs/Makefile	Thu Feb 28 13:14:14 2013	(r41060)
@@ -13,7 +13,6 @@ DOCS=  about.xml
 DOCS+= administration.xml
 DOCS+= applications.xml
 DOCS+= art.xml
-DOCS+= availability.xml
 DOCS+= docs.xml
 DOCS+= features.xml
 DOCS+= internet.xml
@@ -45,7 +44,6 @@ DATA+=	freebsd.css
 DATA+=	google6bb24ed0b804d5e9.html
 DATA+=	index.css
 DATA+=	robots.txt
-DATA+=	vendors.html
 
 # Subdirectories
 # XML
@@ -76,7 +74,6 @@ SUBDIR+= search
 SUBDIR+= security
 SUBDIR+= snapshots
 SUBDIR+= support
-SUBDIR+= tutorials
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= doc
 SUBDIR+= ports

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 13:17:34 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B903573F;
 Thu, 28 Feb 2013 13:17:34 +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 93DE3353;
 Thu, 28 Feb 2013 13:17:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SDHY4I001688;
 Thu, 28 Feb 2013 13:17:34 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SDHYSr001687;
 Thu, 28 Feb 2013 13:17:34 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302281317.r1SDHYSr001687@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 28 Feb 2013 13:17:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41061 - head/en_US.ISO8859-1/books/handbook/cutting-edge
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, 28 Feb 2013 13:17:34 -0000

Author: eadler
Date: Thu Feb 28 13:17:34 2013
New Revision: 41061
URL: http://svnweb.freebsd.org/changeset/doc/41061

Log:
  Word sentence differently.
  
  Submitted by:	wblock
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/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	Thu Feb 28 13:14:14 2013	(r41060)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb 28 13:17:34 2013	(r41061)
@@ -2577,11 +2577,9 @@ Script done, &hellip;</screen>
 	    files.</para>
 	</warning>
 
-	<para>Next, build a dummy set of directories to install the
-	  new <filename class="directory">/etc</filename> and other
-	  files into <filename
-	    class="directory">/var/tmp/root</filename> is a reasonable
-	  choice:</para>
+	<para>Build a temporary set of directories into which the new
+	  <filename class="directory">/etc</filename> and other files
+	  can be installed:</para>
 
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root</userinput>
 &prompt.root; <userinput>cd /usr/src/etc</userinput>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 15:40:57 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DEFD9D8D;
 Thu, 28 Feb 2013 15:40:57 +0000 (UTC) (envelope-from dru@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 CB985CC9;
 Thu, 28 Feb 2013 15:40:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SFevBf046211;
 Thu, 28 Feb 2013 15:40:57 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SFevU4046210;
 Thu, 28 Feb 2013 15:40:57 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302281540.r1SFevU4046210@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 28 Feb 2013 15:40:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41062 -
 head/en_US.ISO8859-1/books/handbook/virtualization
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, 28 Feb 2013 15:40:57 -0000

Author: dru
Date: Thu Feb 28 15:40:57 2013
New Revision: 41062
URL: http://svnweb.freebsd.org/changeset/doc/41062

Log:
  This is a minor content fixup as much work is needed in this chapter.
  
  This patch addresses the following:
  
  - minor rewording for "you"
  
  - fix xref and guimenuitem tags (need to review ulinks)
  
  - enforce consistency in app names
  
  - note on vbox 4.0.0 removed as this port hasn't been less than this version for 22 months
  
  Approved by: gjb (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Thu Feb 28 13:17:34 2013	(r41061)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Thu Feb 28 15:40:57 2013	(r41062)
@@ -66,23 +66,23 @@
 
     <itemizedlist>
       <listitem>
-	<para>Understand the basics of &unix; and &os; (<xref
-	    linkend="basics"/>).</para>
+	<para>Understand the <link linkend="basics">basics of &unix;
+	    and &os;</link>.</para>
       </listitem>
 
       <listitem>
-	<para>Know how to install &os; (<xref
-	    linkend="install"/>).</para>
+	<para>Know how to <link linkend="install">install
+	    &os;</link>.</para>
       </listitem>
 
       <listitem>
-	<para>Know how to set up your network connection (<xref
-	    linkend="advanced-networking"/>).</para>
+	<para>Know how to <link linkend="advanced-networking">set up a
+	    network connection</link>.</para>
       </listitem>
 
       <listitem>
-	<para>Know how to install additional third-party
-	  software (<xref linkend="ports"/>).</para>
+	<para>Know how to <link linkend="ports">install additional
+	    third-party software</link>.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -91,7 +91,7 @@
     <title>&os; as a Guest OS</title>
 
     <sect2 id="virtualization-guest-parallels">
-      <title>Parallels on MacOS</title>
+      <title><application>Parallels</application> on &macos; X</title>
 
       <para><application>Parallels Desktop</application> for &mac; is
 	a commercial software product available for &intel; based
@@ -104,8 +104,8 @@
       <sect3 id="virtualization-guest-parallels-install">
 	<title>Installing &os; on Parallels/&macos; X</title>
 
-	<para>The first step in installing &os; on &macos;
-	  X/<application>Parallels</application> is to create a new
+	<para>The first step in installing &os; on
+	  <application>Parallels</application> is to create a new
 	  virtual machine for installing &os;.  Select
 	  <guimenuitem>&os;</guimenuitem> as the <guimenu>Guest OS
 	    Type</guimenu> when prompted:</para>
@@ -116,8 +116,8 @@
 	  </imageobject>
 	</mediaobject>
 
-	<para>And choose a reasonable amount of disk and memory
-	  depending on your plans for this virtual &os; instance.
+	<para>Choose a reasonable amount of disk and memory
+	  depending on the plans for this virtual &os; instance.
 	  4GB of disk space and 512MB of RAM work well for most uses
 	  of &os; under <application>Parallels</application>:</para>
 
@@ -174,16 +174,16 @@
 	  </imageobject>
 	</mediaobject>
 
-	<para>After your &os; virtual machine has been created, you
-	  will need to install &os; on it.  This is best done with an
-	  official &os; CDROM or with an ISO image downloaded from an
-	  official FTP site.  When you have the appropriate ISO image
-	  on your local &mac; filesystem or a CDROM in your &mac;'s CD
-	  drive, click on the disc icon in the bottom right corner of
-	  your &os; <application>Parallels</application> window.  This
-	  will bring up a window that allows you to associate the
-	  CDROM drive in your virtual machine with an ISO file on disk
-	  or with your real CDROM drive.</para>
+	<para>After the &os; virtual machine has been created, &os;
+	  can be installed on it.  This is best done with an
+	  official &os; CD/DVD or with an ISO image downloaded from an
+	  official FTP site.  Copy the appropriate ISO image to the
+	  local &mac; filesystem or insert a CD/DVD in the &mac;'s CD
+	  drive.  Click on the disc icon in the bottom right corner of
+	  the &os; <application>Parallels</application> window.  This
+	  will bring up a window that can be used to associate the
+	  CDROM drive in the virtual machine with the ISO file on disk
+	  or with the real CDROM drive.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -191,12 +191,10 @@
 	  </imageobject>
 	</mediaobject>
 
-	<para>Once you have made this association with your CDROM
-	  source, reboot your &os; virtual machine as normal by
-	  clicking the reboot icon.
-	  <application>Parallels</application> will reboot with a
-	  special BIOS that first checks if you have a CDROM just as a
-	  normal BIOS would do.</para>
+	<para>Once this association with the CDROM source has been
+	  made, reboot the &os; virtual machine by clicking the reboot
+	  icon.  <application>Parallels</application> will reboot with
+	  a special BIOS that first checks if there is a CDROM.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -205,10 +203,9 @@
 	</mediaobject>
 
 	<para>In this case it will find the &os; installation media
-	  and begin a normal <application>sysinstall</application>
-	  based installation as described in <xref
-	    linkend="install"/>.  You may install, but do not attempt
-	  to configure X11 at this time.</para>
+	  and begin a normal &os; installation.  Perform the
+	  installation, but do not attempt to configure
+	  <application>&xorg;</application> at this time.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -216,8 +213,8 @@
 	  </imageobject>
 	</mediaobject>
 
-	<para>When you have finished the installation, reboot into
-	  your newly installed &os; virtual machine.</para>
+	<para>When the installation is finished, reboot into the
+	  newly installed &os; virtual machine.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -227,7 +224,8 @@
       </sect3>
 
       <sect3 id="virtualization-guest-parallels-configure">
-	<title>Configuring &os; on &macos; X/Parallels</title>
+	<title>Configuring &os; on
+	  <application>Parallels</application> </title>
 
 	<para>After &os; has been successfully installed on &macos;
 	  X with <application>Parallels</application>, there are a
@@ -248,35 +246,32 @@
 	    <programlisting>kern.hz=100</programlisting>
 
 	    <para>Without this setting, an idle &os;
-	      <application>Parallels</application> guest
-	      OS will use roughly 15% of the CPU of a single
-	      processor &imac;.  After this change the usage will be
-	      closer to a mere 5%.</para>
+	      <application>Parallels</application> guest will use
+	      roughly 15% of the CPU of a single process &imac;.
+	      After this change the usage will be closer to 5%.</para>
 	  </step>
 
 	  <step>
 	    <title>Create a New Kernel Configuration File</title>
 
-	    <para>You can remove all of the SCSI, FireWire, and USB
-	      device drivers.  <application>Parallels</application>
-	      provides a virtual network
-	      adapter used by the &man.ed.4; driver, so
-	      all other network devices except for
-	      &man.ed.4; and &man.miibus.4; can be
-	      removed from the kernel.</para>
+	    <para>All of the SCSI, FireWire, and USB device drivers
+	      can be removed from a custom kernel configuration file.
+	      <application>Parallels</application> provides a virtual
+	      network adapter used by the &man.ed.4; driver, so all
+	      network devices except for &man.ed.4; and &man.miibus.4;
+	      can be removed from the kernel.</para>
 	  </step>
 
 	  <step>
 	    <title>Configure Networking</title>
 
-	    <para>The most basic networking setup involves simply
-	      using DHCP to connect your virtual machine to the same
-	      local area network as your host &mac;.  This can be
-	      accomplished by adding
+	    <para>The most basic networking setup uses DHCP to connect
+	      the virtual machine to the same local area network as
+	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_ed0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in
-	      <xref linkend="advanced-networking"/>.</para>
+	      networking setups are described in <link
+		linkend="advanced-networking"></link>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -592,26 +587,27 @@ xenbr1          8000.feffffffffff   no  
       </sect2>
 -->
     <sect2 id="virtualization-guest-virtualpc">
-      <title>Virtual PC on &windows;</title>
+      <title><application>Virtual PC</application> on
+	&windows;</title>
 
       <para><application>Virtual PC</application> for &windows; is a
 	&microsoft; software product available for free download.
-	See <ulink
+	See this website for the <ulink
 	  url="http://www.microsoft.com/windows/downloads/virtualpc/sysreq.mspx">
 	system requirements</ulink>.  Once <application> Virtual PC
 	</application> has been installed on &microsoft.windows;,
-	the user must configure a virtual machine and then install
+	the user can configure a virtual machine and then install
 	the desired guest operating system.</para>
 
       <sect3 id="virtualization-guest-virtualpc-install">
-	<title>Installing &os; on Virtual
-	  PC/&microsoft.windows;</title>
+	<title>Installing &os; on <application>Virtual
+	    PC</application></title>
 
 	<para>The first step in installing &os; on
-	  &microsoft.windows; /<application>Virtual PC
-	  </application> is to create a new virtual machine for
-	  installing &os;.  Select <guimenuitem>Create a virtual
-	    machine</guimenuitem> when prompted:</para>
+	  <application>Virtual PC </application> is to create a new
+	  virtual machine for installing &os;.  Select
+	  <guimenuitem>Create a virtual machine</guimenuitem> when
+	  prompted:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -625,7 +621,7 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>And select <guimenuitem>Other</guimenuitem> as the
+	<para>Select <guimenuitem>Other</guimenuitem> as the
 	  <guimenuitem>Operating system</guimenuitem> when
 	  prompted:</para>
 
@@ -636,10 +632,9 @@ xenbr1          8000.feffffffffff   no  
 	</mediaobject>
 
 	<para>Then, choose a reasonable amount of disk and memory
-	  depending on your plans for this virtual &os;
-	  instance.  4GB of disk space and 512MB of RAM work well
-	  for most uses of &os; under
-	  <application>Virtual PC</application>:</para>
+	  depending on the plans for this virtual &os; instance.
+	  4GB of disk space and 512MB of RAM work well for most uses
+	  of &os; under <application>Virtual PC</application>:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -661,7 +656,7 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Select your &os; virtual machine and click
+	<para>Select the &os; virtual machine and click
 	  <guimenu>Settings</guimenu>, then set the type of networking
 	  and a network interface:</para>
 
@@ -677,18 +672,18 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>After your &os; virtual machine has been created, you
-	  will need to install &os; on it.  This is best done with an
-	  official &os; CDROM or with an ISO image downloaded from an
-	  official FTP site.  When you have the appropriate ISO image
-	  on your local &windows; filesystem or a CDROM in your CD
-	  drive, double click on your &os; virtual machine to boot.
-	  Then, click <guimenu>CD</guimenu> and choose
-	  <guimenu>Capture ISO Image...</guimenu> on
+	<para>After the &os; virtual machine has been created, &os;
+	  can be installed on it.  This is best done with an
+	  official &os; CD/DVD or with an ISO image downloaded from an
+	  official FTP site.  Copy the appropriate ISO image to the
+	  local &windows; filesystem or insert a CD/DVD in the CD
+	  drive, then double click on the &os; virtual machine to
+	  boot.  Then, click <guimenu>CD</guimenu> and choose
+	  <guimenu>Capture ISO Image...</guimenu> on the
 	  <application>Virtual PC</application> window.  This will
-	  bring up a window that allows you to associate the CDROM
-	  drive in your virtual machine with an ISO file on disk or
-	  with your real CDROM drive.</para>
+	  bring up a window where the CDROM drive in the virtual
+	  machine can be associated with an ISO file on disk or
+	  with the real CDROM drive.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -702,13 +697,11 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Once you have made this association with your CDROM
-	  source, reboot your &os; virtual machine as normal by
-	  clicking the <guimenu>Action</guimenu> and
-	  <guimenu>Reset</guimenu>.
+	<para>Once this association with the CDROM source has been
+	  made, reboot the &os; virtual machine by clicking
+	  <guimenu>Action</guimenu> and <guimenu>Reset</guimenu>.
 	  <application>Virtual PC</application> will reboot with a
-	  special BIOS that first checks if you have a CDROM just as a
-	  normal BIOS would do.</para>
+	  special BIOS that first checks for a CDROM.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -717,10 +710,9 @@ xenbr1          8000.feffffffffff   no  
 	</mediaobject>
 
 	<para>In this case it will find the &os; installation media
-	  and begin a normal <application>sysinstall</application>
-	  based installation as described in
-	  <xref linkend="install"/>.  You may install, but do not
-	  attempt to configure X11 at this time.</para>
+	  and begin a normal &os; installation.  Continue with the
+	  installation, but do not attempt to configure
+	  <application>&xorg;</application> at this time.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -728,9 +720,9 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>When you have finished the installation, remember to
-	  eject CDROM or release ISO image.  Finally, reboot into your
-	  newly installed &os; virtual machine.</para>
+	<para>When the installation is finished, remember to eject
+	  the CD/DVD or release the ISO image.  Finally, reboot into
+	  the newly installed &os; virtual machine.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -740,8 +732,8 @@ xenbr1          8000.feffffffffff   no  
       </sect3>
 
       <sect3 id="virtualization-guest-virtualpc-configure">
-	<title>Configuring &os; on &microsoft.windows;/Virtual
-	  PC</title>
+	<title>Configuring &os; on <application>Virtual
+	    PC</application></title>
 
 	<para>After &os; has been successfully installed on
 	  &microsoft.windows; with <application>Virtual PC
@@ -755,9 +747,9 @@ xenbr1          8000.feffffffffff   no  
 
 	    <para>The most important step is to reduce the
 	      <option>kern.hz</option> tunable to reduce the CPU
-	      utilization of &os; under the
-	      <application>Virtual PC</application> environment.
-	      This is accomplished by adding the following line to
+	      utilization of &os; under the <application>Virtual
+		PC</application> environment.  This is accomplished
+	      by adding the following line to
 	      <filename> /boot/loader.conf</filename>:</para>
 
 	      <programlisting>kern.hz=100</programlisting>
@@ -765,55 +757,57 @@ xenbr1          8000.feffffffffff   no  
 	    <para>Without this setting, an idle &os;
 	      <application>Virtual PC</application> guest OS will
 	      use roughly 40% of the CPU of a single processor
-	      computer.  After this change the usage will be
-	      closer to a mere 3%.</para>
+	      computer.  After this change, the usage will be
+	      closer to 3%.</para>
 	  </step>
 
 	  <step>
 	    <title>Create a New Kernel Configuration File</title>
 
-	    <para>You can remove all of the SCSI, FireWire, and USB
-	      device drivers.  <application>Virtual PC</application>
-	      provides a virtual network adapter used by the
-	      &man.de.4; driver, so all other network devices except
-	      for &man.de.4; and &man.miibus.4; can be removed from
-	      the kernel.</para>
+	    <para>All of the SCSI, FireWire, and USB device drivers
+	      can be removed from a custom kernel configuration file.
+	      <application>Virtual PC</application> provides a virtual
+	      network adapter used by the &man.de.4; driver, so all
+	      network devices except for &man.de.4; and &man.miibus.4;
+	      can be removed from the kernel.</para>
 	  </step>
 
 	  <step>
 	    <title>Configure Networking</title>
 
-	    <para>The most basic networking setup involves simply
-	      using DHCP to connect your virtual machine to the same
-	      local area network as your host &microsoft.windows;.
-	      This can be accomplished by adding
-	      <literal>ifconfig_de0="DHCP"</literal> to
+	    <para>The most basic networking setup uses DHCP to connect
+	      the virtual machine to the same local area network as
+	      the &microsoft.windows; host.  This can be accomplished
+	      by adding <literal>ifconfig_de0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in
-	      <xref linkend="advanced-networking"/>.</para>
+	      networking setups are described in <link
+		linkend="advanced-networking"></link>.</para>
 	  </step>
 	</procedure>
       </sect3>
     </sect2>
 
     <sect2 id="virtualization-guest-vmware">
-      <title>VMware on MacOS</title>
+      <title><application>VMware Fusion</application> on
+	&macos;</title>
 
       <para><application>VMware Fusion</application> for &mac; is a
 	commercial software product available for &intel; based
 	&apple; &mac; computers running &macos; 10.4.9 or higher.
 	&os; is a fully supported guest operating system.  Once
 	<application>VMware Fusion</application> has been
-	installed on &macos; X, the user must configure a virtual
+	installed on &macos; X, the user can configure a virtual
 	machine and then install the desired guest operating
 	system.</para>
 
       <sect3 id="virtualization-guest-vmware-install">
-	<title>Installing &os; on VMware/&macos; X</title>
+	<title>Installing &os; on <application>VMware
+	    Fusion</application></title>
 
-	<para>The first step is to start VMware Fusion, the Virtual
-	  Machine Library will load.  Click "New" to create the
-	  VM:</para>
+	<para>The first step is to start <application>VMware
+	    Fusion</application> which will load the Virtual
+	  Machine Library.  Click <guimenuitem>New</guimenuitem> to
+	  create the virtual machine:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -821,8 +815,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>This will load the New Virtual Machine Assistant to help
-	  you create the VM, click Continue to proceed:</para>
+	<para>This will load the New Virtual Machine Assistant.  Click
+	  <guimenuitem>Continue</guimenuitem> to proceed:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -831,11 +825,10 @@ xenbr1          8000.feffffffffff   no  
 	</mediaobject>
 
 	<para>Select <guimenuitem>Other</guimenuitem> as the
-	  <guimenuitem>Operating System</guimenuitem> and
+	  <guimenuitem>Operating System</guimenuitem> and either
 	  <guimenuitem>&os;</guimenuitem> or
-	  <guimenuitem>&os; 64-bit</guimenuitem>, depending on if
-	  you want 64-bit support, as the <guimenu>Version</guimenu>
-	  when prompted:</para>
+	  <guimenuitem>&os; 64-bit</guimenuitem>, as the
+	  <guimenu>Version</guimenu> when prompted:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -843,8 +836,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Choose the Name of the VM Image and the Directory where
-	  you would like it saved:</para>
+	<para>Choose the name of the virtual machine and the directory
+	  where it should be saved:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -852,8 +845,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Choose the size of the Virtual Hard Disk for the
-	  VM:</para>
+	<para>Choose the size of the Virtual Hard Disk for the virtual
+	  machine:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -861,8 +854,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Choose the method you would like to install the VM,
-	  either from an ISO image or from a CD:</para>
+	<para>Choose the method to install the virtual machine,
+	  either from an ISO image or from a CD/DVD:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -870,7 +863,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Once you click Finish, the VM will boot:</para>
+	<para>Click <guimenuitem>Finish</guimenuitem> and the virtual
+	  machine will boot:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -878,8 +872,7 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Install &os; like you normally would, or by following
-	  the directions in <xref linkend="install"/>:</para>
+	<para>Install &os; as usual:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -887,12 +880,14 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>Once the install is complete you can modify the settings
-	  of the VM, such as Memory Usage:</para>
+	<para>Once the install is complete, the settings
+	  of the virtual machine can be modified, such as memory
+	  usage:</para>
 
 	<note>
-	  <para>The System Hardware settings of the VM cannot be
-	    modified while the VM is running.</para>
+	  <para>The System Hardware settings of the virtual machine
+	    cannot be modified while the virtual machine is
+	    running.</para>
 	</note>
 
 	<mediaobject>
@@ -901,7 +896,8 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>The number of CPUs the VM will have access to:</para>
+	<para>The number of CPUs the virtual machine will have access
+	  to:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -909,9 +905,9 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>The status of the CD-Rom Device.  Normally you can
-	  disconnect the CD-Rom/ISO from the VM if you will not be
-	  needing it anymore.</para>
+	<para>The status of the CDROM device.  Normally the
+	  CD/DVD/ISO is disconnected from the virtual machine when it
+	  is no longer needed.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -919,14 +915,15 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>The last thing to change is how the VM will connect to
-	  the Network.  If you want to allow connections to the VM
-	  from other machines besides the Host, make sure you choose
-	  the <guimenuitem>Connect directly to the physical network
-	  (Bridged)</guimenuitem>.  Otherwise <guimenuitem>Share the
+	<para>The last thing to change is how the virtual machine will
+	  connect to the network.  To allow connections to the virtual
+	  machine from other machines besides the host, choose
+	  <guimenuitem>Connect directly to the physical network
+	  (Bridged)</guimenuitem>.  Otherwise, <guimenuitem>Share the
 	    host's internet connection (NAT)</guimenuitem> is
-	  preferred so that the VM can have access to the Internet,
-	  but the network cannot access the VM.</para>
+	  preferred so that the virtual machine can have access to the
+	  Internet, but the network cannot access the virtual
+	  machine.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -934,17 +931,18 @@ xenbr1          8000.feffffffffff   no  
 	  </imageobject>
 	</mediaobject>
 
-	<para>After you have finished modifying the settings, boot the
-	  newly installed &os; virtual machine.</para>
+	<para>After modifying the settings, boot the newly installed
+	  &os; virtual machine.</para>
       </sect3>
 
       <sect3 id="virtualization-guest-vmware-configure">
-	<title>Configuring &os; on &macos; X/VMware</title>
+	<title>Configuring &os; on <application>VMware
+	    Fusion</application></title>
 
 	<para>After &os; has been successfully installed on &macos; X
-	  with <application>VMware</application>, there are a number
-	  of configuration steps that can be taken to optimize the
-	  system for virtualized operation.</para>
+	  with <application>VMware Fusion</application>, there are a
+	  number of configuration steps that can be taken to optimize
+	  the system for virtualized operation.</para>
 
 	<procedure>
 	  <step>
@@ -953,40 +951,40 @@ xenbr1          8000.feffffffffff   no  
 	    <para>The most important step is to reduce the
 	      <option>kern.hz</option> tunable to reduce the CPU
 	      utilization of &os; under the
-	      <application>VMware</application> environment.  This is
-	      accomplished by adding the following line to
+	      <application>VMware Fusion</application> environment.
+	      This is accomplished by adding the following line to
 	      <filename>/boot/loader.conf</filename>:</para>
 
 	    <programlisting>kern.hz=100</programlisting>
 
 	    <para>Without this setting, an idle &os;
-	      <application>VMware</application> guest
-	      OS will use roughly 15% of the CPU of a single
-	      processor &imac;.  After this change the usage will be
-	      closer to a mere 5%.</para>
+	      <application>VMware Fusion</application> guest will use
+	      roughly 15% of the CPU of a single processor &imac;.
+	      After this change, the usage will be closer to
+	      5%.</para>
 	  </step>
 
 	  <step>
 	    <title>Create a New Kernel Configuration File</title>
 
-	    <para>You can remove all of the FireWire, and USB device
-	      drivers.  <application>VMware</application> provides a
+	    <para>All of the FireWire, and USB device drivers can be
+	      removed from a custom kernel configuration file.
+	      <application>VMware Fusion</application> provides a
 	      virtual network adapter used by the &man.em.4; driver,
-	      so all other network devices except for &man.em.4; can
-	      be removed from the kernel.</para>
+	      so all  network devices except for &man.em.4; can be
+	      removed from the kernel.</para>
 	  </step>
 
 	  <step>
 	    <title>Configure Networking</title>
 
-	    <para>The most basic networking setup involves simply
-	      using DHCP to connect your virtual machine to the
-	      same local area network as your host &mac;.  This
-	      can be accomplished by adding
+	    <para>The most basic networking setup uses DHCP to connect
+	      the virtual machine to the same local area network as
+	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_em0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in
-	      <xref linkend="advanced-networking"/>.</para>
+	      networking setups are described in <link
+		linkend="advanced-networking"></link>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -1000,23 +998,23 @@ xenbr1          8000.feffffffffff   no  
 
       <itemizedlist>
 	<listitem>
-	  <para>Clipboard sharing</para>
+	  <para>Clipboard sharing.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Mouse pointer integration</para>
+	  <para>Mouse pointer integration.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Host time synchronization</para>
+	  <para>Host time synchronization.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Window scaling</para>
+	  <para>Window scaling.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Seamless mode</para>
+	  <para>Seamless mode.</para>
 	</listitem>
       </itemizedlist>
 
@@ -1026,7 +1024,8 @@ xenbr1          8000.feffffffffff   no  
 
       <para>First, install the <filename
 	  role="package">emulators/virtualbox-ose-additions</filename>
-	package in the &os; guest.</para>
+	package or port in the &os; guest.  This will install
+	the port:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
 
@@ -1036,14 +1035,15 @@ xenbr1          8000.feffffffffff   no  
       <programlisting>vboxguest_enable="YES"
 vboxservice_enable="YES"</programlisting>
 
-      <para>If &man.ntpd.8; or &man.ntpdate.8; will be used, host time
+      <para>If &man.ntpd.8; or &man.ntpdate.8; is used, host time
 	synchronization should be disabled:</para>
 
       <programlisting>vboxservice_flags="--disable-timesync"</programlisting>
 
-      <para>The <literal>vboxvideo_drv</literal> should be recognized
-	by <command>Xorg -configure</command>.  If not, modify
-	<filename>xorg.conf</filename> for the
+      <para>The <literal>vboxvideo</literal> driver should be
+	automatically recognized by <command>Xorg
+	  -configure</command>.  If not, modify
+	<filename>/etc/X11/xorg.conf</filename> for the
 	<application>&virtualbox;</application> video card:</para>
 
       <programlisting>Section "Device"
@@ -1058,15 +1058,16 @@ vboxservice_enable="YES"</programlisting
 	BusID "PCI:0:2:0"
 EndSection</programlisting>
 
-      <para>To use <literal>vboxmouse_drv</literal>, adjust the mouse
-	section in your <filename>xorg.conf</filename>:</para>
+      <para>To use the <literal>vboxmouse</literal> driver, adjust the
+	mouse section in
+	<filename>/etc/X11/xorg.conf</filename>:</para>
 
       <programlisting>Section "InputDevice"
 	Identifier "Mouse0"
 	Driver "vboxmouse"
 EndSection</programlisting>
 
-      <para><acronym>HAL</acronym> users should create this file at
+      <para><acronym>HAL</acronym> users should create the following
 	<filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename>
 	or copy it from
 	<filename>/usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi</filename>:</para>
@@ -1107,45 +1108,39 @@ EndSection</programlisting>
   </sect1>
 
   <sect1 id="virtualization-host">
-    <title>&os; as a Host OS</title>
+    <title>&os; as a Host</title>
 
     <para>For a number of years, &os; was not officially supported as
-      a host OS by any of the available virtualization solutions.
-      Some people were using older and mostly obsolete versions of
-      <application>VMware</application> (like
-      <filename role="package">emulators/vmware3</filename>), which
-      utilized the &linux; binary compatibility layer.  Shortly after
-      the release of &os;&nbsp;7.2, Sun's
+      a host operating system by any of the available virtualization
+      solutions.  Shortly after the release of &os;&nbsp;7.2, &oracle;
       <application>&virtualbox;</application> appeared in the
       Ports&nbsp;Collection as a native &os; program.</para>
 
     <para><application>&virtualbox;</application> is an actively
       developed, complete virtualization package, that is available
       for most operating systems including &windows;, &macos;, &linux;
-      and &os;.  It is equally capable at running &windows; or &unix;
-      like guests.  It is released as open source software, but with
-      closed-source components available in a separate extension pack.
-      These components include support for USB 2.0 devices, among
-      others.  More information may be found on the
-      <quote>Downloads</quote> page of the
-      <application>&virtualbox;</application> wiki, at <ulink
-	url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
+      and &os;.  It is equally capable of running &windows; or
+      &unix;-like guests.  It is released as open source software, but
+      with closed-source components available in a separate extension
+      pack.  These components include support for USB 2.0 devices.
+      More information may be found on the <ulink
+	url="http://www.virtualbox.org/wiki/Downloads">
+	<quote>Downloads</quote> page of the
+	<application>&virtualbox;</application> wiki</ulink>.
       Currently, these extensions are not available for &os;.</para>
 
     <sect2 id="virtualization-virtualbox-install">
       <title>Installing &virtualbox;</title>
 
       <para><application>&virtualbox;</application> is available as a
-	&os; port in
-	<filename role="package">emulators/virtualbox-ose</filename>.
-	As &virtualbox; is very actively developed, make sure your
-	ports tree is up to date before installing.  Install using
-	these commands:</para>
+	&os; package or port in <filename
+	  role="package">emulators/virtualbox-ose</filename>.  The
+	port can be installed using these commands:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>One useful option in the configuration dialog is the
+      <para>One useful option in the port's configuration menu is the
 	<literal>GuestAdditions</literal> suite of programs.  These
 	provide a number of useful features in guest operating
 	systems, like mouse pointer integration (allowing the mouse to
@@ -1153,8 +1148,7 @@ EndSection</programlisting>
 	special keyboard shortcut to switch) and faster video
 	rendering, especially in &windows; guests.  The guest
 	additions are available in the <guimenu>Devices</guimenu>
-	menu, after the installation of the guest OS is
-	finished.</para>
+	menu, after the installation of the guest is finished.</para>
 
       <para>A few configuration changes are needed before
 	<application>&virtualbox;</application> is started for the
@@ -1181,59 +1175,51 @@ EndSection</programlisting>
 	during installation of
 	<application>&virtualbox;</application>.  All users that need
 	access to <application>&virtualbox;</application> will have to
-	be added as members of this group.  The <command>pw</command>
-	command may be used to add new members:</para>
+	be added as members of this group.  <command>pw</command>
+	can be used to add new members:</para>
 
       <screen>&prompt.root; <userinput>pw groupmod vboxusers -m <replaceable>yourusername</replaceable></userinput></screen>
 
-      <para>The default permissions for
-	<filename class="devicefile">/dev/vboxnetctl</filename> are
+      <para>The default permissions for <filename
+	  class="devicefile">/dev/vboxnetctl</filename> are
 	restrictive and need to be changed for bridged
-	networking.</para>
-
-      <para>To test it temporarily:</para>
+	networking:</para>
 
       <screen>&prompt.root; <userinput>chown root:vboxusers /dev/vboxnetctl</userinput>
 &prompt.root; <userinput>chmod 0660 /dev/vboxnetctl</userinput></screen>
 
-      <para>To make the permissions change permanent, add these
+      <para>To make this permissions change permanent, add these
 	lines to <filename>/etc/devfs.conf</filename>:</para>
 
       <programlisting>own     vboxnetctl root:vboxusers
 perm    vboxnetctl 0660</programlisting>
 
-      <para>To launch <application>&virtualbox;</application>, either
-	select the <guimenuitem>Sun VirtualBox</guimenuitem> item from
-	the graphic environment's menu, or type the following in a
-	terminal:</para>
+      <para>To launch <application>&virtualbox;</application>,
+	type from a <application>&xorg;</application> session:</para>
 
       <screen>&prompt.user; <userinput>VirtualBox</userinput></screen>
 
       <para>For more information on configuring and using
-	<application>&virtualbox;</application>, please visit the
-	official website at
-	<ulink url="http://www.virtualbox.org"></ulink>. As the &os;
-	port is very recent, it is under heavy development.  For the
-	latest information and troubleshooting instructions, please
-	visit the relevant page in the &os; wiki, at <ulink
-	  url="http://wiki.FreeBSD.org/VirtualBox"></ulink>.</para>
+	<application>&virtualbox;</application>, refer to the
+	<ulink url="http://www.virtualbox.org">official
+	  website</ulink>.  For &os;-specific information and
+	troubleshooting instructions, refer to the <ulink
+	  url="http://wiki.FreeBSD.org/VirtualBox">relevant page in
+	  the &os; wiki</ulink>.</para>
     </sect2>
 
     <sect2 id="virtualization-virtualbox-usb-support">
       <title>&virtualbox; USB Support</title>
 
-      <note>
-	<para>These steps require VirtualBox 4.0.0 or later.</para>
-      </note>
-
       <para>In order to be able to read and write to USB devices,
-	users need to be members of the operator group:</para>
+	users need to be members of
+	<groupname>operator</groupname>:</para>
 
       <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>jerry</replaceable></userinput></screen>
 
       <para>Then, add the following to
-	<filename>/etc/devfs.rules</filename> (create it if it does
-	not exist yet):</para>
+	<filename>/etc/devfs.rules</filename>, or create this file if
+	it does not exist yet:</para>
 
       <programlisting>[system=10]
 add path 'usb/*' mode 0660 group operator</programlisting>
@@ -1256,20 +1242,20 @@ add path 'usb/*' mode 0660 group operato
       <title>&virtualbox; Host DVD/CD Access</title>
 
       <para>Access to the host DVD/CD drives from guests is achieved
-	through the sharing of the physical drives.  In GUI this is
-	set up from the Storage window in the Settings of the virtual
-	machine.  Create an empty IDE CD/DVD device first.
-	Then choose the Host Drive from the popup menu for the virtual
-	CD/DVD drive selection.  A checkbox labeled
-	<literal>Passthrough</literal> check box will appear.
-	This allows the virtual machine to use the hardware directly.
-	For example, audio CDs or the burner only function if
-	this option is selected.</para>
+	through the sharing of the physical drives.  Within
+	&virtualbox;, this is set up from the Storage window in the
+	Settings of the virtual machine.  If needed, create an empty
+	IDE CD/DVD device first.  Then choose the Host Drive from the
+	popup menu for the virtual CD/DVD drive selection.  A checkbox
+	labeled <literal>Passthrough</literal> will appear.  This
+	allows the virtual machine to use the hardware directly.  For
+	example, audio CDs or the burner will only function if this
+	option is selected.</para>
 
       <para><acronym>HAL</acronym> needs to run for
 	<application>&virtualbox;</application> DVD/CD functions to
 	work, so enable it in <filename>/etc/rc.conf</filename> and
-	start it (if it is not already running):</para>
+	start it if it is not already running:</para>
 
       <programlisting>hald_enable="YES"</programlisting>
 
@@ -1277,16 +1263,14 @@ add path 'usb/*' mode 0660 group operato
 
       <para>In order for users to be able to use
 	<application>&virtualbox;</application> DVD/CD functions, they
-	need access to
-	<filename class="devicefile">/dev/xpt0</filename>, <filename
+	need access to <filename
+	  class="devicefile">/dev/xpt0</filename>, <filename
 	  class="devicefile">/dev/cd<replaceable>N</replaceable></filename>,
 	and <filename
 	  class="devicefile">/dev/pass<replaceable>N</replaceable></filename>.
-	This is usually achieved by making the user of
-	<application>&virtualbox;</application>
-	a member of the operator group, which is also the default
-	group of the above mentioned devices.  Permissions of these
-	devices have to be corrected by adding the following lines to
+	This is usually achieved by making the user a member of
+	<groupname>operator</groupname>.  Permissions to these devices
+	have to be corrected by adding the following lines to
 	<filename>/etc/devfs.conf</filename>:</para>
 
       <programlisting>perm cd* 0600

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 18:37:52 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5A2A9EDA;
 Thu, 28 Feb 2013 18:37:52 +0000 (UTC)
 (envelope-from issyl0@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 3DAECAE8;
 Thu, 28 Feb 2013 18:37:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SIbqDJ001955;
 Thu, 28 Feb 2013 18:37:52 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SIbp1Q001952;
 Thu, 28 Feb 2013 18:37:51 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201302281837.r1SIbp1Q001952@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Thu, 28 Feb 2013 18:37:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41063 - head/en_US.ISO8859-1/htdocs/news/status
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, 28 Feb 2013 18:37:52 -0000

Author: issyl0
Date: Thu Feb 28 18:37:51 2013
New Revision: 41063
URL: http://svnweb.freebsd.org/changeset/doc/41063

Log:
  Add the Q3 and Q4 status reports.
  
  These aren't linked to from anywhere yet, as I wanted to open up the review
  process more. In one day or so, I plan to have incorporated any reasonable
  changes I receive (via email - comments or patches are welcome), and then
  complete the rest of the report release process.
  
  Hat: monthly
  Approved by:	gabor (mentor, this morning - approval for .xml parts only)

Added:
  head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/htdocs/news/status/Makefile

Modified: head/en_US.ISO8859-1/htdocs/news/status/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/Makefile	Thu Feb 28 15:40:57 2013	(r41062)
+++ head/en_US.ISO8859-1/htdocs/news/status/Makefile	Thu Feb 28 18:37:51 2013	(r41063)
@@ -56,6 +56,8 @@ XMLDOCS+=	report-2011-07-2011-09
 XMLDOCS+=	report-2011-10-2011-12
 XMLDOCS+=	report-2012-01-2012-03
 XMLDOCS+=	report-2012-04-2012-06
+XMLDOCS+=	report-2012-07-2012-09
+XMLDOCS+=	report-2012-10-2012-12
 
 XSLT.DEFAULT=	report.xsl
 

Added: head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml	Thu Feb 28 18:37:51 2013	(r41063)
@@ -0,0 +1,708 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd" >
+<!-- $FreeBSD$ -->
+<report>
+  <date>
+    <month>July-September</month>
+
+    <year>2012</year>
+  </date>
+
+  <section>
+    <title>Introduction</title>
+
+    <p>This report covers &os;-related projects between July and
+      September 2012. This is the third of the four reports planned for
+      2012.</p>
+
+    <p>Thanks to all the reporters for the excellent work! This report
+      contains 12 entries and we hope you enjoy reading it.</p>
+  </section>
+
+  <category>
+    <name>proj</name>
+
+    <description>Projects</description>
+  </category>
+
+  <category>
+    <name>team</name>
+
+    <description>&os; Team Reports</description>
+  </category>
+
+  <category>
+    <name>kern</name>
+
+    <description>Kernel</description>
+  </category>
+
+  <category>
+    <name>docs</name>
+
+    <description>Documentation</description>
+  </category>
+
+  <category>
+    <name>ports</name>
+
+    <description>Ports</description>
+  </category>
+
+  <category>
+    <name>misc</name>
+
+    <description>Miscellaneous</description>
+  </category>
+
+  <category>
+    <name>soc</name>
+
+    <description>&os; in Google Summer of Code</description>
+  </category>
+
+  <project cat='proj'>
+    <title>&os; on Altera FPGAs</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Brooks</given>
+	  <common>Davis</common>
+	</name>
+	<email>brooks@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Robert</given>
+	  <common>Watson</common>
+	</name>
+	<email>rwatson@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Bjoern</given>
+	  <common>Zeeb</common>
+	</name>
+	<email>bz@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.cl.cam.ac.uk/research/security/ctsrd/">
+	CTSRD Project</url>
+
+      <url
+      href="http://www.cl.cam.ac.uk/research/security/ctsrd/cheri.html">
+	CHERI</url>
+    </links>
+
+    <body>
+      <p>In the course of developing the <a
+	  href="http://www.cl.cam.ac.uk/research/security/ctsrd/cheri.html">
+	    CHERI processor</a> as part of the <a
+	  href="http://www.cl.cam.ac.uk/research/security/ctsrd/">CTSRD
+	    project</a> SRI International's Computer Science Laboratory and
+	the University of Cambridge Computer Laboratory have developed
+	support for a number of general purpose IP cores for Altera FPGAs
+	including the Altera Triple Speed Ethernet (ATSE) MAC core, the
+	Altera University Program SD Card core, and the Altera JTAG UART.
+	We have also added support for general access to memory mapped
+	devices on the Avalon bus via the avgen bus. We have implemented
+	both nexus and flattened device tree (FDT) attachments for these
+	devices.</p>
+
+      <p>In addition to these softcore we have developed support for
+	the Terasic multi-touch LCD and are working to provide support
+	for the Terasic HDMI Transmitter Daughter Card. Both of these
+	work with common development and/or reference boards for Altera
+	FPGAs. They do require additional IP cores which we plan to
+	release to the open source community in the near future.</p>
+
+      <p>With exception of the ATSE and HDMI drivers we have merged all
+	of these changes to &os;-CURRENT. We anticipate that these
+	drivers will be useful for users who with to run &os; on either
+	hard or soft core CPUs on Altera FPGAs.</p>
+
+      <p>This work has been sponsored by DARPA, AFRL, and Google.</p>
+    </body>
+  </project>
+
+  <project cat='proj'>
+    <title>Native iSCSI Target</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Edward Tomasz</given>
+	  <common>Napiera&#322;a</common>
+	</name>
+	<email>trasz@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+    </links>
+
+    <body>
+      <p>During the July-September time period, the Native iSCSI Target
+	project was officially started under sponsorship from the &os;
+	Foundation. Before the end of September I've written ctld(8), the
+	userspace part of the target, responsible for handling
+	configuration, accepting incoming connections, performing
+	authentication and iSCSI parameter negotiation, and handing off
+	connections to the kernel. For the time being, I've reused some
+	parts of protocol-handling code from the istgt project; since
+	ctld(8) only handles the Login phase, the code can be rewritten
+	in a much simpler and shorter way in the future.</p>
+    </body>
+  </project>
+
+  <project cat='proj'>
+    <title>Parallel rc.d execution</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Kuan-Chung</given>
+	  <common>Chiu</common>
+	</name>
+	<email>buganini@gmail.com</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Kilian</given>
+	</name>
+	<email>kklimek@uos.de</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://github.com/buganini/rcexecr" />
+      <url href="https://github.com/kil/rcorder" />
+    </links>
+
+    <body>
+      <p>There are two implementations to make rc.d execution parallel.
+	Compared to Kil's rcorder, rcexecr brings more concurrence and
+	provides more flexibility than older "early_late_divider"
+	mechanism but require more invasive /etc patch. Both
+	implementations have switch to toggle parallel execution. Further
+	modification/integration needs more discussion.</p>
+    </body>
+
+    <help>
+      <task>Refine /etc/rc.d/* to eliminate unnecessary waiting.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Bugbusting Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Eitan</given>
+	  <common>Adler</common>
+	</name>
+	<email>eadler@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Gavin</given>
+	  <common>Atkinson</common>
+	</name>
+	<email>gavin@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Oleksandr</given>
+	  <common>Tymoshenko</common>
+	</name>
+	<email>gonzo@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/support.html#gnats" />
+      <url href="https://wiki.freebsd.org/BugBusting" />
+    </links>
+
+    <body>
+      <p>In August, Eitan Adler (eadler@) and Oleksandr Tymoshenko
+	(gonzo@) joined the Bugmeister team. At the same time, Remko
+	Lodder and Volker Werth stepped down. We extend our thanks to
+	Volker and Remko for their work in the past, and welcome
+	Oleksandr and Eitan. Eitan and Oleksandr have been working hard
+	on migrating from GNATS, and have made significant progress on
+	evaluating new software, and creating scripts to export data
+	from GNATS.</p>
+
+      <p>The bugbusting team continue work on trying to make the
+	contents of the GNATS PR database cleaner, more accessible and
+	easier for committers to find and resolve PRs, by tagging PRs
+	to indicate the areas involved, and by ensuring that there is
+	sufficient info within each PR to resolve each issue.</p>
+
+      <p>As always, anybody interested in helping out with the PR
+	queue is welcome to join us in #freebsd-bugbusters on EFnet. We
+	are always looking for additional help, whether your interests
+	lie in triaging incoming PRs, generating patches to resolve
+	existing problems, or simply helping with the database
+	housekeeping (identifying duplicate PRs, ones that have already
+	been resolved, etc). This is a great way of getting more
+	involved with &os;!</p>
+    </body>
+
+    <help>
+      <task>Further research into tools suitable to replace
+	GNATS.</task>
+
+      <task>Get more users involved with triaging PRs as they come
+	in.</task>
+
+      <task>Assist committers with closing PRs.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>The &os; Core Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Core Team</given>
+	</name>
+	<email>core@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <body>
+      <p>Along with the change in the Core Team membership, several
+	related roles changed hands. Gabor Pali assumed the role of core
+	secretary from Gavin Atkinson, and David Chisnall replaced Robert
+	Watson as liaison to the &os; Foundation. The Core Team felt
+	there was no longer a need for a formal security team liaison, so
+	that role was retired.</p>
+
+      <p>In the third quarter, the Core Team granted access for 2 new
+	committers and took 2 commit bits into safekeeping.</p>
+
+      <p>The Core Team worked with the Port Management Team and Cluster
+	Administrators to set a date to stop providing CVS exports for
+	the ports repository, which is February 28, 2013. In the
+	meantime, the CVS export for 9.1-RELEASE was restored.</p>
+    </body>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Foundation</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Deb</given>
+	  <common>Goodkin</common>
+	</name>
+	<email>deb@FreeBSDFoundation.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url
+      href="http://www.freebsdfoundation.org/press/2012Jul-newsletter.shtml">
+	Semi-annual newsletter</url>
+    </links>
+
+    <body>
+      <p>The Foundation hosted and sponsored the Cambridge &os;
+	developer summit in August 2012.</p>
+
+      <p>We were represented at the following conferences: OSCON July
+	2012, Texas LinuxFest, and Ohio LinuxFest.</p>
+
+      <p>We negotiated/supervised Foundation funded projects:
+	Distributed Security Audit Logging, Capsicum Component
+	Framework, Native iSCSI Target Scoping, and Growing UFS
+	Filesystems Online.</p>
+
+      <p>We negotiated, supervised, and funded hardware needs for
+	&os; co-location centers.</p>
+
+      <p>We welcomed Kirk McKusick to our board of directors. He took
+	over the responsibility of managing our investments.</p>
+
+      <p>We visited companies to discuss their &os; use and to help
+	facilitate collaboration with the Project.</p>
+
+      <p>We managed &os; vendor community mailing list and
+	meetings.</p>
+
+      <p>We created a high quality &os; 9 brochure to help promote
+	&os;.</p>
+
+      <p>Published our <a
+	  href="http://www.freebsdfoundation.org/press/2012Jul-newsletter.shtml">
+	    semi-annual newsletter</a> that highlighted Foundation
+	  funded projects, travel grants for
+	  developers, conferences sponsored and other ways the Foundation
+	  supported the &os; Project.</p>
+
+      <p>We hired a technical writer to help with &os;
+	marketing/promotional material.</p>
+
+      <p>We began work on redesigning our website.</p>
+    </body>
+  </project>
+
+  <project cat='kern'>
+    <title>&os; on ARMv6/ARMv7</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>freebsd-arm mailing list</given>
+	</name>
+	<email>freebsd-arm@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+    </links>
+
+    <body>
+      <p>Support for ARMv6 and ARMv7 architecture has been merged from
+	project branch to HEAD.  This code covers the following parts:
+	<ul>
+	  <li>General ARMv6/ARMv7 kernel bits (pmap, cache, assembler
+	    routines, etc...)</li>
+	  <li>ARM Generic Interrupt Controller driver</li>
+	  <li>Improved thread-local storage for cpus &gt;=ARMv6</li>
+	  <li>Driver for SMSC LAN95XX and LAN8710A ethernet controllers</li>
+	  <li>Marvell MV78x60 support (multiuser, ARMADA XP kernel config)</li>
+	  <li>TI OMAP4 and AM335x support (multiuser, no GPU or graphics
+	    support, kernel configs for Pandaboard and Beaglebone)</li>
+	  <li>LPC32x0 support (multiuser, frame buffer works with SSD1289
+	    LCD controller.  Embedded Artists EA3250 kernel config)</li>
+	</ul>
+      </p>
+
+      <p>This work was a result of a joint effort by many people,
+	including but not limited to: Grzegorz Bernacki (gber@),
+	Aleksander Dutkowski, Ben R. Gray (bgray@), Olivier Houchard
+	(cognet@), Rafal Jaworowski (raj@) and Semihalf team, Tim
+	Kientzle (kientzle@), Jakub Wojciech Klama (jceel@), Ian Lepore
+	(ian@), Warner Losh (imp@), Damjan Marion (dmarion@), Lukasz
+	Plachno, Stanislav Sedov (stas@), Mark Tinguely and Andrew
+	Turner (andrew@).  Thanks to all, who contributed by
+	submitting code, testing and giving valuable advice.</p>
+    </body>
+
+    <help>
+      <task>More hardware bring-ups and more drivers</task>
+
+      <task>Finish SMP support</task>
+
+      <task>VFP/NEON support</task>
+    </help>
+  </project>
+
+  <project cat='docs'>
+    <title>The &os; Japanese Documentation Project</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Hiroki</given>
+	  <common>Sato</common>
+	</name>
+	<email>hrs@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Ryusuke</given>
+	  <common>Suzuki</common>
+	</name>
+	<email>ryusuke@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/ja/">Japanese &os; Web
+	Page</url>
+
+      <url href="http://www.jp.FreeBSD.org/doc-jp/">The &os; Japanese
+	Documentation Project Web Page</url>
+    </links>
+
+    <body>
+      <p>Web page (htdocs): Newsflash and some other updates in the
+	English version were translated to keep them up-to-date.
+	Especially "security incident on &os; infrastructure" was
+	translated and published in a timely manner.</p>
+
+      <p>&os; Handbook: Big update in the "advanced-networking". With
+	this update, merging translation results from the handbook in the
+	local repository of Japanese documentation project into the main
+	repository was completed. This chapter is still outdated and
+	needs more work. The other sections have also constantly been
+	updated. Especially, new subsection "Using pkgng for Binary
+	Package Management" was added to "ports" section and "Using
+	subversion" subsection was added to "mirrors" section.</p>
+
+      <p>Article: Some progress was made in "Writing &os; Problem
+	Reports" and "Writing &os; Problem Reports" articles.</p>
+    </body>
+
+    <help>
+      <task>Further translation work of outdated documents in the 
+	<tt>ja_JP.eucJP</tt> subtree.</task>
+    </help>
+  </project>
+
+  <project cat='ports'>
+    <title>KDE/&os;</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>KDE</given>
+	  <common>FreeBSD</common>
+	</name>
+	<email>kde@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://FreeBSD.kde.org">KDE/&os; home page</url>
+      <url href="http://FreeBSD.kde.org/area51.php">area51</url>
+    </links>
+
+    <body>
+      <p>The KDE/&os; team have continued to improve the experience of
+	KDE software and Qt under &os;. The latest round of improvements
+	include: 
+	<ul>
+	  <li>Fixes for building Qt with libc++ and C++11</li>
+
+	  <li>Fixes for Solid-related crashes</li>
+
+	  <li>Fix battery detection in battery monitor plasmoid</li>
+	</ul>
+      </p>
+
+      <p>The team has also made many releases and upstreamed many fixes
+	and patches. The latest round of releases include: 
+	<ul>
+	  <li>KDE SC: 4.9.1 (area51) and 4.8.4 (ports)</li>
+
+	  <li>Qt: 4.8.3 (area51)</li>
+
+	  <li>PyQt: 4.9.4 (area51); QScintilla 2.6.2 (area51); SIP:
+	    4.13.3 (area51)</li>
+
+	  <li>Calligra: 2.4.3, 2.5-RC2, 2.5.0. 2.5.1, 2.5.2 (area51) and
+	    2.4.3, 2.5.0, 2.5.1 (ports)</li>
+
+	  <li>Amarok: 2.6.0 (area51)</li>
+
+	  <li>CMake: 2.8.9 (ports)</li>
+
+	  <li>Digikam (and KIPI-plugins): 2.7.0, 2.8.0, 2.9.0 (area51)
+	    and 2.7.0, 2.9.0 (ports)</li>
+
+	  <li>QtCreator: 2.6.0-beta (area51)</li>
+
+	  <li>many smaller ports</li>
+	</ul>
+      </p>
+
+      <p>The team is always looking for more testers and porters so
+	please contact us at kde@FreeBSD.org and visit our home page at 
+	<a href="http://FreeBSD.kde.org">http://FreeBSD.kde.org</a>.</p>
+    </body>
+
+    <help>
+      <task>Please see 2012 Q4 Status Report</task>
+
+      <task>Updating out-of-date ports, see 
+	<a href="http://portscout.org/kde@freebsd.org.html">PortScout</a>
+	for a list</task>
+    </help>
+  </project>
+
+  <project cat='ports'>
+    <title>Ports Collection</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Thomas</given>
+	  <common>Abthorpe</common>
+	</name>
+	<email>portmgr-secretary@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Port</given>
+	  <common>Management Team</common>
+	</name>
+	<email>portmgr@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/ports/" />
+
+      <url href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributing-ports/" />
+
+      <url href="http://portsmon.freebsd.org/index.html" />
+
+      <url href="http://www.freebsd.org/portmgr/index.html" />
+
+      <url href="http://blogs.freebsdish.org/portmgr/" />
+
+      <url href="http://www.twitter.com/freebsd_portmgr/" />
+
+      <url href="http://www.facebook.com/portmgr" />
+    </links>
+
+    <body>
+      <p>The ports tree approaches 24,000 ports, while the PR count
+	still is above 1000.</p>
+
+      <p>In Q3 we added 2 new committers and took in two commits bit
+	for safe keeping.</p>
+
+      <p>The Ports Management team had performed multiple -exp runs,
+	verifying how base system updates may affect the ports tree,
+	as well as providing QA runs for major ports updates.</p>
+
+      <p>Beat Gaetzi took over the role of sending out fail mails, a
+	role that Pav Lucistnik had previously held. Beat also undertook
+	the task of converting the Ports tree from CVS to Subversion.</p>
+
+      <p>Florent Thoumie stepped down from his role on portmgr, he was
+	instrumental in maintaining the legacy pkg_* code.</p>
+    </body>
+
+    <help>
+      <task>Most ports PRs are assigned, we now need to focus on
+	testing, committing and closing.</task>
+    </help>
+  </project>
+
+  <project cat='misc'>
+    <title>&os; Developer Summit, Cambridge, UK</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Robert</given>
+	  <common>Watson</common>
+	</name>
+	<email>rwatson@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/201208DevSummit">Developer
+	Summit Home Page</url>
+    </links>
+
+    <body>
+      <p>In the end of August, there was an "off-season" Developer
+	Summit held in Cambridge, UK at the University of Cambridge
+	Computer Laboratory. This was a three-day event, with a
+	documentation summit scheduled for the day before.  The three
+	days of the main event were split into three sessions, with two
+	tracks in each.  Some of them even involved ARM developers from
+	the neighborhoods which proven to be productive, and led to
+	further engagement between the &os; community and ARM.</p>
+
+      <p>The schedule was finalized on the first day, spawning a
+	plethora of topics to discuss, followed by splitting into groups.
+	A short summary from each of the groups was presented in the
+	final session and then published at the event's home page on the
+	&os; wiki. This summit contributed greatly to arriving to a
+	tentative plan for throwing the switch to make clang the default
+	compiler on HEAD. This was further discussed on the mailing list,
+	and has now happened, bringing us one big step closer to a
+	GPL-free &os; 10. As part of the program, an afternoon of short
+	talks from researchers in the Cambridge Computer Laboratory
+	involved either operating systems work in general or &os; in
+	particular. Robert Watson showed off a tablet running &os; on a
+	MIPS-compatible soft-core processor running on an Altera
+	FPGA.</p>
+
+      <p>In association with the event, a dinner was hosted by St. John's
+	college and co-sponsored by Google and the &os; Foundation. The
+	day after the conference, a trip was organized to Bletchley Park,
+	which was celebrating Turing's centenary in 2012.</p>
+    </body>
+  </project>
+
+  <project cat='soc'>
+    <title>Google Summer of Code 2012</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>
+	  </given>
+	  <common>&os; Summer of Code Administrators</common>
+	</name>
+	<email>soc-admins@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.freebsd.org/projects/summerofcode.html">
+	FreeBSD Summer of Code page</url>
+
+      <url href="https://wiki.freebsd.org/SummerOfCode2012">Summer of
+	Code 2012 projects</url>
+    </links>
+
+    <body>
+      <p>Over the Summer of 2012, &os; were once again granted a
+	place to participate in the Google Summer of Code program. We
+	received a total of 32 project proposals, and were ultimately
+	given 15 slots for university students to work on open source
+	projects mentored by existing &os; developers.</p>
+
+      <p>We were able to accept a wide spread of proposals, covering
+	both the base system and the ports infrastructure. We had
+	students working on file systems, file integrity checking, and
+	parallelization in the ports collection. Students worked on
+	kernel infrastructure, including one project to support CPU
+	resource limits on users, processes and jails, and one student
+	improving the BSD callout(9) and timer facilities. Two students
+	worked on the ARM platform, widely used in embedded systems and
+	smart phones; one student worked on a significant cleanup and
+	improvements to the Flattened Device Tree implementation code,
+	while the other ported &os; to the OMAP3-based BeagleBoard-xM
+	device. One student worked on improving IPv6 support in
+	userland tools, whilst another worked on BIOS emulation for the
+	BHyVE BSD-licensed hypervisor, new in &os; 10. Other students
+	worked on EFI boot support, userland lock profiling and an
+	automated kernel crash reporting system.</p>
+
+      <p>Overall, a significant proportion of the code produced has
+	or will be integrated into &os; in one form or another. All of
+	the work is available in our Summer Of Code Subversion
+	repository, and some of the work has already been merged back
+	into the main repositories.</p>
+
+      <p>&os; is once again grateful to Google for being selected to
+	participate in Summer of Code 2012.</p>
+    </body>
+  </project>
+</report>

Added: head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml	Thu Feb 28 18:37:51 2013	(r41063)
@@ -0,0 +1,1455 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd" >
+<!-- $FreeBSD$ -->
+<report>
+  <date>
+    <month>October-December</month>
+
+    <year>2012</year>
+  </date>
+
+  <section>
+    <title>Introduction</title>
+
+    <p>This report covers &os;-related projects between October and
+      December 2012. This is the last of four reports planned for 2012.</p>
+
+    <p>Thanks to all the reporters for the excellent work! This report
+      contains 28 entries and we hope you enjoy reading it.</p>
+
+    <p>The deadline for submissions covering the period between January
+      and March 2013 is April 21st, 2013.</p>
+  </section>
+
+  <category>
+    <name>proj</name>
+
+    <description>Projects</description>
+  </category>
+
+  <category>
+    <name>bin</name>
+
+    <description>Userland Programs</description>
+  </category>
+
+  <category>
+    <name>team</name>
+
+    <description>&os; Team Reports</description>
+  </category>
+
+  <category>
+    <name>kern</name>
+
+    <description>Kernel</description>
+  </category>
+
+  <category>
+    <name>net</name>
+
+    <description>Network Infrastructure</description>
+  </category>
+
+  <category>
+    <name>docs</name>
+
+    <description>Documentation</description>
+  </category>
+
+  <category>
+    <name>arch</name>
+
+    <description>Architectures</description>
+  </category>
+
+  <category>
+    <name>ports</name>
+
+    <description>Ports</description>
+  </category>
+
+  <category>
+    <name>misc</name>
+
+    <description>Miscellaneous</description>
+  </category>
+
+  <project cat='proj'>
+    <title>&os; on BeagleBone</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Tim</given>
+	  <common>Kientzle</common>
+	</name>
+	<email>kientzle@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Oleksandr</given>
+	  <common>Tymoshenko</common>
+	</name>
+	<email>gonzo@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Damjan</given>
+	  <common>Marion</common>
+	</name>
+	<email>dmarion@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Brett</given>
+	  <common>Wynkoop</common>
+	</name>
+	<email>wynkoop@wynn.com</email>
+      </person>
+    </contact>
+
+    <links>
+    </links>
+
+    <body>
+      <p>&os; on BeagleBone is benefiting from the general work on ARM
+	stability being done by many people, and is proving to be a nice
+	testbed for our ARMv7 support. All ongoing work is happening now
+	directly in -CURRENT and we expect it to be in pretty good shape
+	by the time 10.0 ships.</p>
+
+      <p>The network driver is now pretty stable; the system should be
+	useful as a small network device.</p>
+
+      <p>Occasional system snapshots are being built and advertised for
+	people to test. Ask on freebsd-arm@ if you'd like to try the
+	newest one.</p>
+    </body>
+
+    <help>
+      <task>We need someone to finish the USB driver. Ask if you'd like
+	to take this over.</task>
+
+      <task>MMCSD performance is still rather poor.</task>
+
+      <task>There's been discussion of how to improve the GPIO
+	configuration and pinmux handling to simplify hardware
+	experimentation. If we had more people to help build drivers, we
+	could start supporting some of the BeagleBone capes.</task>
+
+      <task>Mostly we just need people to use it and report any issues
+	they encounter.</task>
+    </help>
+  </project>
+
+  <project cat='proj'>
+    <title>BHyVe</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Neel</given>
+	  <common>Natu</common>
+	</name>
+	<email>neel@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Peter</given>
+	  <common>Grehan</common>
+	</name>
+	<email>grehan@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.FreeBSD.org/BHyVe" />
+      <url href="http://www.bhyve.org/" />
+    </links>
+
+    <body>
+      <p>BHyVe is a type-2 hypervisor for &os;/amd64 hosts with Intel
+	VT-x and EPT CPU support. The bhyve project branch was merged
+	into CURRENT on Jan 18. Work is progressing on performance, ease
+	of use, AMD SVM support, and being able to run non-&os; operating
+	systems.</p>
+    </body>
+
+    <help>
+      <task>1. Booting Linux/*BSD/Windows</task>
+
+      <task>2. Moving the codebase to a more modular design consisting
+	of a small base and loadable modules</task>
+
+      <task>3. Various hypervisor features such as suspend/resume/live
+	migration/sparse disk support</task>
+    </help>
+  </project>
+
+  <project cat='proj'>
+    <title>BSD-licenced patch(1)</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Pedro</given>
+	  <common>Giffuni</common>
+	</name>
+	<email>pfg@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Gabor</given>
+	  <common>Kovesdan</common>
+	</name>
+	<email>gabor@FreeBSD.org</email>
+      </person>
+      <person>
+	<name>
+	  <given>Xin</given>
+	  <common>Li</common>
+	</name>
+	<email>delphij@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://code.google.com/p/bsd-patch/">Home for BSD
+	patch (deprecated)</url>
+    </links>
+
+    <body>
+      <p>&os; has been using for a while a very old version of GNU
+	patch that is partially under the GPLv2. The original GNU patch
+	utility is based on an initial implementation by Larry Wall that
+	was not actually copyleft. OpenBSD did many enhancements to an
+	older non-copyleft version of patch, this version was later
+	adopted and further refined by DragonFlyBSD and NetBSD but there
+	was no centralized development of the tool and &os; kept working
+	independently. In less than a week we took the version in
+	DragonFlyBSD and adapted the &os; enhancements to make it behave
+	nearer to the version used natively in &os;. Most of the work was
+	done by Pedro Giffuni, adapting patches from sepotvin@ and ed@,
+	and additional contributions were done by Christoph Mallon, Gabor
+	Kovesdan and Xin Li. As a result of this we now have a new
+	version of patch committed in head/usr.bin/patch that you can try
+	by using WITH_BSD_PATCH in your builds. The new patch(1) doesn't
+	support the &os;-specific -I and -S options which don't seem
+	necessary. In GNU patch -I actually means 'ignore whitespaces'
+	and we now support it too.</p>
+    </body>
+
+    <help>
+      <task>Testing.  A lot more testing.</task>
+    </help>
+  </project>
+
+  <project cat='proj'>
+    <title>Common Flash Interface (CFI) driver improvements</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Brooks</given>
+	  <common>Davis</common>
+	</name>
+	<email>brooks@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+    </links>
+
+    <body>
+      <p>The Common Flash Interface provides a common programming
+	interface for a wide range of NOR flash devices commonly found in
+	embedded systems. I have developed a number of improvements to
+	the cfi(4) device when used on Intel StrataFlash parts.
+	Unnecessary erase cycles are now avoided, devices that require
+	single word writes only write changed words, and multi-word

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

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 28 23:33:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BFC7BD8D;
 Thu, 28 Feb 2013 23:33:05 +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 A3C1394C;
 Thu, 28 Feb 2013 23:33:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SNX5xM094684;
 Thu, 28 Feb 2013 23:33:05 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SNX4er094673;
 Thu, 28 Feb 2013 23:33:04 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302282333.r1SNX4er094673@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 28 Feb 2013 23:33:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41064 - in head/en_US.ISO8859-1/books/handbook:
 advanced-networking disks install mirrors multimedia printing security
 serialcomms
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, 28 Feb 2013 23:33:05 -0000

Author: eadler
Date: Thu Feb 28 23:33:03 2013
New Revision: 41064
URL: http://svnweb.freebsd.org/changeset/doc/41064

Log:
  Remove references / support of &os; 7.x
  
  ppp-and-slip not touched because of ongoing work to revise that chapter.
  
  Reviewed by:	doc@
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  head/en_US.ISO8859-1/books/handbook/install/chapter.xml
  head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
  head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
  head/en_US.ISO8859-1/books/handbook/security/chapter.xml
  head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -867,22 +867,6 @@ route_net2="-net 192.168.1.0/24 192.168.
 	    wrapper.</para>
 	</note>
 
-	<para>Under &os;&nbsp;7.X, with a device driver you need to
-	  also bring in the 802.11 networking support required by the
-	  driver.  For the &man.ath.4; driver these are at least the
-	  &man.wlan.4;, <literal>wlan_scan_ap</literal> and
-	  <literal>wlan_scan_sta</literal> modules; the &man.wlan.4;
-	  module is automatically loaded with the wireless device
-	  driver, the remaining modules must be loaded at boot time
-	  in <filename>/boot/loader.conf</filename>:</para>
-
-	<programlisting>wlan_scan_ap_load="YES"
-wlan_scan_sta_load="YES"</programlisting>
-
-	<para>Since &os;&nbsp;8.0, these modules are part of the
-	  base &man.wlan.4; driver which is dynamically loaded with
-	  the adapter driver.</para>
-
 	<para>With that, you will need the modules that implement
 	  cryptographic support for the security protocols you intend
 	  to use.  These are intended to be dynamically loaded on
@@ -922,13 +906,6 @@ device ath_hal           # pci/cardbus c
 options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
 device ath_rate_sample   # SampleRate tx rate control for ath</programlisting>
 
-	  <para>Both following lines are also required by
-	    &os;&nbsp;7.X, other &os; versions do not need
-	    them:</para>
-
-	  <programlisting>device wlan_scan_ap      # 802.11 AP mode scanning
-device wlan_scan_sta     # 802.11 STA mode scanning</programlisting>
-
 	  <para>With this information in the kernel configuration
 	    file, recompile the kernel and reboot your &os;
 	    machine.</para>
@@ -979,21 +956,6 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	      require you to mark the interface up again.</para>
 	  </note>
 
-	  <note>
-	    <para>Under &os;&nbsp;7.X, the adapter device, for example
-	      <devicename><replaceable>ath0</replaceable></devicename>,
-	      is used directly instead of the
-	      <devicename>wlan<replaceable>0</replaceable></devicename>
-	      device.  This requires you to replace the both previous
-	      lines with:</para>
-
-	    <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen>
-
-	    <para>In the rest of this document, &os;&nbsp;7.X users
-	      will need to change the command and configuration lines
-	      according to that scheme.</para>
-	  </note>
-
 	  <para>The output of a scan request lists each BSS/IBSS
 	    network found.  Beside the name of the network,
 	    <literal>SSID</literal>, we find the
@@ -1096,13 +1058,6 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	    <programlisting>wlans_ath0="wlan0"
 ifconfig_wlan0="DHCP"</programlisting>
 
-	    <note>
-	      <para>As previously mentioned, &os;&nbsp;7.X will only
-		require a line related to the adapter device:</para>
-
-	      <programlisting>ifconfig_ath0="DHCP"</programlisting>
-	    </note>
-
 	    <para>If there are multiple access points and you want to
 	      select a specific one, you can select it by its
 	      SSID:</para>

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -3040,13 +3040,7 @@ Filesystem 1K-blocks Used Avail Capacity
 	kernel configuration.</para>
 
       <para>Next, enable disk quotas in
-	<filename>/etc/rc.conf</filename>.  On &os;&nbsp;7.X and
-	earlier, this is done by adding the line:</para>
-
-      <programlisting>enable_quotas="YES"</programlisting>
-
-      <para>On &os;&nbsp;8.0-RELEASE and later, add the following
-	line instead:</para>
+	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>quota_enable="YES"</programlisting>
 
@@ -4028,10 +4022,6 @@ Device          1K-blocks     Used    Av
 	      linkend="network-communication">&os;
 	      networking</link>.</para>
 	</listitem>
-
-	<listitem>
-	  <para>Use &os;&nbsp;8.1-RELEASE or newer.</para>
-	</listitem>
       </itemizedlist>
 
       <para>The <acronym>HAST</acronym> project was sponsored by The

Modified: head/en_US.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/install/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/install/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -4556,7 +4556,7 @@ Please press any key to reboot.</screen>
 	  <para>That directory will normally contain the following images:</para>
 
 	  <table frame="none">
-	    <title>FreeBSD 7.<replaceable>X</replaceable> and 8.<replaceable>X</replaceable>
+	    <title>&os; 8.<replaceable>X</replaceable>
 	      ISO Image Names and Meanings</title>
 
 	    <tgroup cols="2">

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -232,7 +232,7 @@
 	<application>CTM</application> distribution lists.
 	&a.ctm-cvs-cur.name; supports the entire CVS tree.
 	&a.ctm-src-cur.name; supports the head of the development
-	branch.  &a.ctm-src-7.name; supports the 7.X release branch,
+	branch.  &a.ctm-src-9.name; supports the 9.X release branch,
 	etc..  (If you do not know how to subscribe yourself to a
 	list, click on the list name above or go to
 	&a.mailman.lists.link; and click on the list that you wish to

Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -1677,10 +1677,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 	<application>SANE</application> has a <ulink
 	url="http://www.sane-project.org/sane-supported-devices.html">supported
 	devices</ulink> list that can provide you with information
-	about the support for a scanner and its status.  On systems
-	prior to &os;&nbsp;8.X the
-	&man.uscanner.4; manual page also provides a list of supported
-	USB scanners.</para>
+	about the support for a scanner and its status.</para>
     </sect2>
 
     <sect2>
@@ -1704,16 +1701,6 @@ device uhci
 device ohci
 device ehci</programlisting>
 
-	<para>On systems prior to &os;&nbsp;8.X, the following line is
-	  also needed:</para>
-
-	<programlisting>device uscanner</programlisting>
-
-	<para>On these versions of &os;, the &man.uscanner.4; device
-	  driver provides support for the USB scanners.  Since
-	  &os;&nbsp;8.0, this support is directly provided by
-	  the &man.libusb.3; library.</para>
-
 	<para>After rebooting with the correct kernel,
 	  plug in your USB scanner.  A
 	  line showing the detection of your
@@ -1722,14 +1709,9 @@ device ehci</programlisting>
 
 	<screen>ugen0.2: &lt;EPSON&gt; at usbus0</screen>
 
-	<para>or on a &os;&nbsp;7.X system:</para>
-
-	<screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen>
-
 	<para>These messages show that our scanner is using
-	  either <filename>/dev/ugen0.2</filename> or
-	  <filename>/dev/uscanner0</filename> as device node according
-	  to the &os; version we run.  For this example, a
+	  either <filename>/dev/ugen0.2</filename>
+	  as device node.  For this example, a
 	  &epson.perfection;&nbsp;1650 USB scanner was used.</para>
       </sect3>
 
@@ -1973,22 +1955,6 @@ device `epson:/dev/uscanner0' is a Epson
 add path ugen0.2 mode 0660 group usb
 add path usb/0.2.0 mode 0666 group usb</programlisting>
 
-      <para>&os;&nbsp;7.X users will probably need the following
-	lines with the correct device node
-	<filename>/dev/uscanner0</filename>:</para>
-
-      <programlisting>[system=5]
-add path uscanner0 mode 660 group usb</programlisting>
-
-      <para>Then add the following to
-	<filename>/etc/rc.conf</filename> and reboot the
-	machine:</para>
-
-      <programlisting>devfs_system_ruleset="system"</programlisting>
-
-      <para>More information regarding these lines can be found in the
-	&man.devfs.8; manual page.</para>
-
       <para>Now, one will just have to add users to the
 	<groupname><replaceable>usb</replaceable></groupname> group to
 	allow the access to the scanner:</para>

Modified: head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -212,15 +212,6 @@
   <sect1 id="printing-intro-setup">
     <title>Basic Setup</title>
 
-    <warning>
-      <para>As of &os; 8.0, device nodes for serial ports have been
-	renamed from
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename> to
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename>.
-	&os;&nbsp;7.X users will have to adapt the following
-	documentation according to these changes.</para>
-    </warning>
-
     <para>To use printers with the <application>LPD</application>
       spooling system, you will need to set up both your printer
       hardware and the <application>LPD</application> software.  This
@@ -1465,15 +1456,6 @@ $%&amp;'()*+,-./01234567
   <sect1 id="printing-advanced">
     <title>Advanced Printer Setup</title>
 
-    <warning>
-      <para>As of &os; 8.0, device nodes for serial ports have been
-	renamed from
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename> to
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename>.
-	&os;&nbsp;7.X users will have to adapt the following
-	documentation according to these changes.</para>
-    </warning>
-
     <para>This section describes filters for printing specially
       formatted files, header pages, printing across networks, and
       restricting and accounting for printer usage.</para>

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -645,8 +645,7 @@
 	turned off, and access to raw devices will be denied.  Higher
 	levels restrict even more operations.  For a full description
 	of the effect of various secure levels, please read the
-	&man.security.7; manual page (or the manual page of
-	&man.init.8; in releases older than &os; 7.0).</para>
+	&man.security.7; manual page.</para>
 
       <note>
 	<para>Bumping the secure level to 1 or higher may cause a few

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Feb 28 18:37:51 2013	(r41063)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Feb 28 23:33:03 2013	(r41064)
@@ -59,17 +59,6 @@
   <sect1 id="serial">
     <title>Introduction</title>
 
-    <warning>
-      <para>As of &os; 8.0, device nodes for serial ports have been
-	renamed from
-	<filename>/dev/cuad<replaceable>N</replaceable></filename> to
-	<filename>/dev/cuau<replaceable>N</replaceable></filename> and
-	from
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename> to
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename>.
-	&os;&nbsp;7.X users will have to adapt the following
-	documentation according to these changes.</para>
-    </warning>
     <!-- XXX Write me! -->
 
     <sect2 id="serial-terminology">

From owner-svn-doc-head@FreeBSD.ORG  Fri Mar  1 00:27:36 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 493E38C5;
 Fri,  1 Mar 2013 00:27:36 +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 3AE34AD0;
 Fri,  1 Mar 2013 00:27:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r210RaSq010758;
 Fri, 1 Mar 2013 00:27:36 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r210RaJa010757;
 Fri, 1 Mar 2013 00:27:36 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201303010027.r210RaJa010757@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 1 Mar 2013 00:27:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41065 - head/en_US.ISO8859-1/htdocs/news/status
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, 01 Mar 2013 00:27:36 -0000

Author: gjb
Date: Fri Mar  1 00:27:35 2013
New Revision: 41065
URL: http://svnweb.freebsd.org/changeset/doc/41065

Log:
  Fix portscout URL.

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml	Thu Feb 28 23:33:03 2013	(r41064)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml	Fri Mar  1 00:27:35 2013	(r41065)
@@ -532,7 +532,7 @@
       <task>Please see 2012 Q4 Status Report</task>
 
       <task>Updating out-of-date ports, see 
-	<a href="http://portscout.org/kde@freebsd.org.html">PortScout</a>
+	<a href="http://portscout.FreeBSD.org/kde@freebsd.org.html">PortScout</a>
 	for a list</task>
     </help>
   </project>

From owner-svn-doc-head@FreeBSD.ORG  Fri Mar  1 00:32:06 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9625E952;
 Fri,  1 Mar 2013 00:32: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 88625AEA;
 Fri,  1 Mar 2013 00:32:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r210W5tJ012998;
 Fri, 1 Mar 2013 00:32:05 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r210W5cB012997;
 Fri, 1 Mar 2013 00:32:05 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201303010032.r210W5cB012997@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 1 Mar 2013 00:32:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41066 - head/en_US.ISO8859-1/htdocs/news/status
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, 01 Mar 2013 00:32:06 -0000

Author: gjb
Date: Fri Mar  1 00:32:05 2013
New Revision: 41066
URL: http://svnweb.freebsd.org/changeset/doc/41066

Log:
  Fix portscout URL; missed this file with
  previous commit.

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml	Fri Mar  1 00:27:35 2013	(r41065)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml	Fri Mar  1 00:32:05 2013	(r41066)
@@ -524,7 +524,7 @@ Report//EN" "http://www.FreeBSD.org/XML/
       <task>Test KDE SC 4.8.95.</task>
       <task>Test KDE PIM 4.8.95.</task>
       <task>Update out-of-date ports, see <a
-	  href="http://portscout.org/kde@freebsd.org.html">PortScout</a> for a
+	  href="http://portscout.FreeBSD.org/kde@freebsd.org.html">PortScout</a> for a
 	list.</task>
     </help>
   </project>

From owner-svn-doc-head@FreeBSD.ORG  Fri Mar  1 12:56:49 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 98CC03D2;
 Fri,  1 Mar 2013 12:56:49 +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 8B8BDB90;
 Fri,  1 Mar 2013 12:56:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21Cungo041587;
 Fri, 1 Mar 2013 12:56:49 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21Cunx9041586;
 Fri, 1 Mar 2013 12:56:49 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201303011256.r21Cunx9041586@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 1 Mar 2013 12:56:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41067 - head/en_US.ISO8859-1/htdocs/releases/8.4R
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, 01 Mar 2013 12:56:49 -0000

Author: rene
Date: Fri Mar  1 12:56:48 2013
New Revision: 41067
URL: http://svnweb.freebsd.org/changeset/doc/41067

Log:
  Update the 8.4-RELEASE schedule:
  - add information related to the documentation slush
  - update and comment out the wiki link, there is no wiki page for
    8.4-RELEASE yet.
  Approved by:	gjb (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml

Modified: head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml	Fri Mar  1 00:32:05 2013	(r41066)
+++ head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml	Fri Mar  1 12:56:48 2013	(r41067)
@@ -46,6 +46,14 @@
     </tr>
 
     <tr>
+      <td>Announce <tt>doc/</tt> tree slush</td>
+      <td>-</td>
+      <td>28&nbsp;February&nbsp;2013</td>
+      <td>Notification of the impending <tt>doc/</tt> tree slush
+	should be sent to <tt>doc@</tt>.</td>
+    </tr>
+
+    <tr>
       <td>Code freeze begins</td>
       <td>08&nbsp;March&nbsp;2013</td>
       <td>-</td>
@@ -63,6 +71,16 @@
     </tr>
 
     <tr>
+      <td><tt>doc/</tt> tree slush</td>
+      <td>17&nbsp;March&nbsp;2013</td>
+      <td>-</td>
+      <td>Non-essential commits to the <tt>en_US.ISO8859-1/</tt>
+	subtree should be delayed from this point until after the
+	<tt>doc/</tt> tree tagging, to give translation teams time to
+	synchronize their work.</td>
+     </tr>
+
+    <tr>
       <td>releng/&local.rel; branch</td>
       <td>18&nbsp;March&nbsp;2013</td>
       <td>-</td>
@@ -107,10 +125,10 @@
 	announcement.</td>
     </tr>
   </table>
-
+<!--
   <h1>Internal Status / TODO</h1>
-  <a href="http://wiki.freebsd.org/Releng/8.3TODO">http://wiki.freebsd.org/Releng/8.3TODO</a>
-
+  <a href="http://wiki.freebsd.org/Releng/8.4TODO">http://wiki.freebsd.org/Releng/8.4TODO</a>
+-->
 
   </body>
 </html>

From owner-svn-doc-head@FreeBSD.ORG  Fri Mar  1 19:58:23 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 390AC4B5;
 Fri,  1 Mar 2013 19:58:23 +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 1CA83143F;
 Fri,  1 Mar 2013 19:58:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21JwM1x069595;
 Fri, 1 Mar 2013 19:58:23 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21JwMUv069594;
 Fri, 1 Mar 2013 19:58:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201303011958.r21JwMUv069594@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 1 Mar 2013 19:58:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41068 - head/en_US.ISO8859-1/books/arch-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, 01 Mar 2013 19:58:23 -0000

Author: eadler
Date: Fri Mar  1 19:58:22 2013
New Revision: 41068
URL: http://svnweb.freebsd.org/changeset/doc/41068

Log:
  Fix a whole bunch of whitespace issues
  
  Translators: there are no content changes here
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/arch-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/book.xml	Fri Mar  1 12:56:48 2013	(r41067)
+++ head/en_US.ISO8859-1/books/arch-handbook/book.xml	Fri Mar  1 19:58:22 2013	(r41068)
@@ -42,20 +42,20 @@
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
-      <para>Welcome to the &os; Architecture Handbook.  This manual is a
+      <para>Welcome to the &os; Architecture Handbook.  This manual is
+	a
 	<emphasis>work in progress</emphasis> and is the work of many
 	individuals.  Many sections do not yet exist and some of those
 	that do exist need to be updated.  If you are interested in
 	helping with this project, send email to the &a.doc;.</para>
 
       <para>The latest version of this document is always available
-        from the <ulink url="&url.base;/index.html">FreeBSD World
-        Wide Web server</ulink>.  It may also be downloaded in a
-        variety of formats and compression options from the <ulink
-        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP
-        server</ulink> or one of the numerous <ulink
-        url="&url.books.handbook;/mirrors-ftp.html">mirror
-        sites</ulink>.</para>
+	from the <ulink url="&url.base;/index.html">FreeBSD World
+	Wide Web server</ulink>.  It may also be downloaded in a
+	variety of formats and compression options from the <ulink
+	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP server</ulink>
+	or one of the numerous <ulink
+	  url="&url.books.handbook;/mirrors-ftp.html">mirror sites</ulink>.</para>
     </abstract>
   </bookinfo>
 
@@ -96,7 +96,7 @@
       <title>* I386</title>
 
       <para>Talk about <literal>i386</literal> specific &os;
-        architecture.</para>
+	architecture.</para>
     </chapter>
 
     <chapter id="alpha">
@@ -118,21 +118,21 @@
       <title>* SPARC64</title>
 
       <para>Talk about <literal>SPARC64</literal> specific &os;
-        architecture.</para>
+	architecture.</para>
     </chapter>
 
     <chapter id="amd64">
       <title>* AMD64</title>
 
       <para>Talk about <literal>AMD64</literal> specific &os;
-        architecture.</para>
+	architecture.</para>
     </chapter>
 
     <chapter id="powerpc">
       <title>* PowerPC</title>
 
       <para>Talk about <literal>PowerPC</literal> specific &os;
-        architecture.</para>
+	architecture.</para>
     </chapter>
   </part>
 -->
@@ -140,41 +140,48 @@
   <part id="appendices">
     <title>Appendices</title>
 
-      <bibliography>
+    <bibliography>
 
       <biblioentry xreflabel="1">
-        <authorgroup>
-          <author>
-            <firstname>Marshall</firstname>
-            <othername role="Middle">Kirk</othername>
-            <surname>McKusick</surname>
-          </author>
-          <author>
-            <firstname>Keith</firstname>
-            <surname>Bostic</surname>
-          </author>
-          <author>
-            <firstname>Michael</firstname>
-            <othername role="MI">J</othername>
-            <surname>Karels</surname>
-          </author>
-          <author>
-            <firstname>John</firstname>
-            <othername role="MI">S</othername>
-            <surname>Quarterman</surname>
-          </author>
-        </authorgroup>
-        <copyright><year>1996</year><holder>Addison-Wesley Publishing Company,
-        Inc.</holder></copyright>
-        <isbn>0-201-54979-4</isbn>
-        <publisher>
-          <publishername>Addison-Wesley Publishing Company, Inc.</publishername>
-        </publisher>
-        <title>The Design and Implementation of the 4.4 BSD Operating System</title>
-        <pagenums>1-2</pagenums>
+	<authorgroup>
+	  <author>
+	    <firstname>Marshall</firstname>
+	    <othername role="Middle">Kirk</othername>
+	    <surname>McKusick</surname>
+	  </author>
+	  <author>
+	    <firstname>Keith</firstname>
+	    <surname>Bostic</surname>
+	  </author>
+	  <author>
+	    <firstname>Michael</firstname>
+	    <othername role="MI">J</othername>
+	    <surname>Karels</surname>
+	  </author>
+	  <author>
+	    <firstname>John</firstname>
+	    <othername role="MI">S</othername>
+	    <surname>Quarterman</surname>
+	  </author>
+	</authorgroup>
+
+	<copyright>
+	  <year>1996</year>
+	  <holder>Addison-Wesley Publishing Company, Inc.</holder>
+	</copyright>
+
+	<isbn>0-201-54979-4</isbn>
+
+	<publisher>
+	  <publishername>Addison-Wesley Publishing Company, Inc.</publishername>
+	</publisher>
+
+	<title>The Design and Implementation of the 4.4 BSD Operating System</title>
+
+	<pagenums>1-2</pagenums>
       </biblioentry>
 
-      </bibliography>
+    </bibliography>
   </part>
 
   &chap.index;

From owner-svn-doc-head@FreeBSD.ORG  Fri Mar  1 19:58:25 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B4A5B4B8;
 Fri,  1 Mar 2013 19:58:25 +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 A2F3B1441;
 Fri,  1 Mar 2013 19:58:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21JwP1H069632;
 Fri, 1 Mar 2013 19:58:25 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21JwP6q069631;
 Fri, 1 Mar 2013 19:58:25 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201303011958.r21JwP6q069631@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 1 Mar 2013 19:58:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41069 - head/en_US.ISO8859-1/books/arch-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, 01 Mar 2013 19:58:25 -0000

Author: eadler
Date: Fri Mar  1 19:58:25 2013
New Revision: 41069
URL: http://svnweb.freebsd.org/changeset/doc/41069

Log:
  Alpha is long gone
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/arch-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/book.xml	Fri Mar  1 19:58:22 2013	(r41068)
+++ head/en_US.ISO8859-1/books/arch-handbook/book.xml	Fri Mar  1 19:58:25 2013	(r41069)
@@ -99,13 +99,6 @@
 	architecture.</para>
     </chapter>
 
-    <chapter id="alpha">
-      <title>* Alpha</title>
-
-      <para>Talk about the architectural specifics of
-      FreeBSD/alpha.</para>
-    </chapter>
-
     <chapter id="ia64">
       <title>* IA-64</title>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Mar  2 01:56:03 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C67146B8;
 Sat,  2 Mar 2013 01:56:03 +0000 (UTC) (envelope-from jgh@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 A18CE1C4;
 Sat,  2 Mar 2013 01:56:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r221u2UL082813;
 Sat, 2 Mar 2013 01:56:02 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r221u2SM082811;
 Sat, 2 Mar 2013 01:56:02 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303020156.r221u2SM082811@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 2 Mar 2013 01:56:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41070 - head/en_US.ISO8859-1/articles/contributors
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, 02 Mar 2013 01:56:03 -0000

Author: jgh (ports committer)
Date: Sat Mar  2 01:56:02 2013
New Revision: 41070
URL: http://svnweb.freebsd.org/changeset/doc/41070

Log:
  - add Waitman Gobble for ports-mgmt/prhistory
  
  PR:		175627

Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Fri Mar  1 19:58:25 2013	(r41069)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sat Mar  2 01:56:02 2013	(r41070)
@@ -10709,6 +10709,11 @@
     </listitem>
 
     <listitem>
+      <para>Waitman Gobble
+	<email>waitman@waitman.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Walt Howard
 	<email>howard@ee.utah.edu</email></para>
     </listitem>

From owner-svn-doc-head@FreeBSD.ORG  Sat Mar  2 15:53:53 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A2AE08FF;
 Sat,  2 Mar 2013 15:53:53 +0000 (UTC)
 (envelope-from ryusuke@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 9475929B;
 Sat,  2 Mar 2013 15:53:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22FrrHA044091;
 Sat, 2 Mar 2013 15:53:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22FrrXe044090;
 Sat, 2 Mar 2013 15:53:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201303021553.r22FrrXe044090@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 2 Mar 2013 15:53:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41071 - head/ja_JP.eucJP/books/handbook/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, 02 Mar 2013 15:53:53 -0000

Author: ryusuke
Date: Sat Mar  2 15:53:52 2013
New Revision: 41071
URL: http://svnweb.freebsd.org/changeset/doc/41071

Log:
  - Merge the following from the English version:
  
  	r40982 -> r41064	head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Sat Mar  2 01:56:02 2013	(r41070)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40982
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -232,8 +232,8 @@
 	ÇÛÉۥ᡼¥ê¥ó¥°¥ê¥¹¥È¤Î¤¤¤º¤ì¤«¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
 	&a.ctm-cvs-cur.name; ¤Ï´°Á´¤Ê CVS ¥Ä¥ê¡¼¡¢
 	&a.ctm-src-cur.name;
-	¤Ï³«È¯Àèü¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£&a.ctm-src-7.name;
-	¤Ï 7.X ¥ê¥ê¡¼¥¹¤Î¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤¿¤â¤Î¤Ç¤¹
+	¤Ï³«È¯Àèü¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£&a.ctm-src-9.name;
+	¤Ï 9.X ¥ê¥ê¡¼¥¹¤Î¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤¿¤â¤Î¤Ç¤¹
 	(¤â¤·»²²ÃÊýË¡¤¬Ê¬¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È̾¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¡¢
         &a.mailman.lists.link; ¤Ë¹Ô¤Ã¤Æ»²²Ã¤·¤¿¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
         ¤³¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢»²²Ã¼ê½ç¤¬¾Ü¤·¤¯½ñ¤«¤ì¤Æ¤¤¤Þ¤¹)¡£</para>
@@ -865,19 +865,6 @@ Certificate information:
 	¤Î³Æ¥ß¥é¡¼¥µ¥¤¥È¤Ç¼Â¹Ô¤¹¤ë¥µ¡¼¥Ð <command>cvsupd</command>
 	¤Ç¤¹¡£</para>
 
-      <para>&os; ¤Îʸ½ñ¤ä¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤òÆɤó¤ÀºÝ¤Ë¡¢
-	<application>sup</application> ¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤ò
-	¸«¤«¤±¤¿¤«¤â¤·¤ì¤Þ¤»¤ó¡£<application>sup</application> ¤Ï
-	<application>CVSup</application> ¤ÎÁ°¤Ë¸ºß¤·¤Æ¤¤¤¿¤â¤Î¤Ç¡¢
-	ƱÍͤÎÌÜŪ¤Ç»È¤ï¤ì¤Æ¤¤¤Þ¤·¤¿¡£
-	<application>CVSup</application> ¤Ï sup
-	¤ÈƱ¤¸¤è¤¦¤Ë»ÈÍѤµ¤ì¤Æ¤ª¤ê¡¢¼ÂºÝ¡¢<command>sup</command>
-	¤È¸ß´¹À­¤Î¤¢¤ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£
-	<application>CVSup</application>
-	¤ÎÊý¤¬¤è¤ê¹â®¤Ç½ÀÆðÀ­¤â¤¢¤ë¤Î¤Ç¡¢¤â¤Ï¤ä
-	<application>sup</application> ¤Ï &os;
-	¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
-
       <note>
 	<para><application>csup</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï
 	  <application>CVSup</application>
@@ -1253,23 +1240,9 @@ src-all</programlisting>
           <quote>¤ï¤«¤ê¤Þ¤·¤¿¡£
             ¤Ç¤Ï¡¢¤³¤ì¤È¤³¤ì¤È¤³¤ì¤ò¤â¤é¤¤¤Þ¤¹</quote> ¤ÈÅú¤¨¤Þ¤¹¡£
           ¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Î <application>CVSup</application> ¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢
-          ÀßÄê¥Õ¥¡¥¤¥ë¤ÇÁª¤ó¤À¥³¥ì¥¯¥·¥ç¥ó¤È¥¿¥°¤ËŬ¹ç¤¹¤ë
-	  ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£
-          ¤·¤«¤·¡¢¤³¤ì¤Ï¾ï¤Ë¤¢¤Ê¤¿¤Î˾¤àÆ°ºî¤È°ìÃפ¹¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
-          ÆÃ¤Ë <filename>doc</filename> ¤ä <filename>ports</filename> ¤ä
-          <filename>www</filename> ¤Î¥Ä¥ê¡¼¤òƱ´ü¤µ¤»¤ë¾ì¹ç¤Ê¤É¤Ï¤½¤¦¤Ç¤·¤ç¤¦¡£
-          ¤Û¤È¤ó¤É¤Î¿Í¤Ï»Í¤«¹ñ¸ì¤â¸Þ¤«¹ñ¸ì¤âÁà¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤«¤é¡¢
-          ÆÃÄê¤Î¸À¸ì¤Î¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤ÏɬÍפʤ¤¤Ç¤·¤ç¤¦¡£
-          Ports Collection ¤ò <application>CVSup</application>
-          ¤Ç¼èÆÀ¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢³Æ¥³¥ì¥¯¥·¥ç¥ó¤ò¸ÄÊ̤˻ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹
-          (¤¿¤È¤¨¤Ð¡¢Ã±¤Ë <emphasis>ports-all</emphasis> ¤È¤¹¤ë¤«¤ï¤ê¤Ë
-          <emphasis>ports-astrology</emphasis>¡¢
-          <emphasis>ports-biology</emphasis> ¤Ê¤É¤È½ñ¤­¤Þ¤¹)¡£
-          °ìÊý¡¢<filename>doc</filename> ¤È <filename>www</filename>
-          ¤Î¥Ä¥ê¡¼¤Ï¸À¸ìÊ̤Υ³¥ì¥¯¥·¥ç¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£
-          ¤½¤³¤Ç¤¢¤Ê¤¿¤Ï <application>CVSup</application>
-          ¤Î¤¿¤¯¤µ¤ó¤¢¤ëÀöÎý¤µ¤ì¤¿µ¡Ç½¤Î°ì¤Ä¡¢
-          <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	  ÀßÄê¥Õ¥¡¥¤¥ë¤ÇÁª¤ó¤À¥³¥ì¥¯¥·¥ç¥ó¤È¥¿¥°¤ËŬ¹ç¤¹¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£
+	  ¥Ä¥ê¡¼¤Î°ìÉô¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¡¢
+	  <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
         <para><filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Ï
           <application>CVSup</application> ¤ËÂФ·¡¢
@@ -1288,37 +1261,13 @@ src-all</programlisting>
 
         <para><filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Î½ñ¼°¤Ï¡¢Ã±¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤¯¤Ê¤¤¥Õ¥¡¥¤¥ë¤ä
           ¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤¬½ñ¤¤¤Æ¤¢¤ë¤À¤±¤ÎÈó¾ï¤Ë¥·¥ó¥×¥ë¤Ê¤â¤Î¤Ç¤¹¡£
-          ¤¿¤È¤¨¤Ð¡¢±Ñ¸ì°Ê³°¤Ë¤Ï¥É¥¤¥Ä¸ì¤ò¾¯¤·Ï令ë¤À¤±¤Î¿Í¤Ç¡¢
-          ʸ½ñ¤Î¥É¥¤¥Ä¸ìÌõ¤òÆɤàɬÍפò´¶¤¸¤Ê¤±¤ì¤Ð
-          °Ê²¼¤Î¤è¤¦¤Ê <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para>
-
-       <programlisting>doc/bn_*
-doc/da_*
-doc/de_*
-doc/el_*
-doc/es_*
-doc/fr_*
-doc/hu_*
-doc/it_*
-doc/ja_*
-doc/mn_*
-doc/nl_*
-doc/no_*
-doc/pl_*
-doc/pt_*
-doc/ru_*
-doc/sr_*
-doc/tr_*
-doc/zh_*</programlisting>
-
-        <para>¾¤Î¸À¸ì¤Ë¤Ä¤¤¤Æ¤âƱÍͤǤ¹ (Á´¥ê¥¹¥È¤Ï <ulink
-          url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os;
-          CVS ¥ê¥Ý¥¸¥È¥ê</ulink> ¤ò¤´Í÷¤Ë¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤)¡£</para>
-
-        <para>¤³¤Î¼Â¤ËÊØÍø¤Êµ¡Ç½¤ò»È¤¦¤È
-          ¤Þ¤Ã¤¿¤¯É¬ÍפȤ·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¡¢
-          ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î²óÀþ¤¬ÃÙ¤«¤Ã¤¿¤ê½¾ÎÌÀ©¤Ç²Ý¶â¤µ¤ì¤Æ¤¤¤ë¿Í¤Ï
-          µ®½Å¤Ê»þ´Ö¤òÀáÌó¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ê <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para>
+
+	<programlisting>bin/
+usr.bin/</programlisting>
+
+	<para>¤Þ¤Ã¤¿¤¯É¬ÍפȤ·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¡¢
+	  ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î²óÀþ¤¬ÃÙ¤«¤Ã¤¿¤ê½¾ÎÌÀ©¤Ç²Ý¶â¤µ¤ì¤Æ¤¤¤ë¿Í¤Ï»þ´Ö¤òÀáÌó¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
           <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¤ä
           <application>CVSup</application> ¤¬»ý¤Ä¤½¤Î¾¤ÎÊØÍø¤Êµ¡Ç½¤Ë´Ø¤·¤Æ¤Ï
           ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1414,11 +1363,7 @@ doc/zh_*</programlisting>
         »ú²¼¤²¤·¤Æɽ¸½¤·¤Þ¤¹¡£</para>
 
       <para>ºÇ¤â°ìÈÌŪ¤Ë»ÈÍѤ¹¤ë¥³¥ì¥¯¥·¥ç¥ó¤Ï
-        <literal>src-all</literal>¡¢
-        <literal>ports-all</literal> ¤Ç¤¹¡£
-        ¾¤Î¥³¥ì¥¯¥·¥ç¥ó¤ÏÆÃÊ̤ÊÌÜŪ¤ò»ý¤Ä¿Íã¤À¤±¤¬»ÈÍѤ·¤Æ¤ª¤ê¡¢
-        ¥ß¥é¡¼¥µ¥¤¥È¤Ï¤½¤ì¤é¤Î¤¹¤Ù¤Æ¤ò
-        »ý¤Ã¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+        <literal>src-all</literal> ¤Ç¤¹¡£</para>
 
       <variablelist>
         <varlistentry>
@@ -1439,560 +1384,6 @@ doc/zh_*</programlisting>
               </varlistentry>
 
               <varlistentry>
-                <term><literal>ports-all release=cvs</literal></term>
-
-                <listitem>
-                  <para>&os; Ports Collection ¤Ç¤¹¡£</para>
-
-		  <important id="cvsup-collec-pbase-warn">
-		    <para><literal>ports-all</literal> (ports ¥Ä¥ê¡¼Á´ÂÎ) ¤ò¹¹¿·¤»¤º¤Ë¡¢
-                       °Ê²¼¤Î¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤Î°ì¤Ä¤ò»È¤¦¾ì¹ç¤Ï¡¢<emphasis>¾ï¤Ë</emphasis>
-                       <literal>ports-base</literal> ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤ò¹¹¿·¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!
-                       ports ¤Î¹½ÃÛ¥·¥¹¥Æ¥à¤ËÊѹ¹¤¬¤¢¤ë¤È¡¢
-                       <literal>ports-base</literal> ¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£
-                       ¤½¤·¤Æ¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢¤½¤ÎÊѹ¹¤Ï¿·¤·¤¤ ports
-                       ¤Ç<quote>¼ÂºÝ¤Ë</quote>»È¤ï¤ì¤ë¤«¤é¤Ç¤¹¡£
-                       ¤Ä¤Þ¤ê¡¢<quote>¸Ä¡¹¤Î ports</quote> ¤À¤±¤ò¹¹¿·¤·¤Æ¤¤¤ë¤È¡¢
-                       ´ñ̯¤Ê¥¨¥é¡¼¤Ç¹½Ãۤ˼ºÇÔ¤¹¤ë²ÄǽÀ­¤¬Èó¾ï¤Ë¹â¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-		       <literal>ports-base</literal> ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤¬
-                       ºÇ¿·¾õÂ֤Ǥ¢¤ë¤«¤É¤¦¤«¤Î³Îǧ¤Ï¡¢
-                       <emphasis>²¿¤è¤ê¤âºÇ½é¤Ë¤ä¤é¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤</emphasis>
-                       ¤³¤È¤Ê¤Î¤Ç¤¹¡£</para>
-		  </important>
-
-		  <important id="cvsup-collec-index-warn">
-		    <para>¥í¡¼¥«¥ë¤Ç <filename>ports/INDEX</filename>
-		      ¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢
-		      <literal>ports-all</literal> (ports ¥Ä¥ê¡¼Á´ÂÎ)
-		      ¤¬<emphasis>ɬÍ×</emphasis>¤Ç¤¹¡£
-		      ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤Î¤ß¤Ç <filename>ports/INDEX</filename>
-		      ¤òºîÀ®¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-		      <ulink url="&url.books.faq;/applications.html#MAKE-INDEX">
-		      FAQ</ulink> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-		  </important>
-
-                  <variablelist>
-                    <varlistentry>
-		      <term><literal>ports-accessibility
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¾ã³²¤ò»ý¤Ã¤¿¥æ¡¼¥¶¤ÎÌò¤ËΩ¤Ä¥½¥Õ¥È¥¦¥§¥¢</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-arabic
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥¢¥é¥Ó¥¢¸ì¥µ¥Ý¡¼¥È</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-                      <term><literal>ports-archivers release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥¢¡¼¥«¥¤¥Ó¥ó¥°¤Î¥Ä¡¼¥ë¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-astro release=cvs</literal></term>
-
-                      <listitem>
-                        <para>ŷʸ³Ø´ØÏ¢¤Î ports¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-audio release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥µ¥¦¥ó¥É¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-base release=cvs</literal></term>
-
-                      <listitem>
-			<para>Ports Collection ¤Î¹½ÃÛ¥·¥¹¥Æ¥àÉôʬ¡£
-			  <filename>/usr/ports</filename> ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê
-                          <filename>Mk/</filename>¡¢<filename>Tools/</filename>
-                          ¤Ë¤¢¤ë¡¢¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-			<note>
-			  <para><link linkend="cvsup-collec-pbase-warn">¾å¤ÎÃí°Õʸ</link>¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-			    &os; Ports Collection ¤Î°ìÉôʬ¤ò¹¹¿·¤¹¤ë»þ¤Ë¤Ï¡¢
-			    ¤³¤Î¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤â<emphasis>¾ï¤Ë</emphasis>¹¹¿·¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
-			</note>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-benchmarks release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥Ù¥ó¥Á¥Þ¡¼¥¯¥×¥í¥°¥é¥à¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-biology release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¿¢Êª³Ø´ØÏ¢¤Î¥×¥í¥°¥é¥à¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-cad release=cvs</literal></term>
-
-                      <listitem>
-                        <para>CAD ¥Ä¡¼¥ë¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-chinese release=cvs</literal></term>
-
-                      <listitem>
-                        <para>Ãæ¹ñ¸ì¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-comms release=cvs</literal></term>
-
-                      <listitem>
-                        <para>ÄÌ¿®¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-converters release=cvs</literal></term>
-
-                      <listitem>
-                        <para>ʸ»ú¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-databases release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥Ç¡¼¥¿¥Ù¡¼¥¹¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-deskutils release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥³¥ó¥Ô¥å¡¼¥¿¤¬È¯ÌÀ¤µ¤ì¤ëÁ°¤Ë
-                          Âî¾å¤Ç»È¤ï¤ì¤Æ¤¤¤¿¤â¤Î¤¿¤Á¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-devel release=cvs</literal></term>
-
-                      <listitem>
-                        <para>³«È¯¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-dns release=cvs</literal></term>
-
-                      <listitem>
-                        <para>DNS ´ØÏ¢¤Î¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-editors release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥¨¥Ç¥£¥¿¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-emulators release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¾¤Î OS ¤Î¥¨¥ß¥å¥ì¡¼¥¿¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-finance
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¶âÍ»¡¢ºâ̳´ØÏ¢¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-ftp release=cvs</literal></term>
-
-                      <listitem>
-                        <para>FTP ¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-games release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥²¡¼¥à¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-german release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥É¥¤¥Ä¸ì¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-graphics release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥°¥é¥Õ¥£¥Ã¥¯¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-hebrew
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Ø¥Ö¥é¥¤¸ì¥µ¥Ý¡¼¥È</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-hungarian
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥µ¥Ý¡¼¥È¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-irc release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥ê¥ì¡¼¥Á¥ã¥Ã¥È (IRC) ÍѤΥ桼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-japanese release=cvs</literal></term>
-
-                      <listitem>
-                        <para>ÆüËܸ쥵¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-java release=cvs</literal></term>
-
-                      <listitem>
-                        <para>&java; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-korean release=cvs</literal></term>
-
-                      <listitem>
-                        <para>´Ú¹ñ¸ì¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-lang release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-mail release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥á¡¼¥ë¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-math release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¿ôÃÍ·×»»¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-misc release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¿§¡¹¤Ê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-multimedia
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-net release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥Í¥Ã¥È¥ï¡¼¥­¥ó¥°¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-net-im
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥¤¥ó¥¹¥¿¥ó¥È¥á¥Ã¥»¡¼¥¸¥ó¥°¥½¥Õ¥È¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-net-mgmt
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-net-p2p
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Ô¥¢¥Ä¡¼¥Ô¥¢¥Í¥Ã¥È¥ï¡¼¥¯¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-                      <term><literal>ports-news release=cvs</literal></term>
-
-                      <listitem>
-                        <para>USENET ¥Ë¥å¡¼¥¹¤Î¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-palm release=cvs</literal></term>
-
-                      <listitem>
-                        <para><trademark class="trade">Palm</trademark> ¥·¥ê¡¼¥ºÍÑ¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-polish
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Ý¡¼¥é¥ó¥É¸ì¤Î¥µ¥Ý¡¼¥È¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-ports-mgmt
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>ports ¤ª¤è¤Ó packages ´ÉÍýÍѤΥ桼¥Æ¥£¥ê¥Æ¥£¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-portuguese
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥Ý¥ë¥È¥¬¥ë¸ì¤Î¥µ¥Ý¡¼¥È¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-print release=cvs</literal></term>
-
-                      <listitem>
-                        <para>°õºþ¥½¥Õ¥È¥¦¥§¥¢¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-russian release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥í¥·¥¢¸ì¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-science
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>²Ê³Ø</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-                      <term><literal>ports-security release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥»¥­¥å¥ê¥Æ¥£¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-shells release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥³¥Þ¥ó¥É¥é¥¤¥ó¥·¥§¥ë¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-sysutils release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥·¥¹¥Æ¥à¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-textproc release=cvs</literal></term>
-
-                      <listitem>
-                        <para>ʸ½ñ½èÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£
-                          (¥Ç¥¹¥¯¥È¥Ã¥×¥Ñ¥Ö¥ê¥Ã¥·¥ó¥°¤Ï´Þ¤Þ¤Ê¤¤)¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-ukrainian
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>¥¦¥¯¥é¥¤¥Ê¸ì¥µ¥Ý¡¼¥È</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-                      <term><literal>ports-vietnamese release=cvs</literal></term>
-
-                      <listitem>
-                        <para>¥Ù¥È¥Ê¥à¸ì¥µ¥Ý¡¼¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-x11 release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X window ¥·¥¹¥Æ¥à¤ò¥µ¥Ý¡¼¥È¤¹¤ë ports¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-x11-clocks release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X11 ¾å¤ÇÆ°ºî¤¹¤ë»þ·×¤Î¿ô¡¹¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-x11-drivers
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>X11 ¤Î¥É¥é¥¤¥Ð¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-                      <term><literal>ports-x11-fm release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X11 ¾å¤ÇÆ°ºî¤¹¤ë¥Õ¥¡¥¤¥é¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-x11-fonts release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X11 ¤Î¥Õ¥©¥ó¥È¤È¥Õ¥©¥ó¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-                      <term><literal>ports-x11-toolkits release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X11 ¤Î¥Ä¡¼¥ë¥­¥Ã¥È¡£</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-x11-servers
-			  release=cvs</literal></term>
-
-                      <listitem>
-                        <para>³Æ¼ï X11 ¥µ¡¼¥Ð¡£</para>
-		      </listitem>
-		    </varlistentry>
-
-		    <varlistentry>
-		      <term><literal>ports-x11-themes
-			  release=cvs</literal></term>
-
-		      <listitem>
-			<para>X11 ¤Î¥Æ¡¼¥Þ</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
-		      <term><literal>ports-x11-wm
-			  release=cvs</literal></term>
-
-                      <listitem>
-                        <para>X11 ¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡£</para>
-                      </listitem>
-                    </varlistentry>
-                  </variablelist>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
 		<term><literal>projects-all release=cvs</literal></term>
 		<listitem>
 		  <para>&os; ¥×¥í¥¸¥§¥¯¥È¤Î¥ê¥Ý¥¸¥È¥ê¤Î¥½¡¼¥¹¡£</para>
@@ -2275,14 +1666,6 @@ doc/zh_*</programlisting>
 	    <para>&os; ´ØÏ¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥¢¡¼¥«¥¤¥Ö¡£</para>
           </listitem>
         </varlistentry>
-
-        <varlistentry><term><literal>www release=current</literal></term>
-          <listitem>
-	    <para>Á°½èÍý¤µ¤ì¤¿ &os; WWW ¥µ¥¤¥È¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹
-	      (¥½¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£
-              WWW ¥ß¥é¡¼¥µ¥¤¥È¤¬»ÈÍѤ·¤Þ¤¹¡£</para>
-          </listitem>
-        </varlistentry>
       </variablelist>
     </sect2>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Mar  2 17:23:43 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1C24349B;
 Sat,  2 Mar 2013 17:23:43 +0000 (UTC)
 (envelope-from ryusuke@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 0DCF08E5;
 Sat,  2 Mar 2013 17:23:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22HNgh6073893;
 Sat, 2 Mar 2013 17:23:42 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22HNgxX073889;
 Sat, 2 Mar 2013 17:23:42 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201303021723.r22HNgxX073889@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 2 Mar 2013 17:23:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41072 - in head/ja_JP.eucJP/books/handbook: install
 multimedia printing
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, 02 Mar 2013 17:23:43 -0000

Author: ryusuke
Date: Sat Mar  2 17:23:42 2013
New Revision: 41072
URL: http://svnweb.freebsd.org/changeset/doc/41072

Log:
  - Merge the following from the English version:
  
  	r40601 -> r41064	head/ja_JP.eucJP/books/handbook/install/chapter.xml
  	r38167 -> r41064	head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
  	r40980 -> r41064	head/ja_JP.eucJP/books/handbook/printing/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/install/chapter.xml
  head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
  head/ja_JP.eucJP/books/handbook/printing/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/install/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/install/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/install/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: rr40601
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -4663,8 +4663,8 @@ Please press any key to reboot.</screen>
 	  <para>Ä̾¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£</para>
 
 	  <table frame="none">
-	    <title>FreeBSD 7.<replaceable>X</replaceable> ¤ª¤è¤Ó
-	      8.<replaceable>X</replaceable> ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title>
+	    <title>&os; 8.<replaceable>X</replaceable>
+	      ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title>
 
 	    <tgroup cols="2">
 	      <thead>

Modified: head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.144
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -1706,9 +1706,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 	<application>SANE</application> ¤Ë¤Ï
 	¥¹¥­¥ã¥Ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤È¤½¤Î¾õ¶·¤¬¤Þ¤È¤á¤é¤ì¤Æ¤¤¤ë <ulink
 	  url="http://www.sane-project.org/sane-supported-devices.html">Âбþ¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷</ulink>
-	¤¬¤¢¤ê¤Þ¤¹¡£&os;&nbsp;8.X ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	&os; ¤Î &man.uscanner.4;
-	¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤âÂбþ USB ¥¹¥­¥ã¥Ê¤Î°ìÍ÷¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	¤¬¤¢¤ê¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
@@ -1732,16 +1730,6 @@ device uhci
 device ohci
 device ehci</programlisting>
 
-	<para>&os;&nbsp;8.X
-	  ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï°Ê²¼¤Î¹Ô¤âɬÍפȤʤê¤Þ¤¹¡£</para>
-
-	<programlisting>device uscanner</programlisting>
-
-	<para>¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢&man.uscanner.4;
-	  ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤¬ USB ¥¹¥­¥ã¥Ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	  &os;&nbsp;8.0 °Ê¹ß¤Ç¤Ï¡¢&man.libusb.3;
-	  ¥é¥¤¥Ö¥é¥ê¤¬Ä¾ÀÜÄ󶡤·¤Þ¤¹¡£</para>
-
 	<para>ŬÀڤʥɥ饤¥Ð¤òÁȤ߹þ¤ó¤À¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¸å¡¢
 	  USB ¥¹¥­¥ã¥Ê¤ò¥·¥¹¥Æ¥à¤ËÀܳ¤·¤Þ¤¹¡£
 	  ¤¹¤ë¤È¡¢¥á¥Ã¥»¡¼¥¸¥Ð¥Ã¥Õ¥¡ (&man.dmesg.8;)
@@ -1749,14 +1737,7 @@ device ehci</programlisting>
 
 	<screen>ugen0.2: &lt;EPSON&gt; at usbus0</screen>
 
-	<para>&os;&nbsp;7.X ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	  °Ê²¼¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</para>
-
-	<screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen>
-
-	<para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë±þ¤¸¤Æ¡¢
-	  ¥¹¥­¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename>
-	  ¤Þ¤¿¤Ï¡¢<filename>/dev/uscanner0</filename>
+	<para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢¥¹¥­¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename>
 	  ¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤ò»ÈÍѤ·¤Æ¤¤¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£
 	  ¤³¤ÎÎã¤Ç¤Ï¡¢&epson.perfection;&nbsp;1650 USB ¥¹¥­¥ã¥Ê¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </sect3>
@@ -2010,22 +1991,6 @@ device `epson:/dev/uscanner0' is a Epson
 add path ugen0.2 mode 0660 group usb
 add path usb/0.2.0 mode 0666 group usb</programlisting>
 
-      <para>&os;&nbsp;7.X ¤Î¥æ¡¼¥¶¤Ï¡¢¥Ç¥Ð¥¤¥¹¥Î¡¼¥É
-	<filename>/dev/uscanner0</filename> ¤ËÂФ·¡¢
-	°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤ÎÄɲä¬É¬ÍפȤʤë¤Ç¤·¤ç¤¦¡£</para>
-
-      <programlisting>[system=5]
-add path uscanner0 mode 660 group usb</programlisting>
-
-      <para>¼¡¤Ë¡¢<filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÄɲä·¤Æ
-	¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Þ¤¹¡£</para>
-
-      <programlisting>devfs_system_ruleset="system"</programlisting>
-
-      <para><filename>/etc/devfs.rules</filename>
-	¤ÇÀßÄꤷ¤¿ÆâÍƤˤĤ¤¤Æ¤Î¾ÜºÙ¤Ï¡¢&man.devfs.8;
-	¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
       <para>ºÇ¸å¤Ë¡¢¥¹¥­¥ã¥Ê¤òÍøÍѤ¹¤ë¥æ¡¼¥¶¤ò
 	<groupname><replaceable>usb</replaceable></groupname>
 	¥°¥ë¡¼¥×¤ËÄɲä·¤Þ¤¹¡£</para>

Modified: head/ja_JP.eucJP/books/handbook/printing/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40980
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -205,15 +205,6 @@
   <sect1 id="printing-intro-setup">
     <title>´ðËÜŪ¤ÊÀßÄê</title>
 
-    <warning>
-      <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename>
-	¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-	&os;&nbsp;7.X ¥æ¡¼¥¶¤Ï¡¢
-	¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
-    </warning>
-
     <para><application>LPD</application>
       ¥¹¥×¡¼¥ê¥ó¥°¥·¥¹¥Æ¥à¤òÍѤ¤¤Æ¥×¥ê¥ó¥¿¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢
       ¥×¥ê¥ó¥¿µ¡´ï¤È <application>LPD</application>
@@ -1516,15 +1507,6 @@ $%&amp;'()*+,-./01234567
   <sect1 id="printing-advanced">
     <title>¥×¥ê¥ó¥¿ÀßÄê¾åµéÊÔ</title>
 
-    <warning>
-      <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename>
-	¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-	&os;&nbsp;7.X ¥æ¡¼¥¶¤Ï¡¢
-	¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
-    </warning>
-
     <para>¤³¤ÎÀá¤Ç¤Ï¡¢Æüì¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤ò°õ»ú¤¹¤ë¤¿¤á¤Î¥Õ¥£¥ë¥¿¡¢
       ¥Ø¥Ã¥À¥Ú¡¼¥¸¡¢¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Î¥×¥ê¥ó¥¿¤Ø¤Î°õ»ú¡¢¤½¤·¤Æ¡¢
       ¥×¥ê¥ó¥¿»ÈÍѤÎÀ©¸Â¤ä²Ý¶â¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>

From owner-svn-doc-head@FreeBSD.ORG  Sat Mar  2 18:32:00 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5A8D7BD3;
 Sat,  2 Mar 2013 18:32:00 +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 34E64C0F;
 Sat,  2 Mar 2013 18:32:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22IW0B0095523;
 Sat, 2 Mar 2013 18:32:00 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22IVxjn095515;
 Sat, 2 Mar 2013 18:31:59 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201303021831.r22IVxjn095515@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Sat, 2 Mar 2013 18:31:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41073 - in head/en_US.ISO8859-1/htdocs: releng security
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, 02 Mar 2013 18:32:00 -0000

Author: remko
Date: Sat Mar  2 18:31:59 2013
New Revision: 41073
URL: http://svnweb.freebsd.org/changeset/doc/41073

Log:
  Remove 7.4 from the list of supported versions.
  Move 7-STABLE and 7.4 to the list of unsupported releases/version.
  
  Releng:
  Mention that RELENG_7 is now a maintenance branch, mention that 7.4
  is no longer officially supported.
  
  Reviewed by:	des,simon
  Hat:		secteam

Modified:
  head/en_US.ISO8859-1/htdocs/releng/index.xml
  head/en_US.ISO8859-1/htdocs/security/security.xml

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Sat Mar  2 17:23:42 2013	(r41072)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Sat Mar  2 18:31:59 2013	(r41073)
@@ -146,14 +146,14 @@
       <td><tt>RELENG_7</tt></td>
       <td>Open</td>
       <td>committers</td>
-      <td>Development branch for 7-STABLE.</td>
+      <td>Maintenance branch for 7-STABLE (not officially supported).</td>
     </tr>
 
     <tr>
       <td><tt>RELENG_7_4</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
-      <td>FreeBSD 7.4 supported errata fix branch.</td>
+      <td>FreeBSD 7.4 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>

Modified: head/en_US.ISO8859-1/htdocs/security/security.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.xml	Sat Mar  2 17:23:42 2013	(r41072)
+++ head/en_US.ISO8859-1/htdocs/security/security.xml	Sat Mar  2 18:31:59 2013	(r41073)
@@ -250,20 +250,6 @@
       <th>Estimated EoL</th>
     </tr>
     <tr>
-      <td>RELENG_7</td>
-      <td>n/a</td>
-      <td>n/a</td>
-      <td>n/a</td>
-      <td>February 28, 2013</td>
-    </tr>
-    <tr>
-      <td>RELENG_7_4</td>
-      <td>7.4-RELEASE</td>
-      <td>Extended</td>
-      <td>February 24, 2011</td>
-      <td>February 28, 2013</td>
-    </tr>
-    <tr>
       <td>RELENG_8</td>
       <td>n/a</td>
       <td>n/a</td>
@@ -421,6 +407,13 @@
       <td>November 30, 2010</td>
     </tr>
     <tr>
+      <td>RELENG_7</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td>February 28, 2013</td>
+    </tr>
+    <tr>
       <td>RELENG_7_0</td>
       <td>7.0-RELEASE</td>
       <td>Normal</td>
@@ -449,6 +442,13 @@
       <td>March 31, 2012</td>
     </tr>
     <tr>
+      <td>RELENG_7_4</td>
+      <td>7.4-RELEASE</td>
+      <td>Extended</td>
+      <td>February 24, 2011</td>
+      <td>February 28, 2013</td>
+    </tr>
+    <tr>
       <td>RELENG_8_0</td>
       <td>8.0-RELEASE</td>
       <td>Normal</td>

From owner-svn-doc-head@FreeBSD.ORG  Sat Mar  2 21:24:09 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EF14DE78;
 Sat,  2 Mar 2013 21:24:09 +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 D76892EA;
 Sat,  2 Mar 2013 21:24:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22LO9Xk049115;
 Sat, 2 Mar 2013 21:24:09 GMT (envelope-from remko@svn.freebsd.org)
Received: (from remko@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22LO9iG049114;
 Sat, 2 Mar 2013 21:24:09 GMT (envelope-from remko@svn.freebsd.org)
Message-Id: <201303022124.r22LO9iG049114@svn.freebsd.org>
From: Remko Lodder <remko@FreeBSD.org>
Date: Sat, 2 Mar 2013 21:24:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41074 - head/en_US.ISO8859-1/htdocs/security
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, 02 Mar 2013 21:24:10 -0000

Author: remko
Date: Sat Mar  2 21:24:09 2013
New Revision: 41074
URL: http://svnweb.freebsd.org/changeset/doc/41074

Log:
  The RELENG_7 branch should have n/a markers. Make it happen.

Modified:
  head/en_US.ISO8859-1/htdocs/security/security.xml

Modified: head/en_US.ISO8859-1/htdocs/security/security.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.xml	Sat Mar  2 18:31:59 2013	(r41073)
+++ head/en_US.ISO8859-1/htdocs/security/security.xml	Sat Mar  2 21:24:09 2013	(r41074)
@@ -408,9 +408,9 @@
     </tr>
     <tr>
       <td>RELENG_7</td>
-      <td></td>
-      <td></td>
-      <td></td>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
       <td>February 28, 2013</td>
     </tr>
     <tr>