From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 23 13:36:01 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 59726311;
 Mon, 23 Feb 2015 13:36:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A62638B;
 Mon, 23 Feb 2015 13:36:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NDa18C025738;
 Mon, 23 Feb 2015 13:36:01 GMT (envelope-from remko@FreeBSD.org)
Received: (from remko@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NDa1EP025737;
 Mon, 23 Feb 2015 13:36:01 GMT (envelope-from remko@FreeBSD.org)
Message-Id: <201502231336.t1NDa1EP025737@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: remko set sender to
 remko@FreeBSD.org using -f
From: Remko Lodder <remko@FreeBSD.org>
Date: Mon, 23 Feb 2015 13:36:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46283 - head/en_US.ISO8859-1/htdocs/releases
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.18-1
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, 23 Feb 2015 13:36:01 -0000

Author: remko
Date: Mon Feb 23 13:36:00 2015
New Revision: 46283
URL: https://svnweb.freebsd.org/changeset/doc/46283

Log:
  Move the 9.1 and 9.2 releases to the no longer supported list
  to follow security releases. Note that 10.0 will have it's
  supported ended in a few days.

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

Modified: head/en_US.ISO8859-1/htdocs/releases/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/index.xml	Fri Feb 20 16:44:12 2015	(r46282)
+++ head/en_US.ISO8859-1/htdocs/releases/index.xml	Mon Feb 23 13:36:00 2015	(r46283)
@@ -102,7 +102,20 @@
 	  <a href="10.0R/errata.html">Errata</a>
 	</em>
       </li>
+  </ul>
+
+  <a name="prior-unsupported"></a>
+  <h2>Prior Releases Which Have Reached End-Of-Life</h2>
+
+    <p>Complete historical information about the release date, the
+      classification type, and the effective End-Of-Life (EOL) for
+      these releases may be found on the <a
+	href="&base;/security/unsupported.html">Unsupported
+	Releases</a> section of the <a
+	href="&base;/security/security.html">FreeBSD Security
+	Information</a> page.</p>
 
+    <ul>
       <li><b>9.2</b> (September 2013)
 	<em>
 	  <a href="9.2R/announce.html">Announcement</a>:
@@ -124,20 +137,18 @@
 	  <a href="9.1R/errata.html">Errata</a>
 	</em>
       </li>
-  </ul>
-
-  <a name="prior-unsupported"></a>
-  <h2>Prior Releases Which Have Reached End-Of-Life</h2>
 
-    <p>Complete historical information about the release date, the
-      classification type, and the effective End-Of-Life (EOL) for
-      these releases may be found on the <a
-	href="&base;/security/unsupported.html">Unsupported
-	Releases</a> section of the <a
-	href="&base;/security/security.html">FreeBSD Security
-	Information</a> page.</p>
+      <li><b>9.0</b> (January 2012)
+	<em>
+	  <a href="9.0R/announce.html">Announcement</a>:
+	  <a href="9.0R/relnotes.html">Release Notes</a>:
+	  <a href="9.0R/installation.html">Installation Instructions</a>:
+	  <a href="9.0R/hardware.html">Hardware Notes</a>:
+	  <a href="9.0R/readme.html">Readme</a>:
+	  <a href="9.0R/errata.html">Errata</a>
+	</em>
+      </li>
 
-    <ul>
       <li><b>8.3</b> (April 2012)
 	<em>
 	  <a href="8.3R/announce.html">Announcement</a>:
@@ -149,17 +160,6 @@
 	</em>
       </li>
 
-      <li><b>9.0</b> (January 2012)
-	<em>
-	  <a href="9.0R/announce.html">Announcement</a>:
-	  <a href="9.0R/relnotes.html">Release Notes</a>:
-	  <a href="9.0R/installation.html">Installation Instructions</a>:
-	  <a href="9.0R/hardware.html">Hardware Notes</a>:
-	  <a href="9.0R/readme.html">Readme</a>:
-	  <a href="9.0R/errata.html">Errata</a>
-	</em>
-      </li>
-
       <li><b>8.2</b> (February 2011)
 	<em>
 	  <a href="8.2R/announce.html">Announcement</a>:

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 23 19:27:48 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 440B080B;
 Mon, 23 Feb 2015 19:27:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2F856144;
 Mon, 23 Feb 2015 19:27:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NJRlaA093038;
 Mon, 23 Feb 2015 19:27:47 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NJRli1093037;
 Mon, 23 Feb 2015 19:27:47 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201502231927.t1NJRli1093037@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Mon, 23 Feb 2015 19:27:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46284 - head/en_US.ISO8859-1/articles/hubs
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.18-1
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, 23 Feb 2015 19:27:48 -0000

Author: jgh
Date: Mon Feb 23 19:27:47 2015
New Revision: 46284
URL: https://svnweb.freebsd.org/changeset/doc/46284

Log:
  - add suggestion of nginx
  
  http://lists.freebsd.org/pipermail/freebsd-doc/2015-February/024979.html
  
  Differential Revision:	https://reviews.freebsd.org/D1898
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/articles/hubs/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/hubs/article.xml	Mon Feb 23 13:36:00 2015	(r46283)
+++ head/en_US.ISO8859-1/articles/hubs/article.xml	Mon Feb 23 19:27:47 2015	(r46284)
@@ -248,6 +248,17 @@
                 contain the same set of optimizations for FreeBSD that
                 are found in <application>thttpd</application>.</para>
             </listitem>
+
+            <listitem>
+              <para><package>www/nginx</package>:
+              <application>Nginx</application> is a high performance edge web
+              server with a low memory footprint and key features to build
+              a modern and efficient web infrastructure.  Features include
+              a HTTP server, HTTP and mail reverse proxy, caching, load
+              balancing, compression, request throttling, connection
+              multiplexing and reuse, SSL offload and HTTP media
+              streaming.</para>
+            </listitem>
           </itemizedlist>
       </sect3>
    </sect2>

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 23 19:59:44 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B34EAE53;
 Mon, 23 Feb 2015 19:59:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E8826CF;
 Mon, 23 Feb 2015 19:59:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NJxiAY007655;
 Mon, 23 Feb 2015 19:59:44 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NJxigJ007654;
 Mon, 23 Feb 2015 19:59:44 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201502231959.t1NJxigJ007654@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Mon, 23 Feb 2015 19:59:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46285 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 23 Feb 2015 19:59:44 -0000

Author: jgh
Date: Mon Feb 23 19:59:43 2015
New Revision: 46285
URL: https://svnweb.freebsd.org/changeset/doc/46285

Log:
  - adjust entity for current release to reflect 10.1
  
  Differential Revision:	https://reviews.freebsd.org/D1899
  Reviewed by:	bcr, gjb
  Approved by:	bcr (mentor)

Modified:
  head/share/xml/freebsd.ent

Modified: head/share/xml/freebsd.ent
==============================================================================
--- head/share/xml/freebsd.ent	Mon Feb 23 19:27:47 2015	(r46284)
+++ head/share/xml/freebsd.ent	Mon Feb 23 19:59:43 2015	(r46285)
@@ -67,8 +67,8 @@ used in both environments.
      it's really release time -->
 
 <!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel.current "10.0">
-<!ENTITY rel.current.date "January 2014">
+<!ENTITY rel.current "10.1">
+<!ENTITY rel.current.date "November 2014">
 <!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
 <!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
 <!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>

From owner-svn-doc-head@FreeBSD.ORG  Mon Feb 23 22:17:55 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE968F7B;
 Mon, 23 Feb 2015 22:17:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A94A68FE;
 Mon, 23 Feb 2015 22:17:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NMHtlF077895;
 Mon, 23 Feb 2015 22:17:55 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NMHtYE077894;
 Mon, 23 Feb 2015 22:17:55 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201502232217.t1NMHtYE077894@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 23 Feb 2015 22:17:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46286 - 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.18-1
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, 23 Feb 2015 22:17:55 -0000

Author: pawel (ports committer)
Date: Mon Feb 23 22:17:54 2015
New Revision: 46286
URL: https://svnweb.freebsd.org/changeset/doc/46286

Log:
  For sysutils/s6
  
  PR:		197235

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	Mon Feb 23 19:59:43 2015	(r46285)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Mon Feb 23 22:17:54 2015	(r46286)
@@ -1884,6 +1884,11 @@
     </listitem>
 
     <listitem>
+      <para>Colin Booth
+	<email>colin@heliocat.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Colman Reilly
 	<email>careilly@tcd.ie</email></para>
     </listitem>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 06:26:02 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A2E2D991;
 Wed, 25 Feb 2015 06:26:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 899A9C3A;
 Wed, 25 Feb 2015 06:26:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1P6Q2K1003953;
 Wed, 25 Feb 2015 06:26:02 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1P6Q0GM003932;
 Wed, 25 Feb 2015 06:26:00 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201502250626.t1P6Q0GM003932@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 25 Feb 2015 06:26:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46288 - in head/share: security/advisories
 security/patches/EN-15:01 security/patches/EN-15:02 security/patches/EN-15:03
 security/patches/SA-15:04 security/patches/SA-15:05 xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 25 Feb 2015 06:26:02 -0000

Author: delphij
Date: Wed Feb 25 06:25:59 2015
New Revision: 46288
URL: https://svnweb.freebsd.org/changeset/doc/46288

Log:
  Add latest batch of security advisories and errata notices.

Added:
  head/share/security/advisories/FreeBSD-EN-15:01.vt.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-EN-15:02.openssl.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-SA-15:04.igmp.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-SA-15:05.bind.asc   (contents, props changed)
  head/share/security/patches/EN-15:01/
  head/share/security/patches/EN-15:01/vt.patch   (contents, props changed)
  head/share/security/patches/EN-15:01/vt.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:02/
  head/share/security/patches/EN-15:02/openssl-10.0.patch   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-10.0.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-10.1.patch   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-10.1.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-8.4.patch   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-8.4.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-9.3.patch   (contents, props changed)
  head/share/security/patches/EN-15:02/openssl-9.3.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:03/
  head/share/security/patches/EN-15:03/freebsd-update.patch   (contents, props changed)
  head/share/security/patches/EN-15:03/freebsd-update.patch.asc   (contents, props changed)
  head/share/security/patches/SA-15:04/
  head/share/security/patches/SA-15:04/igmp.patch   (contents, props changed)
  head/share/security/patches/SA-15:04/igmp.patch.asc   (contents, props changed)
  head/share/security/patches/SA-15:05/
  head/share/security/patches/SA-15:05/bind.patch   (contents, props changed)
  head/share/security/patches/SA-15:05/bind.patch.asc   (contents, props changed)
Modified:
  head/share/xml/advisories.xml
  head/share/xml/notices.xml

Added: head/share/security/advisories/FreeBSD-EN-15:01.vt.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-15:01.vt.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,132 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-15:01.vt                                             Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          vt(4) crash with improper ioctl parameters
+
+Category:       core
+Module:         vt
+Announced:      2015-02-25
+Credits:        Francisco Falcon from Core Security Technologies
+Affects:        FreeBSD 9.3 and FreeBSD 10.1
+Corrected:      2015-02-02 18:48:49 UTC (stable/10, 10.1-STABLE)
+                2015-02-25 05:56:16 UTC (releng/10.1, 10.1-RELEASE-p6)
+                2015-02-02 18:48:49 UTC (stable/9, 9.3-STABLE)
+                2015-02-25 05:56:54 UTC (releng/9.3, 9.3-RELEASE-p10)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.freebsd.org/>.
+
+I.   Background
+
+The vt(4) device provides multiple virtual terminals with an extensive
+feature set.
+
+II.  Problem Description
+
+The vt(4) code uses a signed integer as index value and does not test for
+negative values.
+
+III. Impact
+
+A local attacker could trigger a panic by tricking the kernel into
+accessing undefined kernel memory.
+
+IV.  Workaround
+
+No workaround is available, but systems that do not use vt(4) are not
+affected.
+
+All affected FreeBSD releases does not ship with vt(4) enabled by
+default, and user have to enable them explicitly.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-15:01/vt.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:01/vt.patch.asc
+# gpg --verify vt.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+<URL:https://www.FreeBSD.org/handbook/kernelconfig.html> and reboot the
+system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/9/                                                         r278106
+releng/9.3/                                                       r279265
+stable/10/                                                        r278106
+releng/10.1/                                                      r279264
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0998>
+
+<URL:http://www.coresecurity.com/advisories/freebsd-kernel-multiple-vulnerabilities>
+
+The latest revision of this Errata Notice is available at
+https://security.FreeBSD.org/advisories/FreeBSD-EN-15:01.vt.asc
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAEBCgAGBQJU7Wi8AAoJEO1n7NZdz2rnjXUQAIXWVC52AmDrQHvirZ23Jc84
+OnhLpYU3McHxtEpuIRZOcklDwuBQlP/0u1zsHoPvlHP/t6k74SA07MsuYjnUYrom
+lF+P9wlmADXXFijGceE3UvdxD574ByyOVuqwvjDMbnxJOCyUNM4NaflZCacpqt4J
+P7cpZVBLIh/lmFZYuuyYZ+AKC+02hNGQkLfY010EmPjsZMPYgr6UfRP5UG3+JLvy
+LXYXOMkklQst9tSyJoC1QhQ8N6MbvGAjs0f9tO2G3nLkxdSZfAWnIExkACUnhW5G
+2JzBJXTrXbyRelX3RmCV93j/9PHkS5Oj85p3fmc8swsdEgyq3e2rVMUdWEtJEZuE
+c5lR/cGikMpFlsFnJqNi8LyIoXiGuVfLlhsNZsfjOn4WzenYd5gbmzZFLiu5agfq
+TZZOAtpoYv7yvW+t98yZR+wUDQNk0Jsq738FR8qnPG4uN0yFVMjg+EEWMIEA+fnj
+rLPxCO798PkpsVgUY+KC02Q/OLDcavWmf4+dGLGXVOHGrdmW4/9mSywiQQEZXl/9
+5GsY/5Qy6XmL8bf+I7pa1ozUGvJNZo+GZaak5hnaaaWiAt/aTlf9uoeNCizGo7ad
++srCLTEI0lEo883PrgNE8K1WWbg/by9Nv9YkE9AkPaAt8gIj/sOMuRv5/oGUj94D
+v5gabABppiNMM9tNykM9
+=7HYa
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-EN-15:02.openssl.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-15:02.openssl.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,150 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-15:02.openssl                                        Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          OpenSSL update
+
+Category:       contrib
+Module:         openssl
+Announced:      2015-02-25
+Affects:        All supported versions of FreeBSD.
+Corrected:      2015-01-23 19:14:36 UTC (stable/10, 10.1-STABLE)
+                2015-02-25 05:56:16 UTC (releng/10.1, 10.1-RELEASE-p6)
+                2015-02-25 05:56:16 UTC (releng/10.0, 10.0-RELEASE-p18)
+                2015-01-09 01:11:43 UTC (stable/9, 9.3-STABLE)
+                2015-02-25 05:56:54 UTC (releng/9.3, 9.3-RELEASE-p10)
+                2015-01-09 01:11:43 UTC (stable/8, 8.4-STABLE)
+                2015-02-25 05:56:54 UTC (releng/8.4, 8.4-RELEASE-p24)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.freebsd.org/>.
+
+I.   Background
+
+FreeBSD includes software from the OpenSSL Project.  The OpenSSL Project is
+a collaborative effort to develop a robust, commercial-grade, full-featured
+Open Source toolkit implementing the Secure Sockets Layer (SSL v2/v3)
+and Transport Layer Security (TLS v1) protocols as well as a full-strength
+general purpose cryptography library.
+
+II.  Problem Description
+
+The OpenSSL software bundled with the FreeBSD base system has been diverged
+due to various security advisories in the past and some reliability fixes
+were not merged.
+
+III. Impact
+
+Divergence in the cryptographic code makes it harder to review changes, and
+running unique code exposes users who run FreeBSD to possible unique bugs,
+if there is any.
+
+IV.  Workaround
+
+No workaround is available, but systems that do not use base system OpenSSL
+for public facing services are not affected.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[FreeBSD 8.4]
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-8.4.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-8.4.patch.asc
+
+[FreeBSD 9.3]
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-9.3.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-9.3.patch.asc
+
+[FreeBSD 10.0]
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-10.0.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-10.0.patch.asc
+
+[FreeBSD 10.1]
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-10.1.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:02/openssl-10.1.patch.asc
+
+# gpg --verify XXXX.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Restart all deamons using the library, or reboot the system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r276865
+releng/8.4/                                                       r279265
+stable/9/                                                         r276865
+releng/9.3/                                                       r279265
+stable/10/                                                        r277597
+releng/10.0/                                                      r279264
+releng/10.1/                                                      r279264
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+The latest revision of this Errata Notice is available at
+https://security.FreeBSD.org/advisories/FreeBSD-EN-15:02.openssl.asc
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAEBCgAGBQJU7WjCAAoJEO1n7NZdz2rnqScP/0nfy96IWKzt6GdHXIF7rgSl
+yNF9xCfsG0jYgL2B7eLOmLyqT4+P5kEgarTCncjtDh/YEtfx/xXTseCPCAbVGmre
+qhYQ/8J05bmw4vkFUxUtQAt0Kn2e911IfU1BM1J9/7sO39iBZkrbTf+mQ3zbuHP/
+0Iluz0vQY4N5qrStywr34Qy3UVzh06YmrNYGryxn+vw4FmGMp0eMeX7SGHO1saAI
+Rwe8Q2nArl1pIffMtbB84MU8GphIS9td5U3w7+wJ94r7s9bXULIvKwd91H8+A8sW
+njmldZLs4L192Ez7NoL25+uz0AdB0R2Flb9iDwTxDyvuudQeZR0qJAfXU/sbsa6r
+PFt41UCV1ZJA0d+N8GG1X2lHBkaw5LWcV5GNKAFwGj659ycYqRndpPhjviM1WLJs
+s/zlhM/0z3iFC5EZn0z1oNf8W0AhxGMrGG9EdFLGFE1w0U6BqPujqdZMBoey0y+Q
+00O0APcQENNo4jr8xBg/ykzA7cbCao48nbPDOWiY2SLiB+HLdbafapPimndyF0nf
+JxOe973UzZVRg+mdni3I6MriK1uaTAjMzNYD5x0avoResocrJKwZVUswNOJV1ONs
+gvTvmAAYHGvDXeiV8YP1nb2+G8dusljawRkkY2Hg0yBH6PS+qKfMfCq+UEQ5ewdc
+L7YxxXDEwrBgtAkv5A5z
+=xouA
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,160 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-15:03.freebsd-update                                 Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          freebsd-update updates libraries in suboptimal order
+
+Category:       base
+Module:         freebsd-update
+Announced:      2015-02-25
+Credits:        Brooks Davis
+Affects:        All supported versions of FreeBSD.
+Corrected:      2015-02-09 09:22:47 UTC (stable/10, 10.1-STABLE)
+                2015-02-25 05:56:16 UTC (releng/10.1, 10.1-RELEASE-p6)
+                2015-02-25 05:56:16 UTC (releng/10.0, 10.0-RELEASE-p18)
+                2015-02-09 09:45:58 UTC (stable/9, 9.3-STABLE)
+                2015-02-25 05:56:54 UTC (releng/9.3, 9.3-RELEASE-p10)
+                2015-02-09 10:09:46 UTC (stable/8, 8.4-STABLE)
+                2015-02-25 05:56:54 UTC (releng/8.4, 8.4-RELEASE-p24)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.freebsd.org/>.
+
+I.   Background
+
+The freebsd-update(8) utility is used to apply binary patches to FreeBSD
+systems installed from official release images, as an alternative to
+rebuilding from source.  A freebsd-update(8) build server generates the
+signed update packages, consisting of an index of files and directories
+with checksums before the update, a set of binary patches, and an
+index of files and directories with checksums after the update.  The
+client downloads the indexes, verifies the signatures and checksums,
+then downloads and applies the required patches.
+
+II.  Problem Description
+
+In general, the runtime linker needs to be updated before all other
+libraries, including the standard C library (libc) and the threading
+library (libthr), because these libraries depend on functionality of
+the runtime linker.
+
+Before this update, the freebsd-update(8) utility did not enforce
+this ordering requirement and would replace libthr (and all other
+libraries) before updating the runtime linker.
+
+A recent change to the FreeBSD threading library that would prevent
+a deadlock in a child process requires a NULL pointer test in the
+runtime linker (/libexec/ld-elf.so.1) be in place.  Since previous
+versions of the runtime linker do not have this test, processes will
+crash due to a NULL pointer deference.
+
+III. Impact
+
+If a name-service switch module linked to the threading library -- such
+as ldap or winbind -- was configured to provide passwd or group services
+in /etc/nsswitch.conf, then all attempts to look up a user or group by
+name after the threading library was updated would result in a crash.
+Most obviously, all further install(1) invocations by freebsd-update(8)
+will crash, leaving the system partially updated and largely unusable.
+
+IV.  Workaround
+
+Disabling any name-service switch modules linked to libthr prior to
+running the freebsd-update(8) 'upgrade' command works around the issue.
+These modules include, but are not limited to, ldap and winbind.
+
+V.   Solution
+
+The freebsd-update(8) utility has been updated to install the runtime
+linker before any libraries.
+
+You MUST upgrade systems prior to 10.1 to address this errata notice before
+updating to 10.1 or later using freebsd-update(8).
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[FreeBSD 9.3]
+# fetch https://security.FreeBSD.org/patches/EN-15:03/freebsd-update.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:03/freebsd-update.patch.asc
+# gpg --verify freebsd-update.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r278446
+releng/8.4/                                                       r279265
+stable/9/                                                         r278444
+releng/9.3/                                                       r279265
+stable/10/                                                        r278443
+releng/10.0/                                                      r279264
+releng/10.1/                                                      r279264
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+The latest revision of this Errata Notice is available at
+https://security.FreeBSD.org/advisories/FreeBSD-EN-15:03.freebsd-update.asc
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAEBCgAGBQJU7WjDAAoJEO1n7NZdz2rnkNkQAOJU6l5aKWWwvxU+Bxwc/zV5
+DcmGnL+7b/dN2zKdRVz6N54vuFnoUsXMd5EobxdC5MX31Yn/GnL5dQMbJDNAEL8D
+I6jYdqf7PQL3v+EBiOFNazjeRbx5EM2gNLfwozv5LHKxER5ggmalmmf168Se4cRX
+V+v2i28lCvAgOu3hXLd5gKQ3s8dNh2t/uxWI+fS3Sl6bitC0xVsXFEpTc8qIaJEu
+cbVmedRQEoSnQPLdpoSgbmQpjp6/45l/UtLZpK7Cr7h8BHS9wtKdWjjkNL/wyF5j
+3p2yanr6koT3P1iAhBJFE/3Dw4h5PlvWH56LP4PJmACuxU02AYrjc/ZVX1IL6bLt
+9AuO8W28DTi6q9q8xy+XHcYXuDS4PF3oCDZ92m2iZMHcO747q8UQdKkgCEUfIZ2n
+L79Dfkkx0uSmp4FIc1f/T6gDiBkZFRfs4stHRrm9K6nbyvFCAczj8wTUQPDjDUGw
+zGH1jN9r/I3mHi3FREd0+w++BYZproepf4yfv5c/UJN9P88vCBAZZqlS1kkxYGUz
+jOwzsF/MkpMWW16Xp58f7uwGTVZNTLzoq0r2GTln2R9fQAoQNrJYcBiW48MPSlQe
+wef9nRhC8BPOSI70dl5r16/lOu4IuBqwBFiY8QzzDc/DABmaDUQrhLRp+VDHqFeL
+taJCUogXb0n1CFub4f9P
+=J5C+
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-SA-15:04.igmp.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-15:04.igmp.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,133 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-15:04.igmp                                       Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          Integer overflow in IGMP protocol
+
+Category:       core
+Module:         igmp
+Announced:      2015-02-25
+Credits:        Mateusz Kocielski, Logicaltrust,
+                Marek Kroemeke, and 22733db72ab3ed94b5f8a1ffcde850251fe6f466
+Affects:        All supported versions of FreeBSD.
+Corrected:      2015-02-25 05:43:02 UTC (stable/10, 10.1-STABLE)
+                2015-02-25 05:56:16 UTC (releng/10.1, 10.1-RELEASE-p6)
+                2015-02-25 05:56:16 UTC (releng/10.0, 10.0-RELEASE-p18)
+                2015-02-25 05:43:02 UTC (stable/9, 9.3-STABLE)
+                2015-02-25 05:56:54 UTC (releng/9.3, 9.3-RELEASE-p10)
+                2015-02-25 05:43:02 UTC (stable/8, 8.4-STABLE)
+                2015-02-25 05:56:54 UTC (releng/8.4, 8.4-RELEASE-p24)
+CVE Name:       CVE-2015-1414
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+IGMP is a control plane protocol used by IPv4 hosts and routers to propagate
+multicast group membership information.  IGMP version 3 is implemented on
+FreeBSD.
+
+II.  Problem Description
+
+An integer overflow in computing the size of IGMPv3 data buffer can result
+in a buffer which is too small for the requested operation.
+
+III. Impact
+
+An attacker who can send specifically crafted IGMP packets could cause a
+denial of service situation by causing the kernel to crash.
+
+IV.  Workaround
+
+Block incoming IGMP packets by protecting your host/networks with a firewall.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/SA-15:04/igmp.patch
+# fetch https://security.FreeBSD.org/patches/SA-15:04/igmp.patch.asc
+# gpg --verify igmp.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+<URL:https://www.FreeBSD.org/handbook/kernelconfig.html> and reboot the
+system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r279263
+releng/8.4/                                                       r279265
+stable/9/                                                         r279263
+releng/9.3/                                                       r279265
+stable/10/                                                        r279263
+releng/10.0/                                                      r279264
+releng/10.1/                                                      r279264
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-1414>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-15:04.igmp.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAEBCgAGBQJU7WjDAAoJEO1n7NZdz2rnjr8QAL0J0+4lRtPXRyDRX2xFSnzw
+sc3OpfmlTiD3pCFkebTYy3/+EK86iAL1ZELqlJe5mm2+pzhCQB13C4/exc0l1U6b
+tyiGXxhVi2/4SBrs6n9lmB/YhXkgtqaOQAcNaOD6sVbS1e5cBtjnG86oOq8tQ2qG
+c7Dvh3HTp9M5fDJtsI40SIpqy3FcKORBfpjYd8jONfSqMnLM2kM8xzwHSv4/X23e
+GlDKHtIi+1ylD/Qu7Z3S7hqXDTSYjZb1QHc7axDFB6X6nj2Rz3aWS2hPPTypFd3T
+zTj5DZjgiP7U2LhR40sWW68RYi21yzNUwbe0w5LeDah6Ymc5CDO2ujdm3HDQbQGH
+pA9QIOjzpgR64nWLIJfZ7jMxL3rCCaCW3NCB/iRXni2Ib/wt3ZDkJyEk/SF4K82H
+72U2u2qVjAsnhmwWK8gksBi9bEXk3TnX778bkrwm4rt1xOjACq8k66LAernoE4tB
+DkE0pO4QR+6XwFb5sJMG/3L9CmrhTp2pkPDBQDbSD+ngBs5V5mJOqVf7gB+UptnN
+Fh8OACO/5KtDkqBDsCljHxHZNaboVF4Q613+iF5CUc6SYOTkLnBDUE4Pq38vlzVB
+GdZMEo/hvsCbR4c2TmdKuvEkEqayxCxcv0DXiyTlVCecxSkaYvMXPwCKK43QtS7S
+het83QCUxaVuxLiznuwR
+=lkYC
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-SA-15:05.bind.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-15:05.bind.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,140 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-15:05.bind                                       Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          BIND remote denial of service vulnerability
+
+Category:       contrib
+Module:         bind
+Announced:      2015-02-25
+Credits:        ISC
+Affects:        FreeBSD 8.x and FreeBSD 9.x.
+Corrected:      2015-02-18 22:20:19 UTC (stable/9, 9.3-STABLE)
+                2015-02-25 05:56:54 UTC (releng/9.3, 9.3-RELEASE-p10)
+                2015-02-18 22:29:52 UTC (stable/8, 8.4-STABLE)
+                2015-02-25 05:56:54 UTC (releng/8.4, 8.4-RELEASE-p24)
+CVE Name:       CVE-2015-1349
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:https://security.FreeBSD.org/>.
+
+I.   Background
+
+BIND 9 is an implementation of the Domain Name System (DNS) protocols.
+The named(8) daemon is an Internet Domain Name Server.
+
+II.  Problem Description
+
+BIND servers which are configured to perform DNSSEC validation and which
+are using managed keys (which occurs implicitly when using
+"dnssec-validation auto;" or "dnssec-lookaside auto;") may exhibit
+unpredictable behavior due to the use of an improperly initialized
+variable.
+
+III. Impact
+
+A remote attacker can trigger a crash of a name server that is configured
+to use managed keys under specific and limited circumstances.  However,
+the complexity of the attack is very high unless the attacker has a
+specific network relationship to the BIND server which is targeted.
+
+IV.  Workaround
+
+Only systems that runs BIND, including recursive resolvers and authoritative
+servers that performs DNSSEC validation and using managed-keys are affected.
+
+This issue can be worked around by not using "auto" for the dnssec-validation
+or dnssec-lookaside options and do not configure a managed-keys statement.
+Note that in order to do DNSSEC validation with this workaround one would
+have to configure an explicit trusted-keys statement with the appropriate
+keys.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/SA-15:05/bind.patch
+# fetch https://security.FreeBSD.org/patches/SA-15:05/bind.patch.asc
+# gpg --verify bind.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+Restart the applicable daemons, or reboot the system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r278973
+releng/8.4/                                                       r279265
+stable/9/                                                         r278972
+releng/9.3/                                                       r279265
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://kb.isc.org/article/AA-01235>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-1349>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-15:05.bind.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAEBCgAGBQJU7WjDAAoJEO1n7NZdz2rnKkgP/3vUBO8o5ofQFMUYSS1siPxZ
+63OeeRlMabEgiWZaQ+V2O7/CPrHDIgJHQABx9kNoiutWD9TC3c5f7Yh4nfaXmbKe
+Ncu3EjF1Zw/uGbu3cXjboX0CYnBDYrPNJnzIvSG0UlTY5hEIi3FgN4v2Q3gzuU/2
+3aUlFHyZb4GVzK+lA+wD0unOc6+il6LHPpSzwRbLpNxCB2J582HoCuw9i5NfMiOB
+KP8axZeNZLMpE90s3H/VD+7UIoe6eOC0kykH/DpuUIUxxlExK9c8f9QurpoCnOrV
+qwPAeWEYjmjZmMFivVZf5ugir6diaenfPjpXvUGNz2pCp5wlRkku71sMDsgnErX2
+Fnuc6nCXqTb/XX6zQmz/236EEVr2UBuX0cXWT0Dvu8GznMij/s4J+9+/Pkjp/mr7
+PfXj4H9UMv2Q3zOW7+Vb2Ru0zwfL9Dt90SyNbvt6DOA9KSNnUZIkN/pbKuS9fnHX
+Pw7eiNPs4Rq0Ui1DJDWVsJnZV2aVSw+qHxeMVtjCWbx3O7IVGgj5W7i95iAPHRJ4
+PVd1oaI2WsteoLNGpfXUD5sQr9yFRU/mRKtgSjxtKRV/nIkdwfTNcHHXIl0XuIWw
+C7VmAjlZgqj7aacTZWiVXqiFkN6gDjjFv1lVYmuDQOiK52JCbcBavYnxzZxVzuSa
+yIpDuhJS5vIt/B5oepoZ
+=uquT
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-15:01/vt.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:01/vt.patch	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,34 @@
+Index: sys/dev/vt/vt_core.c
+===================================================================
+--- sys/dev/vt/vt_core.c	(revision 278106)
++++ sys/dev/vt/vt_core.c	(working copy)
+@@ -1719,14 +1719,16 @@ skip_thunk:
+ 		}
+ 		VT_UNLOCK(vd);
+ 		return (EINVAL);
+-	case VT_WAITACTIVE:
++	case VT_WAITACTIVE: {
++		unsigned int idx;
++
+ 		error = 0;
+ 
+-		i = *(unsigned int *)data;
+-		if (i > VT_MAXWINDOWS)
++		idx = *(unsigned int *)data;
++		if (idx > VT_MAXWINDOWS)
+ 			return (EINVAL);
+-		if (i != 0)
+-			vw = vd->vd_windows[i - 1];
++		if (idx > 0)
++			vw = vd->vd_windows[idx - 1];
+ 
+ 		VT_LOCK(vd);
+ 		while (vd->vd_curwindow != vw && error == 0)
+@@ -1733,6 +1735,7 @@ skip_thunk:
+ 			error = cv_wait_sig(&vd->vd_winswitch, &vd->vd_lock);
+ 		VT_UNLOCK(vd);
+ 		return (error);
++	}
+ 	case VT_SETMODE: {    	/* set screen switcher mode */
+ 		struct vt_mode *mode;
+ 		struct proc *p1;

Added: head/share/security/patches/EN-15:01/vt.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:01/vt.patch.asc	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.1 (FreeBSD)
+
+iQIcBAABCgAGBQJU7WjZAAoJEO1n7NZdz2rnu1YQAOmWCucNAVFb6agfA4im6Roz
+Y0ujoSDgLmbYiKbT8tgXE456hLzk/VIOT6LdBxxsbXFBvKcRUlSDVlTa7YS2FlHN
+QmQFput2r+1Cxase9tEFDFWG4c7TUFxWSotNZKrx0Xvt14kg4vUVqrkFEWQlnWlg
+NhsPPZ4Ui2XQW3+hEUha7HuUvca6JWe8KbHFlzKcABm20cbGxHSnmyzsg6DjofeI
+35fyKdJe81HYG94P31Xqx60HwBK4ncvJY7HXbdMfmIE/nGrdn19147X8bo2N/EvG
+0mXis5iRbsKVqDqvuE9eXHXtVg5JibDgT/vos4T0ZtauLK0e4j7kDGAcp7HFE8p8
+OoHLHLf8VevO8iI1UYczNN97tLfGWD3P7wiO/p7mpYUny0G+U4lqQGaTSmfgobxe
+MJUNyZl/riIYlgjg7lG9lrtsdecEFKY6V4mzCt+kEb0QysoYCs8Kk7zrm9C8B02T
+cydBPV5bjy3cKuFOfoYFXHKROKTaaR81e6lHaoRMYZ4XOzrVHFnTQoPlEe6k2EsS
+lgwnPEmkoTMT46IcOnLN1Nq7pQIrls6bstrCcM6bIIvjv//k70emw8nNd1gcow38
+rFOjOmruepze0sA1OSAXshDwzLt+XUOvl8AT/X4O2FX52KWic48sL9L4cEkv7pL8
+sxl/mffCaySZUHqrmv9X
+=chiR
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-15:02/openssl-10.0.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:02/openssl-10.0.patch	Wed Feb 25 06:25:59 2015	(r46288)
@@ -0,0 +1,58313 @@
+Index: crypto/openssl/ACKNOWLEDGMENTS
+===================================================================
+--- crypto/openssl/ACKNOWLEDGMENTS	(revision 279126)
++++ crypto/openssl/ACKNOWLEDGMENTS	(working copy)
+@@ -10,13 +10,18 @@ OpenSSL project.
+ We would like to identify and thank the following such sponsors for their past
+ or current significant support of the OpenSSL project:
+ 
++Major support:
++
++	Qualys		http://www.qualys.com/
++
+ Very significant support:
+ 
+-	OpenGear: www.opengear.com
++	OpenGear:	http://www.opengear.com/
+ 
+ Significant support:
+ 
+-	PSW Group: www.psw.net
++	PSW Group:	http://www.psw.net/
++	Acano Ltd.	http://acano.com/
+ 
+ Please note that we ask permission to identify sponsors and that some sponsors
+ we consider eligible for inclusion here have requested to remain anonymous.
+Index: crypto/openssl/CHANGES
+===================================================================
+--- crypto/openssl/CHANGES	(revision 279126)
++++ crypto/openssl/CHANGES	(working copy)
+@@ -2,9 +2,376 @@
+  OpenSSL CHANGES
+  _______________
+ 
++ Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
++
++  *) Build fixes for the Windows and OpenVMS platforms
++     [Matt Caswell and Richard Levitte]
++
++ Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
++
++  *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
++     message can cause a segmentation fault in OpenSSL due to a NULL pointer
++     dereference. This could lead to a Denial Of Service attack. Thanks to
++     Markus Stenberg of Cisco Systems, Inc. for reporting this issue.
++     (CVE-2014-3571)
++     [Steve Henson]
++
++  *) Fix DTLS memory leak in dtls1_buffer_record. A memory leak can occur in the
++     dtls1_buffer_record function under certain conditions. In particular this
++     could occur if an attacker sent repeated DTLS records with the same
++     sequence number but for the next epoch. The memory leak could be exploited
++     by an attacker in a Denial of Service attack through memory exhaustion.
++     Thanks to Chris Mueller for reporting this issue.
++     (CVE-2015-0206)
++     [Matt Caswell]
++
++  *) Fix issue where no-ssl3 configuration sets method to NULL. When openssl is
++     built with the no-ssl3 option and a SSL v3 ClientHello is received the ssl
++     method would be set to NULL which could later result in a NULL pointer
++     dereference. Thanks to Frank Schmirler for reporting this issue.
++     (CVE-2014-3569)
++     [Kurt Roeckx]
++
++  *) Abort handshake if server key exchange message is omitted for ephemeral
++     ECDH ciphersuites.
++
++     Thanks to Karthikeyan Bhargavan of the PROSECCO team at INRIA for
++     reporting this issue.
++     (CVE-2014-3572)
++     [Steve Henson]
++
++  *) Remove non-export ephemeral RSA code on client and server. This code
++     violated the TLS standard by allowing the use of temporary RSA keys in
++     non-export ciphersuites and could be used by a server to effectively
++     downgrade the RSA key length used to a value smaller than the server
++     certificate. Thanks for Karthikeyan Bhargavan of the PROSECCO team at
++     INRIA or reporting this issue.
++     (CVE-2015-0204)
++     [Steve Henson]
++
++  *) Fixed issue where DH client certificates are accepted without verification.
++     An OpenSSL server will accept a DH certificate for client authentication
++     without the certificate verify message. This effectively allows a client to
++     authenticate without the use of a private key. This only affects servers
++     which trust a client certificate authority which issues certificates
++     containing DH keys: these are extremely rare and hardly ever encountered.
++     Thanks for Karthikeyan Bhargavan of the PROSECCO team at INRIA or reporting
++     this issue.
++     (CVE-2015-0205)
++     [Steve Henson]
++
++  *) Ensure that the session ID context of an SSL is updated when its
++     SSL_CTX is updated via SSL_set_SSL_CTX.
++
++     The session ID context is typically set from the parent SSL_CTX,
++     and can vary with the CTX.
++     [Adam Langley]
++
++  *) Fix various certificate fingerprint issues.
++
++     By using non-DER or invalid encodings outside the signed portion of a
++     certificate the fingerprint can be changed without breaking the signature.
++     Although no details of the signed portion of the certificate can be changed
++     this can cause problems with some applications: e.g. those using the
++     certificate fingerprint for blacklists.
++
++     1. Reject signatures with non zero unused bits.
++
++     If the BIT STRING containing the signature has non zero unused bits reject
++     the signature. All current signature algorithms require zero unused bits.
++
++     2. Check certificate algorithm consistency.
++
++     Check the AlgorithmIdentifier inside TBS matches the one in the
++     certificate signature. NB: this will result in signature failure
++     errors for some broken certificates.
++
++     Thanks to Konrad Kraszewski from Google for reporting this issue.
++
++     3. Check DSA/ECDSA signatures use DER.
++
++     Reencode DSA/ECDSA signatures and compare with the original received
++     signature. Return an error if there is a mismatch.
++
++     This will reject various cases including garbage after signature
++     (thanks to Antti Karjalainen and Tuomo Untinen from the Codenomicon CROSS
++     program for discovering this case) and use of BER or invalid ASN.1 INTEGERs
++     (negative or with leading zeroes).
++
++     Further analysis was conducted and fixes were developed by Stephen Henson
++     of the OpenSSL core team.
++
++     (CVE-2014-8275)
++     [Steve Henson]
++
++   *) Correct Bignum squaring. Bignum squaring (BN_sqr) may produce incorrect
++      results on some platforms, including x86_64. This bug occurs at random
++      with a very low probability, and is not known to be exploitable in any
++      way, though its exact impact is difficult to determine. Thanks to Pieter
++      Wuille (Blockstream) who reported this issue and also suggested an initial
++      fix. Further analysis was conducted by the OpenSSL development team and
++      Adam Langley of Google. The final fix was developed by Andy Polyakov of
++      the OpenSSL core team.
++      (CVE-2014-3570)
++      [Andy Polyakov]
++
++   *) Do not resume sessions on the server if the negotiated protocol
++      version does not match the session's version. Resuming with a different
++      version, while not strictly forbidden by the RFC, is of questionable
++      sanity and breaks all known clients.
++      [David Benjamin, Emilia Käsper]
++
++   *) Tighten handling of the ChangeCipherSpec (CCS) message: reject
++      early CCS messages during renegotiation. (Note that because
++      renegotiation is encrypted, this early CCS was not exploitable.)
++      [Emilia Käsper]
++
++   *) Tighten client-side session ticket handling during renegotiation:
++      ensure that the client only accepts a session ticket if the server sends
++      the extension anew in the ServerHello. Previously, a TLS client would
++      reuse the old extension state and thus accept a session ticket if one was
++      announced in the initial ServerHello.
++
++      Similarly, ensure that the client requires a session ticket if one
++      was advertised in the ServerHello. Previously, a TLS client would
++      ignore a missing NewSessionTicket message.
++      [Emilia Käsper]
++
++ Changes between 1.0.1i and 1.0.1j [15 Oct 2014]
++
++  *) SRTP Memory Leak.
++
++     A flaw in the DTLS SRTP extension parsing code allows an attacker, who
++     sends a carefully crafted handshake message, to cause OpenSSL to fail
++     to free up to 64k of memory causing a memory leak. This could be
++     exploited in a Denial Of Service attack. This issue affects OpenSSL
++     1.0.1 server implementations for both SSL/TLS and DTLS regardless of
++     whether SRTP is used or configured. Implementations of OpenSSL that
++     have been compiled with OPENSSL_NO_SRTP defined are not affected.
++
++     The fix was developed by the OpenSSL team.
++     (CVE-2014-3513)
++     [OpenSSL team]
++
++  *) Session Ticket Memory Leak.
++
++     When an OpenSSL SSL/TLS/DTLS server receives a session ticket the
++     integrity of that ticket is first verified. In the event of a session
++     ticket integrity check failing, OpenSSL will fail to free memory
++     causing a memory leak. By sending a large number of invalid session
++     tickets an attacker could exploit this issue in a Denial Of Service
++     attack.
++     (CVE-2014-3567)
++     [Steve Henson]
++
++  *) Build option no-ssl3 is incomplete.
++
++     When OpenSSL is configured with "no-ssl3" as a build option, servers
++     could accept and complete a SSL 3.0 handshake, and clients could be
++     configured to send them.
++     (CVE-2014-3568)
++     [Akamai and the OpenSSL team]
++
++  *) Add support for TLS_FALLBACK_SCSV.
++     Client applications doing fallback retries should call
++     SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV).
++     (CVE-2014-3566)
++     [Adam Langley, Bodo Moeller]
++
++  *) Add additional DigestInfo checks.

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 16:40:27 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 207C4EDE;
 Wed, 25 Feb 2015 16:40:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 026FEF28;
 Wed, 25 Feb 2015 16:40:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PGeQmp097147;
 Wed, 25 Feb 2015 16:40:26 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PGeQ16097144;
 Wed, 25 Feb 2015 16:40:26 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502251640.t1PGeQ16097144@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 25 Feb 2015 16:40:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46290 - in head/en_US.ISO8859-1/htdocs/releases: 10.1R
 8.4R 9.3R
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.18-1
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, 25 Feb 2015 16:40:27 -0000

