From owner-svn-doc-all@freebsd.org  Sun Jan 24 01:47:04 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 302FFA8F3F9;
 Sun, 24 Jan 2016 01:47:04 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DC4CB1AE7;
 Sun, 24 Jan 2016 01:47:03 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0O1l2S6040459;
 Sun, 24 Jan 2016 01:47:02 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0O1l2VP040458;
 Sun, 24 Jan 2016 01:47:02 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601240147.u0O1l2VP040458@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 24 Jan 2016 01:47:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48082 - head/en_US.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 01:47:04 -0000

Author: wblock
Date: Sun Jan 24 01:47:02 2016
New Revision: 48082
URL: https://svnweb.freebsd.org/changeset/doc/48082

Log:
  Add --with-ck-launch to the startxfce command.  Also revise some
  unwieldy wording in the Compiz Fusion introduction.

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Sat Jan 23 16:03:16 2016	(r48081)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Sun Jan 24 01:47:02 2016	(r48082)
@@ -1563,14 +1563,14 @@ DisplayManager.requestPort:     0</scree
 	from the command line by typing <command>startx</command>,
 	first add its entry to <filename>~/.xinitrc</filename>:</para>
 
-      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4" &gt; ~/.xinitrc</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" &gt; ~/.xinitrc</userinput></screen>
 
       <para>An alternate method is to use
 	<application>XDM</application>.  To configure this method,
 	create an executable <filename>~/.xsession</filename>:</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" &gt; ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4" &gt;&gt; ~/.xsession</userinput>
+&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" &gt;&gt; ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>
   </sect1>
@@ -1578,8 +1578,8 @@ DisplayManager.requestPort:     0</scree
   <sect1 xml:id="x-compiz-fusion">
     <title>Installing Compiz Fusion</title>
 
-    <para>One way to increase the pleasantness of using a desktop
-      computer is by having nice 3D effects.</para>
+    <para>One way to make using a desktop
+      computer more pleasant is with nice 3D effects.</para>
 
     <para>Installing the <application>Compiz&nbsp;Fusion</application>
       package is easy, but configuring it requires a few steps that

From owner-svn-doc-all@freebsd.org  Sun Jan 24 11:41:06 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CD1B7C6A;
 Sun, 24 Jan 2016 11:41:06 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D86D7E3A;
 Sun, 24 Jan 2016 11:41:05 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OBf459030963;
 Sun, 24 Jan 2016 11:41:04 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OBf4TV030962;
 Sun, 24 Jan 2016 11:41:04 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601241141.u0OBf4TV030962@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 24 Jan 2016 11:41:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48083 - head/de_DE.ISO8859-1/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 11:41:06 -0000

Author: bhd
Date: Sun Jan 24 11:41:04 2016
New Revision: 48083
URL: https://svnweb.freebsd.org/changeset/doc/48083

Log:
  Update to r44288:
  
  Finish editorial review of kernel config chapter.
  
  Reviewed by:	bcr
  Differential Revision:	https://reviews.freebsd.org/D5045

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

Modified: head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 01:47:02 2016	(r48082)
+++ head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 11:41:04 2016	(r48083)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r44287
+     basiert auf: r44288
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
   <info><title>Konfiguration des &os;-Kernels</title>
@@ -1321,18 +1321,15 @@ device          fwe           # Ethernet
         <term><command>config</command> verursacht Fehler:</term>
 
         <listitem>
-          <para>Wenn &man.config.8; fehlschlägt, liegt vermutlich ein
-	    einfacher Fehler vor.  Glücklicherweise gibt
-	    &man.config.8; die Zeilennummer der Fehlerstelle an.
-	    Beispielsweise könnten
-	    Sie folgende Fehlermeldung sehen:</para>
+	  <para>Wenn <command>config</command> fehlschlägt, zeigt es
+	    die Nummer der Zeile an, die das Problem verursacht.
+	    Bei der folgenden Fehlermeldung sollten Sie die angegebene
+	    Zeile mit <filename>GENERIC</filename> oder
+	    <filename>NOTES</filename> vergleichen und sicherstellen,
+	    dass das Schlüsselwort in Zeile 17 richtig geschrieben
+	    ist:</para>
 
           <screen>config: line 17: syntax error</screen>
-
-	  <para>Vergleichen Sie die angegebene Zeile mit
-	    <filename>GENERIC</filename> und stellen Sie sicher,
-	    dass das Schlüsselwort in Zeile 17 richtig geschrieben
-	    ist.</para>
         </listitem>
       </varlistentry>
 
@@ -1340,13 +1337,12 @@ device          fwe           # Ethernet
         <term><command>make</command> verursacht Fehler:</term>
 
         <listitem>
-	  <para>Wenn <command>make</command> misslingt, liegen
-	    meistens Fehler in der Konfigurationsdatei vor,
-	    die aber nicht schwerwiegend genug für
-	    &man.config.8; waren.  Überprüfen Sie
-	    die Konfiguration und wenn Sie keinen
-	    Fehler entdecken können, schicken Sie eine
-	    E-Mail mit der Kernelkonfiguration an die Mailingliste
+	  <para>Wenn <command>make</command> fehlschlägt, liegen
+	    meistens Fehler in der Konfigurationsdatei vor, die aber
+	    nicht schwerwiegend genug für <command>config</command>
+	    waren.  Überprüfen Sie die Konfiguration und wenn Sie
+	    keinen Fehler entdecken können, schicken Sie eine E-Mail
+	    mit der Kernelkonfigurationsdatei an die Mailingliste
 	    &a.de.questions;.</para>
         </listitem>
       </varlistentry>
@@ -1365,9 +1361,7 @@ device          fwe           # Ethernet
 	    <quote>Escape to a loader prompt</quote>.  Danach
 	    geben Sie am Prompt
 	    <command>boot kernel.old</command> oder
-	    den Namen eines anderen Kernels ein, der sauber bootet.
-	    Bei der Rekonfiguration eines Kernels empfiehlt es sich
-	    immer einen Kernel bereit zu halten, der garantiert
+	    den Namen eines anderen Kernels ein, der sauber
 	    bootet.</para>
 
           <para>Nun kann die Konfiguration noch einmal überprüft und
@@ -1379,21 +1373,16 @@ device          fwe           # Ethernet
 
           <note>
 	    <para>Wenn Sie Probleme beim
-	      Kernelbau bekommen, heben Sie sich immer einen
+	      Kernelbau bekommen, heben Sie sich immer eine Kopie von
 	      <filename>GENERIC</filename> oder einen anderen
-	      Kernel, der garantiert bootet, auf.  Der Name
-	      dieses Kernels sollte so gewählt sein, dass
-	      er beim nächsten Bau nicht überschrieben
-	      wird.  Verlassen Sie sich nicht auf
-	      <filename>kernel.old</filename>, da
-	      dieser Kernel durch den zuletzt installierten
-	      Kernel, der vielleicht schon kaputt war, während
-	      der Installation ersetzt wird.  Kopieren Sie den
-	      funktionierenden Kernel so schnell wie möglich
-	      nach <filename>/boot/kernel</filename>.
-	      Ansonsten funktionieren Kommandos wie &man.ps.1;
-	      nicht.  Benennen Sie dazu einfach das Verzeichnis
-	      des funktionierenden Kernels um:</para>
+	      Kernel, der garantiert bootet, auf.  Dies ist sehr
+	      wichtig, weil jedes Mal, wenn ein neuer Kernel
+	      installiert wird, <filename>kernel.old</filename>
+	      mit dem zuletzt installierten Kernel überschrieben
+	      wird und dieser möglicherweise nicht bootfähig ist.
+	      Verschieben Sie daher den funktionierenden Kernel so
+	      schnell wie möglich, indem Sie das Verzeichnis mit dem
+	      funktionierenden Kernel umbenennen:</para>
 
 	    <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
 &prompt.root; <userinput>mv /boot/kernel.good /boot/kernel</userinput></screen>
@@ -1403,22 +1392,22 @@ device          fwe           # Ethernet
       </varlistentry>
 
       <varlistentry>
-	<term>Der Kernel ist in Ordnung, aber <command>ps</command> geht
-	  nicht mehr:</term>
+	<term>Der Kernel funktioniert, aber <command>ps</command>
+	  nicht</term>
 
         <listitem>
 	  <para>Wenn Sie eine andere Version des Kernels installiert
 	    haben als die, mit der Ihre Systemwerkzeuge gebaut
-	    wurden (beispielsweise einen -CURRENT-Kernel auf einem
-	    -RELEASE-System), werden Programme wie &man.ps.1; und
-	    &man.vmstat.8; nicht mehr funktionieren.  Um dies zu
-	    beheben, sollten Sie das <link linkend="makeworld">komplette
-	      System neu bauen und installieren</link>.  Achten
-	    Sie darauf, dass die Quellen, aus denen das
-	    System gebaut wird, zum installierten Kernel passt.
-	    Das ist ein Grund, warum man nie einen
-	    Kernel, der nicht zur Systemversion passt, benutzen
-	    sollte.</para>
+	    wurden, beispielsweise einen Kernel aus den
+	    -CURRENT-Quellen auf einem -RELEASE-System, werden
+	    Programme wie &man.ps.1; und &man.vmstat.8; nicht mehr
+	    funktionieren.  Um dies zu beheben, sollten Sie das
+	    <link linkend="makeworld">komplette System neu bauen und
+	      installieren</link>.  Achten Sie darauf, dass die
+	    Quellen, aus denen das System gebaut wird, zum
+	    installierten Kernel passt.  Man sollte niemals einen
+	    Kernel, der nicht zur Systemversion passt,
+	    benutzen.</para>
         </listitem>
       </varlistentry>
     </variablelist>

From owner-svn-doc-all@freebsd.org  Sun Jan 24 12:29:08 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AD899995A0;
 Sun, 24 Jan 2016 12:29:08 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 20434F71;
 Sun, 24 Jan 2016 12:29:08 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OCT7w6046901;
 Sun, 24 Jan 2016 12:29:07 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OCT7xY046900;
 Sun, 24 Jan 2016 12:29:07 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601241229.u0OCT7xY046900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 24 Jan 2016 12:29:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48084 - head/de_DE.ISO8859-1/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 12:29:08 -0000

Author: bhd
Date: Sun Jan 24 12:29:06 2016
New Revision: 48084
URL: https://svnweb.freebsd.org/changeset/doc/48084

Log:
  Update to r44371:
  
  Recover lost <replaceable> tags.

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

Modified: head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 11:41:04 2016	(r48083)
+++ head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 12:29:06 2016	(r48084)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r44288
+     basiert auf: r44371
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
   <info><title>Konfiguration des &os;-Kernels</title>
@@ -395,7 +395,7 @@ options         IPDIVERT
 
     <para>Dies ist der Name des Kernels.  Setzen Sie hier den Namen
       des neuen Kernels ein, beispielsweise
-      <literal>MYKERNEL</literal>.  Der Wert von
+      <literal><replaceable>MYKERNEL</replaceable></literal>.  Der Wert von
       <literal>ident</literal> wird beim Booten des neuen Kernels
       ausgegeben.</para>
 
@@ -1360,8 +1360,8 @@ device          fwe           # Ethernet
 	    im Bootmenü die Option
 	    <quote>Escape to a loader prompt</quote>.  Danach
 	    geben Sie am Prompt
-	    <command>boot kernel.old</command> oder
-	    den Namen eines anderen Kernels ein, der sauber
+	    <command>boot <replaceable>kernel.old</replaceable></command>
+	    oder den Namen eines anderen Kernels ein, der sauber
 	    bootet.</para>
 
           <para>Nun kann die Konfiguration noch einmal überprüft und
@@ -1384,8 +1384,8 @@ device          fwe           # Ethernet
 	      schnell wie möglich, indem Sie das Verzeichnis mit dem
 	      funktionierenden Kernel umbenennen:</para>
 
-	    <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
-&prompt.root; <userinput>mv /boot/kernel.good /boot/kernel</userinput></screen>
+	    <screen>&prompt.root; <userinput>mv /boot/kernel <replaceable>/boot/kernel.bad</replaceable></userinput>
+&prompt.root; <userinput>mv <replaceable>/boot/kernel.good</replaceable> /boot/kernel</userinput></screen>
 
 	  </note>
         </listitem>

From owner-svn-doc-all@freebsd.org  Sun Jan 24 12:53:45 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8CE9999F42;
 Sun, 24 Jan 2016 12:53:45 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8A9C4FC8;
 Sun, 24 Jan 2016 12:53:45 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OCriMH055840;
 Sun, 24 Jan 2016 12:53:44 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OCriEs055839;
 Sun, 24 Jan 2016 12:53:44 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601241253.u0OCriEs055839@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 24 Jan 2016 12:53:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48085 - head/de_DE.ISO8859-1/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 12:53:45 -0000

Author: bhd
Date: Sun Jan 24 12:53:44 2016
New Revision: 48085
URL: https://svnweb.freebsd.org/changeset/doc/48085

Log:
  Update to r 46043:
  
  Wrap long xmlns lines.
  While here, fix some minor nits found by igor(8).

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

Modified: head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 12:29:06 2016	(r48084)
+++ head/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Jan 24 12:53:44 2016	(r48085)
@@ -5,10 +5,14 @@
 
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r44371
+     basiert auf: r46043
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
-  <info><title>Konfiguration des &os;-Kernels</title>
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="kernelconfig">
+  <info>
+    <title>Konfiguration des &os;-Kernels</title>
+
     <!--
     <authorgroup>
       <author><personname><firstname>Jim</firstname><surname>Mock</surname></personname><contrib>Erweitert und neu strukturiert von </contrib></author>
@@ -22,8 +26,6 @@
     -->
   </info>
 
-  
-
   <sect1 xml:id="kernelconfig-synopsis">
     <title>Übersicht</title>
 
@@ -33,18 +35,18 @@
     </indexterm>
 
     <para>Der Kernel ist das Herz des &os;-Betriebssystems.  Er ist
-      verantwortlich für die Speicherverwaltung, das Durchsetzen
-      von Sicherheitsdirektiven, Netzwerkfähigkeit, Festplattenzugriffen
+      verantwortlich für die Speicherverwaltung, das Durchsetzen von
+      Sicherheitsdirektiven, Netzwerkfähigkeit, Festplattenzugriffen
       und vieles mehr.  Obwohl &os; es ermöglicht, dynamisch
       konfiguriert zu werden, ist es ab und an notwendig, einen
       angepassten Kernel zu konfigurieren und zu kompilieren.</para>
 
-    <para>Nachdem Sie dieses Kapitel gelesen haben, werden Sie Folgendes
-      wissen:</para>
+    <para>Nachdem Sie dieses Kapitel gelesen haben, werden Sie
+      Folgendes wissen:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Wann Sie einen angepassten Kernel kompilieren
+	<para>Wann Sie einen angepassten Kernel kompilieren
 	  sollten.</para>
       </listitem>
 
@@ -53,25 +55,25 @@
       </listitem>
 
       <listitem>
-        <para>Wie Sie eine Kernelkonfigurationsdatei verändern.</para>
+	<para>Wie Sie eine Kernelkonfigurationsdatei verändern.</para>
       </listitem>
 
       <listitem>
-        <para>Wie Sie mit der Konfigurationsdatei einen neuen Kernel
+	<para>Wie Sie mit der Konfigurationsdatei einen neuen Kernel
 	  kompilieren.</para>
       </listitem>
 
       <listitem>
-        <para>Wie Sie den neuen Kernel installieren.</para>
+	<para>Wie Sie den neuen Kernel installieren.</para>
       </listitem>
 
       <listitem>
-        <para>Was zu tun ist, falls etwas schiefgeht.</para>
+	<para>Was zu tun ist, falls etwas schiefgeht.</para>
       </listitem>
     </itemizedlist>
 
-    <para>Alle Kommandos, aus den Beispielen dieses Kapitels,
-      müssen mit <systemitem class="username">root</systemitem>-Rechten
+    <para>Alle Kommandos, aus den Beispielen dieses Kapitels, müssen
+      mit <systemitem class="username">root</systemitem>-Rechten
       ausgeführt werden.</para>
   </sect1>
 
@@ -108,24 +110,24 @@
 
     <itemizedlist>
       <listitem>
-        <para>Schnellerer Bootvorgang.  Da der Kernel nur
+	<para>Schnellerer Bootvorgang.  Da der Kernel nur
 	  nach der Hardware des Systems sucht, kann sich
 	  die Zeit für einen Systemstart verkürzen.</para>
       </listitem>
 
       <listitem>
-        <para>Geringerer Speicherbedarf.  Ein eigener Kernel
+	<para>Geringerer Speicherbedarf.  Ein eigener Kernel
 	  benötigt in der Regel weniger Speicher als ein
 	  <filename>GENERIC</filename>-Kernel durch das Entfernen von
-	  Funktionen und Gerätetreibern. Das ist vorteilhaft, denn der
-	  Kernel verweilt immer im RAM und verhindert dadurch, dass dieser
-	  Speicher von Anwendungen genutzt wird.  Deshalb ist ein
-	  angepasster Kernel auf einem System mit wenig RAM
+	  Funktionen und Gerätetreibern.  Das ist vorteilhaft, denn
+	  der Kernel verweilt immer im RAM und verhindert dadurch,
+	  dass dieser Speicher von Anwendungen genutzt wird.  Deshalb
+	  ist ein angepasster Kernel auf einem System mit wenig RAM
 	  sinnvoll.</para>
       </listitem>
 
       <listitem>
-        <para>Zusätzliche Hardwareunterstützung.  Ein
+	<para>Zusätzliche Hardwareunterstützung.  Ein
 	  angepasster Kernel kann Unterstützung für
 	  Geräte bieten, die im
 	  <filename>GENERIC</filename>-Kernel nicht enthalten
@@ -160,9 +162,11 @@ following line in &man.loader.conf.5;:
       bestimmte Subsysteme.</para>
   </sect1>
 
- <sect1 xml:id="kernelconfig-devices">
-    <info><title>Informationen über die vorhandene Hardware
-      beschaffen</title>
+  <sect1 xml:id="kernelconfig-devices">
+    <info>
+      <title>Informationen über die vorhandene Hardware
+	beschaffen</title>
+
       <!--
       <authorgroup>
 	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Geschrieben von </contrib></author>
@@ -170,8 +174,6 @@ following line in &man.loader.conf.5;:
       -->
     </info>
 
-    
-
     <para>Bevor die Kernelkonfigurationsdatei bearbeitet wird, ist es
       empfehlenswert eine Bestandsaufnahme der Hardware des Systems
       durchzuführen.  Auf einem Dual-Boot-System können diese
@@ -293,11 +295,10 @@ ath_hal(4)               - Atheros Hardw
     <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>amd64</replaceable>/conf</userinput>
 &prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen>
 
-    <para>Editieren Sie
-      <filename><replaceable>MYKERNEL</replaceable></filename> mit
-      einem Texteditor.  Der Standard-Editor ist
-      <application>vi</application>, jedoch steht mit
-      <application>ee</application> ein weiterer, einfach zu
+    <para><filename><replaceable>MYKERNEL</replaceable></filename>
+      kann jetzt mit einem Texteditor bearbeitet werden.  Der
+      Standard-Editor ist <application>vi</application>, jedoch steht
+      mit <application>ee</application> ein weiterer, einfach zu
       bedienender Editor bereit.</para>
 
     <indexterm>
@@ -333,12 +334,12 @@ ath_hal(4)               - Atheros Hardw
 
     <tip>
       <para>Wenn Sie die Kernelkonfigurationsdatei fertig bearbeitet
-        haben, sollten Sie eine Sicherungskopie außerhalb von
+	haben, sollten Sie eine Sicherungskopie außerhalb von
 	<filename>/usr/src</filename> speichern</para>
 
       <para>Alternativ kann die Kernelkonfigurationsdatei an anderer
-      Stelle gespeichert, und ein symbolischer Link auf die Datei
-      erstellt werden:</para>
+	Stelle gespeichert, und ein symbolischer Link auf die Datei
+	erstellt werden:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src/sys/amd64/conf</userinput>
 &prompt.root; <userinput>mkdir /root/kernels</userinput>
@@ -1360,7 +1361,8 @@ device          fwe           # Ethernet
 	    im Bootmenü die Option
 	    <quote>Escape to a loader prompt</quote>.  Danach
 	    geben Sie am Prompt
-	    <command>boot <replaceable>kernel.old</replaceable></command>
+	    <command>boot
+	      <replaceable>kernel.old</replaceable></command>
 	    oder den Namen eines anderen Kernels ein, der sauber
 	    bootet.</para>
 

From owner-svn-doc-all@freebsd.org  Sun Jan 24 13:07:58 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4A467318;
 Sun, 24 Jan 2016 13:07:58 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7578785B;
 Sun, 24 Jan 2016 13:07:58 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OD7vFh058911;
 Sun, 24 Jan 2016 13:07:57 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OD7v0P058910;
 Sun, 24 Jan 2016 13:07:57 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601241307.u0OD7v0P058910@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 24 Jan 2016 13:07:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48086 - head/de_DE.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 13:07:58 -0000

Author: bhd
Date: Sun Jan 24 13:07:57 2016
New Revision: 48086
URL: https://svnweb.freebsd.org/changeset/doc/48086

Log:
  Update to r48082:
  
  Add --with-ck-launch to the startxfce command.

Modified:
  head/de_DE.ISO8859-1/books/handbook/x11/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/x11/chapter.xml	Sun Jan 24 12:53:44 2016	(r48085)
+++ head/de_DE.ISO8859-1/books/handbook/x11/chapter.xml	Sun Jan 24 13:07:57 2016	(r48086)
@@ -4,7 +4,7 @@
 
      $FreeBSD$
      $FreeBSDde: de-docproj/books/handbook/x11/chapter.xml,v 1.79 2012/04/30 16:18:12 bcr Exp $
-     basiert auf: r47900
+     basiert auf: r48082
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -1678,7 +1678,7 @@ DisplayManager.requestPort:     0</progr
 	werden kann, muss zunächst ein Eintrag in
 	<filename>~/.xinitrc</filename> hinzugefügt werden:</para>
 
-      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4" &gt; ~/.xinitrc</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" &gt; ~/.xinitrc</userinput></screen>
 
       <para>Alternativ dazu kann <application>XDM</application>
 	verwendet werden.  Um diese Methode zu konfigurieren,
@@ -1686,7 +1686,7 @@ DisplayManager.requestPort:     0</progr
 	<filename>~/.xsession</filename>:</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" &gt; ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4" &gt;&gt; ~/.xsession</userinput>
+&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" &gt;&gt; ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>
   </sect1>

From owner-svn-doc-all@freebsd.org  Sun Jan 24 14:11:36 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 492D09C2B08;
 Sun, 24 Jan 2016 14:11:36 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 19C4BE05;
 Sun, 24 Jan 2016 14:11:36 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OEBZVm078312;
 Sun, 24 Jan 2016 14:11:35 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OEBZ9w078311;
 Sun, 24 Jan 2016 14:11:35 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601241411.u0OEBZ9w078311@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 24 Jan 2016 14:11:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48087 -
 head/de_DE.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 14:11:36 -0000

Author: bhd
Date: Sun Jan 24 14:11:34 2016
New Revision: 48087
URL: https://svnweb.freebsd.org/changeset/doc/48087

Log:
  Update to r42610:
  
  Correct the name of the dhcpd example configuration file.

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

Modified: head/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Jan 24 13:07:57 2016	(r48086)
+++ head/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Jan 24 14:11:34 2016	(r48087)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde: de-docproj/books/handbook/network-servers/chapter.xml,v 1.103 2011/12/24 15:51:18 bcr Exp $
-     basiert auf: r42602
+     basiert auf: r42610
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="network-servers">
   <info><title>Netzwerkserver</title>
@@ -3256,6 +3256,11 @@ dhclient_flags=""</programlisting>
               entfernen, wenn DHCP nicht verwendet wird.</para>
           </note>
 
+	<para>Der Port <package>net/isc-dhcp42-server</package>
+	  installiert eine Beispiel-Konfigurationsdatei.  Kopieren
+	  Sie <filename>/usr/local/etc/dhcpd.conf.example</filename>
+	  nach <filename>/usr/local/etc/dhcpd.conf</filename> und
+	  nehmen Sie die Änderungen an der neuen Datei vor.</para>
         <para>Danach muss die vom Port
 	  <package>net/isc-dhcp42-server</package>
 	  erzeugte Vorlage für <filename>dhcpd.conf</filename>

From owner-svn-doc-all@freebsd.org  Sun Jan 24 23:20:17 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B27BA31D46;
 Sun, 24 Jan 2016 23:20:17 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E1BA9E63;
 Sun, 24 Jan 2016 23:20:16 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0ONKFgB047543;
 Sun, 24 Jan 2016 23:20:15 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0ONKFem047542;
 Sun, 24 Jan 2016 23:20:15 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601242320.u0ONKFem047542@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 24 Jan 2016 23:20:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48088 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2016 23:20:17 -0000

Author: wblock
Date: Sun Jan 24 23:20:15 2016
New Revision: 48088
URL: https://svnweb.freebsd.org/changeset/doc/48088

Log:
  Add some settings for the newest version of dblatex.  The doc build can
  once again use dblatex, but the formatting still needs work.  To use,
  switch to the document directory and
    make FORMATS=pdf RENDERENGINE=dblatex

Modified:
  head/share/xml/freebsd-dblatex.xsl

Modified: head/share/xml/freebsd-dblatex.xsl
==============================================================================
--- head/share/xml/freebsd-dblatex.xsl	Sun Jan 24 14:11:34 2016	(r48087)
+++ head/share/xml/freebsd-dblatex.xsl	Sun Jan 24 23:20:15 2016	(r48088)
@@ -7,7 +7,15 @@
   <!-- $FreeBSD$ -->
 
   <!-- The localization layer is the same preference level of this file -->
-  <xsl:include href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-dblatex.xsl"/>
+  <xsl:param name="page.margin.bottom">2cm</xsl:param>
+  <xsl:param name="page.margin.inner">3cm</xsl:param>
+  <xsl:param name="page.margin.outer">2.5cm</xsl:param>
+  <xsl:param name="page.margin.top">2.13cm</xsl:param>
+  <xsl:param name="monospace.font.family">Courier-New</xsl:param>
+  <xsl:param name="xref.hypermarkup">1</xsl:param>
+  <xsl:param name="latex.hyperparam">colorlinks,linkcolor=blue,pdfstartview=FitH</xsl:param>
+  <xsl:param name="literal.extensions">scale.by.width</xsl:param>
+  <xsl:param name="doc.lot.show">figure,table,example</xsl:param>
 
   <xsl:param name="latex.encoding">utf8</xsl:param>
   <xsl:param name="latex.hyperparam">linktocpage,colorlinks,linkcolor=blue,citecolor=blue,urlcolor=blue</xsl:param>
@@ -26,7 +34,7 @@
     </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
- 
+
   <xsl:template match="text()" mode="tex.escape">
     <xsl:variable name="t1" select="str:replace(., '\', '\\')"/>
     <xsl:variable name="t2" select="str:replace($t1, '^', '\^')"/>

From owner-svn-doc-all@freebsd.org  Mon Jan 25 05:05:55 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E71C2A31D2B;
 Mon, 25 Jan 2016 05:05:55 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 ADFB812B7;
 Mon, 25 Jan 2016 05:05:55 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0P55sn0048981;
 Mon, 25 Jan 2016 05:05:54 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0P55s0K048980;
 Mon, 25 Jan 2016 05:05:54 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601250505.u0P55s0K048980@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 25 Jan 2016 05:05:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48089 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 05:05:56 -0000

Author: wblock
Date: Mon Jan 25 05:05:54 2016
New Revision: 48089
URL: https://svnweb.freebsd.org/changeset/doc/48089

Log:
  Correct the name of the rpm4 port.  Pointed out by forum user masayoshi.

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Sun Jan 24 23:20:15 2016	(r48088)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jan 25 05:05:54 2016	(r48089)
@@ -259,9 +259,9 @@ Abort</screen>
       <title>Installing a &linux; <acronym>RPM</acronym> Based
 	Application</title>
 
-      <para>In order to install a &linux; <acronym>RPM</acronym>-based
+      <para>To install a &linux; <acronym>RPM</acronym>-based
 	application, first install the
