svn commit: r41526 - in projects/xml-tools: de_DE.ISO8859-1/articles de_DE.ISO8859-1/articles/freebsd-update-server de_DE.ISO8859-1/articles/port-mentor-guidelines de_DE.ISO8859-1/books/handbook/cu...

Gabor Kovesdan gabor at FreeBSD.org
Tue Apr 30 09:50:28 UTC 2013 

Author: gabor
Date: Tue Apr 30 09:50:22 2013
New Revision: 41526
URL: http://svnweb.freebsd.org/changeset/doc/41526

Log:
  - MFH

Added:
  projects/xml-tools/de_DE.ISO8859-1/articles/freebsd-update-server/
     - copied from r41525, head/de_DE.ISO8859-1/articles/freebsd-update-server/
  projects/xml-tools/en_US.ISO8859-1/htdocs/internal/clusteradm.xml
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/internal/clusteradm.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc-thumbnail.jpg
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc-thumbnail.jpg
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc-thumbnail.jpg
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc-thumbnail.jpg
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc.pdf
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc.pdf
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/reporting.xml
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/unsupported.xml
     - copied unchanged from r41525, head/en_US.ISO8859-1/htdocs/security/unsupported.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/security/reporting.xml
     - copied unchanged from r41525, head/ja_JP.eucJP/htdocs/security/reporting.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/security/unsupported.xml
     - copied unchanged from r41525, head/ja_JP.eucJP/htdocs/security/unsupported.xml
  projects/xml-tools/share/pgpkeys/asomers.key
     - copied unchanged from r41525, head/share/pgpkeys/asomers.key
  projects/xml-tools/share/pgpkeys/bhaga.key
     - copied unchanged from r41525, head/share/pgpkeys/bhaga.key
  projects/xml-tools/share/pgpkeys/bk.key
     - copied unchanged from r41525, head/share/pgpkeys/bk.key
  projects/xml-tools/share/pgpkeys/deb.key
     - copied unchanged from r41525, head/share/pgpkeys/deb.key
  projects/xml-tools/share/pgpkeys/dhw.key
     - copied unchanged from r41525, head/share/pgpkeys/dhw.key
  projects/xml-tools/share/pgpkeys/dutchdaemon.key
     - copied unchanged from r41525, head/share/pgpkeys/dutchdaemon.key
  projects/xml-tools/share/pgpkeys/hiren.key
     - copied unchanged from r41525, head/share/pgpkeys/hiren.key
  projects/xml-tools/share/pgpkeys/pgpkeys-other.xml
     - copied unchanged from r41525, head/share/pgpkeys/pgpkeys-other.xml
  projects/xml-tools/share/security/advisories/FreeBSD-SA-13:05.nfsserver.asc
     - copied unchanged from r41525, head/share/security/advisories/FreeBSD-SA-13:05.nfsserver.asc
  projects/xml-tools/share/security/patches/SA-13:05/
     - copied from r41525, head/share/security/patches/SA-13:05/
Deleted:
  projects/xml-tools/ja_JP.eucJP/htdocs/FAQ/
  projects/xml-tools/ja_JP.eucJP/htdocs/availability.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/tutorials/
Modified:
  projects/xml-tools/de_DE.ISO8859-1/articles/Makefile
  projects/xml-tools/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/xml-tools/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
  projects/xml-tools/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml
  projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml
  projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml
  projects/xml-tools/de_DE.ISO8859-1/share/xml/release.l10n.ent
  projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/ports/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/administration.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/advocacy/myths.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/docs/books.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/internal/Makefile
  projects/xml-tools/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/Makefile
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/Makefile
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/security.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/where.xml
  projects/xml-tools/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
  projects/xml-tools/ja_JP.eucJP/books/handbook/ports/chapter.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/Makefile
  projects/xml-tools/ja_JP.eucJP/htdocs/docs/books.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/internal/Makefile
  projects/xml-tools/ja_JP.eucJP/htdocs/security/Makefile
  projects/xml-tools/ja_JP.eucJP/htdocs/security/security.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/where.xml
  projects/xml-tools/ja_JP.eucJP/share/xml/navibar.l10n.ent
  projects/xml-tools/ja_JP.eucJP/share/xml/news.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/geom-class/article.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/hubs/article.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
  projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/Makefile
  projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/book.xml
  projects/xml-tools/ru_RU.KOI8-R/books/handbook/install/chapter.xml
  projects/xml-tools/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
  projects/xml-tools/share/pgpkeys/pgpkeys-developers.xml
  projects/xml-tools/share/pgpkeys/pgpkeys.ent
  projects/xml-tools/share/xml/advisories.xml
  projects/xml-tools/share/xml/authors.ent
  projects/xml-tools/share/xml/commercial.consult.xml
  projects/xml-tools/share/xml/commercial.isp.xml
  projects/xml-tools/share/xml/developers.ent
  projects/xml-tools/share/xml/navibar.ent
  projects/xml-tools/share/xml/news.xml
  projects/xml-tools/share/xml/release.ent
Directory Properties:
  projects/xml-tools/   (props changed)
  projects/xml-tools/de_DE.ISO8859-1/   (props changed)
  projects/xml-tools/en_US.ISO8859-1/   (props changed)
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2009-freebsd-gsoc.pdf   (props changed)
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2010-freebsd-gsoc.pdf   (props changed)
  projects/xml-tools/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.pdf   (props changed)
  projects/xml-tools/ja_JP.eucJP/   (props changed)
  projects/xml-tools/ru_RU.KOI8-R/   (props changed)
  projects/xml-tools/share/   (props changed)