Author: gjb
Date: Wed Feb 25 16:40:25 2015
New Revision: 46290
URL: https://svnweb.freebsd.org/changeset/doc/46290

Log:
  Regen after r279285
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html
  head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
  head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html

Modified: head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html	Wed Feb 25 06:26:36 2015	(r46289)
+++ head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html	Wed Feb 25 16:40:25 2015	(r46290)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.1-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeB
 SD 10.1-RELEASE will be maintained until the release of FreeBSD 10.2-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61487952"></a>FreeBSD 10.1-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.1-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeB
 SD 10.1-RELEASE will be maintained until the release of FreeBSD 10.2-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61533008"></a>FreeBSD 10.1-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation
 	Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
@@ -40,8 +40,10 @@
 	    suite </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:01.openssl.asc" target="_top">FreeBSD-SA-15:01.openssl</a></td><td>14 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities in
 	    OpenSSL </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:02.kmem.asc" target="_top">FreeBSD-SA-15:02.kmem</a></td><td>27 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP kernel memory corruption and
 	    disclosure vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:03.sctp.asc" target="_top">FreeBSD-SA-15:03.sctp</a></td><td>27 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP stream reset
-	    vulnerability </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3. Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed directory deletion issue in
-	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.1-RELEASE running as a guest
+	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:04.igmp.asc" target="_top">FreeBSD-SA-15:04.igmp</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Integer overflow in IGMP protocol </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3. Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed direct
 ory deletion issue in
