From e6eb16da6788b5ba2f6157243955b0590cd30545 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 20 Aug 2012 12:08:49 +0000
Subject: [PATCH 01/37] Update the cutting-edge chapter for obtaining/updating
the FreeBSD Documentation Project sources to reflect the CVS->SVN conversion.
Submitted by: ryusuke (originally)
---
.../books/handbook/cutting-edge/chapter.sgml | 92 ++++---------------
1 file changed, 19 insertions(+), 73 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index 16901043c5..9fcb17061f 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -736,14 +736,12 @@ Fetching 133 new ports or files... done.</screen>
shipped with each release by maintaining a local copy of the
latest &os; Documentation Set.</para>
- <sect2 id="csup-doc">
- <title>Using CVSup to Update the Documentation</title>
+ <sect2 id="dsvn-doc">
+ <title>Using <application>Subversion</application> to Update the Documentation</title>
- <para>The sources and the installed copy of the &os; documentation
- can be updated with <application>CVSup</application>, using a
- mechanism similar to the one employed for the base system
- sources (c.f. <xref linkend="makeworld">). This section
- describes:</para>
+ <para>The &os; documentation sources can be obtained with
+ <application>Subversion</application>. This section
+ describes:</para>
<itemizedlist>
<listitem>
@@ -755,7 +753,7 @@ Fetching 133 new ports or files... done.</screen>
<listitem>
<para>How to download a copy of the documentation source
at <filename class="directory">/usr/doc</filename>,
- using <application>CVSup</application>.</para>
+ using <application>Subversion</application>.</para>
</listitem>
<listitem>
@@ -775,7 +773,7 @@ Fetching 133 new ports or files... done.</screen>
</sect2>
<sect2 id="installing-documentation-toolchain">
- <title>Installing CVSup and the Documentation Toolchain</title>
+ <title>Installing <application>Subversion</application> and the Documentation Toolchain</title>
<para>Rebuilding the &os; documentation from source requires a
fairly large collection of tools. These tools are not part of
@@ -804,68 +802,34 @@ Fetching 133 new ports or files... done.</screen>
necessary.</para>
</note>
- <para>For more information on installing and using
- <application>CVSup</application>, see <link
- linkend="cvsup">Using CVSup</link>.</para>
+ <para><application>Subversion</application> is installed with
+ the <filename role="package">textproc/docproj</filename>
+ port.</para>
</sect2>
<sect2 id="updating-documentation-sources">
<title>Updating the Documentation Sources</title>
- <para>The <application>CVSup</application> utility can fetch a
- clean copy of the documentation sources, using
- the <filename>/usr/share/examples/cvsup/doc-supfile</filename>
- file as a configuration template. The default update host is
- set to a placeholder value in <filename>doc-supfile</filename>,
- but &man.cvsup.1; accepts a host name through the command line,
- so the documentation sources can be fetched from one of the
- <application>CVSup</application> servers by typing:</para>
+ <para>The <application>Subversion</application> program can fetch a
+ clean copy of the documentation sources by typing:</para>
- <screen>&prompt.root; <userinput>cvsup -h <replaceable>cvsup.FreeBSD.org</replaceable> -g -L 2 <filename>/usr/share/examples/cvsup/doc-supfile</filename></userinput></screen>
-
- <para>Change <replaceable>cvsup.FreeBSD.org</replaceable> to the
- nearest <application>CVSup</application> server. See <xref
- linkend="cvsup-mirrors"> for a complete listing of mirror
- sites.</para>
+ <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
<para>The initial download of the documentation sources may take a
while. Let it run until it completes.</para>
<para>Future updates of the documentation sources may be fetched
- by running the same command.
- The <application>CVSup</application> utility downloads and
- copies only the updates since the last time it ran, so every run
- of <application>CVSup</application> after the first complete run
- should be pretty fast.</para>
+ by running:</para>
+
+ <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
<para>After checking out the sources, an alternative way of
updating the documentation is supported by the
<filename>Makefile</filename> of the <filename
- class="directory">/usr/doc</filename> directory. By setting
- <makevar>SUP_UPDATE</makevar>, <makevar>SUPHOST</makevar> and
- <makevar>DOCSUPFILE</makevar> in the
- <filename>/etc/make.conf</filename> file, it is possible to
- run:</para>
+ class="directory">/usr/doc</filename> directory by running:</para>
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make update</userinput></screen>
-
- <para>A typical set of these &man.make.1; options
- for <filename>/etc/make.conf</filename> is:</para>
-
- <programlisting>SUP_UPDATE= yes
-SUPHOST?= cvsup.freebsd.org
-DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
-
- <note>
- <para>Setting the <makevar>SUPHOST</makevar>
- and <makevar>DOCSUPFILE</makevar> value
- with <literal>?=</literal> permits overriding them in the
- command-line of make. This is the recommended way of adding
- options to <filename>make.conf</filename>, to avoid having to
- edit the file every time a different option value has to be
- tested.</para>
- </note>
</sect2>
<sect2 id="updating-documentation-options">
@@ -903,15 +867,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
</varlistentry>
- <varlistentry>
- <term><makevar>SUPHOST</makevar></term>
-
- <listitem>
- <para>The hostname of the <application>CVSup</application>
- server to use when updating.</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><makevar>DOCDIR</makevar></term>
@@ -947,15 +902,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>If <filename>make.conf</filename> has been set up with the
- correct <makevar>DOCSUPFILE</makevar>, <makevar>SUPHOST</makevar>
- and <makevar>SUP_UPDATE</makevar> options, the install step may
- be combined with an update of the documentation sources by
- typing:</para>
-
- <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make update install clean</userinput></screen>
-
<para>If an update of only a specific language is desired,
&man.make.1; can be invoked in a language specific subdirectory
of <filename class="directory">/usr/doc</filename>, i.e.:</para>
@@ -997,7 +943,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
though. Building the documentation sources requires a fairly
large collection of tools and utilities, the
<emphasis>documentation toolchain</emphasis>, a certain level of
- familiarity with <application>CVS</application> and source
+ familiarity with <application>Subversion</application> and source
checkouts from a repository, and a few manual steps to build the
checked out sources. In this section, we describe an
alternative way of updating the installed copies of the &os;
@@ -1129,7 +1075,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<note>
<para>Notice that the default target directory
differs from the directory used by the
- <application>CVSup</application> method. This is
+ <application>Subversion</application> method. This is
because we are installing a port, and ports are
usually installed under the <filename
class="directory">/usr/local</filename> directory.
From 2760a29d925a5ec26335fb16789a79475da083d6 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 20 Aug 2012 20:47:14 +0000
Subject: [PATCH 02/37] Add the mystic chant for creating the zpool. While
here, remove an extra copy of an instruction, and add the two things I
inevitably forget when installing a server.
---
.../articles/portbuild/article.sgml | 27 ++++++++++++-------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index 07a1dadbda..28425ce063 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -2723,12 +2723,25 @@ ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</screen>
<filename>/etc/.ssh/</filename>.</para>
</step>
+ <step>
+ <para>Add the following to <filename>/boot/loader.conf</filename>:<screen>
+console="vidconsole,comconsole"</screen>
+ </para>
+ </step>
+
<step>
<para>Add the following to <filename>/etc/sysctl.conf</filename>:<screen>
kern.maxfiles=40000</screen>
</para>
</step>
+ <step>
+ <para>Make sure the following change is made to
+ <filename>/etc/ttys</filename>:<screen>
+ttyu0 "/usr/libexec/getty std.9600" vt100 on secure</screen>
+ </para>
+ </step>
+
<step>
<para>TBA</para>
</step>
@@ -2744,26 +2757,20 @@ kern.maxfiles=40000</screen>
<step>
<para>Create a <application>zfs</application> volume named
<filename>a</filename> and mount it on
- <filename>/a</filename>.
+ <filename>/a</filename>:<screen>
+# zpool create a mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
</para>
</step>
<step>
- <para><screen>
+ <para>Set up the base portbuild directory:<screen>
# mkdir -p /a/portbuild
# cd /a/portbuild
-#
+# chown portmgr:portmgr .
# chmod 775 .</screen>
</para>
</step>
- <step>
- <para>Create a <application>zfs</application> volume named
- <filename>a/portbuild</filename> and mount it on
- <filename>/a/portbuild</filename>.
- </para>
- </step>
-
<step>
<para>TBA</para>
</step>
From b9a71825a8c9cc2e7fe2ef87cd9f60cc5b579e0f Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Mon, 20 Aug 2012 21:48:44 +0000
Subject: [PATCH 03/37] - Update the administration page to reflect that
rwatson has stepped down from core and he is without successor as secteam
liasion because this role has been ceased by core.
Approved by: core (implicit)
---
en_US.ISO8859-1/htdocs/administration.sgml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/administration.sgml b/en_US.ISO8859-1/htdocs/administration.sgml
index a8aa644a0e..cd68c7b300 100644
--- a/en_US.ISO8859-1/htdocs/administration.sgml
+++ b/en_US.ISO8859-1/htdocs/administration.sgml
@@ -239,8 +239,7 @@
<li>&a.philip; <<a href="mailto:philip@FreeBSD.org">philip@FreeBSD.org</a>></li>
<li>&a.qingli; <<a href="mailto:qingli@FreeBSD.org">qingli@FreeBSD.org</a>></li>
<li>&a.remko; <<a href="mailto:remko@FreeBSD.org">remko@FreeBSD.org</a>></li>
- <li>&a.rwatson; <<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>>
- (Core Team Liaison)</li>
+ <li>&a.rwatson; <<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>></li>
<li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>>
(Officer)</li>
<li>&a.stas; <<a href="mailto:stas@FreeBSD.org">stas@FreeBSD.org</a>></li>
From aae55e5d00489b10fa4c019b0f8bfaacfc4719e3 Mon Sep 17 00:00:00 2001
From: Andrey Zonov <zont@FreeBSD.org>
Date: Tue, 21 Aug 2012 12:31:35 +0000
Subject: [PATCH 04/37] - Add my GPG key. - Add my entry to developers.ent and
authors.ent. - Add my entry to contrib.committers.sgml. - Add a news.xml
entry for myself.
Approved by: kib (mentor)
---
.../contributors/contrib.committers.sgml | 4 +
en_US.ISO8859-1/share/sgml/authors.ent | 2 +
share/pgpkeys/pgpkeys-developers.sgml | 5 +
share/pgpkeys/pgpkeys.ent | 1 +
share/pgpkeys/zont.key | 98 +++++++++++++++++++
share/sgml/developers.ent | 1 +
share/sgml/news.xml | 9 ++
7 files changed, 120 insertions(+)
create mode 100644 share/pgpkeys/zont.key
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index d5287637f6..44bb4177b6 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -1614,6 +1614,10 @@
<para>&a.sephe;</para>
</listitem>
+ <listitem>
+ <para>&a.zont;</para>
+ </listitem>
+
<listitem>
<para>&a.az;</para>
</listitem>
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 2ca6e71df8..caaeb5e39b 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1403,3 +1403,5 @@
<!ENTITY a.zml "Zachary Loafman <email>zml@FreeBSD.org</email>">
<!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">
+
+<!ENTITY a.zont "Andrey Zonov <email>zont@FreeBSD.org</email>">
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 14e6ed8aa3..83a3860d7e 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1841,3 +1841,8 @@
&pgpkey.sephe;
</sect2>
+ <sect2 id="pgpkey-zont">
+ <title>&a.zont;</title>
+ &pgpkey.zont;
+ </sect2>
+
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index c868052bec..ba7ccb3683 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -390,6 +390,7 @@
<!ENTITY pgpkey.zack SYSTEM "zack.key">
<!ENTITY pgpkey.zi SYSTEM "zi.key">
<!ENTITY pgpkey.zml SYSTEM "zml.key">
+<!ENTITY pgpkey.zont SYSTEM "zont.key">
<!ENTITY section.pgpkeys-core SYSTEM "pgpkeys-core.sgml">
<!ENTITY section.pgpkeys-developers SYSTEM "pgpkeys-developers.sgml">
<!ENTITY section.pgpkeys-officers SYSTEM "pgpkeys-officers.sgml">
diff --git a/share/pgpkeys/zont.key b/share/pgpkeys/zont.key
new file mode 100644
index 0000000000..bf3def6fbd
--- /dev/null
+++ b/share/pgpkeys/zont.key
@@ -0,0 +1,98 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh zont E8A68B1C;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub 2048R/E8A68B1C 2012-08-17 [expires: 2016-08-17]
+ Key fingerprint = 3DFF AA2F C10A A979 2FB9 A764 F145 4BB6 E8A6 8B1C
+uid Andrey Zonov <zont@FreeBSD.org>
+uid Andrey Zonov <andrey@zonov.org>
+sub 2048R/57FC2BD3 2012-08-17 [expires: 2016-08-17]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
++Is2qlWoT4cI+VuljBbdprk4
+=ElkT
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/sgml/developers.ent b/share/sgml/developers.ent
index 5f980149c2..27be286c5b 100644
--- a/share/sgml/developers.ent
+++ b/share/sgml/developers.ent
@@ -680,6 +680,7 @@ $FreeBSD$
<!ENTITY a.zi "Ryan Steinmetz">
<!ENTITY a.zml "Zachary Loafman">
<!ENTITY a.znerd "Ernst de Haan">
+<!ENTITY a.zont "Andrey Zonov">
<!-- GNATS-only contributors -->
<!ENTITY a.vwe "Volker Werth">
diff --git a/share/sgml/news.xml b/share/sgml/news.xml
index 7f1e18d2af..ce922ecf73 100644
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@@ -35,6 +35,15 @@
<month>
<name>8</name>
+ <day>
+ <name>21</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:zont@FreeBSD.org">Andrey Zonov</a> (src)</p>
+ </event>
+ </day>
+
<day>
<name>1</name>
From ad004830773e7f990fc13d41e79369af83507ca0 Mon Sep 17 00:00:00 2001
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Tue, 21 Aug 2012 18:53:10 +0000
Subject: [PATCH 05/37] - Florent has stepped down from his duties on portmgr@,
update team entries - Add Florent to the alumni list - Thanks for you years
of service on the team!
Approved by: gjb
---
.../articles/contributors/contrib.portmgralumni.sgml | 4 ++++
en_US.ISO8859-1/htdocs/administration.sgml | 1 -
share/sgml/developers.ent | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
index c670670a16..e45743856b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
@@ -1,6 +1,10 @@
<!-- $FreeBSD$ -->
<itemizedlist>
+ <listitem>
+ <para>&a.flz; (2008 - 2012)</para>
+ </listitem>
+
<listitem>
<para>&a.kris; (2001 - 2010)</para>
</listitem>
diff --git a/en_US.ISO8859-1/htdocs/administration.sgml b/en_US.ISO8859-1/htdocs/administration.sgml
index cd68c7b300..05a94ba019 100644
--- a/en_US.ISO8859-1/htdocs/administration.sgml
+++ b/en_US.ISO8859-1/htdocs/administration.sgml
@@ -128,7 +128,6 @@
<li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li>
<li>&a.pav; <<a href="mailto:pav@FreeBSD.org">pav@FreeBSD.org</a>></li>
<li>&a.itetcu; <<a href="mailto:itetcu@FreeBSD.org">itetcu@FreeBSD.org</a>></li>
- <li>&a.flz; <<a href="mailto:flz@FreeBSD.org">flz@FreeBSD.org</a>></li>
<li>&a.miwi; <<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>></li>
</ul>
diff --git a/share/sgml/developers.ent b/share/sgml/developers.ent
index 27be286c5b..436018cd6b 100644
--- a/share/sgml/developers.ent
+++ b/share/sgml/developers.ent
@@ -704,7 +704,7 @@ $FreeBSD$
<!ENTITY a.donations '&a.gjb;, &a.wilko;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
<!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.flz;, &a.miwi;'>
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.miwi;'>
<!-- FreeBSD Release Engineering Teams -->
<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;'>
From 0f988a5254121577c335d1b27047144cef31f510 Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 22 Aug 2012 14:55:20 +0000
Subject: [PATCH 06/37] Add a more concrete example on how to do a MFC.
Approved by: joel (mentor)
---
.../articles/committers-guide/article.sgml | 36 +++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 0814ee5aaf..d253ea8d39 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -575,7 +575,7 @@
preferable.</para>
</sect3>
- <sect3>
+ <sect3 id="subversion-primer-base-layout">
<title><literal>RELENG_*</literal> Branches and General
Layout</title>
@@ -1151,7 +1151,7 @@
&prompt.user; <userinput>svn commit stable/8</userinput></screen>
</sect3>
- <sect3>
+ <sect3 id="subversion-primer-merge">
<title>Merging with <acronym>SVN</acronym></title>
<para>This section deals with merging code from one branch to
@@ -1441,6 +1441,38 @@ $target - head/$source:$P,$Q,$R</screen>
Subversion.</para>
</sect5>
+ <sect5>
+ <title>Practical Example</title>
+ <para>As an practical example, consider the following scenario:
+ The changes to <filename>netmap.4</filename> in r238987 is
+ to be merged from CURRENT to 9-STABLE. The file resides in
+ <filename class="directory">head/share/man/man4</filename> and
+ according to <xref linkend="subversion-primer-merge"> this
+ is also where to do the merge. Note that in this example
+ all paths are relative to the top of the svn repository.
+ for more information on the directory layout, see
+ <xref linkend="subversion-primer-base-layout">.</para>
+ <para>The first step is to check the existing mergeinfo.</para>
+
+ <screen>&prompt.user; <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput></screen>
+
+ <para>Take a quick note of how it looks before moving on to the next
+ step; doing the actual merge:</para>
+
+ <screen>&prompt.user; <userinput>svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput>
+--- Merging r238987 into 'stable/9/share/man/man4':
+U stable/9/share/man/man4/netmap.4
+--- Recording mergeinfo for merge of r238987 into
+'stable/9/share/man/man4':
+ U stable/9/share/man/man4</screen>
+
+ <para>Check that the merge info is still ok; the revision
+ number of the merged revision should be added. Once this
+ is checked, the only thing left is the actual commit.</para>
+
+ <screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>
+ </sect5>
+
<sect5>
<title>Merging into the Kernel
(<filename class="directory">sys/</filename>)</title>
From 7d4cf7d4185551507d4311f790fb6c6867cf22d8 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 22 Aug 2012 16:27:42 +0000
Subject: [PATCH 07/37] Force-commit to portmgr/index.sgml so website picks up
recent change.
From 82eb8fca83a60ecec81dc44827f4cf09d52851a1 Mon Sep 17 00:00:00 2001
From: Benedict Reuschling <bcr@FreeBSD.org>
Date: Wed, 22 Aug 2012 16:51:24 +0000
Subject: [PATCH 08/37] Fix a typo in the translation found while reading the
chapter.
---
de_DE.ISO8859-1/books/handbook/users/chapter.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/books/handbook/users/chapter.sgml b/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
index 5a5828842a..699776f352 100644
--- a/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
@@ -492,7 +492,7 @@ Goodbye!
Benutzer gehört).</para>
</step>
<step>
- <para>Entfernt eingegange E-Mails des Benutzers
+ <para>Entfernt eingegangene E-Mails des Benutzers
aus <filename>/var/mail</filename>.</para>
</step>
<step>
From a99fa7ec0778e77d75106ddfb5dac1ff6318e519 Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 22 Aug 2012 18:11:32 +0000
Subject: [PATCH 09/37] Improve wording.
Suggested by: wblock
Approved by: joel (mentor)
---
en_US.ISO8859-1/articles/committers-guide/article.sgml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index d253ea8d39..42090ba254 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -1452,7 +1452,7 @@ $target - head/$source:$P,$Q,$R</screen>
all paths are relative to the top of the svn repository.
for more information on the directory layout, see
<xref linkend="subversion-primer-base-layout">.</para>
- <para>The first step is to check the existing mergeinfo.</para>
+ <para>The first step is to inspect the existing mergeinfo.</para>
<screen>&prompt.user; <userinput>svn propget svn:mergeinfo -R stable/9/share/man/man4</userinput></screen>
@@ -1466,9 +1466,9 @@ U stable/9/share/man/man4/netmap.4
'stable/9/share/man/man4':
U stable/9/share/man/man4</screen>
- <para>Check that the merge info is still ok; the revision
- number of the merged revision should be added. Once this
- is checked, the only thing left is the actual commit.</para>
+ <para>Check that the revision number of the merged revision
+ has been added. Once this is verified, the only thing left
+ is the actual commit.</para>
<screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>
</sect5>
From 3aeaa1f7b8706394794b6848fab94613c916ec3e Mon Sep 17 00:00:00 2001
From: Ken Smith <kensmith@FreeBSD.org>
Date: Thu, 23 Aug 2012 04:10:45 +0000
Subject: [PATCH 10/37] Update the target 9.1 schedule.
---
en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
index 70a3c1b7e8..90f94f89d2 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
@@ -79,27 +79,27 @@
<tr>
<td>RC1</td>
<td>20 July 2012</td>
- <td>-</td>
+ <td>23 August 2012</td>
<td>First release candidate.</td>
</tr>
<tr>
<td>RC2</td>
- <td>3 August 2012</td>
+ <td>7 September 2012</td>
<td>-</td>
<td>Second release candidate.</td>
</tr>
<tr>
<td>RELEASE build</td>
- <td>13 August 2012</td>
+ <td>14 September 2012</td>
<td>-</td>
<td>9.1-RELEASE built.</td>
</tr>
<tr>
<td>RELEASE announcement</td>
- <td>17 August 2012</td>
+ <td>19 September 2012</td>
<td>-</td>
<td>9.1-RELEASE press release.</td>
</tr>
From a242222cadba18b434aee27133726f3552fe3d77 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 23 Aug 2012 10:22:51 +0000
Subject: [PATCH 11/37] - Merge the following from the English version:
r38879 -> 39399 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
---
.../books/handbook/cutting-edge/chapter.sgml | 107 +++++-------------
1 file changed, 29 insertions(+), 78 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
index ef2f0a60e8..f4761185b5 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r38879
+ Original revision: r39399
$FreeBSD$
-->
@@ -750,13 +750,12 @@ Fetching 133 new ports or files... done.</screen>
�ǿ��� &os;
�ɥ�����ȥ��åȤ��������ǰݻ�������ˡ���Ѱդ���Ƥ��ޤ���</para>
- <sect2 id="csup-doc">
- <title>CVSup ���Ѥ����ɥ�����ȤΥ��åץǡ�����ˡ</title>
+ <sect2 id="dsvn-doc">
+ <title><application>Subversion</application>
+ ���Ѥ����ɥ�����ȤΥ��åץǡ�����ˡ</title>
- <para>&os; �Υɥ�����ȤΥ������䥤�ȡ��뤵�줿�ɥ�����Ȥϡ�
- �١��������ƥ�Υ������Υ��åץǡ���
- (<xref linkend="makeworld"> ��) ��Ʊ�͡�
- <application>CVSup</application> ���Ѥ��ƥ��åץǡ��ȤǤ��ޤ���
+ <para>&os; �Υɥ�����ȤΥ������ϡ�
+ <application>Subversion</application> ���Ѥ�������Ǥ��ޤ���
������Ǥϰʲ��ˤĤ����������ޤ���</para>
<itemizedlist>
@@ -767,9 +766,10 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
- <para><application>CVSup</application> ���Ѥ���
+ <para><application>Subversion</application> ���Ѥ��ơ�
+ �ɥ�����ȤΥ�������
<filename class="directory">/usr/doc</filename>
- �˥ɥ�����ȤΥ����������������ɤ�����ˡ��</para>
+ �ʲ��˥���������ɤ�����ˡ��</para>
</listitem>
<listitem>
@@ -787,12 +787,13 @@ Fetching 133 new ports or files... done.</screen>
</sect2>
<sect2 id="installing-documentation-toolchain">
- <title>CVSup ����ӥɥ�����ȥġ����������Υ��ȡ���</title>
+ <title><application>Subversion</application>
+ ����ӥɥ�����ȥġ����������Υ��ȡ���</title>
<para>&os; �Υɥ�����Ȥ�������ƹ��ۤ���ˤϡ�
���ʤ��礭�ʥġ���Υ��쥯�����ɬ�פǤ���
�����Υġ����¿���Υǥ��������̤�ɬ�פȤ����ޤ���
- ���٤Ƥ� &os; �桼���ˤȤä�ͭ�ѤȤ����櫓�ǤϤʤ����ᡢ
+ ���٤Ƥ� &os; �桼���ˤȤä�ͭ�ѤȤ����櫓�ǤϤʤ��Τǡ�
&os; �١��������ƥ�ΰ����ǤϤ���ޤ���
�����Υġ���ϡ�&os;
�Τ���˿������ɥ�����Ȥ��ȯ�˼�ɮ���Ƥ������䡢
@@ -816,68 +817,36 @@ Fetching 133 new ports or files... done.</screen>
���Υġ���ȡ��뤷�ʤ����ȤϤȤƤ⸭���Ǥ���</para>
</note>
- <para><application>CVSup</application>
- �Υ��ȡ��뤪������Ѥ˴ؤ��뤵��ʤ����ϡ�<link
- linkend="cvsup">CVSup ��Ȥ�</link> �ξϤ�������������</para>
+ <para><filename role="package">textproc/docproj</filename>
+ �ȡ��뤹��ȡ�<application>Subversion</application>
+ �⥤�ȡ��뤵��ޤ���</para>
</sect2>
<sect2 id="updating-documentation-sources">
<title>�ɥ�����ȤΥ������åץǡ��Ȥ���</title>
- <para><application>CVSup</application> �桼�ƥ���ƥ���Ȥäơ�
- �ɥ�����ȤΥ����������������ɤǤ��ޤ���
- ������ <filename>/usr/share/examples/cvsup/doc-supfile</filename>
- �ե����뤬����Υƥ�ץ졼�ȤǤ���
- �ǥե���ȤΥ��åץǡ��ȥۥ��Ȥ� <filename>doc-supfile</filename>
- �Υץ졼���ۥ�����ͤ����ꤵ��Ƥ��ޤ�����
- &man.cvsup.1; �˥��ޥ�ɥ饤��ǥۥ���̾����ꤹ�뤳�Ȥ�Ǥ��ޤ���
- <application>CVSup</application> ������
- 1 �Ĥ���ɥ�����ȤΥ����������������ɤ���ˤϰʲ��Τ褦�����Ϥ��Ƥ���������</para>
+ <para>�ɥ�����ȤΥ������ϡ�
+ <application>Subversion</application>
+ �ץ�������Ȥäƥ���������ɤǤ��ޤ���
+ ����������ɤ���ˤϰʲ��Τ褦�����Ϥ��Ƥ���������</para>
- <screen>&prompt.root; <userinput>cvsup -h <replaceable>cvsup.FreeBSD.org</replaceable> -g -L 2 <filename>/usr/share/examples/cvsup/doc-supfile</filename></userinput></screen>
-
- <para>������ <replaceable>cvsup.FreeBSD.org</replaceable> ��Ǥ���
- <application>CVSup</application> �����Ф��֤������Ƥ���������
- �ߥ顼�����Ȥδ����ʰ����ˤĤ��Ƥϡ�<xref
- linkend="cvsup-mirrors"> ��������������</para>
+ <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
<para>�ǽ�˥ɥ�����ȤΥ����������������ɤ���ˤϾ������֤�������ޤ���
����������ɤ������ޤǤ��Ԥ�����������</para>
- <para>����ɥ�����ȤΥ������åץǡ��Ȥ���ˤϡ�
- Ʊ�����ޥ�ɤ�¹Ԥ��Ƥ���������<application>CVSup</application>
- �桼�ƥ���ƥ��ϺǸ�˼¹Ԥ���������Υ��åץǡ��ȤΤߤ����������ɤ���Τǡ�
- �ǽ�� <application>CVSup</application> ��¹Ԥ�����Ǥϡ�
- ���ޥ�ɤμ¹Ի��֤Ϥ��ʤ�û���ʤ�ޤ�</para>
+ <para>����������ɤ����ɥ�����ȤΥ������åץǡ��Ȥ���ˤϡ�
+ �ʲ��Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
- <para>�����������ꤷ���顢�ɥ�����ȤΥ��åץǡ��Ȥˡ�<filename
+ <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
+
+ <para>�����������ꤷ���顢<filename
class="directory">/usr/doc</filename> �ǥ��쥯�ȥ��
- <filename>Makefile</filename> ��Ȥ����Ȥ�Ǥ��ޤ���
- <filename>/etc/make.conf</filename> �ե������
- <makevar>SUP_UPDATE</makevar>, <makevar>SUPHOST</makevar> �����
- <makevar>DOCSUPFILE</makevar> �����ꤹ��ȡ�
- �ʲ���¹ԤǤ���褦�ˤʤ�ޤ���</para>
+ <filename>Makefile</filename> ��Ȥ���
+ �ʲ��Τ褦�˥ɥ�����Ȥåץǡ��Ȥ��뤳�Ȥ�Ǥ��ޤ���</para>
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make update</userinput></screen>
-
- <para>�ʲ��ϡ�<filename>/etc/make.conf</filename> �� &man.make.1;
- ���ץ�����ŵ��Ū����Ǥ���</para>
-
- <programlisting>SUP_UPDATE= yes
-SUPHOST?= cvsup.freebsd.org
-DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
-
- <note>
- <para><makevar>SUPHOST</makevar> �����
- <makevar>DOCSUPFILE</makevar> ���ͤ�
- <literal>?=</literal> �ˤ���ȡ�
- make �Υ��ޥ�ɥ饤��ξ����Ĥ��ޤ���
- ����ϡ����ޤ��ޤʥ��ץ������ͤ�ƥ��Ȥ�����ˡ�
- �ͤ��Ȥ˥ե�������Խ����뤳�Ȥ����뤿�ᡢ
- <filename>make.conf</filename>
- �˥��ץ������ɲä�����ˡ�Ȥ��ƿ侩����Ƥ��ޤ���</para>
- </note>
</sect2>
<sect2 id="updating-documentation-options">
@@ -915,15 +884,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
</varlistentry>
- <varlistentry>
- <term><makevar>SUPHOST</makevar></term>
-
- <listitem>
- <para>���åץǡ��Ȼ��˻Ȥ� <application>CVSup</application>
- �����ФΥۥ��ȥ͡��ࡣ</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><makevar>DOCDIR</makevar></term>
@@ -957,15 +917,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>�⤷��<filename>make.conf</filename> ��
- <makevar>DOCSUPFILE</makevar>, <makevar>SUPHOST</makevar> �����
- <makevar>SUP_UPDATE</makevar> ���ץ�����Ŭ�ڤ����ꤷ�Ƥ���ΤǤ���С�
- ���ȡ���Υ��ƥåפϡ�
- �ʲ��Τ褦�˥ɥ�����ȤΥ��åץǡ��Ⱥ�Ȥ�����Ǥ��ޤ���</para>
-
- <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make update install clean</userinput></screen>
-
<para>�⤷����������θ���Τߤåץǡ��Ȥ������ΤǤ���С�
<filename class="directory">/usr/doc</filename>
���֥ǥ��쥯�ȥ�ǰʲ��Τ褦�� &man.make.1; ��¹Ԥ��Ƥ���������</para>
@@ -1008,7 +959,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
�ɥ�����Ȥ������鹽�ۤ���ˤϡ�
���ʤ��礭�ʥġ���ȥ桼�ƥ���ƥ����鹽�������
<emphasis>�ɥ�����ơ������ġ����������</emphasis> ��ɬ�פǤ���
- �ޤ���<application>CVS</application>
+ �ޤ���<application>Subversion</application>
��ݥ��ȥ꤫�饽����������å������Ȥ���
�����å������Ȥ�������������ɥ�����Ȥ��ư�ǹ��ۤ�����ˡ�ˤĤ��ơ�
����ʤ�˽��Τ��Ƥ���ɬ�פ⤢��ޤ���
@@ -1146,7 +1097,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<note>
<para>�ǥե���ȤΥ������åȥǥ��쥯�ȥ�ϡ�
- <application>CVSup</application>
+ <application>Subversion</application>
���Ѥ�����ˡ�Ȥϰۤʤ�ޤ���
�ʤ��ʤ�С�������������Ƥ�����ˡ�Ǥ�
port ���Ѥ��ƥ��ȡ��뤷�Ƥ��ꡢ
From 9e56dc06196e13361927cf3e2469f9d95c0a2c09 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 23 Aug 2012 18:33:15 +0000
Subject: [PATCH 12/37] Announce 9.1-RC1.
---
share/sgml/news.xml | 15 +++++++++++++++
share/sgml/release.ent | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/share/sgml/news.xml b/share/sgml/news.xml
index ce922ecf73..2867c8ffe4 100644
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@@ -35,6 +35,21 @@
<month>
<name>8</name>
+ <day>
+ <name>23</name>
+ <event>
+ <title>&os; 9.1-RC1 Available</title>
+
+ <p>The first RC build for the &os;-9.1 release cycle is
+ now available. ISO images for the amd64, i386, powerpc64
+ and sparc64 architectures are <a
+ href="&lists.stable;/2012-August/069233.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>21</name>
diff --git a/share/sgml/release.ent b/share/sgml/release.ent
index bd92c7ecfd..0b6d3c9a74 100644
--- a/share/sgml/release.ent
+++ b/share/sgml/release.ent
@@ -32,7 +32,7 @@
<!ENTITY beta.testing "INCLUDE">
<!ENTITY % beta.testing "INCLUDE">
<!ENTITY betarel.current '9.1'>
-<!ENTITY betarel.vers 'BETA1'>
+<!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 d56b75efbaaee3ee3df4c17f44351b2bad4f984c Mon Sep 17 00:00:00 2001
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Thu, 23 Aug 2012 20:29:55 +0000
Subject: [PATCH 13/37] - Get ade@ listed on the alumni page
Approved by: gjb
---
.../articles/contributors/contrib.portmgralumni.sgml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
index e45743856b..37ddfaa5ce 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
@@ -41,6 +41,10 @@
<para>&a.steve; (2001 - 2004)</para>
</listitem>
+ <listitem>
+ <para>&a.ade; (2001 - 2002)</para>
+ </listitem>
+
<listitem>
<para>&a.asami; ( - 2001)</para>
</listitem>
From a3ae7c3803bda306413a85ea9841bb689dfdf988 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 06:39:59 +0000
Subject: [PATCH 14/37] PR: www/170412
Add CloudSigma to the list of ISP providers with FreeBSD support. They support the install of native FreeBSD into their cloud.
Requested by: Yoanna Savova <yoanna.savova@cloudsigma.com>
---
share/sgml/commercial.isp.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/share/sgml/commercial.isp.xml b/share/sgml/commercial.isp.xml
index 52e23ec5e0..c9e7aef03f 100644
--- a/share/sgml/commercial.isp.xml
+++ b/share/sgml/commercial.isp.xml
@@ -309,6 +309,23 @@
</description>
</entry>
+ <entry id="CloudSigma">
+ <name>CloudSigma</name>
+ <url>http://cloudsigma.com/en</url>
+ <description>
+ As a public cloud provider we pride ourselves on offering the
+ latest operating system releases via our public library of
+ instantly deployable images. FreeBSD is a popular distribution
+ and we have a loyal following of FreeBSD users. Especially as we
+ are one of the few public clouds that natively supports FreeBSD
+ without modification. We are very pleased to offer version 9.0
+ with a 7 day free trial as an ideal opportunity for new customers
+ to discover as well what the latest version has to offer. Please
+ visit our <a href="http://cloudsigma.com/en">website</a> to get
+ more information.
+ </description>
+ </entry>
+
<entry id="colocationamerica">
<name>Colocation America</name>
<url>http://www.colocationamerica.com/</url>
From 335150f2e9f82d771169284f0503b23005239c47 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 07:19:31 +0000
Subject: [PATCH 15/37] PR: www/170607
Add Cloud BT IT Support from Australia to the list of consultants with FreeBSD support.
Requested by: JJ Fiasson <jj.fiasson@nowfixit.com.au>
---
share/sgml/commercial.consult.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/share/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index a40314264e..73ea660388 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@@ -225,6 +225,22 @@
</description>
</entry>
+ <entry id="CloudBT" category="australia">
+ <name>Cloud BT IT Support</name>
+ <url>http://www.clue.com/</url>
+ <description>
+ Cloud BT provides IT support and other IT services to businesses in
+ Australia, including system maintenance, <a
+ href="http://www.it-support.com.au/data-recovery/">data
+ recovery</a>, and ongoing IT consulting. We also provide a range of
+ scalable cloud solutions to our business clients. In our day-to-day
+ operation we support numerous platforms including FreeBSD, Linux and
+ other Unix-based environments. Call us on 1300 737 205 or visit our
+ <a href="http://www.it-support.com.au/">website</a> for more
+ information.
+ </description>
+ </entry>
+
<entry id="Clue" category="namerica">
<name>Clue Computing, Inc.</name>
<url>http://www.clue.com/</url>
From 17d3f890c1b206c54a3a9235d3373550206b76bd Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 24 Aug 2012 11:36:07 +0000
Subject: [PATCH 16/37] - Merge the following from the English version:
r39290 -> r39424 head/ja_JP.eucJP/share/sgml/news.xml
---
ja_JP.eucJP/share/sgml/news.xml | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/ja_JP.eucJP/share/sgml/news.xml b/ja_JP.eucJP/share/sgml/news.xml
index 880da5381b..2426af939c 100644
--- a/ja_JP.eucJP/share/sgml/news.xml
+++ b/ja_JP.eucJP/share/sgml/news.xml
@@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
- Original revision: r39290
+ Original revision: r39424
-->
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
@@ -35,6 +35,30 @@
<month>
<name>8</name>
+ <day>
+ <name>23</name>
+ <event>
+ <title>&os; 9.1-RC1 ����</title>
+
+ <p>&os;-9.1 ������������κǽ�Υ��������Ǥ���������ޤ�����
+ amd64, i386, powerpc64 ����� sparc64
+ �������ƥ������ ISO ��������� <a
+ href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+ �ߥ顼������</a> �� <a
+ href="&lists.stable;/2012-August/069233.html">����</a>
+ ����Ƥ��ޤ���</p>
+ </event>
+ </day>
+
+ <day>
+ <name>21</name>
+
+ <event>
+ <p>�����ߥå���Ǥ:
+ <a href="mailto:zont@FreeBSD.org">Andrey Zonov</a> (src)</p>
+ </event>
+ </day>
+
<day>
<name>1</name>
From eac97f2a47dd4cd7a88e7020545b4e6d02c76f5e Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 11:38:04 +0000
Subject: [PATCH 17/37] PR: www/170656
Add the BSD usergroup "Grupo de Usuarios BSD de Venezuela" to the usergroup list.
Requested by: Alberto Mijares <amijaresp@gmail.com>
---
share/sgml/usergroups.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/share/sgml/usergroups.xml b/share/sgml/usergroups.xml
index 0601ddfb86..95621dd9f5 100644
--- a/share/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
@@ -927,6 +927,18 @@ The country codes are precise ISO3166 codes from, e.g.
</entry>
</country>
+ <country code="VE" name="Venezuela">
+ <entry id="bsd-ve">
+ <name>Grupo de Usuarios BSD de Venezuela</name>
+ <url>http://groups.google.com/group/bsd-ve/about</url>
+ <description>The Grupo de Usuarios BSD de Venezuela is a forum
+ for *BSD users in Venezuela. For more information please
+ contact the group admin <a
+ href="mailto:amijaresp@gmail.com">Alberto Mijares</a>.
+ </description>
+ </entry>
+ </country>
+
<country code="BR" name="Brazil">
<entry id="fugspbr">
<name>The Brazilian FreeBSD User Group (FUG-BR)</name>
From 4eaebdf457123f81eeb69d69cb5cdbcecbf27060 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 12:54:33 +0000
Subject: [PATCH 18/37] PR: www/170657
Update the entry for Fortuitous.com.
Requested by: Philip Carinhas <support@fortuitous.com>
---
share/sgml/commercial.consult.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/share/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index 73ea660388..7a4874e46b 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@@ -2205,12 +2205,12 @@
<name>Fortuitous Technologies</name>
<url>http://fortuitous.com</url>
<description>
- Fortuitous Technologies provides Capacity Planning, Performance
- Tuning, and consulting services for FreeBSD, Linux, and Unix
- systems worldwide. We cover Cluster, Grid, and Multi-tiered
- systems of all types. Contact Fortuitous <a
- href="http://fortuitous.com/en/contact.html">here</a> or by
- telephone at (512) 351-7783.
+ Fortuitous Technologies provides Performance Tuning, Capacity
+ Planning, System Design, Network Design and security services
+ for FreeBSD, Linux, and Unix systems worldwide. We cover Cloud,
+ Grid, and Multi-tiered systems of all types. Contact us at <a
+ href="http://fortuitous.com">http://Fortuitous.com</a> for
+ further information.
</description>
</entry>
From eafe83ee678bbb137c27483130e2a8b29093f726 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 13:23:55 +0000
Subject: [PATCH 19/37] PR: www/170687
Update the entry for Wirewalk Technologies.
Requested by: Lenny Shovsky <sales@wirewalk.com>
---
share/sgml/commercial.consult.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/share/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index 7a4874e46b..f74c71898e 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@@ -1715,12 +1715,13 @@
<url>http://www.wirewalk.com/</url>
<description>
Wirewalk Technologies is a NYC based consulting company, with
- offices in London, Moscow and Rome. We provide consulting solutions
- for: FreeBSD, OpenBSD, Linux, Solaris, HPUX, AIX and Irix.
- Programming solutions in: C, C++, Java, Perl, Oracle, MySQl etc.
- Contact us: <a
- href="mailto:sales@wirewalk.com">sales at wirewalk.com</a>,
- 646-827-9397.
+ strategic partnerships around the globe. We offer onsite and
+ remote consulting, and full integration services based on
+ FreeBSD, as well as OpenBSD, NetBSD, Linux, MacOS, Solaris.
+ Programming solutions in: C, C++, Java, Perl, PHP, Oracle,
+ MySQL, Postgresql, etc. Contact us via <a
+ href="mailto:sales@wirewalk.com">email</a> or call us under#
+ 212-202-2613 or 917-217-7975.
</description>
</entry>
From 1a508b9d1060bc0ddc21c4b0df917caecf04e68a Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 14:20:17 +0000
Subject: [PATCH 20/37] MFen: r39290 -> r39424
Resync the news section.
Obtained from: The FreeBSD German Documentation Project
---
de_DE.ISO8859-1/share/sgml/news.xml | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/share/sgml/news.xml b/de_DE.ISO8859-1/share/sgml/news.xml
index 72e601586f..d8768cd769 100644
--- a/de_DE.ISO8859-1/share/sgml/news.xml
+++ b/de_DE.ISO8859-1/share/sgml/news.xml
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r39290
+ basiert auf: r39424
-->
<!-- Simple schema for FreeBSD Project news.
@@ -43,6 +43,31 @@
<month>
<name>8</name>
+ <day>
+ <name>23</name>
+
+ <event>
+ <title>&os; 9.1-RC1 verfügbar</title>
+
+ <p>Der erste Release Candidate aus dem &os;-9.1-Releasezyklus
+ ist <a
+ href="&lists.stable;/2012-August/069233.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>21</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:zont@FreeBSD.org">Andrey Zonov</a> (src)</p>
+ </event>
+ </day>
+
<day>
<name>1</name>
From ba3b03ba49857964c672265c00dcd7275dabf611 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 14:57:47 +0000
Subject: [PATCH 21/37] Fix the entry for 9.1-RC1.
There are no ISO images for sparc64 at the moment. See announcement and FTP server.
---
share/sgml/news.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/sgml/news.xml b/share/sgml/news.xml
index 2867c8ffe4..28412cb1bf 100644
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@@ -41,8 +41,8 @@
<title>&os; 9.1-RC1 Available</title>
<p>The first RC build for the &os;-9.1 release cycle is
- now available. ISO images for the amd64, i386, powerpc64
- and sparc64 architectures are <a
+ now available. ISO images for the amd64, i386 and powerpc64
+ architectures are <a
href="&lists.stable;/2012-August/069233.html">available</a>
on most of our <a
href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
From c1956e89f70571f8628049bab0ca2bd94e6821b3 Mon Sep 17 00:00:00 2001
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 24 Aug 2012 21:51:14 +0000
Subject: [PATCH 22/37] add Nick Dewing for devel/rubygem-mixlib-shellout
PR: 170998
Sponsored by: Experts-Exchange, LLC.
---
.../articles/contributors/contrib.additional.sgml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 416b594dc3..f3fdf14684 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -7275,6 +7275,11 @@
<email>Nick.Barnes@pobox.com</email></para>
</listitem>
+ <listitem>
+ <para>Nick Dewing
+ <email>ndewing@experts-exchange.com</email></para>
+ </listitem>
+
<listitem>
<para>Nick Handel
<email>nhandel@NeoSoft.com</email></para>
From 3e873dfb4c2a1b3f874dc34a43e42bfc30702c16 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 24 Aug 2012 23:27:16 +0000
Subject: [PATCH 23/37] PR: www/170996 PR: www/170607
Fix a wrong link introduced with r39427.
Noticed by: JJ Fiasson <jj.fiasson@gmail.com>
---
share/sgml/commercial.consult.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index f74c71898e..b814451af1 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@@ -227,7 +227,7 @@
<entry id="CloudBT" category="australia">
<name>Cloud BT IT Support</name>
- <url>http://www.clue.com/</url>
+ <url>http://www.it-support.com.au/</url>
<description>
Cloud BT provides IT support and other IT services to businesses in
Australia, including system maintenance, <a
From f6617bf5d72981ee72b59c800015ffb12e915ab7 Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 25 Aug 2012 01:01:28 +0000
Subject: [PATCH 24/37] - Update core-secretary
Approved by: core (implicit)
---
en_US.ISO8859-1/books/dev-model/book.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/books/dev-model/book.sgml b/en_US.ISO8859-1/books/dev-model/book.sgml
index 66a221b66b..517e0a46f5 100644
--- a/en_US.ISO8859-1/books/dev-model/book.sgml
+++ b/en_US.ISO8859-1/books/dev-model/book.sgml
@@ -1162,7 +1162,7 @@
unresolved.
</para>
<para>
- Hat currently held by: &a.gavin;.
+ Hat currently held by: &a.pgj;.
</para>
</section>
From 4aa837986522ff486711061b84d7902b3d590215 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 25 Aug 2012 05:37:26 +0000
Subject: [PATCH 25/37] - Merge the following from the English version:
r39424 -> r39436 head/ja_JP.eucJP/share/sgml/news.xml
---
ja_JP.eucJP/share/sgml/news.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ja_JP.eucJP/share/sgml/news.xml b/ja_JP.eucJP/share/sgml/news.xml
index 2426af939c..661a1b6069 100644
--- a/ja_JP.eucJP/share/sgml/news.xml
+++ b/ja_JP.eucJP/share/sgml/news.xml
@@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
- Original revision: r39424
+ Original revision: r39436
-->
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
@@ -41,10 +41,9 @@
<title>&os; 9.1-RC1 ����</title>
<p>&os;-9.1 ������������κǽ�Υ��������Ǥ���������ޤ�����
- amd64, i386, powerpc64 ����� sparc64
- �������ƥ������ ISO ��������� <a
- href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
- �ߥ顼������</a> �� <a
+ <a href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+ �ߥ顼������</a> �ˤ����ơ�amd64, i386 ����� powerpc64
+ �������ƥ������ ISO ������� <a
href="&lists.stable;/2012-August/069233.html">����</a>
����Ƥ��ޤ���</p>
</event>
From 5050a8a6fbda58ef94e56b81c853fb78544742d8 Mon Sep 17 00:00:00 2001
From: Benedict Reuschling <bcr@FreeBSD.org>
Date: Sat, 25 Aug 2012 11:07:19 +0000
Subject: [PATCH 26/37] Fix typo in title.
---
de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
index 958b05353c..40f61d07e1 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
@@ -383,7 +383,7 @@ etc...</programlisting>
</sect2>
<sect2 id="x86-where-return-values">
- <title>Wo sind die Rückgabewerdet?</title>
+ <title>Wo sind die Rückgabewerte?</title>
<para>Leider gilt: Es kommt darauf an... Für die meisten
Systemaufrufe liegt er in <varname
From d820807bc8430ea06eadcf1e49b18f4d36ecd673 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sat, 25 Aug 2012 14:42:42 +0000
Subject: [PATCH 27/37] Add Subversion Sites section to the mirrors chapter
listing official Subversion mirrors.
Obtained from: Google
---
.../books/handbook/mirrors/chapter.sgml | 92 +++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 2a4e4881ea..76b3ba6dbf 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -227,6 +227,98 @@
linkend="burncd">, burncd.</para>
</sect1>
+ <sect1 id="mirrors-svn">
+ <title>Subversion Sites</title>
+
+ <indexterm>
+ <primary>svn</primary>
+ </indexterm>
+
+ <para>As of July 2012 &os;
+ uses <ulink url="http://subversion.apache.org/">Subversion</ulink>
+ (svn) as the primary version control system to store all of
+ &os;'s source code.</para>
+
+ <note><para>For most user, instead of using Subversion it is
+ suggested to use
+ <link linkend="updating-upgrading-freebsdupdate">FreeBSD
+ Update</link> for updating the &os; base system, and
+ <link linkend="updating-upgrading-portsnap">Portsnap</link>
+ for &os; Ports Collection.</para></note>
+
+ <para>The &os; mirror network is still in its early days, and will
+ likely change again, so do not count on this list of mirrors
+ being static. In particular the SSL certificates of the servers
+ will likely change at some point.</para>
+
+ <para>In subversion URLs are always used to designate a
+ repository. They have the
+ form <literal>protocol://hostname/path</literal>. Mirrors may
+ support different protocols as specified below. The first
+ component of the path is the FreeBSD repository to access. There
+ are three different repositories, base for the &os; Base
+ system, <literal>ports</literal> for the FreeBSD Ports
+ Collection, and <literal>doc</literal> for the FreeBSD
+ Documentation. All mirrors carries all repositories. The URL
+ for the &os; ports repository's main branch on svn0.FreeBSD.org
+ using the svn protocol would
+ be: <literal>svn://svn0.FreeBSD.org/ports/head/</literal>.</para>
+
+ <para>The master FreeBSD Subversion server,
+ <literal>svn.FreeBSD.org</literal> is publicly accessible
+ read-only, but this may change in the future so users are
+ encouraged to use one of the official mirrors. To browse the
+ FreeBSD Subversion repositories through a browser,
+ use
+ <ulink url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
+
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colwidth="2*">
+ <colspec colwidth="1*">
+ <colspec colwidth="1*">
+ <colspec colwidth="4*">
+ <thead>
+ <row>
+ <entry>Name</entry>
+
+ <entry>Protocols</entry>
+
+ <entry>Location</entry>
+
+ <entry>SSL fingerprint</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>svn0.us-west.FreeBSD.org</entry>
+
+ <entry>svn, <ulink url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
+ <ulink url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
+
+ <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>
+ </row>
+
+ <row>
+ <entry>svn0.us-east.FreeBSD.org</entry>
+
+ <entry>svn, <ulink url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
+ <ulink url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
+
+ <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>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect1>
+
<sect1 id="anoncvs">
<title>Anonymous CVS</title>
From 2da3f5cf91e6e42f7e52402589e7489719f85e19 Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 25 Aug 2012 19:37:13 +0000
Subject: [PATCH 28/37] Add a missing closing tag.
---
en_US.ISO8859-1/articles/building-products/article.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/articles/building-products/article.sgml b/en_US.ISO8859-1/articles/building-products/article.sgml
index c060b90d68..4233570c8b 100644
--- a/en_US.ISO8859-1/articles/building-products/article.sgml
+++ b/en_US.ISO8859-1/articles/building-products/article.sgml
@@ -504,7 +504,7 @@
</listitem>
<listitem>
<simpara>The goals of the FreeBSD project are
- <citation>Hub1994</citation>:
+ <citation>Hub1994</citation>:</simpara>
<itemizedlist spacing="compact">
<listitem>
<simpara>To develop a high-quality operating system for
From a8c453bebc148b3ba9dfa5899f34c1be670b0b1c Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 25 Aug 2012 19:51:06 +0000
Subject: [PATCH 29/37] Add new translated article (building-products)
PR: docs/161804
Submitted by: Frederic Culot <culot@FreeBSD.org>
---
.../articles/building-products/Makefile | 20 +
.../articles/building-products/article.sgml | 1303 +++++++++++++++++
2 files changed, 1323 insertions(+)
create mode 100644 fr_FR.ISO8859-1/articles/building-products/Makefile
create mode 100644 fr_FR.ISO8859-1/articles/building-products/article.sgml
diff --git a/fr_FR.ISO8859-1/articles/building-products/Makefile b/fr_FR.ISO8859-1/articles/building-products/Makefile
new file mode 100644
index 0000000000..7ca6b11b43
--- /dev/null
+++ b/fr_FR.ISO8859-1/articles/building-products/Makefile
@@ -0,0 +1,20 @@
+#
+# $FreeBSD$
+#
+# Article: Building products using FreeBSD
+
+DOC?= article
+
+FORMATS?= html
+
+INSTALL_COMPRESSED?= gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+IMAGES_EN= freebsd-branches.pic freebsd-organization.pic
+
+URL_RELPREFIX?= ../../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
+
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.sgml b/fr_FR.ISO8859-1/articles/building-products/article.sgml
new file mode 100644
index 0000000000..d72da08d4b
--- /dev/null
+++ b/fr_FR.ISO8859-1/articles/building-products/article.sgml
@@ -0,0 +1,1303 @@
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"> %man;
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"> %freebsd;
+<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> %urls.ent;
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES Common Document URL Entities//FR"> %urls;
+<!ENTITY % abstract PUBLIC "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"> %abstract;
+<!ENTITY % artheader PUBLIC "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"> %artheader;
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//FR">%trademarks;
+<!ENTITY % not.published "IGNORE">
+]>
+
+<!--
+ The FreeBSD Documentation Project
+ The FreeBSD French Documentation Project
+ Original revision: 39444
+-->
+
+<article lang="fr">
+ <articleinfo>
+ <title>Construire des produits avec &os;</title>
+
+ <authorgroup>
+ <author>
+ <firstname>Joseph</firstname>
+ <surname>Koshy</surname>
+ <affiliation>
+ <orgname>Le Projet &os;</orgname>
+ <address><email>jkoshy@FreeBSD.org</email></address>
+ </affiliation>
+ </author>
+ </authorgroup>
+
+ <pubdate>$FreeBSD$</pubdate>
+
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.general;
+ </legalnotice>
+
+ <abstract>
+ <title>Résumé</title>
+
+ <para>Le projet &os; est un projet international, collaboratif
+ et basé sur le volontariat, qui développe un
+ système d'exploitation portable et de grande
+ qualité. Le projet &os; distribue le code source de
+ ses produits avec une licence libérale dans l'intention
+ d'encourager l'utilisation de son code. Collaborer avec le
+ project &os; peut aider les organisations à
+ réduire leur délai de mise sur le marché,
+ leurs coûts de développement, et améliorer
+ la qualité de leurs produits.</para>
+
+ <para>Cet article se penche sur les questions relatives à
+ l'utilisation du code de &os; dans les appareils informatiques
+ et les logiciels. Il met en évidence les
+ caractéristiques de &os; qui en font un excellent
+ support pour le développement de produits. Cet article
+ conclut en suggérant quelques <quote>bonnes
+ pratiques</quote> pour les organisations qui collaborent avec
+ le projet &os;.</para>
+ &trans.a.culot;
+ </abstract>
+ </articleinfo>
+
+ <sect1 id="introduction">
+ <title>Introduction</title>
+
+ <para>&os; est reconnu aujourd'hui comme un système
+ d'exploitation hautes performances pour serveurs. Il est
+ déployé sur des millions de serveurs web et de
+ machines connectées à internet de part le monde.
+ Le code de &os; fait aussi partie intégrante de beaucoup
+ de produits depuis des appareils comme les routeurs
+ réseau, pare-feux, et dispositifs de stockage, jusqu'aux
+ ordinateurs personnels. Des parties de &os; ont
+ également été utilisées dans des
+ produits commerciaux (voir <xref
+ linkend="freebsd-intro">).</para>
+
+ <para>Dans cet article nous nous intéressons au <ulink
+ url="&url.base;/">projet &os;</ulink> en tant que ressource pour
+ la conception logicielle—une collection de briques de base
+ et de processus que vous pouvez utiliser pour construire
+ d'autres produits.</para>
+
+ <para>Bien que les sources de &os; soient distribuées
+ librement au public, les organisations ont besoin de
+ <emphasis>collaborer</emphasis> avec le projet pour pouvoir
+ pleinement apprécier les bénéfices de ce
+ travail. Dans les sections suivantes de cet article nous
+ présentons les moyens efficaces qui existent afin de
+ collaborer avec le projet, ainsi que les pièges à
+ éviter.</para>
+
+ <formalpara>
+ <title>Avertissement au lecteur</title>
+
+ <para>L'auteur pense que les caractéristiques du Projet
+ &os; telles que décrites dans cet article sont en
+ grande partie vraies au moment où cet article a
+ été conçu et rédigé (2005).
+ Cependant, le lecteur doit garder en tête que les
+ pratiques et processus utilisés par les
+ communautés open-source peuvent changer au cours du
+ temps, et que les informations contenues dans cet article
+ devraient donc être considérées comme
+ étant indicatives plutôt que
+ prescriptives.</para>
+ </formalpara>
+
+ <sect2>
+ <title>Public visé</title>
+
+ <para>Ce document pourrait présenter un
+ intérêt pour les groupes de personnes
+ suivants:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Les preneurs de décisions dans les
+ entreprises qui recherchent à améliorer la
+ qualité de leurs produits, à réduire
+ leur délai de mise sur le marché, et
+ réduire leurs coûts de développement sur
+ le long terme.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les consultants en technologie à la
+ recherche de bonnes pratiques pour tirer profit de
+ l'<quote>open-source</quote>.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les spécialistes de l'industrie
+ intéressés par la compréhension de la
+ dynamique des projets open-source.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les développeurs logiciels cherchant
+ à utiliser &os; et désirant contribuer au
+ projet en retour.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2>
+ <title>Objectifs de l'article</title>
+
+ <para>La lecture de cet article devrait vous apporter:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Une compréhension des buts du Projet &os;
+ ainsi que de la structure de son organisation.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Un aperçu des technologies disponibles dans
+ le projet.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Une compréhension de son modèle de
+ développement et de ses processus
+ d'ingénierie.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Une compréhension des différences
+ entre les processus de développement conventionnels
+ que l'on retrouve chez les éditeurs de logiciels et
+ ceux utilisés par le projet &os;.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Une sensibilisation aux canaux de communication
+ utilisés par le projet et le niveau de transparence
+ auquel vous pouvez vous attendre.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Une connaissance des moyens optimaux qui existent
+ pour travailler avec le projet—comment
+ réduire au maximum les coûts de
+ développement, améliorer le délai de
+ mise sur le marché, gérer les failles de
+ sécurité, et préserver la
+ compatibilité future de votre produit avec les
+ évolutions du projet &os;.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2>
+ <title>Structure de l'article</title>
+
+ <para>La suite de l'article est structurée de la
+ façon suivante:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara><xref linkend="freebsd-intro"> introduit le projet
+ &os;, présente sa structure organisationnelle, ses
+ technologies clés et ses processus de
+ développement.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara><xref linkend="freebsd-collaboration"> décrit
+ les moyens de collaborer avec le projet &os;. Les
+ pièges les plus courants rencontrés par les
+ sociétés travaillant avec les projets
+ basés sur le volontariat comme &os; sont
+ également présentés.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara><xref linkend="conclusion"> conclut.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+ </sect1>
+
+ <sect1 id="freebsd-intro">
+ <title>&os; en tant que brique constitutive</title>
+
+ <para>&os; représente une excellente base sur laquelle
+ construire des produits:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Le source code de &os; est distribué avec une
+ licence BSD libérale qui facilite grandement son
+ utilisation dans les produits commerciaux
+ <citation>Mon2005</citation>.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Le projet &os; a d'excellentes pratiques de
+ développement qui peuvent être mises à
+ profit.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Le projet offre une transparence exceptionnelle eu
+ égard à son fonctionnement, permettant aux
+ companies utilisant son code de planifier efficacement
+ l'avenir.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>La culture du projet &os;, héritée du
+ Groupe de Recherche sur la Science Informatique de
+ l'Université de Berkeley en Californie
+ <citation>McKu1999-1</citation>, encourage le travail de
+ grande qualité. Certaines fonctionnalités de
+ &os; sont considérés comme des
+ références.</simpara>
+ </listitem>
+ </itemizedlist>
+
+ <simpara><citation>GoldGab2005</citation> examine avec plus de
+ détails les raisons commerciales qui justifient
+ l'utilisation de l'open-source. Les bénéfices que
+ les sociétés peuvent tirer de l'utilisation de
+ composants &os; dans leurs produits comprennent un délai
+ réduit de mise sur le marché, ainsi qu'une
+ réduction des coûts et des risques liés au
+ développement.</simpara>
+
+ <sect2>
+ <title>Construire avec &os;</title>
+
+ <simpara>Voici quelques utilisations que des
+ sociétés ont faites de &os;:</simpara>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Comme source de code testé pour des
+ bibliothèques ou utilitaires.</simpara>
+
+ <simpara>En étant <quote>en aval</quote> du projet,
+ les organisations tirent profit des nouvelles
+ fonctionnalités, corrections de bogues et tests
+ dont le code en amont bénéficie.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>En tant que système d'exploitation
+ embarqué (par exemple, pour un routeur OEM ou un
+ appareil servant de pare-feu). Dans ce modèle, les
+ organisations utilisent un noyau &os; adapté ainsi
+ qu'un ensemble de logiciels appropriés
+ conjointement avec une couche propriétaire de
+ gestion de leur appareil. Les OEMs
+ bénéficient des nouveaux supports
+ matériels ajoutés par le projet &os; en
+ amont, ainsi que des tests effectués sur le
+ système de base.</simpara>
+
+ <simpara>&os; est diffusé avec un environnement de
+ développement auto-hébergé qui permet
+ de créer facilement de telles
+ configurations.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>En tant qu'environnement compatible &unix; pour les
+ fonctions de gestion des environnements de stockage et les
+ appareils réseau, fonctionnant sur un
+ <quote>serveur lame</quote>
+ séparé.</simpara>
+
+ <simpara>&os; fournit les outils nécessaires pour
+ créer des systèmes d'exploitation
+ dédiés et des images d'applications. Son
+ implémentation basée sur une API BSD &unix;
+ est mature et testée. &os; peut aussi fournir un
+ environnement de développement croisé stable
+ pour les autres composants de l'appareil final.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>En tant que moyen d'obtenir une large base de tests
+ et du support de la part d'une équipe de
+ développeurs internationale pour tout ce qui a
+ trait à la <quote>propriété
+ intellectuelle</quote> non critique.</simpara>
+
+ <simpara>Dans ce modèle, les organisations apportent
+ un ensemble d'infrastructures utiles au projet &os; (voir
+ par exemple &man.netgraph.3;). L'importante exposition
+ que le code acquiert aide pour l'identification rapide de
+ problèmes de performance et de bogues.
+ L'implication d'excellents développeurs apporte
+ aussi des ajouts utiles à la base existante, ce
+ dont l'organisation contributrice bénéficie
+ également.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>En tant qu'environnement de développement
+ autorisant le développement croisé pour des
+ systèmes embarqués tels que <ulink
+ url="http://www.rtems.com/">RTEMS</ulink> et <ulink
+ url="http://ecos.sourceware.org/">eCOS</ulink>.</simpara>
+
+ <simpara>Il existe une pléthore d'environnements de
+ développement très complets dans le
+ catalogue des &os.numports; applications portées et
+ empaquetées pour &os;.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Comme moyen de fournir une API Unix dans un
+ système propriétaire par ailleurs,
+ augmentant ainsi son attractivité pour les
+ développeurs d'applications.</simpara>
+
+ <simpara>Dans ce cas des parties du noyau &os; et des
+ applications sont <quote>portées</quote> pour
+ tourner conjointement avec d'autres tâches du
+ système d'exploitation propriétaire. La
+ disponibilité de l'implémentation d'une API
+ <trademark>Unix</trademark> stable et bien testée
+ peut réduire l'effort nécessaire pour porter
+ des applications populaires sur le système
+ propriétaire. Comme &os; est fournit avec une
+ documentation de grande qualité concernant ses
+ mécanismes internes et assure une gestion efficace
+ des vulnérabilités et des cycles de
+ développement, les coûts pour se maintenir
+ à jour sont bas.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2 id="freebsd-technologies">
+ <title>Technologies</title>
+
+ <para>Le projet &os; supporte un grand nombre de technologies
+ dont une sélection est présentée
+ ci-dessous:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Un système complet qui peut faire de
+ l'auto-hébergement croisé pour les
+ architectures suivantes: alpha (jusqu'à &os;
+ version 6.X), amd64, ia64, i386, sparc64, powerpc (voir
+ &man.build.7;).</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Le support pour les technologies, protocoles et standards
+ suivants: <!-- Keyword soup. Urk. -->
+ <acronym>ATA</acronym>, <acronym>ATAPI</acronym>,
+ <acronym>ATM</acronym>, <trademark>Bluetooth</trademark>,
+ <acronym>CAM</acronym>, <trademark>CardBus</trademark>,
+ <acronym>DHCP</acronym>, <acronym>DNS</acronym>,
+ <trademark>EISA</trademark>,
+ <trademark>Ethernet</trademark>, <acronym>FDDI</acronym>,
+ Fibre Channel, <acronym>GPIB</acronym>, IEEE 1394, IPv4,
+ IPv6, <acronym>IPSEC</acronym>,
+ <trademark>IPX</trademark>, <acronym>ISDN</acronym>,
+ <acronym>MAC</acronym>, <acronym>NIS</acronym>,
+ <acronym>NFS</acronym>, OpenSSH, <acronym>OPIE</acronym>,
+ <acronym>PAM</acronym>, <trademark>PCI</trademark>,
+ <acronym>PCMCIA</acronym>, <trademark>POSIX</trademark>,
+ <acronym>PnP</acronym>, <acronym>RAID</acronym>,
+ <acronym>RPC</acronym>, <acronym>SATA</acronym>,
+ <acronym>SCSI</acronym>, <acronym>SMB</acronym>,
+ <acronym>TCP</acronym>, <acronym>USB</acronym>,
+ <acronym>VESA</acronym>, <acronym>VLAN</acronym>,
+ <acronym>VLB</acronym>,
+ <trademark>WebNFS</trademark>.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Un noyau modulaire permettant le traitement
+ symétrique multiprocesseurs, avec chargement
+ possible de modules noyau et un système de
+ configuration facile à utiliser.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Le support pour l'émulation de
+ <trademark>Linux</trademark> et des binaires SVR4 à
+ vitesse quasi-native et le support pour les pilotes
+ réseau <trademark>Windows</trademark>
+ (<acronym>NDIS</acronym>).</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Des librairies pour de nombreuses tâches
+ liées à la programmation: archivage, support
+ FTP et HTTP, support des processus légers en plus
+ d'un environnement de programmation
+ <trademark>POSIX</trademark>.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Des dispositifs de sécurité
+ avancés : Mandatory Access Control (&man.mac.9;),
+ jails (&man.jail.2;), <acronym>ACL</acronym>s, ainsi que
+ le support d'un dispositif cryptographique au niveau
+ noyau.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Des caractéristiques réseau
+ avancées : dispositifs pares-feu, gestion de Qos,
+ communications TCP/IP hautes performances avec support de
+ nombreuses caractéristiques
+ avancées.</simpara>
+
+ <simpara>Le système Netgraph (&man.netgraph.4;)
+ présent dans le noyau &os; permet à des
+ modules noyau de gestion des communications réseau
+ d'être interconnectés de manière
+ flexible.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Le support pour des technologies de stockage
+ avancées: fibre, <acronym>SCSI</acronym>, RAID
+ logiciel et matériel, <acronym>ATA</acronym> et
+ <acronym>SATA</acronym>.</simpara>
+
+ <simpara>&os; est capable de gérer plusieurs
+ systèmes de fichiers différents, et son
+ support natif du système de fichiers UFS2 autorise
+ les <foreignphrase>soft updates</foreignphrase>, les
+ sauvegardes instantanées, ainsi que les
+ systèmes de fichiers très volumineux (16TB
+ par système)
+ <citation>McKu1999</citation>.</simpara>
+
+ <simpara>Le système <acronym>GEOM</acronym>
+ (&man.geom.4;) présent dans le noyau &os; permet de
+ composer de manière flexible des modules noyau
+ dédiés à la gestion du
+ stockage.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>L'accès à plus de &os.numports;
+ applications portées, qu'elles soient commerciales
+ ou open-source, gérées grâce à
+ la collection des portages de &os;.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2>
+ <title>Structure organisationnelle</title>
+
+ <para>La structure organisationnelle de &os; n'est pas
+ hiérarchique.</para>
+
+ <para>Il existe essentiellement deux types de contributeurs
+ à &os;, les utilisateurs de &os;, et les
+ développeurs qui ont les droits en écriture
+ (connus sous le terme <firstterm>committers</firstterm> dans
+ notre jargon) et peuvent modifier les sources.</para>
+
+ <para>Il existe plusieurs milliers de contributeurs dans le
+ premier groupe, la vaste majorité des contributions
+ à &os; proviennent de personnes faisant partie de ce
+ groupe. Les droits de <foreignphrase>commit</foreignphrase>
+ (droits d'accès en écriture) sont
+ accordés aux personnes qui contribuent au projet de
+ manière récurrente. Ces droits viennent avec
+ des responsabilités supplémentaires, et les
+ nouveaux <foreignphrase>committers</foreignphrase> se voient
+ attribuer des mentors pour les aider à apprendre les
+ bases.</para>
+
+ <figure>
+ <title>L'organisation &os;</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="freebsd-organization" format="PIC">
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>La résolution des conflits est assurée
+ par une équipe (<quote>Core Team</quote>) de neuf
+ membres qui est élue par le groupe des
+ <foreignphrase>committers</foreignphrase>.</para>
+
+ <para>Les <foreignphrase>committers</foreignphrase> ne sont pas
+ employés par &os;. Il est exigé de la part des
+ <foreignphrase>committers</foreignphrase> qu'ils prennent la
+ responsabilité des changements qu'ils introduisent dans
+ le code. Le <ulink
+ url="&url.articles.committers-guide;">Guide du Committer
+ &os;</ulink> <citation>ComGuide</citation> documente les
+ règles et responsabilités des
+ <foreignphrase>committers</foreignphrase>.</para>
+
+ <para>Le modèle de projet de &os; est examiné en
+ détails dans <citation>Nik2005</citation>.</para>
+ </sect2>
+
+ <sect2>
+ <title>Les processus de développement des versions
+ de &os;</title>
+
+ <para>Les processus de développement des versions de
+ &os; jouent un rôle majeur en assurant que les versions
+ qui sont délivrées sont de grande
+ qualité. À n'importe quel moment que l'on
+ considère, les volontaires de &os; assurent le
+ développement de plusieurs branches de code (<xref
+ linkend="fig-freebsd-branches">):</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Les nouvelles fonctionnalités et le code
+ expérimental sont incorporés sur la branche
+ de développement, aussi connue sous le nom de
+ branche <firstterm>-CURRENT</firstterm>.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les branches <firstterm>-STABLE</firstterm>
+ représentent les lignes de code qui sont reprises
+ de la HEAD à des intervalles de temps
+ réguliers. Seul le code testé est
+ autorisé sur une branche -STABLE. Les nouvelles
+ fonctionnalités sont autorisées une fois
+ qu'elles ont été testées et
+ stabilisées sur la branche -CURRENT.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les branches <firstterm>-RELEASE</firstterm>
+ sont maintenues par l'équipe sécurité
+ de &os;. Seuls les correctifs de bogues pour les
+ problèmes critiques sont autorisés sur les
+ branches -RELEASE.</simpara>
+ </listitem>
+ </itemizedlist>
+
+ <figure id="fig-freebsd-branches">
+ <title>Les branches &os;</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="freebsd-branches" format="EPS">
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Les lignes de code sont maintenues aussi longtemps qu'il
+ existe des utilisateurs et des développeurs qui s'y
+ intéressent.</para>
+
+ <para>Les architectures machine sont groupées en
+ <quote>niveaux</quote>. Les architectures de premier niveau
+ (<firstterm>Tier 1</firstterm>) sont entièrement
+ supportées par l'équipe en charge des versions
+ et l'équipe sécurité. Les architectures
+ de second niveau (<firstterm>Tier 2</firstterm>) sont
+ supportées dans la mesure du possible, et les
+ architectures expérimentales représentent le
+ <firstterm>Tier 3</firstterm>. La liste des <ulink
+ url="&url.articles.committers-guide;/archs.html">
+ architectures supportées</ulink> est incluse dans la
+ documentation &os;.</para>
+
+ <para>L'équipe en charge des versions publie une <ulink
+ url="&url.base;/releng/">feuille de route</ulink> pour les
+ futures versions de &os; sur la page web du projet. Les dates
+ qui sont mentionnées sur la feuille de route ne sont
+ pas des dates butoirs: les versions de &os; sont
+ délivrées lorsque son code et sa documentation
+ sont prêts.</para>
+
+ <para>Les processus de développement des versions de &os;
+ sont décrits dans
+ <citation>RelEngDoc</citation>.</para>
+ </sect2>
+ </sect1>
+
+ <sect1 id="freebsd-collaboration">
+ <title>Collaborer avec &os;</title>
+
+ <para>Les projets Open-source tels que &os; offrent un code de
+ très grande qualité <citation>Cov2005</citation>.
+ Des études ont examiné les effets de la
+ disponibilité du code source sur le développement
+ logiciel <citation>Com2004</citation>.</para>
+
+ <para>Alors que l'accès à du code source de
+ qualité peut réduire les coûts initiaux de
+ développement, les coûts liés à la
+ gestion des changements deviennent prédominants par la
+ suite. Comme les environnements informatiques changent au fil
+ du temps et que de nouvelles failles de sécurité
+ sont découvertes, votre produit lui aussi a besoin de
+ changements et d'adaptations. Utiliser du code open-source se
+ conçoit plus comme un processus <emphasis>continu dans le
+ temps</emphasis> que comme quelque chose de ponctuel. Les
+ meilleurs projets avec lesquels collaborer sont ceux qui sont
+ <emphasis>actifs</emphasis>, c'est-à-dire ceux qui ont
+ une communauté active, des objectifs clairs et des
+ méthodes de travail transparentes.</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>&os; possède une communauté
+ active de développeurs gravitant autour du projet.
+ Au moment de l'écriture de cet article, il existe
+ plusieurs milliers de contributeurs vivant sur tous les
+ continents peuplés de la planète et plus de
+ 300 personnes possédant les droits d'accès aux
+ dépôts des sources du projet.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Les objectifs du projet &os; sont
+ <citation>Hub1994</citation>:</simpara>
+
+ <itemizedlist spacing="compact">
+ <listitem>
+ <simpara>De développer un système
+ d'exploitation de grande qualité pour les
+ architectures informatiques populaires, et</simpara>
+ </listitem>
+ <listitem>
+ <simpara>Mettre notre travail à la disposition de
+ tous sous couvert d'une licence libérale.</simpara>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <simpara>&os; bénéficie d'une culture ouverte et
+ transparente. Quasiment toutes les discussions au sein du
+ projet se font par courrier électronique, sur les
+ <ulink url="&a.mailman.listinfo;">listes publiques</ulink>
+ qui sont aussi archivées pour la
+ postérité. Les règles et pratiques du
+ projet sont <ulink url="&url.base;/internal/policies.html">
+ documentées</ulink> et maintenues en utilisant un
+ système de gestion de versions. Participer au projet
+ est ouvert à tous.</simpara>
+ </listitem>
+ </itemizedlist>
+
+ <sect2 id="freebsd-org">
+ <title>Comprendre la culture &os;</title>
+
+ <para>Afin de pouvoir travailler de manière efficace avec
+ le projet &os;, vous devez comprendre la culture qui
+ règne au sein du projet.</para>
+
+ <para>Les projets menés par des volontaires fonctionnent
+ avec des règles différentes de celles
+ utilisées par des organisations commerciales. Une des
+ erreurs récurrentes faite par les entreprises
+ lorsqu'elles s'aventurent dans le monde de l'open-source est
+ de sous-estimer ces différences.</para>
+
+ <!-- XXX using <formalpara> constructs is clunky, but I like using
+ <variablelist> even less -->
+ <formalpara>
+ <title>Motivation</title>
+
+ <para>La plupart des contributions à &os; sont faites
+ de manière volontaire et aucune rétribution
+ financière n'entre en jeu. Les facteurs qui motivent
+ les contributeurs sont complexes, et parmi ceux-ci on peut
+ citer l'altruisme ou un intérêt pour
+ résoudre les genres de problèmes que &os;
+ tente de résoudre. Dans cette environnement,
+ <quote>l'élégance n'est jamais
+ optionnelle</quote> <citation>Nor1993</citation>.</para>
+ </formalpara>
+
+ <formalpara>
+ <title>La Vision à Long Terme</title>
+
+ <para>Les origines de &os; remontent à presque vingt
+ ans dans le passé avec le travail effectué au
+ Groupe de Recherche en Science Informatique (CSRG) de
+ l'Université de Berkeley en Californie.<footnote>
+ <simpara>Le <ulink
+ url="http://cvsweb.freebsd.org/"> dépôt
+ des sources</ulink> de &os; contient l'historique du
+ projet depuis sa création, et il existe des
+ <ulink
+ url="http://www.mckusick.com/csrg/">CDROMs</ulink> qui
+ contiennent du code plus ancien en provenance du
+ CSRG.</simpara>
+ </footnote>Certains des développeurs originaux
+ du CSRG sont toujours associés au projet.</para>
+ </formalpara>
+
+ <para>Le projet met l'accent sur les perspectives à long
+ terme <citation>Nor2001</citation>. Un acronyme
+ fréquemment rencontré au sein du projet est
+ <acronym>DTRT</acronym> qui signifie <quote>Do The Right
+ Thing</quote> (Faites les Choses Correctement).</para>
+
+ <formalpara>
+ <title>Les Processus de Développement</title>
+
+ <para>Les programmes informatiques sont des outils de
+ communication: à un certain niveau les programmeurs
+ communiquent leurs intentions, en utilisant une notation
+ précise, à un outil (un compilateur) qui
+ traduit ces instructions en code exécutable.
+ À un autre niveau, la même notation est
+ utilisée entre deux programmeurs pour communiquer
+ leurs intentions.</para>
+ </formalpara>
+
+ <para>Les spécifications formelles et les documents
+ d'architecture sont rarement utilisés dans le projet.
+ Du code clair et bien écrit ainsi que des rapports de
+ changements (<xref linkend="fig-change-log">) eux aussi bien
+ écrits sont utilisés à la place. Le
+ développement de &os; commence par <quote>une
+ ébauche de consensus et en faisant tourner du
+ code</quote> <citation>Carp1996</citation>.</para>
+
+ <figure id="fig-change-log">
+ <title>Un example de rapport de modification</title>
+
+ <programlisting>
+bde 2005-10-29 16:34:50 UTC
+
+ FreeBSD src repository
+
+ Modified files:
+ lib/msun/src e_rem_pio2f.c
+ Log:
+ Use double precision to simplify and optimize arg reduction for small
+ and medium size args too: instead of conditionally subtracting a float
+ 17+24, 17+17+24 or 17+17+17+24 bit approximation to pi/2, always
+ subtract a double 33+53 bit one. The float version is now closer to
+ the double version than to old versions of itself — it uses the same
+ 33+53 bit approximation as the simplest cases in the double version,
+ and where the float version had to switch to the slow general case at
+ |x| == 2^7*pi/2, it now switches at |x| == 2^19*pi/2 the same as the
+ double version.
+
+ This speeds up arg reduction by a factor of 2 for |x| between 3*pi/4 and
+ 2^7*pi/4, and by a factor of 7 for |x| between 2^7*pi/4 and 2^19*pi/4.
+
+ Revision Changes Path
+ 1.14 +22 -97 src/lib/msun/src/e_rem_pio2f.c
+ </programlisting>
+ </figure>
+
+ <simpara>La communication entre programmeurs est
+ facilitée par l'utilisation d'un standard commun
+ concernant le code &man.style.9;.</simpara>
+
+ <formalpara>
+ <title>Les canaux de communication</title>
+
+ <para>Les contributeurs &os; sont répartis dans le
+ monde entier. Le courrier électronique (et dans une
+ moindre mesure, l'IRC) est le moyen de communication
+ prépondérant au sein du projet.</para>
+ </formalpara>
+ </sect2>
+
+ <sect2>
+ <title>Les meilleures pratiques pour collaborer avec le projet
+ &os;</title>
+
+ <para>Nous nous intéressons maintenant à quelques
+ bonnes pratiques utiles pour tirer profit au maximum de
+ l'utilisation de &os; pour le développement de
+ produits.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Plan à long terme</term>
+
+ <listitem>
+ <para>Mettre en place des processus qui simplifient le
+ suivi du développement de &os;. Par
+ example:</para>
+
+ <formalpara>
+ <title>Suivre les changements dans le code source de
+ &os;</title>
+
+ <para>Le projet rend la copie de son dépôt
+ CVS aisée grâce à l'utilisation de
+ <ulink url="&url.articles.cvsup-advanced;"><!--
+ --><application>CVSup</application></ulink>. Avoir
+ l'historique complet des sources est utile lors du
+ déboguage de problèmes complexes et
+ offre des indications utiles sur les intentions des
+ développeurs. Utilisez un système de
+ contrôle de sources efficace qui vous permette
+ de facilement fusionner les changements entre le code
+ &os; et votre propre code.</para>
+ </formalpara>
+
+ <para>La <xref linkend="fig-cvs-annotate"> montre une
+ partie d'un listing annoté du fichier dont le
+ rapport de changement de la <xref
+ linkend="fig-change-log"> fait référence.
+ L'origine de chacune des lignes du code source est
+ clairement affichée. Les listings annotés
+ montrant l'historique de chacun des fichiers faisant
+ partie de &os; sont <ulink
+ url="http://cvsweb.freebsd.org/">disponibles sur
+ Internet</ulink>.</para>
+
+ <figure id="fig-cvs-annotate">
+ <title>Un listing annoté
+ généré par <command>cvs
+ annotate</command></title>
+
+ <programlisting>
+#LINE #REV #WHO #DATE #TEXT
+
+62 1.1 (jkh 19-Aug-94): int32_t __ieee754_rem_pio2f(float x, float *y)
+63 1.1 (jkh 19-Aug-94): {
+64 1.14 (bde 29-Oct-05): double z,w,t,r,fn;
+65 1.13 (bde 29-Oct-05): double tx[3];
+66 1.14 (bde 29-Oct-05): int32_t e0,i,nx,n,ix,hx;
+67 1.1 (jkh 19-Aug-94):
+68 1.1 (jkh 19-Aug-94): GET_FLOAT_WORD(hx,x);
+69 1.1 (jkh 19-Aug-94): ix = hx&0x7fffffff;
+70 1.1 (jkh 19-Aug-94): if(ix<=0x3f490fd8) /* |x| ~<= pi/4 , no need for reduction */
+71 1.1 (jkh 19-Aug-94): {y[0] = x; y[1] = 0; return 0;}
+72 1.14 (bde 29-Oct-05): /* 33+53 bit pi is good enough for special and medium size cases */
+73 1.2 (bde 07-Apr-95): if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */
+74 1.14 (bde 29-Oct-05): if(hx>0) {
+75 1.15 (bde 06-Nov-05): z = x - pio2;
+76 1.15 (bde 06-Nov-05): n = 1;
+77 1.15 (bde 06-Nov-05): } else {
+78 1.15 (bde 06-Nov-05): z = x + pio2;
+79 1.15 (bde 06-Nov-05): n = 3;
+80 1.9 (bde 08-Oct-05): }
+81 1.15 (bde 06-Nov-05): y[0] = z;
+82 1.15 (bde 06-Nov-05): y[1] = z - y[0];
+83 1.15 (bde 06-Nov-05): return n;
+84 1.15 (bde 06-Nov-05): }
+85 1.15 (bde 06-Nov-05): if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */
+ </programlisting>
+ </figure>
+
+ <formalpara>
+ <title>Utilisez un observateur</title>
+
+ <para>Nommez un <firstterm>observateur</firstterm> pour
+ surveiller les développements de &os;, pour
+ déceler les changements qui pourraient
+ potentiellement impacter vos produits.</para>
+ </formalpara>
+
+ <formalpara>
+ <title>Remontez les bogues en amont</title>
+
+ <para>Si vous détectez un bogue dans le code
+ &os; que vous utilisez, remplissez un <ulink
+ url="&url.base;/send-pr.html">rapport de
+ bogue</ulink>. Cette étape permet de faire en
+ sorte que vous n'ayez pas à corriger le
+ même bogue la prochaine fois que vous
+ récupérerez les sources en amont.</para>
+ </formalpara>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Tirez profit des efforts portés sur la gestion
+ des versions</term>
+
+ <listitem>
+ <simpara>Utilisez du code d'une branche de
+ développement -STABLE de &os;. Ces branches de
+ développement sont officiellement
+ supportées par les équipes en charge des
+ versions et les équipes sécurité de
+ &os; et sont constituées de code testé.
+ </simpara>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Donnez du code pour réduire les
+ coûts</term>
+
+ <listitem>
+ <simpara>La majeure partie des coûts associés
+ au développement est liée à la
+ maintenance. En donnant du code non critique au projet,
+ vous bénéficiez du fait que votre code
+ aura une diffusion bien plus importante que celle qu'il
+ aurait eu sans ça. Ceci amène à ce
+ que plus de bogues et de failles de
+ sécurité soient éliminés et
+ que les problèmes de performance soient
+ identifiés et résolus.
+ </simpara>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Recevez un soutien efficace</term>
+
+ <listitem>
+ <simpara>Pour les produits avec des dates butoirs
+ rapprochées, il est recommandé d'embaucher
+ ou de s'attacher les services d'un développeur ou
+ d'une firme qui a de l'expérience avec &os;. La
+ &a.jobs est un canal de communication utile si vous
+ êtes à la recherche de talents dans le
+ domaine. Le projet &os; maintient une <ulink
+ url="&url.base;/commercial/consult_bycat.html"> liste
+ des consultants et des firmes de consulting</ulink>
+ assurant des travaux liés à &os;. Le
+ <ulink url="http://www.bsdcertification.org/">Groupe de
+ Certification &os;</ulink> propose des certifications
+ pour la majorité des systèmes
+ d'exploitation dérivés de BSD.</simpara>
+
+ <simpara>Pour les besoins moins critiques, vous pouvez
+ demander de l'aide sur les <ulink
+ url="http://lists.&os;.org/mailman/listinfo"> listes de
+ diffusion du projet</ulink>. Un guide utile à
+ suivre si vous souhaitez demander de l'aide est celui de
+ <citation>Ray2004</citation>.
+ </simpara>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Faites de la publicité sur votre
+ engagement</term>
+
+ <listitem>
+ <simpara>Vous n'êtes pas obligé de faire de
+ la publicité sur votre utilisation de &os;, mais
+ le faire permet à la fois de vous aider vous mais
+ aussi le projet.</simpara>
+
+ <simpara>Faire valoir auprès de la
+ communauté &os; que votre société
+ utilise &os; améliore vos chances de pouvoir
+ attirer des personnes talentueuses. Une longue liste de
+ personnes habilitées à faire du support
+ sur &os; signifie aussi plus d'échanges
+ d'idées entre les développeurs. Ceci
+ permet de construire des fondations plus seines pour
+ votre futur.</simpara>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Soutenez les développeurs de &os;</term>
+
+ <listitem>
+ <simpara>Parfois la manière la plus directe pour
+ qu'une fonctionnalité dont on a besoin soit
+ incluse dans &os; est d'aider un développeur qui
+ travaille déjà sur un problème
+ ayant un rapport avec cette fonctionnalité. Ces
+ aides peuvent prendre plusieurs formes, depuis le don de
+ matériel jusqu'à des donations
+ financières. Dans certains pays, les donations
+ au projet &os; peuvent bénéficier
+ d'avantages au niveau des impôts. Le projet a un
+ <ulink url="&url.base;/donations/">interlocuteur
+ dédié</ulink> pour assister les donateurs.
+ Le projet maintien également une page web sur
+ laquelle les développeurs <ulink
+ url="&url.base;/donations/wantlist.html">recensent leurs
+ besoins</ulink>.</simpara>
+
+ <simpara>Le projet &os; met un point d'honneur à
+ <ulink
+ url="&url.articles.contributors;">remercier</ulink> tous
+ les donnateurs sur son site web.</simpara>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect2>
+ </sect1>
+
+ <sect1 id="conclusion">
+ <title>Conclusion</title>
+
+ <para>Les objectifs du projet &os; sont de créer et
+ proposer gratuitement le code source d'un système
+ d'exploitation de grande qualité. En travaillant avec le
+ projet &os; vous pouvez réduire vos coûts de
+ développement et améliorer vos délais de
+ mise sur le marché dans un certain nombre de
+ scénarios de développement de produits.</para>
+
+ <para>Nous avons passé en revue les caractéristiques
+ du projet &os; qui en font un excellent choix pour faire partie
+ d'une stratégie produit d'une entreprise. Nous avons
+ ensuite présenté la culture du projet et
+ examiné les différents moyens à disposition
+ pour interagir avec ses développeurs. Cet article
+ conclut avec une liste des bonnes pratiques qui peuvent
+ être mises en place par les organisations pour collaborer
+ avec le projet.</para>
+ </sect1>
+
+ <bibliography>
+ <biblioentry>
+ <abbrev>Carp1996</abbrev>
+ <citetitle><ulink url="http://www.ietf.org/rfc/rfc1958.txt">The
+ Architectural Principles of the Internet</ulink></citetitle>
+ <author>
+ <firstname>B.</firstname>
+ <surname>Carpenter</surname>
+ <affiliation>
+ <orgname>The Internet Architecture Board</orgname>
+ </affiliation>
+ </author>
+ <copyright>
+ <year>1996</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry xreflabel="Com2004">
+ <abbrev>Com2004</abbrev>
+ <citetitle><ulink
+ url="http://csdl.computer.org/comp/mags/so/2004/01/s1028.pdf">How
+ is Open-Source Affecting Software
+ Development?</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Diomidis</firstname>
+ <surname>Spinellis</surname>
+ </author>
+ <author>
+ <firstname>Clemens</firstname>
+ <surname>Szyperski</surname>
+ </author>
+ </authorgroup>
+ <title>IEEE Computer</title>
+ <copyright>
+ <year>Jan/Feb 2004</year>
+ </copyright>
+ <publisher>
+ <publishername>IEEE Computer Society</publishername>
+ </publisher>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>ComGuide</abbrev>
+ <citetitle><ulink
+ url="&url.articles.committers-guide;">Committer's
+ Guide</ulink></citetitle>
+ <authorgroup>
+ <corpauthor>The &os; Project</corpauthor>
+ </authorgroup>
+ <copyright>
+ <year>2005</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>Cov2005</abbrev>
+ <citetitle><ulink
+ url="http://www.coverity.com/news/nf_news_06_27_05_story_9.html">Coverity
+ study on kernel security holes in Linux and &os;</ulink></citetitle>
+ <authorgroup>
+ <corpauthor>Coverity Inc.</corpauthor>
+ </authorgroup>
+ <copyright>
+ <year>2005</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>GoldGab2005</abbrev> <citetitle><ulink
+ url="http://dreamsongs.com/IHE/IHE.html">Innovation Happens
+ Elsewhere: Open Source as Business Strategy</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Ron</firstname>
+ <surname>Goldman</surname>
+ </author>
+ <author>
+ <firstname>Richard</firstname>
+ <surname>Gabriel</surname>
+ </author>
+ </authorgroup>
+ <copyright>
+ <year>2005</year>
+ </copyright>
+ <isbn>ISBN 1558608893</isbn>
+ <publisher>
+ <publishername>Morgan-Kaufmann</publishername>
+ </publisher>
+ </biblioentry>
+ <biblioentry xreflabel="Hub1994">
+ <!-- XXX Get the date of this article right -->
+ <abbrev>Hub1994</abbrev>
+ <citetitle><ulink url="&url.articles.contributing;">Contributing
+ to the &os; Project</ulink></citetitle>
+ <author>
+ <firstname>Jordan</firstname>
+ <surname>Hubbard</surname>
+ </author>
+ <copyright>
+ <year>1994—2005</year>
+ </copyright>
+ <publisher>
+ <publishername>The &os; Project</publishername>
+ </publisher>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>McKu1999</abbrev>
+ <citetitle><ulink
+ url="http://www.usenix.org/publications/library/proceedings/usenix99/mckusick.html">Soft
+ Updates: A Technique for Eliminating Most Synchronous Writes
+ in the Fast Filesystem</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Kirk</firstname>
+ <surname>McKusick</surname>
+ </author>
+ <author>
+ <firstname>Gregory</firstname>
+ <surname>Ganger</surname>
+ </author>
+ </authorgroup>
+ <confgroup>
+ <conftitle>USENIX Annual Technical Conference</conftitle>
+ </confgroup>
+ <copyright>
+ <year>1999</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>McKu1999-1</abbrev>
+ <citetitle><ulink
+ url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"
+ >Twenty Years of Berkeley Unix: From AT&T-Owned to
+ Freely Redistributable</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Marshall Kirk</firstname>
+ <surname>McKusick</surname>
+ </author>
+ </authorgroup>
+ <title><ulink
+ url="http://www.oreilly.com/catalog/opensources/book/toc.html">Open
+ Sources: Voices from the Open Source
+ Revolution</ulink></title>
+ <isbn>ISBN 1-56592-582-3</isbn>
+ <publisher>
+ <publishername>O'Reilly Inc.</publishername>
+ </publisher>
+ <copyright>
+ <year>1993</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>Mon2005</abbrev>
+ <citetitle><ulink url="&url.articles.bsdl-gpl;/article.html">Why you should
+ use a BSD style license for your Open Source
+ Project</ulink></citetitle>
+ <author>
+ <firstname>Bruce</firstname>
+ <surname>Montague</surname>
+ </author>
+ <publisher>
+ <publishername>The &os; Project</publishername>
+ </publisher>
+ <copyright>
+ <year>2005</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry xreflabel="Nik2005">
+ <abbrev>Nik2005</abbrev>
+ <citetitle><ulink url="&url.books.dev-model;/book.html">A
+ project model for the &os; Project</ulink></citetitle>
+ <author>
+ <firstname>Niklas</firstname>
+ <surname>Saers</surname>
+ </author>
+ <copyright>
+ <year>2005</year>
+ </copyright>
+ <publisher>
+ <publishername>The &os; Project</publishername>
+ </publisher>
+ </biblioentry>
+ <biblioentry xreflabel="Nor1993">
+ <abbrev>Nor1993</abbrev>
+ <citetitle><ulink
+ url="http://www.norvig.com/luv-slides.ps">Tutorial
+ on Good Lisp Programming Style</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Peter</firstname>
+ <surname>Norvig</surname>
+ </author>
+ <author>
+ <firstname>Kent</firstname>
+ <surname>Pitman</surname>
+ </author>
+ </authorgroup>
+ <copyright>
+ <year>1993</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>Nor2001</abbrev>
+ <citetitle><ulink url="http://www.norvig.com/21-days.html">Teach
+ Yourself Programming in Ten Years</ulink></citetitle>
+ <author>
+ <firstname>Peter</firstname>
+ <surname>Norvig</surname>
+ </author>
+ <copyright>
+ <year>2001</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>Ray2004</abbrev>
+ <citetitle><ulink
+ url="http://www.catb.org/~esr/faqs/smart-questions.html">How
+ to ask questions the smart way</ulink></citetitle>
+ <authorgroup>
+ <author>
+ <firstname>Eric Steven</firstname>
+ <surname>Raymond</surname>
+ </author>
+ </authorgroup>
+ <copyright>
+ <year>2004</year>
+ </copyright>
+ </biblioentry>
+ <biblioentry>
+ <abbrev>RelEngDoc</abbrev>
+ <citetitle><ulink url="&url.articles.releng;">&os; Release
+ Engineering</ulink></citetitle>
+ <author>
+ <firstname>Murray</firstname>
+ <surname>Stokely</surname>
+ </author>
+ <copyright>
+ <year>2001</year>
+ </copyright>
+ <publisher>
+ <publishername>The &os; Project</publishername>
+ </publisher>
+ </biblioentry>
+ </bibliography>
+</article>
From 4091b57dd868a81859fd0f80e0f85bcf639acf83 Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 25 Aug 2012 19:52:34 +0000
Subject: [PATCH 30/37] Hook building-products to the build.
---
fr_FR.ISO8859-1/articles/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fr_FR.ISO8859-1/articles/Makefile b/fr_FR.ISO8859-1/articles/Makefile
index f738f8c30b..1e5186cc40 100644
--- a/fr_FR.ISO8859-1/articles/Makefile
+++ b/fr_FR.ISO8859-1/articles/Makefile
@@ -6,7 +6,8 @@
# Original revision: 1.3
#
-SUBDIR = committers-guide
+SUBDIR = building-products
+SUBDIR+= committers-guide
SUBDIR+= contributing
SUBDIR+= contributing-ports
SUBDIR+= contributors
From 70e2d79ab7bd93e9f5b9af53aa5a336fdea066ad Mon Sep 17 00:00:00 2001
From: Dennis Herrmann <dhn@FreeBSD.org>
Date: Sun, 26 Aug 2012 08:25:45 +0000
Subject: [PATCH 31/37] - Update my own PGP key
---
share/pgpkeys/dhn.key | 96 ++++++++++++++++++++++++-------------------
1 file changed, 54 insertions(+), 42 deletions(-)
diff --git a/share/pgpkeys/dhn.key b/share/pgpkeys/dhn.key
index 9cb2349736..42b79c9ab1 100644
--- a/share/pgpkeys/dhn.key
+++ b/share/pgpkeys/dhn.key
@@ -1,52 +1,64 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh dhn 65181EA0;
+sh addkey.sh dhn F7CDCAA1;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 1024D/65181EA0 2008-09-07 [expires: 2009-03-06]
- Key fingerprint = D4DB A438 EB5E 1B26 C782 F969 820B 66B3 6518 1EA0
-uid Dennis Herrmann (Vi veri universum vivus vici) <adox@mcx2.org>
-sub 4096g/C003C5DD 2008-09-07 [expires: 2009-03-06]
+pub 4096R/F7CDCAA1 2012-08-26
+ Key fingerprint = 0587 E730 68A6 2646 A991 505D CD9B 3A87 F7CD CAA1
+uid Dennis 'dhn' Herrmann (Everybody wants to go to heaven, but nobody wants to die) <dhn@FreeBSD.org>
+sub 4096R/0A6D554F 2012-08-26
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mQGiBEjED4sRBADa5Vs8Qr1f4zBnTcnYqRDI44VSUXGYKxP6XpgDJclPefgX4OMV
-4zE+iLtxNXh+T80UJJTq+9t/rZ7Ovfwbg2WhXfnGb43GcrmFggznShtn6LaUAT/J
-xb+1mWRcapMIzdORGddOWB6+b8w/o/91stupEXmP0w7mNs6cxp3T+h5fzwCghrle
-N6iN1AjFHiK80/cku4cM9u8D/RHCnM2bAMR5IpunpRDzXm4jXjNcvITEOM+ygT6v
-54ggD4fEh0CllbT9+tDq3Iq5v2hJiBQlqsypQuIv2WldMu3wcqpuTwtYPANtxRK3
-vWob8jBqZ/xnM379jIrEmE78/t7FEU2cVyIVm9kuz1+fgPHvmpBzaY+wRx9C3HMg
-nXfkA/4vu0QqAqg9PN4IGryzHeoCYYd6q2Fvtol2kX2J2Kb85u5GlSlBWKkQ/uVn
-1QioKsXEq2SL9InE8piBrsrN4ZPq8Pa22PT4x6q/BWK9S+43J8UdY/KEVko46owW
-AnvG4meiDowvZ8Qm/PGDp6RFPsT/vMalLg381dk55jrPDIhHLbQ+RGVubmlzIEhl
-cnJtYW5uIChWaSB2ZXJpIHVuaXZlcnN1bSB2aXZ1cyB2aWNpKSA8YWRveEBtY3gy
-Lm9yZz6IZgQTEQIAJgUCSMQPiwIbAwUJAO1OAAYLCQgHAwIEFQIIAwQWAgMBAh4B
-AheAAAoJEIILZrNlGB6gPj0AniNN1oXbn7dQD+OF2fKx0UJ8zoXvAJ40SYl3UYti
-jmEJt6ocblK0Jz54B7kEDQRIxA+LEBAA4BQ3TUxASU0Aflp30Nf021zSOYGaqHfl
-cWqVXpt/M3PpxxgZMaJSgR6Z+ZExL7Y/e5g8i3GQHthrm/vXyqGWFNHxIqUDrwIz
-xdxdfEu+t1af9sBnylizd8ulzchR/RcA/+2DeAkY6E9Xs9YdvZF1z13uwNirj303
-1Li1Y875AqcrvyJimV0/5ZKLoQMvCY9XJdzFMLor9xoIeiFOr53l34QtFATXhl3T
-Am1vUlkwsyUgBN3xGfhV0XPSppyZOmwuI+XaL1FY3z2ty1ShEBgdPVN7Hi6VLZXJ
-SlsUfaEqyQC5ogcAQE2sUNkQT3Z/yuRqeV/vEZlmdGX4r+Hc6M3YIg8FdKhwQGkJ
-Kktbvr7Qkugc4nAcmHsH8FfEE8E3PBuDj7zObFazlNwsJzI11SkxfH8uwkXRPfQ/
-WtEK0yvrCIzCtGDjPjTGLzFtMhykuxZhfb1pLlVJZrY2bHBrxclS1lUcEexDGItX
-+Uyv3uE6zHVsC7drwqaTS3YLHhFB+gL9CrPE1cOmIrhanxVH+zsePGPGgOJrZnT0
-u9BcPWpePgfGIJnbe4ZZoeVfntyOOxumfuvsWrvoNeOdd69E4JnF7j5fgAdfTBkg
-aBORNy6IV4acviz9Z+N32j4Z9OxO2UrUt0PLtADQVIdJrTtWToZNJvvf7pCkiiR8
-aD1goNUiH9cAAwUQALm4Jf5Z6x/jtnhK7x39tXTaCLL7Tp+QJvmimpri6fDiJXOV
-kZ6ShKsE88yiET4wOqSyiommrNwsdN7hd1koK6WQKstTv13E7mWzEOm/Hts47Lks
-hxBttMiq8hBGzlYcO6ltzR7CWBn8MnLDHcVq/kAPHMevsBVrj7TG09W/SXdDaeiZ
-1vYbL7XkEuCcqpiWOlHGqDIc2/nOM/OP0Rah1Y7bJ8rTWODg3Wl2P6NH6kMF63L8
-ccg+0/ua55G2KMGhlxqrL4XR51xjDbbVT0rYxPQOsDhIvOwWjkIdQN47y3gS6cd+
-cvoakicyq2u5ZJKGCMAnPzDvFVFOp2JH1MCycRnDT7p29B+AEhUG4j4tz7hGSnSk
-ZBRnb5JVz6tJCuQwKCYKtg4r070ets3zDQp+UwIgWMuoiXukiCTT+PqiuAe6SuNV
-i6tqUsuvcgsI+FFYAHjwqfZjg95KWgFBRYbqkK084mp8YTPTAOnpLJa1Hqh1hJm/
-Ibbd8i7f6zSsVp2qXaZE3FHEpwmmthkzKAcQQxz4xgRoI1X25Ap4esEyIxIJz/tF
-eD/SUFQ6pwk4QX437+eIyeg4/1Xyu0lkb0IA7IkI76U8EtPnD3Rgmd4Ms+2eRu++
-H+hTEWktfyrvRz8ok6srGILUrcsJ+8nGSJeWhxMxogjU9FfRqeXtiVBVs2pdiE8E
-GBECAA8FAkjED4sCGwwFCQDtTgAACgkQggtms2UYHqC+7wCfRZDezMQHqg6Cuto/
-ywcTJSVsCbgAnjbJK2rtSIwsxc/XxgfutXrrBIZ0
-=b9AS
+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
+0JTFuwbvNUiIKGhuHbBvP3I=
+=EizD
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
From f1e29076fcbc787b8cf8139d8a84cccb3c2a05b0 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 26 Aug 2012 09:00:32 +0000
Subject: [PATCH 32/37] Update PGP key
---
share/pgpkeys/crees.key | 62 ++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/share/pgpkeys/crees.key b/share/pgpkeys/crees.key
index a4c1764e48..a35bfb61f7 100644
--- a/share/pgpkeys/crees.key
+++ b/share/pgpkeys/crees.key
@@ -1,41 +1,41 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh crees E1EBCAC4;
+sh addkey.sh crees 1E12E96A;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 2048R/E1EBCAC4 2011-06-11 [expires: 2012-06-10]
- Key fingerprint = 2066 B855 E4B1 226A 8B4C B6E6 B084 92D1 E1EB CAC4
-uid Chris Rees <crees@freebsd.org>
-sub 2048R/FA45D5D6 2011-06-11 [expires: 2012-06-10]
+pub 2048R/1E12E96A 2012-08-26
+ Key fingerprint = 8C57 BE3B D320 5FFC C4C3 C0B0 900F 45A6 1E12 E96A
+uid Chris Rees <crees@FreeBSD.org>
+sub 2048R/C10740CD 2012-08-26 [expires: 2013-08-26]
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mQENBE3zP7YBCADI9977L+dBZPFBuI436OF4Q4MtVao5W1AflipqTpvt3PwUvNlZ
-1abmJFjglvOP8ilYEPyPjW7+E+r5/rGP6hce695AwrnU4fip5lCFyMUKKCQuSqDB
-n9gbKPiZKY9oI8dqJEn8zehvkdujgzy7dC2WB+nL/sOe9dagMvEiIM60cR4JTnNu
-pBePulRWX2p+GlSLbtrovOFChNGdwUhVIl869FOBWMrfMYRXIHwF88lBhzjm0zrL
-pjZUIKbBzbJ+jN11A/MC2UaI2jEHgoFn35g6s8AmVKfYp3bv3t05Yuy/najRaoa7
-qz7IZVnmqBbZlFL34ANIzNVlvyGYX6A01cAVABEBAAG0HkNocmlzIFJlZXMgPGNy
-ZWVzQGZyZWVic2Qub3JnPokBPgQTAQIAKAUCTfM/tgIbAwUJAeEzgAYLCQgHAwIG
-FQgCCQoLBBYCAwECHgECF4AACgkQsISS0eHrysRkgAf/QhvWrXPbdghpxWFJkO/E
-L8A3CbJCyEUvTLs8JRM+I7g0kdDQH03uw23GMHSNvnn3loncFGavSx7035BeJ22b
-oBmcVkjAKOoa0JPjGvrJiXlnCE8vxi0ed6O14WR7rZwN4WQftOY/pX+SOMgSU3wS
-rnm1YNp49H0f5H24qXRrpAjrvdPgnzEkyFWv/VzADsruA+8N68ut3DLP2GKaYBus
-GRvlGHMkt+rXgR1yNvQgwGikQ4wX+PhwqL58dz6Sp0SRikQnNba8ExSBWbd3Z3PD
-WGDzJUj3h/TdEvlRsGecFviGdBms0EO9RlJVPa+EYYx8GOlj/NkKLwHVGKbC0PmC
-V7kBDQRN8z+2AQgA2ItQ76DHBjDTfygxQcofK7jfI9JIe4zLHiQZSDs5452KTgp3
-A1apSyI40HpujPPR7cbAwXdwrFy6lkCY1u+dqh/jkpcqKEmUoPbOBQEBylfTn3Ca
-UZdilthppduRaHag5zJJiMOLBR38tM1enszIVU18BYttBVf/DEMEOyWAcSUDLk2R
-ioZqRLQGSjSwAbCuHaOhPoVl14EOgPesk3SSAQm8h5eHsiBOMejuyuMi/qFkvbXT
-ynUCNXYuw8i7xgWrP8YEn3GJFwLlZMwt+GYaCretXgL7Fp2Ytg9hLyfjK/ceiW7Y
-oTuTCRgb85RuwWsofEhsS+nPQMX1G4UJmjzXqQARAQABiQElBBgBAgAPBQJN8z+2
-AhsMBQkB4TOAAAoJELCEktHh68rEBugIALqhzu8BfqNxIVIROJSY1PcqFgMfDJac
-Oax9dOTkCjZL+Yim/EprUY4YwuRt3RX2CcXBa9QQ/p4e40P63IyX6r3jSU0QRu7h
-kLxSTn6l1tSYacskfumTQ8X8usByBIgpn/oRCTgM0Hl3QGZqR5EPGV4E1rzYsmie
-LbGNsxX0BH6xe7uJz2DLe6bhqCxasiW0mz/WQMcPWRMAD63fcchkdelRi3AcmTkp
-yeNUyIzr8jApA1SG5H6Z/xc+p5/vPj6uxbhCqXGXD5nKdMpX2zpmro2paM7oZNUJ
-LB0OcxVcma6qTL8orNQz9fs0mT9XITzjC7P5CbCJ5mEgORR9XTFz658=
-=7XI/
+mQENBFA55DwBCADLmiSSORwcGwNoCi2X02jPmS2lcZXWp5uCtzx0ybPM65tIQAII
+L5e8QzyrV+r/yyNdGJIKtl4ty69aVodQ6n6Xf2BGqmm/x6jlvg2BrJgNHYfAjkIV
+tugkbwsMQxHkNmOlB+fURVPJk9xub4pz9kRRdtXJ3DiImQRw5XVe2ZvBXZuu2nOz
+jw2zArEaBSLbjo1MlXWJvvuyA2ktaKcAjFyfz/VJ8M/RDbJdfYDB9Q78jrr4uwIM
+lyWSWUD8RxAvbWw0My2tr1Nu9FDvsydbKygGnZ+7oo4zvqncGZ+0am6D3XSsOcaf
+/bzB8pIGJ1hsSe9JHvYpLvnWCwP+AJtKTPwFABEBAAG0HkNocmlzIFJlZXMgPGNy
+ZWVzQEZyZWVCU0Qub3JnPokBOAQTAQIAIgUCUDnkPAIbAwYLCQgHAwIGFQgCCQoL
+BBYCAwECHgECF4AACgkQkA9Fph4S6WoK/gf/eghgBaGoxfXXbNZwZNIC0NUhISas
+XVYnKNpKCojFl80ZGzI5mPAFUiQm6aMh3fSrzTIB1uxxd9T9A3KN5ghf9jjtOmpU
++uYEm1aW4wHYSWzKDfgfV3QlFOROBn02V8xc1XPaZr0pqBCSJ18BDVwsI8UG9odw
+/vPrrcE/Gm3psKJRwaHVGTtvJYPZYB5dQM5XD0shvj7DDSdut5l7DGDGUhp6Q8R3
+2iMkCSTbaJEQNMzUqoIIw/oPrgsVeNxG7zFrkxbdl4YLmuzy9nZhRPLZ7lWpoRrf
+3lsvo7WktMEXiW+uAX23wKH3P0gSypcsJ/jbb0nfV1r13/8O8plXwo5Z9LkBDQRQ
+OeTHAQgA5GzHZKoE3obEg4Ey/hW5xp/OvyQr9hruwwd5CSxendMJWlmwT9V4QTDl
+RNtn6n37n70wJxjUHdDrr34ItKhWN0AGy71LKcGBrfMenSW2IugB06/kSik3ti2m
+fVI9TJ/gTT4uSppM2MTMmRPw1YR9VOGvO3CED4NfVa4EajCUtMMoEVaFCk6hPhzs
+pSLcnvN+DUVR00RwGQJveHObRCDR10olA0PrLn7hqU2XAlnCAnclSPLjj3pLH9hi
+vWkoeXr8PKNC50yWqclyuTKo+HsUkanDLgfC9kq+ffLvebUayaYfGyYpBKcxzcBs
+uLEJhbh26NBqVfp1q7fTnxvNMVMUnwARAQABiQElBBgBAgAPBQJQOeTHAhsMBQkB
+4TOAAAoJEJAPRaYeEulqcrIH/iO/VQq5gLquEQfzFdIl0I2HIyey/bNpkhDLiLNv
+xPVpflymH9c90fdEXUYrI1HSbYKuACRsiXhu+SaQ0uvfBZuPDQZ7XWweuPB8y+fe
+s86MmAyFXGs8gLisYREnGyltNK3goX+FiZeXdMkE7u+FfFSgMgP02/Ki85F2hj7B
+nFAyaERP9vCeK20dUKSXn+y7+xqbTZBg7Ic9krSNsi77IyuAQ11BMe+vQVVoEhGO
+TdjgE2VJzDiS1FXcvFWh93f3AQ9yAUqkstHMzKAfkwqm4y3SFYCS1xK5YUszImAa
+2T9qZkw+R7dFEM20OWtNiz6P80+BRw/KAL0PwDFCyU4MoC4=
+=QoyM
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
From 7006d6d31c82bbe36053ff76eadd7bdee08fba42 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 26 Aug 2012 13:19:19 +0000
Subject: [PATCH 33/37] Add some commas and markup, minor edits for clarity.
Reviewed by: simon
---
.../books/handbook/mirrors/chapter.sgml | 59 ++++++++++---------
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 76b3ba6dbf..8f046d540a 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -234,50 +234,51 @@
<primary>svn</primary>
</indexterm>
- <para>As of July 2012 &os;
+ <para>As of July 2012, &os;
uses <ulink url="http://subversion.apache.org/">Subversion</ulink>
- (svn) as the primary version control system to store all of
- &os;'s source code.</para>
+ (<emphasis>svn</emphasis>) as the primary version control system for storing all of
+ &os;'s source code, documentation, and the Ports Collection.</para>
- <note><para>For most user, instead of using Subversion it is
- suggested to use
+ <note><para>Subversion is generally a developer tool. Most users should use
<link linkend="updating-upgrading-freebsdupdate">FreeBSD
- Update</link> for updating the &os; base system, and
+ Update</link> to update the &os; base system, and
<link linkend="updating-upgrading-portsnap">Portsnap</link>
- for &os; Ports Collection.</para></note>
+ to update the &os; Ports Collection.</para></note>
- <para>The &os; mirror network is still in its early days, and will
- likely change again, so do not count on this list of mirrors
- being static. In particular the SSL certificates of the servers
+ <para>The &os; svn mirror network is still in its early days, and will
+ likely change. Do not count on this list of mirrors
+ being static. In particular, the SSL certificates of the servers
will likely change at some point.</para>
- <para>In subversion URLs are always used to designate a
- repository. They have the
- form <literal>protocol://hostname/path</literal>. Mirrors may
+ <para>In Subversion, URLs are used to designate a
+ repository, taking the
+ form of <literal>protocol://hostname/path</literal>. Mirrors may
support different protocols as specified below. The first
component of the path is the FreeBSD repository to access. There
- are three different repositories, base for the &os; Base
+ are three different repositories, <literal>base</literal> for the &os; Base
system, <literal>ports</literal> for the FreeBSD Ports
Collection, and <literal>doc</literal> for the FreeBSD
- Documentation. All mirrors carries all repositories. The URL
- for the &os; ports repository's main branch on svn0.FreeBSD.org
- using the svn protocol would
- be: <literal>svn://svn0.FreeBSD.org/ports/head/</literal>.</para>
+ Documentation. For example, the URL
+ <literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
+ specifies the main branch of the &os; ports repository on the <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror,
+ using the svn protocol.</para>
- <para>The master FreeBSD Subversion server,
- <literal>svn.FreeBSD.org</literal> is publicly accessible
- read-only, but this may change in the future so users are
- encouraged to use one of the official mirrors. To browse the
- FreeBSD Subversion repositories through a browser,
+ <para>All mirrors carry all repositories.</para>
+
+ <para>The master &os; Subversion server,
+ <hostid role="fqdn">svn.FreeBSD.org</hostid>, is publicly accessible,
+ read-only. That may change in the future, so users are
+ encouraged to use one of the official mirrors. To view the
+ &os; Subversion repositories through a browser,
use
<ulink url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
<informaltable>
- <tgroup cols="3">
+ <tgroup cols="4">
+ <colspec colwidth="3*">
+ <colspec colwidth="1*">
<colspec colwidth="2*">
- <colspec colwidth="1*">
- <colspec colwidth="1*">
- <colspec colwidth="4*">
+ <colspec colwidth="10*">
<thead>
<row>
<entry>Name</entry>
@@ -292,7 +293,7 @@
<tbody>
<row>
- <entry>svn0.us-west.FreeBSD.org</entry>
+ <entry><hostid role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
<entry>svn, <ulink url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
<ulink url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
@@ -304,7 +305,7 @@
</row>
<row>
- <entry>svn0.us-east.FreeBSD.org</entry>
+ <entry><hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
<entry>svn, <ulink url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
<ulink url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
From 0308dd10cfb77c38f14504e7f66722727a5c4956 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 26 Aug 2012 13:29:20 +0000
Subject: [PATCH 34/37] Whitespace-only fixes for the new SVN mirrors section.
Translators, please ignore.
---
.../books/handbook/mirrors/chapter.sgml | 101 ++++++++++--------
1 file changed, 55 insertions(+), 46 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 8f046d540a..30d7128873 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -234,69 +234,75 @@
<primary>svn</primary>
</indexterm>
- <para>As of July 2012, &os;
- uses <ulink url="http://subversion.apache.org/">Subversion</ulink>
- (<emphasis>svn</emphasis>) as the primary version control system for storing all of
- &os;'s source code, documentation, and the Ports Collection.</para>
+ <para>As of July 2012, &os; uses
+ <ulink url="http://subversion.apache.org/">Subversion</ulink>
+ (<emphasis>svn</emphasis>) as the primary version control system
+ for storing all of &os;'s source code, documentation, and the
+ Ports Collection.</para>
- <note><para>Subversion is generally a developer tool. Most users should use
+ <note>
+ <para>Subversion is generally a developer tool. Most users
+ should use
<link linkend="updating-upgrading-freebsdupdate">FreeBSD
Update</link> to update the &os; base system, and
<link linkend="updating-upgrading-portsnap">Portsnap</link>
- to update the &os; Ports Collection.</para></note>
+ to update the &os; Ports Collection.</para>
+ </note>
- <para>The &os; svn mirror network is still in its early days, and will
- likely change. Do not count on this list of mirrors
- being static. In particular, the SSL certificates of the servers
- will likely change at some point.</para>
+ <para>The &os; svn mirror network is still in its early days, and
+ will likely change. Do not count on this list of mirrors being
+ static. In particular, the SSL certificates of the servers will
+ likely change at some point.</para>
- <para>In Subversion, URLs are used to designate a
- repository, taking the
- form of <literal>protocol://hostname/path</literal>. Mirrors may
- support different protocols as specified below. The first
- component of the path is the FreeBSD repository to access. There
- are three different repositories, <literal>base</literal> for the &os; Base
- system, <literal>ports</literal> for the FreeBSD Ports
- Collection, and <literal>doc</literal> for the FreeBSD
- Documentation. For example, the URL
+ <para>In Subversion, URLs are used to designate a repository,
+ taking the form of <literal>protocol://hostname/path</literal>.
+ Mirrors may support different protocols as specified below. The
+ first component of the path is the FreeBSD repository to access.
+ There are three different repositories, <literal>base</literal>
+ for the &os; Base system, <literal>ports</literal> for the
+ FreeBSD Ports Collection, and <literal>doc</literal> for the
+ FreeBSD Documentation. For example, the URL
<literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
- specifies the main branch of the &os; ports repository on the <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror,
+ specifies the main branch of the &os; ports repository on the
+ <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror,
using the svn protocol.</para>
<para>All mirrors carry all repositories.</para>
<para>The master &os; Subversion server,
- <hostid role="fqdn">svn.FreeBSD.org</hostid>, is publicly accessible,
- read-only. That may change in the future, so users are
- encouraged to use one of the official mirrors. To view the
- &os; Subversion repositories through a browser,
- use
- <ulink url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
+ <hostid role="fqdn">svn.FreeBSD.org</hostid>, is publicly
+ accessible, read-only. That may change in the future, so users
+ are encouraged to use one of the official mirrors. To view the
+ &os; Subversion repositories through a browser, use <ulink
+ url="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</ulink>.</para>
<informaltable>
<tgroup cols="4">
- <colspec colwidth="3*">
- <colspec colwidth="1*">
- <colspec colwidth="2*">
- <colspec colwidth="10*">
- <thead>
- <row>
- <entry>Name</entry>
+ <colspec colwidth="3*">
+ <colspec colwidth="1*">
+ <colspec colwidth="2*">
+ <colspec colwidth="10*">
+ <thead>
+ <row>
+ <entry>Name</entry>
- <entry>Protocols</entry>
+ <entry>Protocols</entry>
<entry>Location</entry>
- <entry>SSL fingerprint</entry>
- </row>
- </thead>
+ <entry>SSL fingerprint</entry>
+ </row>
+ </thead>
- <tbody>
- <row>
- <entry><hostid role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
+ <tbody>
+ <row>
+ <entry><hostid
+ role="fqdn">svn0.us-west.FreeBSD.org</hostid></entry>
- <entry>svn, <ulink url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
- <ulink url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
+ <entry>svn, <ulink
+ url="http://svn0.us-west.FreeBSD.org/base/">http</ulink>,
+ <ulink
+ url="https://svn0.us-west.FreeBSD.org/base/">https</ulink></entry>
<entry>USA, California</entry>
@@ -304,11 +310,14 @@
<literal>79:35:8F:CA:6D:34:D9:30:44:D1:00:AF:33:4D:E6:11:44:4D:15:EC</literal></entry>
</row>
- <row>
- <entry><hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
+ <row>
+ <entry><hostid
+ role="fqdn">svn0.us-east.FreeBSD.org</hostid></entry>
- <entry>svn, <ulink url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
- <ulink url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
+ <entry>svn, <ulink
+ url="http://svn0.us-east.FreeBSD.org/base/">http</ulink>,
+ <ulink
+ url="https://svn0.us-east.FreeBSD.org/base/">https</ulink></entry>
<entry>USA, New Jersey</entry>
From d59cee6f46e89093e285da7cbf7d457dca3f57df Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 26 Aug 2012 13:41:13 +0000
Subject: [PATCH 35/37] Note that the "repocopy" state is now obsolete.
Discussed with: linimon
---
en_US.ISO8859-1/articles/pr-guidelines/article.sgml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
index 6b74c880c5..9f8d37c3ca 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
@@ -206,11 +206,15 @@
</glossentry>
<glossentry>
- <glossterm>repocopy</glossterm>
+ <glossterm>repocopy (obsolete)</glossterm>
<glossdef>
<para>The resolution of the problem report is dependent on a
repository copy, or repocopy, operation within the CVS
repository which is awaiting completion.</para>
+
+ <para>Given that all repositories now use Subversion, there is
+ no need for this state anymore. Subversion has native
+ support support for copying and moving files.</para>
</glossdef>
</glossentry>
From f2c2ad33b38b4d029adf895b35c293cce0314a4d Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 26 Aug 2012 15:59:40 +0000
Subject: [PATCH 36/37] Remove a duplicated "support"
Submitted by: wblock
---
en_US.ISO8859-1/articles/pr-guidelines/article.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
index 9f8d37c3ca..4f4e5b7471 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
@@ -214,7 +214,7 @@
<para>Given that all repositories now use Subversion, there is
no need for this state anymore. Subversion has native
- support support for copying and moving files.</para>
+ support for copying and moving files.</para>
</glossdef>
</glossentry>
From 7cc48f9a2d06957f579b6a7e1fc5b852de1b45d9 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 27 Aug 2012 03:44:33 +0000
Subject: [PATCH 37/37] Document PORTSCOUT Makefile usage, and provide a few
examples.
Reviewed by: wblock
---
.../books/porters-handbook/book.sgml | 50 +++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index c08a5a1670..0784ff6d39 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -3449,6 +3449,56 @@ ALWAYS_KEEP_DISTFILES= yes
<filename>Makefile</filename>.</para>
</sect1>
+ <sect1 id="makefile-portscout">
+ <title><makevar>PORTSCOUT</makevar></title>
+
+ <para><application>Portscout</application> is an automated
+ distfile check utility for the &os; Ports Collection,
+ described in detail in
+ <xref linkend="distfile-survey">.</para>
+
+ <para>The <makevar>PORTSCOUT</makevar> variable defines
+ special conditions within which the
+ <application>Portscout</application> distfile
+ scanner should be restricted.</para>
+
+ <para>Situations where the <makevar>PORTSCOUT</makevar>
+ variable should be set include:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>When distfiles should be ignored, whether for
+ specific versions, or specific minor revisions. For
+ example, to exclude version
+ <replaceable>8.2</replaceable> from distfile version
+ checks because it is known to be broken, add:</para>
+
+ <programlisting>PORTSCOUT= ignore:8.2</programlisting>
+
+ </listitem>
+ <listitem>
+ <para>When specific versions or specific major and minor
+ revisions of a distfile should be checked. For
+ example, if only version
+ <replaceable>0.6.4</replaceable> should be monitored
+ because newer versions have compatablity issues with
+ &os;, add:</para>
+
+ <programlisting>PORTSCOUT= limit:^0\.6\.4</programlisting>
+
+ </listitem>
+ <listitem>
+ <para>When URLs listing the available versions differ
+ from the download URLs. For example, to limit
+ distfile version checks to the download page for the
+ <filename role="package">databases/pgtune</filename>
+ port, add:</para>
+
+ <programlisting>PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000416</programlisting>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
<sect1 id="makefile-depend">
<title>Dependencies</title>