-	<package>archivers/rpm</package> package or port.  Once
+	<package>archivers/rpm4</package> package or port.  Once
 	installed, <systemitem class="username">root</systemitem> can
 	use this command to install a
 	<filename>.rpm</filename>:</para>

From owner-svn-doc-all@freebsd.org  Mon Jan 25 05:12:22 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2145DA31FB3;
 Mon, 25 Jan 2016 05:12:22 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CA7AD1754;
 Mon, 25 Jan 2016 05:12:21 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0P5CKcU051237;
 Mon, 25 Jan 2016 05:12:20 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0P5CKeI051236;
 Mon, 25 Jan 2016 05:12:20 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601250512.u0P5CKeI051236@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 25 Jan 2016 05:12:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48090 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 05:12:22 -0000

Author: wblock
Date: Mon Jan 25 05:12:20 2016
New Revision: 48090
URL: https://svnweb.freebsd.org/changeset/doc/48090

Log:
  Whitespace-only fixes, translators please ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jan 25 05:05:54 2016	(r48089)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jan 25 05:12:20 2016	(r48090)
@@ -638,9 +638,9 @@ FEATURE Maple maplelmg 2000.0831 permane
 
     <para>The &linux; version of <application>&matlab;</application>
       can be purchased and licensed from <ulink
-	url="http://www.mathworks.com/products/matlab/">
-	MathWorks</ulink>.  Consider letting the company know that
-      you would like a native &os; version of this software.</para>
+	url="http://www.mathworks.com/products/matlab/">MathWorks</ulink>.
+      Consider letting the company know that you would like a native
+      &os; version of this software.</para>
 
     <sect2>
       <title>Installing &matlab;</title>
@@ -1203,10 +1203,10 @@ export PATH</programlisting>
     <para>&linux; mode dynamically <emphasis>reroots</emphasis>
       lookups.  This is, in effect, equivalent to the
       <option>union</option> option to file system mounts.  First, an
-      attempt is made to lookup the file in <filename
-	>/compat/linux/<replaceable>original-path</replaceable></filename>.
-      If that fails, the lookup is done in <filename
-	>/<replaceable>original-path</replaceable></filename>.
+      attempt is made to lookup the file in
+      <filename>/compat/linux/<replaceable>original-path</replaceable></filename>.
+      If that fails, the lookup is done in
+      <filename>/<replaceable>original-path</replaceable></filename>.
       This makes sure that binaries that require other binaries can
       run.  For example, the &linux; toolchain can all run under
       &linux; <acronym>ABI</acronym> support.  It also means that the
@@ -1214,7 +1214,7 @@ export PATH</programlisting>
       are no corresponding &linux; binaries present, and that a
       &man.uname.1; command can be placed in the
       <filename>/compat/linux</filename> directory tree to ensure that
-      the &linux; binaries can not tell they are not running on
+      the &linux; binaries cannot tell they are not running on
       &linux;.</para>
 
     <para>In effect, there is a &linux; kernel in the &os; kernel.

From owner-svn-doc-all@freebsd.org  Mon Jan 25 14:16:20 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CEE7A46615;
 Mon, 25 Jan 2016 14:16:20 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0EB02355;
 Mon, 25 Jan 2016 14:16:19 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PEGJWq016422;
 Mon, 25 Jan 2016 14:16:19 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PEGJ7H016421;
 Mon, 25 Jan 2016 14:16:19 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201601251416.u0PEGJ7H016421@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 25 Jan 2016 14:16:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48091 - head/ja_JP.eucJP/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 14:16:20 -0000

Author: ryusuke
Date: Mon Jan 25 14:16:18 2016
New Revision: 48091
URL: https://svnweb.freebsd.org/changeset/doc/48091

Log:
  - Merge the following from the English version:
  
  	r46930 -> r47098	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Mon Jan 25 05:12:20 2016	(r48090)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Mon Jan 25 14:16:18 2016	(r48091)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46930
+     Original revision: r47098
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -263,59 +263,6 @@
     <screen>&prompt.root; <userinput>pkg install xorg</userinput></screen>
   </sect1>
 
-  <sect1 xml:id="x-config-quick-start">
-    <title>¥¯¥£¥Ã¥¯¥¹¥¿¡¼¥È</title>
-
-    <para>¤Û¤È¤ó¤É¤Î¾ì¹ç <application>&xorg;</application> ¤Ï¼«¸Ê¹½À®¤Ç¤¹¡£
-      ÀßÄê¥Õ¥¡¥¤¥ë¤òÊѹ¹¤»¤º¤Ëµ¯Æ°¤·¤Æ¤â¡¢
-      ¥Ó¥Ç¥ª¥«¡¼¥É¤ª¤è¤ÓÆþÎϥǥХ¤¥¹¤Ï¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¤Æ»È¤ï¤ì¤Þ¤¹¡£
-      ¼«Æ°ÀßÄê¤ÏºÇ¤â¹¥¤Þ¤·¤¤ÊýË¡¤Ç¡¢ºÇ½é¤Ë»î¤·¤Æ¤ß¤ë¤Ù¤­ÊýË¡¤Ç¤¹¡£</para>
-
-    <procedure xml:id="x-config-quick-start-procedure">
-      <step>
-	<para>X ¥µ¡¼¥Ð¤¬ <acronym>HAL</acronym>
-	  ¤ò»È¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.user; <userinput>pkg info xorg-server | grep HAL</userinput></screen>
-
-	<para>¤â¤·¡¢<acronym>HAL</acronym> ¤¬
-	  <literal>off</literal> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
-	  ¼¡¤Î¥¹¥Æ¥Ã¥×¤Þ¤ÇÆɤßÈô¤Ð¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤â¤·¡¢<acronym>HAL</acronym> ¤¬ <literal>on</literal> ¤Ç¤¢¤ì¤Ð¡¢
-	  <filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î 2 ¤Ä¤Î¥¨¥ó¥È¥ê¤òÄɲ䷤ơ¢
-	  ɬÍפȤʤ륵¡¼¥Ó¥¹¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<programlisting>hald_enable="YES"
-dbus_enable="YES"</programlisting>
-
-	<screen>&prompt.root; <userinput>service hald start ; service dbus start</userinput></screen>
-      </step>
-
-      <step>
-	<para>¸Å¤¤ÈǤΠ<filename>xorg.conf</filename>
-	  ¤Î̾Á°¤òÊѹ¹¤¹¤ë¤«ºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>mv /etc/X11/xorg.conf ~/xorg.conf.etc</userinput>
-&prompt.root; <userinput>mv /usr/local/etc/X11/xorg.conf ~/xorg.conf.localetc</userinput></screen>
-      </step>
-
-      <step>
-	<para>X ¥·¥¹¥Æ¥à¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.user; <userinput>startx</userinput></screen>
-
-	<para>¥Þ¥¦¥¹¤òÆ°¤«¤·¤¿¤ê¡¢¥¦¥£¥ó¥É¥¦¤ËÂФ·¤Æ¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Æ¡¢
-	  ¥·¥¹¥Æ¥à¤¬Àµ¤·¤¯Æ°¤¤¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¥Þ¥¦¥¹¤ª¤è¤Ó¥­¡¼¥Ü¡¼¥É¤¬´üÂÔÄ̤ê¤ËÆ°¤¤¤Æ¤¤¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
-	  <xref linkend="x11-wm"/> ¤ª¤è¤Ó <xref linkend="x-xdm"/>
-	  ¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
-
-	<para>¤â¤·¥Þ¥¦¥¹¤ª¤è¤Ó¥­¡¼¥Ü¡¼¥É¤¬»×¤Ã¤¿¤è¤¦¤ËÆ°¤«¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	  <xref linkend="x-config"/> ¤Ë¿Ê¤ó¤ÇÀßÄê¤ò³¤±¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </step>
-    </procedure>
-  </sect1>
-
   <sect1 xml:id="x-config">
     <info><title><application>&xorg;</application> ¤ÎÀßÄê</title>
       <!--<authorgroup>
@@ -326,55 +273,78 @@ dbus_enable="YES"</programlisting>
     <indexterm><primary>&xorg;</primary></indexterm>
     <indexterm><primary><application>&xorg;</application></primary></indexterm>
 
-    <para>¸Å¤«¤Ã¤¿¤ê¡¢°ìÈÌŪ¤Ç¤Ï¤Ê¤¤¤è¤¦¤Êµ¡´ï¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢
-      ÀßÄê¤ò»Ï¤á¤ëÁ°¤Ë¡¢
-      °Ê²¼¤Î¥Ï¡¼¥É¥¦¥§¥¢¾ðÊó¤ò½¸¤á¤Æ¤ª¤¯¤È½õ¤±¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</para>
+    <para>¤Û¤È¤ó¤É¤Î¾ì¹ç <application>&xorg;</application> ¤Ï¼«¸Ê¹½À®¤Ç¤¹¡£
+      ¼«Æ°ÀßÄê¤ÏºÇ¤â¹¥¤Þ¤·¤¤ÊýË¡¤Ç¡¢ºÇ½é¤Ë»î¤·¤Æ¤ß¤ë¤Ù¤­ÊýË¡¤Ç¤¹¡£
+      ÀßÄê¥Õ¥¡¥¤¥ë¤òÊѹ¹¤»¤º¤Ë X ¤òµ¯Æ°¤·¤Æ¤â¡¢
+      ¥Ó¥Ç¥ª¥«¡¼¥É¤ª¤è¤ÓÆþÎϥǥХ¤¥¹¤Ï¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¤Æ»È¤ï¤ì¤Þ¤¹¡£
+      ¤â¤·¥·¥¹¥Æ¥à¤ËÀßÄê¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë¤¬¡¢
+      ¿·¤·¤¯ÀßÄê¤ò¹Ô¤¤¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+      ºÇ½é¤Ë¤³¤ì¤Þ¤Ç¤ÎÀßÄê¤òÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <itemizedlist>
-      <listitem>
-	<para>¥â¥Ë¥¿Æ±´ü¼þÇÈ¿ô</para>
-      </listitem>
+    <screen>&prompt.root; <userinput>mv /etc/X11/xorg.conf ~/xorg.conf.etc</userinput>
+&prompt.root; <userinput>mv /usr/local/etc/X11/xorg.conf ~/xorg.conf.localetc</userinput></screen>
 
-      <listitem>
-	<para>¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥Á¥Ã¥×¥»¥Ã¥È</para>
-      </listitem>
+    <para>ÀßÄê¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¡¢
+      X ¥·¥¹¥Æ¥à¤òµ¯Æ°¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <listitem>
-	<para>¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥á¥â¥ê</para>
-      </listitem>
-    </itemizedlist>
+    <screen>&prompt.user; <userinput>startx</userinput></screen>
+
+    <para>¹õ¤È¥°¥ì¡¼¤Î¥°¥ê¥Ã¥É¤È X
+      ¤Î¥Þ¥¦¥¹¥Ý¥¤¥ó¥¿¤¬¸½¤ï¤ì¤ì¤Ð¤½¤ÎÀßÄê¤ÏÀ®¸ù¤Ç¤¹¡£
+      ¥Þ¥¦¥¹¤òÆ°¤«¤·¤¿¤ê¡¢¥¦¥£¥ó¥É¥¦¤ËÂФ·¤Æ¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Æ¡¢
+      ¥·¥¹¥Æ¥à¤¬Àµ¤·¤¯Æ°¤¤¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+      ¥Æ¥¹¥È¤ò½ªÎ»¤¹¤ë¤Ë¤Ï¡¢X ¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿²¾ÁÛ¥³¥ó¥½¡¼¥ë¤Ë
+      <keycombo action="simul"> <keycap>Ctrl</keycap>
+	<keycap>Alt</keycap>
+	<keycap>F<replaceable>n</replaceable></keycap> </keycombo>
+      (1 ÈÖÌܤβ¾ÁÛ¥³¥ó¥½¡¼¥ë¤Ø¤Ï <keycap>F1</keycap>)
+      ¤ÈÆþÎϤ·¤ÆÀÚ¤êÂؤ¨¡¢<keycombo action="simul"> <keycap>Ctrl</keycap>
+	<keycap>C</keycap> </keycombo> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+    <para>¥Þ¥¦¥¹¤Þ¤¿¤Ï¥­¡¼¥Ü¡¼¥É¤¬Æ°¤«¤Ê¤¤¤è¤¦¤Ç¤·¤¿¤é¡¢<xref
+	linkend="x11-understanding"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+    <para><application>GNOME</application>, <application>KDE</application>
+      ¤â¤·¤¯¤Ï <application>Xfce</application> ¤Î¤è¤¦¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ï¡¢
+      ¥Ó¥Ç¥ª²òÁüÅ٤Τ褦¤Ê¥Ñ¥é¥á¡¼¥¿¤òÀßÄꤹ¤ë¥°¥é¥Õ¥£¥«¥ë¤Ê¥Ä¡¼¥ë¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+      ¤â¤·¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤¬¤¦¤Þ¤¯Æ°¤¯¾ì¹ç¤Ë¤Ï¡¢
+      <xref linkend="x11-wm"/>
+      ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Î¥¤¥ó¥¹¥È¡¼¥ëÎã¤Ø¤È¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
+
+    <note>
+      <para><keycombo action="simul">
+	  <keycap>Ctrl</keycap>
+	  <keycap>Alt</keycap>
+	  <keycap>Backspace</keycap>
+	</keycombo> ¥­¡¼¤ÎÁȤ߹ç¤ï¤»¤Ç¤â
+	<application>&xorg;</application> ¤ò½ªÎ»¤Ç¤­¤Þ¤¹¡£ 
+	X üËö¥¨¥ß¥å¥ì¡¼¥¿¤Ç°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.user; <userinput>setxkbmap -option terminate:ctrl_alt_bksp</userinput></screen>
+
+      <para>¤Þ¤¿¤Ï¡¢
+	<application>hald</application> ÍѤΥ­¡¼¥Ü¡¼¥ÉÀßÄê¥Õ¥¡¥¤¥ë
+	<filename>x11-input.fdi</filename> ¤òºîÀ®¤·¤Æ
+	<filename>/usr/local/etc/hal/fdi/policy</filename>
+	¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï°Ê²¼¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="iso-8859-1"?&gt;
+&lt;deviceinfo version="0.2"&gt;
+  &lt;device&gt;
+    &lt;match key="info.capabilities" contains="input.keyboard"&gt;
+	  &lt;merge key="input.x11_options.XkbOptions" type="string"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;
+    &lt;/match&gt;
+  &lt;/device&gt;
+&lt;/deviceinfo&gt;</programlisting>
 
-    <indexterm>
-      <primary>¿åʿƱ´ü¼þÇÈ¿ô</primary>
-    </indexterm>
-    <indexterm>
-      <primary>¿åÊ¿Áöºº¥ì¡¼¥È</primary>
-      <see>¿åʿƱ´ü¼þÇÈ¿ô</see>
-    </indexterm>
-    <indexterm><primary>¥ê¥Õ¥ì¥Ã¥·¥å¥ì¡¼¥È</primary></indexterm>
-    <indexterm>
-      <primary>¿âľƱ´ü¼þÇÈ¿ô</primary>
-      <see>¥ê¥Õ¥ì¥Ã¥·¥å¥ì¡¼¥È</see>
-    </indexterm>
-    <indexterm>
-      <primary>¿âľÁöºº¥ì¡¼¥È</primary>
-      <see>¥ê¥Õ¥ì¥Ã¥·¥å¥ì¡¼¥È</see>
-    </indexterm>
-
-    <para>²èÌ̤βòÁüÅ٤ȥê¥Õ¥ì¥Ã¥·¥å¥ì¡¼¥È¤Ï¡¢
-      ¥â¥Ë¥¿¤Î¿åÊ¿¤ª¤è¤Ó¿âľƱ´ü¼þÇÈ¿ô¤Ë¤è¤ê·èÄꤵ¤ì¤Þ¤¹¡£
-      ¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¥â¥Ë¥¿¤Ï¡¢¤³¤ì¤é¤ÎÃͤò¼«Æ°¸¡½Ð¤·¤Þ¤¹¡£
-      ¤³¤ì¤é¤ÎÃͤò¼«Æ°¸¡½Ð¤·¤Ê¤¤¥â¥Ë¥¿¤â¤¢¤ê¤Þ¤¹¤¬¡¢
-      ¤³¤¦¤¤¤Ã¤¿»ÅÍͤϡ¢ÉÕ°¤Î¥Þ¥Ë¥å¥¢¥ë¤ä¡¢
-      À½Â¤¸µ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹¡£</para>
-
-    <para>¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥Á¥Ã¥×¥»¥Ã¥È¤â¼«Æ°¸¡½Ð¤µ¤ì¡¢
-      ¥Ó¥Ç¥ª¥É¥é¥¤¥Ð¤ÎÁªÂò¤Ë»È¤ï¤ì¤Þ¤¹¡£
-      Àµ¾ï¤Ëǧ¼±¤µ¤ì¤Ê¤¤»þ¤Î¤¿¤á¤Ë¡¢
-      ¤É¤Î¥Á¥Ã¥×¥»¥Ã¥È¤¬»È¤ï¤ì¤Æ¤¤¤ë¤«¤òÃΤäƤª¤¯¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
+      <para><filename>xorg.conf.new</filename> ¤Î
+	<literal>ServerLayout</literal> ¤â¤·¤¯¤Ï
+	<literal>ServerFlags</literal> ¥»¥¯¥·¥ç¥ó¤Ë¡¢
+	°Ê²¼¤Î¹Ô¤òÄɲ乤ëɬÍפ⤢¤ë¤Ç¤·¤ç¤¦¡£</para>
 
-    <para>¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥á¥â¥ê¤Ï¡¢
-      ¥°¥é¥Õ¥£¥Ã¥¯¥¢¥À¥×¥¿¤¬¤É¤Î²òÁüÅ٤Ȥɤο§¿ô¤ÇÆ°¤¯¤³¤È¤¬¤Ç¤­¤ë¤«¤ò·è¤á¤Þ¤¹¡£</para>
+      <programlisting>Option	"DontZap"	"off"</programlisting>
+    </note>
 
     <sect2>
       <title>Ãí°Õ</title>
@@ -417,61 +387,6 @@ dbus_enable="YES"</programlisting>
 	</listitem>	
       </itemizedlist>
     </sect2>
-
-    <sect2>
-      <title><application>&xorg;</application> ¤ÎÀßÄê</title>
-
-      <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<application>&xorg;</application> ¤Ï¡¢
-	<acronym>HAL</acronym> ¤òÍѤ¤¤Æ¥­¡¼¥Ü¡¼¥É¤ä¥Þ¥¦¥¹¤ò¼«Æ°Ç§¼±¤·¤Þ¤¹¡£
-	<package>x11/xorg</package> ¤Î°Í¸¤È¤·¤Æ¡¢
-	<package>sysutils/hal</package> ¤ª¤è¤Ó
-	<package>devel/dbus</package> port
-	¤¬¼«Æ°Åª¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¤¬¡¢°Ê²¼¤Î¤è¤¦¤Ê¥¨¥ó¥È¥ê¤ò
-	<filename>/etc/rc.conf</filename> ¤ËÄɲä·¡¢
-	Í­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
-
-      <programlisting>hald_enable="YES"
-dbus_enable="YES"</programlisting>
-
-      <para><application>&xorg;</application> ¤ÎÀßÄ꤬¹Ô¤ï¤ì¤ëÁ°¤Ë¡¢
-	¤³¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>service hald start</userinput>
-&prompt.root; <userinput>service dbus start</userinput></screen>
-
-      <para>°ìÅÙ¤³¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤·¤¿¤é¡¢
-	°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ <application>&xorg;</application>
-	¤Î¼«Æ°ÀßÄê¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>
-
-      <para>¤³¤ì¤Ë¤è¤ê¡¢<filename>/root/xorg.conf.new</filename>
-	¤È¤¤¤¦¡¢¸¡½Ð¤µ¤ì¤¿¥Ï¡¼¥É¥¦¥§¥¢¤ËÂФ·¡¢
-	ŬÀڤʥɥ饤¥Ð¤òÆɤ߹þ¤à¤è¤¦¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Î¿÷·Á¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
-	¼¡¤Ë¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¡¢
-	¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤¬¤½¤Î¥°¥é¥Õ¥£¥Ã¥¯¥Ï¡¼¥É¥¦¥§¥¢¤ÇÆ°¤¯¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
-
-      <para>¤â¤·¡¢¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢<xref
-	  linkend="x11-understanding"/> ¤Ø¤È¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£
-	¤¦¤Þ¤¯Æ°¤¤¤¿¾ì¹ç¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò
-	<filename>/etc/X11/xorg.conf</filename>
-	¤Ø¤È¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>cp xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
-
-      <note>
-	<para><application>GNOME</application>,
-	  <application>KDE</application> ¤â¤·¤¯¤Ï
-	  <application>Xfce</application>
-	  ¤Î¤è¤¦¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ï¡¢
-	  ¥Ó¥Ç¥ª²òÁüÅ٤Τ褦¤Ê¥Ñ¥é¥á¡¼¥¿¤òÀßÄꤹ¤ë¥°¥é¥Õ¥£¥«¥ë¤Ê¥Ä¡¼¥ë¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	  ¤â¤·¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤¬¤¦¤Þ¤¯Æ°¤¯¾ì¹ç¤Ë¤Ï¡¢
-	  <xref linkend="x11-wm"/>
-	  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Î¥¤¥ó¥¹¥È¡¼¥ëÎã¤Ø¤È¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
-      </note>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="x-fonts">

From owner-svn-doc-all@freebsd.org  Mon Jan 25 15:39:54 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E81EFA462F2;
 Mon, 25 Jan 2016 15:39:54 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 B5451D3A;
 Mon, 25 Jan 2016 15:39:54 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PFdr8r040420;
 Mon, 25 Jan 2016 15:39:53 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PFdrfM040419;
 Mon, 25 Jan 2016 15:39:53 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201601251539.u0PFdrfM040419@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Mon, 25 Jan 2016 15:39:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48092 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 15:39:55 -0000

Author: allanjude
Date: Mon Jan 25 15:39:53 2016
New Revision: 48092
URL: https://svnweb.freebsd.org/changeset/doc/48092

Log:
  Fix a typo
  
  simular should be simulate
  
  Submitted by:	Johnny Eriksson <bygg at cafax.se>

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

Modified: head/en_US.ISO8859-1/htdocs/features.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/features.xml	Mon Jan 25 14:16:18 2016	(r48091)
+++ head/en_US.ISO8859-1/htdocs/features.xml	Mon Jan 25 15:39:53 2016	(r48092)
@@ -166,7 +166,7 @@
 	  The base system includes IPFW and IPFilter, as well as a
 	  modified version of the popular pf with improved SMP
 	  performance.  IPFW also includes the dummynet feature,
-	  allowing network administrators to simular adverse network
+	  allowing network administrators to simulate adverse network
 	  conditions, including latency, jitter, packet loss and
 	  limited bandwidth.</li>
 

From owner-svn-doc-all@freebsd.org  Mon Jan 25 21:22:07 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B13B3A46CA5;
 Mon, 25 Jan 2016 21:22:07 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7DF79905;
 Mon, 25 Jan 2016 21:22:07 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PLM6eh042335;
 Mon, 25 Jan 2016 21:22:06 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PLM65L042333;
 Mon, 25 Jan 2016 21:22:06 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601252122.u0PLM65L042333@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 25 Jan 2016 21:22:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48093 - in head/share: mk 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 21:22:07 -0000

Author: wblock
Date: Mon Jan 25 21:22:06 2016
New Revision: 48093
URL: https://svnweb.freebsd.org/changeset/doc/48093

Log:
  Improve the formatting of dblatex-produced PDF documents.

Modified:
  head/share/mk/doc.docbook.mk
  head/share/xml/freebsd-dblatex.xsl

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Mon Jan 25 15:39:53 2016	(r48092)
+++ head/share/mk/doc.docbook.mk	Mon Jan 25 21:22:06 2016	(r48093)
@@ -69,7 +69,7 @@ XSLTPROCOPTS?=	--nonet
 IMGDIR?=	${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}
 CALLOUTDIR=	${.CURDIR}/imagelib/callouts
 XSLDBLATEX=	${DOC_PREFIX}/share/xml/freebsd-dblatex.xsl
-DBLATEXOPTS?=	-I ${IMGDIR} -p ${XSLDBLATEX} -T simple -b xetex -d
+DBLATEXOPTS?=	-I ${IMGDIR} -p ${XSLDBLATEX} -b xetex -d
 FOPJAVAOPTS?=	-Xss1024k -Xmx1431552k
 FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf
 

Modified: head/share/xml/freebsd-dblatex.xsl
==============================================================================
--- head/share/xml/freebsd-dblatex.xsl	Mon Jan 25 15:39:53 2016	(r48092)
+++ head/share/xml/freebsd-dblatex.xsl	Mon Jan 25 21:22:06 2016	(r48093)
@@ -16,6 +16,9 @@
   <xsl:param name="latex.hyperparam">colorlinks,linkcolor=blue,pdfstartview=FitH</xsl:param>
   <xsl:param name="literal.extensions">scale.by.width</xsl:param>
   <xsl:param name="doc.lot.show">figure,table,example</xsl:param>
+  <xsl:param name="doc.pdfcreator.show">1</xsl:param>
+  <xsl:param name="latex.output.revhistory">0</xsl:param>
+  <xsl:param name="doc.collab.show">0</xsl:param>
 
   <xsl:param name="latex.encoding">utf8</xsl:param>
   <xsl:param name="latex.hyperparam">linktocpage,colorlinks,linkcolor=blue,citecolor=blue,urlcolor=blue</xsl:param>

From owner-svn-doc-all@freebsd.org  Mon Jan 25 21:32:46 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B69CA45119;
 Mon, 25 Jan 2016 21:32:46 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 181CBE20;
 Mon, 25 Jan 2016 21:32:46 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PLWjku047228;
 Mon, 25 Jan 2016 21:32:45 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PLWj58047227;
 Mon, 25 Jan 2016 21:32:45 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601252132.u0PLWj58047227@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 25 Jan 2016 21:32:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48094 - head/en_US.ISO8859-1/books/handbook/printing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 21:32:46 -0000

Author: wblock
Date: Mon Jan 25 21:32:44 2016
New Revision: 48094
URL: https://svnweb.freebsd.org/changeset/doc/48094

Log:
  Add some inexplicably missing words and reword a few sentences for
  clarity.

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

Modified: head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Mon Jan 25 21:22:06 2016	(r48093)
+++ head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Mon Jan 25 21:32:44 2016	(r48094)
@@ -118,11 +118,11 @@ Starting lpd.</screen>
 
     <para>Printers are connected to computer systems in a variety of
       ways.  Small desktop printers are usually connected directly to
-      computer's <acronym>USB</acronym> port.  Older printers are
+      a computer's <acronym>USB</acronym> port.  Older printers are
       connected to a parallel or <quote>printer</quote> port.  Some
       printers are directly connected to a network, making it easy for
-      multiple computers share them.  A few printers use a much less
-      common serial port connection.</para>
+      multiple computers to share them.  A few printers use a rare
+      serial port connection.</para>
 
     <para>&os; can communicate with all of these types of
       printers.</para>
@@ -144,7 +144,7 @@ Starting lpd.</screen>
 	    job, <filename>ulpt0</filename> resets the
 	    <acronym>USB</acronym> port.  Resetting the port can cause
 	    problems with some printers, so the
-	    <filename>unlpt0</filename> device is used instead.
+	    <filename>unlpt0</filename> device is usually used instead.
 	    <filename>unlpt0</filename> does not reset the USB port at
 	    all.</para>
 	</listitem>
@@ -187,9 +187,9 @@ Starting lpd.</screen>
 
 	  <para>Several communication parameters must be known to
 	    communicate with a serial printer.  The most important are
-	    <emphasis>baud rate</emphasis> and
+	    <emphasis>baud rate</emphasis> or <acronym>BPS</acronym> (Bits Per Second) and
 	    <emphasis>parity</emphasis>.  Values vary, but typical
-	    serial printers often use a baud rate of 9600 and no
+	    serial printers use a baud rate of 9600 and no
 	    parity.</para>
 	</listitem>
       </varlistentry>