+	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:01.vt.asc" target="_top">FreeBSD-EN-15:01.vt</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vt&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vt</span>(4)</span></a> crash with improper ioctl
+	    parameters </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSL update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
+	    suboptimal order </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.1-RELEASE running as a guest
 	  operating system on <span xmlns="http://www.w3.org/1999/xhtml" class="application">VirtualBox</span>
 	  can have a problem with disk I/O access.  It depends on some
 	  specific hardware configuration and does not depend on a

Modified: head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html	Wed Feb 25 06:26:36 2015	(r46289)
+++ head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html	Wed Feb 25 16:40:25 2015	(r46290)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 8.4-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 8.4-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  8.4-RELEASE will be maintained until the FreeBSD 8.4-RELEASE end of life." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60798032"></a>FreeBSD 8.4-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 8.4-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 8.4-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  8.4-RELEASE will be maintained until the FreeBSD 8.4-RELEASE end of life." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60791504"></a>FreeBSD 8.4-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
     The FreeBSD Project
     </span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p>FreeBSD is a registered trademark of
   the FreeBSD Foundation.</p><p>Intel, Celeron, Centrino, Core, EtherExpress, i386,
@@ -69,6 +69,7 @@
 	    suite</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:01.openssl.asc" target="_top">FreeBSD-SA-15:01.ntp</a></td><td>14 January 2015</td><td><p>Multiple vulnerabilities in
 	    OpenSSL</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:02.kmem.asc" target="_top">FreeBSD-SA-15:02.kmem</a></td><td>27 January 2015</td><td><p>Fix SCTP SCTP_SS_VALUE kernel memory corruption
 	    and disclosure vulnerability</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:03.sctp.asc" target="_top">FreeBSD-SA-15:03.sctp</a></td><td>27 January 2015</td><td><p>Fix SCTP stream reset
+	    vulnerability</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:04.igmp.asc" target="_top">FreeBSD-SA-15:04.igmp</a></td><td>25 February 2015</td><td><p>Integer overflow in IGMP protocol</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:05.bind.asc" target="_top">FreeBSD-SA-15:05.igmp</a></td><td>25 February 2015</td><td><p>Remote denial of service
 	    vulnerability</p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3. Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-13:01.fxp.asc" target="_top">FreeBSD-EN-13:01.fxp</a></td><td>28 June 2013</td><td><p>Fixed a problem where <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=dhclient&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">dhclient</span>(8)</span></a> would
 	    infinitely try to intialize <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=fxp&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">fxp</span>(4)</span></a></p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-13:02.vtnet.asc" target="_top">FreeBSD-EN-13:02.vtnet</a></td><td>28 June 2013</td><td><p>Fixed a problem frames sent to additional MAC
 	    addresses are not forwarded to the <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vtnet&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vtnet</span>(4)</span></a>
@@ -79,7 +80,8 @@
 	    process</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:08.heimdal.asc" target="_top">FreeBSD-EN-14:08.heimdal</a></td><td>24 June 2014</td><td><p>Fix <code class="literal">gss_pseudo_random()</code>
 	    interoperability issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:09.jail.asc" target="_top">FreeBSD-EN-14:09.jail</a></td><td>8 July 2014</td><td><p>Fix jail fails to start if
 	    WITHOUT_INET/WITHOUT_INET6 is use</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:10.tzdata.asc" target="_top">FreeBSD-EN-14:10.tzdata</a></td><td>21 October 2014</td><td><p>Time zone data file update</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:12.zfs.asc" target="_top">FreeBSD-EN-14:12.zfs</a></td><td>4 November 2014</td><td><p>Fix NFSv4 and ZFS cache consistency
-	    issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p>Fix directory deletion issue</p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><p>[20130613] The <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vtnet&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vtnet</span>(4)</span></a> network interface driver
+	    issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p>Fix directory deletion issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p>OpenSSL update</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p><a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
+	    suboptimal order</p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><p>[20130613] The <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vtnet&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vtnet</span>(4)</span></a> network interface driver
       displays the following message upon configuration when using
       <span class="application">QEMU</span> 1.4.1 and later:</p><pre class="screen">vtnet0: error setting host MAC filter table</pre><p>This message is harmless when the interface has only one MAC
       address.  The patch for this issue is filed to a PR <a class="link" href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=178955" target="_top">kern/178955</a>.</p><p>[20130609] There is incompatibility in <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=jail&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">jail</span>(8)</span></a>

Modified: head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	Wed Feb 25 06:26:36 2015	(r46289)
+++ head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	Wed Feb 25 16:40:25 2015	(r46290)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61900368"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61888080"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
     The FreeBSD Project
     </span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
@@ -46,10 +46,13 @@
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=libmagic&amp;sektion=3"><span class="citerefentry"><span class="refentrytitle">libmagic</span>(3)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:29.bind.asc" target="_top">FreeBSD-SA-14:29.bind</a></td><td>10 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-14:31.ntp.asc" target="_top">FreeBSD-SA-14:31.ntp</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:01.openssl.asc" target="_top">FreeBSD-SA-15:01.openssl</a></td><td>14 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Multiple vulnerabilities </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:02.kmem.asc" target="_top">FreeBSD-SA-15:02.kmem</a></td><td>27 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP kernel memory corruption and
 	    disclosure vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:03.sctp.asc" target="_top">FreeBSD-SA-15:03.sctp</a></td><td>27 January 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">SCTP stream reset
+	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:04.igmp.asc" target="_top">FreeBSD-SA-15:04.igmp</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Integer overflow in IGMP protocol </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-15:05.bind.asc" target="_top">FreeBSD-SA-15:05.igmp</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Remote denial of service
 	    vulnerability </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3. Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:10.tzdata.asc" target="_top">FreeBSD-EN-14:10.tzdata</a></td><td>21 October 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Time zone data file update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:11.crypt.asc" target="_top">FreeBSD-EN-14:11.crypt</a></td><td>21 October 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Change <a xmlns="http://www.w3.org/
 1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=crypt&amp;sektion=3"><span class="citerefentry"><span class="refentrytitle">crypt</span>(3)</span></a> default hashing algorithm
 	    back to DES </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:12.zfs.asc" target="_top">FreeBSD-EN-14:12.zfs</a></td><td>11 November 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix NFSv4 and ZFS cache consistency
 	    issue </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed directory deletion issue in
-	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4. Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
+	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:01.vt.asc" target="_top">FreeBSD-EN-15:01.vt</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vt&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vt</span>(4)</span></a> crash with improper ioctl
+	    parameters </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSL update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
+	    suboptimal order </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4. Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
       can be downloaded from <a href="https://www.FreeBSD.org/releases/">https://www.FreeBSD.org/releases/</a>.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about FreeBSD, read the
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>All users of FreeBSD 9.3-STABLE should

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 16:45:39 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BBF595D8;
 Wed, 25 Feb 2015 16:45:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7A6668;
 Wed, 25 Feb 2015 16:45:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PGjdWd001639;
 Wed, 25 Feb 2015 16:45:39 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PGjdvp001638;
 Wed, 25 Feb 2015 16:45:39 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201502251645.t1PGjdvp001638@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Wed, 25 Feb 2015 16:45:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46291 - head/en_US.ISO8859-1/articles/hubs
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.18-1
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, 25 Feb 2015 16:45:39 -0000

Author: jgh
Date: Wed Feb 25 16:45:38 2015
New Revision: 46291
URL: https://svnweb.freebsd.org/changeset/doc/46291

Log:
  - whitespace only fix to r46284 (translators can ignore)
  
  Approved by:	remko (mentor)

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

Modified: head/en_US.ISO8859-1/articles/hubs/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/hubs/article.xml	Wed Feb 25 16:40:25 2015	(r46290)
+++ head/en_US.ISO8859-1/articles/hubs/article.xml	Wed Feb 25 16:45:38 2015	(r46291)
@@ -251,13 +251,13 @@
 
             <listitem>
               <para><package>www/nginx</package>:
-              <application>Nginx</application> is a high performance edge web
-              server with a low memory footprint and key features to build
-              a modern and efficient web infrastructure.  Features include
-              a HTTP server, HTTP and mail reverse proxy, caching, load
-              balancing, compression, request throttling, connection
-              multiplexing and reuse, SSL offload and HTTP media
-              streaming.</para>
+                <application>Nginx</application> is a high performance edge web
+                server with a low memory footprint and key features to build
+                a modern and efficient web infrastructure.  Features include
+                a HTTP server, HTTP and mail reverse proxy, caching, load
+                balancing, compression, request throttling, connection
+                multiplexing and reuse, SSL offload and HTTP media
+                streaming.</para>
             </listitem>
           </itemizedlist>
       </sect3>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 17:01:17 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61C5FEB9;
 Wed, 25 Feb 2015 17:01:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4314C375;
 Wed, 25 Feb 2015 17:01:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PH1HJP010787;
 Wed, 25 Feb 2015 17:01:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PH1HYK010786;
 Wed, 25 Feb 2015 17:01:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502251701.t1PH1HYK010786@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 25 Feb 2015 17:01:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46292 -
 head/en_US.ISO8859-1/books/porters-handbook/versions
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.18-1
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, 25 Feb 2015 17:01:17 -0000

Author: gjb
Date: Wed Feb 25 17:01:16 2015
New Revision: 46292
URL: https://svnweb.freebsd.org/changeset/doc/46292

Log:
  Document the following __FreeBSD_version values:
   1100060, 1100061, 1100062, 1001508, 1001509, 903508,
   804508
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml	Wed Feb 25 16:45:38 2015	(r46291)
+++ head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml	Wed Feb 25 17:01:16 2015	(r46292)
@@ -3887,6 +3887,15 @@
 	</row>
 
 	<row>
+	  <entry>804508</entry>
+	  <entry>February 25, 2015</entry>
+	  <entry>8-STABLE after FreeBSD-EN-15:01.vt,
+	    FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update,
+	    FreeBSD-SA-15:04.igmp, FreeBSD-SA-15:05.bind
+	    <revnumber>279287</revnumber>).</entry>
+	</row>
+
+	<row>
 	  <entry>900000</entry>
 	  <entry>August 22, 2009</entry>
 	  <entry>9.0-CURRENT.</entry>
@@ -4503,6 +4512,15 @@
 	</row>
 
 	<row>
+	  <entry>903508</entry>
+	  <entry>February 25, 2015</entry>
+	  <entry>9-STABLE after FreeBSD-EN-15:01.vt,
+	    FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update,
+	    FreeBSD-SA-15:04.igmp, FreeBSD-SA-15:05.bind
+	    <revnumber>279287</revnumber>).</entry>
+	</row>
+
+	<row>
 	  <entry>1000000</entry>
 	  <entry>September 26, 2011</entry>
 	  <entry>10.0-CURRENT.</entry>
@@ -5239,6 +5257,23 @@
 	</row>
 
 	<row>
+	  <entry>1001508</entry>
+	  <entry>February 18, 2015</entry>
+	  <entry>10-STABLE after addition of the
+	    <literal>CDAI_TYPE_EXT_INQ</literal> request type
+	    <revnumber>278974</revnumber>).</entry>
+	</row>
+
+	<row>
+	  <entry>1001509</entry>
+	  <entry>February 25, 2015</entry>
+	  <entry>10-STABLE after FreeBSD-EN-15:01.vt,
+	    FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update,
+	    FreeBSD-SA-15:04.igmp, FreeBSD-SA-15:05.bind
+	    <revnumber>279287</revnumber>).</entry>
+	</row>
+
+	<row>
 	  <entry>1100000</entry>
 	  <entry>October 10, 2013</entry>
 	  <entry>11.0-CURRENT
@@ -5711,6 +5746,30 @@
 	    gained libthr dependency.
 	    (<revnumber>278433</revnumber>).</entry>
 	</row>
+
+	<row>
+	  <entry>1100060</entry>
+	  <entry>February 16, 2015</entry>
+	  <entry>11.0-CURRENT after forwarding
+	    <literal>FBIO_BLANK</literal>
+	    to framebuffer clients
+	    (<revnumber>278846</revnumber>).</entry>
+	</row>
+
+	<row>
+	  <entry>1100061</entry>
+	  <entry>February 18, 2015</entry>
+	  <entry>11.0-CURRENT after <literal>CDAI_FLAG_NONE</literal>
+	    addition (<revnumber>278964</revnumber>).</entry>
+	</row>
+
+	<row>
+	  <entry>1100062</entry>
+	  <entry>February 23, 2015</entry>
+	  <entry>11.0-CURRENT after &man.mtio.4; and &man.sa.4;
+	    <acronym>API</acronym> and &man.ioctl.2; additions
+	    (<revnumber>279221</revnumber>).</entry>
+	</row>
       </tbody>
     </tgroup>
   </table>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 19:01:27 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DCC5B3E2;
 Wed, 25 Feb 2015 19:01:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C736E6CC;
 Wed, 25 Feb 2015 19:01:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PJ1RXg068939;
 Wed, 25 Feb 2015 19:01:27 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PJ1R1L068937;
 Wed, 25 Feb 2015 19:01:27 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201502251901.t1PJ1R1L068937@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 25 Feb 2015 19:01:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46293 - in head/en_US.ISO8859-1: articles htdocs/docs
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.18-1
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, 25 Feb 2015 19:01:28 -0000

Author: wblock
Date: Wed Feb 25 19:01:26 2015
New Revision: 46293
URL: https://svnweb.freebsd.org/changeset/doc/46293

Log:
  Restore the Handbook vinum chapter into a new separate article.

Added:
     - copied from r41710, head/share/images/books/handbook/vinum/
Directory Properties:
  head/share/images/articles/vinum/   (props changed)
Modified:
  head/en_US.ISO8859-1/articles/Makefile
  head/en_US.ISO8859-1/htdocs/docs/books.xml

Modified: head/en_US.ISO8859-1/articles/Makefile
==============================================================================
--- head/en_US.ISO8859-1/articles/Makefile	Wed Feb 25 17:01:16 2015	(r46292)
+++ head/en_US.ISO8859-1/articles/Makefile	Wed Feb 25 19:01:26 2015	(r46293)
@@ -42,6 +42,7 @@ SUBDIR+= releng-packages
 SUBDIR+= remote-install
 SUBDIR+= serial-uart
 SUBDIR+= solid-state
+SUBDIR+= vinum
 SUBDIR+= vm-design
 SUBDIR+= wp-toolbox
 

Modified: head/en_US.ISO8859-1/htdocs/docs/books.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docs/books.xml	Wed Feb 25 17:01:16 2015	(r46292)
+++ head/en_US.ISO8859-1/htdocs/docs/books.xml	Wed Feb 25 19:01:26 2015	(r46293)
@@ -310,6 +310,10 @@
 	Solid State Devices</a> (solid-state)<br/>
       The use of solid state disk devices in FreeBSD.</p>
 
+    <p><a href="&url.articles;/vinum/index.html">The vinum Volume
+	Manager</a> (vinum)<br/>
+      Using gvinum to create RAID arrays.</p>
+
     <p><a href="&url.articles;/vm-design/index.html">Design elements
 	of the FreeBSD VM system</a> (vm-design)<br/>
       An easy to follow description of the design of the FreeBSD

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 19:22:05 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C2BB9597;
 Wed, 25 Feb 2015 19:22:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC039A11;
 Wed, 25 Feb 2015 19:22:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PJM5tc081416;
 Wed, 25 Feb 2015 19:22:05 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PJM5dB081414;
 Wed, 25 Feb 2015 19:22:05 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201502251922.t1PJM5dB081414@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 25 Feb 2015 19:22:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46294 - head/en_US.ISO8859-1/articles/vinum
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.18-1
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, 25 Feb 2015 19:22:06 -0000

Author: wblock
Date: Wed Feb 25 19:22:04 2015
New Revision: 46294
URL: https://svnweb.freebsd.org/changeset/doc/46294

Log:
  Restore the vinum chapter as an article.

Added:
     - copied from r41710, head/en_US.ISO8859-1/books/handbook/vinum/
  head/en_US.ISO8859-1/articles/vinum/article.xml
     - copied, changed from r41710, head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
Directory Properties:
  head/en_US.ISO8859-1/articles/vinum/   (props changed)
Deleted:
  head/en_US.ISO8859-1/articles/vinum/chapter.xml