Modified: projects/xml-tools/de_DE.ISO8859-1/articles/Makefile
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/articles/Makefile	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/articles/Makefile	Tue Apr 30 09:50:22 2013	(r41526)
@@ -8,6 +8,7 @@
 SUBDIR = contributing
 SUBDIR+= contributing-ports
 SUBDIR+= explaining-bsd
+SUBDIR+= freebsd-update-server
 SUBDIR+= laptop
 SUBDIR+= linux-comparison
 SUBDIR+= nanobsd

Modified: projects/xml-tools/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml
==============================================================================
--- head/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
 <!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
 ]>
 
@@ -836,14 +834,14 @@ the new builds.</screen>
 
 	<screen>               # Build the world
 		   log "Building world"
-		   cd /usr/src &&
-		   make -j 2 ${COMPATFLAGS} buildworld 2>&1
+		   cd /usr/src &&
+		   make -j 2 ${COMPATFLAGS} buildworld 2>&1
 
 		# Distribute the world
 		   log "Distributing world"
-		   cd /usr/src/release &&
-		   make -j 2 obj &&
-		   make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+		   cd /usr/src/release &&
+		   make -j 2 obj &&
+		   make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
       </listitem>
 
       <listitem>

Modified: projects/xml-tools/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
==============================================================================
Binary file (source and/or target). No diff available.

Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -379,7 +379,7 @@ MergeChanges /etc/ /var/named/etc/</prog
           <literal>-p</literal>-Nummer, die von dem Kommando <command>uname
           -r</command> ausgegeben wird) wird aus dieser Datei ausgelesen.
           Die Neuinstallation des selbstkonfigurierten Kernels, selbst wenn
-          sich daran nichts geädert hat, erlaubt es &man.uname.1;, den
+          sich daran nichts geändert hat, erlaubt es &man.uname.1;, den
           aktuellen Patch-Level des Systems korrekt wiederzugeben.  Dies ist
           besonders hilfreich, wenn mehrere Systeme gewartet werden, da es
           eine schnelle Einschätzung der installierten Aktualisierungen in

Modified: projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/books/porters-handbook/book.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -8,7 +8,7 @@
 
     $FreeBSD$
     $FreeBSDde: de-docproj/books/porters-handbook/book.xml,v 1.241 2011/10/08 16:18:17 jkois Exp $
-    basiert auf: 1.1117
+    basiert auf: r37819
 -->
 
 <book id="of" lang="de">
@@ -15824,12 +15824,50 @@ Reference: <http://www.freebsd.org/po
 	    </row>
 
 	    <row>
+	      <entry>900040</entry>
+	      <entry>19. Juli 2011</entry>
+	      <entry>Standardmäßige Erhöhung von MAXCPU für &os; auf
+		64 für amd64 und ia64 und auf 128 für XLP
+		(mips).</entry>
+	    </row>
+
+	    <row>
 	      <entry>900041</entry>
 	      <entry>13. August 2011</entry>
 	      <entry>9.0-CURRENT, nachdem Capsicum-Funktionalitäten
 		implementiert wurden.  Zusätzlich wurde fget(9) um ein
 		Rechte-Argument erweitert.</entry>
             </row>
+
+	    <row>
+	      <entry>900042</entry>
+	      <entry>28. August 2011</entry>
+	      <entry>Versionssprünge für Shared-Libraries deren ABI
+		sich geändert hat, in Vorbereitung für 9.0.</entry>
+	    </row>
+
+	    <row>
+	      <entry>900043</entry>
+	      <entry>2. September 2011</entry>
+	      <entry>Automatische Erkennung von USB-Massenspeicher
+		Geräten, die das no synchronize cache SCSI Kommando
+		nicht unterstützen.</entry>
+	    </row>
+
+	    <row>
+	      <entry>900044</entry>
+	      <entry>10. September 2011</entry>
+	      <entry>Re-factor auto-quirk.</entry>
+	    </row>
+
+	    <row>
+	      <entry>900045</entry>
+	      <entry>13. Oktober 2011</entry>
+	      <entry>Allen nicht-kompatiblen
+		Systemaufruf-Einstiegspunkten wurde ein sys_
+		vorangestellt.</entry>
+	    </row>
+
 	  </tbody>
 	</tgroup>
       </table>

Modified: projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
-<!ENTITY dedate "$FreeBSDde: de-www/docs/books.xml,v 1.32 2011/02/20 14:05:21 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde$">
 <!ENTITY title "Online vorhandene Bücher und Artikel">
-<!ENTITY reference "basiert auf: 1.41">
+<!ENTITY reference "basiert auf: r39632">
 <!ENTITY url.articles "../../doc/en_US.ISO8859-1/articles">
 <!ENTITY url.articles.de "../../doc/de_DE.ISO8859-1/articles">
 <!ENTITY url.books "../../doc/en_US.ISO8859-1/books">
@@ -256,7 +256,7 @@
         (mh)<br/>
       Eine Einführung in das MH-Mailprogramm.</p>
 
-    <p><a href="&url.articles;/nanobsd/index.html">NanoBSD</a>
+    <p><a href="&url.articles.de;/nanobsd/index.html">NanoBSD</a>
         (nanobsd)<br/>
       Informationen zu den NanoBSD-Werkzeugen, mit deren Hilfe
         sich FreeBSD-Images für den Einsatz in eingebetteten