@@ -1042,8 +1042,8 @@ lp:
 
 	<para>All of the documents print on that single printer.  When
 	  the Sales department grows enough to need their own printer,
-	  the alias is removed from the shared printer entry and used
-	  as the name of the new printer.  Users in both departments
+	  the alias can be removed from the shared printer entry and used
+	  as the name of a new printer.  Users in both departments
 	  continue to use the same commands, but the Sales documents
 	  are sent to the new printer.</para>
       </sect3>
@@ -1051,7 +1051,7 @@ lp:
       <sect3 xml:id="printing-shared-headers">
 	<title>Header Pages</title>
 
-	<para>Users can have difficulty locating their documents in
+	<para>It can be difficult for users to locate their documents in
 	  the stack of pages produced by a busy shared printer.
 	  <emphasis>Header pages</emphasis> were created to solve this
 	  problem.  A header page with the user name and document name
@@ -1062,7 +1062,7 @@ lp:
 	<para>Enabling header pages differs depending on whether the
 	  printer is connected directly to the computer with a
 	  <acronym>USB</acronym>, parallel, or serial cable, or
-	  is connected remotely by the network.</para>
+	  is connected remotely over a network.</para>
 
 	<para>Header pages on directly-connected printers are enabled
 	  by removing the <literal>:sh:\</literal> (Suppress Header)

From owner-svn-doc-all@freebsd.org  Mon Jan 25 22:41:18 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF70AA4690C;
 Mon, 25 Jan 2016 22:41:18 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6ED601562;
 Mon, 25 Jan 2016 22:41:18 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PMfHro065783;
 Mon, 25 Jan 2016 22:41:17 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PMfHTV065782;
 Mon, 25 Jan 2016 22:41:17 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601252241.u0PMfHTV065782@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 25 Jan 2016 22:41:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48095 - head/en_US.ISO8859-1/books/handbook/printing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 22:41:18 -0000

Author: wblock
Date: Mon Jan 25 22:41:17 2016
New Revision: 48095
URL: https://svnweb.freebsd.org/changeset/doc/48095

Log:
  Whitespace-only fixes, translators please ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Mon Jan 25 21:32:44 2016	(r48094)
+++ head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Mon Jan 25 22:41:17 2016	(r48095)
@@ -144,9 +144,9 @@ Starting lpd.</screen>
 	    job, <filename>ulpt0</filename> resets the
 	    <acronym>USB</acronym> port.  Resetting the port can cause
 	    problems with some printers, so the
-	    <filename>unlpt0</filename> device is usually used instead.
-	    <filename>unlpt0</filename> does not reset the USB port at
-	    all.</para>
+	    <filename>unlpt0</filename> device is usually used
+	    instead.  <filename>unlpt0</filename> does not reset the
+	    USB port at all.</para>
 	</listitem>
       </varlistentry>
 
@@ -187,10 +187,10 @@ Starting lpd.</screen>
 
 	  <para>Several communication parameters must be known to
 	    communicate with a serial printer.  The most important are
-	    <emphasis>baud rate</emphasis> or <acronym>BPS</acronym> (Bits Per Second) and
-	    <emphasis>parity</emphasis>.  Values vary, but typical
-	    serial printers use a baud rate of 9600 and no
-	    parity.</para>
+	    <emphasis>baud rate</emphasis> or <acronym>BPS</acronym>
+	    (Bits Per Second) and <emphasis>parity</emphasis>.  Values
+	    vary, but typical serial printers use a baud rate of 9600
+	    and no parity.</para>
 	</listitem>
       </varlistentry>
 
@@ -1042,17 +1042,17 @@ lp:
 
 	<para>All of the documents print on that single printer.  When
 	  the Sales department grows enough to need their own printer,
-	  the alias can be removed from the shared printer entry and used
-	  as the name of a new printer.  Users in both departments
-	  continue to use the same commands, but the Sales documents
-	  are sent to the new printer.</para>
+	  the alias can be removed from the shared printer entry and
+	  used as the name of a new printer.  Users in both
+	  departments continue to use the same commands, but the Sales
+	  documents are sent to the new printer.</para>
       </sect3>
 
       <sect3 xml:id="printing-shared-headers">
 	<title>Header Pages</title>
 
-	<para>It can be difficult for users to locate their documents in
-	  the stack of pages produced by a busy shared printer.
+	<para>It can be difficult for users to locate their documents
+	  in the stack of pages produced by a busy shared printer.
 	  <emphasis>Header pages</emphasis> were created to solve this
 	  problem.  A header page with the user name and document name
 	  is printed before each print job.  These pages are also

From owner-svn-doc-all@freebsd.org  Tue Jan 26 03:15:21 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 741C5A46004;
 Tue, 26 Jan 2016 03:15:21 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 4087C31B;
 Tue, 26 Jan 2016 03:15:21 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0Q3FKCW047315;
 Tue, 26 Jan 2016 03:15:20 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0Q3FK4h047314;
 Tue, 26 Jan 2016 03:15:20 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201601260315.u0Q3FK4h047314@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Tue, 26 Jan 2016 03:15:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48096 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 03:15:21 -0000

Author: bjk
Date: Tue Jan 26 03:15:20 2016
New Revision: 48096
URL: https://svnweb.freebsd.org/changeset/doc/48096

Log:
  Updates to the triage team entry from koobs

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml	Mon Jan 25 22:41:17 2016	(r48095)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml	Tue Jan 26 03:15:20 2016	(r48096)
@@ -2137,7 +2137,16 @@
       </task>
 
       <task>
-	<p>Recruit more suitable triagers into the team.</p>
+	<p>We are actively recruiting to grow our &os; Triage Team.
+	  If you are interested in participating and contributing to one
+	  of the most important community-facing areas of the &os;
+	  project, join #freebsd-bugs on the freenode IRC and let us
+	  know!</p>
+
+	<p>Experience with issue tracking is desirable, but not required.
+	  No prior internal project knowledge or technical skills are
+	  required, just bring your communication skills and awesome
+	  attitude. Training is provided.</p>
       </task>
     </help>
   </project>

From owner-svn-doc-all@freebsd.org  Tue Jan 26 23:27:46 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29C1DA6F5CF;
 Tue, 26 Jan 2016 23:27:46 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 EC9DB1620;
 Tue, 26 Jan 2016 23:27:45 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QNRi4p008556;
 Tue, 26 Jan 2016 23:27:44 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QNRicY008555;
 Tue, 26 Jan 2016 23:27:44 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601262327.u0QNRicY008555@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 26 Jan 2016 23:27:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48097 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 23:27:46 -0000

Author: wblock
Date: Tue Jan 26 23:27:44 2016
New Revision: 48097
URL: https://svnweb.freebsd.org/changeset/doc/48097

Log:
  Put a plain $FreeBSD$ in the generated PO, rather than an ID string that
  has been expanded by Subversion.  Thanks to bjk!

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Tue Jan 26 03:15:20 2016	(r48096)
+++ head/share/mk/doc.docbook.mk	Tue Jan 26 23:27:44 2016	(r48097)
@@ -290,7 +290,9 @@ PO_CATALOG_FILES+=     ${EXTRA_CATALOGS}
 PO_XMLLINT=	env XML_CATALOG_FILES="${PO_CATALOG_FILES}" ${PREFIX}/bin/xmllint
 
 # fix settings in PO file