Modified:
  head/en_US.ISO8859-1/articles/vinum/Makefile

Modified: head/en_US.ISO8859-1/articles/vinum/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/vinum/Makefile	Thu May 23 06:12:40 2013	(r41710)
+++ head/en_US.ISO8859-1/articles/vinum/Makefile	Wed Feb 25 19:22:04 2015	(r46294)
@@ -4,12 +4,26 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.xml
+DOC?= article
 
-VPATH=		..
+FORMATS?= html
+WITH_ARTICLE_TOC?= YES
 
-MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
+INSTALL_COMPRESSED?= gz
+INSTALL_ONLY_COMPRESSED?=
 
-DOC_PREFIX?= 	${.CURDIR}/../../../..
+SRCS=   article.xml
+
+IMAGES_EN=	vinum-concat.pic
+IMAGES_EN+=	vinum-mirrored-vol.pic
+IMAGES_EN+=	vinum-raid10-vol.pic
+IMAGES_EN+=	vinum-raid5-org.pic
+IMAGES_EN+=	vinum-simple-vol.pic
+IMAGES_EN+=	vinum-striped-vol.pic
+IMAGES_EN+=	vinum-striped.pic
+
+URL_RELPREFIX?= ../../../..
+DOC_PREFIX?=    ${.CURDIR}/../../..
+
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
-.include "../Makefile"

Copied and modified: head/en_US.ISO8859-1/articles/vinum/article.xml (from r41710, head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml)
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml	Thu May 23 06:12:40 2013	(r41710, copy source)
+++ head/en_US.ISO8859-1/articles/vinum/article.xml	Wed Feb 25 19:22:04 2015	(r46294)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+  "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:lang="en">
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
@@ -10,20 +15,21 @@
 	$FreeBSD$
 -->
 
-<chapter id="vinum-vinum">
-  <chapterinfo>
+  <info>
+    <title>The <filename>vinum</filename> Volume Manager</title>
+
     <authorgroup>
       <author>
+	<personname>
 	<firstname>Greg</firstname>
 	<surname>Lehey</surname>
+	</personname>
 	<contrib>Originally written by </contrib>
       </author>
     </authorgroup>
-  </chapterinfo>
-
-  <title>The <devicename>vinum</devicename> Volume Manager</title>
+  </info>
 
-  <sect1 id="vinum-synopsis">
+  <sect1 xml:id="vinum-synopsis">
     <title>Synopsis</title>
 
     <para>No matter the type of disks, there are always potential
@@ -38,9 +44,9 @@
       redundant, disks.  In addition to supporting various cards and
       controllers for hardware Redundant Array of Independent
       Disks <acronym>RAID</acronym> systems, the base &os; system
-      includes the <devicename>vinum</devicename> volume manager, a
+      includes the <filename>vinum</filename> volume manager, a
       block device driver that implements virtual disk drives and
-      addresses these three problems.  <devicename>vinum</devicename>
+      addresses these three problems.  <filename>vinum</filename>
       provides more flexibility, performance, and reliability than
       traditional disk storage and implements
       <acronym>RAID</acronym>-0, <acronym>RAID</acronym>-1, and
@@ -49,16 +55,16 @@
 
     <para>This chapter provides an overview of potential problems with
       traditional disk storage, and an introduction to the
-      <devicename>vinum</devicename> volume manager.</para>
+      <filename>vinum</filename> volume manager.</para>
 
     <note>
-      <para>Starting with &os;&nbsp;5, <devicename>vinum</devicename>
+      <para>Starting with &os;&nbsp;5, <filename>vinum</filename>
 	has been rewritten in order to fit into the <link
-	  linkend="GEOM">GEOM architecture</link>, while retaining the
+	  xlink:href="&url.books.handbook;/geom.html">GEOM architecture</link>, while retaining the
 	original ideas, terminology, and on-disk metadata.  This
 	rewrite is called <emphasis>gvinum</emphasis> (for <emphasis>
 	  GEOM vinum</emphasis>).  While this chapter uses the term
-	<devicename>vinum</devicename>, any command invocations should
+	<filename>vinum</filename>, any command invocations should
 	be performed with <command>gvinum</command>.  The name of the
 	kernel module has changed from the original
 	<filename>vinum.ko</filename> to
@@ -66,12 +72,12 @@
 	reside under <filename
 	  class="directory">/dev/gvinum</filename> instead of
 	<filename class="directory">/dev/vinum</filename>.  As of
-	&os;&nbsp;6, the original <devicename>vinum</devicename>
+	&os;&nbsp;6, the original <filename>vinum</filename>
 	implementation is no longer available in the code base.</para>
     </note>
   </sect1>
 
-  <sect1 id="vinum-access-bottlenecks">
+  <sect1 xml:id="vinum-access-bottlenecks">
     <title>Access Bottlenecks</title>
 
     <para>Modern systems frequently need to access data in a highly
@@ -96,7 +102,7 @@
       to be atomic as it does not make any sense to interrupt
       them.</para>
 
-    <para><anchor id="vinum-latency"/> Consider a typical transfer of
+    <para><anchor xml:id="vinum-latency"/> Consider a typical transfer of
       about 10&nbsp;kB: the current generation of high-performance
       disks can position the heads in an average of 3.5&nbsp;ms.  The
       fastest drives spin at 15,000&nbsp;rpm, so the average
@@ -147,10 +153,14 @@
       organization.</para>
 
     <para>
-      <figure id="vinum-concat">
+      <figure xml:id="vinum-concat">
 	<title>Concatenated Organization</title>
 
-	<graphic fileref="vinum/vinum-concat"/>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="vinum/vinum-concat"/>
+	  </imageobject>
+	</mediaobject>
       </figure></para>
 
     <indexterm>
@@ -184,14 +194,18 @@
       organization.</para>
 
     <para>
-      <figure id="vinum-striped">
+      <figure xml:id="vinum-striped">
 	<title>Striped Organization</title>
 
-	<graphic fileref="vinum/vinum-striped"/>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="vinum/vinum-striped"/>
+	  </imageobject>
+	</mediaobject>
       </figure></para>
   </sect1>
 
-  <sect1 id="vinum-data-integrity">
+  <sect1 xml:id="vinum-data-integrity">
     <title>Data Integrity</title>
 
     <para>The final problem with disks is that they are unreliable.
@@ -239,10 +253,10 @@
     <para>An alternative solution is <emphasis>parity</emphasis>,
       implemented in <acronym>RAID</acronym> levels 2, 3, 4 and 5.
       Of these, <acronym>RAID-5</acronym> is the most interesting.  As
-      implemented in <devicename>vinum</devicename>, it is a variant
+      implemented in <filename>vinum</filename>, it is a variant
       on a striped organization which dedicates one block of each
       stripe to parity one of the other blocks.  As implemented by
-      <devicename>vinum</devicename>, a
+      <filename>vinum</filename>, a
       <acronym>RAID-5</acronym> plex is similar to a striped plex,
       except that it implements <acronym>RAID-5</acronym> by
       including a parity block in each stripe.  As required by
@@ -251,10 +265,14 @@
       blocks indicate the relative block numbers.</para>
 
     <para>
-      <figure id="vinum-raid5-org">
+      <figure xml:id="vinum-raid5-org">
 	<title><acronym>RAID</acronym>-5 Organization</title>
 
-	<graphic fileref="vinum/vinum-raid5-org"/>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="vinum/vinum-raid5-org"/>
+	  </imageobject>
+	</mediaobject>
       </figure></para>
 
     <para>Compared to mirroring, <acronym>RAID-5</acronym> has the
@@ -268,11 +286,11 @@
       all the remaining drives.</para>
   </sect1>
 
-  <sect1 id="vinum-objects">
-    <title><devicename>vinum</devicename> Objects</title>
+  <sect1 xml:id="vinum-objects">
+    <title><filename>vinum</filename> Objects</title>
 
     <para>In order to address these problems,
-      <devicename>vinum</devicename> implements a four-level hierarchy
+      <filename>vinum</filename> implements a four-level hierarchy
       of objects:</para>
 
     <itemizedlist>
@@ -293,21 +311,21 @@
       </listitem>
 
       <listitem>
-	<para>Since <devicename>vinum</devicename> exists within the
+	<para>Since <filename>vinum</filename> exists within the
 	  &unix; disk storage framework, it would be possible to use
 	  &unix; partitions as the building block for multi-disk
 	  plexes.  In fact, this turns out to be too inflexible as
 	  &unix; disks can have only a limited number of partitions.
-	  Instead, <devicename>vinum</devicename> subdivides a single
+	  Instead, <filename>vinum</filename> subdivides a single
 	  &unix; partition, the <emphasis>drive</emphasis>, into
 	  contiguous areas called <emphasis>subdisks</emphasis>, which
 	  are used as building blocks for plexes.</para>
       </listitem>
 
       <listitem>
-	<para>Subdisks reside on <devicename>vinum</devicename>
+	<para>Subdisks reside on <filename>vinum</filename>
 	  <emphasis>drives</emphasis>, currently &unix; partitions.
-	  <devicename>vinum</devicename> drives can contain any
+	  <filename>vinum</filename> drives can contain any
 	  number of subdisks.  With the exception of a small area at
 	  the beginning of the drive, which is used for storing
 	  configuration and state information, the entire drive is
@@ -317,13 +335,13 @@
 
     <para>The following sections describe the way these objects
       provide the functionality required of
-      <devicename>vinum</devicename>.</para>
+      <filename>vinum</filename>.</para>
 
     <sect2>
       <title>Volume Size Considerations</title>
 
       <para>Plexes can include multiple subdisks spread over all
-	drives in the <devicename>vinum</devicename> configuration.
+	drives in the <filename>vinum</filename> configuration.
 	As a result, the size of an individual drive does not limit
 	the size of a plex or a volume.</para>
     </sect2>
@@ -331,7 +349,7 @@
     <sect2>
       <title>Redundant Data Storage</title>
 
-      <para><devicename>vinum</devicename> implements mirroring by
+      <para><filename>vinum</filename> implements mirroring by
 	attaching multiple plexes to a volume.  Each plex is a
 	representation of the data in a volume.  A volume may contain
 	between one and eight plexes.</para>
@@ -348,7 +366,7 @@
     <sect2>
       <title>Which Plex Organization?</title>
 
-      <para><devicename>vinum</devicename> implements both
+      <para><filename>vinum</filename> implements both
 	concatenation and striping at the plex level:</para>
 
       <itemizedlist>
@@ -374,7 +392,7 @@
 	    By choosing an optimum sized stripe, about 256&nbsp;kB,
 	    the load can be evened out on the component drives.
 	    Extending a plex by adding new subdisks is so complicated
-	    that <devicename>vinum</devicename> does not implement
+	    that <filename>vinum</filename> does not implement
 	    it.</para>
 	</listitem>
       </itemizedlist>
@@ -382,8 +400,8 @@
       <para><xref linkend="vinum-comparison"/> summarizes the
 	advantages and disadvantages of each plex organization.</para>
 
-      <table id="vinum-comparison" frame="none">
-	<title><devicename>vinum</devicename> Plex
+      <table xml:id="vinum-comparison" frame="none">
+	<title><filename>vinum</filename> Plex
 	  Organizations</title>
 
 	<tgroup cols="5">
@@ -421,26 +439,26 @@
     </sect2>
   </sect1>
 
-  <sect1 id="vinum-examples">
+  <sect1 xml:id="vinum-examples">
     <title>Some Examples</title>
 
-    <para><devicename>vinum</devicename> maintains a
+    <para><filename>vinum</filename> maintains a
       <emphasis>configuration database</emphasis> which describes the
       objects known to an individual system.  Initially, the user
       creates the configuration database from one or more
       configuration files using &man.gvinum.8;.
-      <devicename>vinum</devicename> stores a copy of its
+      <filename>vinum</filename> stores a copy of its
       configuration database on each disk
       <emphasis>device</emphasis> under its control.  This database is
       updated on each state change, so that a restart accurately
       restores the state of each
-      <devicename>vinum</devicename> object.</para>
+      <filename>vinum</filename> object.</para>
 
     <sect2>
       <title>The Configuration File</title>
 
       <para>The configuration file describes individual
-	<devicename>vinum</devicename> objects.  The definition of a
+	<filename>vinum</filename> objects.  The definition of a
 	simple volume might be:</para>
 
       <programlisting>    drive a device /dev/da3h
@@ -448,7 +466,7 @@
       plex org concat
         sd length 512m drive a</programlisting>
 
-      <para>This file describes four <devicename>vinum</devicename>
+      <para>This file describes four <filename>vinum</filename>
 	objects:</para>
 
       <itemizedlist>
@@ -487,7 +505,7 @@
 	    derived from the plex name by adding the suffix
 	    <emphasis>.s</emphasis><emphasis>x</emphasis>, where
 	    <emphasis>x</emphasis> is the number of the subdisk in
-	    the plex.  Thus <devicename>vinum</devicename> gives this
+	    the plex.  Thus <filename>vinum</filename> gives this
 	    subdisk the name <emphasis>myvol.p0.s0</emphasis>.</para>
 	</listitem>
       </itemizedlist>
@@ -516,11 +534,15 @@
 	  linkend="vinum-simple-vol"/>.</para>
 
       <para>
-	<figure id="vinum-simple-vol">
-	  <title>A Simple <devicename>vinum</devicename>
+	<figure xml:id="vinum-simple-vol">
+	  <title>A Simple <filename>vinum</filename>
 	    Volume</title>
 
-	  <graphic fileref="vinum/vinum-simple-vol"/>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="vinum/vinum-simple-vol"/>
+	    </imageobject>
+	  </mediaobject>
 	</figure></para>
 
       <para>This figure, and the ones which follow, represent a
@@ -555,7 +577,7 @@
 
       <para>In this example, it was not necessary to specify a
 	definition of drive <emphasis>a</emphasis> again, since
-	<devicename>vinum</devicename> keeps track of all objects in
+	<filename>vinum</filename> keeps track of all objects in
 	its configuration database.  After processing this definition,
 	the configuration looks like:</para>
 
@@ -583,11 +605,15 @@
 	structure graphically.</para>
 
       <para>
-	<figure id="vinum-mirrored-vol">
-	  <title>A Mirrored <devicename>vinum</devicename>
+	<figure xml:id="vinum-mirrored-vol">
+	  <title>A Mirrored <filename>vinum</filename>
 	    Volume</title>
 
-	  <graphic fileref="vinum/vinum-mirrored-vol"/>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="vinum/vinum-mirrored-vol"/>
+	    </imageobject>
+	  </mediaobject>
 	</figure></para>
 
       <para>In this example, each plex contains the full 512&nbsp;MB
@@ -618,7 +644,7 @@
 	  sd length 128m drive d</programlisting>
 
       <para>As before, it is not necessary to define the drives which
-	are already known to <devicename>vinum</devicename>.  After
+	are already known to <filename>vinum</filename>.  After
 	processing this definition, the configuration looks
 	like:</para>
 
@@ -651,11 +677,15 @@
     S striped.p0.s3         State: up       PO:     1536 kB Size:        128 MB</programlisting>
 
       <para>
-	<figure id="vinum-striped-vol">
-	  <title>A Striped <devicename>vinum</devicename>
+	<figure xml:id="vinum-striped-vol">
+	  <title>A Striped <filename>vinum</filename>
 	    Volume</title>
 
-	  <graphic fileref="vinum/vinum-striped-vol"/>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="vinum/vinum-striped-vol"/>
+	    </imageobject>
+	  </mediaobject>
 	</figure></para>
 
       <para>This volume is represented in <xref
@@ -668,7 +698,7 @@
     <sect2>
       <title>Resilience and Performance</title>
 
-      <para><anchor id="vinum-resilience"/>With sufficient hardware,
+      <para><anchor xml:id="vinum-resilience"/>With sufficient hardware,
 	it is possible to build volumes which show both increased
 	resilience and increased performance compared to standard
 	&unix; partitions.  A typical configuration file might
@@ -697,19 +727,23 @@
 	structure of this volume.</para>
 
       <para>
-	<figure id="vinum-raid10-vol">
-	  <title>A Mirrored, Striped <devicename>vinum</devicename>
+	<figure xml:id="vinum-raid10-vol">
+	  <title>A Mirrored, Striped <filename>vinum</filename>
 	    Volume</title>
 
-	  <graphic fileref="vinum/vinum-raid10-vol"/>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref="vinum/vinum-raid10-vol"/>
+	    </imageobject>
+	  </mediaobject>
 	</figure></para>
     </sect2>
   </sect1>
 
-  <sect1 id="vinum-object-naming">
+  <sect1 xml:id="vinum-object-naming">
     <title>Object Naming</title>
 
-    <para><devicename>vinum</devicename> assigns default names to
+    <para><filename>vinum</filename> assigns default names to
       plexes and subdisks, although they may be overridden.
       Overriding the default names is not recommended as it does not
       bring a significant advantage and it can cause
@@ -721,16 +755,16 @@
       subdisks may be up to 64 characters long, and the names of
       drives may be up to 32 characters long.</para>
 
-    <para><devicename>vinum</devicename> objects are assigned device
+    <para><filename>vinum</filename> objects are assigned device
       nodes in the hierarchy <filename
 	class="directory">/dev/gvinum</filename>.  The configuration
-      shown above would cause <devicename>vinum</devicename> to create
+      shown above would cause <filename>vinum</filename> to create
       the following device nodes:</para>
 
     <itemizedlist>
       <listitem>
 	<para>Device entries for each volume.  These are the main
-	  devices used by <devicename>vinum</devicename>.  The
+	  devices used by <filename>vinum</filename>.  The
 	  configuration above would include the devices
 	  <filename class="devicefile">/dev/gvinum/myvol</filename>,
 	  <filename class="devicefile">/dev/gvinum/mirror</filename>,
@@ -790,7 +824,7 @@
 
     <para>Although it is recommended that plexes and subdisks should
       not be allocated specific names,
-      <devicename>vinum</devicename> drives must be named.  This makes
+      <filename>vinum</filename> drives must be named.  This makes
       it possible to move a drive to a different location and still
       recognize it automatically.  Drive names may be up to 32
       characters long.</para>
@@ -800,20 +834,20 @@
 
       <para>Volumes appear to the system to be identical to disks,
 	with one exception.  Unlike &unix; drives,
-	<devicename>vinum</devicename> does not partition volumes,
+	<filename>vinum</filename> does not partition volumes,
 	which thus do not contain a partition table.  This has
 	required modification to some disk utilities, notably
 	&man.newfs.8;, so that it does not try to interpret the last
-	letter of a <devicename>vinum</devicename> volume name as a
+	letter of a <filename>vinum</filename> volume name as a
 	partition identifier.  For example, a disk drive may have a
 	name like <filename class="devicefile">/dev/ad0a</filename>
 	or <filename class="devicefile">/dev/da2h</filename>.  These
 	names represent the first partition
-	(<devicename>a</devicename>) on the first (0) IDE disk
-	(<devicename>ad</devicename>) and the eighth partition
-	(<devicename>h</devicename>) on the third (2) SCSI disk
-	(<devicename>da</devicename>) respectively.  By contrast, a
-	<devicename>vinum</devicename> volume might be called
+	(<filename>a</filename>) on the first (0) IDE disk
+	(<filename>ad</filename>) and the eighth partition
+	(<filename>h</filename>) on the third (2) SCSI disk
+	(<filename>da</filename>) respectively.  By contrast, a
+	<filename>vinum</filename> volume might be called
 	<filename class="devicefile">/dev/gvinum/concat</filename>,
 	which has no relationship with a partition name.</para>
 
@@ -824,14 +858,14 @@
     </sect2>
   </sect1>
 
-  <sect1 id="vinum-config">
-    <title>Configuring <devicename>vinum</devicename></title>
+  <sect1 xml:id="vinum-config">
+    <title>Configuring <filename>vinum</filename></title>
 
     <para>The <filename>GENERIC</filename> kernel does not contain
-      <devicename>vinum</devicename>.  It is possible to build a
-      custom kernel which includes <devicename>vinum</devicename>, but
+      <filename>vinum</filename>.  It is possible to build a
+      custom kernel which includes <filename>vinum</filename>, but
       this is not recommended.  The standard way to start
-      <devicename>vinum</devicename> is as a kernel module.
+      <filename>vinum</filename> is as a kernel module.
       &man.kldload.8; is not needed because when &man.gvinum.8;
       starts, it checks whether the module has been loaded, and if it
       is not, it loads it automatically.</para>
@@ -840,10 +874,10 @@
     <sect2>
       <title>Startup</title>
 
-      <para><devicename>vinum</devicename> stores configuration
+      <para><filename>vinum</filename> stores configuration
 	information on the disk slices in essentially the same form as
 	in the configuration files.  When reading from the