Modified: projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41381
+     basiert auf: r41484
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -42,6 +42,91 @@
       <name>4</name>
 
       <day>
+	<name>24</name>
+
+	<event>
+	  <title>Das FreeBSD Project nimmt am Google Summer of
+	    Code 2013 teil</title>
+
+	  <p>Das FreeBSD Project freut sich, bekanntgeben zu dürfen,
+	    das es auch dieses Jahr an Google's Summer of Code-Programm
+	    teilnimmt.  Durch dieses Programm wird die Arbeit von Studenten
+	    im Rahmen von Open Source-Projekten gefördert.  Das
+	    FreeBSD Project nimmt bereits zum neunten Mal hintereinander
+	    an diesem Programm teil und hat seit der ersten Teilnahme 2005
+	    mehr als 150 Studenten erfolgreich durch deren Arbeiten
+	    begleitet.</p>
+
+	  <p>Zu den erfolgreich abgeschlossenen Projekten gehören
+	    Verbesserungen an der Linux-ABI-Emulation, NFSv4 ACLs,
+	    TCP-Regressionstests, die Unterstützung für das
+	    FUSE-Dateisytem sowie zahlreiche andere Projekte.  Viele
+	    Studenten, die an diesem Programm teilnahmen, sind inzwischen
+	    aktive FreeBSD-Entwickler und/oder nehmen (nicht zuletzt
+	    dank der Unterstützung der FreeBSD Foundation) weiterhin
+	    aktiv an verschiedenen FreeBSD-Veranstaltungen auf der
+	    ganzen Welt teil.</p>
+
+	  <p>Wir laden alle Studenten ein, während des Sommers gegen
+	    Bezahlung an der Weiterentwicklung von &os; zu arbeiten!
+	    Weitere Informationen zu möglichen Projektvorschlägen
+	    sowie zum Ablauf finden sich auf der Seite <a
+	    href="&enbase;/projects/summerofcode.html">FreeBSD Summer
+	    Projects</a>.</p>
+	</event>
+      </day>
+   
+      <day>
+	<name>22</name>
+
+	<event>
+	  <title>&os; 8.4-RC2 verfügbar</title>
+
+	  <p>Der zweite Release Candidate aus dem &os;-8.4-Releasezyklus
+	    ist <a
+	    href="&lists.stable;/2013-April/073198.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386 sowie
+	    pc98 sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>  
+	</event>
+      </day>
+
+      <day>
+	<name>18</name>
+
+	<event>
+	  <p>Erweiterte Commit-Privilegien: <a
+	    href="mailto:cy at FreeBSD.org">Cy Schubert</a> (src, ports)</p>
+	</event>
+      </day>
+      
+      <day>
+	<name>12</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:hiren at FreeBSD.org">Hiren Panchasara</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>10</name>
+
+	<event>
+	  <title>&os; 8.4-RC1 verfügbar</title>
+
+	  <p>Der erste Release Candidate aus dem &os;-8.4-Releasezyklus
+	    ist <a
+	    href="&lists.stable;/2013-April/073070.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386 sowie
+	    pc98 sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>3</name>
 
 	<event>

