From c40dc337bb1443fc6c73ab735d369774dd00d0f0 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 24 Jul 2013 23:52:05 +0000
Subject: [PATCH 01/92] Simplify and improve the nano config section.
---
.../fdp-primer/editor-config/chapter.xml | 40 ++++++++++++-------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
index 68e5c76ce5..05b02dd575 100644
--- a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
@@ -84,27 +84,36 @@ augroup END</programlisting>
<filename role="package">editors/nano</filename> or
<filename role="package">editors/nano-devel</filename>.</para>
- <para>Configuration:</para>
+ <sect2 id="editor-config-nano-config">
+ <title>Configuration</title>
+
+ <para>Copy the sample <acronym>XML</acronym> syntax highlight
+ file to the user's home directory:</para>
<screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
- <para>Use <command>printf</command> to add lines to the
- configuration file. Some have embedded <keycap>Tab</keycap>
- characters, making this easier than editing the file
- directly:</para>
+ <para>Add these lines to the new <filename>~/.nanorc</filename>.</para>
- <screen>&prompt.user; <userinput>printf '# trailing whitespace\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "[[:space:]]+$"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# (after zero or more tabs) should be a tab\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "^([\t]*[ ]{8})+"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# tabs after spaces\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,yellow "( )+\t"\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# lines longer than 70 characters\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n' >> ~/.nanorc</userinput></screen>
+ <programlisting># trailing whitespace
+color ,blue "[[:space:]]+$"
+# multiples of eight spaces at the start a line
+# (after zero or more tabs) should be a tab
+color ,blue "^([TAB]*[ ]{8})+"
+# tabs after spaces
+color ,yellow "( )+TAB"
+# highlight indents that have an odd number of spaces
+color ,red "^(([ ]{2})+|(TAB+))*[ ]{1}[^ ]{1}"
+# lines longer than 70 characters
+color ,yellow "^(.{71})|(TAB.{63})|(TAB{2}.{55})|(TAB{3}.{47}).+$"</programlisting>
+ <para>Process the file to create embedded tabs:</para>
+
+ <screen>&prompt.user; <userinput>perl -i'' -pe 's/TAB/\t/g' ~/.nanorc</userinput></screen>
+ </sect2>
+ <sect2 id="editor-config-nano-use">
+ <title>Use</title>
<para>Specify additional helpful options when running the
- editor.</para>
+ editor:</para>
<screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
@@ -117,5 +126,6 @@ augroup END</programlisting>
automatically:</para>
<screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
+ </sect2>
</sect1>
</chapter>
From 00a5bc5a0ae3acbfe0968444f542b60f50a924ec Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 24 Jul 2013 23:55:30 +0000
Subject: [PATCH 02/92] Whitespace-only fixes. Translators, please ignore.
---
.../fdp-primer/editor-config/chapter.xml | 34 +++++++++++--------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
index 05b02dd575..485ec0a3b1 100644
--- a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
@@ -85,16 +85,17 @@ augroup END</programlisting>
<filename role="package">editors/nano-devel</filename>.</para>
<sect2 id="editor-config-nano-config">
- <title>Configuration</title>
+ <title>Configuration</title>
<para>Copy the sample <acronym>XML</acronym> syntax highlight
file to the user's home directory:</para>
- <screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
+ <screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
- <para>Add these lines to the new <filename>~/.nanorc</filename>.</para>
+ <para>Add these lines to the new
+ <filename>~/.nanorc</filename>.</para>
- <programlisting># trailing whitespace
+ <programlisting># trailing whitespace
color ,blue "[[:space:]]+$"
# multiples of eight spaces at the start a line
# (after zero or more tabs) should be a tab
@@ -106,26 +107,29 @@ color ,red "^(([ ]{2})+|(TAB+))*[ ]{1}[^ ]{1}"
# lines longer than 70 characters
color ,yellow "^(.{71})|(TAB.{63})|(TAB{2}.{55})|(TAB{3}.{47}).+$"</programlisting>
- <para>Process the file to create embedded tabs:</para>
+ <para>Process the file to create embedded tabs:</para>
- <screen>&prompt.user; <userinput>perl -i'' -pe 's/TAB/\t/g' ~/.nanorc</userinput></screen>
+ <screen>&prompt.user; <userinput>perl -i'' -pe 's/TAB/\t/g' ~/.nanorc</userinput></screen>
</sect2>
+
<sect2 id="editor-config-nano-use">
<title>Use</title>
- <para>Specify additional helpful options when running the
- editor:</para>
- <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
+ <para>Specify additional helpful options when running the
+ editor:</para>
- <para>Users of &man.csh.1; can define an alias in
- <filename>~/.cshrc</filename> to automate these options:</para>
+ <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
- <programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
+ <para>Users of &man.csh.1; can define an alias in
+ <filename>~/.cshrc</filename> to automate these
+ options:</para>
- <para>After the alias is defined, the options will be added
- automatically:</para>
+ <programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
- <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
+ <para>After the alias is defined, the options will be added
+ automatically:</para>
+
+ <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
</sect2>
</sect1>
</chapter>
From 975deb1d5cf18af9c94b1603d5d2f4afd5010f61 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 25 Jul 2013 08:14:46 +0000
Subject: [PATCH 03/92] - Fix table markup
---
.../books/fdp-primer/docbook-markup/chapter.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index 9cf9617c8b..d0a6dcc3f2 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -164,6 +164,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -197,6 +199,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -228,6 +232,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -276,6 +282,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -304,6 +312,8 @@
<row>
<entry></entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
From 0c12038620bd01d69cd68eb0c11e6cdccc75ba9f Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 25 Jul 2013 08:16:41 +0000
Subject: [PATCH 04/92] - Do not wrap prompts in literal since DB 5.0 doesn'
allow it and this section is meant to show the rendering, which may be
different when wrapped into literal
---
en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index d0a6dcc3f2..1fea4515bc 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -324,14 +324,14 @@
<row>
<entry><literal>&prompt.root;</literal></entry>
- <entry><literal>&prompt.root;</literal></entry>
+ <entry>&prompt.root;</entry>
<entry>The <username>root</username> user
prompt.</entry>
</row>
<row>
<entry><literal>&prompt.user;</literal></entry>
- <entry><literal>&prompt.user;</literal></entry>
+ <entry>&prompt.user;</entry>
<entry>A prompt for an unprivileged user.</entry>
</row>
From e2b947301c6e522636f118b36b281942a7fc13f2 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 25 Jul 2013 08:46:43 +0000
Subject: [PATCH 05/92] - Fix table markup
---
zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index 5798715c08..487ad1a9bf 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -1190,8 +1190,6 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<row>
<entry>BSD</entry>
- <entry>
- �μ� &man.bsdlabel.8;��</entry>
<entry>���� MBR �� BSD Label�� ��ʱҲ����Σ�յ�ר��ģʽ��
��dangerously dedicated mode���� �����
&man.bsdlabel.8;��</entry>
@@ -1333,6 +1331,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<row>
<entry><literal>freebsd-boot</literal></entry>
<entry><literal>512K</literal></entry>
+ <entry/>
+ <entry/>
</row>
<row>
From 695f535d9fb07ce26256fd87a72633c6abd23679 Mon Sep 17 00:00:00 2001
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Thu, 25 Jul 2013 09:09:08 +0000
Subject: [PATCH 06/92] Docformat navigation translations.
They are named docnavi.split-html / docnavi.single-html entities in SGML
before XML tolchain upgrade (r41645) and have lost in transit.
---
ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
index c548ec0ac2..f75b44ab4c 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
@@ -18,4 +18,18 @@
<<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.<br/>
</small></p>
</xsl:template>
+
+ <xsl:template name="docformatnav">
+ <xsl:variable name="single.fname">
+ <xsl:choose>
+ <xsl:when test="/book">book.html</xsl:when>
+ <xsl:when test="/article">article.html</xsl:when>
+ </xsl:choose>
+ </xsl:variable>
+
+ <div class="docformatnavi">
+ [ <a href="index.html">�� ��������</a> /
+ <a href="{$single.fname}">����� ������</a> ]
+ </div>
+ </xsl:template>
</xsl:stylesheet>
From 4255e721c2145198793c262d918847fa222f8410 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 25 Jul 2013 09:25:39 +0000
Subject: [PATCH 07/92] Quick fixes for the Dutch handbook when using 'make
lint'.
Requested by: gabor
---
nl_NL.ISO8859-1/books/handbook/disks/chapter.xml | 6 ++++--
nl_NL.ISO8859-1/books/handbook/geom/chapter.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
index da4872df81..6ab22240c0 100644
--- a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
@@ -528,12 +528,13 @@ ad3: 29333MB <WDC WD307AA> [59598/16/63] at ata1-slave UDMA33</programlist
van de juiste jumper dient de documentatie van de schijf
geraadpleegd te worden.</para>
</note>
-
+<!--
<para>Vervolgens dient besloten te worden hoe ze deel gaan
uitmaken van het bestandssysteem. Hiervoor dienen
&man.vinum.4; (<xref linkend="vinum-vinum"/>) en &man.ccd.4;
bestudeerd te worden. Voor deze instellingen werd voor
&man.ccd.4; gekozen.</para>
+-->
</sect4>
<sect4 id="ccd-setup">
@@ -710,9 +711,10 @@ e: 60074784 0 4.2BSD 0 0 0 # (Cyl. 0 - 59597)</programlisting>
schijfopslag. &man.vinum.4; implementeert de modellen
RAID-0, RAID-1 en RAID-5, zowel individueel als als
combinatie.</para>
-
+<!--
<para>In <xref linkend="vinum-vinum"/> staat meer informatie
over &man.vinum.4;.</para>
+-->
</sect3>
</sect2>
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 6a402409d4..606b51218c 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -28,7 +28,7 @@
<title>GEOM: Modulair schijftransformatie raamwerk</title>
- <sect1 id="GEOM-synopsis">
+ <sect1 id="geom-synopsis">
<title>Overzicht</title>
<indexterm><primary>GEOM</primary></indexterm>
From b5c4a262a3bdaa71fbc6c27972a8e16e61778df2 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 26 Jul 2013 09:52:55 +0000
Subject: [PATCH 08/92] - Finally fix the table markup. Hopefully.
---
.../books/fdp-primer/docbook-markup/chapter.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index 1fea4515bc..0b21d3f964 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -140,8 +140,6 @@
<tbody valign="top">
<row>
<entry namest="entity" nameend="notes">&os; Name Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
@@ -170,8 +168,6 @@
<row>
<entry namest="entity" nameend="notes">Manual Page Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
@@ -205,8 +201,6 @@
<row>
<entry namest="entity" nameend="notes">&os; Mailing List Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
@@ -238,8 +232,6 @@
<row>
<entry namest="entity" nameend="notes">&os; Document Link Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
@@ -288,8 +280,6 @@
<row>
<entry namest="entity" nameend="notes">Other Operating System Name Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
@@ -318,8 +308,6 @@
<row>
<entry namest="entity" nameend="notes">Miscellaneous Entities</entry>
- <entry></entry>
- <entry></entry>
</row>
<row>
From 583e2bb8a92861b459489884fc83d76eb728a263 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 26 Jul 2013 09:54:13 +0000
Subject: [PATCH 09/92] - Remove constraint on table column numbers since it
did not take into account those cols than span more.
---
share/xml/freebsd.sch | 3 ---
1 file changed, 3 deletions(-)
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 880ab2d03c..720e93ca69 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -64,9 +64,6 @@
<rule context="//entry">
<report test="@colname and @spanname">You cannot use both colname and spanname attributes on table entries.</report>
</rule>
- <rule context="//tgroup">
- <report test="@cols != count((thead/row|tbody/row)[1]//entry)">The number of columns does not match the specified value (in section <xsl:value-of select="(ancestor::sect5[last()]|ancestor::sect4[last()]|ancestor::sect3[last()]|ancestor::sect2[last()]|ancestor::sect1[last()]|ancestor::chapter[last()])[last()]/@id"/>).</report>
- </rule>
<rule context="//table">
<report test=".//programlisting">Programlisting is not allowed in tables (in section <xsl:value-of select="(ancestor::sect5[last()]|ancestor::sect4[last()]|ancestor::sect3[last()]|ancestor::sect2[last()]|ancestor::sect1[last()]|ancestor::chapter[last()])[last()]/@id"/>).</report>
<report test=".//screen">The screen element is not allowed in tables (in section <xsl:value-of select="(ancestor::sect5[last()]|ancestor::sect4[last()]|ancestor::sect3[last()]|ancestor::sect2[last()]|ancestor::sect1[last()]|ancestor::chapter[last()])[last()]/@id"/>).</report>
From 231d7a25f707d2cc3ae3e07140a1f34f99af0f0a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 26 Jul 2013 11:17:18 +0000
Subject: [PATCH 10/92] - Use a section id instead of an anchor
---
fr_FR.ISO8859-1/books/faq/book.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index fd2070aeae..dd47db4926 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -3167,8 +3167,8 @@ syst
</sect1>
- <sect1>
- <title> ghostscript m'affiche �norm�ment d'erreurs sur mon 386/486SX. <anchor id="emul"/> </title>
+ <sect1 id="emul">
+ <title> ghostscript m'affiche �norm�ment d'erreurs sur mon 386/486SX.</title>
<para> Vous n'avez pas de coprocesseur math�matique, n'est-ce pas ? Vous
devez absolument compiler l'�mulateur math�matique fournit dans votre
From f7f6ece5fd44b08ed46c55cd88fc0937500c2e2d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 26 Jul 2013 12:32:39 +0000
Subject: [PATCH 11/92] - Convert anchors in titles to an id on the section
---
de_DE.ISO8859-1/articles/contributing/article.xml | 4 ++--
de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml | 8 ++++----
el_GR.ISO8859-7/articles/contributing/article.xml | 4 ++--
el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml | 8 ++++----
en_US.ISO8859-1/articles/contributing/article.xml | 4 ++--
es_ES.ISO8859-1/articles/contributing/article.xml | 4 ++--
fr_FR.ISO8859-1/articles/contributing/article.xml | 4 ++--
fr_FR.ISO8859-1/books/faq/book.xml | 4 ++--
fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml | 8 ++++----
hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml | 8 ++++----
it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml | 8 ++++----
ja_JP.eucJP/articles/contributing/article.xml | 4 ++--
nl_NL.ISO8859-1/articles/contributing/article.xml | 4 ++--
nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml | 8 ++++----
pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml | 8 ++++----
pt_BR.ISO8859-1/articles/contributing/article.xml | 4 ++--
pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml | 8 ++++----
ru_RU.KOI8-R/articles/contributing/article.xml | 4 ++--
ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml | 8 ++++----
zh_CN.GB2312/articles/contributing/article.xml | 4 ++--
zh_CN.GB2312/books/handbook/mirrors/chapter.xml | 8 ++++----
zh_TW.Big5/articles/contributing/article.xml | 4 ++--
zh_TW.Big5/books/handbook/mirrors/chapter.xml | 8 ++++----
23 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index 6993c696dd..6fc27791cb 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -561,8 +561,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
unterst�tzten Hardware erweitern zu k�nnen, da
uns die Mittel zum Erwerb dieser Hardware fehlen.</para>
- <sect3>
- <title><anchor id="donations"/>Geldspenden</title>
+ <sect3 id="donations">
+ <title>Geldspenden</title>
<para>Die FreeBSD Foundation ist eine gemeinn�tzige
Gesellschaft, die zur Unterst�tzung des FreeBSD-Projekts
diff --git a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
index 373bc85959..9ad18576f2 100644
--- a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -285,8 +285,8 @@
<sect1 id="anoncvs">
<title>Anonymous CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Einf�hrung</title>
+ <sect2 id="anoncvs-intro">
+ <title>Einf�hrung</title>
<indexterm>
<primary>CVS</primary>
@@ -343,8 +343,8 @@
ist <application>CVSup</application> die einzige Wahl.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Benutzen von Anonymous CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>Benutzen von Anonymous CVS</title>
<para>Setzen Sie einfach die <envar>CVSROOT</envar>
Umgebungsvariable, um &man.cvs.1; das
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index 8417de73ad..53e2dc89e5 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -558,8 +558,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
��� �� ����� ���� — ���� ��� ������ �� ��� ����� ������ ��
������ �� ���������� ���� ������� ������ ����� ���.</para>
- <sect3>
- <title><anchor id="donations"/>���������� ������</title>
+ <sect3 id="donations">
+ <title>���������� ������</title>
<para>� �������� &os; Foundation ����� ���� �� ������������� ��������,
� ������ ���� ������� ��� �� ��������� �� ���� ��� ������ ��� &os;.
diff --git a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
index 4f54ea2d93..731786ee55 100644
--- a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
@@ -244,8 +244,8 @@
<sect1 id="anoncvs">
<title>������� CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>��������</title>
+ <sect2 id="anoncvs-intro">
+ <title>��������</title>
<indexterm>
<primary>CVS</primary>
@@ -304,8 +304,8 @@
�� <application>CVSup</application> ����� ������ ����������.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>��������������� ������� CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>��������������� ������� CVS</title>
<para>� ������� ��� &man.cvs.1; ���� �� ������������ ��� ������� CVS
repository ������� ����� ����������� ��� ��������� �������������
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index bda4185f30..c790885285 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -501,8 +501,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
peripherals since we generally lack the funds to buy such
items ourselves.</para>
- <sect3>
- <title><anchor id="donations"/>Donating Funds</title>
+ <sect3 id="donation">
+ <title>Donating Funds</title>
<para>The FreeBSD Foundation is a non-profit, tax-exempt
foundation established to further the goals of the FreeBSD
diff --git a/es_ES.ISO8859-1/articles/contributing/article.xml b/es_ES.ISO8859-1/articles/contributing/article.xml
index 49212c4bef..1986b6c2b2 100644
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@@ -550,8 +550,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
dado que normalmente andamos cortos de fondos con los que
comprar ese tipo de material.</para>
- <sect3>
- <title><anchor id="donations"/>Donaci�n de Fondos</title>
+ <sect3 id="donations">
+ <title>Donaci�n de Fondos</title>
<para>La Fundaci�n FreeBSD es una fundaci�n sin
�nimo de lucro y exenta de impuestos creada para
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.xml b/fr_FR.ISO8859-1/articles/contributing/article.xml
index b560aa2b68..cde26858d3 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -569,8 +569,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
fonds pour acheter de tels �l�ments
nous-m�mes.</para>
- <sect3>
- <title><anchor id="donations"/>Donation de fonds</title>
+ <sect3 id="donations">
+ <title>Donation de fonds</title>
<para>La Fondation FreeBSD est une fondation à but non lucratif
et exempte d'imp�ts fond�e pour servir les objectifs
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index dd47db4926..3b76e8da56 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -4318,8 +4318,8 @@ pour un prix tr
</para>
</sect1>
- <sect1>
- <title> Pourquoi ma souris ne marche pas sous X ? <anchor id="x-and-moused"/> </title>
+ <sect1 id="x-and-moused">
+ <title> Pourquoi ma souris ne marche pas sous X ?</title>
<para>
Si vous utilisez syscons (le driver par d�faut de la console),
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 3e1181a492..ef9eb219a9 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -279,8 +279,8 @@
<sect1 id="anoncvs">
<title>CVS anonyme</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Introduction</title>
+ <sect2 id="anoncvs-intro">
+ <title>Introduction</title>
<indexterm>
<primary>CVS</primary>
@@ -343,8 +343,8 @@
que d'utiliser <application>CVSup</application>.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Utiliser CVS anonyme</title>
+ <sect2 id="anoncvs-usage">
+ <title>Utiliser CVS anonyme</title>
<para>Configurer &man.cvs.1; pour utiliser un
r�f�rentiel <application>CVS anonyme</application>
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
index a21d3085ab..be6d83508f 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -314,8 +314,8 @@
<sect1 id="anoncvs">
<title>Anonim CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Bevezet�s</title>
+ <sect2 id="anoncvs-intro">
+ <title>Bevezet�s</title>
<indexterm>
<primary>CVS</primary>
@@ -397,8 +397,8 @@
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Az anonim CVS
+ <sect2 id="anoncvs-usage">
+ <title>Az anonim CVS
haszn�lata</title>
<para>A &man.cvs.1; parancsot nagyon k�nny�
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
index f07ac6435a..240f57ea1e 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
@@ -299,8 +299,8 @@
<sect1 id="anoncvs">
<title>CVS Anonimo</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Introduzione</title>
+ <sect2 id="anoncvs-intro">
+ <title>Introduzione</title>
<indexterm>
<primary>CVS</primary>
@@ -353,8 +353,8 @@
realt� l'unica opzione.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Uso del CVS Anonimo</title>
+ <sect2 id="anoncvs-usage">
+ <title>Uso del CVS Anonimo</title>
<para>La configurazione di &man.cvs.1; per usare un deposito CVS Anonimo
� semplicemente una questione di impostare la variabile di
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index d249b475d1..5fe8b44acc 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -548,8 +548,8 @@ Copyright (C) [ǯ]
�ޤ�����Ū�ˡ��䤿���ϼ����Ǽ��յ�����㤦��⤬�����Ƥ��뤿�ᡢ
���յ���Υ��ݡ��Ȥ¤�����Τ˥ϡ��ɥ������δ��դϤȤƤ���פǤ���</para>
- <sect3>
- <title><anchor id="donations"/>�����</title>
+ <sect3 id="donations">
+ <title>�����</title>
<para>The FreeBSD Foundation �ϡ�
FreeBSD �ץ��������Ȥ���ɸ���ʤ��뤿�����Ω���줿��
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index 52e07d8212..a2beea8ca3 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -514,8 +514,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
over het algemeen aan de middelen ontbreekt om zelf zulke dingen
te kopen.</para>
- <sect3>
- <title><anchor id="donations"/>Geld doneren</title>
+ <sect3 id="donations">
+ <title>Geld doneren</title>
<para>De &os; Foundation is een non-profit, belastinguitgesloten
stichting die opgericht is om de doelen van het &os; Project
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
index 43fa397e69..c0e5009ea0 100644
--- a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -346,8 +346,8 @@
<sect1 id="anoncvs">
<title>Anonieme CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Inleiding</title>
+ <sect2 id="anoncvs-intro">
+ <title>Inleiding</title>
<indexterm>
<primary>CVS</primary>
@@ -406,8 +406,8 @@
voor.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Anonieme CVS gebruiken</title>
+ <sect2 id="anoncvs-usage">
+ <title>Anonieme CVS gebruiken</title>
<para>Het instellen van &man.cvs.1; om gebruik te maken van
een Anoniem CVS depot is een kwestie van het instellen van de
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
index 552ef66f88..446814158f 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -283,8 +283,8 @@
<sect1 id="anoncvs">
<title>Anonymous CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Introduction</title>
+ <sect2 id="anoncvs-intro">
+ <title>Introduction</title>
<indexterm>
<primary>CVS</primary>
@@ -340,8 +340,8 @@
option.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Using Anonymous CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>Using Anonymous CVS</title>
<para>Configuring &man.cvs.1; to use an Anonymous CVS repository
is a simple matter of setting the <envar>CVSROOT</envar>
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index d8fadee65e..9b1f2d9c13 100644
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@@ -629,8 +629,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
n�o temos recursos para comprar estes �tens
n�s mesmos.</para>
- <sect3>
- <title><anchor id="donations"/>Doando Dinheiro</title>
+ <sect3 id="donations">
+ <title>Doando Dinheiro</title>
<para>A Funda��o FreeBSD � uma entidade
sem fins lucrativos e isenta de impostos, estabelecida com o
diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 4bd27c8e3e..7217ca07fe 100644
--- a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1109,8 +1109,8 @@
<sect1 id="anoncvs">
<title>CVS An�nimo</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>Introdu��o</title>
+ <sect2 id="anoncvs-intro">
+ <title>Introdu��o</title>
<para>CVS An�nimo (ou, seu outro nome,
<emphasis>anoncvs</emphasis>) � uma funcionalidade dos
@@ -1161,8 +1161,8 @@
realmente sua �nica op��o.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Usando CVS
+ <sect2 id="anoncvs-usage">
+ <title>Usando CVS
An�nimo</title>
<para>Configurar o &man.cvs.1; para utilizar um
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index 4789111ac8..e4c63abda3 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -500,8 +500,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
��������������� ������������� ������������, ��� ��� ������ � ��� ���
������� ��� ���������������� ��� ������������.</para>
- <sect3>
- <title><anchor id="donations"/>���������� ������</title>
+ <sect3 id="donations">
+ <title>���������� ������</title>
<para>The FreeBSD Foundation �������� �������������� ������������,
�������ģ���� �� ������ �������, ��������� � ����� ���������� �����
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index bfdd56ed9e..1f0bdddfff 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -290,8 +290,8 @@
<sect1 id="anoncvs">
<title>��������� CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>��������</title>
+ <sect2 id="anoncvs-intro">
+ <title>��������</title>
<indexterm>
<primary>CVS</primary>
@@ -348,8 +348,8 @@
<!--������� ����������� ����: ������������ �������?-->
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>������������� ���������� CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>������������� ���������� CVS</title>
<para>��������� &man.cvs.1; ��� ������������� ���������� CVS
����������� �������� ��������� ���������� ���������
diff --git a/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index ba80c2c4cd..bc76145d20 100644
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@@ -451,8 +451,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
����Ӳ��Ҳ�dz���Ҫ�� ��Ϊ�����ܹ������������ӿ���֧�ֵ�Ӳ�����࣬
�������еĺܶ��˲�û���㹻���ʽ���������ЩӲ����</para>
- <sect3>
- <title><anchor id="donations"/>���</title>
+ <sect3 id="donations">
+ <title>���</title>
<para>FreeBSD �������һ����Ӫ���ġ� �п�˰����Ȩ�Ļ���ᣬ
�������������Ŀ����Ϊ���� FreeBSD Project �ܹ���ɸ��ӳ�Զ��Ŀ�ꡣ
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
index a018bdcba5..aef03b0b01 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
@@ -273,8 +273,8 @@
<sect1 id="anoncvs">
<title>���� CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>����</title>
+ <sect2 id="anoncvs-intro">
+ <title>����</title>
<indexterm>
<primary>CVS</primary>
@@ -323,8 +323,8 @@
<application>CVSup</application> ��������Ψһ��ѡ��</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>ʹ������ CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>ʹ������ CVS</title>
<para>���� &man.cvs.1; ʹ������ CVS �ֿ���Լ��趨
<envar>CVSROOT</envar> ��������ָ�� &os; ��Ŀ��
diff --git a/zh_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index f888dfdf8b..80ed72c193 100644
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@@ -430,8 +430,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
���صw��]�D�`���n�A�]���o�˯�����U�ڭ̼W�[�i�䴩���w������A
�ӧڭ̤����ܦh�H�èS��������������ʸm�o�ǵw��C</para>
- <sect3>
- <title><anchor id="donations"/>����</title>
+ <sect3 id="donations">
+ <title>����</title>
<para>FreeBSD ����|�O�@�ӫD��Q���B���ҵ|�ŧK�v������|�A
���ҥH�|�إ߳o�Ӱ���|�A�O���F�� FreeBSD �p������i���i�[�C
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.xml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
index 18b1f0e0ce..8008aeca88 100644
--- a/zh_TW.Big5/books/handbook/mirrors/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
@@ -280,8 +280,8 @@
<sect1 id="anoncvs">
<title>Anonymous CVS</title>
- <sect2>
- <title><anchor id="anoncvs-intro"/>anoncvs ²��</title>
+ <sect2 id="anoncvs-intro">
+ <title>anoncvs ²��</title>
<indexterm>
<primary>CVS</primary>
@@ -337,8 +337,8 @@
option.</para>
</sect2>
- <sect2>
- <title><anchor id="anoncvs-usage"/>Using Anonymous CVS</title>
+ <sect2 id="anoncvs-usage">
+ <title>Using Anonymous CVS</title>
<para>Configuring &man.cvs.1; to use an Anonymous CVS repository
is a simple matter of setting the <envar>CVSROOT</envar>
From 69a7f5935382a380926c4ae1329fd2123341cd98 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:14:02 +0000
Subject: [PATCH 12/92] - Merge the following from the English version:
r42364 -> r42388 head/ja_JP.eucJP/share/xml/release.l10n.ent
---
ja_JP.eucJP/share/xml/release.l10n.ent | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ja_JP.eucJP/share/xml/release.l10n.ent b/ja_JP.eucJP/share/xml/release.l10n.ent
index 0aeee734ba..5d1d8b807a 100644
--- a/ja_JP.eucJP/share/xml/release.l10n.ent
+++ b/ja_JP.eucJP/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
<!--
$FreeBSD$
- Original revision: r42364
+ Original revision: r42388
-->
<![%beta2.testing;[
@@ -121,14 +121,12 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
- <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<!--
<tr>
<td></td>
From 4bca61e44213f0ffaa7fa1eb310e1ad2fe28793d Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:41:12 +0000
Subject: [PATCH 13/92] - Merge the following from the English version:
r40061 -> r42402 head/ja_JP.eucJP/articles/contributing/article.xml
---
ja_JP.eucJP/articles/contributing/article.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 5fe8b44acc..6008a55831 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -6,7 +6,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r40061
+ Original revision: r42402
$FreeBSD$
-->
@@ -417,9 +417,9 @@
<orderedlist>
<listitem>
- <indexterm><primary>BSD copyright</primary></indexterm>
- <para>BSD ���ԡ��饤�ȡ�
+ <para>BSD ���ԡ��饤�� <indexterm><primary>BSD ���ԡ��饤��</primary></indexterm>
+��
���Υ��ԡ��饤�Ȥ�
<quote>�����������ʤ�</quote>
���ʤȾ��Ѵ�ȤˤȤäư���Ū��̥�Ϥ��Ĥ���˺Ǥ�ޤ�ޤ���
@@ -429,6 +429,7 @@
</listitem>
<listitem>
+ <para>
<indexterm>
<primary>GPL</primary>
<see>GNU General Public License</see>
@@ -438,7 +439,7 @@
<primary>GNU General Public License</primary>
</indexterm>
- <para>GNU���̸�ͭ���ѵ������ޤ��� <quote>GPL</quote>��
+ GNU���̸�ͭ���ѵ������ޤ��� <quote>GPL</quote>��
���Υ饤���ϥ����ɤ�����Ū�˻��Ѥ������;ʬ�����Ϥ������뤿�ᡢ
�䤿���ˤ��ޤ�ɾȽ���ɤ��Ȥ����櫓�ǤϤ���ޤ���������
�䤿���ϴ��� GPL ���ι��ʼ��ʥ�����
@@ -561,9 +562,9 @@ Copyright (C) [ǯ]
<para>���դϾ��ڼ�ǰʲ������äƤ���������
<address>
The FreeBSD Foundation
- <street>7321 Brockway Dr.</street>
+ <street>P.O. Box 20247</street>,
<city>Boulder</city>,
- <state>CO</state> <postcode>80303</postcode>
+ <state>CO</state> <postcode>80308</postcode>
<country>USA</country>
</address></para>
From bdb30834ea1ae0d9808221deb22bd7d5f4a20510 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:55:53 +0000
Subject: [PATCH 14/92] - Merge the following from the English version:
r42402 -> r42405 head/ja_JP.eucJP/articles/contributing/article.xml
---
ja_JP.eucJP/articles/contributing/article.xml | 47 ++++++++++---------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 6008a55831..e02dee1eff 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -6,7 +6,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r42402
+ Original revision: r42405
$FreeBSD$
-->
@@ -106,7 +106,7 @@
�����������ǿ��ξ��֤��ɤ�����ǧ����Τ���������Ȥ��Ǥ��ޤ���
�ޤ� FreeBSD �ɥ�����ơ������ץ�������������� <ulink
url="&url.books.fdp-primer.en;/translations.html">�����˴ؤ���
- FAQ (�褯�������Ȥ�������)</ulink> ����ɤ��Ƥ���������
+ FAQ (�褯�������Ȥ�������)</ulink> ����ɤ��Ƥ���������
�ȤϤ��äƤ⡢
�������뤳�Ȥˤ�äƤ��ʤ������٤Ƥ� FreeBSD
ʸ��������˷Ȥ��褦�ˤʤ�櫓�ǤϤʤ��Ǥ�����͡�
@@ -191,11 +191,12 @@
</listitem>
<listitem>
- <para>&posix; �Τ褦�ʸ���ɸ��μ̤������ꤷ�Ƥ���������<ulink
- url="&url.base;/projects/c99/index.html">FreeBSD
- C99 & POSIX ɸ��Ŭ��ץ���������</ulink>�Υ����֥����Ȥˡ�
- �������ä�ɸ��ؤΥ�������Ĥ�����ޤ���
- FreeBSD �ε�ư��ɸ�ब�᤹���Τ���Ӥ��Ƥ�����������ư���ۤʤ��硢
+ <para>&posix; �Τ褦�ʸ���ɸ��μ̤������ꤷ�Ƥ���������
+ <ulink url="&url.base;/projects/c99/index.html">FreeBSD
+ C99 & POSIX ɸ��Ŭ��ץ���������</ulink>
+ �Υ����֥����Ȥˡ��������ä�ɸ��ؤΥ�������Ĥ�����ޤ���
+ FreeBSD �ε�ư��ɸ�ब�᤹���Τ���Ӥ��Ƥ���������
+ ��ư���ۤʤ��硢
�äˤ��줬���ͤμ�����ʤ��ä���ʬ����ˤ����٤�����ʬ�ʤ顢
�㳲������Ф��Ƥ����������Ǥ���Фɤ��������٤������餫�ˤ��ơ�
�㳲���˥ѥå���Ĥ��Ƥ���������ɸ�ब�ְ�äƤ���ȴ������顢
@@ -295,9 +296,9 @@
�إ������ꡢ
ï�����˥Х��������դ��Ƥ�餦�褦�����ͤƤ���������</para>
- <para>�ɤ��㳲�������ˡ�ˤĤ��Ƥ�<ulink
- url="&url.articles.problem-reports;/article.html">����ʸ��</ulink
- >��������������</para>
+ <para>�ɤ��㳲�������ˡ�ˤĤ��Ƥ� <ulink
+ url="&url.articles.problem-reports;/article.html">����ʸ��</ulink>
+ ��������������</para>
</sect2>
<sect2>
@@ -329,9 +330,9 @@
�����̤ʷ�³Ū����������ޤ���FreeBSD-CURRENT
�ϳ�ȯ�Ԥ��Ѷ�Ū�ʳ�ư���ص��Τ���ˡ�
��������ˡ�����Ѳ�ǽ�ˤʤäƤ��ޤ���FreeBSD-CURRENT
- ������Ȼ�����ˡ�ˤĤ��Ƥξܤ�������ˤĤ��Ƥ�<ulink
- url="&url.books.handbook;/current-stable.html">FreeBSD �ϥ�ɥ֥å�</ulink>
- �Ȥ��Ƥ���������</para>
+ ������Ȼ�����ˡ�ˤĤ��Ƥξܤ�������ˤĤ��Ƥ� <ulink
+ url="&url.books.handbook;/current-stable.html">FreeBSD
+ �ϥ�ɥ֥å�</ulink> �Ȥ��Ƥ���������</para>
<para>�Ť����������Ȥ˺�Ȥ���ȡ�
��ǰ�ʤ��餢�ʤ����ѹ������Ȥ��ƻ����٤�⤷�����礭���ۤʤ��ΤˤʤäƤ��ޤäơ�
@@ -418,7 +419,8 @@
<orderedlist>
<listitem>
- <para>BSD ���ԡ��饤�� <indexterm><primary>BSD ���ԡ��饤��</primary></indexterm>
+ <para>BSD ���ԡ��饤�� <indexterm><primary>BSD
+ ���ԡ��饤��</primary></indexterm>
��
���Υ��ԡ��饤�Ȥ�
<quote>�����������ʤ�</quote>
@@ -430,16 +432,16 @@
<listitem>
<para>
- <indexterm>
- <primary>GPL</primary>
- <see>GNU General Public License</see>
- </indexterm>
+ <indexterm>
+ <primary>GPL</primary>
+ <see>GNU General Public License</see>
+ </indexterm>
- <indexterm>
- <primary>GNU General Public License</primary>
- </indexterm>
+ <indexterm>
+ <primary>GNU General Public License</primary>
+ </indexterm>
- GNU���̸�ͭ���ѵ������ޤ��� <quote>GPL</quote>��
+ GNU���̸�ͭ���ѵ������ޤ��� <quote>GPL</quote>��
���Υ饤���ϥ����ɤ�����Ū�˻��Ѥ������;ʬ�����Ϥ������뤿�ᡢ
�䤿���ˤ��ޤ�ɾȽ���ɤ��Ȥ����櫓�ǤϤ���ޤ���������
�䤿���ϴ��� GPL ���ι��ʼ��ʥ�����
@@ -594,5 +596,4 @@ Copyright (C) [ǯ]
</sect3>
</sect2>
</sect1>
-
</article>
From 0f9a06e6f708354822f14416ab0a9a6f4e34110e Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:58:55 +0000
Subject: [PATCH 15/92] - Merge the following from the English version:
r42405 -> r42442 head/ja_JP.eucJP/articles/contributing/article.xml
---
ja_JP.eucJP/articles/contributing/article.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index e02dee1eff..447c2ef4b3 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -6,7 +6,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r42405
+ Original revision: r42442
$FreeBSD$
-->
From 9a682c17e278ab3dc00e1f180ff0dc4855badbb9 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 27 Jul 2013 00:02:23 +0000
Subject: [PATCH 16/92] BETA2 builds are in-flight, as scheduled.
Approved by: re (implicit)
---
en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml b/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
index 9bf5f0039a..27d520d391 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
+++ b/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
@@ -86,7 +86,7 @@
<tr>
<td>BETA2 builds begin</td>
<td>26 July 2013</td>
- <td>-</td>
+ <td>26 July 2013</td>
<td>Second beta test snapshot.</td>
</tr>
From 223eda903e8038e5e09e5cb8775e0beb1b304b2c Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 27 Jul 2013 03:39:12 +0000
Subject: [PATCH 17/92] Add two latest advisories:
Fix Denial of Service vulnerability in named(8). [13:07]
Fix a bug that allows remote client bypass the normal
access checks when when -network or -host restrictions are
used at the same time with -mapall. [13:08]
---
.../advisories/FreeBSD-SA-13:07.bind.asc | 121 ++++++++++++++++++
.../advisories/FreeBSD-SA-13:08.nfsserver.asc | 120 +++++++++++++++++
share/security/patches/SA-13:07/bind.patch | 13 ++
.../security/patches/SA-13:07/bind.patch.asc | 6 +
.../security/patches/SA-13:08/nfsserver.patch | 13 ++
.../patches/SA-13:08/nfsserver.patch.asc | 22 ++++
share/xml/advisories.xml | 17 +++
7 files changed, 312 insertions(+)
create mode 100644 share/security/advisories/FreeBSD-SA-13:07.bind.asc
create mode 100644 share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
create mode 100644 share/security/patches/SA-13:07/bind.patch
create mode 100644 share/security/patches/SA-13:07/bind.patch.asc
create mode 100644 share/security/patches/SA-13:08/nfsserver.patch
create mode 100644 share/security/patches/SA-13:08/nfsserver.patch.asc
diff --git a/share/security/advisories/FreeBSD-SA-13:07.bind.asc b/share/security/advisories/FreeBSD-SA-13:07.bind.asc
new file mode 100644
index 0000000000..0f698b237a
--- /dev/null
+++ b/share/security/advisories/FreeBSD-SA-13:07.bind.asc
@@ -0,0 +1,121 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+=============================================================================
+FreeBSD-SA-13:07.bind Security Advisory
+ The FreeBSD Project
+
+Topic: BIND remote denial of service
+
+Category: contrib
+Module: bind
+Announced: 2013-07-26
+Credits: Maxim Shudrak and the HP Zero Day Initiative, ISC
+Affects: FreeBSD 8.4-RELEASE and FreeBSD 9.x
+Corrected: 2013-07-26 22:53:17 UTC (stable/8, 8.4-STABLE)
+ 2013-07-26 22:40:17 UTC (releng/8.4, 8.4-RELEASE-p2)
+ 2013-07-26 22:43:09 UTC (stable/9, 9.2-BETA2)
+ 2013-07-26 22:40:23 UTC (releng/9.1, 9.1-RELEASE-p5)
+CVE Name: CVE-2013-4854
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:http://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. The libdns
+library is a library of DNS protocol support functions.
+
+II. Problem Description
+
+Due to a software defect a specially crafted query which includes
+malformed rdata, could cause named(8) to crash with an assertion
+failure and rejecting the malformed query. This issue affects both
+recursive and authoritative-only nameservers.
+
+III. Impact
+
+An attacker who can send a specially crafted query could cause named(8)
+to crash, resulting in a denial of service.
+
+IV. Workaround
+
+No workaround is available, but systems not running the named(8) service
+and not using the base system DNS utilities are not affected.
+
+V. Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a 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 http://security.FreeBSD.org/patches/SA-13:07/bind.patch
+# fetch http://security.FreeBSD.org/patches/SA-13:07/bind.patch.asc
+# gpg --verify bind.patch.asc
+
+b) Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+Recompile the operating system using buildworld and installworld as
+described in <URL:http://www.FreeBSD.org/handbook/makeworld.html>.
+
+Restart the named daemon, or reboot the system.
+
+3) 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
+
+VI. Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path Revision
+- -------------------------------------------------------------------------
+stable/8/ r253696
+releng/8.4/ r253692
+stable/9/ r253695
+releng/9.1/ r253693
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing XXXXXX with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cXXXXXX --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing XXXXXX with the revision number:
+
+<URL:http://svnweb.freebsd.org/base?view=revision&revision=XXXXXX>
+
+VII. References
+
+https://kb.isc.org/article/AA-01015
+
+<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4854>
+
+The latest revision of this advisory is available at
+http://security.FreeBSD.org/advisories/FreeBSD-SA-13:07.bind.asc
+-----BEGIN PGP SIGNATURE-----
+
+iEYEARECAAYFAlHzPpMACgkQFdaIBMps37Jb2ACdFqaNTTBFiOCuz30MJ5s85UVd
+MzoAn2ebCjqULwyEbJaeTlck87NPfQWR
+=RFf2
+-----END PGP SIGNATURE-----
diff --git a/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc b/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
new file mode 100644
index 0000000000..f770400633
--- /dev/null
+++ b/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
@@ -0,0 +1,120 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+=============================================================================
+FreeBSD-SA-13:08.nfsserver Security Advisory
+ The FreeBSD Project
+
+Topic: Incorrect privilege validation in the NFS server
+
+Category: core
+Module: nfsserver
+Announced: 2013-07-26
+Credits: Rick Macklem, Christopher Key, Tim Zingelman
+Affects: FreeBSD 8.3, FreeBSD 9.0 and FreeBSD 9.1
+Corrected: 2012-12-28 14:06:49 UTC (stable/9, 9.2-BETA2)
+ 2013-07-26 22:40:23 UTC (releng/9.1, 9.1-RELEASE-p5)
+ 2013-01-06 01:11:45 UTC (stable/8, 8.3-STABLE)
+ 2013-07-26 22:40:29 UTC (releng/8.3, 8.3-RELEASE-p9)
+CVE Name: CVE-2013-4851
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit <URL:http://security.FreeBSD.org/>.
+
+I. Background
+
+The Network File System (NFS) allows a host to export some or all of its
+file systems so that other hosts can access them over the network and mount
+them as if they were on local disks. FreeBSD includes both server and client
+implementations of NFS.
+
+II. Problem Description
+
+The kernel incorrectly uses client supplied credentials instead of the one
+configured in exports(5) when filling out the anonymous credential for a
+NFS export, when -network or -host restrictions are used at the same time.
+
+III. Impact
+
+The remote client may supply privileged credentials (e.g. the root user)
+when accessing a file under the NFS share, which will bypass the normal
+access checks.
+
+IV. Workaround
+
+Systems that do not provide the NFS service are not vulnerable. Systems that
+do provide the NFS service are only vulnerable when -mapall or -maproot is
+used in combination with network and/or host restrictions.
+
+V. Solution
+
+Perform one of the following:
+
+1) Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+2) To update your vulnerable system via a 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 http://security.FreeBSD.org/patches/SA-13:08/nfsserver.patch
+# fetch http://security.FreeBSD.org/patches/SA-13:08/nfsserver.patch.asc
+# gpg --verify nfsserver.patch.asc
+
+b) Apply the patch.
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+<URL:http://www.FreeBSD.org/handbook/kernelconfig.html> and reboot the
+system.
+
+3) 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
+
+VI. Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path Revision
+- -------------------------------------------------------------------------
+stable/8/ r245086
+releng/8.3/ r253694
+stable/9/ r244772
+releng/9.1/ r253693
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing XXXXXX with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cXXXXXX --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing XXXXXX with the revision number:
+
+<URL:http://svnweb.freebsd.org/base?view=revision&revision=XXXXXX>
+
+VII. References
+
+<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4851>
+
+The latest revision of this advisory is available at
+http://security.FreeBSD.org/advisories/FreeBSD-SA-13:08.nfsserver.asc
+-----BEGIN PGP SIGNATURE-----
+
+iEYEARECAAYFAlHzPrkACgkQFdaIBMps37I9YACfSu4orRhgOhol8vacW9kF3ZGP
+jtAAn0t2i14CMo1MT5MztI6RWX3hnUWZ
+=xjf/
+-----END PGP SIGNATURE-----
diff --git a/share/security/patches/SA-13:07/bind.patch b/share/security/patches/SA-13:07/bind.patch
new file mode 100644
index 0000000000..f9aa87ece4
--- /dev/null
+++ b/share/security/patches/SA-13:07/bind.patch
@@ -0,0 +1,13 @@
+Index: contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
+===================================================================
+--- contrib/bind9/lib/dns/rdata/generic/keydata_65533.c (revision 253461)
++++ contrib/bind9/lib/dns/rdata/generic/keydata_65533.c (working copy)
+@@ -176,7 +176,7 @@
+ UNUSED(options);
+
+ isc_buffer_activeregion(source, &sr);
+- if (sr.length < 4)
++ if (sr.length < 16)
+ return (ISC_R_UNEXPECTEDEND);
+
+ isc_buffer_forward(source, sr.length);
diff --git a/share/security/patches/SA-13:07/bind.patch.asc b/share/security/patches/SA-13:07/bind.patch.asc
new file mode 100644
index 0000000000..1a149567f0
--- /dev/null
+++ b/share/security/patches/SA-13:07/bind.patch.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlHzPqUACgkQFdaIBMps37IIPgCgioXGAf1PRyZ0mSeCktSzxFeY
+l+4An0YlRzZ8Xbt+CgxwIwyvGjLYpy9q
+=tbCD
+-----END PGP SIGNATURE-----
diff --git a/share/security/patches/SA-13:08/nfsserver.patch b/share/security/patches/SA-13:08/nfsserver.patch
new file mode 100644
index 0000000000..be91c0bdda
--- /dev/null
+++ b/share/security/patches/SA-13:08/nfsserver.patch
@@ -0,0 +1,13 @@
+Index: sys/kern/vfs_export.c
+===================================================================
+--- sys/kern/vfs_export.c (revision 253367)
++++ sys/kern/vfs_export.c (working copy)
+@@ -208,7 +208,7 @@
+ np->netc_anon = crget();
+ np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
+ crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
+- np->netc_anon->cr_groups);
++ argp->ex_anon.cr_groups);
+ np->netc_anon->cr_prison = &prison0;
+ prison_hold(np->netc_anon->cr_prison);
+ np->netc_numsecflavors = argp->ex_numsecflavors;
diff --git a/share/security/patches/SA-13:08/nfsserver.patch.asc b/share/security/patches/SA-13:08/nfsserver.patch.asc
new file mode 100644
index 0000000000..d33a26ea83
--- /dev/null
+++ b/share/security/patches/SA-13:08/nfsserver.patch.asc
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Index: sys/kern/vfs_export.c
+===================================================================
+- --- sys/kern/vfs_export.c (revision 253367)
++++ sys/kern/vfs_export.c (working copy)
+@@ -208,7 +208,7 @@
+ np->netc_anon = crget();
+ np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
+ crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
+- - np->netc_anon->cr_groups);
++ argp->ex_anon.cr_groups);
+ np->netc_anon->cr_prison = &prison0;
+ prison_hold(np->netc_anon->cr_prison);
+ np->netc_numsecflavors = argp->ex_numsecflavors;
+-----BEGIN PGP SIGNATURE-----
+
+iEYEARECAAYFAlHzPsQACgkQFdaIBMps37J36gCgglvXt5i1cg/+gvs4mHyJ+mrj
+tesAn1Qli/x2FjqbQ++FPs8qF2Sc7Rxs
+=kdhf
+-----END PGP SIGNATURE-----
diff --git a/share/xml/advisories.xml b/share/xml/advisories.xml
index 8671ac9e1a..303215d26e 100644
--- a/share/xml/advisories.xml
+++ b/share/xml/advisories.xml
@@ -7,6 +7,23 @@
<year>
<name>2013</name>
+ <month>
+ <name>7</name>
+
+ <day>
+ <name>26</name>
+
+ <advisory>
+ <name>FreeBSD-SA-13:07.bind</name>
+ </advisory>
+
+ <advisory>
+ <name>FreeBSD-SA-13:08.nfsserver</name>
+ </advisory>
+ </day>
+
+ </month>
+
<month>
<name>6</name>
From 5cffdd326ed5dc5dd169bf930692c7b240e479aa Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 27 Jul 2013 03:43:41 +0000
Subject: [PATCH 18/92] Fix order.
---
share/xml/advisories.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/xml/advisories.xml b/share/xml/advisories.xml
index 303215d26e..6ff2b8c55d 100644
--- a/share/xml/advisories.xml
+++ b/share/xml/advisories.xml
@@ -14,11 +14,11 @@
<name>26</name>
<advisory>
- <name>FreeBSD-SA-13:07.bind</name>
+ <name>FreeBSD-SA-13:08.nfsserver</name>
</advisory>
<advisory>
- <name>FreeBSD-SA-13:08.nfsserver</name>
+ <name>FreeBSD-SA-13:07.bind</name>
</advisory>
</day>
From b37698e14a9008919158ca72d277de05eaecf1e3 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 27 Jul 2013 08:14:32 +0000
Subject: [PATCH 19/92] - Merge the following from the English version:
r40684 -> r42226 head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
---
ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index ec602b3d22..e18be8deb5 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r40684
+ Original revision: r42226
$FreeBSD$
-->
@@ -446,7 +446,7 @@
<para>��ư��ǽ�ʥ��ꥹ�ƥ��å������������ˤϡ�
�ʲ��μ��ˤ������äƤ���������</para>
- <procedure>
+ <procedure id="bsdinstall-installation-media-memory-stick">
<step>
<title>���ꥹ�ƥ��å��Υ�����μ���</title>
From 840135a0fb4a6a37cf4eef9a2c97c8db0e35dfc0 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 27 Jul 2013 10:08:59 +0000
Subject: [PATCH 20/92] - Merge the following from the English version:
r42112 -> r42402 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
---
ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index d96c6bb4b9..4e9f8d16ca 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r42112
+ Original revision: r42402
$FreeBSD$
-->
@@ -1529,9 +1529,8 @@ Fetching 133 new ports or files... done.</screen>
<literal>head</literal>������� <ulink
url="&url.base;/releng/">�������˥���Υڡ���</ulink>
������Υ֥����Ǥ�
- <literal>stable/9</literal>���ޤ���
+ <literal>stable/9</literal><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> ��Ȥä�Ʊ��</secondary></indexterm>���ޤ���
<literal>releng/9.0</literal> �Ȥʤ�ޤ���
- <application>Subversion</application><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> ��Ȥä�Ʊ��</secondary></indexterm>
��Ȥäƥ١��������ƥ������å������Ȥ���ݤ�
URL �Υץ�ե��å����ϡ�<link
linkend="svn-mirrors">Subversion �ߥ顼������</link>
From b9bfc0d57b81bd014e60c8db70ad798477700a67 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 27 Jul 2013 10:25:49 +0000
Subject: [PATCH 21/92] - Merge the following from the English version:
r42402 -> r42409 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
---
.../books/handbook/cutting-edge/chapter.xml | 69 ++++++++++++++-----
1 file changed, 51 insertions(+), 18 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index 4e9f8d16ca..4b707da9ad 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r42402
+ Original revision: r42409
$FreeBSD$
-->
@@ -1353,24 +1353,37 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
- <para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> ��Ȥäơ�
+ <para><link
+ linkend="svn">svn</link><indexterm>
+ <primary>Subversion</primary>
+ </indexterm>
+ <indexterm>
+ <primary>-CURRENT</primary>
+ <secondary><application>Subversion</application>
+ ��Ȥä�Ʊ��</secondary>
+ </indexterm>
+ ��Ȥäơ�
��˾���볫ȯ�֥�����
�⤷���ϥ����֥���������å������Ȥ��Ƥ���������
������ˡ�ϡ���ȯ��� &os; ��ݥ��ȥ�ؤΥ������������Ƥ��ꡢ
�侩����Ƥ��ޤ���
<link linkend="svn-mirrors">Subversion �ߥ顼������</link>
�ΤҤȤĤ� <literal>head</literal> �֥�������
- -CURRENT<indexterm><primary>-CURRENT</primary><secondary><application>Subversion</application> ��Ȥä�Ʊ��</secondary></indexterm> �����ɤ�����å������Ȥ��Ƥ���������
+ -CURRENT �����ɤ�����å������Ȥ��Ƥ���������
��ݥ��ȥꥵ�����δ������顢
��˾���륵�֥ĥ�Τߤ�����å������Ȥ��뤳�Ȥ��侩����ޤ���</para>
</listitem>
<listitem>
- <para><application><link linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>CTM ��Ȥä�Ʊ��</secondary></indexterm>���Ѥ��롣
+ <para><application><link
+ linkend="ctm">CTM</link></application><indexterm>
+ <primary>-CURRENT</primary>
+ <secondary>CTM ��Ȥä�Ʊ��</secondary>
+ </indexterm>���Ѥ��롣
��³������ۤ��ä��ꡢemail �ǤΥ������������Ǥ��ʤ��褦�ʡ�
���ޤ��ɼ��Ǥʤ� TCP/IP ��³�ξ��ˤϡ�<application>CTM</application>
- �����Ѥ�����ɤ��Ǥ��礦����������<application><link
- linkend="svn">Subversion</link></application>
+ �����Ѥ�����ɤ��Ǥ��礦����������<application>
+ <link linkend="svn">Subversion</link></application>
�ۤɤˤϿ���ϤǤ��ޤ���
���Τ��ᡢ�����ͥåȤ���³���Ƥ��륷���ƥ�Ǥ���С�
<application><link
@@ -1389,7 +1402,10 @@ Fetching 133 new ports or files... done.</screen>
�����Τߤ�ѥ��뤷�褦�Ȥ���ȡ�
�ְܴۤ㤤�ʤ����꤬�����ޤ���</para>
- <para>&os.current; ��ѥ���<indexterm><primary>-CURRENT</primary><secondary>����ѥ���</secondary></indexterm>��������
+ <para>&os.current; ��ѥ���<indexterm>
+ <primary>-CURRENT</primary>
+ <secondary>����ѥ���</secondary>
+ </indexterm>��������
<filename>/usr/src/Makefile</filename>
�����տ����ɤ�Ǥ���������
���åץ��졼�ɤν����ΰ����Ȥ��ơ��ǽ��
@@ -1520,7 +1536,9 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
- <para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> ��Ȥäơ�
+ <para><link linkend="svn">svn</link><indexterm>
+ <primary>Subversion</primary>
+ </indexterm> ��Ȥäơ�
��˾���볫ȯ�֥�����
�⤷���ϥ����֥���������å��������Ƥ���������
������ˡ�ϡ���ȯ��� &os; ��ݥ��ȥ�ؤΥ������������Ƥ��ꡢ
@@ -1529,7 +1547,11 @@ Fetching 133 new ports or files... done.</screen>
<literal>head</literal>������� <ulink
url="&url.base;/releng/">�������˥���Υڡ���</ulink>
������Υ֥����Ǥ�
- <literal>stable/9</literal><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> ��Ȥä�Ʊ��</secondary></indexterm>���ޤ���
+ <literal>stable/9</literal><indexterm>
+ <primary>-STABLE</primary>
+ <secondary><application>Subversion</application>
+ ��Ȥä�Ʊ��</secondary>
+ </indexterm>���ޤ���
<literal>releng/9.0</literal> �Ȥʤ�ޤ���
��Ȥäƥ١��������ƥ������å������Ȥ���ݤ�
URL �Υץ�ե��å����ϡ�<link
@@ -1541,14 +1563,21 @@ Fetching 133 new ports or files... done.</screen>
<listitem>
<para>�����ͥåȤؤ���³�˹�®�ʲ��������ѤǤ��ʤ��ΤǤ���С�
- <application><link linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>CTM ��Ȥä�Ʊ������</secondary></indexterm>
+ <application><link
+ linkend="ctm">CTM</link></application><indexterm>
+ <primary>-STABLE</primary>
+ <secondary>CTM ��Ȥä�Ʊ������</secondary>
+ </indexterm>
��Ƥ���Ƥߤޤ��礦��</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
- <para>&os.stable;<indexterm><primary>-STABLE</primary><secondary>���ۡ�����ѥ���</secondary></indexterm> ��ѥ��뤹�����ˡ�
+ <para>&os.stable;<indexterm>
+ <primary>-STABLE</primary>
+ <secondary>���ۡ�����ѥ���</secondary>
+ </indexterm> ��ѥ��뤹�����ˡ�
<filename>/usr/src/Makefile</filename> ��褯�ɤ�Ǥ���������
���åץ��졼�ɤν����ΰ����Ȥ��ƺǽ��
<link linkend="makeworld">�����������ͥ�ȡ��뤷�ơ�
@@ -1887,7 +1916,8 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
- <para><command>make <maketarget>delete-old-libs</maketarget></command></para>
+ <para><command>make
+ <maketarget>delete-old-libs</maketarget></command></para>
<para>�Ȥ��ʤ��ʤä��饤�֥�꤬�������饤�֥��ȶ��礹�뤳�Ȥ��뤿�������ޤ���
�Ť��饤�֥������������ˤ��٤Ƥ� ports ��ƹ��ۤ���ɬ�פ�����ޤ���</para>
@@ -2692,8 +2722,8 @@ Script done, …</screen>
�ˤޤȤ���Ƥ��ޤ����ʲ��μ��ˤ�ꡢ
���åץ��졼�ɤβ����Ǥ����Υե���������Ǥ��ޤ���</para>
- <para><command>make
- <maketarget>installworld</maketarget></command>
+ <para>
+ <command>make <maketarget>installworld</maketarget></command>
�ȡ����θ�� <command>mergemaster</command> ��̵���˽���ä��顢
�ʲ�����ˡ�ǻȤ��ʤ��ʤä��ե������饤�֥����ǧ���Ƥ���������</para>
@@ -2750,9 +2780,10 @@ Script done, …</screen>
</warning>
<para>��ͭ�饤�֥�������å�����桼�ƥ���ƥ��Ȥ��ơ�
- Ports Collection �� <filename
- role="package">sysutils/libchk</filename> �� <filename
- role="package">sysutils/bsdadminscripts</filename>
+ Ports Collection ��
+ <filename role="package">sysutils/libchk</filename> ��
+ <filename
+ role="package">sysutils/bsdadminscripts</filename>
�����ѤǤ��ޤ���</para>
<para>�Ȥ��ʤ��ʤä���ͭ�饤�֥��ϡ�
@@ -2834,7 +2865,9 @@ Script done, …</screen>
<qandaentry>
<question>
- <para>signal 11<indexterm><primary>signal 11</primary></indexterm>
+ <para>signal 11<indexterm>
+ <primary>signal 11</primary>
+ </indexterm>
(�⤷����¾�Υ����ʥ��ֹ�) �Υ��顼����������Ф�
����ѥ��뤬���Ԥ��ޤ������������äƤ����Ǥ��礦��?</para>
</question>
From 5334bb133af4f16b082116d0f7dd7ade76548b5d Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 28 Jul 2013 13:31:42 +0000
Subject: [PATCH 22/92] r41837 -> r42373
MFde: Resync the project news
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/xml/news.xml | 128 ++++++++++++++++++++++++++++-
1 file changed, 127 insertions(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml
index cee060bc72..2ed9626d5a 100644
--- a/de_DE.ISO8859-1/share/xml/news.xml
+++ b/de_DE.ISO8859-1/share/xml/news.xml
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r41837
+ basiert auf: r42373
-->
<!-- Simple schema for FreeBSD Project news.
@@ -38,9 +38,135 @@
<year>
<name>2013</name>
+ <month>
+ <name>7</name>
+
+ <day>
+ <name>22</name>
+
+ <event>
+ <title>&os; 9.2-BETA1 verf�gbar</title>
+
+ <p>Die erste Betaversion aus dem &os;-9.2-Releasezyklus ist
+ <a href="&lists.stable;/2013-July/074377.html">verf�gbar</a>.
+ ISO-Images f�r die Architekturen amd64, i386 sowie ia64
+ 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>16</name>
+
+ <event>
+ <title>Statusreport April-Juni 2013</title>
+
+ <p>Der Statusreport f�r die Monate April bis Juni 2013 mit
+ 33 Eintr�gen ist <a
+ href="&enbase;/news/status/report-2013-04-2013-06.html">verf�gbar</a>.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>4</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:marino@FreeBSD.org">John Marino</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>3</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:loos@FreeBSD.org">Luiz Otavio O Souza</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>2</name>
+
+ <event>
+ <title>Bericht: BSDCan 2013 DevSummit</title>
+
+ <p>Ein Statusreport mit den Ergebnissen des BSDCan 2013
+ &os; Developer Summits mit 6 Eintr�gen ist <a
+ href="&enbase;/news/status/report-2013-05-devsummit.html">verf�gbar</a>.</p>
+ </event>
+ </day>
+ </month>
+
<month>
<name>6</name>
+ <day>
+ <name>25</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:feld@FreeBSD.org">Mark Felder</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>19</name>
+
+ <event>
+ <title>Happy Birthday &os;!</title>
+
+ <p>&os; ist seit heute <a
+ href="http://FreeBSD.org/news/1993/freebsd-coined.html">20 Jahre alt</a>.
+ Am 19. Juni 1993 k�ndigten Jordan Hubbard, Rod Grimes sowie
+ and David Greenman die Entwicklung eines auf BSD 4.3
+ basierenden Betriebssystems an.</p>
+
+ <p>&os; 1.0 basiert auf 386BSD 0.1 von Bill und Lynne Jolitz
+ und wurde im November 1993 ver�ffentlicht. Als Projektziel
+ wurde die Entwicklung eines schnellen, stabilen und
+ zuverl�ssigen Serverbetriebssystems f�r i386-Systeme
+ angegeben.</p>
+
+ <p>Seit damals hat sich &os; zur Basis von unz�hligen Produkten
+ weiterentwickelt und unterst�tzt nun auch 64-Bit-Architekturen,
+ eingebundene Ger�te sowie Desktopbenutzer.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>11</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:vg@FreeBSD.org">Veniamin Gvozdikov</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>7</name>
+
+ <event>
+ <title>&os; 8.4-RELEASE verf�gbar</title>
+
+ <p><a href="&enbase;/releases/8.4R/announce.html">&os;
+ 8.4-RELEASE</a> ist verf�gbar. Lesen Sie unbedingt
+ die <a
+ href="&enbase;/releases/8.4R/relnotes.html">Release Notes</a>
+ (<a
+ href="&enbase;/releases/8.4R/relnotes-detailed.html">ausf�hrliche
+ Version</a>) sowie die <a
+ href="&enbase;/releases/8.4R/errata.html">Release Errata</a>,
+ bevor Sie mit der Installation beginnen, um
+ sich �ber aktuelle Neuigkeiten und/oder eventuelle
+ Probleme im Umgang mit 8.4-RELEASE zu informieren.
+ Weitere Informationen zu verschiedenen FreeBSD-Versionen
+ finden Sie auf der Seite <a
+ href="&base;/releases/index.html">Release Information</a>.</p>
+ </event>
+ </day>
+
<day>
<name>4</name>
From 23bf1e5146d99e87d2ae9722e8171fb4f17fc9a9 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 28 Jul 2013 13:47:38 +0000
Subject: [PATCH 23/92] r41004 -> r42024
MFde: Resync the press section
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/xml/press.xml | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/share/xml/press.xml b/de_DE.ISO8859-1/share/xml/press.xml
index 19898ce5f5..dc2c8da0aa 100644
--- a/de_DE.ISO8859-1/share/xml/press.xml
+++ b/de_DE.ISO8859-1/share/xml/press.xml
@@ -7,7 +7,7 @@
"freefall:/c/www/bsddoc/press/".
$FreeBSD$
$FreeBSDde$
- basiert auf: r41004
+ basiert auf: r42024
-->
<press>
@@ -17,6 +17,23 @@
<year>
<name>2013</name>
+
+ <month>
+ <name>6</name>
+
+ <story>
+ <name>Fixing Network Attached Storage with commodity hardware
+ and BSD</name>
+ <url>http://boingboing.net/2013/06/23/fixing-network-attached-storag.html</url>
+ <site-name>Boing Boing</site-name>
+ <site-url>http://boingboing.net/</site-url>
+ <date>23. Juni 2013</date>
+ <author>Ben Laurie</author>
+ <p>Ben Laurie beschreibt, warum er ein propriet�res NAS durch ein
+ auf &os; basierendes NAS mit Standardhardware ersetzt hat.</p>
+ </story>
+ </month>
+
<month>
<name>2</name>
From 9bbcdc03dfca2195a7baefc01b465dbdd88f59ce Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 28 Jul 2013 14:03:33 +0000
Subject: [PATCH 24/92] r40515 -> r41873
MFde: Update the releases info page
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/htdocs/releases/index.xml | 29 +++++++++++++----------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/de_DE.ISO8859-1/htdocs/releases/index.xml b/de_DE.ISO8859-1/htdocs/releases/index.xml
index 9588eb6fdc..baa7e07ee4 100644
--- a/de_DE.ISO8859-1/htdocs/releases/index.xml
+++ b/de_DE.ISO8859-1/htdocs/releases/index.xml
@@ -2,7 +2,7 @@
<!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$">
-<!ENTITY reference "basiert auf: r40515">
+<!ENTITY reference "basiert auf: r41873">
<!ENTITY title "Release Information">
]>
@@ -59,7 +59,9 @@
<a href="&u.rel.errata;">Errata</a>
</em></p>
- <p><b>Release &rel2.current;</b> (Februar 2011) <!-- (&rel2.current.date;) -->
+ <h3>Produktion (alt)</h3>
+
+ <p><b>Release &rel2.current;</b> (Juni 2013) <!-- (&rel2.current.date;) -->
<em>
<a href="&u.rel2.announce;">Announcement</a> :
<a href="&u.rel2.notes;">Release Notes</a> :
@@ -69,17 +71,6 @@
<a href="&u.rel2.errata;">Errata</a>
</em></p>
- <h3>Produktion (alt)</h3>
-
- <p><b>Release &rel3.current;</b> (Februar 2011) <!-- (&rel3.current.date;) -->
- <em>
- <a href="&u.rel3.announce;">Announcement</a> :
- <a href="&u.rel3.notes;">Release Notes</a> :
- <a href="&u.rel3.hardware;">Hardware Notes</a> :
- <a href="&u.rel3.readme;">Readme</a> :
- <a href="&u.rel3.errata;">Errata</a>
- </em></p>
-
<a name="future"></a>
<h2>Zuk�nftige Versionen</h2>
@@ -127,6 +118,18 @@
</em>
</li>
+ <li><b>8.3</b> (April 2012)
+ <em>
+ <a href="&enbase;/releases/8.3R/announce.html">Announcement</a>:
+ <a href="&enbase;/releases/8.3R/relnotes.html">Release Notes</a>:
+ <a href="&enbase;/releases/8.3R/installation.html">Installation
+ Instructions</a>:
+ <a href="&enbase;/releases/8.3R/hardware.html">Hardware Notes</a>:
+ <a href="&enbase;/releases/8.3R/readme.html">Readme</a>:
+ <a href="&enbase;/releases/8.3R/errata.html">Errata</a>
+ </em>
+ </li>
+
<li><b>8.2</b> (Februar 2011)
<em>
<a href="&enbase;/releases/8.2R/announce.html">Announcement</a>:
From dc5c16b0aeb99f872df7b28a7a636d19203e6503 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 28 Jul 2013 16:50:21 +0000
Subject: [PATCH 25/92] - We have callouts until 30; use them
Reported by: jgh
---
share/xsl/freebsd-common.xsl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index 0b225087f3..ef0d63d537 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -27,4 +27,6 @@
<xsl:param name="generate.index" select="0"/>
<xsl:param name="graphic.default.extension">png</xsl:param>
+
+ <xsl:param name="callout.graphics.number.limit">30</xsl:param>
</xsl:stylesheet>
From 89dbbb3a4fc2b4eaaba455ed0ac71ea8c4960cff Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 28 Jul 2013 22:49:27 +0000
Subject: [PATCH 26/92] - Remove section about KDE3 variables. - Convert
USE_GMAKE and USE_IMAKE to USES=gmake and USES=imake
PR: docs/180912
Submitted by: jgh
Approved by: gjb (mentor)
---
.../books/porters-handbook/book.xml | 52 ++++---------------
.../books/porters-handbook/uses.xml | 16 ++++++
2 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 4f7be9cf9b..747a9a8537 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -559,7 +559,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
<para>The <maketarget>build</maketarget> target is run.
This is responsible for descending into the port's private
working directory (<makevar>WRKSRC</makevar>) and building
- it. If <makevar>USE_GMAKE</makevar> is set, GNU
+ it. If <makevar>USES= gmake</makevar> is set, GNU
<command>make</command> will be used, otherwise the system
<command>make</command> will be used.</para>
</step>
@@ -3683,7 +3683,7 @@ ALWAYS_KEEP_DISTFILES= yes
variables, which are processed by
<filename>ports/Mk/bsd.*.mk</filename> to augment initial
build dependencies. For example,
- <literal>USE_GMAKE=yes</literal> adds <filename
+ <literal>USES= gmake</literal> adds <filename
role="package">devel/gmake</filename> to
<makevar>BUILD_DEPENDS</makevar>. To prevent such
additional dependencies from polluting
@@ -5299,7 +5299,7 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep
<command>imake</command></title>
<para>If your port uses <application>GNU make</application>,
- set <literal>USE_GMAKE=yes</literal>.</para>
+ set <literal>USES= gmake</literal>.</para>
<table frame="none">
<title>Variables for Ports Related to
@@ -5315,7 +5315,7 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep
<tbody>
<row>
- <entry><makevar>USE_GMAKE</makevar></entry>
+ <entry><makevar>USES= gmake</makevar></entry>
<entry>The port requires <command>gmake</command> to
build.</entry>
</row>
@@ -5333,7 +5333,7 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep
<filename>Makefile</filename> files from
<filename>Imakefile</filename> files using
<application>imake</application>, then set
- <literal>USE_IMAKE=yes</literal>. This will cause the
+ <literal>USES= imake</literal>. This will cause the
configure stage to automatically do an <command>xmkmf
-a</command>. If the <option>-a</option> flag is a
problem for your port, set <literal>XMKMF=xmkmf</literal>.
@@ -6076,7 +6076,7 @@ USE_GL= glu</programlisting>
<tgroup cols="2">
<tbody>
<row>
- <entry><makevar>USE_IMAKE</makevar></entry>
+ <entry><makevar>USES= imake</makevar></entry>
<entry>The port uses <command>imake</command>.</entry>
</row>
@@ -6742,36 +6742,6 @@ do-configure:
<sect1 id="using-kde">
<title>Using KDE</title>
- <sect2 id="kde-variables">
- <title>Variable Definitions (KDE 3.x Only)</title>
-
- <table frame="none">
- <title>Variables for Ports That Use KDE 3.x</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><makevar>USE_KDELIBS_VER</makevar></entry>
- <entry>The port uses KDE libraries. It specifies the
- major version of KDE to use and implies
- <makevar>USE_QT_VER</makevar> of the appropriate
- version. The only possible value is
- <literal>3</literal>.</entry>
- </row>
-
- <row>
- <entry><makevar>USE_KDEBASE_VER</makevar></entry>
- <entry>The port uses KDE base. It specifies the major
- version of KDE to use and implies
- <makevar>USE_QT_VER</makevar> of the appropriate
- version. The only possible value is
- <literal>3</literal>.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </sect2>
-
<sect2 id="kde4-variables">
<title>KDE 4 Variable Definitions</title>
@@ -6935,8 +6905,8 @@ do-configure:
<para>KDE 4.x ports are installed into
<makevar>KDE4_PREFIX</makevar>, which is
- <filename>/usr/local/kde4</filename> currently, to avoid
- conflicts with KDE 3.x ports. This is achieved by
+ <filename>/usr/local/kde4</filename> currently.
+ This is achieved by
specifying the <literal>kdeprefix</literal> component, which
overrides the default <makevar>PREFIX</makevar>. The ports
however respect any <makevar>PREFIX</makevar> set via
@@ -7270,7 +7240,7 @@ USE_QT4= moc_build qmake_build rcc_build uic_build</programlisting>
default one will be set that simply runs Ant according to
<makevar>MAKE_ENV</makevar>, <makevar>MAKE_ARGS</makevar>
and <makevar>ALL_TARGET</makevar>. This is similar to the
- <makevar>USE_GMAKE</makevar> mechanism, which is documented
+ <makevar>USES= gmake</makevar> mechanism, which is documented
in <xref linkend="building"/>.</para>
</sect2>
@@ -16844,9 +16814,9 @@ PATCH_DIST_STRIP= -p1
[If it requires a "configure" script generated by GNU autoconf to be run]
GNU_CONFIGURE= yes
[If it requires GNU make, not /usr/bin/make, to build...]
-USE_GMAKE= yes
+USES= gmake
[If it is an X application and requires "xmkmf -a" to be run...]
-USE_IMAKE= yes
+USES= imake
[et cetera.]
[non-standard variables to be used in the rules below]
diff --git a/en_US.ISO8859-1/books/porters-handbook/uses.xml b/en_US.ISO8859-1/books/porters-handbook/uses.xml
index e6622aff4a..d80b34c450 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses.xml
@@ -96,6 +96,14 @@
dependency.</entry>
</row>
+<row>
+ <entry><literal>gmake</literal></entry>
+ <entry>(none)</entry>
+ <entry>Implies that the port uses <filename
+ role="package">devel/gmake</filename> as build-time
+ dependency.</entry>
+</row>
+
<row>
<entry><literal>iconv</literal></entry>
<entry>(none)</entry>
@@ -104,6 +112,14 @@
run-time dependency.</entry>
</row>
+<row>
+ <entry><literal>imake</literal></entry>
+ <entry>(none)</entry>
+ <entry>Implies that the port uses <filename
+ role="package">devel/imake</filename> as build-time
+ dependency.</entry>
+</row>
+
<row>
<entry><literal>ncurses</literal></entry>
<entry>(none), <literal>base</literal>,
From 6814a5134fa3155808b60be42115255a816561fc Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 29 Jul 2013 12:45:38 +0000
Subject: [PATCH 27/92] Fix URL to the SVN mirror list.
---
en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index 0b21d3f964..dd987da928 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -2551,7 +2551,7 @@ IMAGES= chapter1/fig1.png
url="&url.books.handbook;/svn.html#svn-intro"</sgmltag>SVN
introduction<sgmltag class="endtag">ulink</sgmltag>, then pick the nearest mirror from
the list of <sgmltag class="starttag">ulink
- url="&url.books.handbook;/subversion-mirrors.html"</sgmltag>Subversion
+ url="&url.books.handbook;/svn-mirrors.html"</sgmltag>Subversion
mirror sites<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
@@ -2560,7 +2560,7 @@ IMAGES= chapter1/fig1.png
url="&url.books.handbook;/svn.html#svn-intro">SVN
introduction</ulink>, then pick the nearest mirror from
the list of <ulink
- url="&url.books.handbook;/subversion-mirrors.html">Subversion
+ url="&url.books.handbook;/svn-mirrors.html">Subversion
mirror sites</ulink>.</para>
<para>Usage for article links:</para>
From 4442ccd29b22dfe2283f9aad37667a71aab12867 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 29 Jul 2013 14:11:16 +0000
Subject: [PATCH 28/92] Fix entities in example.
---
en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
index a7ff166cba..1a436f380b 100644
--- a/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
@@ -75,7 +75,7 @@
Consider this text:</para>
<blockquote>
- <para>To remove <filename>/tmp/foo</filename> use
+ <para>To remove <filename>/tmp/foo</filename>, use
&man.rm.1;.</para>
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>
@@ -108,9 +108,9 @@
<para>The previous example is actually represented in this
document like this:</para>
- <programlisting><sgmltag class="starttag">para</sgmltag>To remove <sgmltag class="starttag">filename</sgmltag>/tmp/foo<sgmltag class="endtag">filename</sgmltag> use &man.rm.1;.<sgmltag class="endtag">para</sgmltag>
+ <programlisting><sgmltag class="starttag">para</sgmltag>To remove <sgmltag class="starttag">filename</sgmltag>/tmp/foo<sgmltag class="endtag">filename</sgmltag>, use &man.rm.1;.<sgmltag class="endtag">para</sgmltag>
-<sgmltag class="starttag">screen</sgmltag>&prompt.user; <sgmltag class="starttag">userinput</sgmltag>rm /tmp/foo<sgmltag class="endtag">userinput</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
+<sgmltag class="starttag">screen</sgmltag>&prompt.user; <sgmltag class="starttag">userinput</sgmltag>rm /tmp/foo<sgmltag class="endtag">userinput</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
<para>The markup is clearly separate from the content.</para>
From 7730cea6e013bf30400a21f209cdc567fa102a81 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Jul 2013 14:31:15 +0000
Subject: [PATCH 29/92] Remove any reference to now non existing USE_IMAKE
Approved by: gavin
---
en_US.ISO8859-1/books/porters-handbook/book.xml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 747a9a8537..5bd5364749 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -136,7 +136,6 @@ COMMENT= Cat chasing a mouse all over the screen
MAN1= oneko.1
MANCOMPRESSED= yes
-USE_IMAKE= yes
.include <bsd.port.mk></programlisting>
@@ -547,11 +546,6 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
is run.</para>
</listitem>
- <listitem>
- <para>If <makevar>USE_IMAKE</makevar> is set,
- <makevar>XMKMF</makevar> (default: <command>xmkmf
- -a</command>) is run.</para>
- </listitem>
</orderedlist>
</step>
@@ -4160,13 +4154,6 @@ MASTERDIR= ${.CURDIR}/../xdvi300
<filename>bsd.port.mk</filename> does not have to do anything
special.</para>
- <para><makevar>MANCOMPRESSED</makevar> is automatically set to
- <literal>yes</literal> if <makevar>USE_IMAKE</makevar> is set
- and <makevar>NO_INSTALL_MANPAGES</makevar> is not set, and to
- <literal>no</literal> otherwise. You do not have to
- explicitly define it unless the default is not suitable for
- your port.</para>
-
<para>If your port anchors its man tree somewhere other than
<makevar>PREFIX</makevar>, you can use the
<makevar>MANPREFIX</makevar> to set it. Also, if only
@@ -16168,8 +16155,7 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
</informaltable>
<note>
- <para>If you have to define the variables
- <makevar>USE_IMAKE</makevar> or
+ <para>If you have to define the variable
<makevar>MASTERDIR</makevar>, do so before including
<filename>bsd.port.pre.mk</filename>.</para>
</note>
From c1d97ccd4deb6911ba7ed8cd7ad061f4e4ac960f Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Jul 2013 14:49:38 +0000
Subject: [PATCH 30/92] Do not document the individual X11 variable that have
been removed from the infrastructure
Approved by: gavin
---
.../books/porters-handbook/book.xml | 99 +------------------
1 file changed, 1 insertion(+), 98 deletions(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 5bd5364749..c63b9264a2 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -6077,107 +6077,10 @@ USE_GL= glu</programlisting>
</tgroup>
</table>
- <table frame="none">
- <title>Variables for Depending on Individual Parts of
- X11</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><makevar>X_IMAKE_PORT</makevar></entry>
- <entry>Port providing <command>imake</command> and
- several other utilities used to build X11.</entry>
- </row>
-
- <row>
- <entry><makevar>X_LIBRARIES_PORT</makevar></entry>
- <entry>Port providing X11 libraries.</entry>
- </row>
-
- <row>
- <entry><makevar>X_CLIENTS_PORT</makevar></entry>
- <entry>Port providing X clients.</entry>
- </row>
-
- <row>
- <entry><makevar>X_SERVER_PORT</makevar></entry>
- <entry>Port providing X server.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTSERVER_PORT</makevar></entry>
- <entry>Port providing font server.</entry>
- </row>
-
- <row>
- <entry><makevar>X_PRINTSERVER_PORT</makevar></entry>
- <entry>Port providing print server.</entry>
- </row>
-
- <row>
- <entry><makevar>X_VFBSERVER_PORT</makevar></entry>
- <entry>Port providing virtual framebuffer
- server.</entry>
- </row>
-
- <row>
- <entry><makevar>X_NESTSERVER_PORT</makevar></entry>
- <entry>Port providing a nested X server.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_ENCODINGS_PORT</makevar></entry>
- <entry>Port providing encodings for fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_MISC_PORT</makevar></entry>
- <entry>Port providing miscellaneous bitmap
- fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_100DPI_PORT</makevar></entry>
- <entry>Port providing 100dpi bitmap fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_75DPI_PORT</makevar></entry>
- <entry>Port providing 75dpi bitmap fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_CYRILLIC_PORT</makevar></entry>
- <entry>Port providing cyrillic bitmap fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_TTF_PORT</makevar></entry>
- <entry>Port providing &truetype; fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_FONTS_TYPE1_PORT</makevar></entry>
- <entry>Port providing Type1 fonts.</entry>
- </row>
-
- <row>
- <entry><makevar>X_MANUALS_PORT</makevar></entry>
- <entry>Port providing developer oriented manual
- pages</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
<example id="using-x11-vars">
<title>Using X11-Related Variables</title>
- <programlisting># Use some X11 libraries and depend on
-# font server as well as cyrillic fonts.
-RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
- ${LOCALBASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
-
+ <programlisting># Use some X11 libraries
USE_XORG= x11 xpm</programlisting>
</example>
</sect2>
From 799623b17f460f16664e56ce7481f86855387893 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Jul 2013 14:59:34 +0000
Subject: [PATCH 31/92] USE_MOTIF has been replace by USES=motif
Approved by: gavin
---
en_US.ISO8859-1/books/porters-handbook/book.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index c63b9264a2..8a761bd17d 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -6089,7 +6089,7 @@ USE_XORG= x11 xpm</programlisting>
<title>Ports That Require Motif</title>
<para>If your port requires a Motif library, define
- <makevar>USE_MOTIF</makevar> in the
+ <makevar>USES= motif</makevar> in the
<filename>Makefile</filename>. Default Motif implementation
is <filename
role="package">x11-toolkits/open-motif</filename>. Users
From b4a6c52a8fc250e2e6f26badfe8f032c874ad2f6 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Jul 2013 19:27:07 +0000
Subject: [PATCH 32/92] Remove reference to WITHOUT_NLS which is deprecated in
favor of the NLS option
Reviewed by: rene, gavin
Approved by: gavin
---
.../books/porters-handbook/book.xml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 8a761bd17d..62fd9049f7 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -4302,13 +4302,6 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
</thead>
<tbody>
- <row id="knobs-without-nls">
- <entry><makevar>WITHOUT_NLS</makevar></entry>
- <entry>If set, says that internationalization is not
- needed, which can save compile time. By default,
- internationalization is used.</entry>
- </row>
-
<row>
<entry><makevar>WITH_OPENSSL_BASE</makevar></entry>
<entry>Use the version of OpenSSL in the base
@@ -4322,15 +4315,6 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
role="package">security/openssl</filename>, even
if the base is up to date.</entry>
</row>
-
- <row>
- <entry><makevar>WITHOUT_X11</makevar></entry>
- <entry>Ports that can be built both with and
- without X support are normally
- built with X support. If this variable is
- defined, then the version that does not have X
- support will be built instead.</entry>
- </row>
</tbody>
</tgroup>
</table>
@@ -5790,8 +5774,7 @@ GNU_CONFIGURE= yes</programlisting>
through passing <option>--disable-nls</option> to
<command>configure</command>. In that case, your port
should use <literal>gettext</literal> conditionally,
- depending on the status of <link
- linkend="knobs-without-nls"><makevar>WITHOUT_NLS</makevar></link>.
+ depending on the status of the <makevar>NLS</makevar> option.
For ports of low to medium complexity, you can rely on the
following idiom:</para>
From 5e2e5fec127e5c47d74387c897402712437c8a4d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 29 Jul 2013 20:55:30 +0000
Subject: [PATCH 33/92] Update 9.2 to -BETA2. Enable links for powerpc64,
sparc64. Comment links for ia64, powerpc.
---
en_US.ISO8859-1/share/xml/release.l10n.ent | 8 ++++----
share/xml/release.ent | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/en_US.ISO8859-1/share/xml/release.l10n.ent b/en_US.ISO8859-1/share/xml/release.l10n.ent
index 8d0b6babca..eb3d532a16 100644
--- a/en_US.ISO8859-1/share/xml/release.l10n.ent
+++ b/en_US.ISO8859-1/share/xml/release.l10n.ent
@@ -109,12 +109,14 @@
<td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
+ <!--
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
+ -->
<!--
<tr>
<td></td>
@@ -123,28 +125,26 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
+ <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- <!--
+ -->
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
- <!--
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
</tbody>
</table>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index 78372ec9cc..5eabc59f75 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -32,7 +32,7 @@
<!ENTITY beta.testing "INCLUDE">
<!ENTITY % beta.testing "INCLUDE">
<!ENTITY betarel.current '9.2'>
-<!ENTITY betarel.vers 'BETA1'>
+<!ENTITY betarel.vers 'BETA2'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
From 9fc067c62b5f4ac26ab648cdded0269bccccacef Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 29 Jul 2013 21:34:24 +0000
Subject: [PATCH 34/92] Announce 9.2-BETA2. \o/
---
share/xml/news.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/share/xml/news.xml b/share/xml/news.xml
index bdf8c75075..0e46d92d04 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,22 @@
<month>
<name>7</name>
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>&os; 9.2-BETA2 Available</title>
+
+ <p>The second BETA build for the &os;-9.2 release cycle is
+ now available. ISO images for the amd64, i386, powerpc64
+ and sparc64 architectures are <a
+ href="&lists.stable;/2013-July/074440.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+
<day>
<name>22</name>
From ef2f2ac0d5387719603748b3802492307297ca75 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 29 Jul 2013 22:43:49 +0000
Subject: [PATCH 35/92] Update svn fingerprints.
Prompted by: wblock
---
en_US.ISO8859-1/books/handbook/mirrors/chapter.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 6b3fcf102f..e633d13ddd 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -736,7 +736,7 @@
<entry>USA, California</entry>
<entry>SHA1
- <literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
</row>
<row>
@@ -751,7 +751,7 @@
<entry>USA, New Jersey</entry>
<entry>SHA1
- <literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
</row>
<row>
From bc0ae271d4824a02a2e3dd5f97a07b8696c5fa07 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 29 Jul 2013 22:59:03 +0000
Subject: [PATCH 36/92] Update the fingerprint example to match the new
fingerprints.
---
en_US.ISO8859-1/books/handbook/mirrors/chapter.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index e633d13ddd..26603b64f3 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -785,11 +785,12 @@
<screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
- The certificate is not issued by a trusted authority. Use the
fingerprint to validate the certificate manually!
+ - The certificate hostname does not match.
Certificate information:
- Hostname: svnmir.ysv.FreeBSD.org
- - Valid: from Fri, 24 Aug 2012 22:04:04 GMT until Sat, 24 Aug 2013 22:04:04 GMT
- - Issuer: clusteradm, FreeBSD.org, CA, US
- - Fingerprint: 79:35:8f:ca:6d:34:d9:30:44:d1:00:af:33:4d:e6:11:44:4d:15:ec
+ - Valid: from Jul 29 22:01:21 2013 GMT until Dec 13 22:01:21 2040 GMT
+ - Issuer: clusteradm, FreeBSD.org, (null), CA, US (clusteradm@FreeBSD.org)
+ - Fingerprint: 1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61
(R)eject, accept (t)emporarily or accept (p)ermanently?</screen>
<para>Compare the fingerprint shown to those listed in the table
From 278a30c0a6fa4d0169989b910eb5899e69a75b37 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Tue, 30 Jul 2013 16:54:19 +0000
Subject: [PATCH 37/92] r42373 -> r42472
MFde: Resync the Project news
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/xml/news.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml
index 2ed9626d5a..8ecfd7f138 100644
--- a/de_DE.ISO8859-1/share/xml/news.xml
+++ b/de_DE.ISO8859-1/share/xml/news.xml
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r42373
+ basiert auf: r42472
-->
<!-- Simple schema for FreeBSD Project news.
@@ -41,6 +41,21 @@
<month>
<name>7</name>
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>&os; 9.2-BETA2 verf�gbar</title>
+
+ <p>Die zweite Betaversion aus dem &os;-9.2-Releasezyklus ist
+ <a href="&lists.stable;/2013-July/074440.html">verf�gbar</a>.
+ ISO-Images f�r die Architekturen amd64, i386, powerpc64
+ sowie sparc64 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>22</name>
From 9f2cd7721818a88a4ed7ee2e1c183a50b1033f8a Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Tue, 30 Jul 2013 17:29:55 +0000
Subject: [PATCH 38/92] MFde: Update release/ISO information
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/htdocs/where.xml | 13 ++++--
de_DE.ISO8859-1/share/xml/release.l10n.ent | 52 ++++++++++++++--------
2 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/de_DE.ISO8859-1/htdocs/where.xml b/de_DE.ISO8859-1/htdocs/where.xml
index 010f8b84c5..61a9a4d655 100644
--- a/de_DE.ISO8859-1/htdocs/where.xml
+++ b/de_DE.ISO8859-1/htdocs/where.xml
@@ -58,7 +58,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>Release<br/>Notes</td>
<td>Hardware<br/>Notes</td>
<td>Installation<br/>Notes</td>
@@ -139,14 +139,14 @@
<td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td>
<td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
</tr>
-
+ <!--
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
<td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
</tr>
- <!--
+
<tr>
<td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
<td colspan="2"></td>
@@ -200,6 +200,13 @@
enth�lt Informationen �ber
fr�here, aktuelle und k�nftige Releases.</p>
+ <a name="past"></a>
+ <h2>Alte (nicht mehr unterst�tzte) Versionen</h2>
+
+ <p>Alte (nicht mehr unterst�tzte Versionen k�nnen vom <a
+ href="http://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/">
+ FTP-Archiv</a> herunterladen werden.</p>
+
<a name="derived"></a>
<h2>Auf FreeBSD basierende Betriebssysteme</h2>
diff --git a/de_DE.ISO8859-1/share/xml/release.l10n.ent b/de_DE.ISO8859-1/share/xml/release.l10n.ent
index 5717ea8d06..822ca25068 100644
--- a/de_DE.ISO8859-1/share/xml/release.l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r41400
+ basiert auf: r42471
-->
<![%beta2.testing;[
<!ENTITY beta.plural 'en'>
@@ -102,35 +102,51 @@
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
- <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<!--
+ <tr>
+ <td></td>
+ <td>ia64</td>
+ <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ </tr>
+ -->
+ <!--
<tr>
<td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td>pc98</td>
+ <td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ </tr>
+ -->
+ <!--
+ <tr>
+ <td></td>
+ <td>powerpc</td>
+ <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ </tr>
+ -->
+ <tr>
+ <td></td>
+ <td>powerpc64</td>
+ <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td>sparc64</td>
+ <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
</tbody>
</table>
From 86f2249e40b0708baf0d776a56d51b9b8299df43 Mon Sep 17 00:00:00 2001
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 30 Jul 2013 19:00:39 +0000
Subject: [PATCH 39/92] Take maintainership.
Discussed with: taras
---
ru_RU.KOI8-R/books/porters-handbook/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index c9c08fd9e7..07f993d0af 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -11,7 +11,7 @@
# Build the FreeBSD Porter's Handbook.
#
-MAINTAINER=andy@FreeBSD.org.ua
+MAINTAINER=pluknet@FreeBSD.org
DOC?= book
From d5bb9ad34d45a9f064349c3c1d6f870ff650704a Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 31 Jul 2013 06:50:34 +0000
Subject: [PATCH 40/92] - Merge the following from the English version:
r42388 -> r42471 head/ja_JP.eucJP/share/xml/release.l10n.ent
---
ja_JP.eucJP/share/xml/release.l10n.ent | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ja_JP.eucJP/share/xml/release.l10n.ent b/ja_JP.eucJP/share/xml/release.l10n.ent
index 5d1d8b807a..1b6429e0ec 100644
--- a/ja_JP.eucJP/share/xml/release.l10n.ent
+++ b/ja_JP.eucJP/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
<!--
$FreeBSD$
- Original revision: r42388
+ Original revision: r42471
-->
<![%beta2.testing;[
@@ -107,12 +107,14 @@
<td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
+ <!--
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
+ -->
<!--
<tr>
<td></td>
@@ -121,28 +123,26 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
+ <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- <!--
+ -->
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
- <!--
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
</tbody>
</table>
From 79029dc5bd8c874ae2e2bcea2557b7acdfb48027 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 31 Jul 2013 06:59:55 +0000
Subject: [PATCH 41/92] - Merge the following from the English version:
r42373 -> r42472 head/ja_JP.eucJP/share/xml/news.xml
---
ja_JP.eucJP/share/xml/news.xml | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml
index d23f99533b..51dfec2731 100644
--- a/ja_JP.eucJP/share/xml/news.xml
+++ b/ja_JP.eucJP/share/xml/news.xml
@@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
- Original revision: r42373
+ Original revision: r42472
-->
<news>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -33,6 +33,22 @@
<month>
<name>7</name>
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>&os; 9.2-BETA2 ����</title>
+
+ <p>&os;-9.2 �����������뤫�� 2 ���ܤ� BETA �Ǥ���������ޤ�����
+ amd64, i386, powerpc64 ����� sparc64 �������ƥ������
+ ISO ���������<a
+ href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+ �ߥ顼������</a> �� <a
+ href="&lists.stable;/2013-July/07440.html">����</a>
+ ����Ƥ��ޤ���</p>
+ </event>
+ </day>
+
<day>
<name>22</name>
From 3a94614c2adf5ce35ceaab60fce9fcd9b89bc2eb Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 31 Jul 2013 22:22:55 +0000
Subject: [PATCH 42/92] Fix broken link.
---
ja_JP.eucJP/share/xml/news.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml
index 51dfec2731..eb2d5c6be7 100644
--- a/ja_JP.eucJP/share/xml/news.xml
+++ b/ja_JP.eucJP/share/xml/news.xml
@@ -44,7 +44,7 @@
ISO ���������<a
href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
�ߥ顼������</a> �� <a
- href="&lists.stable;/2013-July/07440.html">����</a>
+ href="&lists.stable;/2013-July/074440.html">����</a>
����Ƥ��ޤ���</p>
</event>
</day>
From d679d18fc6d0c7a676277604a31b9d220457aca0 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 1 Aug 2013 03:09:47 +0000
Subject: [PATCH 43/92] - Merge the following from the English version:
r42318 -> r42475 head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
---
ja_JP.eucJP/books/handbook/mirrors/chapter.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
index f278287723..0820346482 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r42318
+ Original revision: r42475
$FreeBSD$
-->
@@ -744,7 +744,7 @@
<entry>USA, ����ե���˥�</entry>
<entry>SHA1
- <literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
</row>
<row>
@@ -759,7 +759,7 @@
<entry>USA, �˥塼���㡼��</entry>
<entry>SHA1
- <literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
</row>
<row>
@@ -791,11 +791,12 @@
<screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
- The certificate is not issued by a trusted authority. Use the
fingerprint to validate the certificate manually!
+ - The certificate hostname does not match.
Certificate information:
- Hostname: svnmir.ysv.FreeBSD.org
- - Valid: from Fri, 24 Aug 2012 22:04:04 GMT until Sat, 24 Aug 2013 22:04:04 GMT
- - Issuer: clusteradm, FreeBSD.org, CA, US
- - Fingerprint: 79:35:8f:ca:6d:34:d9:30:44:d1:00:af:33:4d:e6:11:44:4d:15:ec
+ - Valid: from Jul 29 22:01:21 2013 GMT until Dec 13 22:01:21 2040 GMT
+ - Issuer: clusteradm, FreeBSD.org, (null), CA, US (clusteradm@FreeBSD.org)
+ - Fingerprint: 1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61
(R)eject, accept (t)emporarily or accept (p)ermanently?</screen>
<para>�ե����ץ��Ȥ���ɽ�ΰ����Τ�ΤȾȹ礷�Ƥ���������
From 5cb9712d62953c7b88aee79aabf3c8cff7dc2a76 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Thu, 1 Aug 2013 15:10:19 +0000
Subject: [PATCH 44/92] - Updating NFS doc to use services instead of specific
binaries. Also offered a couple of minor points of clarification in the text.
- Clean up some contractions and a double the.
PR: 180955
Submitted by: Ken Reed <kreed002@gmail.com>
Reviewed by: bjk, Allan Jude
---
.../handbook/network-servers/chapter.xml | 25 ++++++++-----------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index b938aca64e..e6a75c06b8 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -267,7 +267,7 @@
</sect2>
<sect2 id="network-inetd-conf">
- <!-- XXX This section isn't very clear, and could do with some lovin' -->
+ <!-- XXX This section is not very clear and could do with some tlc -->
<title><filename>inetd.conf</filename></title>
<para>Configuration of <application>inetd</application> is
@@ -819,20 +819,15 @@ mountd_flags="-r"</programlisting>
<para>Please refer to <xref linkend="configtuning-rcd"/> for
more information about using rc scripts.</para>
- <para>Alternatively, a reboot will make FreeBSD set everything
- up properly. A reboot is not necessary though.
- Executing the following commands as <username>root</username>
- should start everything up.</para>
+ <para>NFS services can now be started by running the following
+ command, on the <acronym>NFS</acronym> server, as
+ <username>root</username>:</para>
- <para>On the <acronym>NFS</acronym> server:</para>
-
- <screen>&prompt.root; <userinput>rpcbind</userinput>
-&prompt.root; <userinput>nfsd -u -t -n 4</userinput>
-&prompt.root; <userinput>mountd -r</userinput></screen>
+ <screen>&prompt.root; <userinput>service nfsd start</userinput></screen>
<para>On the <acronym>NFS</acronym> client:</para>
- <screen>&prompt.root; <userinput>nfsiod -n 4</userinput></screen>
+ <screen>&prompt.root; <userinput>service nfsclient restart</userinput></screen>
<para>Now everything should be ready to actually mount a remote
file system. In these examples the server's name will be
@@ -1609,7 +1604,7 @@ Exports list on foobar:
good reason, never propagate passwords for
<username>root</username> and other administrative
accounts to all the servers in the NIS domain. Therefore,
- before the the NIS maps are initialized, configure the
+ before the NIS maps are initialized, configure the
primary password files:</para>
<screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
@@ -1649,7 +1644,7 @@ Creating an YP server will require that you answer a few questions.
Questions will all be asked at the beginning of the procedure.
Do you want this procedure to quit on non-fatal errors? [y/n: n] <userinput>n</userinput>
Ok, please remember to go back and redo manually whatever fails.
-If you don't, something might not work.
+If not, something might not work.
At this point, we have to construct a list of this domains YP servers.
rod.darktech.org is already known as master server.
Please continue to add any slave servers, one per line. When you are
@@ -1711,7 +1706,7 @@ Questions will all be asked at the beginning of the procedure.
Do you want this procedure to quit on non-fatal errors? [y/n: n] <userinput>n</userinput>
Ok, please remember to go back and redo manually whatever fails.
-If you don't, something might not work.
+If not, something might not work.
There will be no further questions. The remainder of the procedure
should take a few minutes, to copy the databases from ellington.
Transferring netgroup...
@@ -1756,7 +1751,7 @@ Transferring hosts.byname...
ypxfr: Exiting: Map successfully transferred
coltrane has been setup as an YP slave server without any errors.
-Don't forget to update map ypservers on ellington.</screen>
+Remember to update map ypservers on ellington.</screen>
<para>There should be a directory called
<filename>/var/yp/test-domain</filename>. Copies of the
From a6c5ba22339ee622f1f626e8cd65c85c411fb049 Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Thu, 1 Aug 2013 19:10:44 +0000
Subject: [PATCH 45/92] Update the Japanese FreeBSD list.
Approved by: hrs
---
en_US.ISO8859-1/htdocs/community/mailinglists.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/community/mailinglists.xml b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
index 2d7b581ee6..899cfa7d48 100644
--- a/en_US.ISO8859-1/htdocs/community/mailinglists.xml
+++ b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
@@ -70,8 +70,8 @@
or <a href="http://liste.gufi.org/">WWW</a>.</li>
<li><strong>Japanese</strong> -- <a
- href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a>
- or <a href="http://www.jp.FreeBSD.org/ml.html">WWW</a>.</li>
+ href="mailto:freebsd-users-jp@FreeBSD.org">freebsd-users-jp@FreeBSD.org</a>
+ or <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-users-jp">WWW</a>.</li>
<li><strong>Korean</strong> -- <a
href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
From 36ee06cb7d765d71b2433fe4e7c267e4856e289d Mon Sep 17 00:00:00 2001
From: Taras Korenko <taras@FreeBSD.org>
Date: Thu, 1 Aug 2013 20:11:01 +0000
Subject: [PATCH 46/92] + add KyivBSD'13 conference to events2013.xml
---
share/xml/events2013.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/share/xml/events2013.xml b/share/xml/events2013.xml
index 68a0a15936..6d30321f7b 100644
--- a/share/xml/events2013.xml
+++ b/share/xml/events2013.xml
@@ -103,6 +103,31 @@
from commercial vendors.</description>
</event>
+ <event id="kyivbsd-2013">
+ <name>KyivBSD 2013</name>
+ <url>http://en.kyivbsd.org.ua/</url>
+ <startdate>
+ <year>2013</year>
+ <month>9</month>
+ <day>21</day>
+ </startdate>
+ <enddate>
+ <year>2013</year>
+ <month>9</month>
+ <day>21</day>
+ </enddate>
+ <location>
+ <country code="UA">Ukraine</country>
+ <city>Kyiv</city>
+ <site>Taras Shevchenko National University of Kyiv</site>
+ </location>
+ <description>We are glad to invite all to the fifth conference
+ placed in Kyiv! Kyiv is both historical landmark and urbanistic
+ city with many people interested in open source in general.
+ It is a good choice for local and foreign developers
+ to attend.</description>
+ </event>
+
<event id="eurobsdcon-2013">
<name>EuroBSDcon 2013</name>
<url>http://2013.eurobsdcon.org/</url>
From 989ef6ffafdffffc86b17ccc4691b7b6edc16aa0 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 2 Aug 2013 06:01:58 +0000
Subject: [PATCH 47/92] - Merge the following from the English version:
r39769 -> r42484 head/ja_JP.eucJP/htdocs/community/mailinglists.xml
---
ja_JP.eucJP/htdocs/community/mailinglists.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ja_JP.eucJP/htdocs/community/mailinglists.xml b/ja_JP.eucJP/htdocs/community/mailinglists.xml
index d17b2cf372..54c42d2acb 100644
--- a/ja_JP.eucJP/htdocs/community/mailinglists.xml
+++ b/ja_JP.eucJP/htdocs/community/mailinglists.xml
@@ -4,7 +4,7 @@
<!ENTITY title "���ꥹ��">
]>
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39769 -->
+<!-- Original revision: r42484 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -58,9 +58,9 @@
�ޤ��� <a href="http://www.FreeBSD-fr.org/">WWW</a></li>
<li><strong>�ϥ��</strong> -- <a
- href="mailto:bsd@hu.FreeBSD.org">bsd@hu.FreeBSD.org</a>��<a
- href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">���ɥߥ˥��ȥ졼�����</a>
- �ޤ��� <a href="http://lists.hu.FreeBSD.org/pipermail/bsd/">����</a></li>
+ href="mailto:bsd@lista.bsd.hu">bsd@lista.bsd.hu</a>, <a
+ href="http://lista.bsd.hu/">���ɥߥ˥��ȥ졼�����</a>
+ �ޤ��� <a href="http://datacast.hu/pipermail/bsd/">����</a></li>
<li><strong>����ɥͥ�����</strong> -- <a
href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
@@ -70,8 +70,8 @@
�ޤ��� <a href="http://liste.gufi.org/">WWW</a></li>
<li><strong>���ܸ�</strong> -- <a
- href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a>
- �ޤ��� <a href="http://www.jp.FreeBSD.org/ml.html">WWW</a></li>
+ href="mailto:freebsd-users-jp@FreeBSD.org">freebsd-users-jp@FreeBSD.org</a>
+ �ޤ��� <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-users-jp">WWW</a></li>
<li><strong>�ڹ��</strong> -- <a
href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
From 5f78ff8efe0f4b27a2d13f3cb9eba9ea465c02ab Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 2 Aug 2013 16:08:38 +0000
Subject: [PATCH 48/92] - Add a new section for Options Helpers from bapt@
Submitted by: bapt@
Reviewed by: Ken Reed <kreed002@gmail.com>
---
.../books/porters-handbook/book.xml | 241 ++++++++++++++++++
1 file changed, 241 insertions(+)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 62fd9049f7..417a8ef9ad 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -4629,6 +4629,247 @@ CONFIGURE_ARGS+= --disable-foo
.if ${VARIABLE:MVALUE}</programlisting>
</note>
</sect2>
+ <sect2>
+ <title>Options Helpers</title>
+
+ <para>There are some macros to help simplify conditional
+ values which differ based on the options set.</para>
+
+ <para>If <makevar>OPTIONS_SUB</makevar> is set to
+ <literal>yes</literal> then each of the options added
+ to <makevar>OPTIONS_DEFINE</makevar> will be added to
+ <makevar>PLIST_SUB</makevar>, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPTIONS_SUB= yes</programlisting>
+
+ <para> is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+PLIST_SUB+= OPT1=""
+.else
+PLIST_SUB+= OPT1="@comment "
+.endif</programlisting>
+
+ <para>If <makevar>X_CONFIGURE_ENABLE</makevar> is set then
+ <literal>--enable-${X_CONFIGURE_ENABLE}</literal>
+ or <literal>--disable-${X_CONFIGURE_ENABLE}</literal> will
+ be added to <makevar>CONFIGURE_ARGS</makevar> depending on
+ the value of the option<makevar>X</makevar>, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CONFIGURE_ENABLE= test</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+= --enable-test
+.else
+CONFIGURE_ARGS+= --disable-test
+.endif</programlisting>
+
+ <para>If <makevar>X_CONFIGURE_WITH</makevar> is set then
+ <literal>--with-${X_CONFIGURE_WITH}</literal>
+ or <literal>--without-${X_CONFIGURE_WITH}</literal> will
+ be added to <makevar>CONFIGURE_ARGS</makevar> depending
+ on the status of the option <makevar>X</makevar>,
+ for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CONFIGURE_WITH= test</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+= --with-test
+.else
+CONFIGURE_ARGS+= --without-test
+.endif</programlisting>
+
+ <para>If <makevar>X_CONFIGURE_ON</makevar> is set then its value
+ will be appended to <makevar>CONFIGURE_ARGS</makevar> depending
+ on the status of the option <makevar>X</makevar>, for example:
+ </para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CONFIGURE_ON= --add-test</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+= --add-test
+.endif</programlisting>
+
+ <para>If <makevar>X_CONFIGURE_OFF</makevar> is set then its value
+ will be appended to <makevar>CONFIGURE_ARGS</makevar> depending
+ on the status of the option <makevar>X</makevar>, for example:
+ </para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CONFIGURE_OFF= --no-test</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+.include <bsd.port.options.mk>
+.if ! ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+= --no-test
+.endif</programlisting>
+
+ <para>If <makevar>X_CMAKE_ON</makevar> is set then its value
+ will be appended to <makevar>CMAKE_ARGS</makevar> depending
+ on the status of the option <makevar>X</makevar>, for example:
+ </para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CMAKE_ON= -DTEST:BOOL=true</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+= -DTEST:BOOL=true
+.endif</programlisting>
+
+ <para>If <makevar>X_CMAKE_OFF</makevar> is set then its value
+ will be appended to <makevar>CMAKE_ARGS</makevar> depending
+ on the status of the option <makevar>X</makevar>, for example:
+ </para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_CMAKE_OFF= -DTEST:BOOL=false</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+= -DTEST:BOOL=false
+.endif</programlisting>
+
+ <para>For any of the following variables:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><makevar>CFLAGS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>CXXFLAGS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>LDLAGS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>CONFIGURE_ENV</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>MAKE_ENV</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>USES</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>DISTFILES</makevar></para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If <makevar>X_ABOVEVARIABLE</makevar> is defined then
+ its value will be appended to
+ <makevar>ABOVEVARIABLE</makevar> depending on the status of
+ the option <makevar>X</makevar>, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_USES= gmake
+OPT1_CFLAGS= -DTEST</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+USES+= gmake
+CFLAGS+= -DTEST
+.endif</programlisting>
+
+ <para>For any of the following dependency type:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><makevar>PKG_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>EXTRACT_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>PATCH_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>FETCH_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>BUILD_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>LIB_DEPENDS</makevar></para>
+ </listitem>
+
+ <listitem>
+ <para><makevar>RUN_DEPENDS</makevar></para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If <makevar>X_ABOVEVARIABLE</makevar> is defined then
+ its value will be appended to
+ <makevar>ABOVEVARIABLE</makevar> depending on the status
+ of the option <makevar>X</makevar>, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+LIB_DEPENDS+= liba.so:${PORTSDIR}/devel/a
+.endif</programlisting>
+ </sect2>
</sect1>
<sect1 id="makefile-wrkdir">
From 22227f0abb3fd747f6df25bb25e899782d947cc4 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 3 Aug 2013 13:33:20 +0000
Subject: [PATCH 49/92] Document __FreeBSD_versions 902001 and 902501 after
stable/9 branch to releng/9.2.
---
en_US.ISO8859-1/books/porters-handbook/book.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 417a8ef9ad..6b21bc464f 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -15860,6 +15860,22 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
(rev <svnref>249243</svnref>).</entry>
</row>
+ <row>
+ <entry>902001</entry>
+ <entry>August 3, 2013</entry>
+ <entry><literal>releng/9.2</literal> branched from
+ <literal>stable/9</literal>
+ (rev <svnref>253912</svnref>).</entry>
+ </row>
+
+ <row>
+ <entry>902501</entry>
+ <entry>August 2, 2013</entry>
+ <entry>9.2-STABLE after creation of
+ <literal>releng/9.2</literal> branch
+ (rev <svnref>253913</svnref>).</entry>
+ </row>
+
<row>
<entry>1000000</entry>
<entry>September 26, 2011</entry>
From 8df38f00ca57c7b4e97c69e8d88e7b75d7094517 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 3 Aug 2013 14:10:45 +0000
Subject: [PATCH 50/92] Clarity and punctuation improvements.
---
.../articles/committers-guide/article.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index f570dbf9d6..fcf74d2279 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -379,7 +379,7 @@
</itemizedlist>
<para>Subversion can be installed from the &os; Ports
- Collection, by issuing the following commands:</para>
+ Collection by issuing these commands:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/devel/subversion</userinput>
&prompt.root; <userinput>make clean install</userinput></screen>
@@ -590,7 +590,7 @@
<title>&os; Ports Tree Branches and Layout</title>
<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
- <emphasis>ports</emphasis> refers repository root of the
+ <emphasis>ports</emphasis> refers to the repository root of the
ports tree.</para>
<para>In general, most &os; port work will be done within
@@ -710,8 +710,8 @@
<para>It is possible to anonymously check out the &os;
repository with Subversion. This will give access to a
- read-only tree that can be updated, but not committed
- to. To do this, use the following command:</para>
+ read-only tree that can be updated, but not committed back
+ to the main repository. To do this, use the following command:</para>
<screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen>
@@ -801,8 +801,8 @@
<note>
<para>Most new source files should include a
- <literal>$&os;$</literal> string in the
- new file. On commit, <command>svn</command> will expand
+ <literal>$&os;$</literal> string near the start of the
+ file. On commit, <command>svn</command> will expand
the <literal>$&os;$</literal> string,
adding the file path, revision number, date and time of
commit, and the username of the committer. Files which
From cea87d64dec985566c9b3d0e0f36a92f06906a09 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 3 Aug 2013 16:26:05 +0000
Subject: [PATCH 51/92] Update schedule for 9.2-RELEASE.
releng/9.2 branch is created 2 days behind schedule.
9.2-RC1 builds began 1 day behind schedule.
Approved by: re (implicit)
---
en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml b/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
index 27d520d391..0791f9ae28 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
+++ b/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
@@ -93,7 +93,7 @@
<tr>
<td>&local.branch.releng; branch</td>
<td>1 August 2013</td>
- <td>-</td>
+ <td>3 August 2013</td>
<td>Subversion branch created; future release engineering
proceeds on this branch.</td>
</tr>
@@ -101,7 +101,7 @@
<tr>
<td>RC1 builds begin</td>
<td>2 August 2013</td>
- <td>-</td>
+ <td>3 August 2013</td>
<td>First release candidate.</td>
</tr>
From 92d1dbb3d55e4d71fccb4d74155f852200034849 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 5 Aug 2013 11:13:22 +0000
Subject: [PATCH 52/92] Update 9.2 to RC1. Enable links for ia64, powerpc.
---
en_US.ISO8859-1/share/xml/release.l10n.ent | 4 ----
share/xml/release.ent | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/en_US.ISO8859-1/share/xml/release.l10n.ent b/en_US.ISO8859-1/share/xml/release.l10n.ent
index eb3d532a16..d304b108c0 100644
--- a/en_US.ISO8859-1/share/xml/release.l10n.ent
+++ b/en_US.ISO8859-1/share/xml/release.l10n.ent
@@ -109,14 +109,12 @@
<td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- <!--
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<!--
<tr>
<td></td>
@@ -125,14 +123,12 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
- <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<tr>
<td></td>
<td>powerpc64</td>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index 5eabc59f75..f68f3e7762 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -32,7 +32,7 @@
<!ENTITY beta.testing "INCLUDE">
<!ENTITY % beta.testing "INCLUDE">
<!ENTITY betarel.current '9.2'>
-<!ENTITY betarel.vers 'BETA2'>
+<!ENTITY betarel.vers 'RC1'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
From 3cc81c01c2934368222c7193912da780baac65b6 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 5 Aug 2013 11:16:54 +0000
Subject: [PATCH 53/92] Announce FreeBSD 9.2-RC1.
---
share/xml/news.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 0e46d92d04..b12373ae06 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -30,6 +30,26 @@
<year>
<name>2013</name>
+ <month>
+ <name>8</name>
+
+ <day>
+ <name>5</name>
+
+ <event>
+ <title>&os; 9.2-RC1 Available</title>
+
+ <p>The first RC build for the &os;-9.2 release cycle is
+ now available. ISO images for the amd64, i386, ia64,
+ powerpc, powerpc64 and sparc64 architectures are <a
+ href="&lists.stable;/2013-August/074589.html">available</a>
+ on most of our <a
+ href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+ mirror sites</a>.</p>
+ </event>
+ </day>
+ </month>
+
<month>
<name>7</name>
From aaf9338695c96973e56e363d7a29950ebe7c9448 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 5 Aug 2013 15:41:48 +0000
Subject: [PATCH 54/92] - Document the donation of an Apple Cube from glarkin
to alfred
---
en_US.ISO8859-1/htdocs/donations/donors.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/en_US.ISO8859-1/htdocs/donations/donors.xml b/en_US.ISO8859-1/htdocs/donations/donors.xml
index 2a8845353f..5a0bd23780 100644
--- a/en_US.ISO8859-1/htdocs/donations/donors.xml
+++ b/en_US.ISO8859-1/htdocs/donations/donors.xml
@@ -2926,6 +2926,13 @@
<td> gavin </td>
<td> received </td>
</tr>
+
+ <tr>
+ <td> <tt>Greg Larkin</tt> </td>
+ <td> Mac G4 Cube 500Mhz PowerPC </td>
+ <td> alfred </td>
+ <td> received </td>
+ </tr>
</table>
</body>
From 54b4e474e263b8f726af2a4569566a231a7910a2 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 5 Aug 2013 19:16:03 +0000
Subject: [PATCH 55/92] Move programlistings outside of paragraphs. Remove a
space after a prompt as mentioned in PR docs/181075. Because this is inside
a screen element, it is really content, not whitespace.
PR: docs/181075 (partial)
Submitted by: Ken Reed <kreed002@gmail.com>
---
.../books/handbook/network-servers/chapter.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index e6a75c06b8..586c72962f 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1545,25 +1545,25 @@ Exports list on foobar:
<procedure>
<step>
- <para><programlisting>nisdomainname="test-domain"</programlisting>
+ <programlisting>nisdomainname="test-domain"</programlisting>
- This line will set the NIS domainname to
+ <para>This line will set the NIS domainname to
<literal>test-domain</literal>
upon network setup (e.g., after reboot).</para>
</step>
<step>
- <para><programlisting>nis_server_enable="YES"</programlisting>
+ <programlisting>nis_server_enable="YES"</programlisting>
- This will tell FreeBSD to start up the NIS server
+ <para>This will tell FreeBSD to start up the NIS server
processes when the networking is next brought
up.</para>
</step>
<step>
- <para><programlisting>nis_yppasswdd_enable="YES"</programlisting>
+ <programlisting>nis_yppasswdd_enable="YES"</programlisting>
- This will enable the <command>rpc.yppasswdd</command>
+ <para>This will enable the <command>rpc.yppasswdd</command>
daemon which, as mentioned above, will allow users to
change their NIS password from a client
machine.</para>
@@ -2914,7 +2914,7 @@ cn: Manager</programlisting>
<para>There will be a request for the password specified
earlier, and the output should look like this:</para>
- <screen>Enter LDAP Password:
+ <screen>Enter LDAP Password:
adding new entry "dc=example,dc=com"
adding new entry "cn=Manager,dc=example,dc=com"</screen>
From f7bf659ff14ac2f66a066eb63786994d03db6a56 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 5 Aug 2013 19:21:36 +0000
Subject: [PATCH 56/92] Whitespace-only fixes. Translators, please ignore.
PR: docs/181075 (partial)
Submitted by: Ken Reed <kreed002@gmail.com>
---
.../books/handbook/network-servers/chapter.xml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 586c72962f..b7a2f357eb 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -820,7 +820,7 @@ mountd_flags="-r"</programlisting>
more information about using rc scripts.</para>
<para>NFS services can now be started by running the following
- command, on the <acronym>NFS</acronym> server, as
+ command, on the <acronym>NFS</acronym> server, as
<username>root</username>:</para>
<screen>&prompt.root; <userinput>service nfsd start</userinput></screen>
@@ -1547,7 +1547,7 @@ Exports list on foobar:
<step>
<programlisting>nisdomainname="test-domain"</programlisting>
- <para>This line will set the NIS domainname to
+ <para>This line will set the NIS domainname to
<literal>test-domain</literal>
upon network setup (e.g., after reboot).</para>
</step>
@@ -1555,7 +1555,7 @@ Exports list on foobar:
<step>
<programlisting>nis_server_enable="YES"</programlisting>
- <para>This will tell FreeBSD to start up the NIS server
+ <para>This will tell FreeBSD to start up the NIS server
processes when the networking is next brought
up.</para>
</step>
@@ -1563,10 +1563,10 @@ Exports list on foobar:
<step>
<programlisting>nis_yppasswdd_enable="YES"</programlisting>
- <para>This will enable the <command>rpc.yppasswdd</command>
- daemon which, as mentioned above, will allow users to
- change their NIS password from a client
- machine.</para>
+ <para>This will enable the
+ <command>rpc.yppasswdd</command> daemon which, as
+ mentioned above, will allow users to change their NIS
+ password from a client machine.</para>
</step>
</procedure>
@@ -4383,7 +4383,8 @@ mail IN A 192.168.1.5</programlisting>
<sect2>
<title><acronym
- role="Domain Name Security Extensions">DNSSEC</acronym></title>
+ role="Domain Name Security
+ Extensions">DNSSEC</acronym></title>
<indexterm>
<primary>BIND</primary>
From 6ff755ca8df5c486d98092ff6e833b2f10a5d151 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 6 Aug 2013 00:09:21 +0000
Subject: [PATCH 57/92] - Merge the following from the English version:
r42471 -> r42493 head/ja_JP.eucJP/share/xml/release.l10n.ent
---
ja_JP.eucJP/share/xml/release.l10n.ent | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ja_JP.eucJP/share/xml/release.l10n.ent b/ja_JP.eucJP/share/xml/release.l10n.ent
index 1b6429e0ec..ef24d4a003 100644
--- a/ja_JP.eucJP/share/xml/release.l10n.ent
+++ b/ja_JP.eucJP/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
<!--
$FreeBSD$
- Original revision: r42471
+ Original revision: r42493
-->
<![%beta2.testing;[
@@ -107,14 +107,12 @@
<td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- <!--
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<!--
<tr>
<td></td>
@@ -123,14 +121,12 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
- <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<tr>
<td></td>
<td>powerpc64</td>
From dccb61d97f708ab906620ef1110e3721b0dd2c86 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 6 Aug 2013 00:22:45 +0000
Subject: [PATCH 58/92] - Merge the following from the English version:
r42472 -> r42494 head/ja_JP.eucJP/share/xml/news.xml
---
ja_JP.eucJP/share/xml/news.xml | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml
index eb2d5c6be7..da947d9fea 100644
--- a/ja_JP.eucJP/share/xml/news.xml
+++ b/ja_JP.eucJP/share/xml/news.xml
@@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
- Original revision: r42472
+ Original revision: r42494
-->
<news>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -30,6 +30,26 @@
<year>
<name>2013</name>
+ <month>
+ <name>8</name>
+
+ <day>
+ <name>5</name>
+
+ <event>
+ <title>&os; 9.2-RC1 ����</title>
+
+ <p>&os;-9.2 �����������뤫��ǽ�Υ������䤬��������ޤ�����
+ amd64, i386, ia64, powerpc, powerpc64 �����
+ sparc64 �������ƥ������ ISO ���������<a
+ href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+ �ߥ顼������</a> �� <a
+ href="&lists.stable;/2013-August/074589.html">����</a>
+ ����Ƥ��ޤ���</p>
+ </event>
+ </day>
+ </month>
+
<month>
<name>7</name>
From d67b41da7961a4916a4b64a6c24c703544c68bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Tue, 6 Aug 2013 12:49:24 +0000
Subject: [PATCH 59/92] s/gnn/trasz/ as secteam secretary.
Approved by: gjb
---
en_US.ISO8859-1/htdocs/administration.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index fec8808939..5e8f481041 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -308,7 +308,7 @@
Team Secretary does not handle Security Officer Team items.</p>
<ul>
- <li>&a.gnn.email;</li>
+ <li>&a.trasz.email;</li>
</ul>
<hr/>
From 5486bd825179f3705a630ca018a3fac5c0b976c6 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 6 Aug 2013 13:21:03 +0000
Subject: [PATCH 60/92] Give less open permissions in process accounting log
example, discussed in forum thread
http://forums.freebsd.org/showthread.php?t=41059. Remove filename and
username attributes from userinput sections, other small fixes.
Reviewed by: trhodes
---
.../books/handbook/security/chapter.xml | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index 3c47c57dbe..9aecee43a6 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
@@ -3681,11 +3681,10 @@ VII. References <co id="co-ref"/></programlisting>
<para>Before using process accounting, it must be enabled using
the following commands:</para>
- <screen>&prompt.root; <userinput>touch <filename>/var/account/acct</filename></userinput>
-
-&prompt.root; <userinput>accton <filename>/var/account/acct</filename></userinput>
-
-&prompt.root; <userinput>echo 'accounting_enable="YES"' >> <filename>/etc/rc.conf</filename></userinput></screen>
+ <screen>&prompt.root; <userinput>touch /var/account/acct</userinput>
+&prompt.root; <userinput>chmod 600 /var/account/acct</userinput>
+&prompt.root; <userinput>accton /var/account/acct</userinput>
+&prompt.root; <userinput>echo 'accounting_enable="YES"' >> /etc/rc.conf</userinput></screen>
<para>Once enabled, accounting will begin to track information
such as <acronym>CPU</acronym> statistics and executed
@@ -3703,10 +3702,9 @@ VII. References <co id="co-ref"/></programlisting>
<username>trhodes</username> on the <literal>ttyp1</literal>
terminal:</para>
- <screen>&prompt.root; <userinput>lastcomm ls
- <username>trhodes</username> ttyp1</userinput></screen>
+ <screen>&prompt.root; <userinput>lastcomm ls trhodes ttyp1</userinput></screen>
- <para>Many other useful options exist and are explained in the
+ <para>Many other useful options exist and are explained in
&man.lastcomm.1;, &man.acct.5;, and &man.sa.8;.</para>
</sect2>
</sect1>
@@ -3764,7 +3762,7 @@ options RCTL</programlisting>
<para>The entire system will need rebuilt. See
<xref linkend="kernelconfig"/>, which will provide instructions
- for the process. Once this is complete, the
+ for the process. Once this is complete,
<command>rctl</command> may be used to set rules for the
system.</para>
From a86eaea92a8ef42eb56f93e2d9bf56386f971a62 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 6 Aug 2013 13:59:33 +0000
Subject: [PATCH 61/92] Fix a missing space.
PR: docs/181086
Submitted by: Aldis Berjoza <graudeejs@yandex.ru>
---
en_US.ISO8859-1/books/handbook/l10n/chapter.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 544c8b7f91..6367641aa7 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -54,7 +54,7 @@
languages.</para>
</listitem>
<listitem>
- <para>How to use <application>Xorg</application>effectively
+ <para>How to use <application>Xorg</application> effectively
with different languages.</para>
</listitem>
<listitem>
From d009e19dbc5bba739e8c0d555c7709a514378cc9 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 6 Aug 2013 14:19:25 +0000
Subject: [PATCH 62/92] Whitespace-only fixes. Translators, please ignore.
---
.../books/handbook/l10n/chapter.xml | 52 ++++++++++---------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 6367641aa7..83b686a52c 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -41,22 +41,27 @@
applicable.</para>
<para>After reading this chapter, you will know:</para>
+
<itemizedlist>
<listitem>
<para>How different languages and locales are encoded on
modern operating systems.</para>
</listitem>
+
<listitem>
<para>How to set the locale for a login shell.</para>
</listitem>
+
<listitem>
<para>How to configure the console for non-English
languages.</para>
</listitem>
+
<listitem>
<para>How to use <application>Xorg</application> effectively
with different languages.</para>
</listitem>
+
<listitem>
<para>Where to find more information about writing
<acronym>i18n</acronym>-compliant applications.</para>
@@ -176,7 +181,6 @@
typing:</para>
<screen>&prompt.user; <userinput>locale -a</userinput></screen>
-
</sect2>
<sect2>
@@ -195,7 +199,7 @@
character support, or configure it correctly. To provide
application support for wide or multibyte characters, the
<ulink url="&url.base;/ports/index.html">&os; Ports
- Collection</ulink> contains programs for several languages.
+ Collection</ulink> contains programs for several languages.
Refer to the <acronym>i18n</acronym> documentation in the
respective &os; port.</para>
@@ -280,11 +284,11 @@
<para>This section describes the two methods for setting
locale. The first is recommended and assigns the
- environment variables in the <link
- linkend="login-class">login class</link>. The second
+ environment variables in the
+ <link linkend="login-class">login class</link>. The second
method adds the environment variable assignments to the
- system's shell <link linkend="startup-file">startup
- file</link>.</para>
+ system's shell
+ <link linkend="startup-file">startup file</link>.</para>
<sect4 id="login-class">
<title>Login Classes Method</title>
@@ -292,10 +296,10 @@
<para>This method allows environment variables needed for
locale name and MIME character sets to be assigned once
for every possible shell instead of adding specific shell
- assignments to each shell's startup file. <link
- linkend="usr-setup">User Level Setup</link> can be
- performed by each user while <link
- linkend="adm-setup">Administrator Level Setup</link>
+ assignments to each shell's startup file.
+ <link linkend="usr-setup">User Level Setup</link> can be
+ performed by each user while
+ <link linkend="adm-setup">Administrator Level Setup</link>
requires superuser privileges.</para>
<sect5 id="usr-setup">
@@ -465,7 +469,6 @@ me:\
<programlisting><envar>LANG=de_DE.ISO8859-1; export LANG</envar></programlisting>
<programlisting><envar>setenv LANG de_DE.ISO8859-1</envar></programlisting>
-
</sect4>
</sect3>
</sect2>
@@ -652,11 +655,11 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<indexterm><primary>Xorg True Type font
server</primary></indexterm>
- <para>After installing <filename
- role="package">x11-servers/xorg-server</filename>, install
- the language's &truetype; fonts. Setting the correct locale
- should allow users to view their selected language in
- graphical application menus.</para>
+ <para>After installing
+ <filename role="package">x11-servers/xorg-server</filename>,
+ install the language's &truetype; fonts. Setting the
+ correct locale should allow users to view their selected
+ language in graphical application menus.</para>
</sect3>
<sect3>
@@ -762,7 +765,6 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<programlisting>me:My Account:\
:charset=KOI8-R:\
:lang=ru_RU.KOI8-R:</programlisting>
-
</sect3>
<sect3>
@@ -779,7 +781,6 @@ font8x16="cp866b-8x16"
font8x14="cp866-8x14"
font8x8="cp866-8x8"
mousechar_start=3</programlisting>
-
</listitem>
<listitem>
@@ -827,8 +828,8 @@ mousechar_start=3</programlisting>
<orderedlist>
<listitem>
- <para>First, configure the <link
- linkend="setting-locale">non-X locale
+ <para>First, configure the
+ <link linkend="setting-locale">non-X locale
setup</link>.</para>
</listitem>
@@ -862,8 +863,8 @@ Option "XkbOptions" "grp:toggle"</programlisting>
<para>Make sure that <literal>XkbDisable</literal> is
commented out in that file.</para>
- <para>For <literal>grp:toggle</literal> use <keycap>Right
- Alt</keycap>, for
+ <para>For <literal>grp:toggle</literal> use
+ <keycap>Right Alt</keycap>, for
<literal>grp:ctrl_shift_toggle</literal> use <keycombo
action="simul"><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>.
For <literal>grp:caps_toggle</literal> use
@@ -880,7 +881,7 @@ Option "XkbOptions" "grp:toggle"</programlisting>
add the following line to
<filename>/etc/xorg.conf</filename>:</para>
- <programlisting>Option "XkbVariant" ",winkeys"</programlisting>
+ <programlisting>Option "XkbVariant" ",winkeys"</programlisting>
<note>
<para>The Russian XKB keyboard may not work with
@@ -888,6 +889,7 @@ Option "XkbOptions" "grp:toggle"</programlisting>
</note>
</listitem>
</orderedlist>
+
<note>
<para>Minimally localized applications should call a
<function>XtSetLanguageProc (NULL, NULL, NULL);</function>
@@ -968,8 +970,8 @@ Option "XkbOptions" "grp:toggle"</programlisting>
<para>Some &os; contributors have translated parts of the
&os; documentation to other languages. They are available
- through links on the <ulink
- url="&url.base;/index.html">main site</ulink> or in
+ through links on the
+ <ulink url="&url.base;/index.html">main site</ulink> or in
<filename class="directory">/usr/share/doc</filename>.</para>
</sect2>
</sect1>
From 8f5cabeba9b128de5c7927790cd259a31f314368 Mon Sep 17 00:00:00 2001
From: Taras Korenko <taras@FreeBSD.org>
Date: Tue, 6 Aug 2013 14:22:32 +0000
Subject: [PATCH 63/92] MFen: + articles/contributing/article.xml
r40773 --> r42442 + articles/cvs-freebsd/article.xml r39632 -->
r42226 + articles/hubs/article.xml r41155 --> r42226 +
handbook/bsdinstall/chapter.xml r40684 --> r42226 +
handbook/install/chapter.xml r41278 --> r41823
---
.../articles/contributing/article.xml | 10 ++---
ru_RU.KOI8-R/articles/cvs-freebsd/article.xml | 8 ++--
ru_RU.KOI8-R/articles/hubs/article.xml | 4 +-
.../books/handbook/bsdinstall/chapter.xml | 12 +++---
.../books/handbook/install/chapter.xml | 38 +++++++------------
5 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index e4c63abda3..f7fdeafbfd 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -7,7 +7,7 @@
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/contributing/article.xml,v 1.3 2006/03/28 16:40:29 gad Exp $
- Original revision: r40773
+ Original revision: r42442
-->
<article lang='ru'>
@@ -410,9 +410,8 @@
<orderedlist>
<listitem>
- <indexterm><primary>������������ ���������� BSD</primary></indexterm>
-
- <para>������������ ���������� BSD. ��� �������� �����
+ <para>������������ ���������� BSD<indexterm><primary>������������
+ ���������� BSD</primary></indexterm>. ��� �������� �����
���������������� ��-�� <quote>���������� ��������������
�������</quote> � ����� ����������������� ��� ������������
��������. ������ FreeBSD ��̣� �� ����, ����� ��������� ������
@@ -422,6 +421,7 @@
</listitem>
<listitem>
+ <para>
<indexterm>
<primary>GPL</primary>
<see>GNU General Public License</see>
@@ -429,7 +429,7 @@
<indexterm><primary>GNU General Public License</primary></indexterm>
- <para>GNU General Public License, ��� <quote>GPL</quote>. ���
+ GNU General Public License, ��� <quote>GPL</quote>. ���
������������ ���������� �� ����� ��������� � ��� ��-�� ��ߣ��
����������, ������� ����� ��������� ����, ��� ����������
������������ ��� � ������������ �����. ������, �������� ����������
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index 5667839049..12098a40de 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -7,7 +7,7 @@
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml,v 1.9 2006/02/05 17:43:22 marck Exp $
- Original revision: r39632
+ Original revision: r42226
-->
<article lang="ru">
@@ -63,9 +63,9 @@
<para>FreeBSD �������� ����� �� ��������, ������������
<application>CVS</application>. ����� ����� ����� ������� ����������
�������������, ������������ �� ����� ����. ��� ����������� ���������
- �������, ����������� ���������� ����������. ������� ��� ������� ����
- ������������ � ��������� � ������� �������� ����������� (Joseph
- Karthauser), � ����� ���������� �� ������������� � ������ ��������. � ����
+ �������, ����������� ���������� ����������. ������� &a.joe.email;
+ ����������� � ������ � ������� ��� �������
+ � ����� ���������� �� ������������� � ������ ��������. � ����
������ ������ ���� �� ������� ������������� ����� ��������.</para>
<para>����� ������� �������� ���������� �� ���� ������, �� ������ �������
diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml
index 996870ba5b..7354c78e81 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.xml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -7,7 +7,7 @@
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.xml,v 1.21 2007/05/15 18:39:34 gad Exp $
- Original revision: r41155
+ Original revision: r42226
-->
<article lang="ru">
@@ -356,7 +356,7 @@
������� <application>CVSup</application> �������� &a.jdp.email;.
<application>CVSup</application> �������� ���������� �� ���������,
�������� �� FreeBSD, ��������� �� ������� �� ����� Modula-3 � �������
- ���������������� ���������. ���� ������� ������ ��������� ������ M3,
+ ���������������� ���������. &a.jdp; ������ ��������� ������ M3,
����������� ��� ������ <application>CVSup</application>, �������
������� ����� ����������. ����������� ����� ��������� �����: <ulink
url="http://www.polstra.com/projects/freeware/ezm3/">Ezm3</ulink>.
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index f2a4079037..cfe00915a3 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -3,7 +3,7 @@
The FreeBSD Russian Documentation Project
$FreeBSD$
- Original revision: r40684
+ Original revision: r42226
-->
<chapter id="bsdinstall">
<chapterinfo>
@@ -444,7 +444,7 @@
<para>��� �������� ������������ ����-���������� ��������� ���������
����:</para>
- <procedure>
+ <procedure id="bsdinstall-installation-media-memory-stick">
<step>
<title>��������� ������ ��� ����-����������</title>
@@ -972,13 +972,13 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�������� � <application>bsdinstall</application></title>
<para><application>bsdinstall</application> ��� ��������� ��������� ���
- ��������� &os;, ��������� &a.nwhitehorn.email; � �������������� � 2011 ����
- ��� &os; 9.0.</para>
+ ��������� &os;, ��������� &a.nwhitehorn.email; � ��������������
+ � 2011 ���� ��� &os; 9.0.</para>
<note>
<para>� ��������� � <ulink url="http://pcbsd.org">PC-BSD</ulink>
- ���� ��������� <application>pc-sysinstall</application> �� &a.kmoore.email;,
- ������� ����� ����� �������������� ��� <ulink
+ ���� ��������� <application>pc-sysinstall</application> ��
+ &a.kmoore.email;, ������� ����� ����� �������������� ��� <ulink
url="http://wiki.pcbsd.org/index.php/Use_PC-BSD_Installer_to_Install_FreeBSD">
��������� &os;</ulink>. �������� �� ��, ��� ��� ��������� ������ �
<application>bsdinstall</application>, ��� ��� ����� ����� �����
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index c408bf8250..af51f5ab70 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -5,7 +5,7 @@
$FreeBSD$
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/install/chapter.xml,v 1.46 2007/07/13 13:13:07 den Exp $
- Original revision: r41278
+ Original revision: r41823
-->
<chapter id="install">
@@ -378,14 +378,9 @@
������������� ������� ���������� ��������������� ��,
����������� ��� ������ ��������� ������������.</para>
- <para>�� ������ ������������ ������������ ���������,
- ����� ��� <application>&partitionmagic;</application>,
- ��� �������� ����������������, ����� ���
- <application>GParted</application>, ���
- ��������� ������� �������� � ������������ ����� ���
- &os;.
- ��� <application>&partitionmagic;</application>, ��� �
- <application>GParted</application> �������� �������� �
+ <para>��� ��������� ������� �������� � ������������ ����� ��� &os; ��
+ ������ ������������ ��������� <application>GParted</application>.
+ <application>GParted</application> �������� �������� � ���������
<acronym>NTFS</acronym>. ������� <application>GParted</application>
�������� �� ��������� Live CD ������������� Linux, ��������: <ulink
url="http://www.sysresccd.org/">SystemRescueCD</ulink>.</para>
@@ -438,9 +433,8 @@
</listitem>
<listitem>
- <para>������������ ���� �� ������, ����� ���
- <application>&partitionmagic;</application>, ���������
- ����, ��� ������ ������� &windows;.</para>
+ <para>������������ ��� ������ ������� &windows; ���� ��
+ ������������� ������.</para>
</listitem>
</orderedlist>
</example>
@@ -1372,9 +1366,9 @@ Mounting root from ufs:/dev/md0c
<sect2 id="install-drive-bios-numbering">
<title>��������� ������ � BIOS</title>
- <para>����� ���������� � ���������� &os;
- ����� ������������ ��� � ���, �������� ����
- ������� ������ ���������.</para>
+ <para>����� ���������� � ���������� ������������ ������� ����������
+ �����, ��� &os; �������� ��������������� �������� BIOS ����������
+ � ������ � �� ����������.</para>
<indexterm><primary>MS-DOS</primary></indexterm>
@@ -1384,13 +1378,10 @@ Mounting root from ufs:/dev/md0c
��������, ����� ��� &ms-dos; ��� µsoft.windows;, BIOS
����� �������� �� �������� ������� ��������� ������. ���
��������� ������������ ����������� �� ������ � ���
- ����������� <quote>primary master</quote> �����. ��� ��������
- ������ ��� ��� �������������, ��� ���������, ��� ���������� � �����
- ������� ���� ������ ��������� ����� ������� — ������ ������
- ���������� ������� ������� ���� � ��������� ������ ����� �������
- ����� �� ������, ���������
- <application><trademark class="registered">Ghost</trademark></application>
- ��� <application>XCOPY</application>. �����, ���� ������ ���� ������ ��
+ ����������� "primary master" �����. ��� ��������
+ ������ ��� ��� �������������, ������� �������� ������
+ ���������� ������� ������� ���� � ��������� ������ ����� �������
+ ����� �� ������. �����, ���� ������ ���� ������ ��
�����, ����� ������� ������� ��� ��������� ��-�� ����
������������ �������, �� ����� ���� ����� ������������
����� ���������� ������������ ������ � BIOS. ��� ��� �����
@@ -1634,8 +1625,7 @@ Mounting root from ufs:/dev/md0c
��� ����� ���� ���������� ����������� ���� ��������������
������������ ��� ������ ����� �������� �����.</para>
- <para>���� �� ��� ���������� ����� ��� &os; (��������, ���������
- ������� ����� <application>&partitionmagic;</application>),
+ <para>���� �� ��� ���������� ����� ��� &os;, ��
������ ������ <keycap>C</keycap> ��� �������� ������ ������.
����� ����� ���������� ������ ������ ������, ������� ��
������ �������.</para>
From e560d43f9e7ebc618d60d00d80d6f2cd7753dcb8 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 6 Aug 2013 14:27:45 +0000
Subject: [PATCH 64/92] Fix URL to the Greek localization report, successfully
resist making an "it's all Greek to me" joke.
---
en_US.ISO8859-1/books/handbook/l10n/chapter.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 83b686a52c..9a137b63b1 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -943,8 +943,7 @@ Option "XkbOptions" "grp:toggle"</programlisting>
<para>Nikos Kokkalis <email>nickkokkalis@gmail.com</email> has
written a complete article on Greek support in &os;. It is
available <ulink
- url="&url.doc.base;/el_GR.ISO8859-7/articles/greek-language-
- support/ index.html">here</ulink>, in Greek only, as part of
+ url="&url.doc.base;/el_GR.ISO8859-7/articles/greek-language-support/index.html">here</ulink>, in Greek only, as part of
the official &os; Greek documentation.</para>
</sect2>
From 31db86fbb344c8c3cd98ab5f71c948731218497f Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 6 Aug 2013 14:42:32 +0000
Subject: [PATCH 65/92] Whitespace-only fixes. Translators, please ignore.
---
en_US.ISO8859-1/books/handbook/l10n/chapter.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 9a137b63b1..51c669150b 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -943,8 +943,9 @@ Option "XkbOptions" "grp:toggle"</programlisting>
<para>Nikos Kokkalis <email>nickkokkalis@gmail.com</email> has
written a complete article on Greek support in &os;. It is
available <ulink
- url="&url.doc.base;/el_GR.ISO8859-7/articles/greek-language-support/index.html">here</ulink>, in Greek only, as part of
- the official &os; Greek documentation.</para>
+ url="&url.doc.base;/el_GR.ISO8859-7/articles/greek-language-support/index.html">here</ulink>,
+ in Greek only, as part of the official &os; Greek
+ documentation.</para>
</sect2>
<sect2>
From 71b441ac7b95ba4fb78aa45199fae2af1470aa36 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 16:45:01 +0000
Subject: [PATCH 66/92] Add entry for the FreeBSD Foundation 2013 semi-annual
newsletter.
---
share/xml/news.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/share/xml/news.xml b/share/xml/news.xml
index b12373ae06..a7a482beff 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -33,6 +33,28 @@
<month>
<name>8</name>
+ <day>
+ <name>6</name>
+
+ <event>
+ <title>The &os; Foundation Semi-Annual Newsletter is
+ Now Available</title>
+
+ <p>We are pleased to announce the publication of our 2013
+ Semi-Annual Newsletter! This is a chance for you to read
+ about what we are doing to help make &os; the best
+ operating system available.</p>
+
+ <p>Read about funded development projects to improve &os;,
+ sponsored conferences, developer and vendor summits to
+ create face-to-face opportunities, research, how we are
+ doing on our fundraising efforts, and so much more!</p>
+
+ <p>The 2013 semi-annual newsletter is available online <a
+ href="http://www.freebsdfoundation.org/press/2013Jul-newsletter">here</a>.</p>
+ </event>
+ </day>
+
<day>
<name>5</name>
From f97ada6edce6f1c2e26b3c7b1122741786e594d5 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 21:01:31 +0000
Subject: [PATCH 67/92] Attempt to update the reference machine list.
Prodded by: rakuco
Confirmed by: peter (via laughter)
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 30 +++++++-------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 6b78dc8df9..878faa2b4b 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -39,11 +39,10 @@ this file</a>.</p>
<tbody>
<tr>
-<td>builder</td>
-<td>8-STABLE</td>
-<td>i386</td>
-<td>BSD/OS source holder,<br/>
- Build box for the FreeBSD documentation for the FTP site.</td>
+<td>eris</td>
+<td>10-CURRENT</td>
+<td>ia64</td>
+<td>Reference machine.</td>
</tr>
<tr>
@@ -55,29 +54,22 @@ this file</a>.</p>
<tr>
<td>freefall</td>
-<td>8-STABLE</td>
+<td>10-CURRENT</td>
<td>i386</td>
<td>GNATS/shell Logins.</td>
</tr>
<tr>
-<td>pluto1</td>
-<td>8-STABLE</td>
-<td>ia64</td>
-<td>Reference machine; ia64 package building.</td>
+<td>nova</td>
+<td>9-STABLE</td>
+<td>sparc64</td>
+<td>Reference machine.</td>
</tr>
<tr>
-<td>pluto2</td>
-<td>9-CURRENT</td>
+<td>pluto</td>
+<td>9-STABLE</td>
<td>ia64</td>
-<td>Reference machine; ia64 package building.</td>
-</tr>
-
-<tr>
-<td>ref7-amd64</td>
-<td>7-STABLE</td>
-<td>amd64</td>
<td>Reference machine.</td>
</tr>
From 28b3e5f4c48255e54cbbde9452cf9a33785c7ebe Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 22:43:48 +0000
Subject: [PATCH 68/92] Remove the 'OS' column from the Administrative
FreeBSD.org hosts list. It is far too easy for this to become outdated, and
these machines do not have general access anyway.
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 878faa2b4b..5d7cc71203 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -113,7 +113,6 @@ this file</a>.</p>
<thead>
<tr>
<th align="left">Host</th>
-<th align="left">OS</th>
<th align="left">Purpose</th>
</tr>
</thead>
@@ -122,80 +121,67 @@ this file</a>.</p>
<tr>
<td>ftp-master</td>
-<td>8-STABLE</td>
<td>FTP Master (stage server).</td>
</tr>
<tr>
<td>hub</td>
-<td>7-STABLE</td>
<td>Mailing Lists and Mail services.</td>
</tr>
<tr>
<td>ipv6gw</td>
-<td>8-STABLE</td>
<td>IPv6 tunnel router (peer is at ISC).</td>
</tr>
<tr>
<td>mx1</td>
-<td>7-STABLE</td>
<td>Inbound Mail services.</td>
</tr>
<tr>
<td>mx2</td>
-<td>7-STABLE</td>
<td>Outbound Mail services.</td>
</tr>
<tr>
<td>ns0</td>
-<td>6-STABLE</td>
<td>A FreeBSD.org authoritative DNS Server.</td>
</tr>
<tr>
<td>ns1, ns2</td>
-<td>8-STABLE</td>
<td>FreeBSD.org recursive DNS Server.</td>
</tr>
<tr>
<td>repoman</td>
-<td>7-STABLE</td>
<td>CVS Master repository.</td>
</tr>
<tr>
<td>skunkworks</td>
-<td>7-STABLE</td>
<td>Perforce server.</td>
</tr>
<tr>
<td>sky</td>
-<td>8-STABLE</td>
<td>Various web services, such as wiki, reverse HTTP proxy etc.</td>
</tr>
<tr>
<td>spit (cvsup-master)</td>
-<td>6-STABLE</td>
<td>CVSup master mirror.</td>
</tr>
<tr>
<td>svn</td>
-<td>7-STABLE</td>
<td>Subversion master repository.</td>
</tr>
<tr>
<td>www</td>
-<td>7-STABLE</td>
<td>The www.FreeBSD.org Webserver.</td>
</tr>
From 9c2499ee900b17d76d3800834b8c28dfbfa4795e Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 22:44:45 +0000
Subject: [PATCH 69/92] Remove builder and spit. Both have been gone for some
time now.
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 5d7cc71203..9e2ab3a475 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -244,12 +244,6 @@ this file</a>.</p>
<tbody>
-<tr valign="top">
-<td>builder</td>
-<td></td>
-<td></td>
-</tr>
-
<tr valign="top">
<td>flame</td>
<td>Sun SPARC</td>
@@ -360,12 +354,6 @@ Broadcom BCM5704C Gigabit NIC.</td>
<td>2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.</td>
</tr>
-<tr valign="top">
-<td>spit</td>
-<td> </td>
-<td> </td>
-</tr>
-
<tr valign="top">
<td>www</td>
<td>Intel x86</td>
From f2e051b8601b8ff209509fbabf6cd894b33fa7b8 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 22:45:57 +0000
Subject: [PATCH 70/92] s/pluto{1,2}/pluto/
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 9e2ab3a475..14c36b5cfe 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -318,7 +318,7 @@ SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
</tr>
<tr valign="top">
-<td>pluto1, pluto2</td>
+<td>pluto</td>
<td>IA-64 MP</td>
<td>2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset,
2GB Memory, LSILogic 1030 U320 SCSI controller (mpt),
From 531fd8cb794fe8ce4c54858094c13176c74912db Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 6 Aug 2013 22:49:51 +0000
Subject: [PATCH 71/92] Remove 'spit' reference that was missed.
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 14c36b5cfe..23fdb83705 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -169,12 +169,6 @@ this file</a>.</p>
<td>Various web services, such as wiki, reverse HTTP proxy etc.</td>
</tr>
-<tr>
-<td>spit (cvsup-master)</td>
-<td>CVSup master mirror.</td>
-</tr>
-
-
<tr>
<td>svn</td>
<td>Subversion master repository.</td>
From ed31f99fe39f2a8b067396e51fdb9c113a14be95 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 7 Aug 2013 00:36:45 +0000
Subject: [PATCH 72/92] - Merge the following from the English version:
r38587 -> r42512 head/ja_JP.eucJP/htdocs/internal/machines.xml
---
ja_JP.eucJP/htdocs/internal/machines.xml | 66 +++++-------------------
1 file changed, 13 insertions(+), 53 deletions(-)
diff --git a/ja_JP.eucJP/htdocs/internal/machines.xml b/ja_JP.eucJP/htdocs/internal/machines.xml
index 78d1dfd2f5..cf65483687 100644
--- a/ja_JP.eucJP/htdocs/internal/machines.xml
+++ b/ja_JP.eucJP/htdocs/internal/machines.xml
@@ -4,7 +4,7 @@
<!ENTITY title "FreeBSD.org �ͥåȥ��">
]>
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.101 -->
+<!-- Original revision: r42512 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -39,11 +39,10 @@
<tbody>
<tr>
-<td>builder</td>
-<td>8-STABLE</td>
-<td>i386</td>
-<td>BSD/OS �������ۥ��<br/>
-FTP �������Ѥ� FreeBSD �ɥ�����ơ������ӥ�ɥޥ���</td>
+<td>eris</td>
+<td>10-CURRENT</td>
+<td>ia64</td>
+<td>��ե���ޥ���</td>
</tr>
<tr>
@@ -55,29 +54,22 @@ FTP
<tr>
<td>freefall</td>
-<td>8-STABLE</td>
+<td>10-CURRENT</td>
<td>i386</td>
<td>GNATS/shell ��������</td>
</tr>
<tr>
-<td>pluto1</td>
-<td>8-STABLE</td>
-<td>ia64</td>
-<td>��ե���ޥ���; ia64 package �ӥ��</td>
+<td>nova</td>
+<td>9-STABLE</td>
+<td>sparc64</td>
+<td>��ե���ޥ���</td>
</tr>
<tr>
-<td>pluto2</td>
-<td>9-CURRENT</td>
+<td>pluto</td>
+<td>9-STABLE</td>
<td>ia64</td>
-<td>��ե���ޥ���; ia64 package �ӥ��</td>
-</tr>
-
-<tr>
-<td>ref7-amd64</td>
-<td>7-STABLE</td>
-<td>amd64</td>
<td>��ե���ޥ���</td>
</tr>
@@ -121,7 +113,6 @@ FTP
<thead>
<tr>
<th align="left">�ۥ���</th>
-<th align="left">OS</th>
<th align="left">��Ū</th>
</tr>
</thead>
@@ -130,80 +121,61 @@ FTP
<tr>
<td>ftp-master</td>
-<td>8-STABLE</td>
<td>FTP �ޥ��� (���ơ���������)</td>
</tr>
<tr>
<td>hub</td>
-<td>7-STABLE</td>
<td>���ꥹ�Ȥ���ӥ�륵���ӥ�</td>
</tr>
<tr>
<td>ipv6gw</td>
-<td>8-STABLE</td>
<td>IPv6 �ȥ�ͥ�롼�� (peer �� ISC)</td>
</tr>
<tr>
<td>mx1</td>
-<td>7-STABLE</td>
<td>������������륵����</td>
</tr>
<tr>
<td>mx2</td>
-<td>7-STABLE</td>
<td>���������������륵����</td>
</tr>
<tr>
<td>ns0</td>
-<td>6-STABLE</td>
<td>FreeBSD.org DNS ����ƥ�ĥ�����</td>
</tr>
<tr>
<td>ns1, ns2</td>
-<td>8-STABLE</td>
<td>FreeBSD.org DNS ����å��奵����</td>
</tr>
<tr>
<td>repoman</td>
-<td>7-STABLE</td>
<td>CVS �ޥ�����ݥ��ȥ�</td>
</tr>
<tr>
<td>skunkworks</td>
-<td>7-STABLE</td>
<td>Perforce ������</td>
</tr>
<tr>
<td>sky</td>
-<td>8-STABLE</td>
<td>wiki, HTTP ��С����ץ������ʤɤΤ��ޤ��ޤ� web �����ӥ�</td>
</tr>
-<tr>
-<td>spit (cvsup-master)</td>
-<td>6-STABLE</td>
-<td>CVSup �ޥ����ߥ顼</td>
-</tr>
-
-
<tr>
<td>svn</td>
-<td>7-STABLE</td>
<td>Subversion �ޥ�����ݥ��ȥ�</td>
</tr>
<tr>
<td>www</td>
-<td>7-STABLE</td>
<td>www.FreeBSD.org �����֥�����</td>
</tr>
@@ -265,12 +237,6 @@ FTP
<tbody>
-<tr valign="top">
-<td>builder</td>
-<td></td>
-<td></td>
-</tr>
-
<tr valign="top">
<td>flame</td>
<td>Sun SPARC</td>
@@ -345,7 +311,7 @@ SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
</tr>
<tr valign="top">
-<td>pluto1, pluto2</td>
+<td>pluto</td>
<td>IA-64 MP</td>
<td>2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset,
2GB Memory, LSILogic 1030 U320 SCSI controller (mpt),
@@ -381,12 +347,6 @@ Broadcom BCM5704C Gigabit NIC.</td>
<td>2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.</td>
</tr>
-<tr valign="top">
-<td>spit</td>
-<td> </td>
-<td> </td>
-</tr>
-
<tr valign="top">
<td>www</td>
<td>Intel x86</td>
From 41713da7d896b64f9151a144c82dbf6cbeb9394a Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 7 Aug 2013 02:00:22 +0000
Subject: [PATCH 73/92] Remove references to repoman and sky. Both are gone.
---
en_US.ISO8859-1/htdocs/internal/machines.xml | 24 --------------------
1 file changed, 24 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.xml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 23fdb83705..842cc13a56 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.xml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
@@ -154,21 +154,11 @@ this file</a>.</p>
<td>FreeBSD.org recursive DNS Server.</td>
</tr>
-<tr>
-<td>repoman</td>
-<td>CVS Master repository.</td>
-</tr>
-
<tr>
<td>skunkworks</td>
<td>Perforce server.</td>
</tr>
-<tr>
-<td>sky</td>
-<td>Various web services, such as wiki, reverse HTTP proxy etc.</td>
-</tr>
-
<tr>
<td>svn</td>
<td>Subversion master repository.</td>
@@ -334,20 +324,6 @@ SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
BCM5708 NIC.</td>
</tr>
-<tr valign="top">
-<td>repoman</td>
-<td>AMD64 MP</td>
-<td>4x2.4GHz Opteron 280 (dual CPU, dual core), 8GB Memory,
-HP Smart Array 6i RAID controller,
-Broadcom BCM5704C Gigabit NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>sky</td>
-<td>Intel x86 MP</td>
-<td>2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.</td>
-</tr>
-
<tr valign="top">
<td>www</td>
<td>Intel x86</td>
From 75454bb28a9205073b844946d80fb45b4cee62a9 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 7 Aug 2013 05:18:32 +0000
Subject: [PATCH 74/92] - Merge the following from the English version:
r42512 -> r42514 head/ja_JP.eucJP/htdocs/internal/machines.xml
---
ja_JP.eucJP/htdocs/internal/machines.xml | 26 +-----------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/ja_JP.eucJP/htdocs/internal/machines.xml b/ja_JP.eucJP/htdocs/internal/machines.xml
index cf65483687..360f75795a 100644
--- a/ja_JP.eucJP/htdocs/internal/machines.xml
+++ b/ja_JP.eucJP/htdocs/internal/machines.xml
@@ -4,7 +4,7 @@
<!ENTITY title "FreeBSD.org �ͥåȥ��">
]>
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r42512 -->
+<!-- Original revision: r42514 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -154,21 +154,11 @@
<td>FreeBSD.org DNS ����å��奵����</td>
</tr>
-<tr>
-<td>repoman</td>
-<td>CVS �ޥ�����ݥ��ȥ�</td>
-</tr>
-
<tr>
<td>skunkworks</td>
<td>Perforce ������</td>
</tr>
-<tr>
-<td>sky</td>
-<td>wiki, HTTP ��С����ץ������ʤɤΤ��ޤ��ޤ� web �����ӥ�</td>
-</tr>
-
<tr>
<td>svn</td>
<td>Subversion �ޥ�����ݥ��ȥ�</td>
@@ -333,20 +323,6 @@ SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
BCM5708 NIC.</td>
</tr>
-<tr valign="top">
-<td>repoman</td>
-<td>AMD64 MP</td>
-<td>4x2.4GHz Opteron 280 (dual CPU, dual core), 8GB Memory,
-HP Smart Array 6i RAID controller,
-Broadcom BCM5704C Gigabit NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>sky</td>
-<td>Intel x86 MP</td>
-<td>2x2.4GHz Xeon, 2GB Memory, Compaq RAID 5, Broadcom Gigabit NIC.</td>
-</tr>
-
<tr valign="top">
<td>www</td>
<td>Intel x86</td>
From 58af4cb48d88659caab9f6dd4064bf902034ac0d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 7 Aug 2013 10:04:26 +0000
Subject: [PATCH 75/92] Use '.email' macro suffix where missing. Remove a
spurious '<'.
---
en_US.ISO8859-1/htdocs/administration.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 5e8f481041..a41ca6f169 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -213,7 +213,7 @@
href="mailto:denise@ixsystems.com">denise@ixsystems.com</a>></li>
<li>&a.deb.email;</li>
<li>&a.jkoshy.email;</li>
- <li>&a.dru.email; <</li>
+ <li>&a.dru.email;</li>
<li>&a.mwlucas.email;</li>
<li>&a.imp.email;</li>
<li>&a.kmoore.email;</li>
@@ -333,8 +333,8 @@
<p>The Backups Administrators handle all backups on the FreeBSD cluster.</p>
<ul>
- <li>&a.simon;</li>
- <li>&a.dhw;</li>
+ <li>&a.simon.email;</li>
+ <li>&a.dhw.email;</li>
</ul>
<h3><a name="t-bugmeister">Bugmeisters & GNATS Administrators</a>
@@ -400,10 +400,10 @@
services.</p>
<ul>
- <li>&a.brd;</li>
- <li>&a.simon;</li>
- <li>&a.peter;</li>
- <li>&a.bz;</li>
+ <li>&a.brd.email;</li>
+ <li>&a.simon.email;</li>
+ <li>&a.peter.email;</li>
+ <li>&a.bz.email;</li>
</ul>
<h3><a name="t-mirror-admin">FTP/WWW Mirror Site Coordinators</a>
@@ -462,9 +462,9 @@
the Subversion Repositories.</p>
<ul>
- <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li>
- <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li>
- <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li>
+ <li>&a.bz.email;</li>
+ <li>&a.peter.email;</li>
+ <li>&a.simon.email;</li>
</ul>
<h3><a name="t-webmaster">Webmaster Team</a>
From 8f3af6963797f9e5e3251e30c8635534c65adb2d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 7 Aug 2013 10:29:46 +0000
Subject: [PATCH 76/92] Update entities for bugmeister, core, portmgr, re, so.
Submitted by: linimon (most of these, thanks!)
---
share/xml/authors.ent | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 8cecbdcb2d..933ea1a772 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2245,10 +2245,10 @@
<!-- Below we list the various hats. -->
<!-- FreeBSD Bugmeister -->
-<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;, &a.linimon;'>
+<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;'>
<!-- FreeBSD Core Team -->
-<!ENTITY a.core.members '&a.tabthorpe;, &a.gavin;, &a.jhb;, &a.kib;, &a.theraven;, &a.attilio;, &a.hrs;, &a.peter;, &a.miwi;'>
+<!ENTITY a.core.members '&a.tabthorpe;, &a.gavin;, &a.jhb;, &a.kib;, &a.theraven;, &a.hrs;, &a.peter;, &a.miwi;'>
<!-- FreeBSD Doc Engineering Team -->
<!ENTITY a.doceng.members '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'>
@@ -2257,15 +2257,15 @@
<!ENTITY a.donations.members '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, &a.ds;, &a.rwatson;'>
<!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr.members '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.bdrewery;, &a.decke;, &a.erwin;, &a.itetcu;, &a.miwi;'>
<!-- FreeBSD Release Engineering Teams -->
<!ENTITY a.re "re@FreeBSD.org">
-<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;'>
-<!ENTITY a.re.members.email '&a.kib.email;, &a.blackend.email;, &a.jpaetzel.email;, &a.hrs.email;, &a.kensmith.email;'>
+<!ENTITY a.re.members '&a.mva;, &a.gjb;, &a.kib;, &a.joel;, &a.blackend;, &a.skreuzer;, &a.delphij;, &a.jpaetzel;, &a.rodrigc;, &a.hrs;, &a.glebius;, &a.kensmith;, &a.marius;'>
+<!ENTITY a.re.members.email '&a.mva.email;, &a.gjb.email;, &a.kib.email;, &a.joel.email;, &a.blackend.email;, &a.skreuzer.email;, &a.delphij.email;, &a.jpaetzel.email;, &a.rodrigc.email;, &a.hrs.email;, &a.glebius.email;, &a.kensmith.email;, &a.marius.email;'>
<!ENTITY a.re-builders '&a.marcel;, &a.nyan;, &a.nwhitehorn;'>
<!-- FreeBSD Security Officer -->
-<!ENTITY a.so '&a.simon;'>
+<!ENTITY a.so '&a.des;'>
<!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.rwatson;, &a.bz;'>
From b5b73a0332ccb9836c508c49d67902b8730980ee Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Wed, 7 Aug 2013 18:23:33 +0000
Subject: [PATCH 77/92] r42472 -> r42507
MFde: Resync the Project news
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/xml/news.xml | 47 +++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml
index 8ecfd7f138..e69075e12d 100644
--- a/de_DE.ISO8859-1/share/xml/news.xml
+++ b/de_DE.ISO8859-1/share/xml/news.xml
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r42472
+ basiert auf: r42507
-->
<!-- Simple schema for FreeBSD Project news.
@@ -38,6 +38,51 @@
<year>
<name>2013</name>
+ <month>
+ <name>8</name>
+
+ <day>
+ <name>6</name>
+
+ <event>
+ <title>Halbjahres-Newsletter der &os; Foundation
+ verf�gbar</title>
+
+ <p>Wir freuen uns, bekanntgeben zu d�rfen, dass wir unseren
+ Newsletter f�r das erste Halbjahr 2013 ver�ffentlicht
+ haben. Lesen Sie den Newsletter, um sich dar�ber zu
+ informieren, wie die Foundation dabei hilft, &os; zum
+ besten verf�gbaren Betriebssystem zu machen.</p>
+
+ <p>Informieren Sie sich �ber von uns gesponserte
+ Entwicklungsprojekte und Konferenzen sowie �ber
+ Entwickler- und Verk�ufertreffen zur direkten
+ Kommunikation, �ber den Stand unserer Spendenkampagne
+ und vieles andere mehr.</p>
+
+ <p>Der Newsletter f�r das erste Halbjahr 2013 ist ab sofort
+ <a
+ href="http://www.freebsdfoundation.org/press/2013Jul-newsletter">hier</a>
+ verf�gbar.</p>
+ </event>
+ </day>
+
+ <day>
+ <name>5</name>
+
+ <event>
+ <title>&os; 9.2-RC1 verf�gbar</title>
+
+ <p>Der erste Release Candidate aus dem &os;-9.2-Releasezyklus ist
+ <a href="&lists.stable;/2013-August/074589.html">verf�gbar</a>.
+ ISO-Images f�r die Architekturen amd64, i386, ia64, powerpc,
+ powerpc64 sowie sparc64 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>
+ </month>
+
<month>
<name>7</name>
From 4b1cdc8a547d57f41fcc83748b5aa59e0ba35692 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Wed, 7 Aug 2013 18:35:29 +0000
Subject: [PATCH 78/92] r42471 -> r42493
MFde: Update the list of supported architectures for 9.2-RC1.
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/xml/release.l10n.ent | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/de_DE.ISO8859-1/share/xml/release.l10n.ent b/de_DE.ISO8859-1/share/xml/release.l10n.ent
index 822ca25068..4c408cb638 100644
--- a/de_DE.ISO8859-1/share/xml/release.l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r42471
+ basiert auf: r42493
-->
<![%beta2.testing;[
<!ENTITY beta.plural 'en'>
@@ -111,14 +111,12 @@
<td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- <!--
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<!--
<tr>
<td></td>
@@ -127,14 +125,12 @@
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
- <!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
- -->
<tr>
<td></td>
<td>powerpc64</td>
From 786e4a13dff8521503c3ac270d7b66a5366a1cb7 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 7 Aug 2013 18:43:35 +0000
Subject: [PATCH 79/92] Add id tags to writing style sections to make them
easier to refer to directly as HTML links with anchors.
---
.../books/fdp-primer/writing-style/chapter.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index c749efcaa3..d492ffde43 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -276,7 +276,7 @@
<literal><!doctype…></literal>.</para>
</sect2>
- <sect2>
+ <sect2 id="writing-style-acronyms">
<title>Acronyms</title>
<para>Acronyms should be defined the first time they appear in a
@@ -291,7 +291,7 @@
<sgmltag>acronym</sgmltag> tags.</para>
</sect2>
- <sect2>
+ <sect2 id="writing-style-indentation">
<title>Indentation</title>
<para>The first line in each file starts with no indentation,
@@ -332,10 +332,10 @@
<xref linkend="editor-config"/>.</para>
</sect2>
- <sect2>
+ <sect2 id="writing-style-tag-style">
<title>Tag Style</title>
- <sect3>
+ <sect3 id="writing-style-tag-style-spacing">
<title>Tag Spacing</title>
<para>Tags that start at the same indent as a previous tag
@@ -371,7 +371,7 @@
</informalexample>
</sect3>
- <sect3>
+ <sect3 id="writing-style-tag-style-separating">
<title>Separating Tags</title>
<para>Tags like <sgmltag>itemizedlist</sgmltag> which will
@@ -401,7 +401,7 @@
</sect3>
</sect2>
- <sect2>
+ <sect2 id="writing-style-whitespace-changes">
<title>Whitespace Changes</title>
<para><emphasis>Do not commit changes
@@ -421,7 +421,7 @@
ignored by translators.</para>
</sect2>
- <sect2>
+ <sect2 id="writing-style-nonbreaking-space">
<title>Non-Breaking Space</title>
<para>Avoid line breaks in places where they look ugly or make
From d513dac56714f907e875ea491252566d38c790ae Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 8 Aug 2013 12:29:43 +0000
Subject: [PATCH 80/92] - Document glarkin@'s donation of a 4-port KVM switch
to bf@
---
en_US.ISO8859-1/htdocs/donations/donors.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/en_US.ISO8859-1/htdocs/donations/donors.xml b/en_US.ISO8859-1/htdocs/donations/donors.xml
index 5a0bd23780..a542dc87c9 100644
--- a/en_US.ISO8859-1/htdocs/donations/donors.xml
+++ b/en_US.ISO8859-1/htdocs/donations/donors.xml
@@ -2927,6 +2927,15 @@
<td> received </td>
</tr>
+ <tr>
+ <td> <tt>Greg Larkin</tt> </td>
+ <td> Belkin #F1D066 OmniView PS/2 KVM Switch <br/>
+ + 6 foot VGA cables <br/>
+ + 6 foot PS/2<->PS/2 keyboard/or mouse cables </td>
+ <td> bf </td>
+ <td> received </td>
+ </tr>
+
<tr>
<td> <tt>Greg Larkin</tt> </td>
<td> Mac G4 Cube 500Mhz PowerPC </td>
From e9f6ed3030dd5b532afaa0769711fa0241e33563 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 8 Aug 2013 13:01:28 +0000
Subject: [PATCH 81/92] Fix build.
---
en_US.ISO8859-1/htdocs/donations/donors.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/htdocs/donations/donors.xml b/en_US.ISO8859-1/htdocs/donations/donors.xml
index a542dc87c9..544eea81de 100644
--- a/en_US.ISO8859-1/htdocs/donations/donors.xml
+++ b/en_US.ISO8859-1/htdocs/donations/donors.xml
@@ -2931,7 +2931,7 @@
<td> <tt>Greg Larkin</tt> </td>
<td> Belkin #F1D066 OmniView PS/2 KVM Switch <br/>
+ 6 foot VGA cables <br/>
- + 6 foot PS/2<->PS/2 keyboard/or mouse cables </td>
+ + 6 foot PS/2<->PS/2 keyboard/or mouse cables </td>
<td> bf </td>
<td> received </td>
</tr>
From f3a97bdd39b38e1187529e78d62309e49cf495cb Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 8 Aug 2013 17:00:17 +0000
Subject: [PATCH 82/92] Make rcvar output match reality.
PR: docs/181147
Submitted by: Wout Decr? <wout@delta-design.be>
---
en_US.ISO8859-1/books/handbook/config/chapter.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 1653f20602..956ab944cf 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -682,7 +682,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co id="co-env"/>
<screen>&prompt.root; <userinput>service sshd rcvar</userinput>
# sshd
-$sshd_enable=YES</screen>
+#
+sshd_enable="YES"
+# (default: "")</screen>
<note>
<para>The <literal># sshd</literal> line is output from the
@@ -1889,7 +1891,7 @@ kern.maxproc: 1044</screen>
kern.maxfiles: 2088 -> 5000</screen>
<para>Settings of sysctl variables are usually either strings,
- numbers, or booleans, where a a boolean is <literal>1</literal>
+ numbers, or booleans, where a boolean is <literal>1</literal>
for yes or <literal>0</literal> for no.</para>
<para>To automatically set some variables each time the machine
From 884113887c911a70130ff0a0030e9872bb8f4c02 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 8 Aug 2013 17:21:07 +0000
Subject: [PATCH 83/92] Whitespace-only fixes. Translators, please ignore.
---
.../books/handbook/config/chapter.xml | 169 +++++++++---------
1 file changed, 81 insertions(+), 88 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 956ab944cf..004f4205fc 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -270,7 +270,6 @@
<programlisting>sshd_enable="YES"
keyrate="fast"
defaultrouter="10.1.1.254"</programlisting>
-
</listitem>
<listitem>
@@ -278,7 +277,6 @@ defaultrouter="10.1.1.254"</programlisting>
<programlisting>hostname="node1.example.org"
ifconfig_fxp0="inet 10.1.1.1/8"</programlisting>
-
</listitem>
</itemizedlist>
@@ -608,9 +606,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co id="co-env"/>
<para>Users who wish to begin their own
<filename>crontab</filename> file from scratch, without the
- use of a template, can use <command>crontab -e</command>. This
- will invoke the default editor with an empty file. When this
- file is saved, it will be automatically installed by
+ use of a template, can use <command>crontab -e</command>.
+ This will invoke the default editor with an empty file. When
+ this file is saved, it will be automatically installed by
&man.crontab.1;.</para>
<para>In order to remove a user &man.crontab.5; completely,
@@ -633,12 +631,13 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co id="co-env"/>
<title>Using &man.rc.8; Under &os;</title>
<para>In 2002, &os; integrated the NetBSD &man.rc.8; system for
- system initialization. The files listed in <filename
- class="directory">/etc/rc.d</filename> provide basic services
- which can be controlled with the <option>start</option>,
- <option>stop</option>, and <option>restart</option> options
- to &man.service.8;. For instance, &man.sshd.8; can be restarted
- with the following command:</para>
+ system initialization. The files listed in
+ <filename class="directory">/etc/rc.d</filename> provide basic
+ services which can be controlled with the
+ <option>start</option>, <option>stop</option>, and
+ <option>restart</option> options to &man.service.8;. For
+ instance, &man.sshd.8; can be restarted with the following
+ command:</para>
<screen>&prompt.root; <userinput>service sshd restart</userinput></screen>
@@ -1262,15 +1261,15 @@ round-trip min/avg/max/stddev = 0.700/0.729/0.766/0.025 ms</screen>
host. This can happen if no default route is specified or
if a cable is unplugged. Check the output of
<command>netstat -rn</command> and make sure there is a
- valid route to the host. If there is not, read <xref
- linkend="advanced-networking"/>.</para>
+ valid route to the host. If there is not, read
+ <xref linkend="advanced-networking"/>.</para>
<para><errorname>ping: sendto: Permission denied</errorname>
error messages are often caused by a misconfigured firewall.
If a firewall is enabled on &os; but no rules have been
defined, the default policy is to deny all traffic, even
- &man.ping.8;. Refer to <xref
- linkend="firewalls"/> for more information.</para>
+ &man.ping.8;. Refer to
+ <xref linkend="firewalls"/> for more information.</para>
<para>Sometimes performance of the card is poor or below
average. In these cases, try setting the media
@@ -1314,9 +1313,9 @@ round-trip min/avg/max/stddev = 0.700/0.729/0.766/0.025 ms</screen>
given interface, there must be one address which correctly
represents the network's netmask. Any other addresses which
fall within this network must have a netmask of all
- <literal>1</literal>s, expressed as either <hostid
- role="netmask">255.255.255.255</hostid> or <hostid
- role="netmask">0xffffffff</hostid>.</para>
+ <literal>1</literal>s, expressed as either
+ <hostid role="netmask">255.255.255.255</hostid> or
+ <hostid role="netmask">0xffffffff</hostid>.</para>
<para>For example, consider the case where the
<devicename>fxp0</devicename> interface is connected to two
@@ -1324,18 +1323,18 @@ round-trip min/avg/max/stddev = 0.700/0.729/0.766/0.025 ms</screen>
netmask of <hostid role="netmask">255.255.255.0</hostid> and
<hostid role="ipaddr">202.0.75.16</hostid> with a netmask of
<hostid role="netmask">255.255.255.240</hostid>. The system
- is to be configured to appear in the ranges <hostid
- role="ipaddr">10.1.1.1</hostid> through <hostid
- role="ipaddr">10.1.1.5</hostid> and <hostid
- role="ipaddr">202.0.75.17</hostid> through <hostid
- role="ipaddr">202.0.75.20</hostid>. Only the first address
- in a given network range should have a real netmask. All the
- rest (<hostid role="ipaddr">10.1.1.2</hostid> through <hostid
- role="ipaddr">10.1.1.5</hostid> and <hostid
- role="ipaddr">202.0.75.18</hostid> through <hostid
- role="ipaddr">202.0.75.20</hostid>) must be configured with
- a netmask of <hostid
- role="netmask">255.255.255.255</hostid>.</para>
+ is to be configured to appear in the ranges
+ <hostid role="ipaddr">10.1.1.1</hostid> through
+ <hostid role="ipaddr">10.1.1.5</hostid> and
+ <hostid role="ipaddr">202.0.75.17</hostid> through
+ <hostid role="ipaddr">202.0.75.20</hostid>. Only the first
+ address in a given network range should have a real netmask.
+ All the rest (<hostid role="ipaddr">10.1.1.2</hostid> through
+ <hostid role="ipaddr">10.1.1.5</hostid> and
+ <hostid role="ipaddr">202.0.75.18</hostid> through
+ <hostid role="ipaddr">202.0.75.20</hostid>) must be configured
+ with a netmask of
+ <hostid role="netmask">255.255.255.255</hostid>.</para>
<para>The following <filename>/etc/rc.conf</filename> entries
configure the adapter correctly for this scenario:</para>
@@ -1349,7 +1348,6 @@ ifconfig_fxp0_alias4="inet 202.0.75.17 netmask 255.255.255.240"
ifconfig_fxp0_alias5="inet 202.0.75.18 netmask 255.255.255.255"
ifconfig_fxp0_alias6="inet 202.0.75.19 netmask 255.255.255.255"
ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255.255.255"</programlisting>
-
</sect1>
<sect1 id="configtuning-syslog">
@@ -1396,8 +1394,8 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255.255.255"</programlisting>
<literal>syslogd_flags</literal> in
<filename>/etc/rc.conf</filename>. Refer to &man.syslogd.8;
for more information on the arguments, and &man.rc.conf.5;,
- <xref linkend="configtuning-core-configuration"/> and <xref
- linkend="configtuning-rcd"/> for more information about
+ <xref linkend="configtuning-core-configuration"/> and
+ <xref linkend="configtuning-rcd"/> for more information about
<filename>/etc/rc.conf</filename> and the &man.rc.8;
subsystem.</para>
</sect2>
@@ -1537,8 +1535,8 @@ cron.* /var/log/cron
facilities, refer to &man.syslog.3; and &man.syslogd.8;.
For more information about
<filename>/etc/syslog.conf</filename>, its syntax, and more
- advanced usage examples, see &man.syslog.conf.5; and <xref
- linkend="network-syslogd"/>.</para>
+ advanced usage examples, see &man.syslog.conf.5; and
+ <xref linkend="network-syslogd"/>.</para>
</sect2>
<sect2>
@@ -1632,14 +1630,14 @@ cron.* /var/log/cron
&man.newsyslog.8; further instructions, such as how to
compress the rotated file or to create the log file if it
is missing. The last two fields are optional, and
- specify the <acronym
- role="Process Identifier">PID</acronym> file of a process
- and a signal number to send to that process when the file
- is rotated. For more information on all fields, valid
+ specify the
+ <acronym role="Process Identifier">PID</acronym> file of a
+ process and a signal number to send to that process when the
+ file is rotated. For more information on all fields, valid
flags, and how to specify the rotation time, refer to
- &man.newsyslog.conf.5;. Since &man.newsyslog.8; is run
- from &man.cron.8;, it can not rotate files more often than
- it is run from &man.cron.8;.</para>
+ &man.newsyslog.conf.5;. Since &man.newsyslog.8; is run from
+ &man.cron.8;, it can not rotate files more often than it is
+ run from &man.cron.8;.</para>
</sect3>
</sect2>
</sect1>
@@ -1735,9 +1733,8 @@ cron.* /var/log/cron
<primary><filename>resolv.conf</filename></primary>
</indexterm>
- <para>How a
- &os; system accesses the Internet Domain Name System
- (<acronym>DNS</acronym>) is controlled by
+ <para>How a &os; system accesses the Internet Domain Name
+ System (<acronym>DNS</acronym>) is controlled by
&man.resolv.conf.5;.</para>
<para>The most common entries to
@@ -1896,8 +1893,8 @@ kern.maxfiles: 2088 -> 5000</screen>
<para>To automatically set some variables each time the machine
boots, add them to <filename>/etc/sysctl.conf</filename>. For
- more information, refer to &man.sysctl.conf.5; and <xref
- linkend="configtuning-sysctlconf"/>.</para>
+ more information, refer to &man.sysctl.conf.5; and
+ <xref linkend="configtuning-sysctlconf"/>.</para>
<sect2 id="configtuning-sysctlconf">
<title><filename>sysctl.conf</filename></title>
@@ -1923,7 +1920,6 @@ kern.logsigexit=0
# Prevent users from seeing information about processes that
# are being run under another UID.
security.bsd.see_other_uids=0</programlisting>
-
</sect2>
<sect2 id="sysctl-readonly">
@@ -2189,16 +2185,16 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
data blocks of a file did not find their way out of the
buffer cache onto the disk by the time of the crash,
&man.fsck.8; recognizes this and repairs the file system
- by setting the file length to
- <literal>0</literal>. Additionally, the implementation is
- clear and simple. The disadvantage is that meta-data
- changes are slow. For example, <command>rm -r</command>
- touches all the files in a directory sequentially, but each
- directory change will be written synchronously to the
- disk. This includes updates to the directory itself, to
- the inode table, and possibly to indirect blocks allocated
- by the file. Similar considerations apply for unrolling
- large hierarchies using <command>tar -x</command>.</para>
+ by setting the file length to <literal>0</literal>.
+ Additionally, the implementation is clear and simple. The
+ disadvantage is that meta-data changes are slow. For
+ example, <command>rm -r</command> touches all the files in a
+ directory sequentially, but each directory change will be
+ written synchronously to the disk. This includes updates to
+ the directory itself, to the inode table, and possibly to
+ indirect blocks allocated by the file. Similar
+ considerations apply for unrolling large hierarchies using
+ <command>tar -x</command>.</para>
<para>The second approach is to use asynchronous meta-data
updates. This is the default for a <acronym>UFS</acronym>
@@ -2266,7 +2262,7 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
in use are marked as such in their blocks and inodes.
After a crash, the only resource allocation error that
occurs is that resources are marked as <quote>used</quote>
- which are actually <quote>free</quote>. &man.fsck.8;
+ which are actually <quote>free</quote>. &man.fsck.8;
recognizes this situation, and frees the resources that
are no longer used. It is safe to ignore the dirty state
of the file system after a crash by forcibly mounting it
@@ -2381,7 +2377,7 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
compile software. The most important table set by
<literal>maxusers</literal> is the maximum number of
processes, which is set to
- <literal>20 + 16 * maxusers</literal>. If
+ <literal>20 + 16 * maxusers</literal>. If
<literal>maxusers</literal> is set to <literal>1</literal>,
there can only be
<literal>36</literal> simultaneous processes, including
@@ -2493,12 +2489,11 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
</indexterm>
<para>The <varname>net.inet.ip.portrange.*</varname>
- &man.sysctl.8;
- variables control the port number ranges automatically bound
- to <literal>TCP</literal> and <literal>UDP</literal>
- sockets. There are three ranges: a low range, a default
- range, and a high range. Most network programs use the
- default range which is controlled by
+ &man.sysctl.8; variables control the port number ranges
+ automatically bound to <literal>TCP</literal> and
+ <literal>UDP</literal> sockets. There are three ranges: a
+ low range, a default range, and a high range. Most network
+ programs use the default range which is controlled by
<varname>net.inet.ip.portrange.first</varname> and
<varname>net.inet.ip.portrange.last</varname>, which default
to <literal>1024</literal> and <literal>5000</literal>,
@@ -2570,12 +2565,12 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
conditions, but it can also result in higher &man.ping.8;
times over slow links, though still much lower than without
the inflight algorithm. In such cases, try reducing this
- parameter to <literal>15</literal>,
- <literal>10</literal>, or <literal>5</literal> and
- reducing <varname>net.inet.tcp.inflight.min</varname>
- to a value such as <literal>3500</literal> to get the
- desired effect. Reducing these parameters should be done
- as a last resort only.</para>
+ parameter to <literal>15</literal>, <literal>10</literal>,
+ or <literal>5</literal> and reducing
+ <varname>net.inet.tcp.inflight.min</varname> to a value such
+ as <literal>3500</literal> to get the desired effect.
+ Reducing these parameters should be done as a last resort
+ only.</para>
</sect3>
</sect2>
@@ -2634,9 +2629,9 @@ kern.maxvnodes: 100000</screen>
<para>Adding a new hard drive for swap gives better performance
than adding a partition on an existing drive. Setting up
- partitions and hard drives is explained in <xref
- linkend="disks-adding"/> while <xref
- linkend="configtuning-initial"/> discusses partition
+ partitions and hard drives is explained in
+ <xref linkend="disks-adding"/> while
+ <xref linkend="configtuning-initial"/> discusses partition
layouts and swap partition size considerations.</para>
<para>Use &man.swapon.8; to add a swap partition to the system.
@@ -2645,7 +2640,6 @@ kern.maxvnodes: 100000</screen>
<screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1b</replaceable></userinput></screen>
<warning>
-
<para>It is possible to use any partition not currently
mounted, even if it already contains data. Using
&man.swapon.8; on a partition that contains data will
@@ -2685,7 +2679,6 @@ kern.maxvnodes: 100000</screen>
<orderedlist>
<listitem>
-
<para>The <filename>GENERIC</filename> kernel already
includes the memory disk driver (&man.md.4;) required
for this operation. When building a custom kernel,
@@ -2761,8 +2754,8 @@ kern.maxvnodes: 100000</screen>
temperature increases unexpectedly.</para>
<para>This section provides comprehensive information about
- <acronym>ACPI</acronym>. References will be provided for further
- reading.</para>
+ <acronym>ACPI</acronym>. References will be provided for
+ further reading.</para>
<sect2 id="acpi-intro">
<title>What Is ACPI?</title>
@@ -2979,13 +2972,12 @@ kern.maxvnodes: 100000</screen>
<para>Most &os; developers watch &a.current;, but one should
submit problems to &a.acpi.name; to be sure it is seen. Be
patient when waiting for a response. If the bug is not
- immediately apparent, submit a
- <acronym>PR</acronym> using &man.send-pr.1;. When entering a
- <acronym>PR</acronym>, include the same information as
- requested above. This helps developers to track the problem
- and resolve it. Do not send a <acronym>PR</acronym> without
- emailing &a.acpi.name; first as it is likely that the problem
- has been reported before.</para>
+ immediately apparent, submit a <acronym>PR</acronym> using
+ &man.send-pr.1;. When entering a <acronym>PR</acronym>,
+ include the same information as requested above. This helps
+ developers to track the problem and resolve it. Do not send a
+ <acronym>PR</acronym> without emailing &a.acpi.name; first as
+ it is likely that the problem has been reported before.</para>
</sect2>
<sect2 id="ACPI-background">
@@ -3278,8 +3270,9 @@ hw.acpi.s4bios: 0</screen>
<acronym>ASL</acronym>, use &man.acpidump.8;. Include both
<option>-t</option>, to show the contents of the fixed tables,
and <option>-d</option>, to disassemble the
- <acronym>AML</acronym>. Refer to <xref
- linkend="ACPI-submitdebug"/> for an example syntax.</para>
+ <acronym>AML</acronym>. Refer to
+ <xref linkend="ACPI-submitdebug"/> for an example
+ syntax.</para>
<para>The simplest first check is to recompile the
<acronym>ASL</acronym> to check for errors. Warnings can
From 72321b1d0b71723099962f81745a5a3e1c4f307c Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Fri, 9 Aug 2013 20:37:45 +0000
Subject: [PATCH 84/92] Clarify, improve language and tags. Committed version
is a modified version of patch included in PR, thanks to Ken Reed.
PR: docs/181117
Submitted by: Ken Reed <kreed002@gmail.com>
---
.../handbook/network-servers/chapter.xml | 78 +++++++++----------
1 file changed, 36 insertions(+), 42 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index b7a2f357eb..07fe455717 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -22,13 +22,14 @@
<sect1 id="network-servers-synopsis">
<title>Synopsis</title>
- <para>This chapter will cover some of the more frequently used
- network services on &unix; systems. We will cover how to
- install, configure, test, and maintain many different types of
- network services. Example configuration files are included
- throughout this chapter for you to benefit from.</para>
+ <para>This chapter covers some of the more frequently used
+ network services on &unix; systems. This includes
+ installing, configuring, testing, and maintaining
+ many different types of network services. Example
+ configuration files are included throughout this
+ chapter for reference.</para>
- <para>After reading this chapter, you will know:</para>
+ <para>By the end of this chapter, readers will know:</para>
<itemizedlist>
@@ -38,11 +39,13 @@
</listitem>
<listitem>
- <para>How to set up a network file system.</para>
+ <para>How to set up the Network File System
+ (<acronym>NFS</acronym>).</para>
</listitem>
<listitem>
- <para>How to set up a network information server for sharing
+ <para>How to set up the Network Information Server
+ (<acronym>NIS</acronym>) for centralizing and sharing
user accounts.</para>
</listitem>
@@ -51,28 +54,24 @@
server or client</para>
</listitem>
- <listitem>
- <para>How to set &os; up to act as an <acronym>LDAP</acronym>
- server or client</para>
- </listitem>
-
<listitem>
<para>How to set up automatic network settings using
- DHCP.</para>
+ <acronym>DHCP</acronym>.</para>
</listitem>
<listitem>
- <para>How to set up a domain name server.</para>
+ <para>How to set up a Domain Name Server
+ (<acronym>DNS</acronym>).</para>
</listitem>
<listitem>
<para>How to set up the <application>Apache</application>
- HTTP Server.</para>
+ <acronym>HTTP</acronym> Server.</para>
</listitem>
<listitem>
- <para>How to set up a File Transfer Protocol (FTP)
- Server.</para>
+ <para>How to set up a File Transfer Protocol
+ (<acronym>FTP</acronym>) server.</para>
</listitem>
<listitem>
@@ -82,7 +81,8 @@
<listitem>
<para>How to synchronize the time and date, and set up a
- time server, with the NTP protocol.</para>
+ time server using the Network Time Protocol
+ (<acronym>NTP</acronym>).</para>
</listitem>
<listitem>
@@ -93,20 +93,19 @@
</itemizedlist>
- <para>Before reading this chapter, you should:</para>
+ <para>This chapter assumes a basic knowledge of:</para>
<itemizedlist>
<listitem>
- <para>Understand the basics of the
- <filename>/etc/rc</filename> scripts.</para>
+ <para><filename>/etc/rc</filename> scripts.</para>
</listitem>
<listitem>
- <para>Be familiar with basic network terminology.</para>
+ <para>Network terminology.</para>
</listitem>
<listitem>
- <para>Know how to install additional third-party
+ <para>Installation of additional third-party
software (<xref linkend="ports"/>).</para>
</listitem>
@@ -167,20 +166,14 @@
<para><application>inetd</application> is initialized through
the &man.rc.8; system. The
<literal>inetd_enable</literal> option is set to
- <literal>NO</literal> by default, but may be turned on
- by <application>sysinstall</application> during installation,
- depending on the configuration chosen by the user.
- Placing:</para>
+ <literal>NO</literal> by default. It can be enabled
+ by placing:</para>
<programlisting>inetd_enable="YES"</programlisting>
- <para>or</para>
-
- <programlisting>inetd_enable="NO"</programlisting>
-
<para>into
- <filename>/etc/rc.conf</filename> will enable or disable
- <application>inetd</application> starting at boot time.
+ <filename>/etc/rc.conf</filename>.
+ <application>inetd</application> will now start at boot time.
The command:</para>
<screen>&prompt.root; <userinput>service inetd rcvar</userinput></screen>
@@ -512,14 +505,15 @@ server-program-arguments</programlisting>
because they provide
information that may be useful to an attacker.</para>
- <para>Some daemons are not security-conscious and have long, or
- non-existent, timeouts for connection attempts. This allows
- an attacker to slowly send connections to a particular daemon,
- thus saturating available resources. It may be a good idea to
- place <option>max-connections-per-ip-per-minute</option>,
- <option>max-child</option> or
- <option>max-child-per-ip</option> limitations on certain
- daemons if there are too many connections.</para>
+ <para>Some daemons are not security-conscious and have long or
+ non-existent timeouts for connection attempts. An attacker
+ can send connections to a particular daemon, eventually
+ consuming available resources and resulting in a Denial of
+ Service (<acronym>DoS</acronym>).
+ <literal>max-connections-per-ip-per-minute</literal>,
+ <literal>max-child</literal> and
+ <literal>max-child-per-ip</literal> can be used to limit
+ such attacks.</para>
<para>By default, TCP wrapping is turned on. Consult the
&man.hosts.access.5; manual page for more information on
From b3d10f88f5a967b0326a92c8169a32c393727fd9 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Fri, 9 Aug 2013 21:49:13 +0000
Subject: [PATCH 85/92] Whitespace-only fixes. Translators, please ignore.
---
.../handbook/network-servers/chapter.xml | 751 +++++++++---------
1 file changed, 368 insertions(+), 383 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 07fe455717..0d57931e90 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -32,7 +32,6 @@
<para>By the end of this chapter, readers will know:</para>
<itemizedlist>
-
<listitem>
<para>How to manage the <application>inetd</application>
daemon.</para>
@@ -90,7 +89,6 @@
<command>syslogd</command>, to accept logs from remote
hosts.</para>
</listitem>
-
</itemizedlist>
<para>This chapter assumes a basic knowledge of:</para>
@@ -108,7 +106,6 @@
<para>Installation of additional third-party
software (<xref linkend="ports"/>).</para>
</listitem>
-
</itemizedlist>
</sect1>
@@ -164,15 +161,13 @@
<title>Settings</title>
<para><application>inetd</application> is initialized through
- the &man.rc.8; system. The
- <literal>inetd_enable</literal> option is set to
- <literal>NO</literal> by default. It can be enabled
- by placing:</para>
+ the &man.rc.8; system. The <literal>inetd_enable</literal>
+ option is set to <literal>NO</literal> by default. It can be
+ enabled by placing:</para>
<programlisting>inetd_enable="YES"</programlisting>
- <para>into
- <filename>/etc/rc.conf</filename>.
+ <para>into <filename>/etc/rc.conf</filename>.
<application>inetd</application> will now start at boot time.
The command:</para>
@@ -291,8 +286,8 @@ user[:group][/login-class]
server-program
server-program-arguments</programlisting>
- <para>An example entry for the &man.ftpd.8; daemon
- using IPv4 might read:</para>
+ <para>An example entry for the &man.ftpd.8; daemon using IPv4
+ might read:</para>
<programlisting>ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l</programlisting>
@@ -338,6 +333,7 @@ server-program-arguments</programlisting>
<entry>Explanation</entry>
</row>
</thead>
+
<tbody>
<row>
<entry>tcp, tcp4</entry>
@@ -423,15 +419,15 @@ server-program-arguments</programlisting>
<para>A stream-type multi-threaded daemon without any
<option>max-child</option>,
<option>max-connections-per-ip-per-minute</option> or
- <option>max-child-per-ip</option> limits
- would simply be: <literal>nowait</literal>.</para>
+ <option>max-child-per-ip</option> limits would simply
+ be: <literal>nowait</literal>.</para>
<para>The same daemon with a maximum limit of ten daemons
would read: <literal>nowait/10</literal>.</para>
- <para>The same setup with a limit of twenty
- connections per IP address per minute and a maximum
- total limit of ten child daemons would read:
+ <para>The same setup with a limit of twenty connections
+ per IP address per minute and a maximum total limit of
+ ten child daemons would read:
<literal>nowait/10/20</literal>.</para>
<para>These options are utilized by the default
@@ -498,22 +494,22 @@ server-program-arguments</programlisting>
by default. If there is no apparent need for a particular
daemon, consider disabling it. Place a <quote>#</quote> in
front of the daemon in question in
- <filename>/etc/inetd.conf</filename>, and then <link
- linkend="network-inetd-reread">reload the
- inetd configuration</link>. Some daemons, such as
+ <filename>/etc/inetd.conf</filename>, and then
+ <link linkend="network-inetd-reread">reload the
+ inetd configuration</link>. Some daemons, such as
<application>fingerd</application>, may not be desired at all
- because they provide
- information that may be useful to an attacker.</para>
+ because they provide information that may be useful to an
+ attacker.</para>
<para>Some daemons are not security-conscious and have long or
non-existent timeouts for connection attempts. An attacker
can send connections to a particular daemon, eventually
- consuming available resources and resulting in a Denial of
+ consuming available resources and resulting in a Denial of
Service (<acronym>DoS</acronym>).
<literal>max-connections-per-ip-per-minute</literal>,
<literal>max-child</literal> and
- <literal>max-child-per-ip</literal> can be used to limit
- such attacks.</para>
+ <literal>max-child-per-ip</literal> can be used to limit such
+ attacks.</para>
<para>By default, TCP wrapping is turned on. Consult the
&man.hosts.access.5; manual page for more information on
@@ -533,9 +529,8 @@ server-program-arguments</programlisting>
services of <application>inetd</application>.</para>
<para>The <application>auth</application> service provides
- identity network services, and is
- configurable to a certain degree, whilst the others are simply
- on or off.</para>
+ identity network services, and is configurable to a certain
+ degree, whilst the others are simply on or off.</para>
<para>Consult the &man.inetd.8; manual page for more in-depth
information.</para>
@@ -636,6 +631,7 @@ server-program-arguments</programlisting>
<entry>Description</entry>
</row>
</thead>
+
<tbody>
<row>
<entry><application>nfsd</application></entry>
@@ -718,10 +714,10 @@ mountd_flags="-r"</programlisting>
<secondary>export examples</secondary>
</indexterm>
- <para>The following examples give an idea of how to export
- file systems, although the settings may be different depending
- on the environment and network configuration. For instance,
- to export the <filename>/cdrom</filename> directory to three
+ <para>The following examples give an idea of how to export file
+ systems, although the settings may be different depending on
+ the environment and network configuration. For instance, to
+ export the <filename>/cdrom</filename> directory to three
example machines that have the same domain name as the server
(hence the lack of a domain name for each) or have entries in
the <filename>/etc/hosts</filename> file. The
@@ -826,8 +822,8 @@ mountd_flags="-r"</programlisting>
<para>Now everything should be ready to actually mount a remote
file system. In these examples the server's name will be
<hostid>server</hostid> and the client's name will be
- <hostid>client</hostid>. For testing or to temporarily
- mount a remote file system execute a command like this as
+ <hostid>client</hostid>. For testing or to temporarily mount
+ a remote file system execute a command like this as
<username>root</username> on the client:</para>
<indexterm>
@@ -842,8 +838,8 @@ mountd_flags="-r"</programlisting>
visible and available in the <filename>/mnt</filename>
directory.</para>
- <para>To permanently mount a remote file system
- each time the computer boots, add the file system to the
+ <para>To permanently mount a remote file system each time the
+ computer boots, add the file system to the
<filename>/etc/fstab</filename> file. Here is an
example:</para>
@@ -940,12 +936,11 @@ rpc_statd_enable="YES"</programlisting>
<primary>automatic mounter daemon</primary>
</indexterm>
- <para>&man.amd.8; (the automatic mounter daemon)
- automatically mounts a
- remote file system whenever a file or directory within that
- file system is accessed. Filesystems that are inactive for a
- period of time will also be automatically unmounted by
- <application>amd</application>. Using
+ <para>&man.amd.8; (the automatic mounter daemon) automatically
+ mounts a remote file system whenever a file or directory
+ within that file system is accessed. Filesystems that are
+ inactive for a period of time will also be automatically
+ unmounted by <application>amd</application>. Using
<application>amd</application> provides a simple alternative
to permanent mounts, as permanent mounts are usually listed in
<filename>/etc/fstab</filename>.</para>
@@ -957,8 +952,8 @@ rpc_statd_enable="YES"</programlisting>
<application>amd</application> looks up the corresponding
remote mount and automatically mounts it.
<filename>/net</filename> is used to mount an exported file
- system from an IP address, while <filename>/host</filename>
- is used to mount an export from a remote hostname.</para>
+ system from an IP address, while <filename>/host</filename> is
+ used to mount an export from a remote hostname.</para>
<para>An access to a file within
<filename>/host/foobar/usr</filename> would tell
@@ -971,9 +966,8 @@ rpc_statd_enable="YES"</programlisting>
<application>amd</application></title>
<para>The <command>showmount</command> command shows the
- available mounts on a remote host. For example, to
- view the mounts of a host named
- <hostid>foobar</hostid>:</para>
+ available mounts on a remote host. For example, to view the
+ mounts of a host named <hostid>foobar</hostid>:</para>
<screen>&prompt.user; <userinput>showmount -e foobar</userinput>
Exports list on foobar:
@@ -1208,10 +1202,10 @@ Exports list on foobar:
<sect2>
<title><acronym>NIS</acronym>Terms and Processes</title>
- <para>There are several terms and important user
- processes that will be explained while attempting to
- implement NIS on FreeBSD, regardless if the system is a
- NIS server or a NIS client:</para>
+ <para>There are several terms and important user processes that
+ will be explained while attempting to implement NIS on
+ FreeBSD, regardless if the system is a NIS server or a NIS
+ client:</para>
<indexterm>
<primary><application>rpcbind</application></primary>
@@ -1231,6 +1225,7 @@ Exports list on foobar:
<entry>Description</entry>
</row>
</thead>
+
<tbody>
<row>
<entry>NIS domainname</entry>
@@ -1296,7 +1291,6 @@ Exports list on foobar:
</informaltable>
<!-- XXX Missing: rpc.ypxfrd (not important, though) May only run
on the master -->
-
</sect2>
<sect2>
@@ -1380,15 +1374,14 @@ Exports list on foobar:
<title>Planning</title>
<para>Let us assume that an administrator of a small
- university lab, which consists of 15 FreeBSD
- machines, currently has no centralized point of
- administration. Each machine has its own
- <filename>/etc/passwd</filename> and
+ university lab, which consists of 15 FreeBSD machines,
+ currently has no centralized point of administration. Each
+ machine has its own <filename>/etc/passwd</filename> and
<filename>/etc/master.passwd</filename>. These files are
kept in sync with each other only through manual
intervention; currently, a user is added to the lab, the
- process must be ran on all 15 machines.
- The lab would clearly benefit from the addition of two
+ process must be ran on all 15 machines. The lab would
+ clearly benefit from the addition of two
<acronym>NIS</acronym> servers.</para>
<para>Therefore, the configuration of the lab now looks
@@ -1403,6 +1396,7 @@ Exports list on foobar:
<entry>Machine role</entry>
</row>
</thead>
+
<tbody>
<row>
<entry><hostid>ellington</hostid></entry>
@@ -1807,15 +1801,15 @@ Remember to update map ypservers on ellington.</screen>
<primary>NIS</primary>
<secondary>client configuration</secondary>
</indexterm>
- <para>Setting up a FreeBSD machine to be a NIS
- client is fairly straightforward.</para>
+ <para>Setting up a FreeBSD machine to be a NIS client is
+ fairly straightforward.</para>
<procedure>
<step>
- <para>Edit <filename>/etc/rc.conf</filename>
- and add the following lines in order to set the NIS
- domainname and start <command>ypbind</command> during
- network startup:</para>
+ <para>Edit <filename>/etc/rc.conf</filename> and add the
+ following lines in order to set the NIS domainname and
+ start <command>ypbind</command> during network
+ startup:</para>
<programlisting>nisdomainname="test-domain"
nis_client_enable="YES"</programlisting>
@@ -1835,10 +1829,9 @@ nis_client_enable="YES"</programlisting>
account in the NIS server's password maps an
account. There are many ways to configure the NIS
client by changing this line. See the
- <link
- linkend="network-netgroups">netgroups
- section</link> below for more information. For more
- detailed reading see O'Reilly's book on
+ <link linkend="network-netgroups">netgroups
+ section</link> below for more information. For
+ more detailed reading see O'Reilly's book on
<literal>Managing NFS and NIS</literal>.</para>
</note>
@@ -1948,13 +1941,13 @@ nis_client_enable="YES"</programlisting>
<indexterm><primary>TCP Wrappers</primary></indexterm>
<para>The use of <application>TCP Wrapper</application>
- increases the latency of the NIS server. The
- additional delay may be long enough to cause timeouts in
- client programs, especially in busy networks or with slow
- NIS servers. If one or more of the client systems
- suffers from these symptoms, convert the client
- systems in question into NIS slave servers and force them
- to bind to themselves.</para>
+ increases the latency of the NIS server. The additional
+ delay may be long enough to cause timeouts in client
+ programs, especially in busy networks or with slow NIS
+ servers. If one or more of the client systems suffers from
+ these symptoms, convert the client systems in question into
+ NIS slave servers and force them to bind to
+ themselves.</para>
</note>
</sect2>
@@ -1972,19 +1965,18 @@ nis_client_enable="YES"</programlisting>
machine, even if they are present in the NIS database. To do
this, add
<literal>-<replaceable>username</replaceable></literal> with
- the correct number of colons like other entries to the
- end of the <filename>/etc/master.passwd</filename> file on the
- client machine, where <replaceable>username</replaceable> is
- the username of the user to bar from logging in.
- The line with the blocked user must be before the
- <literal>+</literal> line for allowing NIS users.
- This should preferably be done using <command>vipw</command>,
- since <command>vipw</command> will sanity check the changes
- to <filename>/etc/master.passwd</filename>, as well as
- automatically rebuild the password database after
- editing. For example, to bar user
- <username>bill</username> from logging on to
- <hostid>basie</hostid>:</para>
+ the correct number of colons like other entries to the end of
+ the <filename>/etc/master.passwd</filename> file on the client
+ machine, where <replaceable>username</replaceable> is the
+ username of the user to bar from logging in. The line with
+ the blocked user must be before the <literal>+</literal> line
+ for allowing NIS users. This should preferably be done using
+ <command>vipw</command>, since <command>vipw</command> will
+ sanity check the changes to
+ <filename>/etc/master.passwd</filename>, as well as
+ automatically rebuild the password database after editing.
+ For example, to bar user <username>bill</username> from
+ logging on to <hostid>basie</hostid>:</para>
<screen>basie&prompt.root; <userinput>vipw</userinput>
<userinput>[add -bill::::::::: to the end, exit]</userinput>
@@ -2033,10 +2025,9 @@ basie&prompt.root;</screen>
well for special rules in an environment with small numbers of
users and/or machines. On larger networks, administrators
<emphasis>will</emphasis> likely forget to bar some users from
- logging onto sensitive machines, or may even have to
- modify each machine separately, thus losing the main benefit
- of NIS: <emphasis>centralized</emphasis>
- administration.</para>
+ logging onto sensitive machines, or may even have to modify
+ each machine separately, thus losing the main benefit of NIS:
+ <emphasis>centralized</emphasis> administration.</para>
<para>The NIS developers' solution for this problem is called
<emphasis>netgroups</emphasis>. Their purpose and semantics
@@ -2047,18 +2038,16 @@ basie&prompt.root;</screen>
<para>Netgroups were developed to handle large, complex networks
with hundreds of users and machines. On one hand, this is a
- Good Thing in such a situation.
- On the other hand, this complexity makes it almost impossible
- to explain netgroups with really simple examples. The example
- used in the remainder of this section demonstrates this
- problem.</para>
+ Good Thing in such a situation. On the other hand, this
+ complexity makes it almost impossible to explain netgroups
+ with really simple examples. The example used in the
+ remainder of this section demonstrates this problem.</para>
<para>Let us assume that the successful introduction of NIS in
- the laboratory caught a superiors' interest. The next
- task is to extend the NIS domain to cover some of the other
- machines on campus. The two tables contain the names of the
- new users and new machines as well as brief descriptions of
- them.</para>
+ the laboratory caught a superiors' interest. The next task is
+ to extend the NIS domain to cover some of the other machines
+ on campus. The two tables contain the names of the new users
+ and new machines as well as brief descriptions of them.</para>
<informaltable frame="none" pgwide="1">
<tgroup cols="2">
@@ -2159,21 +2148,21 @@ basie&prompt.root;</screen>
<para>Handling this situation with netgroups offers several
advantages. Each user need not be handled separately; they
- would be assigned to one or more netgroups and logins would
- be allowed or forbidden for all members of the netgroup.
- While adding a new
- machine, login restrictions must be defined for all
- netgroups. If a new user is added, they must be added
- to one or more netgroups. Those changes are
- independent of each other: no more <quote>for each combination
- of user and machine do...</quote> If the NIS setup is planned
- carefully, only one central configuration file
- needs modification to grant or deny access to machines.</para>
+ would be assigned to one or more netgroups and logins would be
+ allowed or forbidden for all members of the netgroup. While
+ adding a new machine, login restrictions must be defined for
+ all netgroups. If a new user is added, they must be added to
+ one or more netgroups. Those changes are independent of each
+ other: no more
+ <quote>for each combination of user and machine do...</quote>
+ If the NIS setup is planned carefully, only one central
+ configuration file needs modification to grant or deny access
+ to machines.</para>
<para>The first step is the initialization of the NIS map
- netgroup. &os;'s &man.ypinit.8; does not create this map
- by default, but its NIS implementation will support it
- after creation. To create an empty map, simply type</para>
+ netgroup. &os;'s &man.ypinit.8; does not create this map by
+ default, but its NIS implementation will support it after
+ creation. To create an empty map, simply type</para>
<screen>ellington&prompt.root; <userinput>vi /var/yp/netgroup</userinput></screen>
@@ -2195,10 +2184,9 @@ INTERNS (,able,test-domain) (,baker,test-domain)</programlisting>
<orderedlist>
<listitem>
<para>The name of the host(s) where the following items are
- valid. If a hostname is not specified, the entry is
- valid on all hosts. If a hostname is specified, it
- will need to be micro-managed within this
- configuration.</para>
+ valid. If a hostname is not specified, the entry is valid
+ on all hosts. If a hostname is specified, it will need to
+ be micro-managed within this configuration.</para>
</listitem>
<listitem>
@@ -2218,11 +2206,11 @@ INTERNS (,able,test-domain) (,baker,test-domain)</programlisting>
<note>
<indexterm><primary>netgroups</primary></indexterm>
<para>Netgroup names longer than 8 characters should not be
- used, especially with machines running other
- operating systems within the NIS domain. The names are
- case sensitive; using capital letters for netgroup
- names is an easy way to distinguish between user, machine
- and netgroup names.</para>
+ used, especially with machines running other operating
+ systems within the NIS domain. The names are case
+ sensitive; using capital letters for netgroup names is an
+ easy way to distinguish between user, machine and netgroup
+ names.</para>
<para>Some NIS clients (other than &os;) cannot handle
netgroups with a large number of entries. For example, some
@@ -2237,8 +2225,8 @@ BIGGRP2 (,joe16,domain) (,joe17,domain) [...]
BIGGRP3 (,joe31,domain) (,joe32,domain)
BIGGROUP BIGGRP1 BIGGRP2 BIGGRP3</programlisting>
- <para>Repeat this process if more than 225
- users will exist within a single netgroup.</para>
+ <para>Repeat this process if more than 225 users will exist
+ within a single netgroup.</para>
</note>
<para>Activating and distributing the new NIS map is
@@ -2260,12 +2248,12 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
<para>The output of the first command should resemble the
contents of <filename>/var/yp/netgroup</filename>. The second
command will not produce output without specified
- host-specific netgroups. The third command may be used to
- get the list of netgroups for a user.</para>
+ host-specific netgroups. The third command may be used to get
+ the list of netgroups for a user.</para>
<para>The client setup is quite simple. To configure the server
- <hostid>war</hostid>, use
- &man.vipw.8; to replace the line</para>
+ <hostid>war</hostid>, use &man.vipw.8; to replace the
+ line</para>
<programlisting>+:::::::::</programlisting>
@@ -2275,19 +2263,19 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
<para>Now, only the data for the users defined in the netgroup
<literal>IT_EMP</literal> is imported into
- <hostid>war</hostid>'s password database and only
- these users are allowed to login.</para>
+ <hostid>war</hostid>'s password database and only these users
+ are allowed to login.</para>
<para>Unfortunately, this limitation also applies to the
<literal>~</literal> function of the shell and all routines
converting between user names and numerical user IDs. In
- other words, <command>cd
- ~<replaceable>user</replaceable></command> will not work,
- <command>ls -l</command> will show the numerical ID instead of
- the username and <command>find . -user joe -print</command>
- will fail with <errorname>No such user</errorname>. To fix
- this, import all user entries
- <emphasis>without allowing them to login into the
+ other words,
+ <command>cd ~<replaceable>user</replaceable></command> will
+ not work, <command>ls -l</command> will show the numerical ID
+ instead of the username and
+ <command>find . -user joe -print</command> will fail with
+ <errorname>No such user</errorname>. To fix this, import all
+ user entries <emphasis>without allowing them to login into the
servers</emphasis>.</para>
<para>This can be achieved by adding another line to
@@ -2333,11 +2321,11 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
change a few weeks later: The IT department starts hiring
interns. The IT interns are allowed to use the normal
workstations and the less important servers; and the IT
- apprentices are allowed to login onto the main servers.
- Add a new netgroup <literal>IT_INTERN</literal>, then add the
- new IT interns to this netgroup and start to change the
- configuration on each and every machine. As the old saying
- goes: <quote>Errors in centralized planning lead to global
+ apprentices are allowed to login onto the main servers. Add a
+ new netgroup <literal>IT_INTERN</literal>, then add the new IT
+ interns to this netgroup and start to change the configuration
+ on each and every machine. As the old saying goes:
+ <quote>Errors in centralized planning lead to global
mess</quote>.</para>
<para>NIS' ability to create netgroups from other netgroups can
@@ -2347,11 +2335,10 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
the login restrictions for the important servers, another
netgroup called <literal>SMALLSRV</literal> for the less
important servers and a third netgroup called
- <literal>USERBOX</literal> for the normal
- workstations. Each of these netgroups contains the netgroups
- that are allowed to login onto these machines. The new
- entries for the NIS map netgroup should look like
- this:</para>
+ <literal>USERBOX</literal> for the normal workstations. Each
+ of these netgroups contains the netgroups that are allowed to
+ login onto these machines. The new entries for the NIS map
+ netgroup should look like this:</para>
<programlisting>BIGSRV IT_EMP IT_APP
SMALLSRV IT_EMP IT_APP ITINTERN
@@ -2378,12 +2365,12 @@ USERBOX IT_EMP ITINTERN USERS</programlisting>
<programlisting>+@<replaceable>BOXNAME</replaceable>:::::::::
+:::::::::/sbin/nologin</programlisting>
- <para>Once this task is completed on all the machines,
- there is no longer a need to modify the local versions of
+ <para>Once this task is completed on all the machines, there is
+ no longer a need to modify the local versions of
<filename>/etc/master.passwd</filename> ever again. All
further changes can be handled by modifying the NIS map. Here
- is an example of a possible netgroup map for this
- scenario with some additional goodies:</para>
+ is an example of a possible netgroup map for this scenario
+ with some additional goodies:</para>
<programlisting># Define groups of users first
IT_EMP (,alpha,test-domain) (,beta,test-domain)
@@ -2443,8 +2430,8 @@ TWO (,hotel,test-domain)
<itemizedlist>
<listitem>
- <para>Every time a new user is added to the lab, they
- must be added to the master NIS server and the
+ <para>Every time a new user is added to the lab, they must
+ be added to the master NIS server and the
<acronym>NIS</acronym> maps will need rebuilt. If this
step is omitted, the new user will not be able to login
anywhere except on the NIS master. For example, if we
@@ -2458,8 +2445,8 @@ TWO (,hotel,test-domain)
<para>The user may also be added using
<command>adduser jsmith</command>
instead of <command>pw useradd jsmith</command>.</para>
-
</listitem>
+
<listitem>
<para><emphasis>Keep the administration accounts out of the
NIS maps</emphasis>. This is undesirable as it will
@@ -2468,6 +2455,7 @@ TWO (,hotel,test-domain)
machines will have users whom should not have access to
those accounts.</para>
</listitem>
+
<listitem>
<para><emphasis>Keep the NIS master and slave secure, and
minimize their downtime</emphasis>. If somebody either
@@ -2570,30 +2558,32 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
<screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
- <note><para>The format of passwords already in
- <filename>/etc/master.passwd</filename> will not be updated
- until a user changes his password for the first time
- <emphasis>after</emphasis> the login capability database is
- rebuilt.</para></note>
+ <note>
+ <para>The format of passwords already in
+ <filename>/etc/master.passwd</filename> will not be updated
+ until a user changes his password for the first time
+ <emphasis>after</emphasis> the login capability database is
+ rebuilt.</para>
+ </note>
<para>Next, in order to ensure that passwords are encrypted with
- the chosen format, check that
- the <literal>crypt_default</literal> in
+ the chosen format, check that the
+ <literal>crypt_default</literal> in
<filename>/etc/auth.conf</filename> gives precedence to the
chosen password format. To do this, place the chosen format
- first in the list. For example, when using DES
- encrypted passwords, the entry would be:</para>
+ first in the list. For example, when using DES encrypted
+ passwords, the entry would be:</para>
<programlisting>crypt_default = des blf md5</programlisting>
<para>Having followed the above steps on each of the &os; based
- NIS servers and clients, verify that they all agree
- on which password format is used within the network. If users
- have trouble authenticating on an NIS client, this is a pretty
- good place to start looking for possible problems. Remember:
- to deploy an NIS server for a heterogeneous
- network, they will probably have to use DES on all systems
- because it is the lowest common standard.</para>
+ NIS servers and clients, verify that they all agree on which
+ password format is used within the network. If users have
+ trouble authenticating on an NIS client, this is a pretty good
+ place to start looking for possible problems. Remember: to
+ deploy an NIS server for a heterogeneous network, they will
+ probably have to use DES on all systems because it is the
+ lowest common standard.</para>
</sect2>
</sect1>
@@ -2840,8 +2830,8 @@ rootpw {SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=</programlisting>
<para>Finally, enable the <application>OpenLDAP</application>
service in <filename>rc.conf</filename>. At this time,
setting up a <acronym>URI</acronym> and providing the group
- and user to run as may be useful.
- Edit <filename>/etc/rc.conf</filename> and add the following
+ and user to run as may be useful. Edit
+ <filename>/etc/rc.conf</filename> and add the following
lines:</para>
<programlisting>slapd_enable="YES"
@@ -3133,10 +3123,10 @@ dhclient_flags=""</programlisting>
<secondary>server</secondary>
</indexterm>
<para>The DHCP server, <application>dhcpd</application>, is
- included as part of the <filename
- role="package">net/isc-dhcp42-server</filename> port in
- the ports collection. This port contains the ISC DHCP
- server and documentation.</para>
+ included as part of the
+ <filename role="package">net/isc-dhcp42-server</filename>
+ port in the ports collection. This port contains the ISC
+ DHCP server and documentation.</para>
</sect2>
<sect2>
@@ -3188,7 +3178,7 @@ dhclient_flags=""</programlisting>
<para>The DHCP protocol is fully described in <ulink
url="http://www.freesoft.org/CIE/RFC/2131/">RFC
- 2131</ulink>. An informational resource has also been set
+ 2131</ulink>. An informational resource has also been set
up at <ulink url="http://www.dhcp.org/"></ulink>.</para>
</sect2>
@@ -3654,16 +3644,15 @@ dhcpd_ifaces="dc0"</programlisting>
</listitem>
</itemizedlist>
- <para>When one queries for <hostid
- role="fqdn">www.FreeBSD.org</hostid>, the resolver usually
- queries the uplink <acronym>ISP</acronym>'s name server, and
- retrieves the reply. With a local, caching
+ <para>When one queries for
+ <hostid role="fqdn">www.FreeBSD.org</hostid>, the resolver
+ usually queries the uplink <acronym>ISP</acronym>'s name
+ server, and retrieves the reply. With a local, caching
<acronym>DNS</acronym> server, the query only has to be made
once to the outside world by the caching
<acronym>DNS</acronym> server. Additional queries will not
have to go outside the local network, since the information is
- cached
- locally.</para>
+ cached locally.</para>
</sect2>
<sect2>
@@ -3708,14 +3697,14 @@ dhcpd_ifaces="dc0"</programlisting>
</informaltable>
<para>Depending on how a given zone is configured on the server,
- the files related to that zone can be found in the <filename
- class="directory">master</filename>, <filename
- class="directory">slave</filename>, or <filename
- class="directory">dynamic</filename> subdirectories of the
- <filename class="directory">/etc/namedb</filename> directory.
- These files contain the <acronym>DNS</acronym> information
- that will be given out by the name server in response to
- queries.</para>
+ the files related to that zone can be found in the
+ <filename class="directory">master</filename>,
+ <filename class="directory">slave</filename>, or
+ <filename class="directory">dynamic</filename> subdirectories
+ of the <filename class="directory">/etc/namedb</filename>
+ directory. These files contain the <acronym>DNS</acronym>
+ information that will be given out by the name server in
+ response to queries.</para>
</sect2>
<sect2>
@@ -3731,10 +3720,10 @@ dhcpd_ifaces="dc0"</programlisting>
<para>The default <application>named</application> configuration
is that of a basic resolving name server, running in a
- &man.chroot.8; environment, and restricted to listening on
- the local IPv4 loopback address (127.0.0.1).
- To start the server one time with
- this configuration, use the following command:</para>
+ &man.chroot.8; environment, and restricted to listening on the
+ local IPv4 loopback address (127.0.0.1). To start the server
+ one time with this configuration, use the following
+ command:</para>
<screen>&prompt.root; <userinput>service named onestart</userinput></screen>
@@ -3747,12 +3736,11 @@ dhcpd_ifaces="dc0"</programlisting>
<para>There are obviously many configuration options for
<filename>/etc/namedb/named.conf</filename> that are beyond
the scope of this document. There are other startup options
- for <application>named</application> on
- &os;, take a look at the
- <literal>named_<replaceable>*</replaceable></literal> flags in
- <filename>/etc/defaults/rc.conf</filename> and consult the
- &man.rc.conf.5; manual page. The <xref
- linkend="configtuning-rcd"/> section is also a good
+ for <application>named</application> on &os;, take a look at
+ the <literal>named_<replaceable>*</replaceable></literal>
+ flags in <filename>/etc/defaults/rc.conf</filename> and
+ consult the &man.rc.conf.5; manual page. The
+ <xref linkend="configtuning-rcd"/> section is also a good
read.</para>
</sect2>
@@ -3765,11 +3753,11 @@ dhcpd_ifaces="dc0"</programlisting>
</indexterm>
<para>Configuration files for <application>named</application>
- currently reside in <filename
- class="directory">/etc/namedb</filename> directory and will
- need modification before use unless all that is needed is a
- simple resolver. This is where most of the configuration will
- be performed.</para>
+ currently reside in
+ <filename class="directory">/etc/namedb</filename> directory
+ and will need modification before use unless all that is
+ needed is a simple resolver. This is where most of the
+ configuration will be performed.</para>
<sect3>
<title><filename>/etc/namedb/named.conf</filename></title>
@@ -4128,10 +4116,10 @@ zone "1.168.192.in-addr.arpa" {
<secondary>zone files</secondary>
</indexterm>
- <para>An example master zone file for <hostid
- role="domainname">example.org</hostid> (existing within
- <filename>/etc/namedb/master/example.org</filename>) is as
- follows:</para>
+ <para>An example master zone file for
+ <hostid role="domainname">example.org</hostid> (existing
+ within <filename>/etc/namedb/master/example.org</filename>)
+ is as follows:</para>
<programlisting>$TTL 3600 ; 1 hour default TTL
example.org. IN SOA ns1.example.org. admin.example.org. (
@@ -4296,21 +4284,21 @@ mail IN A 192.168.1.5</programlisting>
<programlisting> IN A 192.168.1.1</programlisting>
- <para>This line assigns IP address <hostid
- role="ipaddr">192.168.1.1</hostid> to the current origin,
- in this case <hostid
- role="domainname">example.org</hostid>.</para>
+ <para>This line assigns IP address
+ <hostid role="ipaddr">192.168.1.1</hostid> to the current
+ origin, in this case
+ <hostid role="domainname">example.org</hostid>.</para>
<programlisting>www IN CNAME @</programlisting>
<para>The canonical name record is usually used for giving
aliases to a machine. In the example, <hostid>www</hostid>
is aliased to the <quote>master</quote> machine whose name
- happens to be the same as the domain name <hostid
- role="domainname">example.org</hostid> (<hostid
- role="ipaddr">192.168.1.1</hostid>). CNAMEs can never be
- used together with another kind of record
- for the same hostname.</para>
+ happens to be the same as the domain name
+ <hostid role="domainname">example.org</hostid>
+ (<hostid role="ipaddr">192.168.1.1</hostid>). CNAMEs can
+ never be used together with another kind of record for the
+ same hostname.</para>
<indexterm>
<primary>MX record</primary>
@@ -4318,11 +4306,11 @@ mail IN A 192.168.1.5</programlisting>
<programlisting> IN MX 10 mail.example.org.</programlisting>
- <para>The MX record indicates which mail
- servers are responsible for handling incoming mail for the
- zone. <hostid role="fqdn">mail.example.org</hostid> is the
- hostname of a mail server, and 10 is the priority of
- that mail server.</para>
+ <para>The MX record indicates which mail servers are
+ responsible for handling incoming mail for the zone.
+ <hostid role="fqdn">mail.example.org</hostid> is the
+ hostname of a mail server, and 10 is the priority of that
+ mail server.</para>
<para>One can have several mail servers, with priorities of
10, 20 and so on. A mail server attempting to deliver to
@@ -4466,22 +4454,22 @@ mail IN A 192.168.1.5</programlisting>
were last updated. This output actually contains two keys.
The first key in the listing, with the value 257 after the
DNSKEY record type, is the one needed. This value indicates
- that this is a Secure Entry Point (<acronym
- role="Secure Entry Point">SEP</acronym>), commonly known
- as a Key Signing Key (<acronym
- role="Key Signing Key">KSK</acronym>). The second key,
- with value 256, is a subordinate key, commonly called a Zone
- Signing Key (<acronym
- role="Zone Signing Key">ZSK</acronym>). More on the
- different key types later in <xref
- linkend="dns-dnssec-auth"/>.</para>
+ that this is a Secure Entry Point
+ (<acronym role="Secure Entry Point">SEP</acronym>), commonly
+ known as a Key Signing Key
+ (<acronym role="Key Signing Key">KSK</acronym>). The second
+ key, with value 256, is a subordinate key, commonly called a
+ Zone Signing Key
+ (<acronym role="Zone Signing Key">ZSK</acronym>). More on
+ the different key types later in
+ <xref linkend="dns-dnssec-auth"/>.</para>
<para>Now the key must be verified and formatted so that
<acronym>BIND</acronym> can use it. To verify the key,
generate a <acronym role="Delegation Signer">DS</acronym>
<acronym role="Resource Record">RR</acronym> set. Create a
- file containing these <acronym
- role="Resource Record">RR</acronym>s with</para>
+ file containing these
+ <acronym role="Resource Record">RR</acronym>s with</para>
<screen>&prompt.user; <userinput>dnssec-dsfromkey -f root-dnskey . > root.ds</userinput></screen>
@@ -4579,12 +4567,12 @@ dnssec-validation yes;</programlisting>
required. A zone is signed using cryptographic keys which
must be generated. It is possible to use only one key for
this. The preferred method however is to have a strong
- well-protected Key Signing Key (<acronym
- role="Key Signing Key">KSK</acronym>) that is
- not rotated very often and a Zone Signing Key (<acronym
- role="Zone Signing Key">ZSK</acronym>) that is rotated more
- frequently. Information on recommended operational
- practices can be found in <ulink
+ well-protected Key Signing Key
+ (<acronym role="Key Signing Key">KSK</acronym>) that is
+ not rotated very often and a Zone Signing Key
+ (<acronym role="Zone Signing Key">ZSK</acronym>) that is
+ rotated more frequently. Information on recommended
+ operational practices can be found in <ulink
url="http://tools.ietf.org/rfc/rfc4641.txt"><acronym>RFC</acronym>
4641: <acronym>DNSSEC</acronym> Operational
Practices</ulink>. Practices regarding the root zone can
@@ -4594,29 +4582,29 @@ dnssec-validation yes;</programlisting>
<acronym>KSK</acronym> operator</ulink> and <ulink
url="http://www.root-dnssec.org/wp-content/uploads/2010/06/vrsn-dps-00.txt"><acronym>DNSSEC</acronym>
Practice Statement for the Root Zone
- <acronym>ZSK</acronym> operator</ulink>. The <acronym
- role="Key Signing Key">KSK</acronym> is used to build a
- chain of authority to the data in need of validation and as
- such is also called a Secure Entry Point (<acronym
- role="Secure Entry Point">SEP</acronym>) key. A message
- digest of this key, called a Delegation Signer (<acronym
- role="Delegation Signer">DS</acronym>) record, must be
- published in the parent zone to establish the trust chain.
- How this is accomplished depends on the parent zone owner.
- The <acronym
- role="Zone Signing Key">ZSK</acronym> is used to sign the
- zone, and only needs to be published there.</para>
+ <acronym>ZSK</acronym> operator</ulink>. The
+ <acronym role="Key Signing Key">KSK</acronym> is used to
+ build a chain of authority to the data in need of validation
+ and as such is also called a Secure Entry Point
+ (<acronym role="Secure Entry Point">SEP</acronym>) key. A
+ message digest of this key, called a Delegation Signer
+ (<acronym role="Delegation Signer">DS</acronym>) record,
+ must be published in the parent zone to establish the trust
+ chain. How this is accomplished depends on the parent zone
+ owner. The <acronym role="Zone Signing Key">ZSK</acronym>
+ is used to sign the zone, and only needs to be published
+ there.</para>
- <para>To enable <acronym>DNSSEC</acronym> for the <hostid
- role="domainname">example.com</hostid> zone depicted in
- previous examples, the first step is to use
+ <para>To enable <acronym>DNSSEC</acronym> for the
+ <hostid role="domainname">example.com</hostid> zone depicted
+ in previous examples, the first step is to use
<application>dnssec-keygen</application> to generate the
<acronym>KSK</acronym> and <acronym>ZSK</acronym> key pair.
This key pair can utilize different cryptographic
algorithms. It is recommended to use RSA/SHA256 for the
keys and 2048 bits key length should be enough. To generate
- the <acronym>KSK</acronym> for <hostid
- role="domainname">example.com</hostid>, run</para>
+ the <acronym>KSK</acronym> for
+ <hostid role="domainname">example.com</hostid>, run</para>
<screen>&prompt.user; <userinput>dnssec-keygen -f KSK -a RSASHA256 -b 2048 -n ZONE example.com</userinput></screen>
@@ -4632,9 +4620,9 @@ dnssec-validation yes;</programlisting>
(private). The <literal>nnnnn</literal> part of the file
name is a five digit key ID. Keep track of which key ID
belongs to which key. This is especially important when
- having more than one key in a zone. It is
- also possible to rename the keys. For each
- <acronym>KSK</acronym> file do:</para>
+ having more than one key in a zone. It is also possible to
+ rename the keys. For each <acronym>KSK</acronym> file
+ do:</para>
<screen>&prompt.user; <userinput>mv Kexample.com.+005+nnnnn.key Kexample.com.+005+nnnnn.KSK.key</userinput>
&prompt.user; <userinput>mv Kexample.com.+005+nnnnn.private Kexample.com.+005+nnnnn.KSK.private</userinput></screen>
@@ -4651,8 +4639,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
<para>Finally, sign the zone and tell <acronym>BIND</acronym>
to use the signed zone file. To sign a zone
<application>dnssec-signzone</application> is used. The
- command to sign the zone <hostid
- role="domainname">example.com</hostid>, located in
+ command to sign the zone
+ <hostid role="domainname">example.com</hostid>, located in
<filename>example.com.db</filename> would look similar
to</para>
@@ -4672,11 +4660,11 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
with all <acronym>RR</acronym>s signed. This output will
end up in a file with the extension
<literal>.signed</literal>, such as
- <filename>example.com.db.signed</filename>. The <acronym
- role="Delegation Signer">DS</acronym> records will also be
- written to a separate file
- <filename>dsset-example.com</filename>.
- To use this signed zone just modify the zone directive in
+ <filename>example.com.db.signed</filename>. The
+ <acronym role="Delegation Signer">DS</acronym> records will
+ also be written to a separate file
+ <filename>dsset-example.com</filename>. To use this signed
+ zone just modify the zone directive in
<filename>named.conf</filename> to use
<filename>example.com.db.signed</filename>. By default, the
signatures are only valid 30 days, meaning that the zone
@@ -4709,19 +4697,19 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
feature called <emphasis>Smart Signing</emphasis> was
introduced. This feature aims to make the key management
and signing process simpler by automating parts of the task.
- By putting the keys into a directory called a <emphasis>key
- repository</emphasis>, and using the new option
- <literal>auto-dnssec</literal>, it is possible to create a
- dynamic zone which will be resigned as needed. To update
- this zone use <application>nsupdate</application> with the
- new option <option>-l</option>.
+ By putting the keys into a directory called a
+ <emphasis>key repository</emphasis>, and using the new
+ option <literal>auto-dnssec</literal>, it is possible to
+ create a dynamic zone which will be resigned as needed. To
+ update this zone use <application>nsupdate</application>
+ with the new option <option>-l</option>.
<application>rndc</application> has also grown the ability
to sign zones with keys in the key repository, using the
option <option>sign</option>. To tell
<acronym>BIND</acronym> to use this automatic signing and
- zone updating for <hostid
- role="domainname">example.com</hostid>, add the following
- to <filename>named.conf</filename>:</para>
+ zone updating for
+ <hostid role="domainname">example.com</hostid>, add the
+ following to <filename>named.conf</filename>:</para>
<programlisting>zone example.com {
type master;
@@ -4757,8 +4745,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
place which could help to lure off possible
<acronym>DNS</acronym> service attacks.</para>
- <para>It is always good idea to read <ulink
- url="http://www.cert.org/">CERT</ulink>'s security
+ <para>It is always good idea to read
+ <ulink url="http://www.cert.org/">CERT</ulink>'s security
advisories and to subscribe to the &a.security-notifications;
to stay up to date with the current Internet and &os; security
issues.</para>
@@ -4885,19 +4873,20 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
<application>Apache</application> software packages should be
included on the &os; installation media. If
<application>Apache</application> was not installed while
- installing &os;, then it can be installed from the <filename
- role="package">www/apache22</filename> port.</para>
+ installing &os;, then it can be installed from the
+ <filename role="package">www/apache22</filename> port.</para>
<para>Once <application>Apache</application> has been installed
successfully, it must be configured.</para>
- <note><para>This section covers version 2.2.X of the
- <application>Apache HTTP Server</application> as that is the
- most widely used version for &os;. For more detailed
- information beyond the scope of this document about
- <application>Apache</application> 2.X, please see <ulink
- url="http://httpd.apache.org/"></ulink>.</para></note>
-
+ <note>
+ <para>This section covers version 2.2.X of the
+ <application>Apache HTTP Server</application> as that is the
+ most widely used version for &os;. For more detailed
+ information beyond the scope of this document about
+ <application>Apache</application> 2.X, please see
+ <ulink url="http://httpd.apache.org/"></ulink>.</para>
+ </note>
</sect2>
<sect2>
@@ -4923,12 +4912,11 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
<listitem>
<para>This specifies the default directory hierarchy for
the <application>Apache</application> installation.
- Binaries are stored in the <filename
- class="directory">bin</filename> and
- <filename
- class="directory">sbin</filename> subdirectories
- of the server root, and configuration files are stored
- in <filename
+ Binaries are stored in the
+ <filename class="directory">bin</filename> and
+ <filename class="directory">sbin</filename>
+ subdirectories of the server root, and configuration
+ files are stored in <filename
class="directory">etc/apache</filename>.</para>
</listitem>
</varlistentry>
@@ -5035,7 +5023,6 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
if it is not the local machine. The default web page that is
displayed is
<filename>/usr/local/www/apache22/data/index.html</filename>.</para>
-
</sect2>
<sect2>
@@ -5094,8 +5081,10 @@ DocumentRoot /www/someotherdomain.tld
<sect3>
<title><application>mod_ssl</application></title>
- <indexterm><primary>web servers</primary>
- <secondary>secure</secondary></indexterm>
+ <indexterm>
+ <primary>web servers</primary>
+ <secondary>secure</secondary>
+ </indexterm>
<indexterm><primary>SSL</primary></indexterm>
<indexterm><primary>cryptography</primary></indexterm>
@@ -5129,8 +5118,10 @@ DocumentRoot /www/someotherdomain.tld
<sect2>
<title>Dynamic Websites</title>
- <indexterm><primary>web servers</primary>
- <secondary>dynamic</secondary></indexterm>
+ <indexterm>
+ <primary>web servers</primary>
+ <secondary>dynamic</secondary>
+ </indexterm>
<para>In the last decade, more businesses have turned to the
Internet in order to enhance their revenue and increase
@@ -5326,9 +5317,9 @@ DocumentRoot /www/someotherdomain.tld
<para>The <acronym>PHP</acronym> support in &os; is extremely
modular so the base install is very limited. It is very
- easy to add support using the <filename
- role="package">lang/php5-extensions</filename> port.
- This port provides a menu driven interface to
+ easy to add support using the
+ <filename role="package">lang/php5-extensions</filename>
+ port. This port provides a menu driven interface to
<acronym>PHP</acronym> extension installation.
Alternatively, individual extensions can be installed using
the appropriate port.</para>
@@ -5365,13 +5356,14 @@ DocumentRoot /www/someotherdomain.tld
<title>Overview</title>
<para>The File Transfer Protocol (FTP) provides users with a
- simple way to transfer files to and from an <acronym
- role="File Transfer Protocol">FTP</acronym> server. &os;
- includes <acronym role="File Transfer Protocol">FTP</acronym>
- server software, <application>ftpd</application>, in the base
- system. This makes setting up and administering an <acronym
- role="File Transfer Protocol">FTP</acronym> server on FreeBSD
- very straightforward.</para>
+ simple way to transfer files to and from an
+ <acronym role="File Transfer Protocol">FTP</acronym> server.
+ &os; includes
+ <acronym role="File Transfer Protocol">FTP</acronym> server
+ software, <application>ftpd</application>, in the base system.
+ This makes setting up and administering an
+ <acronym role="File Transfer Protocol">FTP</acronym> server on
+ FreeBSD very straightforward.</para>
</sect2>
<sect2>
@@ -5401,15 +5393,14 @@ DocumentRoot /www/someotherdomain.tld
<secondary>anonymous</secondary>
</indexterm>
- <para>To enable anonymous FTP access to the
- server, create a user named
- <username>ftp</username> on the &os; system. Users will then
- be able to log on to the FTP server with a username of
- <username>ftp</username> or <username>anonymous</username> and
- with any password (by convention an email address for the user
- should be used as the password). The FTP server will call
- &man.chroot.2; when an anonymous user logs in, to restrict
- access to only the home directory of the
+ <para>To enable anonymous FTP access to the server, create a
+ user named <username>ftp</username> on the &os; system. Users
+ will then be able to log on to the FTP server with a username
+ of <username>ftp</username> or <username>anonymous</username>
+ and with any password (by convention an email address for the
+ user should be used as the password). The FTP server will
+ call &man.chroot.2; when an anonymous user logs in, to
+ restrict access to only the home directory of the
<username>ftp</username> user.</para>
<para>There are two text files that specify welcome messages to
@@ -5479,15 +5470,13 @@ DocumentRoot /www/someotherdomain.tld
</indexterm>
<para>Be aware of the potential problems involved with running
- an anonymous FTP server. In particular, think
- twice about allowing anonymous users to upload files. It may
- turn out that the FTP site becomes a forum for the trade of
- unlicensed commercial software or worse. If anonymous
- FTP uploads are required, then verify the
- permissions so that these files can not be read by other
- anonymous users until they have been reviewed by an
- administrator.</para>
-
+ an anonymous FTP server. In particular, think twice about
+ allowing anonymous users to upload files. It may turn out
+ that the FTP site becomes a forum for the trade of unlicensed
+ commercial software or worse. If anonymous FTP uploads are
+ required, then verify the permissions so that these files can
+ not be read by other anonymous users until they have been
+ reviewed by an administrator.</para>
</sect2>
</sect1>
@@ -5532,7 +5521,6 @@ DocumentRoot /www/someotherdomain.tld
package.</para>
<!-- mention LDAP, Active Directory, WinBIND, ACL, Quotas, PAM, .. -->
-
</sect2>
<sect2>
@@ -5561,11 +5549,10 @@ DocumentRoot /www/someotherdomain.tld
<para>The Samba Web Administration Tool (SWAT) runs as a
daemon from <application>inetd</application>. Therefore,
<application>inetd</application> must be enabled as shown in
- <xref linkend="network-inetd"/>, and
- the following line in <filename>/etc/inetd.conf</filename>
- should be uncommented before <application>swat</application>
- can be used to configure
- <application>Samba</application>:</para>
+ <xref linkend="network-inetd"/>, and the following line in
+ <filename>/etc/inetd.conf</filename> should be uncommented
+ before <application>swat</application> can be used to
+ configure <application>Samba</application>:</para>
<programlisting>swat stream tcp nowait/400 root /usr/local/sbin/swat swat</programlisting>
@@ -5585,9 +5572,8 @@ DocumentRoot /www/someotherdomain.tld
<para>Once successfully logging on to the main
<application>Samba</application> configuration page, the
system documentation will be available, or configuration may
- begin by clicking on the
- <guimenu>Globals</guimenu> tab. The
- <guimenu>Globals</guimenu> section corresponds to the
+ begin by clicking on the <guimenu>Globals</guimenu> tab.
+ The <guimenu>Globals</guimenu> section corresponds to the
variables that are set in the <literal>[global]</literal>
section of
<filename>/usr/local/etc/smb.conf</filename>.</para>
@@ -5598,9 +5584,8 @@ DocumentRoot /www/someotherdomain.tld
<para>Whether <application>swat</application> is being used or
<filename>/usr/local/etc/smb.conf</filename> is being edited
- directly, the first directives encountered
- when configuring <application>Samba</application>
- are:</para>
+ directly, the first directives encountered when configuring
+ <application>Samba</application> are:</para>
<variablelist>
<varlistentry>
@@ -5689,9 +5674,9 @@ DocumentRoot /www/someotherdomain.tld
backend is used, the
<filename>/usr/local/etc/samba/smbpasswd</filename> file
must be created to allow <application>Samba</application> to
- authenticate clients. To provide
- the &unix; user accounts access from &windows; clients, use
- the following command:</para>
+ authenticate clients. To provide the &unix; user accounts
+ access from &windows; clients, use the following
+ command:</para>
<screen>&prompt.root; <userinput>smbpasswd -a username</userinput></screen>
@@ -5808,12 +5793,12 @@ Starting smbd.</screen>
<primary>NTP</primary>
<secondary>ntpd</secondary>
</indexterm>
- <para>&os; ships with the &man.ntpd.8; <acronym
- role="Network Time Protocol">NTP</acronym> server which can
- be used to query other <acronym
- role="Network Time Protocol">NTP</acronym> servers to set
- the clock on the machine or provide time
- services to others.</para>
+ <para>&os; ships with the &man.ntpd.8;
+ <acronym role="Network Time Protocol">NTP</acronym> server
+ which can be used to query other
+ <acronym role="Network Time Protocol">NTP</acronym> servers to
+ set the clock on the machine or provide time services to
+ others.</para>
</sect2>
<sect2>
@@ -5855,11 +5840,11 @@ Starting smbd.</screen>
<indexterm><primary>ntpdate</primary></indexterm>
- <para>To synchronize the clock only when the
- machine boots up, use &man.ntpdate.8;. This may be
- appropriate for some desktop machines which are frequently
- rebooted and only require infrequent synchronization, but
- most machines should run &man.ntpd.8;.</para>
+ <para>To synchronize the clock only when the machine boots up,
+ use &man.ntpdate.8;. This may be appropriate for some
+ desktop machines which are frequently rebooted and only
+ require infrequent synchronization, but most machines should
+ run &man.ntpd.8;.</para>
<para>Using &man.ntpdate.8; at boot time is also a good idea
for machines that run &man.ntpd.8;. The &man.ntpd.8;
@@ -5869,10 +5854,9 @@ Starting smbd.</screen>
<para>To enable &man.ntpdate.8; at boot time, add
<literal>ntpdate_enable="YES"</literal> to
- <filename>/etc/rc.conf</filename>. Also
- specify all synchronization servers and any
- flags to be passed to &man.ntpdate.8; in
- <varname>ntpdate_flags</varname>.</para>
+ <filename>/etc/rc.conf</filename>. Also specify all
+ synchronization servers and any flags to be passed to
+ &man.ntpdate.8; in <varname>ntpdate_flags</varname>.</para>
</sect3>
<sect3>
@@ -5897,15 +5881,15 @@ driftfile /var/db/ntp.drift</programlisting>
<para>The <literal>server</literal> option specifies which
servers are to be used, with one server listed on each line.
If a server is specified with the <literal>prefer</literal>
- argument, as with <hostid
- role="fqdn">ntplocal.example.com</hostid>, that server is
- preferred over other servers. A response from a preferred
- server will be discarded if it differs significantly from
- other servers' responses, otherwise it will be used without
- any consideration to other responses. The
- <literal>prefer</literal> argument is normally used for NTP
- servers that are known to be highly accurate, such as those
- with special time monitoring hardware.</para>
+ argument, as with
+ <hostid role="fqdn">ntplocal.example.com</hostid>, that
+ server is preferred over other servers. A response from a
+ preferred server will be discarded if it differs
+ significantly from other servers' responses, otherwise it
+ will be used without any consideration to other responses.
+ The <literal>prefer</literal> argument is normally used for
+ NTP servers that are known to be highly accurate, such as
+ those with special time monitoring hardware.</para>
<para>The <literal>driftfile</literal> option specifies which
file is used to store the system clock's frequency offset.
@@ -5943,18 +5927,18 @@ driftfile /var/db/ntp.drift</programlisting>
&man.ntp.conf.5; manual for more information.</para>
</note>
- <para>To allow machines within the
- network to synchronize their clocks with the server, but
- ensure they are not allowed to configure the server or used
- as peers to synchronize against, add</para>
+ <para>To allow machines within the network to synchronize
+ their clocks with the server, but ensure they are not
+ allowed to configure the server or used as peers to
+ synchronize against, add</para>
<programlisting>restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap</programlisting>
- <para>instead, where <hostid
- role="ipaddr">192.168.1.0</hostid> is an IP address on
- the network and <hostid
- role="netmask">255.255.255.0</hostid> is the network's
- netmask.</para>
+ <para>instead, where
+ <hostid role="ipaddr">192.168.1.0</hostid> is an IP address
+ on the network and
+ <hostid role="netmask">255.255.255.0</hostid> is the
+ network's netmask.</para>
<para>The <filename>/etc/ntp.conf</filename> file can contain
multiple <literal>restrict</literal> options. For more
@@ -6003,9 +5987,10 @@ driftfile /var/db/ntp.drift</programlisting>
# Prevent outgoing NTP traffic from keeping the connection open
set filter alive 2 permit 0/0 0/0</programlisting>
- <para>For more details see the <literal>PACKET
- FILTERING</literal> section in &man.ppp.8; and the examples
- in <filename>/usr/share/examples/ppp/</filename>.</para>
+ <para>For more details see the
+ <literal>PACKET FILTERING</literal> section in &man.ppp.8; and
+ the examples in
+ <filename>/usr/share/examples/ppp/</filename>.</para>
<note>
<para>Some Internet access providers block low-numbered ports,
@@ -6049,11 +6034,11 @@ driftfile /var/db/ntp.drift</programlisting>
Log file aggregation, merging and rotation may be configured in
one location, using the native tools of &os;, such as
&man.syslogd.8; and &man.newsyslog.8;. In the following example
- configuration, host <hostid>A</hostid>, named <hostid
- role="fqdn">logserv.example.com</hostid>, will collect
+ configuration, host <hostid>A</hostid>, named
+ <hostid role="fqdn">logserv.example.com</hostid>, will collect
logging information for the local network. Host
- <hostid>B</hostid>, named <hostid
- role="fqdn">logclient.example.com</hostid> will pass
+ <hostid>B</hostid>, named
+ <hostid role="fqdn">logclient.example.com</hostid> will pass
logging information to the server system. In live
configurations, both hosts require proper forward and reverse
<acronym>DNS</acronym> or entries in
From 81d9d850924771f39e47d5e31abd0daf8dcfb058 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 10 Aug 2013 18:25:25 +0000
Subject: [PATCH 86/92] Add a new section on graid(8). Many people helped with
review and corrections, including Allan Jude, bjk, brd, and mav.
---
.../books/handbook/geom/chapter.xml | 308 ++++++++++++++++++
1 file changed, 308 insertions(+)
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index 102f07593a..8fa6b4b1b8 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -824,6 +824,314 @@ mountroot></screen>
</sect2>
</sect1>
+ <sect1 id="geom-graid">
+ <sect1info>
+ <authorgroup>
+ <author>
+ <firstname>Warren</firstname>
+ <surname>Block</surname>
+ <contrib>Originally contributed by </contrib>
+ </author>
+ </authorgroup>
+ </sect1info>
+ <title>Software <acronym>RAID</acronym> Devices</title>
+
+ <indexterm>
+ <primary>GEOM</primary>
+ </indexterm>
+ <indexterm>
+ <primary>Software RAID Devices</primary>
+ <secondary>Hardware-assisted RAID</secondary>
+ </indexterm>
+
+ <para>Some motherboards and expansion cards add some simple
+ hardware, usually just a <acronym>ROM</acronym>, that allows the
+ computer to boot from a <acronym>RAID</acronym> array. After
+ booting, access to the <acronym>RAID</acronym> array is handled
+ by software running on the computer's main processor. This
+ <quote>hardware-assisted software
+ <acronym>RAID</acronym></quote> gives <acronym>RAID</acronym>
+ arrays that are not dependent on any particular operating
+ system, and which are functional even before an operating system
+ is loaded.</para>
+
+ <para>Several levels of <acronym>RAID</acronym> are supported,
+ depending on the hardware in use. See &man.graid.8; for a
+ complete list.</para>
+
+ <para>&man.graid.8; requires the <filename>geom_raid.ko</filename>
+ kernel module, which is included in the
+ <filename>GENERIC</filename> kernel starting with &os; 9.1.
+ If needed, it can be loaded manually with
+ <command>graid load</command>.</para>
+
+ <sect2 id="geom-graid-creating">
+ <title>Creating an Array</title>
+
+ <para>Software <acronym>RAID</acronym> devices often have a menu
+ that can be entered by pressing special keys when the computer
+ is booting. The menu can be used to create and delete
+ <acronym>RAID</acronym> arrays. &man.graid.8; can also create
+ arrays directly from the command line.</para>
+
+ <para><command>graid label</command> is used to create a new
+ array. The motherboard used for this example has an Intel
+ software <acronym>RAID</acronym> chipset, so the Intel
+ metadata format is specified. The new array is given a label
+ of <devicename>gm0</devicename>, it is a mirror
+ (<acronym>RAID1</acronym>), and uses drives
+ <devicename>ada0</devicename> and
+ <devicename>ada1</devicename>.</para>
+
+ <caution>
+ <para>Some space on the drives will be overwritten when they
+ are made into a new array. Back up existing data
+ first!</para>
+ </caution>
+
+ <screen>&prompt.root; <userinput>graid label Intel gm0 RAID1 ada0 ada1</userinput>
+GEOM_RAID: Intel-a29ea104: Array Intel-a29ea104 created.
+GEOM_RAID: Intel-a29ea104: Disk ada0 state changed from NONE to ACTIVE.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:0-ada0 state changed from NONE to ACTIVE.
+GEOM_RAID: Intel-a29ea104: Disk ada1 state changed from NONE to ACTIVE.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:1-ada1 state changed from NONE to ACTIVE.
+GEOM_RAID: Intel-a29ea104: Array started.
+GEOM_RAID: Intel-a29ea104: Volume gm0 state changed from STARTING to OPTIMAL.
+Intel-a29ea104 created
+GEOM_RAID: Intel-a29ea104: Provider raid/r0 for volume gm0 created.</screen>
+
+ <para>A status check shows the new mirror is ready for
+ use:</para>
+
+ <screen>&prompt.root; <userinput>graid status</userinput>
+ Name Status Components
+raid/r0 OPTIMAL ada0 (ACTIVE (ACTIVE))
+ ada1 (ACTIVE (ACTIVE))</screen>
+
+ <para>The array device appears in
+ <filename>/dev/raid/</filename>. The first array is called
+ <devicename>r0</devicename>. Additional arrays, if present,
+ will be <devicename>r1</devicename>,
+ <devicename>r2</devicename>, and so on.</para>
+
+ <para>The <acronym>BIOS</acronym> menu on some of these devices
+ can create arrays with special characters in their names. To
+ avoid problems with those special characters, arrays are given
+ simple numbered names like <devicename>r0</devicename>. To
+ show the actual labels, like <devicename>gm0</devicename> in
+ the example above, use &man.sysctl.8;:</para>
+
+ <screen>&prompt.root; <userinput>sysctl kern.geom.raid.name_format=1</userinput></screen>
+ </sect2>
+
+ <sect2 id="geom-graid-volumes">
+ <title>Multiple Volumes</title>
+
+ <para>Some software <acronym>RAID</acronym> devices support
+ more than one <emphasis>volume</emphasis> on an array.
+ Volumes work like partitions, allowing space on the physical
+ drives to be split and used in different ways. For example,
+ Intel software <acronym>RAID</acronym> devices support two
+ volumes. This example creates a 40 G mirror for safely
+ storing the operating system, followed by a 20 G
+ <acronym>RAID0</acronym> (stripe) volume for fast temporary
+ storage:</para>
+
+ <screen>&prompt.root; <userinput>graid label -S 40G Intel gm0 RAID1 ada0 ada1</userinput>
+&prompt.root; <userinput>graid add -S 20G gm0 RAID0</userinput></screen>
+
+ <para>Volumes appear as additional
+ <devicename>r<replaceable>X</replaceable></devicename> entries
+ in <filename>/dev/raid/</filename>. An array with two volumes
+ will show <devicename>r0</devicename> and
+ <devicename>r1</devicename>.</para>
+
+ <para>See &man.graid.8; for the number of volumes supported by
+ different software <acronym>RAID</acronym> devices.</para>
+ </sect2>
+
+ <sect2 id="geom-graid-converting">
+ <title>Converting a Single Drive to a Mirror</title>
+
+ <para>Under certain specific conditions, it is possible to
+ convert an existing single drive to a &man.graid.8; array
+ without reformatting. To avoid data loss during the
+ conversion, the existing drive must meet these minimum
+ requirements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The drive must be partitioned with the
+ <acronym>MBR</acronym> partitioning scheme.
+ <acronym>GPT</acronym> or other partitioning schemes with
+ metadata at the end of the drive will be overwritten and
+ corrupted by the &man.graid.8; metadata.</para>
+ </listitem>
+
+ <listitem>
+ <para>There must be enough unpartitioned and unused space at
+ the end of the drive to hold the &man.graid.8; metadata.
+ This metadata varies in size, but the largest occupies
+ 64 M, so at least that much free space is
+ recommended.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If the drive meets these requirements, start by making a
+ full backup. Then create a single-drive mirror with that
+ drive:</para>
+
+ <screen>&prompt.root; <userinput>graid label Intel gm0 RAID1 ada0 NONE</userinput></screen>
+
+ <para>&man.graid.8; metadata was written to the end of the drive
+ in the unused space. A second drive can now be inserted into
+ the mirror:</para>
+
+ <screen>&prompt.root; <userinput>graid insert raid/r0 ada1</userinput></screen>
+
+ <para>Data from the original drive will immediately begin to be
+ copied to the second drive. The mirror will operate in
+ degraded status until the copy is complete.</para>
+ </sect2>
+
+ <sect2 id="geom-graid-inserting">
+ <title>Inserting New Drives into the Array</title>
+
+ <para>Drives can be inserted into an array as replacements for
+ drives that have failed or are missing. If there are no
+ failed or missing drives, the new drive becomes a spare. For
+ example, inserting a new drive into a working two-drive mirror
+ results in a two-drive mirror with one spare drive, not a
+ three-drive mirror.</para>
+
+ <para>In the example mirror array, data immediately begins to be
+ copied to the newly-inserted drive. Any existing information
+ on the new drive will be overwritten.</para>
+
+ <screen>&prompt.root; <userinput>graid insert raid/r0 ada1</userinput>
+GEOM_RAID: Intel-a29ea104: Disk ada1 state changed from NONE to ACTIVE.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:1-ada1 state changed from NONE to NEW.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:1-ada1 state changed from NEW to REBUILD.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:1-ada1 rebuild start at 0.</screen>
+ </sect2>
+
+ <sect2 id="geom-graid-removing">
+ <title>Removing Drives from the Array</title>
+
+ <para>Individual drives can be permanently removed from a
+ from an array and their metadata erased:</para>
+
+ <screen>&prompt.root; <userinput>graid remove raid/r0 ada1</userinput>
+GEOM_RAID: Intel-a29ea104: Disk ada1 state changed from ACTIVE to OFFLINE.
+GEOM_RAID: Intel-a29ea104: Subdisk gm0:1-[unknown] state changed from ACTIVE to NONE.
+GEOM_RAID: Intel-a29ea104: Volume gm0 state changed from OPTIMAL to DEGRADED.</screen>
+ </sect2>
+
+ <sect2 id="geom-graid-stopping">
+ <title>Stopping the Array</title>
+
+ <para>An array can be stopped without removing metadata from the
+ drives. The array will be restarted when the system is
+ booted.</para>
+
+ <screen>&prompt.root; <userinput>graid stop raid/r0</userinput></screen>
+ </sect2>
+
+ <sect2 id="geom-graid-status">
+ <title>Checking Array Status</title>
+
+ <para>Array status can be checked at any time. After a drive
+ was added to the mirror in the example above, data is being
+ copied from the original drive to the new drive:</para>
+
+ <screen>&prompt.root; <userinput>graid status</userinput>
+ Name Status Components
+raid/r0 DEGRADED ada0 (ACTIVE (ACTIVE))
+ ada1 (ACTIVE (REBUILD 28%))</screen>
+
+ <para>Some types of arrays, like <literal>RAID0</literal> or
+ <literal>CONCAT</literal>, may not be shown in the status
+ report if disks have failed. To see these partially-failed
+ arrays, add <option>-ga</option>:</para>
+
+ <screen>&prompt.root; <userinput>graid status -ga</userinput>
+ Name Status Components
+Intel-e2d07d9a BROKEN ada6 (ACTIVE (ACTIVE))</screen>
+ </sect2>
+
+ <sect2 id="geom-graid-deleting">
+ <title>Deleting Arrays</title>
+
+ <para>Arrays are destroyed by deleting all of the volumes from
+ them. When the last volume present is deleted, the array is
+ stopped and metadata is removed from the drives:</para>
+
+ <screen>&prompt.root; <userinput>graid delete raid/r0</userinput></screen>
+ </sect2>
+
+ <sect2 id="geom-graid-unexpected">
+ <title>Deleting Unexpected Arrays</title>
+
+ <para>Drives may unexpectedly contain &man.graid.8; metadata,
+ either from previous use or manufacturer testing.
+ &man.graid.8; will detect these drives and create an array,
+ interfering with access to the individual drive. To remove
+ the unwanted metadata:</para>
+
+ <procedure>
+ <step>
+ <para>Boot the system. At the boot menu, select
+ <literal>2</literal> for the loader prompt. Enter:</para>
+
+ <screen>OK <userinput>set kern.geom.raid.enable=0</userinput>
+OK <userinput>boot</userinput></screen>
+
+ <para>The system will boot with &man.graid.8;
+ disabled.</para>
+ </step>
+
+ <step>
+ <para>Back up all data on the affected drive.</para>
+ </step>
+
+ <step>
+ <para>As a workaround, &man.graid.8; array detection
+ can be disabled by adding</para>
+
+ <programlisting>kern.geom.raid.enable=0</programlisting>
+
+ <para>to <filename>/boot/loader.conf</filename>.</para>
+
+ <para>To permanently remove the &man.graid.8; metadata
+ from the affected drive, boot a &os; installation
+ <acronym>CD-ROM</acronym> or memory stick, and select
+ <literal>Shell</literal>. Use <command>status</command>
+ to find the name of the array, typically
+ <literal>raid/r0</literal>:</para>
+
+ <screen>&prompt.root; <userinput>graid status</userinput>
+ Name Status Components
+raid/r0 OPTIMAL ada0 (ACTIVE (ACTIVE))
+ ada1 (ACTIVE (ACTIVE))</screen>
+
+ <para>Delete the volume by name:</para>
+
+ <screen>&prompt.root; <userinput>graid delete raid/r0</userinput></screen>
+
+ <para>If there is more than one volume shown, repeat the
+ process for each volume. After the last array has been
+ deleted, the volume will be destroyed.</para>
+
+ <para>Reboot and verify data, restoring from backup if
+ necessary. After the metadata has been removed, the
+ <literal>kern.geom.raid.enable=0</literal> entry in
+ <filename>/boot/loader.conf</filename> can also be
+ removed.</para>
+ </step>
+ </procedure>
+ </sect2>
+ </sect1>
+
<sect1 id="geom-raid3">
<sect1info>
<authorgroup>
From 287b85cce3d10ea4a32a0e2dbe3b11ca5d3797de Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 11 Aug 2013 15:40:56 +0000
Subject: [PATCH 87/92] s/RELENG_X_Y/releng\/x.y/ since we no longer support
cvsup/cvs
---
en_US.ISO8859-1/articles/releng/article.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 73bd395d1f..c022d70c93 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -173,7 +173,7 @@
security fixes and additions are merged onto the release branch.
In addition to source updates via Subversion, binary patchkits are
available to keep systems on the
- <emphasis>RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></emphasis>
+ <emphasis>releng/<replaceable>X</replaceable>.<replaceable>Y</replaceable></emphasis>
branches updated.</para>
<sect2>
From c65282b0b02e96067502651a201c4ebbb63dc028 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 11 Aug 2013 16:01:41 +0000
Subject: [PATCH 88/92] - Snapshots are generated weekly, not monthly. - Add
note about vm images available with snapshots.
---
en_US.ISO8859-1/articles/releng/article.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index c022d70c93..4116d2e338 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -135,7 +135,7 @@
including <emphasis>HEAD</emphasis>, assuming that the system
management interfaces are not used.</para>
- <para>In the interim period between releases, monthly snapshots are
+ <para>In the interim period between releases, weekly snapshots are
built automatically by the &os; Project build machines and made
available for download from <systemitem
class="resource">ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/</systemitem>.
@@ -153,6 +153,18 @@
quality assurance activities ramp up pending a major
release.</para>
+ <para>In addition to installation ISO snapshots, weekly virtual
+ machine images are also provided for use with
+ <application>VirtualBox</application>,
+ <application>qemu</application>, or other popular emulation
+ software. The virtual machine images can be downloaded from
+ <systemitem
+ class="resource">ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/VM-IMAGES/</systemitem>.</para>
+
+ <para>The virtual machine images are approximately 150MB &man.xz.1;
+ compressed, and contain a 10GB sparse filesystem when attached to
+ a virtual machine.</para>
+
<para>Bug reports and feature requests are continuously submitted by
users throughout the release cycle. Problems reports are entered into our
<application class="software">GNATS</application> database
From 17e781c966613c9cfbe936bdeb385fa1381df59c Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 11 Aug 2013 16:03:16 +0000
Subject: [PATCH 89/92] Properly capitalize 'FreeBSD'.
---
en_US.ISO8859-1/articles/releng/article.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 4116d2e338..9c3c8dd249 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -138,7 +138,7 @@
<para>In the interim period between releases, weekly snapshots are
built automatically by the &os; Project build machines and made
available for download from <systemitem
- class="resource">ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/</systemitem>.
+ class="resource">ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/</systemitem>.
The widespread availability of binary release snapshots, and the
tendency of our user community to keep up with -STABLE development
with Subversion and <quote><command>make</command>
@@ -336,7 +336,7 @@
<note>
<para>In all examples below, <literal>$FSVN</literal>
refers to the location of the &os; Subversion repository,
- <literal>svn+ssh://svn.freebsd.org/base/</literal>.</para>
+ <literal>svn+ssh://svn.FreeBSD.org/base/</literal>.</para>
</note>
<para>The layout of &os; branches in Subversion is
From 6c16a1141805a5ecb91cf614647be6c312f49687 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 11 Aug 2013 16:06:46 +0000
Subject: [PATCH 90/92] Minor wordsmithing.
---
en_US.ISO8859-1/articles/releng/article.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 9c3c8dd249..58d04fef88 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -268,8 +268,8 @@
<para>Sixty days before the anticipated release, the source
repository enters a <quote>code freeze</quote>. During this
- time, all commits to the -STABLE branch must be approved by the
- &a.re;, the approval process is technically enforced by the
+ time, all commits to the -STABLE branch must be approved by
+ &a.re;. The approval process is technically enforced by a
pre-commit hook. The kinds of changes that are allowed during
this period include:</para>
From baf49030a34dfb80f0aba9af2c4d0c2e2a80efb2 Mon Sep 17 00:00:00 2001
From: Tim Bishop <tdb@FreeBSD.org>
Date: Mon, 12 Aug 2013 15:44:13 +0000
Subject: [PATCH 91/92] Update my PGP key: 5AE7D984 -> FDF38D55
---
share/pgpkeys/tdb.key | 287 ++++++++++++++++++++++--------------------
1 file changed, 148 insertions(+), 139 deletions(-)
diff --git a/share/pgpkeys/tdb.key b/share/pgpkeys/tdb.key
index 262ce185cb..cd84a0e6cf 100644
--- a/share/pgpkeys/tdb.key
+++ b/share/pgpkeys/tdb.key
@@ -1,152 +1,161 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh tdb 5AE7D984;
+sh addkey.sh tdb FDF38D55;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 1024D/5AE7D984 2000-10-07
- Key fingerprint = 1453 086E 9376 1A50 ECF6 AE05 7DCE D659 5AE7 D984
+pub 4096R/FDF38D55 2013-08-07 [expires: 2015-08-07]
+ Key fingerprint = 4BD9 5F90 8A50 40E8 D26C D681 6C22 6B37 FDF3 8D55
uid Tim Bishop <tim@bishnet.net>
uid Tim Bishop <T.D.Bishop@kent.ac.uk>
-uid Tim Bishop <tdb@i-scream.org>
uid Tim Bishop <tdb@FreeBSD.org>
-sub 4096g/7F886031 2000-10-07
+uid Tim Bishop <tdb@i-scream.org>
+sub 4096R/25CEA948 2013-08-07 [expires: 2015-08-07]
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mQGiBDnfszMRBAD4i2R+XBC9TXuDnhbclf08am1QA0dZs8dAZoPuRr0gmdTrQiGQ
-STg1kHkHR4ErsF8CFcxw5bvB1U9fmDnRRhHNoD3GAtlroN8YLDTefs4KbvK26V0E
-bbVf236zxSV7N3EfqqCGRM5sfD9h7m/muL7M29p8wkPiwhqei7Ic/QXifQCg/zTk
-9Vqp/TNPTruTVJjqujgIFC8D/AzpkXRzaTATBg/Nqysjva+sOmLEzr9B7uUVfY0y
-rWvc3+QiR4Gx6+VhwwmbBH9Jnq7eg2zLTKrtS4wWKGSWnISU2+AHGYzMa5Lth3QN
-20yDmybOj2qepoLx/9PTSrUcsWJScKCLIVkWQdhiNm0G7XOUh/WNn4UZZrk8U1L9
-3H7OBACzb16QVMYcVmud3FLNJWS6HCv5wWF5DEKBI5LOZrAFcmmAjCNe3HSHFSGD
-JFXNJIn1I4rG7rtudAGtUWYMAU0l1MPSjh3Dvq9Wh3bs4Pa1kZmTl1qGKLTElhN5
-DC9NBlu0pdXQcbBnhonEshX7EJKcoXmcV/QcjFegjTZ91Xgc6IhhBB8RAgAhBQI5
-37tkAgcAFwyAEWWofENeCLsU7YuIEDES9ZhE/P7UAAoJEH3O1lla59mE8PMAn2NF
-0lKRNhxBiOrxOgOfJ2m8Bj3cAJ92sTs7/EaIuXnyy1yLexmw59EdEbQcVGltIEJp
-c2hvcCA8dGltQGJpc2huZXQubmV0PohmBBARAgAmBRsDAAAAAhkBBQJDaQtmBgsJ
-CAcDAgQVAggDBBYCAwECHgECF4AACgkQfc7WWVrn2YTLOACfSKneVG4B3EoFM/fP
-Il6rJN/LrgIAoMcsYZe4FXjI8TgDoHy+Xtu2ZXPgiEYEEBECAAYFAjnfti0ACgkQ
-MRL1mET8/tRKdACgjizhpGPXZyKfg02rHRjv3HI939cAoPqij9xXHG7XkxyX+yem
-4WK8oLNeiEYEEBECAAYFAjtfEtMACgkQW3YaO5gYTxn4SACfWTe72dgrWfC1xrbi
-Hjtol+WAf0UAn0TTr2uRjIi7vR8rg9Bnjefjouo+iEYEEBECAAYFAjth+5wACgkQ
-6vqDvLlNLpVrPwCeMttJ6ad8vifJy6luMJMzIbiWJhUAn3vU1yVqWpL7qL+PWGHE
-kytuaOC/iEYEEBECAAYFAjti0w8ACgkQF7ttEUnfsrL75gCg9WCn37lGhN4+R8i1
-lrtn4s4GH0YAoL0JurG7CvAv6iHnjwaNUk3qQWd5iEYEEBECAAYFAjw5kBoACgkQ
-QffKHSlQv/gsNgCg50C6odjVC+6WNU28bNSjwO6TzmoAn1nB0T7kwnf0iBmuUcWy
-EnOXwjw/iEYEExECAAYFAkG3SLcACgkQIWeMYbU/1OVOfQCcDr0EPQenBwscxHHa
-QjLaNEEeuEsAn2IX5XWulgyVpcFS4nbF62bn/6yUiEYEExECAAYFAkG3StQACgkQ
-2nKnhxYOZOU81gCfa7Rs5AnqStlQjGEyL2zkMK7OiSMAn2bSIoA9aN0HYxaCV5Ly
-JX8tgfJ5iEYEExECAAYFAkDYCBsACgkQEp1WLmJavCBWJwCeIXvriDUS2TUdT77g
-kISc2PRdapgAoKHxc5ZX2iork8KNmM3o0/aJu0mSiEYEExECAAYFAkG3YlAACgkQ
-eR7zsjPVKg3yKgCgywPbTx4R021b1T4eGSL/3z1XFPcAmQGhMzCC0+HPa3s+cWDR
-n+2YkJcYiEYEExECAAYFAkG3ZwEACgkQfnhAL+snBNB9zwCgr2w4FGWlzA+2huI3
-lTFmViFTarMAn3e3wZD13RdhNgKI9XbvXkuFu9JciEYEExECAAYFAkG4DUoACgkQ
-A+OhltVdZ9pTtQCdEEjGARcAPhfFN7vlTWK9kVljIJsAoIANUmYsoWPosNagfVTd
-tNov59MGiEYEEhECAAYFAkG4RYoACgkQw6usuxzEM0WIvACeMv3Lk6/Miuc10rOC
-+a7ExAXteWUAmwQjrMBs9QD251r/QnyBODzQcFHsiEYEExECAAYFAkG5hw8ACgkQ
-li3ES4mncmbuswCfaWIIeMyzNL8DipU6BZ4x0IX8ONYAmwYbz60U17cNkMuVQsVb
-oZhXXksviEYEEBECAAYFAkHtDqwACgkQpQ4p2TvRQNAW1QCggPLI6W6bxEXPqK9w
-5dGfRP7FTtkAniSMjrmWTP4ZBVs6rDxshjXVgTBtiEYEEBECAAYFAkMA9K8ACgkQ
-WzzNBFs5gIBp0QCgrG6omGHaBpDoMIyP6/LKvfoGX5wAoJrr2mUTEqXlIbEIE7HM
-oOwrPmzciEYEEhECAAYFAkHdoGgACgkQ57/k9Wdwtz8sFACg6wW5rtAUM3lbNRPH
-C6TVbyGwZqwAoM/RBEgyUDbs195hyu2w2l8ZHqajiQEiBBABAgAMBQJDjczqBQMA
-EnUAAAoJEJcQuJvKV6184jIIAKweV4Q/y/D9zZDPd4qmTgWd+42+gIZKgHT+zisx
-pOz3z93KwScw9/ZG/sIzfrUxqFPUsym6RnErZH1+2qtBxd46KDMmqWuzCKnNsb54
-bQy9Xgj7R0C309L4gDnjk5jl7aW4RSX+sECqMuik3pQWZR8sOZk43ai3g5T/XpdY
-oBgTniwJot16HcDEvvevPYtcjigc7vZ12nKfI1NMicK8cxAkxLdzUBPBXkEPnCR7
-FigZsdkoxo1JVNJHef+Px5ErNFxDthjV41aO7o9BbHPnlvMklIeM7EmTVQDwcOh2
-WYHoiA6iUlUTFVn0wPaoOiUmyhz85tzo5DXseX6IC6yMxge0IlRpbSBCaXNob3Ag
-PFQuRC5CaXNob3BAa2VudC5hYy51az6IYAQTEQIAIAIbAwIeAQIXgAUCQ2kLbwYL
-CQgHAwIEFQIIAwQWAgMBAAoJEH3O1lla59mEPugAoJYJuWPF4LxsVVxOhwcMOX+K
-Jmv4AJ9PSfpJSWE91h+fkbYzLBxM1XUSiYhGBBMRAgAGBQJBt0eUAAoJEOr6g7y5
-TS6VWzwAoJARK/wdjecAWUZPJZzFKDsSnNJZAJ9vn+bgj8z5UxyiQ9CqQVtnZ3Sz
-mIhGBBMRAgAGBQJBt0i5AAoJECFnjGG1P9TlVsoAoJH0SYwjAndlcqLjaRWgNK4D
-pJbuAJsHtcoMvhHyt5Vl+aAVH+zc6GEgxYhGBBMRAgAGBQJBt0rfAAoJENpyp4cW
-DmTlh/UAnjMzSCWqSdQxkXnRadXe5SQApVPqAJ9srI7o2wYqHPl8mwX+jkVXCK7M
-C4hGBBMRAgAGBQJBt2JTAAoJEHke87Iz1SoN8eQAoJtBRqO40tbTL/wrZCCb5zDa
-B+6QAKCGJoUt9GQ8EXuixWLYNyvJRiof54hGBBMRAgAGBQJBt2cLAAoJEH54QC/r
-JwTQ2t0AoNI/83A67Fw4elk+9SvZEoh0rObGAJ95sDMn8QGx/m+plqsV9PERFxzf
-oIhGBBMRAgAGBQJBt2fHAAoJEBKdVi5iWrwgCAwAni6lOIjTxxJmnDu+ishxoE5p
-f5HkAKCgD7lX/2Xia5Swd2zNAAUX+ibp/ohGBBMRAgAGBQJBt6d8AAoJEFt2GjuY
-GE8ZyHAAn3pa0VCvG8y1uKboc/l5ctGvejyEAJ9KohndTigNPpT4Nm+wxz72wbtx
-I4hGBBMRAgAGBQJBuA1NAAoJEAPjoZbVXWfazksAoNIlcv1JHTS0nkDNiODmeon4
-qBvHAKCGj3wgV/lZytNRoxwiL4UNGbaByohGBBIRAgAGBQJBuEWOAAoJEMOrrLsc
-xDNFSaYAnjuKi9/xYpb7ihnnxIGp8Afd1m9VAKDWlidfrwLpT4rSrjJ/EuFiV1u6
-h4hGBBMRAgAGBQJBuYcSAAoJEJYtxEuJp3Jmm4YAoJpzQDRZu+3waFE7wwNfA40Q
-D/sMAJ9qv9RJzu5LKY8IiGeLso3zdBtF24hGBBARAgAGBQJB7Q6wAAoJEKUOKdk7
-0UDQ+cQAnA34pLhpoJaahezczByKkdl7zw35AJ4u/JFnq8F2xfjXrHKbFsq8hE0G
-5ohGBBARAgAGBQJDAPSyAAoJEFs8zQRbOYCA+ZEAn2znyZcKP6GpWc+Mk9tjhExW
-OvhaAJ43j2w/U5u93WNIVkKn5CgY+UTzqohGBBIRAgAGBQJB3aBtAAoJEOe/5PVn
-cLc/tSgAoLNj/SHxc4EPTI4vO0JAEA2QZC7hAKCP/yglIlWTZkm/EvXwrcxnLmtp
-c4kBIgQQAQIADAUCQ43M6gUDABJ1AAAKCRCXELibyletfGXkCADAm0Md1D9ryYKO
-g7Rn9u9z3A5gRYCndWouZ3qCvYX5df3dY51VU7EOuTAF3cvkXDmMkJ57RQ95l6Yw
-OPBEFhrFsNZ0+lzXZFvx4oLmeEYj6w2lDO+NGsy1GbxrWejqApzqqHYOFQXBkv2P
-0wH+wNZFfO949LtG4wwLLSk0Xi4xKlffBWjPH4Mdhr+KH5lMC0/t6jkPpsBOdytt
-MT4GqrBDIXrR6u8wGSBhL/vbbgt0qs8LFrGzJqJl1vOeo/es5zW2nF/RwcoBxCme
-KeriDNJhspOEfuqE+UWYrFBOCTpNw72OQGyk90vps0314XRjRVYQ1dzJEB/fsvYw
-w0Y+w/hGtB1UaW0gQmlzaG9wIDx0ZGJAaS1zY3JlYW0ub3JnPohgBBMRAgAgAhsD
-Ah4BAheABQJDaQtvBgsJCAcDAgQVAggDBBYCAwEACgkQfc7WWVrn2YQoSACg03bx
-S9swvRJ+WzrnYwVUhWUXDxwAmwShlDBq4ZseuA89Tk354AbzJCtRiEYEExECAAYF
-AkG3R5QACgkQ6vqDvLlNLpWuLwCeJpUPvGn/83H9CePaqY0RBRMu/pQAn10RKC6g
-A+PZhg2IUna4knYrV7lxiEYEExECAAYFAkG3SLkACgkQIWeMYbU/1OVc6gCeMWXh
-THikzJg0DPjrq5puqYwqXxAAnjtCpOQUeXc7j2lO6WiSuNge3EtHiEYEExECAAYF
-AkG3St4ACgkQ2nKnhxYOZOWgHwCggEQXoann+N3idBx+0h3VpsJse98Anjb96nkH
-Joa4xW3H6YJrtWhfe+I3iEYEExECAAYFAkG3YlMACgkQeR7zsjPVKg0rmACgjUgu
-anZ3SG5bpmnJDf21BWoLh5oAoKSIsqP5FSBwtny6KLylzG7MW7siiEYEExECAAYF
-AkG3ZwsACgkQfnhAL+snBNAsHACghamTnLNDk0ZAspHmKBHI1GMeYfYAn1ub+VfG
-hd5WeJkkiWOlpk/FBlFOiEYEExECAAYFAkG3Z8QACgkQEp1WLmJavCAOGwCgr3IS
-1UYOGPM+bM+n7Cjp2u5945gAoI0m7S6GXYl5jsaE1iCMw6ElzoBYiEYEExECAAYF
-AkG3p3wACgkQW3YaO5gYTxn/RgCeLV03juwyipL15IcOQNKiBqHz1g4Ani548Rdp
-Q3FL3bhwdYC+IvGKup6EiEYEExECAAYFAkG4DU0ACgkQA+OhltVdZ9q9FgCglfvb
-AzUpu44ZXRjzhQbNDsUrQTgAn2FDAiaT94CtgAEzGUjg3Dtxc7dkiEYEEhECAAYF
-AkG4RY4ACgkQw6usuxzEM0WKJACgjuZlgKF24+RxhxYAzL4g0u0AQ+QAoI76AEBh
-wsOKjXy87b6oaxy5QqOyiEYEExECAAYFAkG5hxIACgkQli3ES4mncmZagwCg3CLJ
-XqmgOfFjVQZuWADxTINu72sAoOsLdwTIpWyv1OW3E8uzC61GBPTqiEYEEBECAAYF
-AkHtDrAACgkQpQ4p2TvRQNAwhgCgxzho0VEbzY4/ECVbVtNSssEp46cAoNGduxph
-wNjvIROXlXZfgP+vmHbOiEYEEBECAAYFAkMA9LIACgkQWzzNBFs5gICEoACdFShC
-qE6i31Hry6NPdWBgDNPUbKUAn2W7KJH6yL5GkQScL8gjTR/bSMNEiEYEEhECAAYF
-AkHdoGwACgkQ57/k9Wdwtz9btQCZAbcfQ+C0H46jtc+TlbbpfaSx+gkAnRz3xMFe
-Xny1x7hJqsnMyss4r6ZHiQEiBBABAgAMBQJDjczqBQMAEnUAAAoJEJcQuJvKV618
-s3QH/iHO1U+LZF3eylEcpJnbmwuoLQgJRV9DfdlPbIcUnPskw1MyQiZUX6gmI4X1
-vXbT7/bS+od64Nf/PVabeLpLZCQELVrMcLNcFt5BuX518RA9I6Lldhl8MgXsXqfv
-rJIqVaUhIli18Tc7KRnVx0a0djchcudq3no2lLwu7yOpJXYnbAT+21i6plhfZceg
-8Yv+PJfs7par1x4RcsNJ3x9jTow2DeIKTVjz664c1RJA22qcwsZA+3FOWEkTrM+i
-jZ09HZDvuqT0Bigtx2sAZwDf0+Mw8f8lWm2CNun9uBvqyD0mtJkb8p0IvjT0V6wZ
-NlyXAfw8VaCxapzQ1gyhE35iV3+0HFRpbSBCaXNob3AgPHRkYkBGcmVlQlNELm9y
-Zz6IYAQTEQIAIAUCQ43KZwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEH3O
-1lla59mEh3EAoPBwl/6Ei9LAWGWutHMSO2T0BTUnAKDBsMVsdDcPpjJUMbZocXZR
-F8E9pIkBIgQQAQIADAUCQ43M6gUDABJ1AAAKCRCXELibyletfHkwB/9tTnUSuRlb
-LfLBcv6KoKR1AQcvC4GuvFuap6vCeIlTc2YpJO2U4H9+4tDJZ23AumzUgZN6T/Sp
-WKLV+1wciqCPoPieCtcq36PwYHuReUBWyXodOg2eAL2T5YndFy3f3GvFHutmmxEv
-gIOELoEJbQIVhd6uBWiIcSOoJAYOzulk105i0Hj6pM6gF+tWK5HsXEBHMkl705+S
-upknwAHbH2Y273ZZglx2FtibtzDFwOpdHQfzQdx2Cp9E7Dk6Cixkr/wU0FseioK4
-e+zKk1ClblJXEzxMUb0zDQgNdRV8+hTJ9saYPHchnRXCBg5QJj+lxCtIQ+WU1MAB
-Atd793HT5F65uQQNBDnfszMQEAD5GKB+WgZhekOQldwFbIeG7GHszUUfDtjgo3nG
-ydx6C6zkP+NGlLYwSlPXfAIWSIC1FeUpmamfB3TT/+OhxZYgTphluNgN7hBdq7YX
-HFHYUMoiV0MpvpXoVis4eFwL2/hMTdXjqkbM+84X6CqdFGHjhKlP0YOEqHm274+n
-Q0YIxswdd1ckOErixPDojhNnl06SE2H22+slDhf99pj3yHx5sHIdOHX79sFzxIMR
-JitDYMPj6NYK/aEoJguuqa6zZQ+iAFMBoHzWq6MSHvoPKs4fdIRPyvMX86RA6dfS
-d7ZCLQI2wSbLaF6dfJgJCo1+Le3kXXn11JJPmxiO/CqnS3wy9kJXtwh/CBdyorrW
-qULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt90xkhkn4DIO9ZekX
-1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcwYc58yWb/Ffm7/ZFe
-xwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZrM2w4DUUdD3yIsxx8
-Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEstSr/POGxKUAYEY18
-hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8vYlLIhkmuquiXsNV
-6z3WFwACAg/9Gs7SRDkdcrrYwzGJMLiJglFQq9dv3bSghtwmAwhw1HS184+uxhnr
-ZQoV1JuZpLJQ/gEQTCi2QN+7k76C8cqVb5Y3bvtfpFjSOVkRCPYDQTluM8yOXvKO
-8A7tRpQMjvn3SnnT8IF6wEBxEu52YxLSxEESNHv4N+BNGZZaBhNrj6mdl7vAdkwB
-vY8xxuoiB3ww8pc0LQKhQsRg/ePPhCDLtedDrKxN033ucmgm8V4u3CEENwk1mdmF
-ha1GOGlhyDfKJL4nIUNYlLpx0VO+mH0ocSNKQauPzLidFWDddavvfnbnEVq8f2u5
-xfcTxL9QinQHSL0QQvsPtv31OGG9HQ02gnLZ669UMYVl6KoNSjPZEuPi7xgJU7TK
-yDuYVd+FkVzaaVrUZxl1MfNqfMU7oCIw6Lw9Kfm/mJJB0HzxBW2VvH+Z3Q35bJ/b
-3WgOSBnA8XfkZae3vVrlHcnWjnjQ/76QPRrcMPa6DNoUvQ+U+BjUUrKAoQOw9DWm
-oPjmogFlesFHZl2FiBp+2gStUmNwGlS2wdnvk+nrGrxoJd0s/7iLj6nRVIPLVbID
-fNcLL8O5phxUw3Y59CL5uI9KrzHtan0pgQArgP6FMYppRERiinAqJLQ9Yp/1li0P
-9puxK0/zG8MxMkL6sXUA9Q1KpXRkOz5NOvlX2WFgoXxDZUTdlid8tCeITAQYEQIA
-DAUCOd+zMwUbDAAAAAAKCRB9ztZZWufZhBwyAJ9GfDyIbcgdnMe0CjuPin9UobRo
-5ACdHjn4iuMiXZA8cDDPAi8VybndPak=
-=F66Y
+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
+3LmEJEI19hT39nIrQGIAzj8zVP/tHw==
+=s4nE
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
From 5f7fda2c6dbec0ed78c8cdc6a576a37e0d4ccfa7 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Mon, 12 Aug 2013 17:51:22 +0000
Subject: [PATCH 92/92] Belatedly add my PGP keys.
---
share/pgpkeys/markm.key | 206 +++++++++++++++++++++++++++
share/pgpkeys/pgpkeys-developers.xml | 5 +
share/pgpkeys/pgpkeys.ent | 1 +
3 files changed, 212 insertions(+)
create mode 100644 share/pgpkeys/markm.key
diff --git a/share/pgpkeys/markm.key b/share/pgpkeys/markm.key
new file mode 100644
index 0000000000..91199fd047
--- /dev/null
+++ b/share/pgpkeys/markm.key
@@ -0,0 +1,206 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh markm 8A13A2CD FB57D793;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub 1024R/8A13A2CD 1995-08-08
+ Key fingerprint = 80 36 6E 40 83 D6 8A 36 BC 06 EA 0E 7A F2 CE CE
+uid Mark Murray <mark@grondar.org>
+uid Mark Murray <markm@iafrica.com>
+uid Mark Murray <mark@grondar.za>
+uid Mark Murray <markm@freebsd.org>
+
+pub 1024D/FB57D793 2000-01-20
+ Key fingerprint = 3FB6 3D12 0CF0 611F 0441 CD18 CD0B 8A35 FB57 D793
+uid Mark R V Murray <mark@grondar.org>
+uid Mark R V Murray <mark@grondar.za>
+uid Mark R V Murray <markm@uunet.co.za>
+uid Mark R V Murray <markm@freebsd.org>
+sub 2048g/EB82BBFC 2000-01-20
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - http://gpgtools.org
+
+mQCNAzAnooMAAAEEAL42eeVYmSJ1QFIMHt1bTSEFafxsszSr3p3YcG783VDEKVzC
+AyJudxWChoEWnZDwdzBCzq8NtY9I5ko4xVTmDtLlouYG/ctK2ORPxRWN9qjr9n14
+/+0Uwgf2lK6xHrmVDwWfNSG14+EU8V+TLaDqvI9NsnIiKyk5N958vKOKE6LNAAUR
+tB9NYXJrIE11cnJheSA8bWFya21AaWFmcmljYS5jb20+iQCVAwUQNjhn6t58vKOK
+E6LNAQEKBQP+MydNxqRtGDOy7yNXrLf4oOqE5iDh0RuLWtHkx6VoAYPDsVr6sBn3
+RlqlVEZcOJmx0jTBWC5NL6BbE87aBnAJsZxqLjf6rsJd9cv+3YMuJmDaAHKsfeCk
+XTyEB40EJ8zQqx4kXIzNzNvqZbHm4rktD/Xq5qFvBV4azhaSgEmac/GJAJUDBRAy
+Pm9G3tqU4mxLVx8BAVsmBACyUNku7Ht7MfiQjz0TfTRcScJVTGMn87r/p7qUPvKg
+ce3sVjQF11LJytISolyTHJpnh/VFuIPsW66wdENwUyzWGf4zOd+Orj4tVM9SsjOk
+RnkWAdChHbzunNm2FsjnAJIieh4PhGi0jj8AaFmgGcRQvX4oSrCBVn4LUZg0pzUg
+/YkAlQMFEDJC2TH7wj+NsTMUOQEBZfgD/jXtaKOSFt8FVHGx8g1p1OSFwsbmARpG
+yf3UxOjs5mMfE9OijTeRJPXzzmIvQ7D+LyGHTgVLU+kLM68yqS1KjriDOmTg7iHu
+b7Q2ekI65q+z3F9qi2qOPRcON/20pS9iVlJfWdZUGwQW+y28XZM0S0ER3YVVl+un
+qlPNqCvsIWNPiQCVAwUQNPzbyl2XsiiA35GBAQEFEAP8DuUzwdU92CADfm/xfOCH
+hpt8JefCevmO0UhkxBdl8YFXBkuOkkmZS8otKggLSpmvzVmQZ/elkE1s+V/YQcbZ
+SHkWLdGBiB6I84y5zka0Xgwl65CO0Bj/8NVLkJtF2nQRDRLIW69HQSaF0ftmmcm3
+yKzGDCwSab0BBm7NFoyuT6KJAJUDBRA1iehuVN1fojxmJGcBAT7EA/0SdeEX0PDG
+N7H7O0N9p3qJ8bNqwhT1uHiYOvATPkfGwUBjx8wt1GXena1Yn0tsnUPDrPhUg9Z5
+/NPaLyMFAVlRQ3ZHoI26Ng79w+BvU7npPuFm/Bwtw0lHPkMksFvU7rj8NmjqDoTU
+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
+rw2zuBrj
+=y5RG
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index 87572722e0..ce12858ca1 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1201,6 +1201,11 @@
&pgpkey.ken;
</sect2>
+ <sect2 id="pgpkey-markm">
+ <title>&a.markm.email;</title>
+ &pgpkey.markm;
+ </sect2>
+
<sect2 id="pgpkey-dinoex">
<title>&a.dinoex.email;</title>
&pgpkey.dinoex;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index a8f26eb565..e91e351264 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -244,6 +244,7 @@
<!ENTITY pgpkey.marino SYSTEM "marino.key">
<!ENTITY pgpkey.marius SYSTEM "marius.key">
<!ENTITY pgpkey.markj SYSTEM "markj.key">
+<!ENTITY pgpkey.markm SYSTEM "markm.key">
<!ENTITY pgpkey.markp SYSTEM "markp.key">
<!ENTITY pgpkey.marks SYSTEM "marks.key">
<!ENTITY pgpkey.markus SYSTEM "markus.key">