-	configuration database, <devicename>vinum</devicename>
+	configuration database, <filename>vinum</filename>
 	recognizes a number of keywords which are not allowed in the
 	configuration files.  For example, a disk configuration might
 	contain the following text:</para>
@@ -871,15 +905,15 @@ sd name bigraid.p0.s4 drive e plex bigra
 	<para>The obvious differences here are the presence of
 	  explicit location information and naming, both of which are
 	  allowed but discouraged, and the information on the states.
-	  <devicename>vinum</devicename> does not store information
+	  <filename>vinum</filename> does not store information
 	  about drives in the configuration information.  It finds the
 	  drives by scanning the configured disk drives for partitions
-	  with a <devicename>vinum</devicename> label.  This enables
-	  <devicename>vinum</devicename> to identify drives correctly
+	  with a <filename>vinum</filename> label.  This enables
+	  <filename>vinum</filename> to identify drives correctly
 	  even if they have been assigned different &unix; drive
 	  IDs.</para>
 
-	<sect3 id="vinum-rc-startup">
+	<sect3 xml:id="vinum-rc-startup">
 	  <title>Automatic Startup</title>
 
 	  <para><emphasis>Gvinum</emphasis> always features an
@@ -889,14 +923,14 @@ sd name bigraid.p0.s4 drive e plex bigra
 	    <literal>geom_vinum_load="YES"</literal> to
 	    <filename>/boot/loader.conf</filename>.</para>
 
-	  <para>When <devicename>vinum</devicename> is started with
+	  <para>When <filename>vinum</filename> is started with
 	    <command>gvinum start</command>,
-	    <devicename>vinum</devicename> reads the configuration
-	    database from one of the <devicename>vinum</devicename>
+	    <filename>vinum</filename> reads the configuration
+	    database from one of the <filename>vinum</filename>
 	    drives.  Under normal circumstances, each drive contains
 	    an identical copy of the configuration database, so it
 	    does not matter which drive is read.  After a crash,
-	    however, <devicename>vinum</devicename> must determine
+	    however, <filename>vinum</filename> must determine
 	    which drive was updated most recently and read the
 	    configuration from this drive.  It then updates the
 	    configuration, if necessary, from progressively older
@@ -905,12 +939,12 @@ sd name bigraid.p0.s4 drive e plex bigra
       </sect2>
     </sect1>
 
-    <sect1 id="vinum-root">
-      <title>Using <devicename>vinum</devicename> for the Root
+    <sect1 xml:id="vinum-root">
+      <title>Using <filename>vinum</filename> for the Root
 	File System</title>
 
       <para>For a machine that has fully-mirrored file systems using
-	<devicename>vinum</devicename>, it is desirable to also
+	<filename>vinum</filename>, it is desirable to also
 	mirror the root file system.  Setting up such a configuration
 	is less trivial than mirroring an arbitrary file system
 	because:</para>
@@ -919,7 +953,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 	<listitem>
 	  <para>The root file system must be available very early
 	    during the boot process, so the
-	    <devicename>vinum</devicename> infrastructure must
+	    <filename>vinum</filename> infrastructure must
 	    already be available at this time.</para>
 	</listitem>
 	<listitem>
@@ -927,20 +961,20 @@ sd name bigraid.p0.s4 drive e plex bigra
 	    contains the system bootstrap and the kernel.  These must
 	    be read using the host system's native utilities, such as
 	    the BIOS, which often cannot be taught about the details
-	    of <devicename>vinum</devicename>.</para>
+	    of <filename>vinum</filename>.</para>
 	</listitem>
       </itemizedlist>
 
       <para>In the following sections, the term <quote>root
 	  volume</quote> is generally used to describe the
-	<devicename>vinum</devicename> volume that contains the root
+	<filename>vinum</filename> volume that contains the root
 	file system.</para>
 
       <sect2>
-	<title>Starting up <devicename>vinum</devicename> Early
+	<title>Starting up <filename>vinum</filename> Early
 	  Enough for the Root File System</title>
 
-	<para><devicename>vinum</devicename> must be available early
+	<para><filename>vinum</filename> must be available early
 	  in the system boot as &man.loader.8; must be able to load
 	  the vinum kernel module before starting the kernel.  This
 	  can be accomplished by putting this line in
@@ -951,13 +985,13 @@ sd name bigraid.p0.s4 drive e plex bigra
     </sect2>
 
     <sect2>
-      <title>Making a <devicename>vinum</devicename>-based Root
+      <title>Making a <filename>vinum</filename>-based Root
 	Volume Accessible to the Bootstrap</title>
 
       <para>The current &os; bootstrap is only 7.5 KB of code and
 	does not understand the internal
-	<devicename>vinum</devicename> structures.  This means that it
-	cannot parse the <devicename>vinum</devicename> configuration
+	<filename>vinum</filename> structures.  This means that it
+	cannot parse the <filename>vinum</filename> configuration
 	data or figure out the elements of a boot volume.  Thus, some
 	workarounds are necessary to provide the bootstrap code with
 	the illusion of a standard <literal>a</literal> partition
@@ -989,7 +1023,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 	partitions is located at the same offset within its device,
 	compared with other devices containing plexes of the root
 	volume.  However, it is probably a good idea to create the
-	<devicename>vinum</devicename> volumes that way so the
+	<filename>vinum</filename> volumes that way so the
 	resulting mirrored devices are symmetric, to avoid
 	confusion.</para>
 
@@ -1005,7 +1039,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 
 	  <screen>&prompt.root; <userinput>gvinum l -rv root</userinput></screen>
 
-	  <para><devicename>vinum</devicename> offsets and sizes are
+	  <para><filename>vinum</filename> offsets and sizes are
 	    measured in bytes.  They must be divided by 512 in order
 	    to obtain the block numbers that are to be used by
 	    <command>bsdlabel</command>.</para>
@@ -1018,13 +1052,13 @@ sd name bigraid.p0.s4 drive e plex bigra
 	  <screen>&prompt.root; <userinput>bsdlabel -e <replaceable>devname</replaceable></userinput></screen>
 
 	  <para><replaceable>devname</replaceable> must be either the
-	    name of the disk, like <devicename>da0</devicename> for
+	    name of the disk, like <filename>da0</filename> for
 	    disks without a slice table, or the name of the
-	    slice, like <devicename>ad0s1</devicename>.</para>
+	    slice, like <filename>ad0s1</filename>.</para>
 
 	  <para>If there is already an <literal>a</literal>
 	    partition on the device from a
-	    pre-<devicename>vinum</devicename> root file system, it
+	    pre-<filename>vinum</filename> root file system, it
 	    should be renamed to something else so that it remains
 	    accessible (just in case), but will no longer be used by
 	    default to bootstrap the system.  A currently mounted root
@@ -1034,7 +1068,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 	    disk that is not been currently booted is manipulated
 	    first.</para>
 
-	  <para>The offset of the <devicename>vinum</devicename>
+	  <para>The offset of the <filename>vinum</filename>
 	    partition on this device (if any) must be added to the
 	    offset of the respective root volume subdisk on this
 	    device.  The resulting value will become the
@@ -1051,9 +1085,9 @@ sd name bigraid.p0.s4 drive e plex bigra
 
 	  <para>That way, a new <literal>a</literal> partition will
 	    be established that overlaps the
-	    <devicename>vinum</devicename> partition on this device.
+	    <filename>vinum</filename> partition on this device.
 	    <command>bsdlabel</command> will only allow for this
-	    overlap if the <devicename>vinum</devicename> partition
+	    overlap if the <filename>vinum</filename> partition
 	    has properly been marked using the
 	    <literal>vinum</literal> fstype.</para>
 	</step>
@@ -1070,8 +1104,8 @@ sd name bigraid.p0.s4 drive e plex bigra
 
       <para>It should be remembered that all files containing control
 	information must be relative to the root file system in the
-	<devicename>vinum</devicename> volume which, when setting up
-	a new <devicename>vinum</devicename> root volume, might not
+	<filename>vinum</filename> volume which, when setting up
+	a new <filename>vinum</filename> root volume, might not
 	match the root file system that is currently active.  So in
 	particular, <filename>/etc/fstab</filename> and
 	<filename>/boot/loader.conf</filename> need to be taken care
@@ -1079,7 +1113,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 
       <para>At next reboot, the bootstrap should figure out the
 	appropriate control information from the new
-	<devicename>vinum</devicename>-based root file system, and act
+	<filename>vinum</filename>-based root file system, and act
 	accordingly.  At the end of the kernel initialization process,
 	after all devices have been announced, the prominent notice
 	that shows the success of this setup is a message like:</para>
@@ -1088,10 +1122,10 @@ sd name bigraid.p0.s4 drive e plex bigra
     </sect2>
 
     <sect2>
-      <title>Example of a <devicename>vinum</devicename>-based Root
+      <title>Example of a <filename>vinum</filename>-based Root
 	Setup</title>
 
-      <para>After the <devicename>vinum</devicename> root volume has
+      <para>After the <filename>vinum</filename> root volume has
 	been set up, the output of <command>gvinum l -rv
 	  root</command> could look like:</para>
 
@@ -1131,18 +1165,18 @@ Subdisk root.p1.s0:
 	parameter for the faked <literal>a</literal> partition
 	matches the value outlined above, while the
 	<literal>offset</literal> parameter is the sum of the offset
-	within the <devicename>vinum</devicename> partition
+	within the <filename>vinum</filename> partition
 	<literal>h</literal>, and the offset of this partition
 	within the device or slice.  This is a typical setup that is
 	necessary to avoid the problem described in <xref
 	  linkend="vinum-root-panic"/>.  The entire
 	<literal>a</literal> partition is completely within the
 	<literal>h</literal> partition containing all the
-	<devicename>vinum</devicename> data for this device.</para>
+	<filename>vinum</filename> data for this device.</para>
 
       <para>In the above example, the entire device is dedicated to
-	<devicename>vinum</devicename> and there is no leftover
-	pre-<devicename>vinum</devicename> root partition.</para>
+	<filename>vinum</filename> and there is no leftover
+	pre-<filename>vinum</filename> root partition.</para>
     </sect2>
 
     <sect2>
@@ -1163,7 +1197,7 @@ Subdisk root.p1.s0:
 	  using <command>set</command> or
 	  <command>unset</command>.</para>
 
-	<para>If the <devicename>vinum</devicename> kernel module was
+	<para>If the <filename>vinum</filename> kernel module was
 	  not yet in the list of modules to load automatically, type
 	  <command>load geom_vinum</command>.</para>
 
@@ -1185,15 +1219,15 @@ Subdisk root.p1.s0:
 	  alternate choice would be something like
 	  <literal>ufs:da0d</literal> which could be a
 	  hypothetical partition containing the
-	  pre-<devicename>vinum</devicename> root file system.  Care
+	  pre-<filename>vinum</filename> root file system.  Care
 	  should be taken if one of the alias
 	  <literal>a</literal> partitions is entered here, that it
 	  actually references the subdisks of the
-	  <devicename>vinum</devicename> root device, because in a
+	  <filename>vinum</filename> root device, because in a
 	  mirrored setup, this would only mount one piece of a
 	  mirrored root device.  If this file system is to be mounted
 	  read-write later on, it is necessary to remove the other
-	  plex(es) of the <devicename>vinum</devicename> root volume
+	  plex(es) of the <filename>vinum</filename> root volume
 	  since these plexes would otherwise carry inconsistent
 	  data.</para>
       </sect3>
@@ -1207,45 +1241,45 @@ Subdisk root.p1.s0:
 	  process starts), an attempt can be made to interrupt the
 	  primary bootstrap by pressing
 	  <keycap>space</keycap>.  This will make the bootstrap stop
-	  in <link linkend="boot-boot1">stage two</link>.  An attempt
+	  in <link xlink:href="&url.books.handbook;/boot.html#boot-boot1">stage two</link>.  An attempt
 	  can be made here to boot off an alternate partition, like
 	  the partition containing the previous root file system that
 	  has been moved away from <literal>a</literal>.</para>
       </sect3>
 
-      <sect3 id="vinum-root-panic">
+      <sect3 xml:id="vinum-root-panic">
 	<title>Nothing Boots, the Bootstrap
 	  Panics</title>
 
 	<para>This situation will happen if the bootstrap had been
-	  destroyed by the <devicename>vinum</devicename>
-	  installation.  Unfortunately, <devicename>vinum</devicename>
+	  destroyed by the <filename>vinum</filename>
+	  installation.  Unfortunately, <filename>vinum</filename>
 	  accidentally leaves only 4 KB at the beginning of its
 	  partition free before starting to write its
-	  <devicename>vinum</devicename> header information.  However,
+	  <filename>vinum</filename> header information.  However,
 	  the stage one and two bootstraps plus the bsdlabel require 8
-	  KB.  So if a <devicename>vinum</devicename> partition was
+	  KB.  So if a <filename>vinum</filename> partition was
 	  started at offset 0 within a slice or disk that was meant to
-	  be bootable, the <devicename>vinum</devicename> setup will
+	  be bootable, the <filename>vinum</filename> setup will
 	  trash the bootstrap.</para>
 
 	<para>Similarly, if the above situation has been recovered,
 	  by booting from a <quote>Fixit</quote> media, and the
 	  bootstrap has been re-installed using
-	  <command>bsdlabel -B</command> as described in <xref
-	    linkend="boot-boot1"/>, the bootstrap will trash the
-	  <devicename>vinum</devicename> header, and
-	  <devicename>vinum</devicename> will no longer find its
-	  disk(s).  Though no actual <devicename>vinum</devicename>
-	  configuration data or data in <devicename>vinum</devicename>
+	  <command>bsdlabel -B</command> as described in <link
+	    xlink:href="&url.books.handbook;/boot.html#boot-boot1"/>, the bootstrap will trash the
+	  <filename>vinum</filename> header, and
+	  <filename>vinum</filename> will no longer find its
+	  disk(s).  Though no actual <filename>vinum</filename>
+	  configuration data or data in <filename>vinum</filename>
 	  volumes will be trashed, and it would be possible to recover
 	  all the data by entering exactly the same
-	  <devicename>vinum</devicename> configuration data again, the
+	  <filename>vinum</filename> configuration data again, the
 	  situation is hard to fix.  It is necessary to move the
-	  entire <devicename>vinum</devicename> partition by at least
-	  4 KB, in order to have the <devicename>vinum</devicename>
+	  entire <filename>vinum</filename> partition by at least
+	  4 KB, in order to have the <filename>vinum</filename>
 	  header and the system bootstrap no longer collide.</para>
       </sect3>
     </sect2>
   </sect1>
-</chapter>
+</article>

From owner-svn-doc-head@FreeBSD.ORG  Wed Feb 25 23:42:06 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A3E7CEF;
 Wed, 25 Feb 2015 23:42:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A8ADDC9;
 Wed, 25 Feb 2015 23:42:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PNg6C6005914;
 Wed, 25 Feb 2015 23:42:06 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PNg6L4005913;
 Wed, 25 Feb 2015 23:42:06 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201502252342.t1PNg6L4005913@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 25 Feb 2015 23:42:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46295 - head/en_US.ISO8859-1/articles/vinum
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.18-1
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, 25 Feb 2015 23:42:06 -0000

Author: wblock
Date: Wed Feb 25 23:42:05 2015
New Revision: 46295
URL: https://svnweb.freebsd.org/changeset/doc/46295

Log:
  Fix paths to images.

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

Modified: head/en_US.ISO8859-1/articles/vinum/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/vinum/article.xml	Wed Feb 25 19:22:04 2015	(r46294)
+++ head/en_US.ISO8859-1/articles/vinum/article.xml	Wed Feb 25 23:42:05 2015	(r46295)
@@ -158,7 +158,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="vinum/vinum-concat"/>
+	    <imagedata fileref="vinum-concat"/>
 	  </imageobject>
 	</mediaobject>
       </figure></para>
@@ -199,7 +199,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="vinum/vinum-striped"/>
+	    <imagedata fileref="vinum-striped"/>
 	  </imageobject>
 	</mediaobject>
       </figure></para>
@@ -270,7 +270,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="vinum/vinum-raid5-org"/>
+	    <imagedata fileref="vinum-raid5-org"/>
 	  </imageobject>
 	</mediaobject>
       </figure></para>
@@ -540,7 +540,7 @@
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="vinum/vinum-simple-vol"/>
+	      <imagedata fileref="vinum-simple-vol"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure></para>
@@ -611,7 +611,7 @@
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="vinum/vinum-mirrored-vol"/>
+	      <imagedata fileref="vinum-mirrored-vol"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure></para>
@@ -683,7 +683,7 @@
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="vinum/vinum-striped-vol"/>
+	      <imagedata fileref="vinum-striped-vol"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure></para>
@@ -733,7 +733,7 @@
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="vinum/vinum-raid10-vol"/>
+	      <imagedata fileref="vinum-raid10-vol"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure></para>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 26 10:48:43 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6A0B7786;
 Thu, 26 Feb 2015 10:48:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B346F59;
 Thu, 26 Feb 2015 10:48:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QAmhET017960;
 Thu, 26 Feb 2015 10:48:43 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QAmh61017958;
 Thu, 26 Feb 2015 10:48:43 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201502261048.t1QAmh61017958@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 26 Feb 2015 10:48:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46296 - head/ja_JP.eucJP/htdocs/releases
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.18-1
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, 26 Feb 2015 10:48:43 -0000

Author: ryusuke
Date: Thu Feb 26 10:48:42 2015
New Revision: 46296
URL: https://svnweb.freebsd.org/changeset/doc/46296

Log:
  - Merge the following from the English version:
  
  	r45988 -> r46283	head/ja_JP.eucJP/htdocs/releases/index.xml

Modified:
  head/ja_JP.eucJP/htdocs/releases/index.xml

Modified: head/ja_JP.eucJP/htdocs/releases/index.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/releases/index.xml	Wed Feb 25 23:42:05 2015	(r46295)
+++ head/ja_JP.eucJP/htdocs/releases/index.xml	Thu Feb 26 10:48:42 2015	(r46296)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r45988 -->
+<!-- Original revision: r46283 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -102,7 +102,18 @@
 	  <a href="&enbase;/releases/10.0R/errata.html">Errata (Àµ¸íɽ)</a>
 	</em>
       </li>
+  </ul>
+
+  <a name="prior-unsupported"></a>
+  <h2>¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</h2>
 
+    <p>¤³¤ì¤Þ¤Ç¤Î¥ê¥ê¡¼¥¹¤Î¥ê¥ê¡¼¥¹Æü¡¢Ê¬Îà¡¢Êݼ齪λÆü (End-Of-Life (EOL))
+      ¤Î´°Á´¤Ê¾ðÊó¤Ï¡¢<a href="&base;/security/security.html">FreeBSD
+      ¥»¥­¥å¥ê¥Æ¥£¾ðÊó</a> ¤Î
+      <a href="&base;/security/unsupported.html">¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</a>
+      ¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+
+    <ul>
       <li><b>9.2</b> (2013 ǯ 9 ·î)
 	<em>
 	  <a href="9.2R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>:
@@ -124,28 +135,6 @@
 	  <a href="&enbase;/releases/9.1R/errata.html">Errata (Àµ¸íɽ)</a>
 	</em>
       </li>
-  </ul>
-
-  <a name="prior-unsupported"></a>
-  <h2>¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</h2>
-
-    <p>¤³¤ì¤Þ¤Ç¤Î¥ê¥ê¡¼¥¹¤Î¥ê¥ê¡¼¥¹Æü¡¢Ê¬Îà¡¢Êݼ齪λÆü (End-Of-Life (EOL))
-      ¤Î´°Á´¤Ê¾ðÊó¤Ï¡¢<a href="&base;/security/security.html">FreeBSD
-      ¥»¥­¥å¥ê¥Æ¥£¾ðÊó</a> ¤Î
-      <a href="&base;/security/unsupported.html">¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</a>
-      ¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <ul>
-      <li><b>8.3</b> (2012 ǯ 4 ·î)
-	<em>
-	  <a href="8.3R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>:
-	  <a href="&enbase;/releases/8.3R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>:
-	  <a href="&enbase;/releases/8.3R/installation.html">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a>:
-	  <a href="&enbase;/releases/8.3R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>
-	  <a href="&enbase;/releases/8.3R/readme.html">README</a>:
-	  <a href="&enbase;/releases/8.3R/errata.html">Errata (Àµ¸íɽ)</a>
-	</em>
-      </li>
 
       <li><b>9.0</b> (2012 ǯ 1 ·î)
 	<em>
@@ -157,6 +146,17 @@
 	  <a href="&enbase;/releases/9.0R/errata.html">Errata (Àµ¸íɽ)</a>
 	</em>
       </li>