Modified: projects/xml-tools/de_DE.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/share/xml/release.l10n.ent	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/de_DE.ISO8859-1/share/xml/release.l10n.ent	Tue Apr 30 09:50:22 2013	(r41526)
@@ -2,7 +2,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41289
+     basiert auf: r41400
 -->
 <![%beta2.testing;[
 <!ENTITY beta.plural 'en'>
@@ -16,7 +16,7 @@
         <tr style="text-align: center;">
           <td colspan="2">Version & Plattform</td>
           <td>Distribution</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
+          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
 
           <td>Statusseite</td>
         </tr>
@@ -89,7 +89,7 @@
         <tr style="text-align: center;">
           <td colspan="2">Version & Plattform</td>
           <td>Distribution</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
+          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
           <!--<td>Statusseite</td>-->
         </tr>
       </thead>

Modified: projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -143,7 +143,6 @@
 		Branches</emphasis></entry>
 
 	    <entry>
-	      <literal>stable/7</literal> (7.X-STABLE),
 	      <literal>stable/8</literal> (8.X-STABLE),
 	      <literal>stable/9</literal> (9.X-STABLE),
 	      <literal>head</literal> (-CURRENT)
@@ -2426,10 +2425,10 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.simon;</term>
+	<term>&a.des;</term>
 
 	<listitem>
-	  <para>Simon is the
+	  <para>Dag-Erling is the
 	  <ulink url="&url.base;/security/">FreeBSD Security
 	  Officer</ulink>
 	  and oversees the &a.security-officer;.

Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -2086,6 +2086,11 @@
     </listitem>
 
     <listitem>
+      <para>Daniel Levai
+	<email>leva at ecentrum.hu</email></para>
+    </listitem>
+
+    <listitem>
       <para>Daniel J. O'Connor
 	<email>darius at dons.net.au</email></para>
     </listitem>

Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -1088,6 +1088,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.hiren;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.hmp;</para>
     </listitem>
 
@@ -1376,6 +1380,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.asomers;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.brian;</para>
     </listitem>
 

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/jails/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -556,7 +556,6 @@ jail_<replaceable>www</replaceable>_devf
 	    usage of its features.  If the presented steps below look
 	    too complicated, it is advised to take a look at a simpler
 	    system such as <filename
-	      role="package">sysutils/qjail</filename> or <filename
 	      role="package">sysutils/ezjail</filename>, which provides
 	    an easier method of administering &os; jails and is not as
 	    sophisticated as this setup.</para>

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -493,14 +493,16 @@ options         IPDIVERT</programlisting
       <filename>GENERIC</filename> will be also be added to the local
       kernel unless they are specifically prevented using
       <literal>nooptions</literal> or <literal>nodevice</literal>.
-      The remainder of this chapter addresses the contents of a
+      A comprehensive list of configuration directives and their
+      descriptions may be found in &man.config.5;.</para>
+
+    <para>The remainder of this chapter addresses the contents of a
       typical configuration file and the role various options and
       devices play.</para>
 
     <note>
       <para>To build a file which contains all available options,
 	run the following command as <username>root</username>:</para>
-
       <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf && make LINT</userinput></screen>
     </note>
 

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -37,4 +37,10 @@
 
     &section.pgpkeys-developers;
   </sect1>
+
+  <sect1 id="pgpkeys-other">
+    <title>Other Cluster Account Holders</title>
+
+    &section.pgpkeys-other;
+  </sect1>
 </appendix>

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -1337,7 +1337,7 @@ Deinstalling ca_root_nss-3.13.5... done<
 
       <para>Once the compile is complete, you are returned to the
 	prompt.  The next step is to install the port using
-	<maketarget>make install</maketarget>:</para>
+	<command>make <maketarget>install</maketarget></command>:</para>
 
       <screen>&prompt.root; <userinput>make install</userinput>
 ===>  Installing for lsof-4.57
@@ -1778,7 +1778,8 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
 
       <note>
 	<para>The <command>portsclean</command> utility is part of the
-	  <application>portupgrade</application> suite.</para>
+	  <filename role="package">ports-mgmt/portupgrade</filename>
+	  suite.</para>
       </note>
 
       <para><filename

Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -2072,10 +2072,7 @@ PORTEPOCH=	1</programlisting>
 		  directly supports the window system.  Do not put
 		  regular X applications here; most of them should go
 		  into other <filename>x11-*</filename> categories
-		  (see below).  If your port <emphasis>is</emphasis>
-		  an X application, define <makevar>USE_XLIB</makevar>
-		  (implied by <makevar>USE_IMAKE</makevar>) and put it
-		  in the appropriate category.</entry>
+		  (see below).</entry>
 	      </row>
 
 	      <row>
@@ -3866,17 +3863,6 @@ ALWAYS_KEEP_DISTFILES=	yes
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_CDRTOOLS</makevar></entry>
-		<entry>The port requires
-		  <application>cdrecord</application> either from
-		  <filename
-		    role="package">sysutils/cdrtools</filename> or
-		  <filename
-		    role="package">sysutils/cdrtools-cjk</filename>,
-		  according to the user's preference.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>USE_GCC</makevar></entry>
 		<entry>The port requires a specific version of
 		  <command>gcc</command> to build.  The exact version
@@ -5775,69 +5761,18 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/subp
       </sect2>
     </sect1>
 
-    <sect1 id="using-pkg-config">
-      <title>Using <literal>pkg-config</literal></title>
-
-      <para>If your ports requires <literal>pkg-config</literal>,
-	just set <makevar>USE_PKGCONFIG</makevar> to the following
-	possible values:</para>
-      <table frame="none">
-	<title>Values for <makevar>USE_PKGCONFIG</makevar></title>
-
-	<tgroup cols="2">
-	  <thead>
-	    <row>
-	      <entry>Definition</entry>
-	      <entry>Description</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><makevar>USE_PKGCONFIG= yes</makevar></entry>
-	      <entry>The ports uses pkg-config only at build
-		time</entry>
-	    </row>
-
-	    <row>
-	      <entry><makevar>USE_PKGCONFIG= build</makevar></entry>
-	      <entry>The ports uses pkg-config only at build
-		time</entry>
-	    </row>
-
-	    <row>
-	      <entry><makevar>USE_PKGCONFIG= run</makevar></entry>
-	      <entry>The ports uses pkg-config only at run
-		time</entry>
-	    </row>
-
-	    <row>
-	      <entry><makevar>USE_PKGCONFIG= both</makevar></entry>
-	      <entry>The ports uses pkg-config both at build and run
-		time</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </table>
-    </sect1>
-
     <sect1 id="using-gettext">
       <title>Using GNU <literal>gettext</literal></title>
 
       <sect2>
 	<title>Basic Usage</title>
 
-	<para>If your port requires <literal>gettext</literal>,
-	  just set <makevar>USE_GETTEXT</makevar> to
-	  <literal>yes</literal>, and your port will grow the
-	  dependency on <filename
-	    role="package">devel/gettext</filename>.  The value of
-	  <makevar>USE_GETTEXT</makevar> can also specify the required
-	  version of the <literal>libintl</literal> library, the basic
-	  part of <literal>gettext</literal>, but using this feature
-	  is <emphasis>strongly discouraged</emphasis>: Your port
-	  should work with just the current version of <filename
-	    role="package">devel/gettext</filename>.</para>
+	<para>If your port requires <literal>gettext</literal>, set
+	  <literal>USES= gettext</literal>, and your
+	  port will inherit a dependency on <filename
+	    role="package">devel/gettext</filename>. Other values for
+	  <literal>gettext</literal> usage are listed in <xref
+	  linkend="uses-values"/>.</para>
 
 	<para>A rather common case is a port using
 	  <literal>gettext</literal> and <command>configure</command>.
@@ -5848,7 +5783,7 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/subp
 	  <envar>CPPFLAGS</envar> and <envar>LDFLAGS</envar> as
 	  follows:</para>
 
-	<programlisting>USE_GETTEXT=	yes
+	<programlisting>USES=	gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -5857,7 +5792,7 @@ GNU_CONFIGURE=	yes</programlisting>
 	<para>Of course, the code can be more compact if there are no
 	  more flags to pass to <command>configure</command>:</para>
 
-	<programlisting>USE_GETTEXT=	yes
+	<programlisting>USES=	gettext
 GNU_CONFIGURE=	yes</programlisting>
       </sect2>
 
@@ -5878,7 +5813,7 @@ GNU_CONFIGURE=	yes</programlisting>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=			gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -6134,25 +6069,12 @@ PLIST_SUB+=		NLS="@comment "
 USE_GL=		glu</programlisting>
 	</example>
 
-	<para>Some ports define <makevar>USE_XLIB</makevar>, which
-	  makes the port depend on all the 50 or so libraries.  This
-	  variable exists for backwards compatibility, as it predates
-	  modular X.Org, and should not be used on new ports.</para>
-
 	<table frame="none">
 	  <title>Variables for Ports That Use X</title>
 
 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><makevar>USE_XLIB</makevar></entry>
-		<entry>The port uses the X libraries.  Deprecated -
-		  use a list of X.Org components in
-		  <makevar>USE_XORG</makevar> variable
-		  instead.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>USE_IMAKE</makevar></entry>
 		<entry>The port uses <command>imake</command>.</entry>
 	      </row>

Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/uses.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/uses.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -40,15 +40,51 @@
 </row>
 
 <row>
+  <entry><literal>desktop-file-utils</literal></entry>
+  <entry>none</entry>
+
+  <entry>Implies that the port uses the
+    <application>update-desktop-database</application> from
+    <filename role="package">devel/desktop-file-utils</filename>.
+    This uses will automatically add a post-install step in such a way
+    that the port itself still can specify there own post-install step
+    if needed.  It also insert lines into the plist for package
+    install and removal to run
+    <application>update-desktop-database</application>.</entry>
+</row>
+
+<row>
   <entry><literal>fuse</literal></entry>
   <entry>none</entry>
 
   <entry>Implies the port will depend on the FUSE library and handle
-    the the dependency on the kernel module depending on the version
+    the dependency on the kernel module depending on the version
     of &os;.</entry>
 </row>
 
 <row>
+  <entry><literal>gettext</literal></entry>
+  <entry>none, <literal>lib</literal>, <literal>build</literal>,
+    <literal>run</literal></entry>
+  <entry>Implies that the port uses <filename
+      role="package">devel/gettext</filename> in one way or another.  By
+    default, with no arguments or with the <literal>lib</literal>
+    argument, implies <command>gettext</command> with build-time and 
+    run-time dependencies, <literal>build</literal> implies a build-time
+    dependency, and <literal>run</literal> implies a run-time
+    dependency.</entry>
+</row>
+
+<row>
+  <entry><literal>iconv</literal></entry>
+  <entry>none</entry>
+  <entry>Implies that the port uses <filename
+      role="package">converters/libiconv</filename> as build-time and
+    run-time dependency.
+  </entry>
+</row>
+
+<row>
   <entry><literal>pathfix</literal></entry>
   <entry>none</entry>
   <entry>Look for the <filename>Makefile.in</filename> and
@@ -58,6 +94,21 @@
 </row>
 
 <row>
+  <entry><literal>pkgconfig</literal></entry>
+
+  <entry>none, <literal>build</literal>, <literal>run</literal>,
+    <literal>both</literal></entry>
+
+  <entry>Implies that the port uses <filename
+      role="package">devel/pkgconf</filename> in one way or another.
+    With no arguments or with the <literal>build</literal>
+    argument, it implies <command>pkg-config</command> as a build-time
+    dependency; <literal>run</literal> implies a run-time dependency;
+    and <literal>both</literal> implies both run-time and build-time
+    dependencies.</entry>
+</row>
+
+<row>
   <entry><literal>qmail</literal></entry>
   <entry>none, <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal>, <literal>vars</literal></entry>
@@ -72,6 +123,21 @@
 </row>
 
 <row>
+  <entry><literal>shared-mime-info</literal></entry>
+  <entry>none</entry>
+
+  <entry>Implies that the port uses
+    <application>update-mime-database</application> from
+    <filename role="package">misc/shared-mime-info</filename>.  This
+    uses will automatically add a post-install step in such a way that
+    the port itself still can specify there own post-install step if
+    needed.  It also insert lines into the plist for package install
+    and removal to run
+    <application>update-mime-data</application> with the correct
+    arguments.</entry>
+</row>
+
+<row>
   <entry><literal>zenoss</literal></entry>
   <entry>none</entry>
   <entry>Implies the port uses <filename

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/administration.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/administration.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/administration.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -129,7 +129,8 @@
     <li>&a.tabthorpe; <<a href="mailto:tabthorpe at FreeBSD.org">tabthorpe at FreeBSD.org</a>></li>
     <li>&a.marcus; <<a href="mailto:marcus at FreeBSD.org">marcus at FreeBSD.org</a>></li>
     <li>&a.bapt; <<a href="mailto:bapt at FreeBSD.org">bapt at FreeBSD.org</a>></li>
-    <li>&a.bdrewery; <<a href="mailto:bdrewery at FreeBSD.org">bdrewery at FreeBSD.org</a>></li>
+    <li>&a.bdrewery; <<a href="mailto:bdrewery at FreeBSD.org">bdrewery at FreeBSD.org</a>>
+      (Release Engineering Team Liaison)</li>
     <li>&a.decke; <<a href="mailto:decke at FreeBSD.org">decke at FreeBSD.org</a>></li>
     <li>&a.erwin; <<a href="mailto:erwin at FreeBSD.org">erwin at FreeBSD.org</a>></li>
     <li>&a.itetcu; <<a href="mailto:itetcu at FreeBSD.org">itetcu at FreeBSD.org</a>></li>
@@ -150,12 +151,20 @@
     Engineering Team in greater detail.</p>
 
   <ul>
+    <li>&a.mva; <<a href="mailto:mva at FreeBSD.org">mva at FreeBSD.org</a>></li>
+    <li>&a.gjb; <<a href="mailto:gjb at FreeBSD.org">gjb at FreeBSD.org</a>></li>
     <li>&a.kib; <<a href="mailto:kib at FreeBSD.org">kib at FreeBSD.org</a>></li>
+    <li>&a.joel; <<a href="mailto:joel at FreeBSD.org">joel at FreeBSD.org</a>></li>
     <li>&a.blackend; <<a href="mailto:blackend at FreeBSD.org">blackend at FreeBSD.org</a>></li>
+    <li>&a.skreuzer; <<a href="mailto:skreuzer at FreeBSD.org">skreuzer at FreeBSD.org</a>></li>
+    <li>&a.delphij; <<a href="mailto:delphij at FreeBSD.org">delphij at FreeBSD.org</a>></li>
     <li>&a.jpaetzel; <<a href="mailto:jpaetzel at FreeBSD.org">jpaetzel at FreeBSD.org</a>></li>
+    <li>&a.rodrigc; <<a href="mailto:rodrigc at FreeBSD.org">rodrigc at FreeBSD.org</a>></li>
     <li>&a.hrs; <<a href="mailto:hrs at FreeBSD.org">hrs at FreeBSD.org</a>></li>
+    <li>&a.glebius; <<a href="mailto:glebius at FreeBSD.org">glebius at FreeBSD.org</a>></li>
     <li>&a.kensmith; <<a href="mailto:kensmith at FreeBSD.org">kensmith at FreeBSD.org</a>>
       (Lead)</li>
+    <li>&a.marius; <<a href="mailto:marius at FreeBSD.org">marius at FreeBSD.org</a>></li>
   </ul>
 
   <h3><a name="t-re-builder">Builders Release Engineering Team</a>
@@ -206,12 +215,12 @@
       href="mailto:denise at ixsystems.com">denise at ixsystems.com</a>></li>
     <li>Deb Goodkin <<a href="mailto:deb at FreeBSD.org">deb at FreeBSD.org</a>></li>
     <li>&a.jkoshy; <<a href="mailto:jkoshy at FreeBSD.org">jkoshy at FreeBSD.org</a>></li>
-    <li>Dru Lavigne <<a
-      href="mailto:dlavigne6 at sympatico.ca">dlavigne6 at sympatico.ca</a>></li>
+    <li>&a.dru; <<a
+      href="mailto:dru at FreeBSD.org">dru at FreeBSD.org</a>></li>
     <li>&a.mwlucas; <<a href="mailto:mwlucas at FreeBSD.org">mwlucas at FreeBSD.org</a>></li>
     <li>&a.imp; <<a href="mailto:imp at FreeBSD.org">imp at FreeBSD.org</a>></li>
-    <li>Kris Moore <<a
-      href="mailto:kris at pcbsd.org">kris at pcbsd.org</a>></li>
+    <li>&a.kmoore; <<a
+      href="mailto:kmoore at FreeBSD.org">kmoore at FreeBSD.org</a>></li>
     <li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
     <li>Matt Olander <<a href="mailto:matt at FreeBSD.org">matt at FreeBSD.org</a>></li>
     <li>Jeremy C. Reed <<a
@@ -341,30 +350,36 @@
     also responsible for the problem report group.</p>
 
   <ul>
-    <li>&a.eadler; < <a href="mailto:eadler at FreeBSD.org">eadler at FreeBSD.org</a>></li>
+    <li>&a.eadler; <<a href="mailto:eadler at FreeBSD.org">eadler at FreeBSD.org</a>></li>
     <li>&a.gavin; <<a href="mailto:gavin at FreeBSD.org">gavin at FreeBSD.org</a>></li>
     <li>&a.gonzo; <<a href="mailto:gonzo at FreeBSD.org">gonzo at FreeBSD.org</a>></li>
   </ul>
 
   <h3><a name="t-clusteradm">Cluster Administrators</a>
     <!-- admins mail aliases intentionally left incomplete -->
-    <clusteradm@></h3>
+    <admins@></h3>
 
   <p>The Cluster Administrators consists of the people responsible for
     administrating the machines that the project relies on for its
     distributed work and communication to be synchronised.  It
     consists mainly of those people who have physical access to the servers.
     Issues concerning the projects infrastructure or setting up new
-    machines should be directed to the cluster administrators.</p>
+    machines should be directed to the cluster administrators. This
+    team is led by the lead cluster administrator whose duties and
+    responsbilities are described in the <a
+      href="internal/clusteradm.html">cluster administration charter</a>
+    in greater detail.</p>
 
   <ul>
     <li>&a.bhaga; <<a href="mailto:bhaga at FreeBSD.org">bhaga at FreeBSD.org</a>></li>
     <li>&a.brd; <<a href="mailto:brd at FreeBSD.org">brd at FreeBSD.org</a>></li>
     <li>&a.bz; <<a href="mailto:bz at FreeBSD.org">bz at FreeBSD.org</a>></li>
+    <li>&a.gjb; <<a href="mailto:gjb at FreeBSD.org">gjb at FreeBSD.org</a>></li>
     <li>&a.kensmith; <<a href="mailto:kensmith at FreeBSD.org">kensmith at FreeBSD.org</a>></li>
-    <li>&a.peter; <<a href="mailto:peter at FreeBSD.org">peter at FreeBSD.org</a>></li>
+    <li>&a.peter; <<a href="mailto:peter at FreeBSD.org">peter at FreeBSD.org</a>> (Lead)</li>
     <li>&a.sbruno; <<a href="mailto:sbruno at FreeBSD.org">sbruno at FreeBSD.org</a>></li>
     <li>&a.simon; <<a href="mailto:simon at FreeBSD.org">simon at FreeBSD.org</a>></li>
+    <li>&a.zi; <<a href="mailto:zi at FreeBSD.org">zi at FreeBSD.org</a>></li>
   </ul>
 
   <h3><a name="t-cvsup-master">CVSup Mirror Site Coordinators</a>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/advocacy/myths.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/advocacy/myths.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/advocacy/myths.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -27,8 +27,8 @@
       particular project it is indicated as such.</blockquote>
 
     <blockquote>If you are aware of an omission or error on this page, please
-      let the maintainer, Tom Rhodes <<a href="mailto:trhodes at FreeBSD.org">trhodes at FreeBSD.org</a>>
-      know.</blockquote>
+      let the <a href="mailto:doc at freebsd.org">FreeBSD
+      documentation project mailing list</a> know.</blockquote>
 
     <h2>Index</h2>
 
@@ -88,8 +88,8 @@
           from the Internet, 24 hours a day. You don't need to wait for
           someone else to roll a release.</p>
 
-	<p><b>FreeBSD, NetBSD:</b> An installable snapshot of the current
-	  progress is made every 24 hours. These snapshots can be installed
+	<p><b>FreeBSD:</b> An installable snapshot of the current
+	  progress is made weekly. These snapshots can be installed
 	  exactly like an ordinary release, and do not require installation
 	  over an existing system.</p>
 
@@ -105,13 +105,6 @@
 	  released, simply because for most *BSD users it is an every day
 	  event.</p></li>
 
-        <li><p>All the *BSD Projects use CVS to maintain their source code.</p>
-
-	<p><b>All the *BSD Projects:</b> make a CVS tree available for anyone to
-	  browse and download, 24 hours a day. The tree can be retrieved using
-	  Anonymous CVS, CVSup, CVSupit, CTM (by e-mail), or through simple
-	  FTP.</p></li>
-
         <li><p>Anyone can submit patches, bug reports, documentation, and
 	  other contributions. They can do this by using the <tt>send-pr</tt>
 	  program installed on their *BSD system, or by using a web based
@@ -185,8 +178,7 @@
 
 	<li><p><a href="http://code.google.com/p/tinybsd/">TinyBSD</a> is
 	  a set of tools made up of shell scripts designed to allow easy
-	  development of Embedded Systems based on FreeBSD 5.x and
-	  6.x.</p></li>
+	  development of Embedded Systems based on FreeBSD.</p></li>
 
 	<li><p><a href="http://thinbsd.zefyris.com/">ThinBSD</a> is a small
 	  FreeBSD based boot image that allows a standard PC to act as
@@ -258,40 +250,8 @@
       outdated nor dying.  Many professional users like the stability that years
       of testing has provided FreeBSD.</p>
 
-    <p>Technological enhancements continue to be added to *BSD, including,
-      but not limited to;</p>
-
-    <ul>
-        <li><p>SMP: Symmetric Multi-Processing, making use of systems with
-	  multiple CPUs.</p></li>
-
-        <li><p>SoftUpdates: Makes the BSD filesystem at least as fast as the
-	  Linux filesystem, <strong>without</strong> needing to enable
-	  asynchronous writes, with their associated risk.</p></li>
-
-        <li><p>VM system: The VM (Virtual Memory) subsystem continues to be
-	  refined. The merged VM/cache design helps systems like
-	  wcarchive.cdrom.com juggle thousands (literally, more than 10,000)
-	  simultaneous FTP connections without falling over.</p></li>
-
-        <li><p>Architecture ports: FreeBSD supports seven main architectures
-	  currently: Alpha, AMD64, i386, Itanium, PC-98, PowerPC and UltraSPARC.
-	  There are also ongoing works to port the project for further
-	  architectures.  See the <a
-	  href="../platforms/index.html">Supported Platforms</a> page
-	  for more information.</p></li>
-
-	<li><p>MAC Framework: FreeBSD supports Mandatory Access Control, a feature
-	  usually found in trusted operating systems available for high
-	  prices.  FreeBSD gives you advanced security for free!  The
-	  <a href="http://www.trustedbsd.org">TrustedBSD Project</a>
-	  provides further trusted operating system extensions.</p></li>
-
-	<li><p>GEOM classess: GEOM is a modular disk framework that lets
-	  you concatenate, mirror, stripe, or encrypt disks.  It is rich
-	  in functionality and keeps your data safe.</p></li>
-
-</ul>
+    <p><a href="../features.html">Technological
+      enhancements</a> continue to be added to *BSD.</p>
 
     <hr noshade="noshade" size="1"/>
 

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/docs/books.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/docs/books.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/docs/books.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -257,6 +257,11 @@
 	      A guide to the PAM system and modules under
 	        FreeBSD.</p>
 
+	    <p><a href="&url.articles;/port-mentor-guidelines/index.html">
+	        Port Mentor Guidelines</a> (port-mentor-guidelines)<br/>
+	      Guidelines for new and/or potential port mentors and
+	        mentees.</p>
+
 	    <p><a href="&url.articles;/portbuild/index.html">Package
 		building procedures</a> (portbuild)<br/>
 	      Describes the approach used by the FreeBSD port

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/internal/Makefile
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/internal/Makefile	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/internal/Makefile	Tue Apr 30 09:50:22 2013	(r41526)
@@ -9,6 +9,7 @@
 
 DOCS= 	about.xml
 DOCS+=	bylaws.xml
+DOCS+=	clusteradm.xml
 DOCS+=	core-vote.xml
 DOCS+= 	data.xml
 DOCS+= 	developer.xml

Copied: projects/xml-tools/en_US.ISO8859-1/htdocs/internal/clusteradm.xml (from r41525, head/en_US.ISO8859-1/htdocs/internal/clusteradm.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/internal/clusteradm.xml	Tue Apr 30 09:50:22 2013	(r41526, copy of r41525, head/en_US.ISO8859-1/htdocs/internal/clusteradm.xml)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "Charter for the Cluster Administrators">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body class="navinclude.docs">
+
+
+<p>Lead cluster administrator is a delegated officer role (aka.  "hat")
+  that answers to the &os; Core Team and ultimately the &os; community
+  at large.  This person shall have the operational authority over the
+  &os; cluster infrastructure (to the extent that the Core Team can
+  delegate this authority) and will be responsible for the following in
+  general:</p>
+
+<ul>
+  <li>Ensure the reliable operation of the Project's equipment and
+    network resources.</li>
+
+  <li>Ensure that the Project's resources are suitably and effectively
+    used to serve the Project's interests.</li>
+
+  <li>Ensure that reasonable security precautions and mitigations are
+    implemented within the constraints of the nature of a highly
+    distributed project.</li>
+
+  <li>Delegate to and coordinating with both the site-specific admin
+    teams and the admins at large.</li>
+
+  <li>Ensure that standard operating procedures, rules, guidelines etc
+    are documented and understandable.</li>
+
+  <li>Take measures to ensure that a competent administrator would be
+    expected to be able to adopt a predecessor's work in a reasonable
+    amount of time.</li>
+
+  <li>Contingency planning and implementation to ensure continuity
+    across site specific problems (including donated site withdrawal or
+    outages).</li>
+
+  <li>Keep the interested parties (Core Team, Security Team, &os;
+    Foundation, Port Management Team, etc), project members and community
+    members appropriately informed.</li>
+
+  <li>Give timely and authoritive answers to questions, or a direct
+    referral to the appropriate party.</li>
+
+  <li>Aid other hat wearers and cluster administrators to get their job
+    done.</li>
+
+  <li>Where practical and appropriate, use the Project's own product as
+    a proving ground.</li>
+
+  <li>Make sure that it is easy for developers to know what hardware
+    resources they have access to for project purposes.</li>
+</ul>
+
+<p>The lead cluster administrator answers to the &os; Core Team.  If a
+  party is unhappy with a position that the hat wearer takes and is
+  unable to change their mind, they may take the issue to the Core Team.
+  The Core Team has the final say in the matter.  If the lead cluster
+  administrator is a member of the Core Team then a complaint may be
+  made in confidence via the core secretary or another member if
+  desired.</p>
+
+<p>Any of the following still require a sign-off from the Core Team:</p>
+
+<ul>
+  <li>New public facing services.</li>
+
+  <li>Planned withdrawal of public facing services.</li>
+
+  <li>New team members.</li>
+</ul>
+
+<p>Notable interaction with other hats:</p>
+
+<ul>
+  <li>The lead cluster administrator will consult with the Security
+    Officer and the Security Team where appropriate but will be
+    responsible for making decisions.  However, the Security Officer may
+    respond to security emergencies involving project infrastructure as
+    necessary.</li>
+
+  <li>The Port Management Team has a large resource footprint and
+    arrangements will be made with them to effectively operate their
+    resources within the constraints of the overall cluster
+    operation.</li>
+</ul>
+
+<p>Earmarked resources:</p>
+
+<p>Some site resources are provided for specific purposes.  Any such
+  earmarking or use restrictions will be documented to make sure such
+  resources are used as intended.</p>
+
+  </body>
+</html>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml	Tue Apr 30 01:29:18 2013	(r41525)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml	Tue Apr 30 09:50:22 2013	(r41526)
@@ -56,52 +56,38 @@
     <th>Estimated EoL</th>
   </tr>
   <tr>
-    <td>RELENG_7</td>
-    <td>n/a</td>
-    <td>RELENG_7_3</td>
-    <td>packages-7-stable</td>
-    <td>February 28, 2013</td>
-  </tr>
-  <tr>
-    <td>RELENG_7_3</td>
-    <td>7.3-RELEASE</td>
-    <td>RELENG_7_3</td>
-    <td>packages-7-stable</td>
-    <td>March 31, 2012</td>
-  </tr>
-  <tr>
-    <td>RELENG_7_4</td>
-    <td>7.4-RELEASE</td>
-    <td>RELENG_7_3</td>
-    <td>packages-7-stable</td>
-    <td>February 28, 2013</td>
-  </tr>
-  <tr>
     <td>RELENG_8</td>

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

More information about the svn-doc-projects mailing list