-POSET_CMD=	${SED} -i '' -e '1s,^,\#$$FreeBSD$$\${.newline},' \
+IDSTR1=		$$Free
+IDSTR2=		BSD$$
+POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDSTR1}${IDSTR2}\${.newline},' \
 			     -e 's,^\(\"Language-Team:.*\\n\"\),\1\${.newline}\"Language: ${PO_LANG}\\n\",' \
 			     -e 's,^\"Content-Type: text/plain; charset=.*\\n,\"Content-Type: text/plain; charset=${PO_CHARSET}\\n,'
 

From owner-svn-doc-all@freebsd.org  Tue Jan 26 23:42:49 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C578BA6FB55;
 Tue, 26 Jan 2016 23:42:49 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 956BB3EE;
 Tue, 26 Jan 2016 23:42:49 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QNgmPt014584;
 Tue, 26 Jan 2016 23:42:48 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QNgmTC014583;
 Tue, 26 Jan 2016 23:42:48 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601262342.u0QNgmTC014583@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 26 Jan 2016 23:42:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48098 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 23:42:49 -0000

Author: wblock
Date: Tue Jan 26 23:42:48 2016
New Revision: 48098
URL: https://svnweb.freebsd.org/changeset/doc/48098

Log:
  Run 'make SRCS' in the English document directory.  Some SRCS files are
  generated, like the list of mirrors used in the Handbook, and this will
  make certain they exist when the PO extraction process needs them.

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Tue Jan 26 23:27:44 2016	(r48097)
+++ head/share/mk/doc.docbook.mk	Tue Jan 26 23:42:48 2016	(r48098)
@@ -299,18 +299,20 @@ POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDS
 .if ${.TARGETS:Mpo} || ${.TARGETS:Mtran}
 
 MASTER_SRCS!=	${MAKE} -C ${EN_DIR} -V SRCS
-EN_SRCS=	${MASTER_SRCS:S,^,${EN_DIR}/,g}
 
-${DOC}.translate.xml:	${EN_SRCS}
+${DOC}.translate.xml:
 	@if [ "${TRAN_DIR}" == "${EN_DIR}" ]; then \
 		${ECHO} "build PO file in a non-English dir" ; \
 		exit 1 ; \
 	 fi
+	# some SRCS files might need to be generated, make sure they exist
+	@${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null
 	# normalize the English original into a single file
 	@${PO_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp
 	# remove redundant namespace attributes
 	@${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET}
 	@${RM} ${.TARGET}.tmp
+	@${MAKE} -C ${EN_DIR} clean > /dev/null
 
 po: ${PO_LANG}.po
 .PHONY:	po

From owner-svn-doc-all@freebsd.org  Wed Jan 27 08:09:34 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 251F2A4618F;
 Wed, 27 Jan 2016 08:09:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E4F1E15AE;
 Wed, 27 Jan 2016 08:09:33 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0R89XvE063387;
 Wed, 27 Jan 2016 08:09:33 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R89Wff063380;
 Wed, 27 Jan 2016 08:09:32 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201601270809.u0R89Wff063380@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 27 Jan 2016 08:09:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48099 - in head/share: security/advisories
 security/patches/SA-16:08 security/patches/SA-16:09 security/patches/SA-16:10
 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 08:09:34 -0000

Author: delphij
Date: Wed Jan 27 08:09:32 2016
New Revision: 48099
URL: https://svnweb.freebsd.org/changeset/doc/48099

Log:
  Add SA-16:08, SA-16:09 and SA-16:10.

Added:
  head/share/security/advisories/FreeBSD-SA-16:08.bind.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-SA-16:10.linux.asc   (contents, props changed)
  head/share/security/patches/SA-16:08/
  head/share/security/patches/SA-16:08/bind.patch   (contents, props changed)
  head/share/security/patches/SA-16:08/bind.patch.asc   (contents, props changed)
  head/share/security/patches/SA-16:09/
  head/share/security/patches/SA-16:09/ntp.patch   (contents, props changed)
  head/share/security/patches/SA-16:09/ntp.patch.asc   (contents, props changed)
  head/share/security/patches/SA-16:10/
  head/share/security/patches/SA-16:10/linux.patch   (contents, props changed)
  head/share/security/patches/SA-16:10/linux.patch.asc   (contents, props changed)
Modified:
  head/share/xml/advisories.xml

Added: head/share/security/advisories/FreeBSD-SA-16:08.bind.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-16:08.bind.asc	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,145 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:08.bind                                       Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          BIND remote denial of service vulnerability
+
+Category:       contrib
+Module:         bind
+Announced:      2016-01-27
+Credits:        ISC
+Affects:        FreeBSD 9.x
+Corrected:      2016-01-20 08:54:35 UTC (stable/9, 9.3-STABLE)
+                2016-01-27 07:42:11 UTC (releng/9.3, 9.3-RELEASE-p35)
+CVE Name:       CVE-2015-8704
+
+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.
+
+Address Prefixes List (APL RR) is a type of DNS Resource Record defined in
+RFC 3123.
+
+II.  Problem Description
+
+There is an off-by-one error in a buffer size check when performing certain
+string formatting operations.
+
+III. Impact
+
+Slaves using text-format db files could be vulnerable if receiving a
+malformed record in a zone transfer from their master.
+
+Masters using text-format db files could be vulnerable if they accept
+a malformed record in a DDNS update message.
+
+Recursive resolvers are potentially vulnerable when debug logging is
+enabled and if they are fed a deliberately malformed record by a
+malicious server.
+
+A server which has cached a specially constructed record could encounter
+this condition while performing 'rndc dumpdb'.
+
+IV.  Workaround
+
+No workaround is available, but hosts not running named(8) are not
+vulnerable.
+
+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.
+
+The named service has to be restarted after the update.  A reboot is
+recommended but not required.
+
+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
+
+The named service has to be restarted after the update.  A reboot is
+recommended but not required.
+
+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.
+
+[FreeBSD 9.3]
+# fetch https://security.FreeBSD.org/patches/SA-16:08/bind.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:08/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/9/                                                         r294405
+releng/9.3/                                                       r294905
+- -------------------------------------------------------------------------
+
+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-01335>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8704>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:08.bind.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAEBCgAGBQJWqHmfAAoJEO1n7NZdz2rngIkP/Ru1a5U14/iJKqGO2o+OQkk5
+j9G3rwEQROlPhtHdUE3vtA2fZcsayJaK1CjU3j91VWlTXHfBnju6gbJVPntNQqe5
+TxRFmRhRjcyreNdt6hKvFgDrXmWwrytRukJ/XafdYxoWFDTtrUScwrOH87U8ILcF
+gkWgzCQ7EnYqr7sEW1makDHmIOLukJo5pJOnUTRkraDP2oaKSros3GC+Fnh6Wf+q
+wYOkgl2gj96ubJW4SvdZCAKFtnMrhw0ZZyrVDuPojzWU+ZotzWvZz3xGvoSqXy5U
+rqqtUQNHMU0Aqhe9zurW4B2ioff6XALZPgRYqQRI8ezXTgDDhJSwa12mjTJuQmaR
+hQRJlW5u5/Ejj2NML6NkhvLuSApwZcAZ2G7cLGdR6nEKKVEb6mXgnL7T/CdhhTj8
+2owIz1iIdI2sUmhv6vuxPxB1k/O7b76LTZ2AL6jx4/mEtOVeofpNej5w7qnvCSqV
+RcZsOYRXrMZ0YWuhBkKqnMGGIU0TBMDvjJL5gxf5RR14iLExcC1fKhkhbvRMag4Y
+ck7Ja45Ltpwtd0t7/AfzbeI4OVmos4NB36HK5pYJchmOUavm6im5V6781mYGZgQn
+HtOQEyi7tSeft+Fz21dmK6Z1GV6lRmrt52wAKyJ71nA/WESgma50WE49RX+cH1MH
+nmon5PYKLuMuzFVNYZWs
+=HYpu
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,225 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:09.ntp                                        Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          Multiple vulnerabilities of ntp
+
+Category:       contrib
+Module:         ntp
+Announced:      2016-01-27
+Credits:        Cisco ASIG / Network Time Foundation
+Affects:        All supported versions of FreeBSD.
+Corrected:      2016-01-22 15:55:21 UTC (stable/10, 10.2-STABLE)
+                2016-01-27 07:41:31 UTC (releng/10.2, 10.2-RELEASE-p11)
+                2016-01-27 07:41:31 UTC (releng/10.1, 10.1-RELEASE-p28)
+                2016-01-22 15:56:35 UTC (stable/9, 9.3-STABLE)
+                2016-01-27 07:42:11 UTC (releng/9.3, 9.3-RELEASE-p35)
+CVE Name:       CVE-2015-7973, CVE-2015-7974, CVE-2015-7975, CVE-2015-7976,
+                CVE-2015-7977, CVE-2015-7978, CVE-2015-7979, CVE-2015-8138,
+                CVE-2015-8139, CVE-2015-8140, CVE-2015-8158
+
+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
+
+The ntpd(8) daemon is an implementation of the Network Time Protocol (NTP)
+used to synchronize the time of a computer system to a reference time
+source.
+
+II.  Problem Description
+
+Multiple vulnerabilities have been discovered in ntp 4.2.8p5:
+
+Potential Infinite Loop in ntpq. [CVE-2015-8158]
+
+A logic error would allow packets with an origin timestamp of zero
+to bypass this check whenever there is not an outstanding request
+to the server.  [CVE-2015-8138]
+
+Off-path Denial of Service (DoS) attack on authenticated broadcast mode.
+[CVE-2015-7979]
+
+Stack exhaustion in recursive traversal of restriction list. [CVE-2015-7978]
+
+reslist NULL pointer dereference. [CVE-2015-7977]
+
+ntpq saveconfig command allows dangerous characters in filenames.
+[CVE-2015-7976]
+
+nextvar() missing length check. [CVE-2015-7975]
+
+Skeleton Key: Missing key check allows impersonation between authenticated
+peers. [CVE-2015-7974]
+
+Deja Vu: Replay attack on authenticated broadcast mode. [CVE-2015-7973]
+
+ntpq vulnerable to replay attacks. [CVE-2015-8140]
+
+Origin Leak: ntpq and ntpdc, disclose origin. [CVE-2015-8139]
+
+III. Impact
+
+A malicious NTP server, or an attacker who can conduct MITM attack by
+intercepting NTP query traffic, may be able to cause a ntpq client to
+infinitely loop. [CVE-2015-8158]
+
+A malicious NTP server, or an attacker who can conduct MITM attack by
+intercepting NTP query traffic, may be able to prevent a ntpd(8) daemon
+to distinguish between legitimate peer responses from forgeries.  This
+can partially be mitigated by configuring multiple time sources.
+[CVE-2015-8138]
+
+An off-path attacker who can send broadcast packets with bad
+authentication (wrong key, mismatched key, incorrect MAC, etc) to
+broadcast clients can cause these clients to tear down associations.
+[CVE-2015-7979]
+
+An attacker who can send unauthenticated 'reslist' command to a NTP
+server may cause it to crash, resulting in a denial of service
+condition due to stack exhaustion [CVE-2015-7978] or a NULL pointer
+dereference [CVE-2015-7977].
+
+An attacker who can send 'modify' requests to a NTP server may be
+able to create file that contain dangerous characters in their name,
+which could cause dangerous behavior in a later shell invocation.
+[CVE-2015-7976] 
+
+A remote attacker may be able to crash a ntpq client. [CVE-2015-7975]
+
+A malicious server which holds a trusted key may be able to
+impersonate other trusted servers in an authenticated configuration.
+[CVE-2015-7974]
+
+A man-in-the-middle attacker or a malicious participant that has the
+same trusted keys as the victim can replay time packets if the NTP
+network is configured for broadcast operations. [CVE-2015-7973]
+
+The ntpq protocol is vulnerable to replay attacks which may be used
+to e.g. re-establish an association to malicious server. [CVE-2015-8140]
+
+An attacker who can intercept NTP traffic can easily forge live server
+responses. [CVE-2015-8139]
+
+IV.  Workaround
+
+No workaround is available, but systems not running ntpd(8) are not
+affected.  Network administrators are advised to implement BCP-38,
+which helps to reduce risk associated with the attacks.
+
+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.
+
+The ntpd service has to be restarted after the update.  A reboot is
+recommended but not required.
+
+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
+
+The ntpd service has to be restarted after the update.  A reboot is
+recommended but not required.
+
+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-16:09/ntp.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:09/ntp.patch.asc
+# gpg --verify ntp.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/9/                                                         r294570
+releng/9.3/                                                       r294905
+stable/10/                                                        r294569
+releng/10.1/                                                      r294904
+releng/10.2/                                                      r294904
+- -------------------------------------------------------------------------
+
+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:http://support.ntp.org/bin/view/Main/SecurityNotice#January_2016_NTP_4_2_8p6_Securit>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7973>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7974>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7975>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7976>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7977>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7978>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7979>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8138>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8139>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8140>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8158>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:09.ntp.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAEBCgAGBQJWqHmfAAoJEO1n7NZdz2rnt9cP/2EtdEPX/oBJXKFWqQv5cwvY
+C4gmlK5MZok2an330XMPl0RO2RplsIw4Lo4BuUh7HPKhVa5loYasabKrULQ+4Pgv
+z9INxDTDO8iooHeTeNe/VAb5YcKFrD7sqajdc0cY11rLEw1o53IuULz9wZnczAe/
+KnHDNUyYaSU2Ep+c3+ADSJqOk3ffhsGDS+0byoOBcUN+66MnBg19/rKomiN5a7Nt
+XSseoQgYISU8aaJDvPlGoaN/Xm5fnFZaKFlJ4y7h51sYYep0qgjQx+Gdakk0vNbh
+CwsjpBKqDpFpBcSgdEC/bYHnNpYUTJB/tPmG3YDO5jMWQISKGrrnuMYeh+7PjTDS
+vCrneztpVBscLG4ZKSlfmhpZ/Jfy31YPXm5P/w8NuA05i13K06P4gG5PKNyUMgsk
+AZQ4Vg8YlyS0Ci4ufdc+AIQI35QMrKvfecJVu49+sNhUA4PpTe7coEU9dks3Dtaw
+g2QbfnsEWzJ6RBJcw7aQDSgRoqrVQgMB8IIota+aMzeVurgyFxPm9LASk2RYjhmC
+Ep283cc+HPUnihKBZTwwkw5iznbmpyRYlPghEc7slgOZCbk9pefnsCMOZAqRW9fZ
+DUpt+HvZD5BKB4kCAUMIvKGS91cyBFaNcdJhlB8uUx2aP2UJmuzldk+x9K74wWGK
+lnP0IazzXnWFobfwr+qT
+=0ZhD
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-SA-16:10.linux.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-16:10.linux.asc	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,140 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:10.linux                                      Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          Linux compatibility layer issetugid(2) system call
+                vulnerability
+
+Category:       core
+Module:         kernel
+Announced:      2016-01-27
+Credits:        Isaac Dunham, Brent Cook, Warner Losh
+Affects:        All supported versions of FreeBSD.
+Corrected:      2016-01-27 07:28:55 UTC (stable/10, 10.2-STABLE)
+                2016-01-27 07:41:31 UTC (releng/10.2, 10.2-RELEASE-p11)
+                2016-01-27 07:41:31 UTC (releng/10.1, 10.1-RELEASE-p28)
+                2016-01-27 07:34:23 UTC (stable/9, 9.3-STABLE)
+                2016-01-27 07:42:11 UTC (releng/9.3, 9.3-RELEASE-p35)
+CVE Name:       CVE-2016-1883
+
+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
+
+FreeBSD is binary-compatible with the Linux operating system through a
+loadable kernel module/optional kernel component.  The support is
+provided on amd64 and i386 machines.
+
+II.  Problem Description
+
+A programming error in the Linux compatibility layer could cause the
+issetugid(2) system call to return incorrect information.
+
+III. Impact
+
+If an application relies on output of the issetugid(2) system call
+and that information is incorrect, this could lead to a privilege
+escalation.
+
+IV.  Workaround
+
+No workaround is available, but systems not using the Linux binary
+compatibility layer are not vulnerable.
+
+The following command can be used to test if the Linux binary
+compatibility layer is loaded:
+
+# kldstat -m linuxelf
+
+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.
+
+Reboot the system or unload and reload the linux.ko kernel module.
+
+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
+
+Reboot the system or unload and reload the linux.ko kernel module.
+
+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-16:10/linux.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:10/linux.patch.asc
+# gpg --verify linux.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/                                                         r294903
+releng/9.3/                                                       r294905
+stable/10/                                                        r294901
+releng/10.1/                                                      r294904
+releng/10.2/                                                      r294904
+- -------------------------------------------------------------------------
+
+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-2016-1883>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:10.linux.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAEBCgAGBQJWqHmfAAoJEO1n7NZdz2rnsr0QAJtM4C+IgRcRHdNGL7vXp1NP
+u3sFyktcRGCR0p+lMOaFYPp/Vmu09NglhcaxYFbk4WONVSnZKOuiWsjOL9by/eof
+77i8bXINlB/8Pp+34KpxDtz5wR3jVAApaL8xvS+/DaKj3RdQ63RrHgtQRTAk+VSO
+ISAXxF2U/XAcRlmBQ3oOtqeHads6M1LNG/D/I0FgpU2G17QoUpfa+AvOkS1wBw7d
+mdcnC4NDKKx3QnyD0FTrh4z444PwvE3IQ7OSm7VX4/oOZdH+CC9coLCV1BXALrfA
+WVmaUMDy8bWiv7JMsda2xl4KhcEx2Y0UN2hGYdMZJubqYcnUknMimW3b2fhsfgl1
+UaQDD6xv9I4xZqo1NHh4/WiH33PvOmM+U0E6IMb5hTUbfSd0mXOn4yzTP5gJxe4h
+fPk5ZUj/HTKx6C8ERMknTDdn+ZrLLlQJAoDbipPZkRBMcsgvRYGjKquBnrW9N0z2
+BUtuLODg/GxMmkQXYV7mT08xw7YLvIbfSwGvlOd/k5hB/0KMTRLBFGd6vc2lZ+CL
+dseeK59vUK50Arua8qbg6AlOYc9Dga/XeQ753za0zEm7LOXzjr7jlBex/04ZxvE/
+N4OTxNYlASk1cwBcoytZ8da3D7Vqh7vw7QmUR8lAb/x5ijR1QjCApji+yRupCEG+
+PGHIMcxSGeBx7Drd1eBE
+=PyM5
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/SA-16:08/bind.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:08/bind.patch	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,22 @@
+Index: contrib/bind9/lib/dns/rdata/in_1/apl_42.c
+===================================================================
+--- contrib/bind9/lib/dns/rdata/in_1/apl_42.c	(revision 294299)
++++ contrib/bind9/lib/dns/rdata/in_1/apl_42.c	(working copy)
+@@ -116,7 +116,7 @@ totext_in_apl(ARGS_TOTEXT) {
+ 	isc_uint8_t len;
+ 	isc_boolean_t neg;
+ 	unsigned char buf[16];
+-	char txt[sizeof(" !64000")];
++	char txt[sizeof(" !64000:")];
+ 	const char *sep = "";
+ 	int n;
+ 
+@@ -140,7 +140,7 @@ totext_in_apl(ARGS_TOTEXT) {
+ 		isc_region_consume(&sr, 1);
+ 		INSIST(len <= sr.length);
+ 		n = snprintf(txt, sizeof(txt), "%s%s%u:", sep,
+-			     neg ? "!": "", afi);
++			     neg ? "!" : "", afi);
+ 		INSIST(n < (int)sizeof(txt));
+ 		RETERR(str_totext(txt, target));
+ 		switch (afi) {

Added: head/share/security/patches/SA-16:08/bind.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:08/bind.patch.asc	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAABCgAGBQJWqHnkAAoJEO1n7NZdz2rnSzoQALduvw7DCOsGiKYoQgU17nyo
+iiacv5vRmDx7+43BMsND1SM9kwid9RPZWbAj5lb80g7ZOnluBxAoilmqVWgzs9gb
+1IkATsf5TTbQcGxYG1wQqx2ahfih0FUIb3Qg1KFMDO3XCPvIMucSAQMtPgq3FdFl
+A/FGH1+Yls4Aum53ulgR6IuotzaYnxiznxqi5IGhfTrPSZIuVnH4SDubwTrE+0kJ
+N3SzYc3ilguqOtxwSyBtIMSaqPiXZCBGYKGnR8RzysxhfdP56dBSJHzkNoniexjU
+4jYD5X+fY6ze04yjgdh/Fat3IgoqjnJ3UJ//lxMWGBrj4xI9JHUAS/jLJpLPnMuI
+WBL7G2jJXGrBsGwq5imDPuobfQoT8wuXYGfMi14XRc5/cKbQn+JqTGf9zB562NSW
+ADe26s05zgvYS10+nhbxT7v3gYcB/0U2M6HGbN5t/KCTBGteJJsSo3o2ZEZBdkbe
+jKnNP8RR2OTAjeCCXYqp8BVO9d+tecOzX/LM5Lj+97iwKKkPkHnOGA9zkyeQdGvt
+8KxBsub1LRYPR/87WZDZWtdGALaxqgQDj7G1ib0mLCbj2CzOSRa34bS/kvTQ7BtD
+ca7fhrebvhBVP6MqnYAmmuU+ojqMftx7mTZs+fWWFVLcTiPp9WqP2w0r6A/MlkSq
+ys1rAAXCj/WvMFopSMzu
+=kVrg
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/SA-16:09/ntp.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:09/ntp.patch	Wed Jan 27 08:09:32 2016	(r48099)
@@ -0,0 +1,17352 @@
+Index: contrib/ntp/ChangeLog
+===================================================================
+--- contrib/ntp/ChangeLog	(revision 294707)
++++ contrib/ntp/ChangeLog	(working copy)
+@@ -1,4 +1,38 @@
+ ---
++(4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>
++
++* [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn.
++* [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
++* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
++* [Sec 2938] ntpq saveconfig command allows dangerous characters
++  in filenames. perlinger@ntp.org
++* [Sec 2939] reslist NULL pointer dereference.  perlinger@ntp.org
++* [Sec 2940] Stack exhaustion in recursive traversal of restriction
++  list. perlinger@ntp.org
++* [Sec 2942]: Off-path DoS attack on auth broadcast mode.  HStenn.
++* [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
++* [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org
++* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
++* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
++  - applied patch by shenpeng11@huawei.com with minor adjustments
++* [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org
++* [Bug 2891] Deadlock in deferred DNS lookup framework. perlinger@ntp.org
++* [Bug 2892] Several test cases assume IPv6 capabilities even when
++             IPv6 is disabled in the build. perlinger@ntp.org
++  - Found this already fixed, but validation led to cleanup actions.
++* [Bug 2905] DNS lookups broken. perlinger@ntp.org
++  - added limits to stack consumption, fixed some return code handling
++* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
++  - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
++  - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
++* [Bug 2980] reduce number of warnings. perlinger@ntp.org
++  - integrated several patches from Havard Eidnes (he@uninett.no)
++* [Bug 2985] bogus calculation in authkeys.c perlinger@ntp.org
++  - implement 'auth_log2()' using integer bithack instead of float calculation
++* Make leapsec_query debug messages less verbose.  Harlan Stenn.
++* Disable incomplete t-ntp_signd.c test.  Harlan Stenn.
++
++---
+ (4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>
+ 
+ * [Sec 2956] small-step/big-step.  Close the panic gate earlier.  HStenn.
+@@ -47,6 +81,7 @@
+               lots of clients. perlinger@ntp.org
+ * [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+   - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
++  - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
+ * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
+ * Unity test cleanup.  Harlan Stenn.
+ * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
+@@ -55,9 +90,8 @@
+ * Quiet a warning from clang.  Harlan Stenn.
+ * Update the NEWS file.  Harlan Stenn.
+ * Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
++
+ ---
+-(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
+-(4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
+ 
+ * [Sec 2899] CVE-2014-9297  perlinger@ntp.org
+ * [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's.
+Index: contrib/ntp/CommitLog
+===================================================================
+--- contrib/ntp/CommitLog	(revision 294707)
++++ contrib/ntp/CommitLog	(working copy)
+@@ -1,8 +1,633 @@
+-ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, stenn@deacon.udel.edu
++ChangeSet@1.3628, 2016-01-20 04:20:12-05:00, stenn@deacon.udel.edu
++  NTP_4_2_8P6
++  TAG: NTP_4_2_8P6
++
++  ChangeLog@1.1793 +1 -0
++    NTP_4_2_8P6
++
++  ntpd/invoke-ntp.conf.texi@1.196 +1 -1
++    NTP_4_2_8P6
++
++  ntpd/invoke-ntp.keys.texi@1.188 +1 -1
++    NTP_4_2_8P6
++
++  ntpd/invoke-ntpd.texi@1.504 +2 -2
++    NTP_4_2_8P6
++
++  ntpd/ntp.conf.5man@1.230 +3 -3
++    NTP_4_2_8P6
++
++  ntpd/ntp.conf.5mdoc@1.230 +2 -3
++    NTP_4_2_8P6
++
++  ntpd/ntp.conf.html@1.183 +60 -2
++    NTP_4_2_8P6
++
++  ntpd/ntp.conf.man.in@1.230 +3 -3
++    NTP_4_2_8P6
++
++  ntpd/ntp.conf.mdoc.in@1.230 +2 -3
++    NTP_4_2_8P6
++
++  ntpd/ntp.keys.5man@1.222 +2 -2
++    NTP_4_2_8P6
++
++  ntpd/ntp.keys.5mdoc@1.222 +3 -3
++    NTP_4_2_8P6
++
++  ntpd/ntp.keys.html@1.184 +21 -33
++    NTP_4_2_8P6
++
++  ntpd/ntp.keys.man.in@1.222 +2 -2
++    NTP_4_2_8P6
++
++  ntpd/ntp.keys.mdoc.in@1.222 +3 -3
++    NTP_4_2_8P6
++
++  ntpd/ntpd-opts.c@1.526 +10 -10
++    NTP_4_2_8P6
++
++  ntpd/ntpd-opts.h@1.525 +4 -4
++    NTP_4_2_8P6
++
++  ntpd/ntpd.1ntpdman@1.333 +4 -4
++    NTP_4_2_8P6
++
++  ntpd/ntpd.1ntpdmdoc@1.333 +3 -3
++    NTP_4_2_8P6
++
++  ntpd/ntpd.html@1.177 +2 -2
++    NTP_4_2_8P6
++
++  ntpd/ntpd.man.in@1.333 +4 -4
++    NTP_4_2_8P6
++
++  ntpd/ntpd.mdoc.in@1.333 +3 -3
++    NTP_4_2_8P6
++
++  ntpdc/invoke-ntpdc.texi@1.501 +2 -2
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc-opts.c@1.519 +10 -10
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc-opts.h@1.518 +4 -4
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc.1ntpdcman@1.332 +4 -4
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc.1ntpdcmdoc@1.332 +3 -3
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc.html@1.345 +2 -2
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc.man.in@1.332 +4 -4
++    NTP_4_2_8P6
++
++  ntpdc/ntpdc.mdoc.in@1.332 +3 -3
++    NTP_4_2_8P6
++
++  ntpq/invoke-ntpq.texi@1.508 +2 -2
++    NTP_4_2_8P6
++
++  ntpq/ntpq-opts.c@1.525 +10 -10
++    NTP_4_2_8P6
++
++  ntpq/ntpq-opts.h@1.523 +4 -4
++    NTP_4_2_8P6
++
++  ntpq/ntpq.1ntpqman@1.336 +4 -4
++    NTP_4_2_8P6
++
++  ntpq/ntpq.1ntpqmdoc@1.336 +3 -3
++    NTP_4_2_8P6
++
++  ntpq/ntpq.html@1.174 +2 -2
++    NTP_4_2_8P6
++
++  ntpq/ntpq.man.in@1.336 +4 -4
++    NTP_4_2_8P6
++
++  ntpq/ntpq.mdoc.in@1.336 +3 -3
++    NTP_4_2_8P6
++
++  ntpsnmpd/invoke-ntpsnmpd.texi@1.503 +2 -2
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd-opts.c@1.521 +10 -10
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd-opts.h@1.520 +4 -4
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.332 +4 -4
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.332 +3 -3
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd.html@1.172 +1 -1
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd.man.in@1.332 +4 -4
++    NTP_4_2_8P6
++
++  ntpsnmpd/ntpsnmpd.mdoc.in@1.332 +3 -3
++    NTP_4_2_8P6
++
++  packageinfo.sh@1.524 +2 -2
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.93 +3 -3
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.94 +2 -2
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/calc_tickadj.html@1.95 +1 -1
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/calc_tickadj.man.in@1.92 +3 -3
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.94 +2 -2
++    NTP_4_2_8P6
++
++  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.97 +1 -1
++    NTP_4_2_8P6
++
++  scripts/invoke-plot_summary.texi@1.114 +2 -2
++    NTP_4_2_8P6
++
++  scripts/invoke-summary.texi@1.114 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/invoke-ntp-wait.texi@1.324 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait-opts@1.60 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.321 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.322 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait.html@1.341 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait.man.in@1.321 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntp-wait/ntp-wait.mdoc.in@1.322 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/invoke-ntpsweep.texi@1.112 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep-opts@1.62 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.100 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.100 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep.html@1.113 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep.man.in@1.100 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntpsweep/ntpsweep.mdoc.in@1.101 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntptrace/invoke-ntptrace.texi@1.113 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace-opts@1.62 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace.1ntptraceman@1.100 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace.1ntptracemdoc@1.101 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace.html@1.114 +2 -2
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace.man.in@1.100 +3 -3
++    NTP_4_2_8P6
++
++  scripts/ntptrace/ntptrace.mdoc.in@1.102 +2 -2
++    NTP_4_2_8P6
++
++  scripts/plot_summary-opts@1.62 +2 -2
++    NTP_4_2_8P6
++
++  scripts/plot_summary.1plot_summaryman@1.112 +3 -3
++    NTP_4_2_8P6
++
++  scripts/plot_summary.1plot_summarymdoc@1.112 +2 -2
++    NTP_4_2_8P6
++
++  scripts/plot_summary.html@1.115 +2 -2
++    NTP_4_2_8P6
++
++  scripts/plot_summary.man.in@1.112 +3 -3
++    NTP_4_2_8P6
++
++  scripts/plot_summary.mdoc.in@1.112 +2 -2
++    NTP_4_2_8P6
++
++  scripts/summary-opts@1.62 +2 -2
++    NTP_4_2_8P6
++
++  scripts/summary.1summaryman@1.112 +3 -3
++    NTP_4_2_8P6
++
++  scripts/summary.1summarymdoc@1.112 +2 -2
++    NTP_4_2_8P6
++
++  scripts/summary.html@1.115 +2 -2
++    NTP_4_2_8P6
++
++  scripts/summary.man.in@1.112 +3 -3
++    NTP_4_2_8P6
++
++  scripts/summary.mdoc.in@1.112 +2 -2
++    NTP_4_2_8P6
++
++  scripts/update-leap/invoke-update-leap.texi@1.13 +1 -1
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap-opts@1.13 +2 -2
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap.1update-leapman@1.13 +3 -3
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap.1update-leapmdoc@1.13 +2 -2
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap.html@1.13 +1 -1
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap.man.in@1.13 +3 -3
++    NTP_4_2_8P6
++
++  scripts/update-leap/update-leap.mdoc.in@1.13 +2 -2
++    NTP_4_2_8P6
++
++  sntp/invoke-sntp.texi@1.501 +2 -2
++    NTP_4_2_8P6
++
++  sntp/sntp-opts.c@1.520 +10 -10
++    NTP_4_2_8P6
++
++  sntp/sntp-opts.h@1.518 +4 -4
++    NTP_4_2_8P6
++
++  sntp/sntp.1sntpman@1.336 +4 -4
++    NTP_4_2_8P6
++
++  sntp/sntp.1sntpmdoc@1.336 +3 -3
++    NTP_4_2_8P6
++
++  sntp/sntp.html@1.516 +2 -2
++    NTP_4_2_8P6
++
++  sntp/sntp.man.in@1.336 +4 -4
++    NTP_4_2_8P6
++
++  sntp/sntp.mdoc.in@1.336 +3 -3
++    NTP_4_2_8P6
++
++  util/invoke-ntp-keygen.texi@1.504 +2 -2
++    NTP_4_2_8P6
++
++  util/ntp-keygen-opts.c@1.522 +10 -10
++    NTP_4_2_8P6
++
++  util/ntp-keygen-opts.h@1.520 +4 -4
++    NTP_4_2_8P6
++
++  util/ntp-keygen.1ntp-keygenman@1.332 +4 -4
++    NTP_4_2_8P6
++
++  util/ntp-keygen.1ntp-keygenmdoc@1.332 +3 -3
++    NTP_4_2_8P6
++
++  util/ntp-keygen.html@1.178 +2 -2
++    NTP_4_2_8P6
++
++  util/ntp-keygen.man.in@1.332 +4 -4
++    NTP_4_2_8P6
++
++  util/ntp-keygen.mdoc.in@1.332 +3 -3
++    NTP_4_2_8P6
++
++ChangeSet@1.3627, 2016-01-20 04:14:51-05:00, stenn@deacon.udel.edu
++  solaris hack
++
++  libntp/work_thread.c@1.20 +2 -0
++    solaris hack
++
++ChangeSet@1.3626, 2016-01-20 01:50:09-05:00, stenn@deacon.udel.edu
++  4.2.8p6
++
++  packageinfo.sh@1.523 +1 -1
++    4.2.8p6
++
++ChangeSet@1.3625, 2016-01-20 00:34:15+00:00, stenn@psp-deb1.ntp.org
++  updates
++
++  NEWS@1.160 +24 -24
++    updates
++
++ChangeSet@1.3624, 2016-01-19 22:28:41+00:00, stenn@psp-deb1.ntp.org
++  typo
++
++  NEWS@1.159 +1 -1
++    typo
++
++ChangeSet@1.3623, 2016-01-18 11:55:56+00:00, stenn@psp-deb1.ntp.org
++  [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
++
++  ChangeLog@1.1792 +1 -0
++    [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
++
++  NEWS@1.158 +40 -0

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

From owner-svn-doc-all@freebsd.org  Wed Jan 27 09:24:04 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B7AFA6EE13;
 Wed, 27 Jan 2016 09:24:04 +0000 (UTC)
 (envelope-from marck@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E3C351FFE;
 Wed, 27 Jan 2016 09:24:03 +0000 (UTC)
 (envelope-from marck@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0R9O25l086376;
 Wed, 27 Jan 2016 09:24:02 GMT (envelope-from marck@FreeBSD.org)
Received: (from marck@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R9O2LO086375;
 Wed, 27 Jan 2016 09:24:02 GMT (envelope-from marck@FreeBSD.org)
Message-Id: <201601270924.u0R9O2LO086375@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marck set sender to
 marck@FreeBSD.org using -f
From: Dmitry Morozovsky <marck@FreeBSD.org>
Date: Wed, 27 Jan 2016 09:24:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48100 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 09:24:04 -0000

Author: marck
Date: Wed Jan 27 09:24:02 2016
New Revision: 48100
URL: https://svnweb.freebsd.org/changeset/doc/48100

Log:
  Correct day number of last three advisories.

Modified:
  head/share/xml/advisories.xml

Modified: head/share/xml/advisories.xml
==============================================================================
--- head/share/xml/advisories.xml	Wed Jan 27 08:09:32 2016	(r48099)
+++ head/share/xml/advisories.xml	Wed Jan 27 09:24:02 2016	(r48100)
@@ -11,7 +11,7 @@
       <name>1</name>
 
       <day>
-        <name>14</name>
+        <name>27</name>
 
         <advisory>
           <name>FreeBSD-SA-16:10.linux</name>

From owner-svn-doc-all@freebsd.org  Wed Jan 27 10:06:10 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C554A6FFB5;
 Wed, 27 Jan 2016 10:06:10 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 3659A19C1;
 Wed, 27 Jan 2016 10:06:10 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RA698g098800;
 Wed, 27 Jan 2016 10:06:09 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RA69nY098799;
 Wed, 27 Jan 2016 10:06:09 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201601271006.u0RA69nY098799@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 27 Jan 2016 10:06:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48101 - head/share/security/advisories
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 10:06:10 -0000

Author: delphij
Date: Wed Jan 27 10:06:08 2016
New Revision: 48101
URL: https://svnweb.freebsd.org/changeset/doc/48101

Log:
  Fix CVE links.

Modified:
  head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc

Modified: head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc
==============================================================================
--- head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc	Wed Jan 27 09:24:02 2016	(r48100)
+++ head/share/security/advisories/FreeBSD-SA-16:09.ntp.asc	Wed Jan 27 10:06:08 2016	(r48101)
@@ -182,44 +182,44 @@ VII. References
 
 <URL:http://support.ntp.org/bin/view/Main/SecurityNotice#January_2016_NTP_4_2_8p6_Securit>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7973>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7973>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7974>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7974>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7975>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7975>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7976>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7976>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7977>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7977>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7978>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7978>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-7979>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7979>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8138>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8138>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8139>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8139>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8140>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8140>
 
-<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?CVE-2015-8158>
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8158>
 
 The latest revision of this advisory is available at
 <URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:09.ntp.asc>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1.8 (FreeBSD)
 
-iQIcBAEBCgAGBQJWqHmfAAoJEO1n7NZdz2rnt9cP/2EtdEPX/oBJXKFWqQv5cwvY
-C4gmlK5MZok2an330XMPl0RO2RplsIw4Lo4BuUh7HPKhVa5loYasabKrULQ+4Pgv
-z9INxDTDO8iooHeTeNe/VAb5YcKFrD7sqajdc0cY11rLEw1o53IuULz9wZnczAe/
-KnHDNUyYaSU2Ep+c3+ADSJqOk3ffhsGDS+0byoOBcUN+66MnBg19/rKomiN5a7Nt
-XSseoQgYISU8aaJDvPlGoaN/Xm5fnFZaKFlJ4y7h51sYYep0qgjQx+Gdakk0vNbh
-CwsjpBKqDpFpBcSgdEC/bYHnNpYUTJB/tPmG3YDO5jMWQISKGrrnuMYeh+7PjTDS
-vCrneztpVBscLG4ZKSlfmhpZ/Jfy31YPXm5P/w8NuA05i13K06P4gG5PKNyUMgsk
-AZQ4Vg8YlyS0Ci4ufdc+AIQI35QMrKvfecJVu49+sNhUA4PpTe7coEU9dks3Dtaw
-g2QbfnsEWzJ6RBJcw7aQDSgRoqrVQgMB8IIota+aMzeVurgyFxPm9LASk2RYjhmC
-Ep283cc+HPUnihKBZTwwkw5iznbmpyRYlPghEc7slgOZCbk9pefnsCMOZAqRW9fZ
-DUpt+HvZD5BKB4kCAUMIvKGS91cyBFaNcdJhlB8uUx2aP2UJmuzldk+x9K74wWGK
-lnP0IazzXnWFobfwr+qT
-=0ZhD
+iQIcBAEBCgAGBQJWqJZaAAoJEO1n7NZdz2rnHWEQANXpxGqlV5gr1f+bi8LcQW5c
++FLoHTppBf+t8kB0lFpEdbn/ypO2lkHXGqMyCr52WVeXEW8Pg0Jpac0HjOtkBkPB
+4RzOZ85B7hGUkPKmKDugG3sS1aFC9XNbvp2XHV0vIcaTVuv8Hm0eeAAFelf3r2LY
+JTy5s1+/aB7ZyLrlAPLP2vc+XRcBlHIE7O5CLGMFhuz4KApReT1YPeomXI7+D4ZR
+Xgx1ho1XNiWPwr4rEOwdEhrCy4ICmPh4763ITSRBBigRNMfYX+YZCtE6lEr8Z1Nr
+ciSBNHyiG2uBRYvNttEHARyjU/8eiV01PqQxn+uJmfTA9/UKtT6rY+XIp6sNGDax
+oDB4flqRrnh5ZNkXVx4TBfjgO4TfnFZkU5U1NOsm9/IypXAjxF7aKDX+Ks/UAL2v
+6NhvhGOMEt41nbB7+GubIubCiIxce6ImxkMB4lWlOTZOn8dn6sO5REg3Wr5A3pxd
+yY98L7yDakeVBAsVqea5aBhC2SYwyarReH7OgTPaKgvlbAis7Rbr2gDOgNuOKKWp
+y8Dtn03GL77+ESLkvLRETMhIbiaoVHze0otAx2jlr02kkpTw769BaLclO7CCcOvh
+5OC/eQt2MKQ48FItH/3W6ptNTgynQWX7rdmSvxtZNFqU+J7xaktcdK+KrMQCjTyE
+GlOGafju5SVfUvYxFvAl
+=lb7l
 -----END PGP SIGNATURE-----

From owner-svn-doc-all@freebsd.org  Wed Jan 27 14:13:08 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF179A6F9ED;
 Wed, 27 Jan 2016 14:13:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 92A1C1FD2;
 Wed, 27 Jan 2016 14:13:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RED7Ho072175;
 Wed, 27 Jan 2016 14:13:07 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RED7c5072173;
 Wed, 27 Jan 2016 14:13:07 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601271413.u0RED7c5072173@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 27 Jan 2016 14:13:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48102 - in head/en_US.ISO8859-1/htdocs/releases: 10.2R
 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 14:13:09 -0000

Author: gjb
Date: Wed Jan 27 14:13:07 2016
New Revision: 48102
URL: https://svnweb.freebsd.org/changeset/doc/48102

Log:
  Regen after r294913.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/en_US.ISO8859-1/htdocs/releases/10.2R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.2R/errata.html	Wed Jan 27 10:06:08 2016	(r48101)
+++ head/en_US.ISO8859-1/htdocs/releases/10.2R/errata.html	Wed Jan 27 14:13:07 2016	(r48102)
@@ -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.2-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.2-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.2-RELEASE will be maintained until the release of FreeBSD 10.3-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="idp58181856"></a>FreeBSD 10.2-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 © 2016 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.2-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.2-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.2-RELEASE will be maintained until the release of FreeBSD 10.3-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="idp56953184"></a>FreeBSD 10.2-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 © 2016 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,7 +40,8 @@
 	    handling </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:04.linux.asc" target="_top">FreeBSD-SA-16:04.linux</a></td><td>14 January 2016</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=setgroups&amp;sektion=2"><span class="citerefentry"><span class="refentrytitle">setgroups</span>(2)</span></a> system call
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:05.tcp.asc" target="_top">FreeBSD-SA-16:05.tcp</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">MD5 signature denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:06.bsnmpd.asc" target="_top">FreeBSD-SA-16:06.bsnmpd</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Insecure default configuration file
 	  permissions </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:07.openssh.asc" target="_top">FreeBSD-SA-16:07.openssh</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSH</span> client
-	    information leak </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-15:11.toolchain.asc" target="_top">FreeBSD-EN-15:11.toolchain</a></td><td>18 August 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=make&amp;sektion=1"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> syntax errors when upgrading
+	    information leak </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:09.ntp.asc" target="_top">FreeBSD-SA-16:09.ntp</a></td><td>27 January 2016</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-16:10.linux.asc" target="_top">FreeBSD-SA-16:10.linux</a></td><td>27 January 2016</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=issetugid&amp;sektion=2"><span class="citerefentry"><span class="refentrytitle">issetugid</span>(2)</span></a> system call
+	    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-15:11.toolchain.asc" target="_top">FreeBSD-EN-15:11.toolchain</a></td><td>18 August 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=make&amp;sektion=1"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> syntax errors when upgrading
 	    from FreeBSD 9.x and earlier. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:12.netstat.asc" target="_top">FreeBSD-EN-15:12.netstat</a></td><td>18 August 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fix incorrect <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=netstat&amp;sektion=1"><span class="citerefentry"><span class="refentrytitle">netstat</span>(1)</span></a> data handling on
 	    32-bit systems. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:13.vidcontrol.asc" target="_top">FreeBSD-EN-15:13.vidcontrol</a></td><td>18 August 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Allow size argument to <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vidcontrol&amp;sektion=1"><span class="citerefentry"><span class="refentrytitle">vidcontrol</span>(1)</span></a> for
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=syscons&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">syscons</span>(4)</span></a>. </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:15.pkg.asc" target="_top">FreeBSD-EN-15:15.pkg</a></td><td>25 August 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Insufficient check of supported <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=pkg&amp;sektion=7"><span class="citerefentry"><span class="refentrytitle">pkg</span>(7)</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 Jan 27 10:06:08 2016	(r48101)
+++ head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	Wed Jan 27 14:13:07 2016	(r48102)
@@ -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="idp60815456"></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="idp60958816"></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 © 2016 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,
@@ -60,7 +60,9 @@
 	    handling </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:04.linux.asc" target="_top">FreeBSD-SA-16:04.linux</a></td><td>14 January 2016</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=setgroups&amp;sektion=2"><span class="citerefentry"><span class="refentrytitle">setgroups</span>(2)</span></a> system call
 	    vulnerability </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:05.tcp.asc" target="_top">FreeBSD-SA-16:05.tcp</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">MD5 signature denial of service </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:06.bsnmpd.asc" target="_top">FreeBSD-SA-16:06.bsnmpd</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Insecure default configuration file
 	  permissions </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:07.openssh.asc" target="_top">FreeBSD-SA-16:07.openssh</a></td><td>14 January 2016</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><span xmlns="http://www.w3.org/1999/xhtml" class="application">OpenSSH</span> client
-	    information leak </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.o
 rg/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
+	    information leak </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-SA-16:08.bind.asc" target="_top">FreeBSD-SA-16:08.bind</a></td><td>27 January 2016</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-16:09.ntp.asc" target="_top">FreeBSD-SA-16:09.ntp</a></td><td>27 January 2016</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-16:10.linux.asc" target="_top">FreeBSD-SA-16:10.linux</a></td><td>27 January 2016</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=issetugid&amp;sektion=2"><span class="citerefentry"><span class="refentrytitle">issetugid</span>(2)</span></a> system call
+	    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><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

From owner-svn-doc-all@freebsd.org  Wed Jan 27 18:23:32 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA069A70C89;
 Wed, 27 Jan 2016 18:23:31 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AD8601A00;
 Wed, 27 Jan 2016 18:23:31 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RINUoZ047131;
 Wed, 27 Jan 2016 18:23:30 GMT (envelope-from trhodes@FreeBSD.org)
Received: (from trhodes@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RINUbq047130;
 Wed, 27 Jan 2016 18:23:30 GMT (envelope-from trhodes@FreeBSD.org)
Message-Id: <201601271823.u0RINUbq047130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trhodes set sender to
 trhodes@FreeBSD.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Wed, 27 Jan 2016 18:23:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48103 - head/en_US.ISO8859-1/books/handbook/security
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 18:23:32 -0000

Author: trhodes
Date: Wed Jan 27 18:23:30 2016
New Revision: 48103
URL: https://svnweb.freebsd.org/changeset/doc/48103

Log:
  Break out the AllowUsers discussion into a separate section and
  add some discussion on the AuthenticationMethods option to utilize
  key-only auth.

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

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Wed Jan 27 14:13:07 2016	(r48102)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Wed Jan 27 18:23:30 2016	(r48103)
@@ -2862,9 +2862,13 @@ user@unfirewalled-system.example.org's p
 	<acronym>SSH</acronym> server, accepting connections from
 	other <acronym>SSH</acronym> clients.</para>
 
-      <para>To see if <application>sshd</application> is enabled,
-	check <filename>/etc/rc.conf</filename> for this line and add
-	it if it is missing:</para>
+      <para>To see if <application>sshd</application> is operating,
+        use the &man.service.8; command:</para>
+
+      <screen>&prompt.root; <userinput>service sshd status</userinput></screen>
+        
+      <para>If the service is not running, add the following line to
+	<filename>/etc/rc.conf</filename>.</para>
 
       <programlisting>sshd_enable="YES"</programlisting>
 
@@ -2885,6 +2889,21 @@ user@unfirewalled-system.example.org's p
 	complete discussion about authentication, the login process,
 	and the various configuration files.</para>
 
+      <para>At this point, the <application>sshd</application> should
+	be available to all users with a username and password on
+	the system.</para>
+    </sect2>
+
+    <sect2>
+      <title>SSH Server Security</title>
+
+      <para>While <application>sshd</application> is the most widely
+	used remote administration facility for &os;, brute force
+	and drive by attacks are common to any system exposed to
+	public networks.  Several additional parameters are available
+	to prevent the success of these attacks and will be described
+	in this section.</para>
+
       <para>It is a good idea to limit which users can log into the
 	<acronym>SSH</acronym> server and from where using the
 	<literal>AllowUsers</literal> keyword in the
@@ -2927,6 +2946,17 @@ user@unfirewalled-system.example.org's p
 	  available keywords.</para>
       </note>
 
+      <para>In addition, users may be forced to use two factor
+	authentication via the use of a public and private key.  When
+	required, the user may generate a key pair through the use
+	of &man.ssh-keygen.1; and send the administrator the public
+	key.  This key file will be placed in the
+	<filename>authorized_keys</filename> as described above in
+	the client section.  To force the users to use keys only,
+	the following option may be configured:</para>
+
+      <programlisting>AuthenticationMethods publickey</programlisting>
+
       <tip>
 	<para>Do not confuse <filename>/etc/ssh/sshd_config</filename>
 	  with <filename>/etc/ssh/ssh_config</filename> (note the

From owner-svn-doc-all@freebsd.org  Wed Jan 27 18:26:03 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7B94A70D6F;
 Wed, 27 Jan 2016 18:26:03 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 98DEB1BB9;
 Wed, 27 Jan 2016 18:26:03 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RIQ2jR047252;
 Wed, 27 Jan 2016 18:26:02 GMT (envelope-from trhodes@FreeBSD.org)
Received: (from trhodes@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RIQ2eV047251;
 Wed, 27 Jan 2016 18:26:02 GMT (envelope-from trhodes@FreeBSD.org)
Message-Id: <201601271826.u0RIQ2eV047251@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trhodes set sender to
 trhodes@FreeBSD.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Wed, 27 Jan 2016 18:26:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48104 - head/en_US.ISO8859-1/books/handbook/security
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 18:26:03 -0000

Author: trhodes
Date: Wed Jan 27 18:26:02 2016
New Revision: 48104
URL: https://svnweb.freebsd.org/changeset/doc/48104

Log:
  Change a ",." to a "." to properly end a sentence.

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

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Wed Jan 27 18:23:30 2016	(r48103)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Wed Jan 27 18:26:02 2016	(r48104)
@@ -28,7 +28,7 @@
     <title>Synopsis</title>
 
     <para>Security, whether physical or virtual, is a topic so broad
-      that an entire industry has grown up around it.  Hundreds of
+      that an entire industry has evolved around it.  Hundreds of
       standard practices have been authored about how to secure
       systems and networks, and as a user of &os;, understanding how
       to protect against attacks and intruders is a must.</para>
@@ -2963,7 +2963,7 @@ user@unfirewalled-system.example.org's p
 	  extra <literal>d</literal> in the first filename).  The
 	  first file configures the server and the second file
 	  configures the client.  Refer to &man.ssh.config.5; for a
-	  listing of the available client settings,.</para>
+	  listing of the available client settings.</para>
       </tip>
     </sect2>
   </sect1>

From owner-svn-doc-all@freebsd.org  Wed Jan 27 22:15:16 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56FBFA6F2B9;
 Wed, 27 Jan 2016 22:15:16 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0F3451E22;
 Wed, 27 Jan 2016 22:15:15 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RMFFB1016271;
 Wed, 27 Jan 2016 22:15:15 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RMFFkL016270;
 Wed, 27 Jan 2016 22:15:15 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601272215.u0RMFFkL016270@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 27 Jan 2016 22:15:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48105 - head/en_US.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 22:15:16 -0000

Author: wblock
Date: Wed Jan 27 22:15:14 2016
New Revision: 48105
URL: https://svnweb.freebsd.org/changeset/doc/48105

Log:
  Add instructions on installing and enabling dbus and hal to the Gnome
  section.  Pointed out by forum user oldrancher.

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Wed Jan 27 18:26:02 2016	(r48104)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Wed Jan 27 22:15:14 2016	(r48105)
@@ -1412,14 +1412,35 @@ DisplayManager.requestPort:     0</scree
       <screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>For proper operation, <application>GNOME</application>
+      <para><application>GNOME</application>
 	requires <filename>/proc</filename> to be mounted.  Add this
 	line to <filename>/etc/fstab</filename> to mount this file
 	system automatically during system startup:</para>
 
       <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
-      <para>Once <application>GNOME</application> is installed,
+      <para><application>GNOME</application> also needs
+	<application>D-Bus</application> and
+	<application>HAL</application>.  These applications provide a
+	message bus and hardware abstraction.  They can be installed
+	from packages:</para>
+
+      <screen>&prompt.root; <userinput>pkg install dbus hal</userinput></screen>
+
+      <para>or from the Ports Collection:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/devel/dbus</userinput>
+&prompt.root; <userinput>make install clean</userinput>
+&prompt.root; <userinput>cd /usr/ports/sysutils/hal</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>Then enable both systems in
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>dbus_enable="YES"
+hald_enable="YES"</programlisting>
+
+      <para>After installation,
 	configure <application>&xorg;</application> to start
 	<application>GNOME</application>.  The easiest way to do this
 	is to enable the GNOME Display Manager,

From owner-svn-doc-all@freebsd.org  Wed Jan 27 23:33:56 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD1D2A70E44;
 Wed, 27 Jan 2016 23:33:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 76CD71B76;
 Wed, 27 Jan 2016 23:33:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RNXtDi039665;
 Wed, 27 Jan 2016 23:33:55 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RNXtLn039663;
 Wed, 27 Jan 2016 23:33:55 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601272333.u0RNXtLn039663@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 27 Jan 2016 23:33:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48106 - in head/en_US.ISO8859-1:
 books/handbook/eresources 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 23:33:56 -0000

Author: gjb
Date: Wed Jan 27 23:33:55 2016
New Revision: 48106
URL: https://svnweb.freebsd.org/changeset/doc/48106

Log:
  Add the pkgbase@ mailing list.
  
  PR:		206693
  Submitted by:	David Wolfskill
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  head/en_US.ISO8859-1/share/xml/mailing-lists.ent

Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Wed Jan 27 22:15:14 2016	(r48105)
+++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Wed Jan 27 23:33:55 2016	(r48106)
@@ -504,6 +504,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.pkgbase.name;</entry>
+	      <entry>Packaging the &os; base system</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.platforms.name;</entry>
 	      <entry>Concerning ports to non &intel; architecture
 		platforms</entry>
@@ -1746,6 +1751,18 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.pkgbase.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Packaging the &os; base
+		system.</emphasis></para>
+
+	    <para>Discussions surrounding implementation and issues
+	      regarding packaging the &os; base system.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.platforms.name;</term>
 
 	  <listitem>

Modified: head/en_US.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Wed Jan 27 22:15:14 2016	(r48105)
+++ head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Wed Jan 27 23:33:55 2016	(r48106)
@@ -353,6 +353,10 @@
 <!ENTITY a.pkg-fallout "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg-fallout.url;'>Fallout logs from package building</link>">
 <!ENTITY a.pkg-fallout.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg-fallout.url;'>freebsd-pkg-fallout</link>">
 
+<!ENTITY a.pkgbase.url "&a.mailman.listinfo;/freebsd-pkgbase">
+<!ENTITY a.pkgbase "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkgbase.url;'>Packaging the &os; base system</link>">
+<!ENTITY a.pkgbase.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkgbase.url;'>freebsd-pkgbase</link>">
+
 <!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
 <!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD non-Intel platforms porting mailing list</link>">
 <!ENTITY a.platforms.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">

From owner-svn-doc-all@freebsd.org  Thu Jan 28 02:00:00 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF424A6F35A;
 Thu, 28 Jan 2016 02:00:00 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8DAF9104E;
 Thu, 28 Jan 2016 02:00:00 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0S1xxAK080551;
 Thu, 28 Jan 2016 01:59:59 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0S1xxIx080550;
 Thu, 28 Jan 2016 01:59:59 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601280159.u0S1xxIx080550@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 28 Jan 2016 01:59:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48107 - head/en_US.ISO8859-1/books/handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 02:00:01 -0000

Author: wblock
Date: Thu Jan 28 01:59:59 2016
New Revision: 48107
URL: https://svnweb.freebsd.org/changeset/doc/48107

Log:
  Clean up and simplify language.  Remove most uses of "you", use &os;
  instead of literal "FreeBSD", make wording less redundant and passive.

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

Modified: head/en_US.ISO8859-1/books/handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/book.xml	Wed Jan 27 23:33:55 2016	(r48106)
+++ head/en_US.ISO8859-1/books/handbook/book.xml	Thu Jan 28 01:59:59 2016	(r48107)
@@ -18,7 +18,7 @@
   xml:lang="en">
 
   <info>
-    <title>FreeBSD Handbook</title>
+    <title>&os; Handbook</title>
 
     <author>
       <orgname>The FreeBSD Documentation Project</orgname>
@@ -87,30 +87,30 @@
     </legalnotice>
 
     <abstract>
-      <para>Welcome to FreeBSD! This handbook covers the installation
+      <para>Welcome to &os;! This handbook covers the installation
 	and day to day use of
-	<emphasis>FreeBSD &rel2.current;-RELEASE</emphasis> and
-	<emphasis>FreeBSD &rel.current;-RELEASE</emphasis>.  This
-	manual is a <emphasis>work in progress</emphasis> and is the
-	work of many individuals.  As such, some sections may become
-	dated and require updating.  If you are interested in helping
-	out with this project, send email to the &a.doc;.  The latest
-
-	version of this document is always available from the <link
-	  xlink:href="http://www.FreeBSD.org/">FreeBSD web site</link>
-	(previous versions of this handbook can be obtained from <uri
-	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>).
-	It may also be downloaded in a variety of formats and
+	<emphasis>&os; &rel2.current;-RELEASE</emphasis> and
+	<emphasis>&os; &rel.current;-RELEASE</emphasis>.  This
+	book is the result of ongoing work by many individuals.  Some sections might be
+	outdated.  Those interested in helping to update and expand
+	this document should send email to the &a.doc;.</para>
+
+      <para>The latest
+
+	version of this book is available from the <link
+	  xlink:href="http://www.FreeBSD.org/">FreeBSD web site</link>.
+	Previous versions can be obtained from <uri
+	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>.
+	The book can be downloaded in a variety of formats and
 	compression options from the <link
-	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
+	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os;
 	  FTP server</link> or one of the numerous
-	<link linkend="mirrors-ftp">mirror sites</link>.  If you would
-	prefer to have a hard copy of the handbook, you can purchase
-	one at the
+	<link linkend="mirrors-ftp">mirror sites</link>.  Printed
+	copies can be purchased at the
 	<link xlink:href="http://www.freebsdmall.com/">FreeBSD
-	  Mall</link>.  You may also want to
-	<link xlink:href="&url.base;/search/index.html">search the
-	  handbook</link>.</para>
+	  Mall</link>.  Searches can be performed on the handbook and other documents on the
+	<link xlink:href="&url.base;/search/index.html">search
+	  page</link>.</para>
     </abstract>
   </info>
 
@@ -120,38 +120,37 @@
     <title>Getting Started</title>
 
     <partintro>
-      <para>This part of the FreeBSD Handbook is for users and
-	administrators who are new to FreeBSD.  These chapters:</para>
+      <para>This part of the handbook is for users and
+	administrators who are new to &os;.  These chapters:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>Introduce you to FreeBSD.</para>
+	  <para>Introduce &os;.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Guide you through the installation process.</para>
+	  <para>Guide readers through the installation process.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Teach you &unix; basics and fundamentals.</para>
+	  <para>Teach &unix; basics and fundamentals.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Show you how to install the wealth of third party
-	    applications available for FreeBSD.</para>
+	  <para>Show how to install the wealth of third party
+	    applications available for &os;.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Introduce you to X, the &unix; windowing system, and
+	  <para>Introduce X, the &unix; windowing system, and
 	    detail how to configure a desktop environment that makes
-	    you more productive.</para>
+	    users more productive.</para>
 	</listitem>
       </itemizedlist>
 
-      <para>We have tried to keep the number of forward references in
-	the text to a minimum so that you can read this section of the
-	Handbook from front to back with the minimum page flipping
-	required.</para>
+      <para>The number of forward references in the text have been
+	kept to a minimum so that this section
+	can be read from front to back with minimal page flipping.</para>
     </partintro>
 
     &chap.introduction;
@@ -166,25 +165,24 @@
 
     <partintro>
       <para>Now that the basics have been covered, this part of the
-	FreeBSD Handbook will discuss some frequently used features of
-	FreeBSD.  These chapters:</para>
+	book discusses some frequently used features of
+	&os;.  These chapters:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>Introduce you to popular and useful desktop
+	  <para>Introduce popular and useful desktop
 	    applications: browsers, productivity tools, document
-	    viewers, etc.</para>
+	    viewers, and more.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Introduce you to a number of multimedia tools
-	    available for FreeBSD.</para>
+	  <para>Introduce a number of multimedia tools
+	    available for &os;.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Explain the process of building a customized FreeBSD
-	    kernel, to enable extra functionality on your
-	    system.</para>
+	  <para>Explain the process of building a customized &os;
+	    kernel to enable extra functionality.</para>
 	</listitem>
 
 	<listitem>
@@ -193,12 +191,12 @@
 	</listitem>
 
 	<listitem>
-	  <para>Show you how to run Linux applications on your FreeBSD
+	  <para>Show how to run Linux applications on the &os;
 	    system.</para>
 	</listitem>
       </itemizedlist>
 
-      <para>Some of these chapters recommend that you do some prior
+      <para>Some of these chapters recommend prior
 	reading, and this is noted in the synopsis at the beginning of
 	each chapter.</para>
     </partintro>
@@ -214,16 +212,16 @@
     <title>System Administration</title>
 
     <partintro>
-      <para>The remaining chapters of the FreeBSD Handbook cover all
-	aspects of FreeBSD system administration.  Each chapter starts
-	by describing what you will learn as a result of reading the
-	chapter, and also details what you are expected to know before
+      <para>The remaining chapters cover all
+	aspects of &os; system administration.  Each chapter starts
+	by describing what will be learned as a result of reading the
+	chapter, and also details what the reader is expected to know before
 	tackling the material.</para>
 
-      <para>These chapters are designed to be read when you need
-	the information.  You do not have to read them in any
-	particular order, nor do you need to read all of them before
-	you can begin using FreeBSD.</para>
+      <para>These chapters are designed to be read as the information
+	is needed.  They do not need to be read in any
+	particular order, nor must all of them be read before
+	beginning to use &os;.</para>
     </partintro>
 
     &chap.config;
@@ -246,7 +244,7 @@
     <title>Network Communication</title>
 
     <partintro>
-      <para>FreeBSD is one of the most widely deployed operating
+      <para>&os; is one of the most widely deployed operating
 	systems for high performance network servers.  The chapters in
 	this part cover:</para>
 
@@ -256,7 +254,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>PPP and PPP over Ethernet</para>
+	  <para><acronym>PPP</acronym> and <acronym>PPP</acronym> over Ethernet</para>
 	</listitem>
 
 	<listitem>
@@ -276,10 +274,10 @@
 	</listitem>
       </itemizedlist>
 
-      <para>These chapters are designed to be read when
-	you need the information.  You do not have to read them in any
-	particular order, nor do you need to read all of them before
-	you can begin using FreeBSD in a network environment.</para>
+      <para>These chapters are designed to be read when the
+	information is needed.  They do not need to be read in any
+	particular order, nor is it necessary to read all of them
+	before using &os; in a network environment.</para>
     </partintro>
 
     &chap.serialcomms;

From owner-svn-doc-all@freebsd.org  Thu Jan 28 02:09:43 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 096FDA6F7E0;
 Thu, 28 Jan 2016 02:09:43 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D254417F2;
 Thu, 28 Jan 2016 02:09:42 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0S29f7d083479;
 Thu, 28 Jan 2016 02:09:41 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0S29fMG083478;
 Thu, 28 Jan 2016 02:09:41 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601280209.u0S29fMG083478@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 28 Jan 2016 02:09:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48108 - head/en_US.ISO8859-1/books/handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 02:09:43 -0000

Author: wblock
Date: Thu Jan 28 02:09:41 2016
New Revision: 48108
URL: https://svnweb.freebsd.org/changeset/doc/48108

Log:
  Whitespace-only fixes, translators please ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/book.xml	Thu Jan 28 01:59:59 2016	(r48107)
+++ head/en_US.ISO8859-1/books/handbook/book.xml	Thu Jan 28 02:09:41 2016	(r48108)
@@ -90,16 +90,14 @@
       <para>Welcome to &os;! This handbook covers the installation
 	and day to day use of
 	<emphasis>&os; &rel2.current;-RELEASE</emphasis> and
-	<emphasis>&os; &rel.current;-RELEASE</emphasis>.  This
-	book is the result of ongoing work by many individuals.  Some sections might be
-	outdated.  Those interested in helping to update and expand
-	this document should send email to the &a.doc;.</para>
-
-      <para>The latest
-
-	version of this book is available from the <link
-	  xlink:href="http://www.FreeBSD.org/">FreeBSD web site</link>.
-	Previous versions can be obtained from <uri
+	<emphasis>&os; &rel.current;-RELEASE</emphasis>.  This book is
+	the result of ongoing work by many individuals.  Some sections
+	might be outdated.  Those interested in helping to update and
+	expand this document should send email to the &a.doc;.</para>
+
+      <para>The latest version of this book is available from the
+	<link xlink:href="http://www.FreeBSD.org/">FreeBSD web
+	  site</link>.  Previous versions can be obtained from <uri
 	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>.
 	The book can be downloaded in a variety of formats and
 	compression options from the <link
@@ -108,7 +106,8 @@
 	<link linkend="mirrors-ftp">mirror sites</link>.  Printed
 	copies can be purchased at the
 	<link xlink:href="http://www.freebsdmall.com/">FreeBSD
-	  Mall</link>.  Searches can be performed on the handbook and other documents on the
+	  Mall</link>.  Searches can be performed on the handbook and
+	other documents on the
 	<link xlink:href="&url.base;/search/index.html">search
 	  page</link>.</para>
     </abstract>
@@ -120,8 +119,8 @@
     <title>Getting Started</title>
 
     <partintro>
-      <para>This part of the handbook is for users and
-	administrators who are new to &os;.  These chapters:</para>
+      <para>This part of the handbook is for users and administrators
+	who are new to &os;.  These chapters:</para>
 
       <itemizedlist>
 	<listitem>
@@ -142,15 +141,15 @@
 	</listitem>
 
 	<listitem>
-	  <para>Introduce X, the &unix; windowing system, and
-	    detail how to configure a desktop environment that makes
-	    users more productive.</para>
+	  <para>Introduce X, the &unix; windowing system, and detail
+	    how to configure a desktop environment that makes users
+	    more productive.</para>
 	</listitem>
       </itemizedlist>
 
       <para>The number of forward references in the text have been
-	kept to a minimum so that this section
-	can be read from front to back with minimal page flipping.</para>
+	kept to a minimum so that this section can be read from front
+	to back with minimal page flipping.</para>
     </partintro>
 
     &chap.introduction;
@@ -165,19 +164,19 @@
 
     <partintro>
       <para>Now that the basics have been covered, this part of the
-	book discusses some frequently used features of
-	&os;.  These chapters:</para>
+	book discusses some frequently used features of &os;.  These
+	chapters:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>Introduce popular and useful desktop
-	    applications: browsers, productivity tools, document
-	    viewers, and more.</para>
+	  <para>Introduce popular and useful desktop applications:
+	    browsers, productivity tools, document viewers, and
+	    more.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Introduce a number of multimedia tools
-	    available for &os;.</para>
+	  <para>Introduce a number of multimedia tools available for
+	    &os;.</para>
 	</listitem>
 
 	<listitem>
@@ -196,9 +195,9 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Some of these chapters recommend prior
-	reading, and this is noted in the synopsis at the beginning of
-	each chapter.</para>
+      <para>Some of these chapters recommend prior reading, and this
+	is noted in the synopsis at the beginning of each
+	chapter.</para>
     </partintro>
 
     &chap.desktop;
@@ -212,16 +211,16 @@
     <title>System Administration</title>
 
     <partintro>
-      <para>The remaining chapters cover all
-	aspects of &os; system administration.  Each chapter starts
-	by describing what will be learned as a result of reading the
-	chapter, and also details what the reader is expected to know before
-	tackling the material.</para>
+      <para>The remaining chapters cover all aspects of &os; system
+	administration.  Each chapter starts by describing what will
+	be learned as a result of reading the chapter, and also
+	details what the reader is expected to know before tackling
+	the material.</para>
 
       <para>These chapters are designed to be read as the information
-	is needed.  They do not need to be read in any
-	particular order, nor must all of them be read before
-	beginning to use &os;.</para>
+	is needed.  They do not need to be read in any particular
+	order, nor must all of them be read before beginning to use
+	&os;.</para>
     </partintro>
 
     &chap.config;
@@ -244,9 +243,9 @@
     <title>Network Communication</title>
 
     <partintro>
-      <para>&os; is one of the most widely deployed operating
-	systems for high performance network servers.  The chapters in
-	this part cover:</para>
+      <para>&os; is one of the most widely deployed operating systems
+	for high performance network servers.  The chapters in this
+	part cover:</para>
 
       <itemizedlist>
 	<listitem>
@@ -254,7 +253,8 @@
 	</listitem>
 
 	<listitem>
-	  <para><acronym>PPP</acronym> and <acronym>PPP</acronym> over Ethernet</para>
+	  <para><acronym>PPP</acronym> and <acronym>PPP</acronym> over
+	    Ethernet</para>
 	</listitem>
 
 	<listitem>
@@ -286,7 +286,6 @@
     &chap.network-servers;
     &chap.firewalls;
     &chap.advanced-networking;
-
   </part>
 
   <part xml:id="appendices">

From owner-svn-doc-all@freebsd.org  Thu Jan 28 22:22:20 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6DADA70C24;
 Thu, 28 Jan 2016 22:22:20 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5BE8B8F7;
 Thu, 28 Jan 2016 22:22:20 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0SMMJS0040924;
 Thu, 28 Jan 2016 22:22:19 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0SMMJbq040923;
 Thu, 28 Jan 2016 22:22:19 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601282222.u0SMMJbq040923@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 28 Jan 2016 22:22:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48109 - head/en_US.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 22:22:20 -0000

Author: wblock
Date: Thu Jan 28 22:22:19 2016
New Revision: 48109
URL: https://svnweb.freebsd.org/changeset/doc/48109

Log:
  Remove the installation instructions for dbus and hal from the Gnome
  section.  They are installed as dependencies.

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Thu Jan 28 02:09:41 2016	(r48108)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Thu Jan 28 22:22:19 2016	(r48109)
@@ -1419,23 +1419,13 @@ DisplayManager.requestPort:     0</scree
 
       <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
-      <para><application>GNOME</application> also needs
+      <para><application>GNOME</application> uses
 	<application>D-Bus</application> and
-	<application>HAL</application>.  These applications provide a
-	message bus and hardware abstraction.  They can be installed
-	from packages:</para>
-
-      <screen>&prompt.root; <userinput>pkg install dbus hal</userinput></screen>
-
-      <para>or from the Ports Collection:</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/ports/devel/dbus</userinput>
-&prompt.root; <userinput>make install clean</userinput>
-&prompt.root; <userinput>cd /usr/ports/sysutils/hal</userinput>
-&prompt.root; <userinput>make install clean</userinput></screen>
-
-      <para>Then enable both systems in
-	<filename>/etc/rc.conf</filename>:</para>
+	<application>HAL</application> for a
+	message bus and hardware abstraction.  These applications are automatically
+	installed as dependencies of <application>GNOME</application>.
+	Enable them in <filename>/etc/rc.conf</filename> so
+	they will be started when the system boots:</para>
 
       <programlisting>dbus_enable="YES"
 hald_enable="YES"</programlisting>
@@ -1457,7 +1447,7 @@ hald_enable="YES"</programlisting>
 
       <programlisting>gnome_enable="YES"</programlisting>
 
-      <para><application>GDM</application> will now start
+      <para><application>GDM</application> will start
 	automatically when the system boots.</para>
 
       <para>A second method for starting

From owner-svn-doc-all@freebsd.org  Thu Jan 28 22:33:39 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14044A7125B;
 Thu, 28 Jan 2016 22:33:39 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E36F911EA;
 Thu, 28 Jan 2016 22:33:38 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0SMXbWN044057;
 Thu, 28 Jan 2016 22:33:37 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0SMXbWO044053;
 Thu, 28 Jan 2016 22:33:37 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201601282233.u0SMXbWO044053@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 28 Jan 2016 22:33:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48110 - in head: hu_HU.ISO8859-2/share/xml
 nl_NL.ISO8859-1/share/xml 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 22:33:39 -0000

Author: jgh
Date: Thu Jan 28 22:33:37 2016
New Revision: 48110
URL: https://svnweb.freebsd.org/changeset/doc/48110

Log:
  - address old security links being generated prior to 2000
  
  PR:		206271
  Reported by:	mexas@bris.ac.uk
  Approved by:	wblock (mentor, doceng), glebius (security)
  Differential Revision:	https://reviews.freebsd.org/D5073

Modified:
  head/hu_HU.ISO8859-2/share/xml/libcommon.xsl
  head/nl_NL.ISO8859-1/share/xml/libcommon.xsl
  head/share/xml/common.ent
  head/share/xml/libcommon.xsl

Modified: head/hu_HU.ISO8859-2/share/xml/libcommon.xsl
==============================================================================
--- head/hu_HU.ISO8859-2/share/xml/libcommon.xsl	Thu Jan 28 22:22:19 2016	(r48109)
+++ head/hu_HU.ISO8859-2/share/xml/libcommon.xsl	Thu Jan 28 22:33:37 2016	(r48110)
@@ -311,7 +311,6 @@
   <xsl:template name="html-list-advisories-putitems">
     <xsl:param name="items" select="''" />
     <xsl:param name="prefix" select="''" />
-    <xsl:param name="prefixold" select="''" />
 
     <xsl:if test="$items">
       <table>
@@ -335,12 +334,6 @@
 	      <xsl:when test="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
-	      <xsl:when test="name/@role='old'">
-		<a><xsl:attribute name="href">
-		    <xsl:value-of select="concat($prefixold, name, '.asc')" />
-		  </xsl:attribute>
-		  <xsl:value-of select="concat(name, '.asc')" /></a>
-	      </xsl:when>
 	      <xsl:otherwise>
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefix, name, '.asc')" />

Modified: head/nl_NL.ISO8859-1/share/xml/libcommon.xsl
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/libcommon.xsl	Thu Jan 28 22:22:19 2016	(r48109)
+++ head/nl_NL.ISO8859-1/share/xml/libcommon.xsl	Thu Jan 28 22:33:37 2016	(r48110)
@@ -197,7 +197,6 @@
     <xsl:param name="itemtype" select="''" />
     <xsl:param name="itemtype" select="''" />
     <xsl:param name="prefix" select="''" />
-    <xsl:param name="prefixold" select="''" />
 
     <xsl:if test="$items">
       <table>
@@ -221,12 +220,6 @@
 	      <xsl:when test="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
-	      <xsl:when test="name/@role='old'">
-		<a><xsl:attribute name="href">
-		    <xsl:value-of select="concat($prefixold, name, '.asc')" />
-		  </xsl:attribute>
-		  <xsl:value-of select="concat(name, '.asc')" /></a>
-	      </xsl:when>
 	      <xsl:otherwise>
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefix, name, '.asc')" />

Modified: head/share/xml/common.ent
==============================================================================
--- head/share/xml/common.ent	Thu Jan 28 22:22:19 2016	(r48109)
+++ head/share/xml/common.ent	Thu Jan 28 22:33:37 2016	(r48110)
@@ -36,7 +36,6 @@
 
 <!ENTITY cgibase "//www.FreeBSD.org/cgi">
 <!ENTITY ftpbase "//security.FreeBSD.org/advisories/">
-<!ENTITY ftpbaseold "ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/">
 <!ENTITY ftpbaseerrata "//security.FreeBSD.org/advisories/">
 
 <!ENTITY os 'FreeBSD'>

Modified: head/share/xml/libcommon.xsl
==============================================================================
--- head/share/xml/libcommon.xsl	Thu Jan 28 22:22:19 2016	(r48109)
+++ head/share/xml/libcommon.xsl	Thu Jan 28 22:33:37 2016	(r48110)
@@ -782,7 +782,6 @@
           <xsl:with-param name="items" select="document($advisories.xml)//advisory" />
           <xsl:with-param name="itemtype" select="'Advisory'" />
           <xsl:with-param name="prefix" select="'&ftpbase;'" />
-          <xsl:with-param name="prefixold" select="'&ftpbaseold;'" />
         </xsl:call-template>
       </xsl:when>
 
@@ -791,7 +790,6 @@
 	  <xsl:with-param name="items" select="document($advisories.xml)//notice" />
 	  <xsl:with-param name="itemtype" select="'Errata Notice'" />
 	  <xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
-	  <xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
 	</xsl:call-template>
       </xsl:when>
     </xsl:choose>
@@ -828,12 +826,6 @@
 	      <xsl:when test="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
-	      <xsl:when test="name/@role='old'">
-		<a><xsl:attribute name="href">
-		    <xsl:value-of select="concat($prefixold, name, '.asc')" />
-		  </xsl:attribute>
-		  <xsl:value-of select="concat(name, '.asc')" /></a>
-	      </xsl:when>
 	      <xsl:otherwise>
 		<a><xsl:attribute name="href">
 		    <xsl:value-of select="concat($prefix, name, '.asc')" />

From owner-svn-doc-all@freebsd.org  Fri Jan 29 00:08:45 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A01BA70996;
 Fri, 29 Jan 2016 00:08:45 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5A38DBBC;
 Fri, 29 Jan 2016 00:08:45 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0T08iWF072772;
 Fri, 29 Jan 2016 00:08:44 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0T08i86072771;
 Fri, 29 Jan 2016 00:08:44 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201601290008.u0T08i86072771@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 29 Jan 2016 00:08:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48111 - head/en_US.ISO8859-1/htdocs/releases/10.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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 00:08:45 -0000

Author: marius (src,ports committer)
Date: Fri Jan 29 00:08:44 2016
New Revision: 48111
URL: https://svnweb.freebsd.org/changeset/doc/48111

Log:
  Update the 10.3-RELEASE schedule to reflect that the code freeze
  is now in effect.
  
  Approved by:	re (implicit)

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

Modified: head/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml	Thu Jan 28 22:33:37 2016	(r48110)
+++ head/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml	Fri Jan 29 00:08:44 2016	(r48111)
@@ -73,7 +73,7 @@
     <tr>
       <td>Code freeze begins</td>
       <td>29&nbsp;January&nbsp;2016</td>
-      <td>-</td>
+      <td>29&nbsp;January&nbsp;2016</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

From owner-svn-doc-all@freebsd.org  Fri Jan 29 01:41:12 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2051A726A0;
 Fri, 29 Jan 2016 01:41:12 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 B52BD1C49;
 Fri, 29 Jan 2016 01:41:12 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0T1fBKP099127;
 Fri, 29 Jan 2016 01:41:11 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0T1fBmU099126;
 Fri, 29 Jan 2016 01:41:11 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201601290141.u0T1fBmU099126@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Fri, 29 Jan 2016 01:41:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48112 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 01:41:13 -0000

Author: bjk
Date: Fri Jan 29 01:41:11 2016
New Revision: 48112
URL: https://svnweb.freebsd.org/changeset/doc/48112

Log:
  Shuffle categories slightly for the 2015Q4 report
  
  Drivers are entirely kernelspace, ports variants basically fall within
  the realm of ports, and the graphics stack involves kernel work as
  well as ports, so make it a "project"

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml	Fri Jan 29 00:08:44 2016	(r48111)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2015-10-2015-12.xml	Fri Jan 29 01:41:11 2016	(r48112)
@@ -667,7 +667,7 @@
     </body>
   </project>
 
-  <project cat='proj'>
+  <project cat='kern'>
     <title>Improvements to QLogic HBA driver</title>
 
     <contact>
@@ -929,7 +929,7 @@
     </help>
   </project>
 
-  <project cat='proj'>
+  <project cat='ports'>
     <title>Supporting Variants in the Ports Framework</title>
 
     <contact>
@@ -1931,7 +1931,7 @@
     </help>
   </project>
 
-  <project cat="ports">
+  <project cat="proj">
     <title>The Graphics stack on &os;</title>
 
     <contact>

From owner-svn-doc-all@freebsd.org  Fri Jan 29 16:45:51 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6300CA7214E;
 Fri, 29 Jan 2016 16:45:51 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 3531D1087;
 Fri, 29 Jan 2016 16:45:51 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0TGjoxH066486;
 Fri, 29 Jan 2016 16:45:50 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TGjoRA066485;
 Fri, 29 Jan 2016 16:45:50 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201601291645.u0TGjoRA066485@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 29 Jan 2016 16:45:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48113 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 16:45:51 -0000

Author: jgh
Date: Fri Jan 29 16:45:50 2016
New Revision: 48113
URL: https://svnweb.freebsd.org/changeset/doc/48113

Log:
  - add ATTO Technology to commerical hardware vendor list
  
  http://www.attotech.com
  
  PR:		206674
  Submitted by:	pdonnelly@attotech.com
  Approved by:	bcr (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5111

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

Modified: head/share/xml/commercial.hardware.xml
==============================================================================
--- head/share/xml/commercial.hardware.xml	Fri Jan 29 01:41:11 2016	(r48112)
+++ head/share/xml/commercial.hardware.xml	Fri Jan 29 16:45:50 2016	(r48113)
@@ -100,6 +100,21 @@
     </description>
   </entry>
 
+  <entry id="atto">
+    <name>ATTO Technology</name>
+    <url>http://www.attotech.com</url>
+    <description>
+      For over 25 years, ATTO Technology, Inc. has been a global leader in
+      storage and network connectivity and infrastructure solutions for
+      data-intensive computing environments. ATTO manufactures Host Bus
+      Adapters, RAID adapters, network adapters, RAID storage controllers,
+      Thunderbolt-enabled Desklink devices, bridges, switches and software.
+      ATTO's Celerity 16Gb Fibre Channel adapters, ExpressSAS 12Gb SAS/SATA
+      HBAs and SAN Storage Controllers all support &os; 9.3 and 10.x operating
+      systems.
+    </description>
+  </entry>
+
   <entry id="catpipe">
     <name>catpipe Systems</name>
     <url>http://www.catpipe.net/</url>

From owner-svn-doc-all@freebsd.org  Fri Jan 29 19:19:10 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE38BA7245E;
 Fri, 29 Jan 2016 19:19:10 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7FCD71317;
 Fri, 29 Jan 2016 19:19:10 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0TJJ9lg010876;
 Fri, 29 Jan 2016 19:19:09 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TJJ9pm010874;
 Fri, 29 Jan 2016 19:19:09 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201601291919.u0TJJ9pm010874@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 29 Jan 2016 19:19:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48114 - head/en_US.ISO8859-1/htdocs/internal
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 19:19:10 -0000

Author: jgh
Date: Fri Jan 29 19:19:09 2016
New Revision: 48114
URL: https://svnweb.freebsd.org/changeset/doc/48114

Log:
  - address internal machine listings
  
  PR:		202235
  Reported by:	chris@bsdjunk.com
  Approved by:	gjb (doceng), bdrewery, wblock (doceng,mentor)
  Differential Revision:	https://reviews.freebsd.org/D5118

Modified:
  head/en_US.ISO8859-1/htdocs/internal/machines.xml

Modified: head/en_US.ISO8859-1/htdocs/internal/machines.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/machines.xml	Fri Jan 29 16:45:50 2016	(r48113)
+++ head/en_US.ISO8859-1/htdocs/internal/machines.xml	Fri Jan 29 19:19:09 2016	(r48114)
@@ -90,62 +90,6 @@ this file</a>.</p>
 </tbody>
 </table>
 
-<h2>Administrative FreeBSD.org hosts</h2>
-
-<p>These systems perform various administrative services.  Most have
-  restricted access.</p>
-
-<table class="tblbasic">
-<thead>
-<tr>
-<th align="left">Host</th>
-<th align="left">Purpose</th>
-</tr>
-</thead>
-
-<tbody>
-
-<tr>
-<td>ftp-master</td>
-<td>FTP Master (stage server).</td>
-</tr>
-
-<tr>
-<td>skunkworks</td>
-<td>Perforce server.</td>
-</tr>
-
-<tr>
-<td>svn</td>
-<td>Subversion master repository.</td>
-</tr>
-
-</tbody>
-</table>
-
-<h2>Ports building cluster</h2>
-
-<p>The ports building cluster is primarily managed by the Ports
-  Management team (portmgr).</p>
-
-<table class="tblbasic">
-<thead>
-<tr>
-<th align="left">Host</th>
-<th align="left">Purpose</th>
-</tr>
-</thead>
-
-<tbody>
-
-<tr valign="top">
-<td>beefy<em>[1-8]</em></td>
-<td>Package building machines</td>
-</tr>
-
-</tbody>
-</table>
-
 <h2>Hardware configurations</h2>
 
 <table class="tblbasic">

From owner-svn-doc-all@freebsd.org  Fri Jan 29 19:22:54 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0863EA7260D;
 Fri, 29 Jan 2016 19:22:54 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CC3501764;
 Fri, 29 Jan 2016 19:22:53 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0TJMqrE013517;
 Fri, 29 Jan 2016 19:22:52 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TJMqng013516;
 Fri, 29 Jan 2016 19:22:52 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201601291922.u0TJMqng013516@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 29 Jan 2016 19:22:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48115 - head/en_US.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2016 19:22:54 -0000

Author: jgh
Date: Fri Jan 29 19:22:52 2016
New Revision: 48115
URL: https://svnweb.freebsd.org/changeset/doc/48115

Log:
  - address deleted port
  
  PR:		206078
  Submitted by:	nick@zalutskiy.com
  Approved by:	wblock (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5113

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri Jan 29 19:19:09 2016	(r48114)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri Jan 29 19:22:52 2016	(r48115)
@@ -971,15 +971,17 @@ EndSection</programlisting>
 	&apple; &mac;; they must be in &unix;/&ms-dos;/&windows;
 	format for use by <application>&xorg;</application>.  Once the
 	files have been copied into this directory, use
-	<application>ttmkfdir</application> to create a
+	<application>mkfontdir</application> to create a
 	<filename>fonts.dir</filename>, so that the X font renderer
 	knows that these new files have been installed.
-	<command>ttmkfdir</command> is available from the FreeBSD
-	Ports Collection as
-	<package>x11-fonts/ttmkfdir</package>.</para>
+	<command>mkfontdir</command> can be installed as a package:</para>
+
+      <screen>&prompt.root; <userinput>pkg install mkfontdir</userinput></screen>
+
+      <para>Then create an index of X font files in a directory:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/local/share/fonts/TrueType</userinput>
-&prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
+&prompt.root; <userinput>mkfontdir</userinput></screen>
 
       <para>Now add the &truetype; directory to the font path.  This
 	is just the same as described in <xref

From owner-svn-doc-all@freebsd.org  Sat Jan 30 06:33:45 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33C60A72F39;
 Sat, 30 Jan 2016 06:33:45 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 03F677A6;
 Sat, 30 Jan 2016 06:33:44 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0U6XikH010502;
 Sat, 30 Jan 2016 06:33:44 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0U6XhON010494;
 Sat, 30 Jan 2016 06:33:43 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201601300633.u0U6XhON010494@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 30 Jan 2016 06:33:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48116 - in head/share: security/advisories
 security/patches/SA-16:11 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 06:33:45 -0000

Author: delphij
Date: Sat Jan 30 06:33:43 2016
New Revision: 48116
URL: https://svnweb.freebsd.org/changeset/doc/48116

Log:
  Add SA-16:11.

Added:
  head/share/security/advisories/FreeBSD-SA-16:11.openssl.asc   (contents, props changed)
  head/share/security/patches/SA-16:11/
  head/share/security/patches/SA-16:11/openssl-10.1.patch   (contents, props changed)
  head/share/security/patches/SA-16:11/openssl-10.1.patch.asc   (contents, props changed)
  head/share/security/patches/SA-16:11/openssl-10.2.patch   (contents, props changed)
  head/share/security/patches/SA-16:11/openssl-10.2.patch.asc   (contents, props changed)
  head/share/security/patches/SA-16:11/openssl-9.3.patch   (contents, props changed)
  head/share/security/patches/SA-16:11/openssl-9.3.patch.asc   (contents, props changed)
Modified:
  head/share/xml/advisories.xml

Added: head/share/security/advisories/FreeBSD-SA-16:11.openssl.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-SA-16:11.openssl.asc	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,159 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-16:11.openssl                                    Security Advisory
+                                                          The FreeBSD Project
+
+Topic:          OpenSSL SSLv2 ciphersuite downgrade vulnerability
+
+Category:       contrib
+Module:         openssl
+Announced:      2016-01-30
+Affects:        All supported versions of FreeBSD.
+Corrected:      2016-01-28 21:42:10 UTC (stable/10, 10.2-STABLE)
+                2016-01-30 06:12:03 UTC (releng/10.2, 10.2-RELEASE-p12)
+                2016-01-30 06:12:03 UTC (releng/10.1, 10.1-RELEASE-p29)
+                2016-01-30 06:09:38 UTC (stable/9, 9.3-STABLE)
+                2016-01-30 06:12:03 UTC (releng/9.3, 9.3-RELEASE-p36)
+CVE Name:       CVE-2015-3197
+
+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
+
+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
+
+A malicious client can negotiate SSLv2 ciphers that have been disabled on
+the server and complete SSLv2 handshakes even if all SSLv2 ciphers have
+been disabled, provided that the SSLv2 protocol was not also disabled via
+SSL_OP_NO_SSLv2.
+
+III. Impact
+
+An active MITM attacker may be able to force a protocol downgrade to SSLv2,
+which is a flawed protocol and intercept the communication between client
+and server.
+
+IV.  Workaround
+
+No workaround is available, but only applications that do not explicitly
+disable SSLv2 are affected.
+
+To determine if a server have SSLv2 enabled, a system administrator can
+use the following command:
+
+% openssl s_client -ssl2 -connect <host>:<port> </dev/null 2>&1 | grep DONE
+
+which will print "DONE" if and only if SSLv2 is enabled.  Note that this
+check will not work for services that uses STARTTLS or DTLS.
+
+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.
+
+Restart all deamons using the library, or reboot the system.
+
+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
+
+Restart all deamons using the library, or reboot the system.
+
+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.
+
+[FreeBSD 10.2]
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-10.2.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-10.2.patch.asc
+# gpg --verify openssl-10.2.patch.asc
+
+[FreeBSD 10.1]
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-10.1.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-10.1.patch.asc
+# gpg --verify openssl-10.1.patch.asc
+
+[FreeBSD 9.3]
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-9.3.patch
+# fetch https://security.FreeBSD.org/patches/SA-16:11/openssl-9.3.patch.asc
+# gpg --verify openssl-9.3.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/9/                                                         r295060
+releng/9.3/                                                       r295061
+stable/10/                                                        r295016
+releng/10.1/                                                      r295061
+releng/10.2/                                                      r295061
+- -------------------------------------------------------------------------
+
+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://www.openssl.org/news/secadv/20160128.txt>
+
+<URL:https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3197>
+
+The latest revision of this advisory is available at
+<URL:https://security.FreeBSD.org/advisories/FreeBSD-SA-16:11.openssl.asc>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAEBCgAGBQJWrFhQAAoJEO1n7NZdz2rnzcwQAJJQvYkvHuVHHBHCuV576ceJ
+39Ry8ooGsNquyThUndbDYOV+Vhpj62XEnI+PXUgZPKENglnf+rRu0CWfCs1SqFQE
+EGOSsiXmBFyvJ8AMoQfiBdCoNRCBafqhY637IG8FU7WSpg8vYJO3bGCLmsgVbeoz
+V2kHmUtGUNSgksvOjo2O6ezc6rYc5jPrpB11mUZ8xFoBE9YhLNRpfttCajKAYy+9
+t7S3tuGnleWWmnLdFj0jNJXjg38h9gG18L4kr+z/mFFWKYmFNdKuoXlpseMFD7pb
+LP7RipHDh0WQqtVOQtyu0x6BuijiuIlByadcHZO1MfDNXnu1UR5OEESs0EYElh8O
+6mR/i3MZ1m9DoIoRcR1eCNQN2NiWV4tVCflSTi2pUl3TTCBpYn+THMi17c4IzTNA
+kaMR7AUeXgJVAntfmAx4mdqdjTam2EfCNRoMS3WdfVCD8cZQDewxFmEY2FbHUzix
+WUBVTUzx2BTUQO7PKJ6UdEiojetJ+OmwlaAb8WfGQTypANKUfMcyXzfmtmM4dgJg
+NjNIUxA9T3unmWUg5nh7CACJVWcykyM1ORLqFTrrxAlIz3d1gPI2kqGiMGtEMbzI
+A42xSFfHVvUJ6MzXe98Sf6cDWs98qQBTLDxHo5COpq6zV4AFDqlvdyzcJ/SQTAfq
+tsPAVgWspt40dxnRQfku
+=DN5y
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/SA-16:11/openssl-10.1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-10.1.patch	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,43 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c	(revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c	(working copy)
+@@ -400,7 +400,7 @@ static int get_client_master_key(SSL *s)
+ 			}
+ 
+ 		cp=ssl2_get_cipher_by_char(p);
+-		if (cp == NULL)
++		if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0)
+ 			{
+ 			ssl2_return_error(s,SSL2_PE_NO_CIPHER);
+ 			SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+@@ -698,9 +698,12 @@ static int get_client_hello(SSL *s)
+ 		    prio = cs;
+ 		    allow = cl;
+ 		    }
+-		for (z=0; z<sk_SSL_CIPHER_num(prio); z++)
++		/* Generate list of SSLv2 ciphers shared between client and server */
++		for (z = 0; z < sk_SSL_CIPHER_num(prio); z++)
+ 			{
+-			if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0)
++			const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++			if ((cp->algorithm_ssl & SSL_SSLV2) == 0 ||
++			    sk_SSL_CIPHER_find(allow, cp) < 0)
+ 				{
+ 				(void)sk_SSL_CIPHER_delete(prio,z);
+ 				z--;
+@@ -711,6 +714,14 @@ static int get_client_hello(SSL *s)
+ 		    sk_SSL_CIPHER_free(s->session->ciphers);
+ 		    s->session->ciphers = prio;
+ 		    }
++
++		/* Make sure we have at least one cipher in common */
++		if (sk_SSL_CIPHER_num(s->session->ciphers) == 0)
++			{
++			ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++			SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++			return -1;
++			}
+ 		/* s->session->ciphers should now have a list of
+ 		 * ciphers that are on both the client and server.
+ 		 * This list is ordered by the order the client sent

Added: head/share/security/patches/SA-16:11/openssl-10.1.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-10.1.patch.asc	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAABCgAGBQJWrFhgAAoJEO1n7NZdz2rnrYUQAJcK0DBwDfvVysKdQBmryikB
+iNjcbriE3X/secGwz2DnN38LoeXS1dP9N0Zk07KWaWi516PpQq1bHLxvomlvcxhw
+m98/Vmwv/MAK6g8AxEeVoXP8A2dCYeVGu8AWmfp9wwum1Kl9vGmm4UE3McPC3a59
+9mqJ1U+icn72EasyZMGNc8WnwZleuievXYxUkFJwQ32urbMgnIk/XkNT9ULpWjiH
+omgu4C4IXKyb/zer0AW5xfQ2WbMqmxD93R4ApcM79+wxCtHFK+CxFeX7Xc8BXAXn
+SEn69KggtFCYCXnsIdAE42IK28c3iw7MoeHPSZAYUf8SJ3x99NvXvdfPairLz6X1
+kjaAbbi2ycZRJBdBWTiSqYrtW3tSPGz+LtutbctcOjB6EsZMbbOZWKZYwAD2d1vi
+httOrSpgd15Jqkhh6xYoK5qmk4rDUMe8MbaSmYH0rmjB/79VxBSneocwWnYpbsUO
+m6Zrg1EpKfoIGcXYeanRHZqobeR+0uhi3oX/dBOUmxycWEMlALxboVJ7DU/q+AXE
+Fq7+H8wkATvMXaJtlRWmKV34ShfmIqTEceNLJMDHFqb/j/yUNKrA3pjfqgkoYflf
+IHrG1v61haJNREs2hx1fTWWy315ua9pwOHrpR9eYNiOwh3b4MbKdA9QErYZLMyuM
+gt45GgReqbU50ikXipnp
+=voQ/
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/SA-16:11/openssl-10.2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-10.2.patch	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,41 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c	(revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c	(working copy)
+@@ -402,7 +402,7 @@ static int get_client_master_key(SSL *s)
+         }
+ 
+         cp = ssl2_get_cipher_by_char(p);
+-        if (cp == NULL) {
++        if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0) {
+             ssl2_return_error(s, SSL2_PE_NO_CIPHER);
+             SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+             return (-1);
+@@ -687,8 +687,12 @@ static int get_client_hello(SSL *s)
+             prio = cs;
+             allow = cl;
+         }
++
++        /* Generate list of SSLv2 ciphers shared between client and server */
+         for (z = 0; z < sk_SSL_CIPHER_num(prio); z++) {
+-            if (sk_SSL_CIPHER_find(allow, sk_SSL_CIPHER_value(prio, z)) < 0) {
++            const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++            if ((cp->algorithm_ssl & SSL_SSLV2) == 0 ||
++                sk_SSL_CIPHER_find(allow, cp) < 0) {
+                 (void)sk_SSL_CIPHER_delete(prio, z);
+                 z--;
+             }
+@@ -697,6 +701,13 @@ static int get_client_hello(SSL *s)
+             sk_SSL_CIPHER_free(s->session->ciphers);
+             s->session->ciphers = prio;
+         }
++
++        /* Make sure we have at least one cipher in common */
++        if (sk_SSL_CIPHER_num(s->session->ciphers) == 0) {
++            ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++            SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++            return -1;
++        }
+         /*
+          * s->session->ciphers should now have a list of ciphers that are on
+          * both the client and server. This list is ordered by the order the

Added: head/share/security/patches/SA-16:11/openssl-10.2.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-10.2.patch.asc	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAABCgAGBQJWrFhgAAoJEO1n7NZdz2rn7pIP/RfM/xbLqKh6jOQKzCAs/hqK
+erl+zzNNn8cJF00c1T2kFY05pwvFExAIAdPQ09uk7S+d+qC1tfn55ioPT0rUaLsv
+qvhsRGEB2FZi+c6l8ZFK9qvePbqTzGAwYjhcmbaxw83YtosdxM5Z6Q3v9Nzfd6cG
+qvGH6X91MDlpzyKx/ZQ/vXXFkMO1gDzMgOJe6phgKkxMiNfknqBifsLaJBUq0uSZ
+WaqlfbhPDDXFu2hJ3lvizAxz2+6OQVUZeuGaw0UPtAzofBdX4H3UhUXjFPO1iECV
+D3P0jTUKnNswd1l6xR8AUNHPh78Zf3T8hE9Ihf7jBiwVpA4VX2+jyan3NfC5ESO2
+dXStOPa4weEMERJVoBra8ZcvUwl+F63/ti35mf42KQK/dMXfn4YYJg06ZOyAxdG2
++7bAJCCW6IVmIWhh+k7UdajP7KKSjyaopw/sNEAvU01iS4nB9EBnFebQ785GgRfE
+iUEm98lCjIzkWLqZU6aGwLL46S3GUYkIhylUjLuHwsVm7YjEhURU0ghhM+srZDuX
+yd4appgHar632XnotetsIiivKkzZJYK+1pt9tVf72/Q7V+ba4Zj7FCs1DEvwAfYa
+LNIFIjS02ocgBQjKKR9+UqazuXe2+o0CpOKlqB/HGeIU3Rcc25h2y3uk8q/cCYoa
+ibsADoMVD+ImHQXbKtlu
+=L3PJ
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/SA-16:11/openssl-9.3.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-9.3.patch	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,43 @@
+Index: crypto/openssl/ssl/s2_srvr.c
+===================================================================
+--- crypto/openssl/ssl/s2_srvr.c	(revision 294905)
++++ crypto/openssl/ssl/s2_srvr.c	(working copy)
+@@ -392,7 +392,7 @@ static int get_client_master_key(SSL *s)
+ 			}
+ 
+ 		cp=ssl2_get_cipher_by_char(p);
+-		if (cp == NULL)
++		if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0)
+ 			{
+ 			ssl2_return_error(s,SSL2_PE_NO_CIPHER);
+ 			SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH);
+@@ -690,9 +690,12 @@ static int get_client_hello(SSL *s)
+ 		    prio = cs;
+ 		    allow = cl;
+ 		    }
+-		for (z=0; z<sk_SSL_CIPHER_num(prio); z++)
++		/* Generate list of SSLv2 ciphers shared between client and server */
++		for (z = 0; z < sk_SSL_CIPHER_num(prio); z++)
+ 			{
+-			if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0)
++			const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z);
++			if ((cp->algorithms & SSL_SSLV2) == 0 ||
++			    sk_SSL_CIPHER_find(allow, cp) < 0)
+ 				{
+ 				(void)sk_SSL_CIPHER_delete(prio,z);
+ 				z--;
+@@ -703,6 +706,14 @@ static int get_client_hello(SSL *s)
+ 		    sk_SSL_CIPHER_free(s->session->ciphers);
+ 		    s->session->ciphers = prio;
+ 		    }
++
++		/* Make sure we have at least one cipher in common */
++		if (sk_SSL_CIPHER_num(s->session->ciphers) == 0)
++			{
++			ssl2_return_error(s, SSL2_PE_NO_CIPHER);
++			SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH);
++			return -1;
++			}
+ 		/* s->session->ciphers should now have a list of
+ 		 * ciphers that are on both the client and server.
+ 		 * This list is ordered by the order the client sent

Added: head/share/security/patches/SA-16:11/openssl-9.3.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/SA-16:11/openssl-9.3.patch.asc	Sat Jan 30 06:33:43 2016	(r48116)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.8 (FreeBSD)
+
+iQIcBAABCgAGBQJWrFhgAAoJEO1n7NZdz2rnHfAP/0dRSsN5QEeACYvdu7fSGyvq
+/9QUsHLyGMj3wS1SUP3oFCgpXuweYfmWVtvFfA2uLqXOukuOPJLYSpJVdF0QXZrK
+dL0mlU3aaA2NLQlgl3QpnX1Gz5ItV62piljHs9Q87Is765BYnUp7i01gexVIA0PE
+kK0U5ocfYiEwGhtcRl1ndTCHFJxrAQY7quRBPgeONpB2VFoSXOmRLF2cCi8s+ebV
+cUk9sTWT+OCutzjvDFsqEFvcaVHT8jDDlXdXUuDGOzZ4sGc/OgKA6J42Wws++VKw
+LqfQjD/RP4GQNvO0mmvd/1jnr6ug+rMxJapnNRVY6nTRBOcn2qEIZjALBjjVTZdx
+xIQVc5M0CmRF4GcnKlwwJMC5vl+BPxvSbb2mKDEGY+nzXdH7z5618wwqE1EyIwj5
+U7X75vogYMv50uTTuAXazQm1WifxmpDYaaIyTRzz5pnSeXE6seeUEvkKXhmD2s+g
+OQhULV51JUPhousieaJzPVTB8/NSZAiqvma++aW7claJr7drGWL1DEOGXqRBl/Rb
+9iYDOJ6VcdqwfDUb1Hf5Ukc3oYGXkobhpswjbFnmTE96Cu/mH7Z1bKDhlG/0Zzwv
+YYHTmWn9j9/azAwL0ZTUZztDm+9ZQqSPBXJMWVEaPOskyxRUHKurgixB7uEZco9U
+RlgyGJfV0gU3oDgM9XE+
+=wEfU
+-----END PGP SIGNATURE-----

Modified: head/share/xml/advisories.xml
==============================================================================
--- head/share/xml/advisories.xml	Fri Jan 29 19:22:52 2016	(r48115)
+++ head/share/xml/advisories.xml	Sat Jan 30 06:33:43 2016	(r48116)
@@ -11,6 +11,14 @@
       <name>1</name>
 
       <day>
+        <name>30</name>
+
+        <advisory>
+          <name>FreeBSD-SA-16:11.openssl</name>
+        </advisory>
+      </day>
+
+      <day>
         <name>27</name>
 
         <advisory>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 10:40:07 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9EBAA72868;
 Sat, 30 Jan 2016 10:40:07 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7AFB61D57;
 Sat, 30 Jan 2016 10:40:07 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UAe6OE080025;
 Sat, 30 Jan 2016 10:40:06 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UAe6ML080024;
 Sat, 30 Jan 2016 10:40:06 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601301040.u0UAe6ML080024@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 10:40:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48117 - head/en_US.ISO8859-1/htdocs/gnome
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 10:40:07 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 10:40:06 2016
New Revision: 48117
URL: https://svnweb.freebsd.org/changeset/doc/48117

Log:
  Add MATE 1.12 news item.
  
  Approved by:	rene@
  Differential Revision:	https://reviews.freebsd.org/D5127

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/news.xml

Modified: head/en_US.ISO8859-1/htdocs/gnome/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 06:33:43 2016	(r48116)
+++ head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 10:40:06 2016	(r48117)
@@ -20,6 +20,27 @@ News//EN"
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
 
   <year>
+    <name>2016</name>
+
+    <month>
+      <name>January</name>
+
+      <day>
+        <name>25</name>
+
+        <event>
+          <title>Announcing MATE 1.12 for FreeBSD!</title>
+
+          <p>The FreeBSD GNOME team proudly presents MATE 1.12 for FreeBSD.</p>
+
+          <p>This version is still build against GTK+ 2, and has a number
+            of bugfixes for the applets.</p>
+        </event>
+      </day>
+    </month>
+  </year>
+
+  <year>
     <name>2015</name>
 
     <month>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 11:32:30 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84C9CA739BF;
 Sat, 30 Jan 2016 11:32:30 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 56028145E;
 Sat, 30 Jan 2016 11:32:30 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UBWT6P097193;
 Sat, 30 Jan 2016 11:32:29 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UBWT5r097192;
 Sat, 30 Jan 2016 11:32:29 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601301132.u0UBWT5r097192@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sat, 30 Jan 2016 11:32:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48118 -
 head/de_DE.ISO8859-1/books/handbook/advanced-networking
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 11:32:30 -0000

Author: bhd
Date: Sat Jan 30 11:32:29 2016
New Revision: 48118
URL: https://svnweb.freebsd.org/changeset/doc/48118

Log:
  Update to r44143:
  
  Finish editorial pass through Routing chapter.
  
  Reviewed by:	bcr
  Differential Revision:	https://reviews.freebsd.org/D5128

Modified:
  head/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Sat Jan 30 10:40:06 2016	(r48117)
+++ head/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Sat Jan 30 11:32:29 2016	(r48118)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde:$
-     basiert auf: r44142
+     basiert auf: r44143
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
 xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -390,49 +390,35 @@ host2.example.com link#1            UC  
 	<primary>Dual-Homed-Hosts</primary>
       </indexterm>
 
-      <para>Ein Dual-Homed-Host ist ein Rechner, der sich in zwei
-	verschiedenen Netzwerken befindet.</para>
-
-      <para>Der Dual-Homed-Host verfügt möglicherweise über zwei
-	Ethernetkarten, die jeweils eine Adresse in einem separaten
-	Subnetz benutzen.  Alternativ hat der Host nur eine
-	Ethernetkarte und verwendet &man.ifconfig.8; Aliasing.
-	Die erste Möglichkeit wird verwendet, wenn zwei physikalisch
-	getrennte Ethernet-Netzwerke vorhanden sind, die zweite, wenn
-	es nur ein physikalisches Ethernet-Netzwerk gibt, das aber aus
-	zwei logisch getrennten Subnetzen besteht.</para>
-
-      <para>In beiden Fällen werden Routingtabellen erstellt,
-	damit jedes Subnetz weiß, dass dieser Rechner als Gateway
-	zum anderen Subnetz arbeitet (<foreignphrase>inbound
-	route</foreignphrase>).  Diese Konfiguration (der
-	Gateway-Rechner arbeitet als Router zwischen den Subnetzen)
-	wird häufig verwendet, wenn es darum geht Paketfilterung oder
-	eine Firewall zu implementieren.</para>
-
-      <para>Damit dieser Rechner Pakete zwischen den beiden
-	Schnittstellen weiterleiten kann, muss &os; als Router
-	konfiguriert werden.  Dies wird im nächsten Abschnitt
-	beschrieben.</para>
+      <para>Ein &os;-System kann als Standard-Gateway bzw. Router für
+	ein Netzwerk konfiguriert werden, wenn es sich um einen
+	Dual-Homed-Host handelt.  Ein Dual-Homed-Host ist ein Rechner,
+	der sich in mindestens zwei verschiedenen Netzwerken
+	befindet.  Typischerweise ist jedes Netzwerk über eine
+	separate Netzwerkschnittstelle verbunden.  Mit
+	<acronym>IP</acronym> Aliasing können mehrere Adressen, die
+	jeweils zu einem andren Subnetz gehören, an eine physikalische
+	Schnittstelle gebunden werden.</para>
 
       <indexterm>
 	<primary>Router</primary>
       </indexterm>
 
-      <para>Ein Netzwerkrouter ist ein System, das Pakete von
-	einer Schnittstelle zur anderen weiterleitet.
-	Internetstandards und gute Ingenieurspraxis sorgten
+      <para>Damit Pakete zwischen den Schnittstellen weitergeleitet
+	werden können, muss das &os;-System als Router konfiguriert
+	werden.  Internetstandards und gute Ingenieurspraxis sorgten
 	dafür, dass diese Funktion in &os; in der Voreinstellung
-	deaktiviert ist.  Diese Funktion kann aktiviert werden,
-	indem folgende Zeile in &man.rc.conf.5; hinzugefügt
-	wird:</para>
+	deaktiviert ist.  Sie kann jedoch aktiviert werden,
+	indem folgende Zeile in <filename>/etc/rc.conf</filename>
+	hinzugefügt wird:</para>
 
       <programlisting>gateway_enable="YES"          # Auf YES setzen, wenn der Rechner als Gateway arbeiten soll</programlisting>
 
-      <para>Diese Option setzt die &man.sysctl.8;-Variable
+      <para>Um das Routing zu aktivieren, setzen Sie die
+	&man.sysctl.8;-Variable
 	<varname>net.inet.ip.forwarding</varname> auf
 	<literal>1</literal>.  Um das Routing zu stoppen,
-	muss die Variable auf <literal>0</literal> gesetzt
+	muss die Variable wieder auf <literal>0</literal> gesetzt
 	werden.</para>
 
       <indexterm>
@@ -445,15 +431,25 @@ host2.example.com link#1            UC  
         <primary>OSPF</primary>
       </indexterm>
 
-      <para>Der neue Router benötigt nun noch Routen, um zu
-	wissen, wohin er den Verkehr senden soll.  Wenn das Netzwerk
-	einfach genug ist, können statische Routen verwendet werden.
-	&os; verfügt über den Standard BSD-Routing-Daemon
-	&man.routed.8;, der <acronym>RIP</acronym> (sowohl Version 1
-	als auch Version 2) und <acronym>IRDP</acronym> versteht.
-	<acronym>BGP</acronym>v4,
-	<acronym>OSPF</acronym>v2 und andere Protokolle werden
-	von <package>net/zebra</package> unterstützt.</para>
+      <para>Die Routingtabelle eines Routers benötigt zusätzliche
+	Routen, damit er weiß, wie er andere Netzwerke erreichen kann.
+	Die Routen können entweder manuell als statische Routen
+	hinzugefügt werden, oder aber der Router lernt automatisch
+	die Routen anhand des Routing-Protokolls.  Statische Routen
+	eignen sich für kleine Netzwerke und dieser Abschnitt
+	beschreibt, wie Sie eine statische Route für ein kleines
+	Netzwerk hinzufügen.</para>
+
+      <note>
+	<para>In großen Netzwerken sind statische Routen schlecht
+	  skalierbar.  &os; beinhaltet den
+	  <acronym>BSD</acronym>-Routing-Daemon &man.routed.8;, der
+	  die Protokolle <acronym>RIP</acronym> (Version 1 und
+	  Version 2) sowie <acronym>IRDP</acronym> unterstützt.  Die
+	  Routing-Protokolle <acronym>BGP</acronym> und
+	  <acronym>OSPF</acronym> können über den Port oder das Paket
+	  <package>net/zebra</package> installiert werden.</para>
+      </note>
 
 	<para>Nehmen wir an, dass wir über folgendes Netzwerk
 	  verfügen:</para>
@@ -495,13 +491,14 @@ host2.example.com link#1            UC  
 	  Router für den Zugriff auf das Internet.  Die
 	  Standardroute ist auf <systemitem class="ipaddress">10.0.0.1</systemitem>
 	  gesetzt, damit ein Zugriff auf das Internet möglich wird.
-	  <systemitem>RouterB</systemitem> ist bereits ordnungsgemäß
+	  <systemitem>RouterB</systemitem> ist bereits
 	  konfiguriert, da er <systemitem
-	    class="ipaddress">192.168.1.1</systemitem> als Gateway
-	  benutzt.</para>
+	    class="ipaddress">192.168.1.1</systemitem> als
+	  Standard-Gateway benutzt.</para>
 
-	<para>Die Routingtabelle auf <systemitem>RouterA</systemitem>
-	  sieht in etwa so aus:</para>
+	<para>Bevor die statischen Routen hinzugefügt werden, sieht
+	  die Routingtabelle auf <systemitem>RouterA</systemitem> in
+	  etwa so aus:</para>
 
 	<screen>&prompt.user; <userinput>netstat -nr</userinput>
 Routing tables
@@ -513,47 +510,34 @@ default            10.0.0.1           UG
 10.0.0/24          link#1             UC          0        0    xl0
 192.168.1/24       link#2             UC          0        0    xl1</screen>
 
-	<para>Mit dieser Routingtabelle kann <systemitem>RouterA</systemitem>
-	  das interne Netz 2 nicht erreichen, da keine Route zum
-	  Rechner <systemitem
-	    class="ipaddress">192.168.2.0/24</systemitem> vorhanden
-	  ist.  Durch den folgenden Befehl wird das interne Netz 2 in
-	  die Routingtabelle des Rechners
-	  <systemitem>RouterA</systemitem> aufgenommen, indem
+	<para>Mit dieser Routingtabelle hat
+	  <systemitem>RouterA</systemitem> keine Route zum Netzwerk
+	  <systemitem class="ipaddress">192.168.2.0/24</systemitem>.
+	  Der folgende Befehl wird das interne Netz 2 in
+	  die Routingtabelle von <systemitem>RouterA</systemitem>
+	  aufnehmen und dabei
 	  <systemitem class="ipaddress">192.168.1.2</systemitem> als
-	  nächster Zwischenschritt
-	  (<foreignphrase>Hop</foreignphrase>) verwendet wird:</para>
+	  nächsten Zwischenschritt
+	  (<foreignphrase>Hop</foreignphrase>) verwenden:</para>
 
 	<screen>&prompt.root; <userinput>route add -net 192.168.2.0/24 192.168.1.2</userinput></screen>
 
 	<para>Ab sofort kann <systemitem>RouterA</systemitem> alle Rechner des
 	  Netzwerks <systemitem class="ipaddress">192.168.2.0/24</systemitem>
-	  erreichen.</para>
+	  erreichen.  Allerdings gehen die Routing-Informationen
+	  verloren, wenn das &os;-System neu gestartet wird.  Um
+	  statische Routen dauerhaft einzurichten, müssen diese in
+	  <filename>/etc/rc.conf</filename> eingetragen werden:</para>
 
-      <sect3>
-	<title>Routen dauerhaft einrichten</title>
-
-	<para>Das obige Beispiel ist für die Konfiguration einer
-	  statischen Route auf einem laufenden System geeignet.  Diese
-	  Routing-Information gehen jedoch verloren, wenn der
-	  &os;-Rechner neu gestartet wird.  Dauerhaft statische
-	  Routen können in <filename>/etc/rc.conf</filename>
-	  eingetragen werden:</para>
-
-	<programlisting># Add Internal Net 2 as a static route
+	<programlisting># Add Internal Net 2 as a persistent static route
 static_routes="internalnet2"
 route_internalnet2="-net 192.168.2.0/24 192.168.1.2"</programlisting>
 
 	<para>Die Variable <literal>static_routes</literal> enthält
 	  eine Reihe von Strings, die durch Leerzeichen getrennt sind.
-	  Jeder String bezieht sich auf den Namen einer Route.  Dieses
-	  Beispiel hat <literal>static_routes</literal>,
-	  <replaceable>internalnet2</replaceable> als einzigen String.
-	  Die Variable <literal>route_internalnet2</literal> enthält
-	  alle Konfigurationsparameter für &man.route.8;.  Dieses
-	  Beispiel entspricht dem Befehl:</para>
-
-	<screen>&prompt.root; <userinput>route add -net 192.168.2.0/24 192.168.1.2</userinput></screen>
+	  Jeder String bezieht sich auf den Namen einer Route.  Die
+	  Variable <literal>route_internalnet2</literal> enthält die
+	  statische Route.</para>
 
 	<para>Wird mit der Variablen <literal>static_routes</literal>
 	  mehr als eine Variable angegeben, so werden auch mehrere
@@ -566,11 +550,10 @@ route_internalnet2="-net 192.168.2.0/24 
 	<programlisting>static_routes="net1 net2"
 route_net1="-net 192.168.0.0/24 192.168.0.1"
 route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
-      </sect3>
     </sect2>
 
-    <sect2 xml:id="network-routing-propagation">
-      <title>Verteilung von Routing-Informationen</title>
+    <sect2 xml:id="network-routing-troubleshooting">
+      <title>Problembehandlung</title>
 
       <para>Wenn ein Adressraum einem Netzwerk zugeordnet wird,
 	konfiguriert der Dienstanbieter seine Routing-Tabellen, so
@@ -586,7 +569,8 @@ route_net2="-net 192.168.1.0/24 192.168.
 	transportieren und verteilen.  Jeder Backbone-Rechner verfügt
 	über eine Kopie von Master-Tabellen, die den Verkehr für ein
 	bestimmtes Netzwerk hierarchisch vom Backbone über eine Kette
-	von Dienstanbietern bis hin zu Ihrer Seite leiten.</para>
+	von Dienstanbietern bis hin zu einem bestimmten Netzwerk
+	leiten.</para>
 
       <para>Es ist die Aufgabe des Dienstanbieters, den
 	Backbone-Seiten mitzuteilen, dass sie mit einer Seite
@@ -594,10 +578,6 @@ route_net2="-net 192.168.1.0/24 192.168.
 	<emphasis>Bekanntmachung von Routen</emphasis>
 	(<foreignphrase>routing propagation</foreignphrase>)
 	bezeichnet.</para>
-    </sect2>
-
-    <sect2 xml:id="network-routing-troubleshooting">
-      <title>Problembehebung</title>
 
       <indexterm>
 	<primary>&man.traceroute.8;</primary>
@@ -607,17 +587,15 @@ route_net2="-net 192.168.1.0/24 192.168.
 	Routen, und einige Seiten sind nicht in der Lage, sich zu
 	verbinden.  Der vielleicht nützlichste Befehl, um
 	festzustellen wo das Routing nicht funktioniert, ist
-	&man.traceroute.8;.  Das Programm ist nützlich, falls
-	&man.ping.8; fehlschlägt.</para>
-
-      <para>Rufen Sie &man.traceroute.8; mit dem Namen des entfernten
-	Rechners auf, mit dem eine Verbindung aufgebaut werden soll.
-	Die Ausgabe zeigt die Gateway-Rechner entlang des
-	Verbindungspfades an.  Schließlich wird der Zielrechner
-	erreicht oder es kommt zu einem Verbindungsabbruch.</para>
+	<command>traceroute</command>.  Das Programm ist nützlich,
+	falls <command>ping</command> fehlschlägt.</para>
 
-      <para>Weitere Informationen finden Sie in
-	&man.traceroute.8;.</para>
+      <para>Rufen Sie <command>traceroute</command> mit dem Namen des
+	entfernten Rechners auf, mit dem eine Verbindung aufgebaut
+	werden soll.  Die Ausgabe zeigt die Gateway-Rechner entlang
+	des Verbindungspfades an.  Schließlich wird der Zielrechner
+	erreicht oder es kommt zu einem Verbindungsabbruch.  Weitere
+	Informationen finden Sie in &man.traceroute.8;.</para>
     </sect2>
 
     <sect2 xml:id="network-routing-multicast">
@@ -633,27 +611,32 @@ route_net2="-net 192.168.1.0/24 192.168.
       </indexterm>
 
       <para>&os; unterstützt sowohl Multicast-Anwendungen als
-	auch Multicast-Routing.  Multicast-Anwendungen sind lauffähig,
-	ohne dass sie gesondert konfiguriert werden müssen.
-	Multicast-Routing muss in der Kernelkonfiguration aktiviert
-	werden:</para>
+	auch Multicast-Routing.  Multicast-Anwendungen benötigen keine
+	spezielle Konfiguration, um auf &os; lauffähig zu sein.  Damit
+	Multicast-Routing unterstützt wird, muss die folgende Option
+	in der Kernelkonfiguration aktiviert werden:</para>
 
       <programlisting>options MROUTING</programlisting>
 
-      <para>Damit der Multicast-Routing-Daemon &man.mrouted.8; Tunnel
-	und <acronym>DVMRP</acronym> aktiviert, muss
-	<filename>/etc/mrouted.conf</filename> konfiguriert werden.
-	Weitere Informationen zu Multicast-Routing finden Sie in
-	&man.mrouted.8;.</para>
+      <para>Der Multicast-Routing-Daemon
+	<application>mrouted</application> kann als Port oder Paket
+	<package>net/mroute</package> installiert werden.  Dieser
+	Daemon implementiert das <acronym>DVMRP</acronym>
+	Multicast-Routing-Protokoll.  Um die Tunnel und
+	<acronym>DVMRP</acronym> einzurichten, muss
+	<filename>/usr/local/etc/mrouted.conf</filename> bearbeitet
+	werden.  Bei der Installation von
+	<application>mrouted</application> wird auch
+	<application>map-mbone</application> und
+	<application>mrinfo</application> sowie die zugehörigen
+	Manualpages installiert, in denen Sie auch
+	Konfigurationsbeispiele finden können.</para>
 
       <note>
-	<para>Der Multicast-Routing-Daemon &man.mrouted.8; verwendet
-	  das <acronym>DVMRP</acronym> Multicast Routing Protocol,
-	  das inzwischen in den meisten Multicast-Installationen
-	  durch &man.pim.4; ersetzt wurde.   &man.mrouted.8; sowie die
-	  damit in Verbindung stehenden Werkzeuge &man.map-mbone.8;
-	  und &man.mrinfo.8; können über die &os; Ports-Sammlung aus
-	  <package>net/mrouted</package> installiert werden.</para>
+	<para><acronym>DVMRP</acronym> wurde in vielen
+	Multicast-Installationen weitgehend durch das
+	<acronym>PIM</acronym>-Protokoll ersetzt.  Weitere
+	Informationen finden Sie in &man.pim.4;.</para>
       </note>
     </sect2>
   </sect1>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 11:38:06 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD9C6A73B3C;
 Sat, 30 Jan 2016 11:38:05 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 B57511765;
 Sat, 30 Jan 2016 11:38:05 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UBc4EM097550;
 Sat, 30 Jan 2016 11:38:04 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UBc4vu097549;
 Sat, 30 Jan 2016 11:38:04 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201601301138.u0UBc4vu097549@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sat, 30 Jan 2016 11:38:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48119 - head/de_DE.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 11:38:06 -0000

Author: bhd
Date: Sat Jan 30 11:38:04 2016
New Revision: 48119
URL: https://svnweb.freebsd.org/changeset/doc/48119

Log:
  Update to r42801:
  
  This patch does the following:
  
  - makes it clear that the ports collection has to be installed
   before performing a search
  
  - updates the listings to latest output
  
  - spells out the hyperlinks so that they render in the print
   edition
  
  - rewords Tip so that it doesn't start with a command

Modified:
  head/de_DE.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jan 30 11:32:29 2016	(r48118)
+++ head/de_DE.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jan 30 11:38:04 2016	(r48119)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde: de-docproj/books/handbook/ports/chapter.xml,v 1.111 2011/12/19 17:13:33 bcr Exp $
-     basiert auf: r42794
+     basiert auf: r42801
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ports">
   <info><title>Installieren von Anwendungen: Pakete und Ports</title>
@@ -255,7 +255,7 @@
 	<indexterm><primary>FreshPorts</primary></indexterm>
 
 	<para>Dan Langille verwaltet <uri
-	    xlink:href="http://www.FreshPorts.org/">FreshPorts</uri>,
+	    xlink:href="http://www.FreshPorts.org/">FreshPorts.org</uri>,
 	  das eine umfassende Suchfunktion bietet und Änderungen an
 	  den Anwendungen in der Ports-Sammlung verfolgt.
 	  Registrierte Benutzer können eine Merkliste erstellen, um
@@ -275,7 +275,9 @@
       </listitem>
 
       <listitem>
-	<para>Verwenden Sie
+	<para>Wenn die Ports-Sammlung bereits installiert ist, gibt es
+	  mehrere Methoden, um die lokale Version dieser Port-Sammlung
+	  abzufragen.  Verwenden Sie
 	  <command>whereis <replaceable>Datei</replaceable></command>
 	  um herauszufinden, in welcher Kategorie ein Port ist, wobei
 	  <replaceable>Datei</replaceable> der Name des Programms ist,
@@ -300,17 +302,18 @@ lsof: /usr/ports/sysutils/lsof</screen>
 	  die eingebaute Suchfunktion der Ports-Sammlung zu benutzen.
 	  Wechseln Sie dazu in das Verzeichnis
 	  <filename>/usr/ports</filename>, und rufen Sie <command>make
-	    search name=Anwendungsname</command> auf, wobei
-	  <replaceable>Anwendungsname</replaceable> der Name der
-	  Software ist.  Um zum Beispiel nach <command>lsof</command>
-	  zu suchen:</para>
+	    search
+	    name=<replaceable>Anwendungsname</replaceable></command>
+	  auf, wobei <replaceable>Anwendungsname</replaceable> der
+	  Name der Software ist.  Um zum Beispiel nach
+	  <command>lsof</command> zu suchen:</para>
 
         <screen>&prompt.root; <userinput>cd /usr/ports</userinput>
 &prompt.root; <userinput>make search name=lsof</userinput>
-Port:   lsof-4.56.4
+Port:   lsof-4.88.d,8
 Path:   /usr/ports/sysutils/lsof
 Info:   Lists information about open files (similar to fstat(1))
-Maint:  obrien@FreeBSD.org
+Maint:  ler@lerctr.org
 Index:  sysutils
 B-deps:
 R-deps: </screen>
@@ -334,7 +337,7 @@ R-deps: </screen>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports</userinput>
 &prompt.root; <userinput>make quicksearch name=lsof</userinput>
-Port:	lsof-4.87.a,7
+Port:	lsof-4.88.d,8
 Path:	/usr/ports/sysutils/lsof
 Info:	Lists information about open files (similar to fstat(1))</screen>
 

From owner-svn-doc-all@freebsd.org  Sat Jan 30 11:47:40 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF8E5A73E25;
 Sat, 30 Jan 2016 11:47:40 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C1E201BCB;
 Sat, 30 Jan 2016 11:47:40 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UBld3e000554;
 Sat, 30 Jan 2016 11:47:39 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UBlda4000552;
 Sat, 30 Jan 2016 11:47:39 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601301147.u0UBlda4000552@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 11:47:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48120 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 11:47:41 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 11:47:39 2016
New Revision: 48120
URL: https://svnweb.freebsd.org/changeset/doc/48120

Log:
  Shorten the GNOME sidebar title, so it doesn't overflow the sidebar box
  in firefox/chrome.
  
  Approved by:	rene@

Modified:
  head/share/xml/navibar.ent

Modified: head/share/xml/navibar.ent
==============================================================================
--- head/share/xml/navibar.ent	Sat Jan 30 11:38:04 2016	(r48119)
+++ head/share/xml/navibar.ent	Sat Jan 30 11:47:39 2016	(r48120)
@@ -116,7 +116,7 @@
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
-    <li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
+    <li><a href="&base;/gnome/index.html">GNOME</a>
       <ul>
         <li><a href="&base;/gnome/docs/faq2.html#q1">Installation Instructions</a></li>
         <li><a href="&base;/gnome/docs/faq232.html#q2">Upgrade Instructions</a></li>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 14:41:14 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C98FA7240D;
 Sat, 30 Jan 2016 14:41:14 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 18174C2F;
 Sat, 30 Jan 2016 14:41:14 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UEfD1G051578;
 Sat, 30 Jan 2016 14:41:13 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UEfDbi051577;
 Sat, 30 Jan 2016 14:41:13 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601301441.u0UEfDbi051577@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 14:41:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48121 - head/en_US.ISO8859-1/htdocs/gnome
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 14:41:14 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 14:41:12 2016
New Revision: 48121
URL: https://svnweb.freebsd.org/changeset/doc/48121

Log:
  Revamp freebsd.org/gnome index page
  
   * Update to include mate and cinnamon.
   * Fix some indention issues.
   * Shuffle some text around, and remove some obsolete items.
   * Only show the 5 most recent news items.
   * Remove the gnomedesktop.org rss news channel parser. It doesn't work
     and is comment out to begin with.
   * Update Resources links. Add our wiki, upstream gnome news, mate and
     cinnamon project sites. Remove obsolete links.
  
  Approved by:	rene@
  Differential Revision:	https://reviews.freebsd.org/D5130

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

Modified: head/en_US.ISO8859-1/htdocs/gnome/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sat Jan 30 11:47:39 2016	(r48120)
+++ head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sat Jan 30 14:41:12 2016	(r48121)
@@ -39,8 +39,8 @@
 			select="descendant::year[position() = 1]/name"/></p>
 		    <ul>
 
-		      <!-- Pull in the 10 most recent news items -->
-		      <xsl:for-each select="descendant::event[position() &lt;= 10]">
+		      <!-- Pull in the 5 most recent news items -->
+		      <xsl:for-each select="descendant::event[position() &lt;= 5]">
 			<li><a>
 			    <xsl:attribute name="href">
 			      newsflash.html#<xsl:call-template name="generate-event-anchor"/>
@@ -58,117 +58,92 @@
 		      <li><a href="newsflash.html">More...</a></li>
 		    </ul>
 		  </div> <!-- rightnav -->
-
-		  <br />
-
-		  <div class="rightnav">
-
-		    <h2>GNOME Project News</h2>
-<!-- XXX: (1) does not work at the moment
-          (2) should we really copy over GNOME news?
-
-		    <ul>
-		      <xsl:for-each select="document('http://gnomedesktop.org/node/feed')/rss/channel/*[name() = 'item'][position() &lt; 10]">
-			<li><a>
-			    <xsl:attribute name="href">
-			      <xsl:value-of select="link"/>
-			    </xsl:attribute>
-			    <xsl:value-of select="title"/><br/>
-			  </a></li>
-		      </xsl:for-each>
-		      <li><a>
-			  <xsl:for-each select="document('http://gnomedesktop.org/backend.php')/rss/*[name() = 'channel'][position() = 1]">
-			    <xsl:attribute name="href">
-			      <xsl:value-of select="link"/>
-			    </xsl:attribute>More...
-			  </xsl:for-each>
-			</a></li>
-		    </ul>
--->
-                  </div> <!-- rightnav -->
                 </div> <!-- rightwrap -->
 
 		<h1>&title;</h1>
 
+		<h2>What software does the GNOME Team maintain?</h2>
+
+		<p>The GNOME Team maintains the GNOME, MATE, and
+		  Cinnamon desktop environments.</p>
+
 		<h2>What is GNOME?</h2>
 
 		<img src="&base;/gnome/images/gnome.png" align="right"
                    border="0" alt="GNOME Logo"/>
 
-	       		<p>GNOME is a complete graphical desktop for X,
+		<p>GNOME is a complete graphical desktop for X,
 	       	   including everything from a window manager to
-	       	   web browsers, audio players, office programs, and
-	       	   more.</p>
-
-		       <p>The &os; GNOME Project is a team of devoted
-			 developers and users that manage the
-			 integration of GNOME and &os;.</p>
-
-		<h2>How to install GNOME</h2>
-
-		<p>The easiest way to install GNOME is to install either of
-		the following ports:</p>
-		<ul>
-			<li>x11/gnome2 (the full desktop)</li>
-			<li>x11/gnome2-lite (the minimum desktop environment)</li>
-		</ul>
-
-		<p>And, as desired, one or all of:</p>
-		<ul>
-			<li>x11/gnome2-fifth-toe (common applications)</li>
-			<li>x11/gnome2-power-tools (tools/toys for power users)</li>
-			<li>editors/gnome2-office (office productivity)</li>
-			<li>devel/gnome2-hacker-tools (development tools)</li>
-		</ul>
-
-		<h2>Upgrading to GNOME 2.32?</h2>
-
-		<p>If you are upgrading from GNOME 2.30 to GNOME 2.32, read the
-		  <a href="docs/faq232.html">Upgrade FAQ</a> for upgrade
-		  instructions.</p>
-
-              <h2>State of the port</h2>
-
-	      <p>GNOME for &os; is currently fully supported on
-		8.4, 8-STABLE, 9.1, 9.2, and 9-STABLE, 10.0 and 10-STABLE while
-                11.0-CURRENT is provided on a best effort basis.
-		Work is being done to replace Gnome 2 with Mate and Gnome3.  
-		There is still <a href="docs/volunteer.html">plenty left to be done</a>!</p>
-
-	      <h2>One stop solution shop!</h2>
-
-	      <p>GNOME is simple and easy to build using the &os; ports system, but
-	        sometimes things simply go wrong. If GNOME -- or anything that uses
-		GNOME libraries -- is not building the way it should, simply run the
-		<a href="/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a>
-		tool from the directory of the failed port, and let the gnomelogalyzer
-		figure out what's wrong and how to fix it!</p>
+		   web browsers, audio players, office programs,
+		   graphical login programs and more.  MATE is
+		   a continuation of the old GNOME 2 desktop
+		   environment.  Cinnamon is originally a fork
+		   of GNOME 3's gnome-shell, but grew into its own
+		   desktop environment.</p>
+
+		<h2>How to install these desktop environments?</h2>
+
+		<p>There are some so called meta ports available for
+		  installing these desktop environments or parts of
+		  them.  They are:
+		  <ul>
+		    <li>gnome3 (full GNOME desktop)</li>
+		    <li>gnome3-lite (minimal GNOME desktop)</li>
+		    <li>mate (full MATE desktop)</li>
+		    <li>mate-lite (minimal MATE desktop)</li>
+		    <li>cinnamon</li>
+		  </ul><br/>
+		  The easiest way of installing is to run the
+		  following command and replace gnome3 with the
+                  desktop environment of choice:
+		  <pre>
+# pkg install gnome3
+		  </pre>
+		  Or if you prefer to build from source:
+		  <pre>
+# cd /usr/ports/x11/gnome3
+# make clean
+# make install clean
+		  </pre>
+		</p>
+<!-- instead of copying text, link to the faq3.xml which has a item
+for how to geting stuff -->
+
+		<h2>State of the port:</h2>
+
+		<p>GNOME, MATE, and Cinnamon for &os; are currently
+		  fully supported on 10.2, 10.1, and 10-STABLE while
+		  support for 9.3, 9-STABLE, and 11.0-CURRENT is provided
+		  on a best effort basis. <!-- xxx volunteer page needs
+		  updating. There is still
+		  <a href="docs/volunteer.html">plenty left to be done</a>!--></p>
+
+		<p>GNOME is simple and easy to build using the &os; ports
+		  system, but sometimes things simply go wrong.  Please
+		  see our <a href="&base;/gnome/docs/bugging.html">Bug reporting</a>
+		  page for more info.</p>
 
 		<h2>Resources</h2>
 		<ul>
+		  <li><a href="https://wiki.freebsd.org/Gnome">FreeBSD GNOME's wiki page</a></li>
 		  <li><a href="http://www.gnome.org/">GNOME Project</a></li>
+		  <li><a href="http://news.gnome.org">GNOME Project news</a></li>
 		  <li><a href="http://developer.gnome.org">GNOME development platform</a></li>
-		  <li><a href="http://gnomedesktop.org">FootNotes</a></li>
-		  <li><a href="http://www.gnomejournal.org">GNOME Journal</a></li>
-		  <li><a href="http://www.gnomefiles.org">GNOME Files</a></li>
+		  <li><a href="http://www.gnomefiles.org">GTK+ software repository</a></li>
 		  <li><a href="http://planet.gnome.org">Planet GNOME (blogs)</a></li>
+		  <li><a href="http://mate-desktop.org/">MATE Project</a></li>
+		  <li><a href="http://cinnamon.linuxmint.com/">Cinnamon Project</a></li>
 		</ul>
 
 		<h2>Related Projects</h2>
 		<ul>
 		  <li><a href="http://www.kde.org/">KDE Project</a></li>
 		  <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
+		  <li><a href="http://www.xfce.org/">XFCE Project</a></li>
+		  <li><a href="https://wiki.freebsd.org/Xfce">XFCE on FreeBSD</a></li>
 		  <li><a href="http://www.opengroup.org/desktop/">CDE (commercial)</a></li>
 		</ul>
 
-		<a id="search" name="search"></a>
-		<form action="http://freebsd.rambler.ru/srch" method="get">
-		  <p>Search the freebsd-gnome mailing list archives:</p>
-		  <input type="text" name="words" size="25"/>
-		  <input type="hidden" name="rubric" value="122" />
-		  <input type="submit" value="Search"/>
-		</form>
-
 	  	</div> <!-- contentwrap -->
 
 	      <br class="clearboth" />

From owner-svn-doc-all@freebsd.org  Sat Jan 30 14:58:20 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE149A7299F;
 Sat, 30 Jan 2016 14:58:20 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A982E1239;
 Sat, 30 Jan 2016 14:58:20 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UEwJom056673;
 Sat, 30 Jan 2016 14:58:19 GMT (envelope-from ehaupt@FreeBSD.org)
Received: (from ehaupt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UEwJHN056672;
 Sat, 30 Jan 2016 14:58:19 GMT (envelope-from ehaupt@FreeBSD.org)
Message-Id: <201601301458.u0UEwJHN056672@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to
 ehaupt@FreeBSD.org using -f
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sat, 30 Jan 2016 14:58:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48122 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 14:58:21 -0000

Author: ehaupt (ports committer)
Date: Sat Jan 30 14:58:19 2016
New Revision: 48122
URL: https://svnweb.freebsd.org/changeset/doc/48122

Log:
  Update my PGP key.

Modified:
  head/share/pgpkeys/ehaupt.key

Modified: head/share/pgpkeys/ehaupt.key
==============================================================================
--- head/share/pgpkeys/ehaupt.key	Sat Jan 30 14:41:12 2016	(r48121)
+++ head/share/pgpkeys/ehaupt.key	Sat Jan 30 14:58:19 2016	(r48122)
@@ -1,63 +1,42 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh ehaupt 329A273C;
+sh addkey.sh ehaupt 104E62C545316E89 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   3072D/329A273C 2012-11-17 [expires: 2013-11-17]
-      Key fingerprint = 920C A49A 5A23 F9E3 4EB0  4387 AB90 5C56 329A 273C
-uid                  Emanuel Haupt <ehaupt@FreeBSD.org>
-sub   3072g/70183B96 2012-11-17 [expires: 2013-11-17]
+pub   rsa2048/104E62C545316E89 2016-01-30 [expires: 2019-01-29]
+      Key fingerprint = D9F1 1649 6964 99EA ADBF  D1C4 104E 62C5 4531 6E89
+uid                            Emanuel Haupt <ehaupt@FreeBSD.org>
+sub   rsa2048/AB8EF8AD753A7017 2016-01-30 [expires: 2019-01-29]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQSuBFCnfG4RDADPgmrXmj/FXtx0ilhLSpDYevUYhhoyLywIWmgjrcBBTCPcO0IC
-Vn2aQI68hnTI4BTWc+aDXbzDOK7KT1o9E+2Rw12qKcbV/psrkmi+Hg0mFttB47aW
-rZG9lYPM/KBudXCoojlF/Ip2n+KkLX/QHN8ip8A8RkOsMk2dAgVyXT9RK78MTVx0
-CkTXhhJcmYJkYuyZdy8y1nlTt1LhO3GPmKRmdqkFG+H5B/zhgHy0tpSKJ67or8yX
-1RvPIxv4Wr4vTengA4p//kibbLOa9rsa4aSjjZvDvOHA/o7Lo3ZypRj+0kYtbT0R
-vP4w4+I8x7Dtgdjl7m05m7MSVMwQHn8alV61EHket8F1wXaxJ5HxbJDeuZkQCgpK
-g6I9CPoNmc5qgmd0Ad9QKWNhDPaWmx8fMCXTJB0+QBX+4ENJHzFioev4ynOxesxL
-L3UZqxV54/QDPcYfZxyfu0K4K9OASEOwrrLpqAil1bahMmZKkO5JfcIw5dJLb9TQ
-jNLz5kudt0qGwrcBAJTo8KTz7pPqnQVKABgwm8gJzZRtTOkb8WqRMYsTJRFpC/9L
-Xy2DnVGmkD4mWD4rWr/mDG2l+FT66cP1HiDBQoJAkGJXgx5DLcPgQwVu7vS1utFb
-x1/nawvnq6Qp/yaAe4UentHUZADgVdogx0AEbCf1QN1e6l3h/S5UKZjLHBu6FKDs
-0HX2rPGwxGTHWw3WiXfM0NHgpAvzg1j3cdjQhT/NDKek8Z0Gr4CnNdVgfbOBM12y
-rSGKlEeVpCf8DFYbMEMu9zFJ6J3JiNBR2U5/EOImYZe79qRr9MS8x58/nj+pc/jx
-MDa7C/ckXIauo2qN4XWsiTFITlsKpQMtIpdNkfd/kZQ9fl6i4w1eWwtCVrcqYs/d
-TI3o489D57jGaeppRjT3yEXyOYgyb4Amd10rzW8PtAA+S+CK7S0enY1vXznotG/u
-5/lhDrldnxJ3cq8LfqG5KePfdcUy1dQK4Vfnlbf3dyIpuSPwXNJd78x2wcElKYrk
-almK070xn/Lf00HuczwxCCHNZ6HdrZAkvO9u9MI7mxp28Y6RZCMq1Ieh7Y+k/6sL
-/38tgyFk44ekdbwLuXveFfEivqoRHPoFyP8UYK/c91bnBGF9Bs6eCcX6W7sENv36
-QzbUgZe8RQJWxQjpU3GvRahe6mG3B5bOySnCTqsJjlPxuKI6XKfhl1UE1K1tqi1p
-3CtUNCLLgmsPNyFq+JNBh2OjFdz/tQA6aKN6aXU006amKbctY1J55xlgIONgt3fy
-LJYb1S30+H0FFm7SCtPX6Q80IgMJv3bvYg/vcEcE7Wz7k8gtiVZhv4synviVgXAq
-jOR1j3Gtf5K1gev9iNTmSxKyJgmZcxUEQuJxGI9Y3sxxKGVomT3Fv0PLF98KNM4z
-s8bGH4ha2epy9BuY8kHNnlEvY9IN5cxyDbgmkK8Gj3YwH00wNcz6YocAC+AGhMmJ
-hBb5BiDZaFAv8tBQO0rEPwMhPs57xZC+0OtFcYfWLO8OYA0QjrqfncgbJEcw2v/Y
-6tV5WiWgpKgcKwgDzFVkAJgrmyd8I5aYlmdLE8uqEMvPLAnrbnnX9MnbXnLfC/t6
-WrQiRW1hbnVlbCBIYXVwdCA8ZWhhdXB0QEZyZWVCU0Qub3JnPoiABBMRCAAoBQJQ
-p3xuAhsDBQkB4TOABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCrkFxWMpon
-PKQgAQCJe+bYbZTr6ULASwjtBNV0Yrigpsnm6qzAlqYkPuEpmwD/T7OiSNqV9vvY
-FeHu/gyUyfDgsL+CWNwvcqWYMenQ6Cu5Aw0EUKd8bhAMAO9ELP2diWa2I54Mcg84
-RjtV1Rf6qHz7vfZC55UYnQhqnXu0Tl9L925GWoRFZFebhSLXD33W/zc/s0/olv9F
-caPUnM2hHKbLATEIeFqmtJ0OLSvvmTk9CubFby1c5HKPXtKlZZFSp8lh26Mtoi+e
-BH4TL6AUuYTjIHvr6QRaj26k/D8GY3wINikipl8epwka3xTL0BPN/ANQZVDk1Sal
-5dTIVj29QLVe6iE9Ijw9UQsq8rR3Ik0fYfjQYhkzm0yH5cSw5L4uDIU4gOEu5C8L
-SyxY6qmZDn7ElIVv78lSmDgIcOTCuSFFyyqj1P4QB3UPyR/ClnTX/uambNu8qIa2
-0XwNSLhu70rsY2ln6URFXmuTk7d535LLPCRaf/PRnz7M41iAOOMhJRjhf3WZ+6wV
-f6akRVsSm27j2w6N/ZtiM45A29MmJz/ujcuG3CGz3Ha72dNtgS/UC4kXbbnXUklo
-SVjaUzRGhjpN+x93h/Kp5qFKeC9W0jhUeECk/M60D+LsuwADBQv/faGAWHcWWGVY
-PgbSyguLTT8NlSrkGYgcwTLiOyEgLXJNfdlJrKq7gp9xQtKs7CccFfEsY8j9+3qo
-/xqiuxUtLo3ur6k3yFtvwU0k16fq/aSdo70VFBnHYefjky0r2WRPTSO3PTvRmRkO
-hBcJ4ZOwn8JIPxTH7mNcdJMGwW08kJFZOC1nQaBSvg30U5vlfiREBXMBidCv3BDl
-fRFeaBPCUQsXacLoFmOEzXOfWQrZ/y1HUxPOFMQqFwLtEeaQq5hf/uG1wdUMfb1B
-FDlXtSYAk20LHBLsAQRnOlQDS9g8geLy2tttbcPpdTehI/pIrcay8gXEEestLm5E
-cqfoR5fg+7tnPyf9wcc+GsWhgWw6PM75whraLaEvPNd9nXl4GooHgykw/nVFOEK4
-7WU2pPcXEi7DV66tssOBWXZxMtJ29zQeT8siH0fUdnBriQyzBoFeNRXhF33pcHPn
-DTY5IW1KzI86GT34IF6p8xQCp6g4TRTMZfU95+GhcCDSK6Fny1sLiGcEGBEIAA8F
-AlCnfG4CGwwFCQHhM4AACgkQq5BcVjKaJzwQpAD/UfTcReU55HdN/5tI/0Fr6Kku
-0ZbDaulknl6JnRmdK4kA/1YU7l50NXukqvMxsaGhde7X0XYDptq/FZN2J1xKTsqN
-=MqAu
+mQENBFaszWkBCADVp+7y+SXuAtQOhVL0gxWCDYpVD78h+jKEx+AASTVaIeOg3/p5
+ulVNtECiRwdRFINR7CSHYgFfBr1GQrqmxQR4wmAJ3MQX9q8CjFbDtYwRludw+tSj
+SteEBvJ/iOAoYcLant5HiYxmK1jR2vMjPv/qZkZwWGyqWFpA08MquKnZNVwMvbrh
+RGUDxFxnA4bijmVwyLoSgoD1Dbog7X4jEhXWahb4aPf10UWjTmiFg03sG9k3M48E
+jf+gLciKNYbOw77WN1EHgtFiTGvkymXxBWQRxAxi8oUDjDe84pPHkzMCZ+g4j/xb
+zQ8VNWJwCijavwF3NkWM2RC2M+h8Qwf+494rABEBAAG0IkVtYW51ZWwgSGF1cHQg
+PGVoYXVwdEBGcmVlQlNELm9yZz6JAT0EEwEKACcFAlaszWkCGwMFCQWjmoAFCwkI
+BwMFFQoJCAsFFgMCAQACHgECF4AACgkQEE5ixUUxbol61Af+NCCB2+Ybg+toEKbi
+II7vIK0rCPwhXqkzfF+HCIHVkWV+9aZjMhuqya0gfU/GkMjNbgZeSCfqGAG/i4cK
+cUpanWjxYS4+xL/dJ/JAuLLpRWf2x0f6Xj9gVDQlpKy6/sVQeByRzE64yD5gk2qm
+9hpJhl5s8o9qWVc86D/Gzez4xipIQDo7YqfO41c2gotLBgY/nc27dfrNSQcXyXp8
+fjd6sEm6oZFyTU+IBaIyU060e0Ur/45usxrkzj75nEr89nbz/JPUlPxYg98X1+Od
+Vjev3TBt/Q24Cy1ThngVI7WJ7E/rujElASr5q414tmuQdGek1wJBuN1sTWAK2PdE
+gW8cyLkBDQRWrM1pAQgApPDPf/mWenG0VdussTFtK/uN+izGqmUfTmXRUJJMiQab
+5FRtEsRVW0dM6f/9WyBASTLpKuGRgTt46pFVFKRsCg/ISq3jGWzE169exU+EI23k
+25n9/Sx5c1c/1RwzybZiN4R7tPHHKWTqL2ULWK0eJfkfeGa1kopFZrqSSSFQJNFN
+PCHYcMlESQo4E/Vbnt+yw/TbZ7oUU1s5u5Cud3CkkiPs2R/O9soOkPI3WFfziZzc
+cMMMSMwymVwnMESu1Klt7Yx6oDExIml/q5/ciKgcO/lu9tf/cMvy3p7JMsfs0475
+yYJIgnjnWDwahaXhxM/HjvhumF3JaYt5LAspvH6p5wARAQABiQElBBgBCgAPBQJW
+rM1pAhsMBQkFo5qAAAoJEBBOYsVFMW6JBXQIAK46hk9Xu2jpxvCAo7qQFBA7TgNF
+ebQhSgBnaeIN74SFOA31YFrUsmA/DigWbuo459fkIBHe/uM5kxHsS1Ook2Gb/o91
+QYn4kJ46xQvlvb9c2UvtS1fgyl9gozSz9x0y2O9yvcu6hh5byTk5ZoQIHm+miGhQ
+yo4xvsSkiIaO+SCzm4EKqGkXx/kDyJcBbvNtcwwOw7HVwBbYi+GQm5m3bAkq8EmS
+etrie68ENplCuu1cIcH5xAYzteO2xpYzAQiXH4stZamNK7ayoxKwPKj7sgPUkuwd
+pR1O0Vrq33GQzNc9kC8G4mfcECXZKlzNXpjSpgbCpEnvNcHQG1eoawPhWYs=
+=MRc2
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 20:22:47 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FE02A7378B;
 Sat, 30 Jan 2016 20:22:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 F1D821982;
 Sat, 30 Jan 2016 20:22:46 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UKMjwv060009;
 Sat, 30 Jan 2016 20:22:45 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UKMj2D060008;
 Sat, 30 Jan 2016 20:22:45 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601302022.u0UKMj2D060008@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 20:22:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48123 - head/en_US.ISO8859-1/htdocs/gnome
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 20:22:47 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 20:22:45 2016
New Revision: 48123
URL: https://svnweb.freebsd.org/changeset/doc/48123

Log:
  s/built/build/
  
  Submitted by:	wblock@

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/news.xml

Modified: head/en_US.ISO8859-1/htdocs/gnome/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 14:58:19 2016	(r48122)
+++ head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 20:22:45 2016	(r48123)
@@ -81,7 +81,7 @@ News//EN"
             The official release notes for this release can be found at
             <a href="http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/">http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/</a></p>
 
-          <p>This version of MATE is still built on the GTK+ 2 toolkit.</p>
+          <p>This version of MATE is still build on the GTK+ 2 toolkit.</p>
 
           <p>Replace mate-dialogs with zenity and mate-calc with galculator.</p>
 

From owner-svn-doc-all@freebsd.org  Sat Jan 30 21:53:39 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF8EBA73451;
 Sat, 30 Jan 2016 21:53:39 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9D8F9117;
 Sat, 30 Jan 2016 21:53:39 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0ULrcpC086493;
 Sat, 30 Jan 2016 21:53:38 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0ULrchn086492;
 Sat, 30 Jan 2016 21:53:38 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601302153.u0ULrchn086492@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 21:53:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48124 - head/en_US.ISO8859-1/htdocs/gnome
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 21:53:39 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 21:53:38 2016
New Revision: 48124
URL: https://svnweb.freebsd.org/changeset/doc/48124

Log:
  Edit CDE entry to point to the correct url, and remove the commercial comment.
  
  PR:		206765
  Submitted by:	Chris Petrik
  Approved by:	wblock@
  Differential Revision:	https://reviews.freebsd.org/D5138

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

Modified: head/en_US.ISO8859-1/htdocs/gnome/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sat Jan 30 20:22:45 2016	(r48123)
+++ head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sat Jan 30 21:53:38 2016	(r48124)
@@ -141,7 +141,7 @@ for how to geting stuff -->
 		  <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
 		  <li><a href="http://www.xfce.org/">XFCE Project</a></li>
 		  <li><a href="https://wiki.freebsd.org/Xfce">XFCE on FreeBSD</a></li>
-		  <li><a href="http://www.opengroup.org/desktop/">CDE (commercial)</a></li>
+		  <li><a href="http://www.opengroup.org/cde/">CDE</a></li>
 		</ul>
 
 	  	</div> <!-- contentwrap -->

From owner-svn-doc-all@freebsd.org  Sat Jan 30 21:54:54 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C9AEA73503;
 Sat, 30 Jan 2016 21:54:54 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0A8CC227;
 Sat, 30 Jan 2016 21:54:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0ULsq6a086582;
 Sat, 30 Jan 2016 21:54:52 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0ULsqoo086581;
 Sat, 30 Jan 2016 21:54:52 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601302154.u0ULsqoo086581@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 21:54:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48125 - in head/en_US.ISO8859-1/htdocs/gnome: . images
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 21:54:54 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 21:54:52 2016
New Revision: 48125
URL: https://svnweb.freebsd.org/changeset/doc/48125

Log:
  Add gnome 3.16 screenshots by Chris Petrik.
  
  Approved by:	wblock@
  Differential Revision:	https://reviews.freebsd.org/D3511

Added:
  head/en_US.ISO8859-1/htdocs/gnome/images/ss316-1-tn.png   (contents, props changed)
  head/en_US.ISO8859-1/htdocs/gnome/images/ss316-1.png   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/htdocs/gnome/screenshots.xml

Added: head/en_US.ISO8859-1/htdocs/gnome/images/ss316-1-tn.png
==============================================================================
Binary file. No diff available.

Added: head/en_US.ISO8859-1/htdocs/gnome/images/ss316-1.png
==============================================================================
Binary file. No diff available.

Modified: head/en_US.ISO8859-1/htdocs/gnome/screenshots.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/screenshots.xml	Sat Jan 30 21:53:38 2016	(r48124)
+++ head/en_US.ISO8859-1/htdocs/gnome/screenshots.xml	Sat Jan 30 21:54:52 2016	(r48125)
@@ -18,6 +18,16 @@
 	<!-- Newer GNOME versions go at the top; newer screenshots go at
 	     the top. -->
 
+	<h3>GNOME 3.16 Screenshots</h3>
+
+	<p><b>A GNOME 3.16 Desktop showing off the Gimp, vlc,
+	  chromium</b><br/>
+	  <a href="images/ss316-1.png"><img title="GNOME 3.16 Screen
+	    Shot 1" src="images/ss316-1-tn.png" alt="GNOME 3.16 Screen
+	    Shot 1" border="0"/></a><br/>
+	  <i>Contributed by Chris Petrik &lt;chris |at|
+	    bsdjunk.com&gt;</i></p>
+
 	<h3>GNOME 2.24 Screenshots</h3>
 
 	<p><b>A GNOME 2.24 Desktop showing off the Gimp, the

From owner-svn-doc-all@freebsd.org  Sat Jan 30 22:10:47 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A910FA73A00;
 Sat, 30 Jan 2016 22:10:47 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7AEA6C9A;
 Sat, 30 Jan 2016 22:10:47 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UMAkps089862;
 Sat, 30 Jan 2016 22:10:46 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UMAkw6089861;
 Sat, 30 Jan 2016 22:10:46 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201601302210.u0UMAkw6089861@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 30 Jan 2016 22:10:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48126 - head/en_US.ISO8859-1/books/handbook/firewalls
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 22:10:47 -0000

Author: jgh
Date: Sat Jan 30 22:10:46 2016
New Revision: 48126
URL: https://svnweb.freebsd.org/changeset/doc/48126

Log:
  - addres pipe symbol missing intable of useful pfctl options
  
  PR:		206764
  Reported by:	c.brinkhaus@t-online.de
  Approved by:	wblock (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5144

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

Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml	Sat Jan 30 21:54:52 2016	(r48125)
+++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml	Sat Jan 30 22:10:46 2016	(r48126)
@@ -490,8 +490,8 @@ device pfsync</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><command>pfctl -s [ rules | nat
-		  state ]</command></entry>
+	      <entry><command>pfctl -s [ rules | nat |
+		  states ]</command></entry>
 	      <entry>Report on the filter rules,
 		<acronym>NAT</acronym> rules, or state
 		table.</entry>

From owner-svn-doc-all@freebsd.org  Sat Jan 30 22:18:33 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C59B4A73CE5;
 Sat, 30 Jan 2016 22:18:33 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9841BFD5;
 Sat, 30 Jan 2016 22:18:33 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UMIWW7092604;
 Sat, 30 Jan 2016 22:18:32 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UMIWXV092603;
 Sat, 30 Jan 2016 22:18:32 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601302218.u0UMIWXV092603@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 30 Jan 2016 22:18:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48127 - head/en_US.ISO8859-1/htdocs/gnome/images
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 22:18:33 -0000

Author: kwm (ports committer)
Date: Sat Jan 30 22:18:32 2016
New Revision: 48127
URL: https://svnweb.freebsd.org/changeset/doc/48127

Log:
  Forgot to hook up the new GNOME 3.16 screenshot up.
  
  Approved by:	wblock@

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/images/Makefile

Modified: head/en_US.ISO8859-1/htdocs/gnome/images/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/images/Makefile	Sat Jan 30 22:10:46 2016	(r48126)
+++ head/en_US.ISO8859-1/htdocs/gnome/images/Makefile	Sat Jan 30 22:18:32 2016	(r48127)
@@ -23,6 +23,8 @@ DATA=	ss224-1.png
 DATA+=	ss224-1-tn.png
 DATA+=	ss224-2.png
 DATA+=	ss224-2-tn.png
+DATA+=	ss316-1.png
+DATA+=	ss316-1-tn.png
 DATA+=	gnome.png
 
 # FreeBSD GNOME Vanity Project

From owner-svn-doc-all@freebsd.org  Sat Jan 30 22:54:53 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 294D5A738C9;
 Sat, 30 Jan 2016 22:54:53 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 EDF171EB2;
 Sat, 30 Jan 2016 22:54:52 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UMspus004173;
 Sat, 30 Jan 2016 22:54:51 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UMspv7004172;
 Sat, 30 Jan 2016 22:54:51 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201601302254.u0UMspv7004172@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 30 Jan 2016 22:54:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48128 - head/en_US.ISO8859-1/htdocs/gnome
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2016 22:54:53 -0000

Author: wblock
Date: Sat Jan 30 22:54:51 2016
New Revision: 48128
URL: https://svnweb.freebsd.org/changeset/doc/48128

Log:
  Edit the news release for clarity.  With help from jgh.
  
  Approved by:	kwm

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/news.xml

Modified: head/en_US.ISO8859-1/htdocs/gnome/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 22:18:32 2016	(r48127)
+++ head/en_US.ISO8859-1/htdocs/gnome/news.xml	Sat Jan 30 22:54:51 2016	(r48128)
@@ -33,7 +33,7 @@ News//EN"
 
           <p>The FreeBSD GNOME team proudly presents MATE 1.12 for FreeBSD.</p>
 
-          <p>This version is still build against GTK+ 2, and has a number
+          <p>This version of MATE uses the GTK+ 2 toolkit for stability, and has a number
             of bugfixes for the applets.</p>
         </event>
       </day>
@@ -81,7 +81,7 @@ News//EN"
             The official release notes for this release can be found at
             <a href="http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/">http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/</a></p>
 
-          <p>This version of MATE is still build on the GTK+ 2 toolkit.</p>
+          <p>This version of MATE is still built on the GTK+ 2 toolkit.</p>
 
           <p>Replace mate-dialogs with zenity and mate-calc with galculator.</p>