+      
+      <li><b>8.3</b> (2012 ǯ 4 ·î)
+	<em>
+	  <a href="8.3R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>:
+	  <a href="&enbase;/releases/8.3R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>:
+	  <a href="&enbase;/releases/8.3R/installation.html">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a>:
+	  <a href="&enbase;/releases/8.3R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>
+	  <a href="&enbase;/releases/8.3R/readme.html">README</a>:
+	  <a href="&enbase;/releases/8.3R/errata.html">Errata (Àµ¸íɽ)</a>
+	</em>
+      </li>
 
       <li><b>8.2</b> (2011 ǯ 2 ·î)
 	<em>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 26 21:56:53 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3AEC7C8;
 Thu, 26 Feb 2015 21:56:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 23CBAD3A;
 Thu, 26 Feb 2015 21:56:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QLurtq041647;
 Thu, 26 Feb 2015 21:56:53 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QLuqTH041643;
 Thu, 26 Feb 2015 21:56:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502262156.t1QLuqTH041643@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 26 Feb 2015 21:56:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46297 - head/en_US.ISO8859-1/htdocs/releases/10.2R
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.18-1
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, 26 Feb 2015 21:56:53 -0000

Author: gjb
Date: Thu Feb 26 21:56:51 2015
New Revision: 46297
URL: https://svnweb.freebsd.org/changeset/doc/46297

Log:
  Add the initial schedule for FreeBSD 10.2-RELEASE.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
  head/en_US.ISO8859-1/htdocs/releases/10.2R/
  head/en_US.ISO8859-1/htdocs/releases/10.2R/Makefile   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/10.2R/docbook.css   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/10.2R/schedule.xml   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/10.2R/todo.xml   (contents, props changed)

Added: head/en_US.ISO8859-1/htdocs/releases/10.2R/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/10.2R/Makefile	Thu Feb 26 21:56:51 2015	(r46297)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DOCS=	schedule.xml \
+	todo.xml
+
+DATA=	docbook.css
+
+.include "${DOC_PREFIX}/share/mk/web.site.mk"

Added: head/en_US.ISO8859-1/htdocs/releases/10.2R/docbook.css
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/10.2R/docbook.css	Thu Feb 26 21:56:51 2015	(r46297)
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2001, 2003, 2010 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+a:link {
+	color:#0645AD;
+	text-decoration: underline;
+}
+
+a:visited, a:hover, a:active {
+	color:#663366;
+	text-decoration: underline;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
+}
+
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
+body address {
+	line-height: 1.3;
+	margin: .6em 0;
+}
+
+html body {
+	margin: 1em 8% 1em 10%;
+	line-height: 1.2;
+}
+
+@media screen {
+	html body { font-family: sans-serif; }
+}
+
+@media print {
+	html body { font-family: serif; }
+}
+
+.legalnotice {
+	font-size: small;
+	font-variant: small-caps;
+}
+
+body div {
+	margin: 0;
+}
+
+dl {
+	margin: .4em 0 0 0;
+	line-height: 1.2;
+}
+
+dt {
+	font-weight: bold;
+	margin: 0.4em 0 0 0;
+}
+
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-size: 115%;
+}
+
+div.calloutlist dt {
+	float: left;
+	width: 1em;}
+
+div.calloutlist dd {
+	clear: right;
+	margin-bottom: 1ex;
+}
+
+body .calloutlist td {
+	padding-right: 0.5em;
+	width: auto;
+}
+
+body .calloutlist td p {
+	line-height: 1.2;
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+body form {
+	margin: .6em 0;
+}
+
+div.example p b,
+.question,
+div.table p b,
+div.procedure p b {
+	color: #990000;
+}
+
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
+	line-height: 1.3;
+	margin-top: 1em;
+	margin-left: 0;
+	color: #990000;
+}
+
+h1.title, h2.title {
+	margin: .8em 0 0 -4%;
+}
+
+h3.title, h4.title {
+	margin: .8em 0 0 -3%;
+}
+
+h5.title {
+	margin: .8em 0 0 -2%;
+}
+
+h6.title {
+	margin: .8em 0 0 -1%;
+}
+
+body hr {
+	margin: .6em;
+	border-width: 0 0 1px 0;
+	border-style: solid;
+	border-color: #cecece;
+}
+
+body img.navheader {
+	margin: 0 0 0 -4%;
+}
+
+ol {
+	margin: 0 0 0 1em;
+	line-height: 1.2;
+}
+
+body pre {
+	margin: .75em 0;
+	font-family: monospace;
+}
+
+body td, body th {
+	line-height: 1.2;
+	padding-right: 1.5em;
+}
+
+ul, body dir, body menu {
+	margin: 0 0 0 1em;
+	line-height: 1.2;
+}
+
+html {
+	margin: 0;
+	padding: 0;
+}
+
+.filename {
+	color: #007a00;
+}
+
+.package, .port {
+  color: #007a00;
+  font-family: monospace;
+  font-style: italic;
+}
+
+.svnref {
+	color: #007a00;
+}
+
+.guimenu, .guimenuitem, .guisubmenu,
+.guilabel, .interface,
+.shortcut, .shortcut .keycap {
+	font-weight: bold;
+}
+
+.guibutton {
+	background-color: #CFCFCF;
+	padding: 2px;
+}
+
+.accel {
+	background-color: #F0F0F0;
+	text-decoration: underline;
+}
+
+pre.screen {
+	white-space: pre;
+	overflow: auto;
+	font-family: monospace;
+	padding: 1ex;
+	background-color: #edc;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+}
+
+pre.programlisting {
+	white-space: pre;
+	overflow: auto;
+	font-family: monospace;
+	padding: 1ex;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+}
+
+@media screen {  /* hide from IE3 */
+	a[href]:hover { background: #ffa }
+}
+
+.informaltable, .table th {
+	padding-left: 0.2em;
+	text-align: left;
+}
+
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
+	border-radius: 4px;
+	padding: 2ex 2ex 0 2ex;
+	margin: .75em 3em .75em 1em;
+        line-height: 1.3;
+}
+
+.note, div.procedure {
+	color: #222;
+	background: #eee;
+	border: 1px solid #ccc;
+	width: 90%;
+}
+
+.tip {
+	color: #004F00;
+	background: #d8ecd6;
+	border: 1px solid green;
+	width: 90%;
+}
+
+.important {
+	font-style:italic;
+	border: 1px solid #a00;
+	border-left: 12px solid #c00;
+	width: 90%;
+}
+
+.warning {
+	color: #9F1313;
+	background: #f8e8e8;
+	border: 1px solid #e59595;
+	width: 90%;
+}
+
+.caution {
+	color: #3E3535;
+	background: #FFC;
+	border: 1px solid #e59595;
+	width: 90%;
+}
+
+.example {
+	background: #fefde6;
+	border: 1px solid #f1bb16;
+	width: 90%;
+}
+
+.admontitle {
+	display: inline;
+	line-height: 1;
+	margin-right: 0;
+}
+
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, {
+	display: inline;
+}
+
+.informaltable table.calstable tr td {
+        padding-left: 1em;
+        padding-right: 1em;
+}
+
+.authorgroup {
+	font-style: italic;
+}
+
+.userinput,
+.userinput code {
+	font-weight: bold;
+}
+
+pre.screen strong {
+	font-weight: normal;
+}
+
+.procedure ol {
+	line-height: 1.2;
+	margin: 0 0 0 -1em;
+}
+
+span.contrib {
+	font-size: small;
+	font-style: italic;
+}

Added: head/en_US.ISO8859-1/htdocs/releases/10.2R/schedule.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/10.2R/schedule.xml	Thu Feb 26 21:56:51 2015	(r46297)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY local.rel "10.2">
+<!ENTITY local.branch.stable "stable/10">
+<!ENTITY local.branch.releng "releng/10.2">
+<!ENTITY title "FreeBSD &local.rel; Release Process">
+<!ENTITY % beta.local.where "IGNORE">
+<!ENTITY % beta2.local.where "IGNORE">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.download">
+
+  <h1>Introduction</h1>
+
+  <p>This is the release schedule for &os;&nbsp;&local.rel;.  For more
+    information about the release engineering process, please see the
+    <a href="&base;/releng/index.html">Release Engineering</a> section
+    of the web site.</p>
+
+  <p>General discussions about the pending release and known issues
+    should be sent to the public <a
+      href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a>
+    mailing list.  <a
+      href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
+    requests should be sent to <a
+      href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
+
+  &beta.local.where;
+  &beta2.local.where;
+
+  <h1>Schedule</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Action</td>
+      <td>Expected</td>
+      <td>Actual</td>
+      <td>Description</td>
+    </tr>
+
+    <tr>
+      <td>Initial release schedule announcement</td>
+      <td>-</td>
+      <td>26&nbsp;February&nbsp;2015</td>
+      <td>Release Engineers send announcement email to developers with
+	a rough schedule.</td>
+    </tr>
+
+    <tr>
+      <td>Release schedule reminder</td>
+      <td>1&nbsp;July&nbsp;2015</td>
+      <td>-</td>
+      <td>Release Engineers send reminder announcement e-mail to
+	developers with updated schedule.</td>
+    </tr>
+
+    <tr>
+      <td>Code slush begins</td>
+      <td>28&nbsp;August&nbsp;2015</td>
+      <td>-</td>
+      <td>Release Engineers announce that all further commits to the
+	&local.branch.stable; branch will not require explicit
+	approval, however new features should be avoided.</td>
+    </tr>
+
+    <tr>
+      <td>Code freeze begins</td>
+      <td>11&nbsp;September&nbsp;2015</td>
+      <td>-</td>
+      <td>Release Engineers announce that all further commits to the
+	&local.branch.stable; branch will require explicit approval.
+	Certain blanket approvals will be granted for narrow areas of
+	development, documentation improvements, etc.</td>
+    </tr>
+
+    <tr>
+      <td>BETA1 builds begin</td>
+      <td>18&nbsp;September&nbsp;2015</td>
+      <td>-</td>
+      <td>First beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>BETA2 builds begin</td>
+      <td>25&nbsp;September&nbsp;2015</td>
+      <td>-</td>
+      <td>Second beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>BETA3 builds begin&nbsp;*</td>
+      <td>2&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>Third beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.releng; branch</td>
+      <td>9&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>Subversion branch created; future release engineering
+	proceeds on this branch.</td>
+    </tr>
+
+    <tr>
+      <td>RC1 builds begin</td>
+      <td>9&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>First release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.stable;&nbsp;thaw</td>
+      <td>10&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>The code freeze on the &local.branch.stable; branch
+	is lifted.</td>
+    </tr>
+
+    <tr>
+      <td>RC2 builds begin</td>
+      <td>16&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>Second release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>RC3 builds begin&nbsp;*</td>
+      <td>23&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>Third release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>RELEASE builds begin</td>
+      <td>30&nbsp;October&nbsp;2015</td>
+      <td>-</td>
+      <td>&local.rel;-RELEASE builds begin.</td>
+    </tr>
+
+    <tr>
+      <td>RELEASE announcement</td>
+      <td>9&nbsp;November&nbsp;2015</td>
+      <td>-</td>
+      <td>&local.rel;-RELEASE press release.</td>
+    </tr>
+
+    <tr>
+      <td>Turn over to the secteam</td>
+      <td>-</td>
+      <td>-</td>
+      <td>&local.branch.releng; branch is handed over to the
+	&os;&nbsp; Security Officer Team in one or two weeks after the
+	announcement.</td>
+    </tr>
+  </table>
+
+  <p>&quot;*&quot; indicates &quot;as-needed&quot; items.</p>
+
+  <h1>Status / TODO</h1>
+  <a href="&base;/releases/&local.rel;R/todo.html">&os; Release
+    Engineering TODO Page</a>
+
+  <h1>Additional Information</h1>
+
+  <ul>
+    <li><a href="&base;/releng/index.html">&os;&nbsp;Release
+	Engineering website</a></li>
+  </ul>
+
+
+  </body>
+</html>

Added: head/en_US.ISO8859-1/htdocs/releases/10.2R/todo.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/10.2R/todo.xml	Thu Feb 26 21:56:51 2015	(r46297)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY local.rel "10.2">
+<!ENTITY local.branch.stable "stable/10">
+<!ENTITY local.branch.releng "releng/10.2">
+<!ENTITY title "FreeBSD &local.rel; Release TODO Items">
+]>
+
+<!--
+     ***************************************************************
+
+     Commits to this file without re@ approval will be reverted.
+
+     ***************************************************************
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.download">
+
+  <h1>Introduction</h1>
+
+    <p>Please <strong>do not</strong> edit this file unless you are
+     on the Release Engineering Team, or a member of the Release
+     Engineering Team gave you explicit permission to do so.</p>
+
+    <p>This is the release cycle <em>TODO</em> page, outlining
+     items that are in-progress, issues that must be fixed (release
+     blockers), issues that need to be fixed but are not blockers,
+     and issues that should be fixed as an Errata Notice after the
+     release.</p>
+
+  <h1>Works in Progress</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Pre-Freeze Issues</td>
+      <td>Description</td>
+      <td>Workaround</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Release Blockers</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+      <td>Target Date</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Release Issues</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+      <td>Target Date</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Post-Release Errata Items</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Additional Information</h1>
+
+    <ul>
+      <li><a href="&base;/releng/index.html">&os;&nbsp;Release
+	  Engineering website</a></li>
+    </ul>
+  </body>
+</html>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 26 21:57:16 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 170AC125;
 Thu, 26 Feb 2015 21:57:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3CF6D3C;
 Thu, 26 Feb 2015 21:57:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QLvFJR041749;
 Thu, 26 Feb 2015 21:57:15 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QLvFqL041745;
 Thu, 26 Feb 2015 21:57:15 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502262157.t1QLvFqL041745@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 26 Feb 2015 21:57:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46298 - head/en_US.ISO8859-1/htdocs/releases/11.0R
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.18-1
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, 26 Feb 2015 21:57:16 -0000

Author: gjb
Date: Thu Feb 26 21:57:14 2015
New Revision: 46298
URL: https://svnweb.freebsd.org/changeset/doc/46298

Log:
  Add the initial schedule for FreeBSD 11.0-RELEASE.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
  head/en_US.ISO8859-1/htdocs/releases/11.0R/
  head/en_US.ISO8859-1/htdocs/releases/11.0R/Makefile   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/11.0R/docbook.css   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/11.0R/schedule.xml   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/releases/11.0R/todo.xml   (contents, props changed)

Added: head/en_US.ISO8859-1/htdocs/releases/11.0R/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/11.0R/Makefile	Thu Feb 26 21:57:14 2015	(r46298)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DOCS=	schedule.xml \
+	todo.xml
+
+DATA=	docbook.css
+
+.include "${DOC_PREFIX}/share/mk/web.site.mk"

