svn commit: r39459 - in projects/sgml2xml:
de_DE.ISO8859-1/books/developers-handbook/x86
de_DE.ISO8859-1/books/handbook/users de_DE.ISO8859-1/share/sgml
en_US.ISO8859-1/articles/building-products e...
Gabor Kovesdan
gabor at FreeBSD.org
Mon Aug 27 11:43:28 UTC 2012
Author: gabor
Date: Mon Aug 27 11:43:27 2012
New Revision: 39459
URL: http://svn.freebsd.org/changeset/doc/39459
Log:
- MFH
Approved by: doceng (implicit)
Added:
projects/sgml2xml/fr_FR.ISO8859-1/articles/building-products/
- copied from r39458, head/fr_FR.ISO8859-1/articles/building-products/
projects/sgml2xml/share/pgpkeys/zont.key
- copied unchanged from r39458, head/share/pgpkeys/zont.key
Modified:
projects/sgml2xml/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
projects/sgml2xml/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
projects/sgml2xml/de_DE.ISO8859-1/share/sgml/news.xml
projects/sgml2xml/en_US.ISO8859-1/articles/building-products/article.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/committers-guide/article.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/portbuild/article.sgml
projects/sgml2xml/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
projects/sgml2xml/en_US.ISO8859-1/books/dev-model/book.sgml
projects/sgml2xml/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
projects/sgml2xml/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
projects/sgml2xml/en_US.ISO8859-1/books/porters-handbook/book.sgml
projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml
projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
projects/sgml2xml/fr_FR.ISO8859-1/articles/Makefile
projects/sgml2xml/fr_FR.ISO8859-1/articles/building-products/article.sgml
projects/sgml2xml/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
projects/sgml2xml/ja_JP.eucJP/share/sgml/news.xml
projects/sgml2xml/share/pgpkeys/crees.key
projects/sgml2xml/share/pgpkeys/dhn.key
projects/sgml2xml/share/pgpkeys/pgpkeys-developers.sgml
projects/sgml2xml/share/pgpkeys/pgpkeys.ent
projects/sgml2xml/share/sgml/authors.ent
projects/sgml2xml/share/sgml/commercial.consult.xml
projects/sgml2xml/share/sgml/commercial.isp.xml
projects/sgml2xml/share/sgml/developers.ent
projects/sgml2xml/share/sgml/news.xml
projects/sgml2xml/share/sgml/release.ent
projects/sgml2xml/share/sgml/usergroups.xml
Directory Properties:
projects/sgml2xml/ (props changed)
Modified: projects/sgml2xml/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -384,7 +384,7 @@ etc...</programlisting>
</sect2>
<sect2 id="x86-where-return-values">
- <title>Wo sind die Rückgabewerdet?</title>
+ <title>Wo sind die Rückgabewerde?</title>
<para>Leider gilt: Es kommt darauf an... Für die meisten
Systemaufrufe liegt er in <varname
Modified: projects/sgml2xml/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/books/handbook/users/chapter.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/de_DE.ISO8859-1/books/handbook/users/chapter.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -493,7 +493,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>
Modified: projects/sgml2xml/de_DE.ISO8859-1/share/sgml/news.xml
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/share/sgml/news.xml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/de_DE.ISO8859-1/share/sgml/news.xml Mon Aug 27 11:43:27 2012 (r39459)
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r39290
+ basiert auf: r39424
-->
<!-- Simple schema for FreeBSD Project news.
@@ -42,6 +42,31 @@
<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 at FreeBSD.org">Andrey Zonov</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
<name>1</name>
<event>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/building-products/article.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/building-products/article.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/building-products/article.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -509,16 +509,16 @@
<listitem>
<simpara>The goals of the FreeBSD project are
<citation>Hub1994</citation>:</simpara>
- <itemizedlist spacing="compact">
- <listitem>
- <simpara>To develop a high-quality operating system for
- popular computer hardware, and,</simpara>
- </listitem>
- <listitem>
- <simpara>To make our work available to all under a liberal
- license.</simpara>
- </listitem>
- </itemizedlist>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <simpara>To develop a high-quality operating system for
+ popular computer hardware, and,</simpara>
+ </listitem>
+ <listitem>
+ <simpara>To make our work available to all under a liberal
+ license.</simpara>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<simpara>FreeBSD enjoys an open and transparent working
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/committers-guide/article.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/committers-guide/article.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/committers-guide/article.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -579,7 +579,7 @@
preferable.</para>
</sect3>
- <sect3>
+ <sect3 id="subversion-primer-base-layout">
<title><literal>RELENG_*</literal> Branches and General
Layout</title>
@@ -1155,7 +1155,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
@@ -1446,6 +1446,38 @@ $target - head/$source:$P,$Q,$R</screen>
</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 inspect 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 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>
+
+ <sect5>
<title>Merging into the Kernel
(<filename class="directory">sys/</filename>)</title>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -7279,6 +7279,11 @@
</listitem>
<listitem>
+ <para>Nick Dewing
+ <email>ndewing at experts-exchange.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Nick Handel
<email>nhandel at NeoSoft.com</email></para>
</listitem>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -1616,6 +1616,10 @@
</listitem>
<listitem>
+ <para>&a.zont;</para>
+ </listitem>
+
+ <listitem>
<para>&a.az;</para>
</listitem>
</itemizedlist>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -3,6 +3,10 @@
<itemizedlist>
<listitem>
+ <para>&a.flz; (2008 - 2012)</para>
+ </listitem>
+
+ <listitem>
<para>&a.kris; (2001 - 2010)</para>
</listitem>
@@ -39,6 +43,10 @@
</listitem>
<listitem>
+ <para>&a.ade; (2001 - 2002)</para>
+ </listitem>
+
+ <listitem>
<para>&a.asami; ( - 2001)</para>
</listitem>
</itemizedlist>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/portbuild/article.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/portbuild/article.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/portbuild/article.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -2730,12 +2730,25 @@ ganglia:*:102:102::0:0:User &:/usr/local
</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>
</procedure>
@@ -2750,27 +2763,21 @@ 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>
Modified: projects/sgml2xml/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/articles/pr-guidelines/article.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/articles/pr-guidelines/article.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -205,11 +205,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 for copying and moving files.</para>
</glossdef>
</glossentry>
Modified: projects/sgml2xml/en_US.ISO8859-1/books/dev-model/book.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/books/dev-model/book.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/books/dev-model/book.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -1165,7 +1165,7 @@
unresolved.
</para>
<para>
- Hat currently held by: &a.gavin;.
+ Hat currently held by: &a.pgj;.
</para>
</section>
Modified: projects/sgml2xml/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -737,14 +737,12 @@ Fetching 133 new ports or files... done.
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>
@@ -756,7 +754,7 @@ Fetching 133 new ports or files... done.
<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>
@@ -776,7 +774,7 @@ Fetching 133 new ports or files... done.
</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
@@ -805,68 +803,34 @@ Fetching 133 new ports or files... done.
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>
-
- <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>
+ <para>The <application>Subversion</application> program can fetch a
+ clean copy of the documentation sources by typing:</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">
@@ -905,15 +869,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
</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>
<listitem>
@@ -948,15 +903,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<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>
@@ -998,7 +944,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
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;
@@ -1130,7 +1076,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<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.
Modified: projects/sgml2xml/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -228,6 +228,108 @@
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>
+ (<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
+ <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>
+
+ <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
+ <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>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="4">
+ <colspec colwidth="3*"/>
+ <colspec colwidth="1*"/>
+ <colspec colwidth="2*"/>
+ <colspec colwidth="10*"/>
+ <thead>
+ <row>
+ <entry>Name</entry>
+
+ <entry>Protocols</entry>
+
+ <entry>Location</entry>
+
+ <entry>SSL fingerprint</entry>
+ </row>
+ </thead>
+
+ <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>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><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>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>
Modified: projects/sgml2xml/en_US.ISO8859-1/books/porters-handbook/book.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/books/porters-handbook/book.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/books/porters-handbook/book.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -3453,6 +3453,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>
Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/administration.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -133,7 +133,6 @@
<li>&a.linimon; <<a href="mailto:linimon at FreeBSD.org">linimon at FreeBSD.org</a>></li>
<li>&a.pav; <<a href="mailto:pav at FreeBSD.org">pav at FreeBSD.org</a>></li>
<li>&a.itetcu; <<a href="mailto:itetcu at FreeBSD.org">itetcu at FreeBSD.org</a>></li>
- <li>&a.flz; <<a href="mailto:flz at FreeBSD.org">flz at FreeBSD.org</a>></li>
<li>&a.miwi; <<a href="mailto:miwi at FreeBSD.org">miwi at FreeBSD.org</a>></li>
</ul>
@@ -244,8 +243,7 @@
<li>&a.philip; <<a href="mailto:philip at FreeBSD.org">philip at FreeBSD.org</a>></li>
<li>&a.qingli; <<a href="mailto:qingli at FreeBSD.org">qingli at FreeBSD.org</a>></li>
<li>&a.remko; <<a href="mailto:remko at FreeBSD.org">remko at FreeBSD.org</a>></li>
- <li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>>
- (Core Team Liaison)</li>
+ <li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
<li>&a.simon; <<a href="mailto:simon at FreeBSD.org">simon at FreeBSD.org</a>>
(Officer)</li>
<li>&a.stas; <<a href="mailto:stas at FreeBSD.org">stas at FreeBSD.org</a>></li>
Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -85,27 +85,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>
Modified: projects/sgml2xml/fr_FR.ISO8859-1/articles/Makefile
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/articles/Makefile Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/fr_FR.ISO8859-1/articles/Makefile Mon Aug 27 11:43:27 2012 (r39459)
@@ -6,7 +6,8 @@
# Original revision: 1.3
#
-SUBDIR = committers-guide
+SUBDIR = building-products
+SUBDIR+= committers-guide
SUBDIR+= contributing
SUBDIR+= contributing-ports
SUBDIR+= contributors
Modified: projects/sgml2xml/fr_FR.ISO8859-1/articles/building-products/article.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/articles/building-products/article.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/fr_FR.ISO8859-1/articles/building-products/article.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -1,14 +1,8 @@
-<!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;
+<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+ "../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/sgml/entities.ent">
+%entities;
<!ENTITY % not.published "IGNORE">
]>
@@ -79,7 +73,7 @@
ordinateurs personnels. Des parties de &os; ont
également été utilisées dans des
produits commerciaux (voir <xref
- linkend="freebsd-intro">).</para>
+ 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
@@ -205,14 +199,14 @@
<itemizedlist>
<listitem>
- <simpara><xref linkend="freebsd-intro"> introduit le projet
+ <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
+ <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
@@ -221,7 +215,7 @@
</listitem>
<listitem>
- <simpara><xref linkend="conclusion"> conclut.</simpara>
+ <simpara><xref linkend="conclusion"/> conclut.</simpara>
</listitem>
</itemizedlist>
</sect2>
@@ -526,7 +520,7 @@
<title>L'organisation &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization" format="PIC">
+ <imagedata fileref="freebsd-organization" format="PIC"/>
</imageobject>
</mediaobject>
</figure>
@@ -560,7 +554,7 @@
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>
+ linkend="fig-freebsd-branches"/>):</para>
<itemizedlist>
<listitem>
@@ -594,7 +588,7 @@
<title>Les branches &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches" format="EPS">
+ <imagedata fileref="freebsd-branches" format="EPS"/>
</imageobject>
</mediaobject>
</figure>
@@ -767,7 +761,7 @@
<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
+ 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
@@ -851,10 +845,10 @@ bde 2005-10-29 16:34:50 UTC
&os; et votre propre code.</para>
</formalpara>
- <para>La <xref linkend="fig-cvs-annotate"> montre une
+ <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.
+ 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
Modified: projects/sgml2xml/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
==============================================================================
--- projects/sgml2xml/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml Mon Aug 27 10:15:10 2012 (r39458)
+++ projects/sgml2xml/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml Mon Aug 27 11:43:27 2012 (r39459)
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r38879
+ Original revision: r39399
$FreeBSD$
-->
@@ -751,13 +751,12 @@ Fetching 133 new ports or files... done.
ºÇ¿·¤Î &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>
@@ -768,9 +767,10 @@ Fetching 133 new ports or files... done.
</listitem>
<listitem>
- <para><application>CVSup</application> ¤òÍѤ¤¤Æ
+ <para><application>Subversion</application> ¤òÍѤ¤¤Æ¡¢
+ ¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò
<filename class="directory">/usr/doc</filename>
- ¤Ë¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
+ °Ê²¼¤Ë¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
</listitem>
<listitem>
@@ -788,12 +788,13 @@ Fetching 133 new ports or files... done.
</sect2>
<sect2 id="installing-documentation-toolchain">
- <title>CVSup ¤ª¤è¤Ó¥É¥¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
+ <title><application>Subversion</application>
+ ¤ª¤è¤Ó¥É¥¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
<para>&os; ¤Î¥É¥¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
¤«¤Ê¤êÂ礤ʥġ¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£
¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ·¡¢¤Þ¤¿¡¢
- ¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¤¤¿¤á¡¢
+ ¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢
&os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢&os;
¤Î¤¿¤á¤Ë¿·¤·¤¤¥É¥¥å¥á¥ó¥È¤ò³èȯ¤Ë¼¹É®¤·¤Æ¤¤¤ëÊý¤ä¡¢
@@ -817,68 +818,36 @@ Fetching 133 new ports or files... done.
¤³¤Î¥Ä¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤³¤È¤Ï¤È¤Æ¤â¸ÌÀ¤Ç¤¹¡£</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>
-
- <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>
+ <para>¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
+ <application>Subversion</application>
+ ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£
+ ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</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>
+
+ <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
- <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢¥É¥¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¡¢<filename
+ <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">
@@ -917,15 +886,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
</varlistentry>
<varlistentry>
- <term><makevar>SUPHOST</makevar></term>
-
- <listitem>
- <para>¥¢¥Ã¥×¥Ç¡¼¥È»þ¤Ë»È¤¦ <application>CVSup</application>
- ¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥Í¡¼¥à¡£</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><makevar>DOCDIR</makevar></term>
<listitem>
@@ -958,15 +918,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<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>
@@ -1009,7 +960,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
¥É¥¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
¤«¤Ê¤êÂ礤ʥġ¼¥ë¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤«¤é¹½À®¤µ¤ì¤ë
<emphasis>¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis> ¤¬É¬ÍפǤ¹¡£
- ¤Þ¤¿¡¢<application>CVS</application>
+ ¤Þ¤¿¡¢<application>Subversion</application>
¥ê¥Ý¥¸¥È¥ê¤«¤é¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¡¢
¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤¿¥½¡¼¥¹¤«¤é¥É¥¥å¥á¥ó¥È¤ò¼êÆ°¤Ç¹½ÃÛ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¡¢
¤½¤ì¤Ê¤ê¤Ë½ÏÃΤ·¤Æ¤¤¤ëɬÍפ⤢¤ê¤Þ¤¹¡£
@@ -1147,7 +1098,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<note>
<para>¥Ç¥Õ¥©¥ë¥È¤Î¥¿¡¼¥²¥Ã¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
- <application>CVSup</application>
+ <application>Subversion</application>
¤òÍѤ¤¤ëÊýË¡¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
¤Ê¤¼¤Ê¤é¤Ð¡¢¤³¤ÎÀá¤ÇÀâÌÀ¤ò¤·¤Æ¤¤¤ëÊýË¡¤Ç¤Ï
port ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤ê¡¢
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-doc-projects
mailing list