Added: head/en_US.ISO8859-1/htdocs/releases/11.0R/docbook.css
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/11.0R/docbook.css	Thu Feb 26 21:57:14 2015	(r46298)
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2001, 2003, 2010 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+a:link {
+	color:#0645AD;
+	text-decoration: underline;
+}
+
+a:visited, a:hover, a:active {
+	color:#663366;
+	text-decoration: underline;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
+}
+
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
+body address {
+	line-height: 1.3;
+	margin: .6em 0;
+}
+
+html body {
+	margin: 1em 8% 1em 10%;
+	line-height: 1.2;
+}
+
+@media screen {
+	html body { font-family: sans-serif; }
+}
+
+@media print {
+	html body { font-family: serif; }
+}
+
+.legalnotice {
+	font-size: small;
+	font-variant: small-caps;
+}
+
+body div {
+	margin: 0;
+}
+
+dl {
+	margin: .4em 0 0 0;
+	line-height: 1.2;
+}
+
+dt {
+	font-weight: bold;
+	margin: 0.4em 0 0 0;
+}
+
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-size: 115%;
+}
+
+div.calloutlist dt {
+	float: left;
+	width: 1em;}
+
+div.calloutlist dd {
+	clear: right;
+	margin-bottom: 1ex;
+}
+
+body .calloutlist td {
+	padding-right: 0.5em;
+	width: auto;
+}
+
+body .calloutlist td p {
+	line-height: 1.2;
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+body form {
+	margin: .6em 0;
+}
+
+div.example p b,
+.question,
+div.table p b,
+div.procedure p b {
+	color: #990000;
+}
+
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
+	line-height: 1.3;
+	margin-top: 1em;
+	margin-left: 0;
+	color: #990000;
+}
+
+h1.title, h2.title {
+	margin: .8em 0 0 -4%;
+}
+
+h3.title, h4.title {
+	margin: .8em 0 0 -3%;
+}
+
+h5.title {
+	margin: .8em 0 0 -2%;
+}
+
+h6.title {
+	margin: .8em 0 0 -1%;
+}
+
+body hr {
+	margin: .6em;
+	border-width: 0 0 1px 0;
+	border-style: solid;
+	border-color: #cecece;
+}
+
+body img.navheader {
+	margin: 0 0 0 -4%;
+}
+
+ol {
+	margin: 0 0 0 1em;
+	line-height: 1.2;
+}
+
+body pre {
+	margin: .75em 0;
+	font-family: monospace;
+}
+
+body td, body th {
+	line-height: 1.2;
+	padding-right: 1.5em;
+}
+
+ul, body dir, body menu {
+	margin: 0 0 0 1em;
+	line-height: 1.2;
+}
+
+html {
+	margin: 0;
+	padding: 0;
+}
+
+.filename {
+	color: #007a00;
+}
+
+.package, .port {
+  color: #007a00;
+  font-family: monospace;
+  font-style: italic;
+}
+
+.svnref {
+	color: #007a00;
+}
+
+.guimenu, .guimenuitem, .guisubmenu,
+.guilabel, .interface,
+.shortcut, .shortcut .keycap {
+	font-weight: bold;
+}
+
+.guibutton {
+	background-color: #CFCFCF;
+	padding: 2px;
+}
+
+.accel {
+	background-color: #F0F0F0;
+	text-decoration: underline;
+}
+
+pre.screen {
+	white-space: pre;
+	overflow: auto;
+	font-family: monospace;
+	padding: 1ex;
+	background-color: #edc;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+}
+
+pre.programlisting {
+	white-space: pre;
+	overflow: auto;
+	font-family: monospace;
+	padding: 1ex;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+}
+
+@media screen {  /* hide from IE3 */
+	a[href]:hover { background: #ffa }
+}
+
+.informaltable, .table th {
+	padding-left: 0.2em;
+	text-align: left;
+}
+
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
+	border-radius: 4px;
+	padding: 2ex 2ex 0 2ex;
+	margin: .75em 3em .75em 1em;
+        line-height: 1.3;
+}
+
+.note, div.procedure {
+	color: #222;
+	background: #eee;
+	border: 1px solid #ccc;
+	width: 90%;
+}
+
+.tip {
+	color: #004F00;
+	background: #d8ecd6;
+	border: 1px solid green;
+	width: 90%;
+}
+
+.important {
+	font-style:italic;
+	border: 1px solid #a00;
+	border-left: 12px solid #c00;
+	width: 90%;
+}
+
+.warning {
+	color: #9F1313;
+	background: #f8e8e8;
+	border: 1px solid #e59595;
+	width: 90%;
+}
+
+.caution {
+	color: #3E3535;
+	background: #FFC;
+	border: 1px solid #e59595;
+	width: 90%;
+}
+
+.example {
+	background: #fefde6;
+	border: 1px solid #f1bb16;
+	width: 90%;
+}
+
+.admontitle {
+	display: inline;
+	line-height: 1;
+	margin-right: 0;
+}
+
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, {
+	display: inline;
+}
+
+.informaltable table.calstable tr td {
+        padding-left: 1em;
+        padding-right: 1em;
+}
+
+.authorgroup {
+	font-style: italic;
+}
+
+.userinput,
+.userinput code {
+	font-weight: bold;
+}
+
+pre.screen strong {
+	font-weight: normal;
+}
+
+.procedure ol {
+	line-height: 1.2;
+	margin: 0 0 0 -1em;
+}
+
+span.contrib {
+	font-size: small;
+	font-style: italic;
+}

Added: head/en_US.ISO8859-1/htdocs/releases/11.0R/schedule.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/11.0R/schedule.xml	Thu Feb 26 21:57:14 2015	(r46298)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY local.rel "11.0">
+<!ENTITY local.branch.head "head">
+<!ENTITY local.branch.stable "stable/11">
+<!ENTITY local.branch.releng "releng/11.0">
+<!ENTITY title "FreeBSD &local.rel; Release Process">
+<!ENTITY % beta.local.where "IGNORE">
+<!ENTITY % beta2.local.where "IGNORE">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.download">
+
+  <h1>Introduction</h1>
+
+  <p>This is the release schedule for &os;&nbsp;&local.rel;.  For more
+    information about the release engineering process, please see the <a
+    href="&base;/releng/index.html">Release Engineering</a> section of the
+    web site.</p>
+
+  <p>General discussions about the pending release and known issues should be
+    sent to the public
+    <a href="mailto:FreeBSD-current@FreeBSD.org">freebsd-current</a> mailing list.
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
+    requests should be sent to
+    <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
+
+  &beta.local.where;
+  &beta2.local.where;
+
+  <h1>Schedule</h1>
+
+  <p>During the &local.branch.head; freeze, the Release Engineering
+    Team may create ALPHA snapshots to publish for testing purposes.
+    As the frequency and total number of the ALPHA snapshots will
+    depend on the length of time the &local.branch.head; branch is
+    frozen, no official schedule is provided.</p>
+
+  <p>Announcements regarding the availability of the
+    ALPHA snapshots will be sent to the <a
+      href="mailto:freebsd-current@FreeBSD.org">freebsd-current</a>
+    and <a
+      href="mailto:freebsd-snapshots@FreeBSD.org">freebsd-snapshots</a>
+    mailing lists.</p>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Action</td>
+      <td>Expected</td>
+      <td>Actual</td>
+      <td>Description</td>
+    </tr>
+
+    <tr>
+      <td>Initial release schedule announcement</td>
+      <td>-</td>
+      <td>26&nbsp;February&nbsp;2015</td>
+      <td>Release Engineers send announcement email to developers with
+	a rough schedule.</td>
+    </tr>
+
+    <tr>
+      <td>Release schedule reminder</td>
+      <td>25&nbsp;March&nbsp;2016</td>
+      <td>-</td>
+      <td>Release Engineers send reminder announcement e-mail to
+	developers with updated schedule.</td>
+    </tr>
+
+    <tr>
+      <td>Code slush begins</td>
+      <td>22&nbsp;April&nbsp;2016</td>
+      <td>-</td>
+      <td>Release Engineers announce that all further commits to the
+	&local.branch.head; branch will not require explicit
+	approval, however new features should be avoided.</td>
+    </tr>
+
+    <tr>
+      <td>Code freeze begins</td>
+      <td>29&nbsp;April&nbsp;2016</td>
+      <td>-</td>
+      <td>Release Engineers announce that all further commits to the
+	&local.branch.head; branch will require explicit approval.
+	Certain blanket approvals will be granted for narrow areas of
+	development, documentation improvements, etc.</td>
+    </tr>
+
+    <tr>
+      <td>KBI freeze begins</td>
+      <td>13&nbsp;May&nbsp;2016</td>
+      <td>-</td>
+      <td>Release Engineers announce that all further commits to the
+	&local.branch.head; branch will require explicit approval.
+	Additionally, there can be no changes to the KBI until
+	&local.branch.head; is branched to &local.branch.stable;.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.stable; branch</td>
+      <td>10&nbsp;June&nbsp;2016</td>
+      <td>-</td>
+      <td>Subversion branch created; release engineering continues
+	on this branch.</td>
+    </tr>
+
+    <tr>
+      <td>BETA1 builds begin</td>
+      <td>10&nbsp;June&nbsp;2016</td>
+      <td>-</td>
+      <td>First beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.head;&nbsp;thaw</td>
+      <td>11&nbsp;June&nbsp;2016</td>
+      <td>-</td>
+      <td>The code freeze on the &local.branch.head; branch
+	is lifted.</td>
+    </tr>
+
+    <tr>
+      <td>BETA2 builds begin</td>
+      <td>17&nbsp;June&nbsp;2016</td>
+      <td>-</td>
+      <td>Second beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>BETA3 builds begin&nbsp;*</td>
+      <td>24&nbsp;June&nbsp;2016</td>
+      <td>-</td>
+      <td>Third beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.releng; branch</td>
+      <td>1&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>Subversion branch created; future release engineering
+	proceeds on this branch.</td>
+    </tr>
+
+    <tr>
+      <td>RC1 builds begin</td>
+      <td>1&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>First release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.stable;&nbsp;thaw</td>
+      <td>2&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>The code freeze on the &local.branch.stable; branch
+	is lifted.</td>
+    </tr>
+
+    <tr>
+      <td>RC2 builds begin</td>
+      <td>8&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>Second release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>RC3 builds begin&nbsp;*</td>
+      <td>15&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>Third release candidate.</td>
+    </tr>
+
+    <tr>
+      <td>RELEASE builds begin</td>
+      <td>22&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>&local.rel;-RELEASE builds begin.</td>
+    </tr>
+
+    <tr>
+      <td>RELEASE announcement</td>
+      <td>27&nbsp;July&nbsp;2016</td>
+      <td>-</td>
+      <td>&local.rel;-RELEASE press release.</td>
+    </tr>
+
+    <tr>
+      <td>Turn over to the secteam</td>
+      <td>-</td>
+      <td>-</td>
+      <td>&local.branch.releng; branch is handed over to the
+	&os;&nbsp;Security Officer Team in one or two weeks after the
+	announcement.</td>
+    </tr>
+  </table>
+
+  <p>&quot;*&quot; indicates &quot;as-needed&quot; items.</p>
+
+  <h1>Status / TODO</h1>
+  <a href="&base;/releases/&local.rel;R/todo.html">&os; Release
+    Engineering TODO Page</a>
+
+  <h1>Additional Information</h1>
+
+  <ul>
+    <li><a href="&base;/releng/index.html">&os;&nbsp;Release
+	Engineering website</a></li>
+  </ul>
+
+
+  </body>
+</html>

Added: head/en_US.ISO8859-1/htdocs/releases/11.0R/todo.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/11.0R/todo.xml	Thu Feb 26 21:57:14 2015	(r46298)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY local.rel "11.0">
+<!ENTITY local.branch.head "head">
+<!ENTITY local.branch.stable "stable/11">
+<!ENTITY local.branch.releng "releng/11.0">
+<!ENTITY title "FreeBSD &local.rel; Release TODO Items">
+]>
+
+<!--
+     ***************************************************************
+
+     Commits to this file without re@ approval will be reverted.
+
+     ***************************************************************
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.download">
+
+  <h1>Introduction</h1>
+
+    <p>Please <strong>do not</strong> edit this file unless you are
+     on the Release Engineering Team, or a member of the Release
+     Engineering Team gave you explicit permission to do so.</p>
+
+    <p>This is the release cycle <em>TODO</em> page, outlining
+     items that are in-progress, issues that must be fixed (release
+     blockers), issues that need to be fixed but are not blockers,
+     and issues that should be fixed as an Errata Notice after the
+     release.</p>
+
+  <h1>Works in Progress</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Pre-Freeze Issues</td>
+      <td>Description</td>
+      <td>Workaround</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Release Blockers</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+      <td>Target Date</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Release Issues</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+      <td>Target Date</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Post-Release Errata Items</h1>
+
+  <table class="tblbasic">
+    <tr class="heading">
+      <td>Description</td>
+      <td>Workaround</td>
+    </tr>
+
+    <tr>
+      <td>n/a</td>
+      <td>n/a</td>
+    </tr>
+  </table>
+  <br/>
+
+  <h1>Additional Information</h1>
+
+    <ul>
+      <li><a href="&base;/releng/index.html">&os;&nbsp;Release
+	  Engineering website</a></li>
+    </ul>
+  </body>
+</html>

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 26 21:57:32 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 36E59184;
 Thu, 26 Feb 2015 21:57:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21960D3F;
 Thu, 26 Feb 2015 21:57:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QLvWmc041819;
 Thu, 26 Feb 2015 21:57:32 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QLvVdc041818;
 Thu, 26 Feb 2015 21:57:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502262157.t1QLvVdc041818@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 26 Feb 2015 21:57:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46299 - head/en_US.ISO8859-1/htdocs/releases
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.18-1
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, 26 Feb 2015 21:57:32 -0000

Author: gjb
Date: Thu Feb 26 21:57:31 2015
New Revision: 46299
URL: https://svnweb.freebsd.org/changeset/doc/46299

Log:
  Connect the 10.2-RELEASE and 11.0-RELEASE schedules
  to the build.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/releases/Makefile

Modified: head/en_US.ISO8859-1/htdocs/releases/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/Makefile	Thu Feb 26 21:57:14 2015	(r46298)
+++ head/en_US.ISO8859-1/htdocs/releases/Makefile	Thu Feb 26 21:57:31 2015	(r46299)
@@ -18,7 +18,8 @@ SUBDIR+=	6.0R 6.1R 6.2R 6.3R 6.4R
 SUBDIR+=	7.0R 7.1R 7.2R 7.3R 7.4R
 SUBDIR+=	8.0R 8.1R 8.2R 8.3R 8.4R
 SUBDIR+=	9.0R 9.1R 9.2R 9.3R
-SUBDIR+=	10.0R 10.1R
+SUBDIR+=	10.0R 10.1R 10.2R
+SUBDIR+=	11.0R
 
 .if defined(NEW_BUILD)
 SUBDIR=

From owner-svn-doc-head@FreeBSD.ORG  Thu Feb 26 21:57:48 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4068E1E2;
 Thu, 26 Feb 2015 21:57:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2AEE8D43;
 Thu, 26 Feb 2015 21:57:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QLvm54041885;
 Thu, 26 Feb 2015 21:57:48 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QLvm98041884;
 Thu, 26 Feb 2015 21:57:48 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502262157.t1QLvm98041884@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 26 Feb 2015 21:57:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46300 - head/en_US.ISO8859-1/htdocs/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.18-1
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, 26 Feb 2015 21:57:48 -0000

Author: gjb
Date: Thu Feb 26 21:57:47 2015
New Revision: 46300
URL: https://svnweb.freebsd.org/changeset/doc/46300

Log:
  Link to the 10.2-RELEASE and 11.0-RELEASE schedules.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Thu Feb 26 21:57:31 2015	(r46299)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Thu Feb 26 21:57:47 2015	(r46300)
@@ -37,7 +37,6 @@
     -->
   </ul>
 
-  <!--
   <h2><a name="schedule" id="schedule">Upcoming Release Schedule</a></h2>
 
   <p>NOTE: Release dates are approximate and may be subject to
@@ -51,12 +50,17 @@
     </tr>
 
     <tr>
-      <td>November 2014</td>
-      <td>&os; 10.1</td>
-      <td><a href="&base;/releases/10.1R/schedule.html">Target Schedule</a></td>
+      <td>November&nbsp;2015</td>
+      <td>&os;&nbsp;10.2</td>
+      <td><a href="&base;/releases/10.2R/schedule.html">Target Schedule</a></td>
+    </tr>
+
+    <tr>
+      <td>July&nbsp;2016</td>
+      <td>&os;&nbsp;11.0</td>
+      <td><a href="&base;/releases/11.0R/schedule.html">Target Schedule</a></td>
     </tr>
   </table>
-  -->
 
   <h2><a name="freeze" id="freeze">Code-Freeze Status</a></h2>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb 28 09:56:46 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A6C8C143;
 Sat, 28 Feb 2015 09:56:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 91ACAE9E;
 Sat, 28 Feb 2015 09:56:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1S9ukv2068982;
 Sat, 28 Feb 2015 09:56:46 GMT (envelope-from whu@FreeBSD.org)
Received: (from whu@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1S9uik1068976;
 Sat, 28 Feb 2015 09:56:44 GMT (envelope-from whu@FreeBSD.org)
Message-Id: <201502280956.t1S9uik1068976@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: whu set sender to whu@FreeBSD.org
 using -f
From: Wei Hu <whu@FreeBSD.org>
Date: Sat, 28 Feb 2015 09:56:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46301 - in head: en_US.ISO8859-1/articles/contributors
 share/pgpkeys share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 28 Feb 2015 09:56:46 -0000

Author: whu (src committer)
Date: Sat Feb 28 09:56:44 2015
New Revision: 46301
URL: https://svnweb.freebsd.org/changeset/doc/46301

Log:
  Add Wei Hu (whu) and GPG key to doc/ according to committer's guide.
  
  Approved by:	royger (mentor)

Added:
  head/share/pgpkeys/whu.key   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  head/share/pgpkeys/pgpkeys-developers.xml
  head/share/pgpkeys/pgpkeys.ent
  head/share/xml/authors.ent
  head/share/xml/news.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Thu Feb 26 21:57:47 2015	(r46300)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sat Feb 28 09:56:44 2015	(r46301)
@@ -539,6 +539,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.whu.email;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.chinsan.email;</para>
     </listitem>
 

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Thu Feb 26 21:57:47 2015	(r46300)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Sat Feb 28 09:56:44 2015	(r46301)
@@ -806,6 +806,11 @@
       &pgpkey.foxfair;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-whu">
+      <title>&a.whu.email;</title>
+      &pgpkey.whu;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-chinsan">
       <title>&a.chinsan.email;</title>
       &pgpkey.chinsan;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Thu Feb 26 21:57:47 2015	(r46300)
+++ head/share/pgpkeys/pgpkeys.ent	Sat Feb 28 09:56:44 2015	(r46301)
@@ -61,7 +61,6 @@
 <!ENTITY pgpkey.bmah SYSTEM "bmah.key">
 <!ENTITY pgpkey.bms SYSTEM "bms.key">
 <!ENTITY pgpkey.bofh SYSTEM "bofh.key">
-<!ENTITY pgpkey.bofh SYSTEM "bofh.key">
 <!ENTITY pgpkey.br SYSTEM "br.key">
 <!ENTITY pgpkey.brd SYSTEM "brd.key">
 <!ENTITY pgpkey.brian SYSTEM "brian.key">
@@ -460,6 +459,7 @@
 <!ENTITY pgpkey.weongyo SYSTEM "weongyo.key">
 <!ENTITY pgpkey.wes SYSTEM "wes.key">
 <!ENTITY pgpkey.wg SYSTEM "wg.key">
+<!ENTITY pgpkey.whu SYSTEM "whu.key">
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">
 <!ENTITY pgpkey.will SYSTEM "will.key">
 <!ENTITY pgpkey.wkoszek SYSTEM "wkoszek.key">

Added: head/share/pgpkeys/whu.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/whu.key	Sat Feb 28 09:56:44 2015	(r46301)
@@ -0,0 +1,42 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh whu E6001C673CCD08F7 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/E6001C673CCD08F7 2015-02-27
+      Key fingerprint = 351D AC21 7E16 BC06 7CA0  7705 E600 1C67 3CCD 08F7
+uid                          Wei Hu <whu@FreeBSD.org>
+sub   rsa2048/0C7F6F103AAA0465 2015-02-27
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFTwOCIBCACjw43RBjeX+4OOLB7qRHyoSEr5oC/u8Nk6n4MeFFKRgcpqYXe6
+ckoQ4jGg8rMTbnsiLUu0OcMUpp4mB/47zc0FXOVSsU8FsBapjxXRsgqLDUZl96Tm
+3xgvgIp6GoIoOvC0m9x6dB5NywKrAvl5pVA0/g2QsinRqaHLrfIYhZpMqwLzGhwf
+m8DdRJ5D95vzG7bJBZyg6phmK5cgXnH2pLtDqo4NPp5weWl+BsvyoblPDocy0Hwx
+StHJbRGqstseDy0UASu9btje5DVlQ4bq897WbOi1yzwA/vbgaL+2B8QGBC+l+cjJ
++S2pEdyDKSWCkeKJaMa34Mp4xs5/W1ZjZlt9ABEBAAG0GFdlaSBIdSA8d2h1QEZy
+ZWVCU0Qub3JnPokBNwQTAQoAIQUCVPA4IgIbAwULCQgHAwUVCgkICwUWAwIBAAIe
+AQIXgAAKCRDmABxnPM0I93WWB/4ojEVo+8zhVm5aM2gHNebIlVOFnOjQcMshX/dT
+7NwNRpZEYV0HqJMJeO7ZMkJoirZrvQQm6WrLS91lh2Aw3Sp0mo9S+pIOJf6cOMRk
+GwzOQBhxPiLEPUIb4oqMeq8pEWT42iiOxEqUnKOBrBJJWQs9rnCkghzYyDVpe3NB
+g1pbD3Yhma5NK9aUCcC75heaXft6lwe0Dd8ddONEHK7ZMlBgem/Uf85SprFMBoRS
+NSQIC2gvJj7O1gGKcWxXudzFSaHKrN6iBUkTT1BqWSRwDvlwcnJbw83/lnSutodU
+B6UCIVST8jgrDNmb/7UQLguG0BLSk0UE2dKjPAf/ICWJu/QFuQENBFTwOCIBCACd
+axrZrShlEwTZFfsJM7uH7XusUJrjGEKPLnTikLcRXcCP1whXbhTinw6ehgm+PooQ
+rWzLIlh+Ogren/QgmKCGEA7WePQJd5DEVH11CnD32LligoRdN2P1ItHDwUdPg0zZ
+R4tR6xe05iUuTiErM9OZKipeFXNqjnr6ki0+hA0ZQEqcZO8rLaLoIBf5EdvNIy1V
+bjBSSuAIdYE0foZlCl+r7VLxFWnhB110n8vIvqmVBaKRkZx8lZ91LVVDBVJ3yuZE
+pEmmfbnJEdi9IPDKcTsfn0eqTDmc/dEiSrLJkKbAfvKMmlIu/cnhQdWCUC+Giyt9
+kZakqi/ksgz6tSBZfY35ABEBAAGJAR8EGAEKAAkFAlTwOCICGwwACgkQ5gAcZzzN
+CPegVQf/WDja2xcoDFN45UCBDubdTi9XWshskymcY2WSRusp9bwo2DPTeZ9yJGn+
+l2NBidZC4ppM2IDxhBCaaEtBZIbqztliVaW0mScssc3M49t26qzEHwIoVAGr7H0n
+RJIC1Nm4DNn1PUwMq8e82lBfRv/5hUdAKg0H9uksFr7jgDYnul3cAITujQWl51kP
+S7E+CS6hOok/IniQIj9Cjp1gcQ2qIP8jKRrNBNojtvQUuqUjv6605EmEQXaNkLrZ
+dm5daJ+me05fokmbkXgDRXyGhmcigPQzqz2ymROzHk1dSyY6L4SjF8/JL1u8fdCb
+G2ii6BtiESfaHof1AMVdYADgnJQL0A==
+=jnKf
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Thu Feb 26 21:57:47 2015	(r46300)
+++ head/share/xml/authors.ent	Sat Feb 28 09:56:44 2015	(r46301)
@@ -2238,6 +2238,9 @@
 <!ENTITY a.whiteside "Don Whiteside">
 <!ENTITY a.whiteside.email "&a.whiteside; <email xmlns='http://docbook.org/ns/docbook'>whiteside@acm.org</email>">
 
+<!ENTITY a.whu "Wei Hu">
+<!ENTITY a.whu.email "&a.whu; <email xmlns='http://docbook.org/ns/docbook'>whu@FreeBSD.org</email>">
+
 <!ENTITY a.wilko "Wilko Bulte">
 <!ENTITY a.wilko.email "&a.wilko; <email xmlns='http://docbook.org/ns/docbook'>wilko@FreeBSD.org</email>">
 

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Thu Feb 26 21:57:47 2015	(r46300)
+++ head/share/xml/news.xml	Sat Feb 28 09:56:44 2015	(r46301)
@@ -32,6 +32,19 @@
     <name>2015</name>
 
     <month>
+      <name>2</name>
+
+      <day>
+        <name>11</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:whu@FreeBSD.org">Wei Hu</a> (src)</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>1</name>
 
       <day>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb 28 14:40:37 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BFC16DC;
 Sat, 28 Feb 2015 14:40:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AAE7AD06;
 Sat, 28 Feb 2015 14:40:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1SEebYT000676;
 Sat, 28 Feb 2015 14:40:37 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1SEebMC000675;
 Sat, 28 Feb 2015 14:40:37 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201502281440.t1SEebMC000675@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 28 Feb 2015 14:40:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46302 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 28 Feb 2015 14:40:37 -0000

Author: ryusuke
Date: Sat Feb 28 14:40:36 2015
New Revision: 46302
URL: https://svnweb.freebsd.org/changeset/doc/46302

Log:
  - Merge the following from the English version:
  
  	r46280 -> r46301	head/ja_JP.eucJP/share/xml/news.xml

Modified:
  head/ja_JP.eucJP/share/xml/news.xml

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sat Feb 28 09:56:44 2015	(r46301)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sat Feb 28 14:40:36 2015	(r46302)
@@ -23,7 +23,7 @@
 	would like to work on.  ***
 
     $FreeBSD$
-    Original revision: r46280
+    Original revision: r46301
 -->
 <news>
   <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,19 @@
     <name>2015</name>
 
     <month>
+      <name>2</name>
+
+      <day>
+        <name>11</name>
+
+        <event>
+	  <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤:
+            <a href="mailto:whu@FreeBSD.org">Wei Hu</a> (src)</p>
+        </event>
+      </day>
+    </month>
+
+    <month>
       <name>1</name>
 
       <day>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb 28 15:45:38 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE1461D6;
 Sat, 28 Feb 2015 15:45:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E9F5324;
 Sat, 28 Feb 2015 15:45:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1SFjcOX034198;
 Sat, 28 Feb 2015 15:45:38 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1SFjcuk034197;
 Sat, 28 Feb 2015 15:45:38 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201502281545.t1SFjcuk034197@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 28 Feb 2015 15:45:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46303 - head/ja_JP.eucJP/books/handbook/bsdinstall
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Sat, 28 Feb 2015 16:38:10 +0000
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 28 Feb 2015 15:45:38 -0000

Author: ryusuke
Date: Sat Feb 28 15:45:37 2015
New Revision: 46303
URL: https://svnweb.freebsd.org/changeset/doc/46303

Log:
  - Merge the following from the English version:
  
  	r44351 -> r44423	head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Feb 28 14:40:36 2015	(r46302)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Feb 28 15:45:37 2015	(r46303)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44351
+     Original revision: r44423
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -54,6 +54,17 @@
 	</personname>
       </author>
     </authorgroup>
+
+    <authorgroup>
+      <author>
+	<personname>
+	  <firstname>Allan</firstname>
+	  <surname>Jude</surname>
+	</personname>
+
+	<contrib>root-on-ZFS ¤Ë¸þ¤±¤¿²þÄû: </contrib>
+      </author>
+    </authorgroup>
   </info>
 
   <sect1 xml:id="bsdinstall-synopsis">
@@ -159,6 +170,7 @@
 	  ¤³¤ì¤é¤Î¥×¥í¥»¥Ã¥µ¤ÎÎã¤Ï¡¢
 	  &intel;&nbsp;&core;&nbsp;2 Duo, Quad, Extreme ¥×¥í¥»¥Ã¥µ¥Õ¥¡¥ß¥ê¡¢
 	  &intel;&nbsp;&xeon; 3000, 5000, 7000 ·Ï¤Î¥×¥í¥»¥Ã¥µ¡¢
+	  &intel;&nbsp;&xeon; E3, E5 ¤ª¤è¤Ó E7 ¥×¥í¥»¥Ã¥µ¡¢
 	  ¤ª¤è¤Ó &intel;&nbsp;&core; i3, i5, i7 ¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£</para>
 
 	<para>nVidia nForce3 Pro-150 ¥Ù¡¼¥¹¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
@@ -1056,6 +1068,23 @@ Trying to mount root from cd9660:/dev/is
 	  <guimenuitem>United States of America ISO-8859-1</guimenuitem>
 	  ¥­¡¼¥Þ¥Ã¥×¤òÁª¤Ö¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
       </note>
+
+      <para>&os; 10.0-RELEASE °Ê¹ß¤Ç¤Ï¡¢¤³¤Î¥á¥Ë¥å¡¼¤¬³ÈÄ¥¤µ¤ì¤Þ¤·¤¿¡£
+	¥Ç¥Õ¥©¥ë¥È¤ÎÁªÂò¤È¶¦¤Ë¡¢¥­¡¼¥Þ¥Ã¥×¤Î¤¹¤Ù¤ÆÁªÂò¹àÌܤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+	¤µ¤é¤Ë¡¢°Û¤Ê¤ë¥­¡¼¥Þ¥Ã¥×¤òÁªÂò¤·¤¿»þ¤Ë¤Ï¡¢
+	¥À¥¤¥¢¥í¥°¤¬É½¼¨¤µ¤ì¡¢¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤àÁ°¤Ë¡¢
+	¥æ¡¼¥¶¤¬¥­¡¼¥Þ¥Ã¥×¤Î»î¸³¤ò¹Ô¤¤¡¢Å¬ÀÚ¤«¤É¤¦¤«¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-keymap-10">
+	<title>³ÈÄ¥¥­¡¼¥Þ¥Ã¥×¥á¥Ë¥å¡¼</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
     </sect2>
 
     <sect2 xml:id="bsdinstall-hostname">
@@ -1210,17 +1239,22 @@ Trying to mount root from cd9660:/dev/is
   <sect1 xml:id="bsdinstall-partitioning">
     <title>¥Ç¥£¥¹¥¯Îΰè¤Î³ä¤êÅö¤Æ</title>
 
-    <para>&os; ¤Ø¥Ç¥£¥¹¥¯Îΰè¤ò³ä¤êÅö¤Æ¤ë¤Ë¤Ï 3 ¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
+    <para>&os; ¤Ø¥Ç¥£¥¹¥¯Îΰè¤ò³ä¤êÅö¤Æ¤ë¤Ë¤Ï 4 ¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
       <emphasis>Guided</emphasis> ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³äÊýË¡¤Ç¤Ï¡¢
       ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¼«Æ°Åª¤ËÀßÄꤷ¤Þ¤¹¡£
       °ìÊý <emphasis>Manual</emphasis> ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³äÊýË¡¤Ï¡¢
       ¹âÅÙ¤ÊÃ챤ò»ý¤Ä¥æ¡¼¥¶¸þ¤±¤Ç¡¢
       ¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
-      3 ¤ÄÌܤÎÊýË¡¤È¤·¤Æ¡¢¥·¥§¥ë¤òÍøÍѤ·¡¢&man.gpart.8;, &man.fdisk.8;, &man.bsdlabel.8;
+      &os; 10 °Ê¹ß¤ÇÍøÍѲÄǽ¤Ê <acronym>ZFS</acronym> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
+      ¥Ö¡¼¥È´Ä¶­¤ËÂбþ¤·¤¿ root-on-ZFS ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤·¤Þ¤¹¡£
+      °Å¹æ²½¤µ¤ì¤¿ root-on-ZFS ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      ¤½¤Î¾¤ÎÊýË¡¤È¤·¤Æ¡¢¥·¥§¥ë¤òÍøÍѤ·¡¢
+      &man.gpart.8;, &man.fdisk.8;, &man.bsdlabel.8;
       ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ëÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <figure xml:id="bsdinstall-part-guided-manual">
-	<title>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤Ë Guided ¤È Manual ¤Î¤É¤Á¤é¤òÍѤ¤¤ë¤«¤ÎÁªÂò</title>
+	<title>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤ÎÊýË¡¤ò
+	  Guided, Manual ¤â¤·¤¯¤Ï Shell ¤«¤éÁªÂò</title>
 
 	<mediaobject>
 	  <imageobject>
@@ -1230,6 +1264,17 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
+    <figure xml:id="bsdinstall-zfs-partmenu">
+      <title>Guided, Manual, Shell ¤Þ¤¿¤Ï
+	<acronym>ZFS</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎÁªÂò</title>
+
+      <mediaobject>
+	<imageobject>
+	  <imagedata fileref="bsdinstall/bsdinstall-zfs-partmenu"/>
+	</imageobject>
+      </mediaobject>
+    </figure>
+
     <para>¤³¤Î¾Ï¤Ç¤Ï¡¢
       ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¥ì¥¤¥¢¥¦¥È¤¹¤ëºÝ¤Î¸¡Æ¤»ö¹à¤òÀâÌÀ¤·¤Þ¤¹¡£
       ¤½¤Î¸å¡¢Guided Partitioning ¤ª¤è¤Ó Manual Partitioning screens
@@ -1520,8 +1565,8 @@ Trying to mount root from cd9660:/dev/is
       </itemizedlist>
 
       <para>¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó·Á¼°¤Ë <literal>freebsd-zfs</literal> ¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤Ï &os; ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò´Þ¤á¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-
+	¤³¤ì¤Ï &os; <acronym>ZFS</acronym>
+	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò´Þ¤á¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	<link xlink:href="&url.books.handbook.en;/filesystems-zfs.html">
 	  The Z File System (ZFS)</link> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 	ÍøÍѲÄǽ¤Ê <acronym>GPT</acronym>
@@ -1662,6 +1707,176 @@ Trying to mount root from cd9660:/dev/is
 	<guibutton>[&nbsp;Finish&nbsp;]</guibutton> ¤òÁªÂò¤·¤Æ¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
     </sect2>
+
+    <sect2 xml:id="bsdinstall-part-zfs">
+      <title>root-on-ZFS ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¼«Æ°ºîÀ®</title>
+
+      <para>root-on-ZFS ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¼«Æ°ºîÀ®¤Ï¡¢
+	&os; 10.0-RELEASE ¤«¤éÂбþ¤·¤Þ¤·¤¿¡£
+	¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥â¡¼¥É¤Ï¡¢
+	¥Ç¥£¥¹¥¯¤Î¤¹¤Ù¤Æ¤ÎÎΰè¤ËÂФ·¤Æµ¡Ç½¤¹¤ë¤Î¤Ç¡¢
+	¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò¾Ãµî¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢<acronym>ZFS</acronym> ¤¬ 4k ¥»¥¯¥¿¤ò»È¤¦¤è¤¦¤Ë¡¢
+	¼«Æ°Åª¤Ë 4k ¤Î¶­³¦¤Ë¥¢¥é¥¤¥ó¤¹¤ë¤è¤¦¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤Þ¤¹¡£
+	512 ¥Ð¥¤¥È¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£
+	512 ¥Ð¥¤¥È¤Î¥Ç¥£¥¹¥¯¤ÇºîÀ®¤µ¤ì¤¿¥×¡¼¥ë¤Ë¡¢
+	¾­Í襹¥È¥ì¡¼¥¸¶õ´Ö¤òÄɲä·¤¿¤ê¡¢²õ¤ì¤¿¥Ç¥£¥¹¥¯¤ÎÃÖ¤­´¹¤¨¤Ë¤ª¤¤¤Æ¡¢4k
+	¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤òÄɲäǤ­¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤¯¤³¤È¤Ë¤Ï¥á¥ê¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥é¤Ï¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢
+	GELI ¥Ç¥£¥¹¥¯¤Î°Å¹æ²½¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	<!-- <link
+	     linkend="disks-encrypting-geli">GELI</link> -->
+	°Å¹æ²½¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢<filename>/boot</filename>
+	¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤à 2&nbsp;GB
+	¤Î°Å¹æ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ö¡¼¥È¥×¡¼¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
+	¤³¤³¤Ë¤Ï¡¢¥«¡¼¥Í¥ë¤È¥·¥¹¥Æ¥à¤òµ¯Æ°¤¹¤ë¤Î¤ËɬÍפʥե¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
+	¥æ¡¼¥¶¤¬¥µ¥¤¥º¤òÁªÂò²Äǽ¤Ê swap ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤âºîÀ®¤µ¤ì¡¢
+	»Ä¤ê¤Î¥¹¥Ú¡¼¥¹¤¬ <acronym>ZFS</acronym> ¥×¡¼¥ë¤È¤·¤Æ»È¤ï¤ì¤Þ¤¹¡£</para>
+
+      <para>¥¤¥ó¥¹¥È¡¼¥é¤Î <acronym>ZFS</acronym> ¥á¥¤¥ó¥á¥Ë¥å¡¼¤Ë¤Ï¡¢
+	¥×¡¼¥ë¤ÎºîÀ®¤ò¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¿ô¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-menu">
+	<title><acronym>ZFS</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥á¥Ë¥å¡¼</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-menu"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>ºÇ¤â½ÅÍפʥª¥×¥·¥ç¥ó¤Ï¡¢
+	²¾ÁۥǥХ¤¥¹¤Î¥¿¥¤¥×¤ª¤è¤Ó¥×¡¼¥ë¤ò¹½À®¤¹¤ë¥Ç¥£¥¹¥¯¤ÎÁªÂò¤Ç¤¹¡£
+	¸½ºß¤Î¤È¤³¤í¡¢¼«Æ°¤Î <acronym>ZFS</acronym> ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢
+	¥¹¥È¥é¥¤¥×¥â¡¼¥É¤ò½ü¤­¡¢
+	ñ°ì¤Î¥È¥Ã¥×¥ì¥Ù¥ë¤Î²¾ÁۥǥХ¤¥¹¤ÎºîÀ®¤Î¤ß¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	¤è¤êÊ£»¨¤Ê¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢<link
+	  linkend="bsdinstall-part-shell">Shell Mode</link>
+	¤Ç¥×¡¼¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢
+	¥¹¥È¥é¥¤¥× (¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£¾éĹÀ­¤Ê¤·)¡¢¥ß¥é¡¼
+	(¥Ù¥¹¥È¤Ê¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡£»ÈÍѤǤ­¤ëÍÆÎ̤ϺǾ®) ¤ª¤è¤Ó RAID-Z 1, 2
+	¤ª¤è¤Ó 3 (¤½¤ì¤¾¤ì 1, 2 ¤ª¤è¤Ó 3 ¥Ç¥£¥¹¥¯¤ÎƱ»þ¾ã³²¤ØÂбþ)¡¢
+	¤È¤¤¤Ã¤¿¤µ¤Þ¤¶¤Þ¤Ê¥¿¥¤¥×¤Î¥×¡¼¥ë¤ÎºîÀ®¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	¥×¡¼¥ë¥¿¥¤¥×¤òÁªÂò¤¹¤ë¤È¥¹¥¯¥ê¡¼¥ó¤Î²¼¤ËÀâÌÀ¤¬É½¼¨¤µ¤ì¡¢
+	³Æ¥¿¥¤¥×¤Ë¤ª¤¤¤ÆɬÍפʥǥ£¥¹¥¯¿ô¤ä¡¢RAID-Z ¤Î¾ì¹ç¤Ë¤Ï¡¢
+	³ÆÀßÄê¤ËÂФ·¤ÆºÇŬ¤Ê¥Ç¥£¥¹¥¯¤Î¿ô¤Î¥¢¥É¥Ð¥¤¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-vdev_type">
+	<title><acronym>ZFS</acronym> ¥×¡¼¥ë¥¿¥¤¥×</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-vdev_type"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¥×¡¼¥ë¤Î¥¿¥¤¥×¤òÁªÂò¤·¤¿¤é¡¢
+	ÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+	¤½¤Î¸å¡¢¥×¡¼¥ë¤ò¹½À®¤¹¤ë¥Ç¥£¥¹¥¯¤ò¡¢1 ¤Ä¤Þ¤¿¤ÏÊ£¿ôÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	½½Ê¬¤Ê¥Ç¥£¥¹¥¯¤¬ÁªÂò¤µ¤ì¤¿¤«¤É¤¦¤«ÀßÄ꤬¸¡¾Ú¤µ¤ì¤Þ¤¹¡£
+	¤â¤·¡¢ÌäÂ꤬¤¢¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
+	<guibutton>&lt;Change Selection&gt;</guibutton>
+	¤òÁªÂò¤·¤Æ¡¢¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤Ë¤â¤É¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+	¤â¤·¤¯¤Ï¡¢
+	<guibutton>&lt;Cancel&gt;</guibutton> ¤òÁªÂò¤·¤Æ¡¢
+	¥×¡¼¥ë¤Î¥¿¥¤¥×¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-disk_select">
+	<title>¥Ç¥£¥¹¥¯¤ÎÁªÂò</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-disk_select"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <figure xml:id="bsdinstall-zfs-vdev_invalid">
+	<title>ÌäÂê¤Î¤¢¤ëÁªÂò</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-vdev_invalid"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¤³¤Î°ìÍ÷¤ÎÃæ¤ËÈ´¤±¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤¬¤¢¤ë»þ¤ä¡¢
+	¥¤¥ó¥¹¥È¡¼¥é¤¬Î©¤Á¾å¤¬¤Ã¤¿¸å¤Ë¥Ç¥£¥¹¥¯¤òÀܳ¤·¤¿¾ì¹ç¤Ë¡¢
+	ºÇ¿·¤ÎÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤ò¸«¤ë¤Ë¤Ï¡¢
+	<guibutton>- Rescan Devices</guibutton> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	´Ö°ã¤Ã¤¿¥Ç¥£¥¹¥¯¤ò¥¢¥¯¥·¥Ç¥ó¥È¤ÇÇ˲õ¤·¤Ê¤¤¤è¤¦¤Ë¡¢
+	ŬÀڤʥǥ£¥¹¥¯¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢
+	<guibutton>- Disk Info</guibutton> ¥á¥Ë¥å¡¼ÁªÂò¤·¤Æ¡¢
+	³Æ¥Ç¥£¥¹¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¡¢¤ª¤è¤Ó¡¢
+	¥Ç¥Ð¥¤¥¹¥â¥Ç¥ëÈֹ椪¤è¤Ó¥·¥ê¥¢¥ëÈÖ¹æ¤Ê¤É¤Î¤µ¤Þ¤¶¤Þ¤Ê¾ðÊó¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-disk_info">
+	<title>¥Ç¥£¥¹¥¯¤Î²òÀÏ</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-disk_info"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¥á¥Ë¥å¡¼¤Ç¤Ï¡¢¥×¡¼¥ë¤Î̾Á°¤ÎÆþÎÏ¡¢4k ¥»¥¯¥¿À©¸Â¤ÎÀßÄê¤Î̵¸ú²½¡¢
+	°Å¹æ²½¤ÎÍ­¸ú / ̵¸ú¤ÎÀßÄê¡¢¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¥¿¥¤¥×¤Î GPT (¿ä¾©)
+	¤È MBR ¤ÎÀÚ¤êÂؤ¨¡¢¥¹¥ï¥Ã¥×Îΰè¤ÎÍÆÎ̤òÁªÂò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+	¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤¬Å¬ÀÚ¤ÊÃͤËÀßÄꤵ¤ì¤¿¤é¡¢
+	¥á¥Ë¥å¡¼¤Î¥È¥Ã¥×¤Ë¤¢¤ë <guibutton>&gt;&gt;&gt;&nbsp;Install</guibutton>
+	¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <para>&man.geli.8; ¥Ç¥£¥¹¥¯°Å¹æ²½¤òÍ­¸ú¤Ë¤·¤Æ¤¤¤¿¤é¡¢
+	¥Ç¥£¥¹¥¯¤ò°Å¹æ²½¤¹¤ë¤Î¤ËÍѤ¤¤ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò 2 ÅÙµá¤á¤é¤ì¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-geli_password">
+	<title>¥Ç¥£¥¹¥¯°Å¹æ²½¥Ñ¥¹¥ï¡¼¥É</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-geli_password"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¥¤¥ó¥¹¥È¡¼¥é¤Ï <acronym>ZFS</acronym>
+	¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤¿¤á¤ËÁªÂò¤µ¤ì¤¿¥É¥é¥¤¥Ö¤ÎÃæ¿È¤òÇË´þ¤¹¤ë¤³¤È¤ÎºÇ½ª³Îǧ¤ò¹Ô¤¤¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-warning">
+	<title>ºÇ½ª³Îǧ</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-warning"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¤½¤Î¸å¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î²áÄø¤Ï¡¢Ä̾ïÄ̤ê¤Ë¿Ê¤ß¤Þ¤¹¡£</para>
+
+    </sect2>
+
+    <sect2 xml:id="bsdinstall-part-shell">
+      <title>¥·¥§¥ë¥â¡¼¥É¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎºîÀ®</title>
+
+      <para>¹âÅ٤ʥ¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤Ë¤Ï¡¢bsdinstall ¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢
+	½ÀÆðÀ­¤Ë¤«¤±¤Þ¤¹¡£
+	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç      
+	<guibutton>Shell</guibutton> ¥ª¥×¥·¥ç¥ó¤òÁªÂò¤¹¤ë¤È¡¢
+	¥·¥§¥ë¤ò»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+	¥É¥é¥¤¥Ö¤òʬ³ä¤·¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤·¡¢&man.fstab.5;
+	¥Õ¥¡¥¤¥ë¤ò <filename>/tmp/bsdinstall_etc/fstab</filename> ¤ËºîÀ®¤·¡¢
+	<filename>/mnt</filename>
+	°Ê²¼¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê¾å¤ò¼Â¹Ô¤·¤¿¤é¡¢
+	<command>exit</command> ¤ò¼Â¹Ô¤·¤Æ¡¢
+	bsdinstall ¤ËÌá¤ê¡¢¥¤¥ó¥¹¥È¡¼¥ë¤ò³¤±¡¢ÇÛÉÛʪ¤Î¥»¥Ã¥È¤ÎŸ³«¤ò³«»Ï¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </sect2>
   </sect1>
 
   <sect1 xml:id="bsdinstall-final-warning">