- MFH

Approved by:	doceng (implicit)

en_US.ISO8859-1/articles/committers-guide/article.sgml

@@ -1447,7 +1447,7 @@ $target - head/$source:$P,$Q,$R</screen>
 
 	  <sect5>
 	    <title>Practical Example</title>
-	    <para>As an practical example, consider the following scenario:
+	    <para>As a 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

en_US.ISO8859-1/articles/contributors/contrib.additional.sgml

@@ -8065,6 +8065,11 @@
 	<email>paul@vix.com</email></para>
     </listitem>
 
+    <listitem>
+      <para>Paulo Fragoso
+	<email>paulo@nlink.com.br</email></para>
+    </listitem>
+
     <listitem>
       <para>Paulo Menezes
 	<email>paulo@isr.uc.pt</email></para>

en_US.ISO8859-1/articles/problem-reports/article.sgml

@@ -650,7 +650,7 @@
 	adding one or more email addresses to the
 	<literal>Cc:</literal> header.</para>
 
-      <para>In the email template you will find the following two
+      <para>In the email template only, you will find the following
 	single-line fields:</para>
 
       <itemizedlist>
@@ -668,6 +668,48 @@
 	    <application>CVSup</application>.</para>
 	</listitem>
 
+	<listitem>
+	  <para><emphasis>Severity:</emphasis> One of
+	    <literal>non-critical</literal>,
+	    <literal>serious</literal> or
+	    <literal>critical</literal>.  Do not overreact; refrain
+	    from labeling your problem <literal>critical</literal>
+	    unless it really is (e.g., data corruption issues, serious
+	    regression from previous functionality in -CURRENT)
+	    or <literal>serious</literal> unless
+	    it is something that will affect many users (kernel
+	    panics or freezes; problems with
+	    particular device drivers or system utilities).  &os;
+	    developers will not necessarily work on your problem faster
+	    if you inflate its importance since there are so many other
+	    people who have done exactly that &mdash; in fact, some
+	    developers pay little attention to this field
+	    because of this.</para>
+
+	  <note>
+	    <para>Security problems should <emphasis>not</emphasis>
+	      be filed in GNATS, because all GNATS information is public
+	      knowledge.  Please send such problems according to our
+	      <ulink url="http://security.freebsd.org/#how">security
+		report guidelines</ulink>.</para>
+	  </note>
+	</listitem>
+
+	<listitem>
+	  <para><emphasis>Priority:</emphasis> One of
+	    <literal>low</literal>, <literal>medium</literal> or
+	    <literal>high</literal>.  <literal>high</literal> should
+	    be reserved for problems that will affect practically
+	    every user of &os; and <literal>medium</literal> for
+	    something that will affect many users.</para>
+
+	  <note>
+	    <para>This field has become so widely abused that it is
+	      almost completely meaningless.</para>
+	  </note>
+	</listitem>
+
+
       </itemizedlist>
 
       <para>The next section describes fields that are common to both
@@ -718,46 +760,6 @@
 	    <literal>maintainer-update</literal>.</para>
 	</listitem>
 
-	<listitem>
-	  <para><emphasis>Severity:</emphasis> One of
-	    <literal>non-critical</literal>,
-	    <literal>serious</literal> or
-	    <literal>critical</literal>.  Do not overreact; refrain
-	    from labeling your problem <literal>critical</literal>
-	    unless it really is (e.g. data corruption issues, serious
-	    regression from previous functionality in -CURRENT)
-	    or <literal>serious</literal> unless
-	    it is something that will affect many users (kernel
-	    panics or freezes; problems with
-	    particular device drivers or system utilities).  &os;
-	    developers will not necessarily work on your problem faster
-	    if you inflate its importance since there are so many other
-	    people who have done exactly that &mdash; in fact, some
-	    developers pay little attention to this field
-	    because of this.</para>
-
-	  <note>
-	    <para>Major security problems should <emphasis>not</emphasis>
-	      be filed in GNATS, because all GNATS information is public
-	      knowledge.  Please send such problems in private email to
-	      &a.security-officer;.</para>
-	  </note>
-	</listitem>
-
-	<listitem>
-	  <para><emphasis>Priority:</emphasis> One of
-	    <literal>low</literal>, <literal>medium</literal> or
-	    <literal>high</literal>.  <literal>high</literal> should
-	    be reserved for problems that will affect practically
-	    every user of &os; and <literal>medium</literal> for
-	    something that will affect many users.</para>
-
-	  <note>
-	    <para>This field has become so widely abused that it is
-	      almost completely meaningless.</para>
-	  </note>
-	</listitem>
-
 	<listitem>
 	  <para><emphasis>Category:</emphasis> Choose an appropriate
 	    category.</para>

en_US.ISO8859-1/books/faq/book.sgml

@@ -2082,28 +2082,6 @@
 	    shows up before loader is started.</para>
 	</answer>
       </qandaentry>
-
-      <qandaentry>
-	<question id="boot-acpi">
-	  <para>Installation crashes while booting, what can I do?</para>
-	</question>
-
-	<answer>
-	  <para>Try disabling ACPI support.  When the bootloader loads,
-	    press the <keycap>Space</keycap> key.  The system will display
-	    the following:</para>
-
-	  <screen>OK</screen>
-
-	  <para>Type:</para>
-
-	  <screen><userinput>unset acpi_load</userinput></screen>
-
-	  <para>And then type:</para>
-
-	  <screen><userinput>boot</userinput></screen>
-	</answer>
-      </qandaentry>
     </qandaset>
   </chapter>
 
@@ -2748,18 +2726,6 @@ bindkey ^[[3~ delete-char # for xterm</programlisting>
 	  </answer>
 	</qandaentry>
 
-	<qandaentry>
-	  <question id="disable-acpi">
-	    <para>How do I disable ACPI?</para>
-	  </question>
-
-	  <answer>
-	    <para>Add following line
-	      <screen>hint.acpi.0.disabled="1"</screen> into your
-	      <filename>/boot/device.hints</filename> file.</para>
-	  </answer>
-	</qandaentry>
-
 	<qandaentry>
 	  <question id="micron-hang-boot">
 	    <para>Why does my Micron system hang at boot time?</para>
@@ -10428,20 +10394,6 @@ hint.sio.7.irq="12"</programlisting>
 	</answer>
       </qandaentry>
 
-      <qandaentry>
-	<question id="major-numbers">
-	  <para>Can you assign a major number for a device driver I have
-	    written?</para>
-	</question>
-
-	<answer>
-	  <para>&os; releases after February 2003 has a facility for
-	    dynamically and automatically allocating major numbers for
-	    device drivers at runtime (see &man.devfs.5;), so there is
-	    no need for this.</para>
-	</answer>
-      </qandaentry>
-
       <qandaentry>
 	<question id="alternate-directory-layout">
 	  <para>What about alternative layout policies for

en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml

@@ -258,13 +258,13 @@
     <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.
+      first component of the path is the &os; repository to access.
       There are three different repositories, <literal>base</literal>
-      for the &os; Base system, <literal>ports</literal> for the
+      for the &os; base system source code, <literal>ports</literal>
-      FreeBSD Ports Collection, and <literal>doc</literal> for the
+      for the Ports Collection, and <literal>doc</literal> for
-      FreeBSD Documentation.  For example, the URL
+      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
+      specifies the main branch of the ports repository on the
       <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror,
       using the svn protocol.</para>
 

en_US.ISO8859-1/books/handbook/ports/chapter.sgml

@@ -979,6 +979,32 @@ docbook                     =
 	    as three separate steps.</para>
 	</note>
 
+	<note>
+	  <para>When installing a port, using only <command>make
+	      <maketarget>install</maketarget></command> from the
+	    beginning means there will potentially be many waiting
+	    periods between user interaction as the default behaviour
+	    is to prompt the user for options.  When there are many
+	    dependencies, this sometimes makes building a single port
+	    a huge hassle.  To avoid this, first run <command>make
+	      <maketarget>config-recursive</maketarget></command> to
+	    do the configuration in one batch.  Then run
+	    <command>make <maketarget>install
+	      [clean]</maketarget></command> afterwards.</para>
+	</note>
+
+	<tip>
+	  <para>When using <maketarget>config-recursive</maketarget>,
+	    the list of ports to configure are gathered by the
+	    <maketarget>all-depends-list</maketarget> &man.make.1;
+	    target.  It is often recommended to run <command>make
+	      <maketarget>config-recursive</maketarget></command>
+	    until all dependent ports options have been defined, and
+	    ports options &man.dialog.1; screens no longer
+	    appear, to be certain all ports options have been
+	    configured as intended.</para>
+	</tip>
+
 	<note>
 	  <para>Some shells keep a cache of the commands that are
 	    available in the directories listed in the

en_US.ISO8859-1/books/porters-handbook/book.sgml

@@ -124,12 +124,7 @@
       <para>The minimal <filename>Makefile</filename> would look
 	something like this:</para>
 
-      <programlisting># New ports collection makefile for:	oneko
+      <programlisting># &dollar;FreeBSD&dollar;
-# Date created:        5 December 1994
-# Whom:                asami
-#
-# &dollar;FreeBSD&dollar;
-#
 
 PORTNAME=	oneko
 PORTVERSION=	1.1b
@@ -145,6 +140,14 @@ USE_IMAKE=	yes
 
 .include &lt;bsd.port.mk&gt;</programlisting>
 
+      <note>
+	<para>In some cases, the <filename>Makefile</filename> of an
+	  existing port may contain additional lines in the header,
+	  such as the name and email of the person that originally
+	  created the port.  This additional information has been
+	  declared obsolete, and is being phased out.</para>
+      </note>
+
       <para>See if you can figure it out.  Do not worry about the
 	contents of the <literal>&dollar;FreeBSD&dollar;</literal>
 	line, it will be filled in automatically by SVN when the port
@@ -3419,26 +3422,29 @@ ALWAYS_KEEP_DISTFILES=	yes
 	<orderedlist>
 	    <listitem>
 	      <para>Try to keep the COMMENT value at no longer than 70
-		characters, as this line will be used by the &man.pkg.info.1;
+		characters, as this line will be used by the
-		utility to display a one-line summary of the port;</para>
+		&man.pkg.info.1; utility to display a one-line summary
+		of the port;</para>
 	    </listitem>
 	    <listitem>
-	      <para>Do <emphasis>not</emphasis> include the package name
+	      <para>Do <emphasis>not</emphasis> include the package
-	      (or version number of the software);</para>
+		name (or version number of the software);</para>
 	    </listitem>
 	    <listitem>
-	      <para>The comment should begin with a capital and end without a
+	      <para>The comment should begin with a capital and end
-	      period;</para>
+		without a period;</para>
 	    </listitem>
 	    <listitem>
-	      <para>Do not start with an indefinite article (i.e. A or An);</para>
+	      <para>Do not start with an indefinite article (i.e.
+		A or An);</para>
 	    </listitem>
 	    <listitem>
-	      <para>Names are capitalized (e.g. Apache, JavaScript, Perl);</para>
+	      <para>Names are capitalized (e.g. Apache, JavaScript,
+		Perl);</para>
 	    </listitem>
 	    <listitem>
-	      <para>For lists of words use the Oxford comma (e.g. green,
+	      <para>For lists of words use the Oxford comma (e.g.
-	      red<emphasis>,</emphasis> and blue);</para>
+		green, red<emphasis>,</emphasis> and blue);</para>
 	    </listitem>
 	    <listitem>
 	      <para>Spell check the text.</para>
@@ -16293,20 +16299,10 @@ IGNORE=	POINTYHAT is not supported
       <filename>Makefile</filename>.</para>
 
     <programlisting>[the header...just to make it easier for us to identify the ports.]
-# New ports collection makefile for:   xdvi
-[the "version required" line is only needed when the PORTVERSION
- variable is not specific enough to describe the port.]
-# Date created:                26 May 1995
-[this is the person who did the original port to FreeBSD, in particular, the
-person who wrote the first version of this Makefile.  Remember, this should
-not be changed when upgrading the port later.]
-# Whom:                        Satoshi Asami &lt;asami@FreeBSD.org&gt;
-#
 # &dollar;FreeBSD&dollar;
 [ ^^^^^^^^^ This will be automatically replaced with RCS ID string by SVN
 when it is committed to our repository.  If upgrading a port, do not alter
 this line back to "&dollar;FreeBSD&dollar;".  SVN deals with it automatically.]
-#
 
 [section to describe the port itself and the master site - PORTNAME
  and PORTVERSION are always first, followed by CATEGORIES,

en_US.ISO8859-1/htdocs/administration.sgml

@@ -57,7 +57,6 @@
 	<li><a href="#t-bugmeister">Bugmeisters &amp; GNATS
 	  Administrators</a></li>
 	<li><a href="#t-clusteradm">Cluster Administrators</a></li>
-	<li><a href="#t-dcvs">CVS doc/www Repository Managers</a></li>
 	<li><a href="#t-pcvs">CVS ports Repository Managers</a></li>
 	<li><a href="#t-ncvs">CVS src Repository Managers</a></li>
 	<li><a href="#t-cvsup-master">CVSup Mirror Site
@@ -368,31 +367,12 @@
 
   <ul>
     <li>&a.brd; &lt;<a href="mailto:brd@FreeBSD.org">brd@FreeBSD.org</a>&gt;</li>
-    <li>&a.billf; &lt;<a href="mailto:billf@FreeBSD.org">billf@FreeBSD.org</a>&gt;</li>
     <li>&a.simon; &lt;<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>&gt;</li>
     <li>&a.ps; &lt;<a href="mailto:ps@FreeBSD.org">ps@FreeBSD.org</a>&gt;</li>
     <li>&a.kensmith; &lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;</li>
     <li>&a.peter; &lt;<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>&gt;</li>
   </ul>
 
-  <h3><a name="t-dcvs">CVS doc/www Repository Managers</a>
-    &lt;<a href="mailto:dcvs@FreeBSD.org">dcvs@FreeBSD.org</a>&gt;</h3>
-
-  <p>The CVS doc/www Repository Managers are allowed to directly modify the
-    repository without using the CVS tool.  It is their responsibility to
-    ensure that technical problems that arise in the repository are
-    resolved quickly.  The CVS doc/www repository managers have the
-    authority to back out commits if this is necessary to resolve a CVS
-    technical problem.  Repo-copy requests should be directed to the
-    repository managers.</p>
-
-  <ul>
-    <li>&a.joe; &lt;<a href="mailto:joe@FreeBSD.org">joe@FreeBSD.org</a>&gt;</li>
-    <li>&a.kuriyama; &lt;<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>&gt;</li>
-    <li>&a.markm; &lt;<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>&gt;</li>
-    <li>&a.simon; &lt;<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>&gt;</li>
-  </ul>
-
   <h3><a name="t-pcvs">CVS ports Repository Managers</a>
     &lt;<a href="mailto:pcvs@FreeBSD.org">pcvs@FreeBSD.org</a>&gt;</h3>
 
@@ -454,7 +434,6 @@
     services.</p>
 
   <ul>
-    <li>&a.billf; &lt;<a href="mailto:billf@FreeBSD.org">billf@FreeBSD.org</a>&gt;</li>
     <li>&a.dg; &lt;<a href="mailto:dg@FreeBSD.org">dg@FreeBSD.org</a>&gt;</li>
     <li>&a.ps; &lt;<a href="mailto:ps@FreeBSD.org">ps@FreeBSD.org</a>&gt;</li>
     <li>&a.kensmith; &lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;</li>

en_US.ISO8859-1/htdocs/internal/homepage.pl

@@ -1,11 +1,12 @@
 #!/usr/bin/perl
 
-$passwd = '/etc/passwd';
+# $FreeBSD$
+
 $homepagedir = 'public_html';
 @index = ('index.html', 'index.cgi');
 $noindex = '.noindex';
 
-open(P, 'ypcat passwd |') || die "open $passwd: $!\n";
+open(P, 'getent passwd |') || die "getent passwd: $!\n";
 undef @pages;
 while(<P>) {
 	($login,$password,$uid,$gid,$gcos,$home,$shell) = split(/:/);
@@ -14,7 +15,7 @@ while(<P>) {
 	$gcos =~ s/,.*//;
 
 	# disable daemons
-	next if $uid <= 100;
+	next if $uid < 500;
 	next if $login eq 'nobody';
 	next if $shell =~ ~ m%/(pppd|sliplogin|nologin|nonexistent)$%;
 

en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml

@@ -11572,6 +11572,17 @@
 
 	<!-- devsummit - cambridge
 	 -->
+	<item source="devsummit-cambridge" added="20120930">
+	    <title>Cambridge FreeBSD DevSummit2012 - Photos - Ollivier
+	      Robert</title>
+	    <overview>http://gallery.keltia.net/v/voyages/conferences/devsummit-cam-2012/</overview>
+	    <desc>
+		Photos of the 2012 FreeBSD DevSummit at the University
+		of Cambridge by Ollivier Robert
+	    </desc>
+	    <tags>devsummit2012,devsummit,photos,ollivier robert</tags>
+	</item>
+
 	<item source="devsummit-cambridge" added="20080825">
 	    <title>Welcome - Cambridge University FreeBSD DevSummit - Robert Watson</title>
 	    <overview>http://wiki.freebsd.org/200808DevSummit</overview>

en_US.ISO8859-1/htdocs/platforms/ppc.sgml

@@ -226,25 +226,25 @@ OK load /boot/kernel/kernel.save</pre>
     <li><a href="http://www.firmworks.com/QuickRef.html">
       Open Firmware Quick Reference</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn1061.html">
+    <li><a href="https://developer.apple.com/legacy/mac/library/#technotes/tn/tn1061.html">
       "TN1061: Fundamentals of Open Firmware, Part 1 - The User
       Interface"</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn1062.html">
+    <li><a href="https://developer.apple.com/legacy/mac/library/#technotes/tn/tn1062.html">
       "TN1062: Fundamentals of Open Firmware, Part 2 - The Device
       Tree"</a></li>
 
-    <li><a href="http://developer.apple.com/techpubs/hardware/hardware2.html">
+    <li><a href="http://developer.apple.com/legacy/mac/library/navigation/">
       Apple hardware developer docs</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2004.html">
+    <li><a href="http://web.archive.org/web/20080514111646/http://developer.apple.com/technotes/tn/tn2004.html">
       "TN2004: Debugging Open Firmware Using Telnet"</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2023.html">
+    <li><a href="http://web.archive.org/web/20080509173539/http://developer.apple.com/technotes/tn/tn2023.html">
       "TN2023: Open Firmware Ethernet Debugging II - Telnet Downloading"
       </a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2001.html">
+    <li><a href="http://developer.apple.com/legacy/mac/library/#technotes/tn/tn2001.html">
       "TN2001: Running Files from a Hard Drive in Open Firmware"</a></li>
 
     <li><a href="http://sourceware.org/psim/">psim</a> - A PowerPC

en_US.ISO8859-1/htdocs/ports/index.sgml

@@ -41,13 +41,13 @@ be committed.
 <p>Each ``port'' listed here
 contains any patches necessary to make the original application source
 code compile and run on FreeBSD.  Installing an application is as
-simple as downloading the port, unpacking it and typing
+simple as typing
 <a href="http://www.freebsd.org/cgi/man.cgi?query=make"><tt>make</tt></a>
-in the port directory.  However, the most convenient (and common) method
+in the port directory.  If you
-is to download the framework for the entire list of ports by installing the
+download the framework for the entire list of ports by installing the
 <!--<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">-->
-<a href="installing.html">
+<a href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html#ports-tree">
-entire ports hierarchy</a> at FreeBSD installation time, and then have
+ports hierarchy</a>, you can have
 thousands of applications right at your fingertips.
 </p>
 

en_US.ISO8859-1/htdocs/releases/9.0R/hardware.html

@@ -7249,10 +7249,6 @@ RT2600 chipsets, including:</p>
 </li>
 </ul>
 
-<p>An up to date list can be found at <a
-href="http://damien.bergamini.free.fr/ral/list.html"
-target="_top">http://damien.bergamini.free.fr/ral/list.html</a>.</p>
-
 <p>[i386,amd64] The <a
 href="http://www.FreeBSD.org/cgi/man.cgi?query=rum&sektion=4&manpath=FreeBSD+9.0-RELEASE">
 <span class="CITEREFENTRY"><span class="REFENTRYTITLE">rum</span>(4)</span></a> driver

en_US.ISO8859-1/htdocs/search/search.sgml

@@ -30,7 +30,6 @@
     <ul>
       <li><a href="http://fxr.watson.org/">
 	The Source Code</a></li>
-      <li><a href="http://www.google.com/bsd">Google Search BSD</a></li>
       <li><a href="http://freebsd.rambler.ru/">Rambler: FreeBSD mail archives search</a></li>
       <li><a href="http://freebsd.markmail.org/">MarkMail: FreeBSD mail archives search</a></li>
     </ul>

en_US.ISO8859-1/htdocs/search/sitemap.xml

@@ -1748,11 +1748,6 @@
       <destination>&base;/projects/cvsweb.html</destination>
     </item>
 
-    <item>
-      <text>FreeBSD GNATS Upgrade</text>
-      <destination>&base;/projects/gnats4/index.html</destination>
-    </item>
-
     <item>
       <text>FreeBSD Project Ideas</text>
       <destination>&base;/projects/ideas/index.html</destination>

en_US.ISO8859-1/htdocs/snapshots/index.sgml

@@ -25,6 +25,7 @@
       These snapshots will be very similar to full releases,
       except that they might not include all the bits included in a
       full release (such as packages and updated documentation).</p>
+-->
 
     <h2>Getting Snapshots</h2>
 
@@ -35,12 +36,15 @@
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">mirror
 	  sites</a>.</p>
 
+    <p>Please note that sometimes the snapshots available to download
+      may be somewhat outdated.</p>
+
+<!--
     <p>Currently the snapshots of
-      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">9-CURRENT</a>,
+      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">&rel.head.major;-CURRENT</a>,
-      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">8-STABLE</a>,
+      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">&rel.current.major;-STABLE</a>,
-      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">7-STABLE</a>,
       and
-      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">6-STABLE</a>
+      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">&rel2.current.major;-STABLE</a>,
       are released monthly in directories whose URLs have the format
       <tt>&url.snapshots;/&lt;year&gt;&lt;month&gt;/</tt>
       where <tt>&lt;year&gt;</tt> is the four-digit year and
@@ -52,6 +56,7 @@
       applicable).
       Each snapshot directory might contain a <tt>RELNOTES.TXT</tt>
       file which outlines the changes for the particular snapshot.</p>
+-->
 
     <h2>Things You Might Want to Know</h2>
 

en_US.ISO8859-1/htdocs/support/bugreports.sgml

@@ -44,12 +44,10 @@
 
 	    <p>Problem reports may be submitted to the development team using the
 	      <a href="&cgibase;/man.cgi?query=send-pr&amp;sektion=1">send-pr(1)</a>
-	      command on a &os; system.  Another way to submit a problem report is
+	      command on a &os; system or by
-	      to use the web based <a href="&base;/send-pr.html">form</a>,
+	      using the web based <a href="&base;/send-pr.html">form</a>.
-	      or by sending an email message to <a
+	      Please note that
-		href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.
+	      messages sent to a mailing list are <em>not</em> tracked as
-	      Please note that <a href="&base;/send-pr.html">send-pr</a> is preferred
-	      since messages sent to the mailing list are <em>not</em> tracked as
 	      official problem reports, and may get lost in the noise!</p>
 
 	    <p>Before submitting a problem report, you might find it useful to

ja_JP.eucJP/htdocs/platforms/ppc.sgml

@@ -6,7 +6,7 @@
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.30 -->
+<!-- Original revision: r39477 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -240,25 +240,25 @@ OK load /boot/kernel/kernel.save</pre>
     <li><a href="http://www.firmworks.com/QuickRef.html">
       Open Firmware Quick ¥ê¥Õ¥¡¥ì¥ó¥¹</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn1061.html">
+    <li><a href="https://developer.apple.com/legacy/mac/library/#technotes/tn/tn1061.html">
       "TN1061: Fundamentals of Open Firmware, Part 1 - The User
       Interface"</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn1062.html">
+    <li><a href="https://developer.apple.com/legacy/mac/library/#technotes/tn/tn1062.html">
       "TN1062: Fundamentals of Open Firmware, Part 2 - The Device
       Tree"</a></li>
 
-    <li><a href="http://developer.apple.com/techpubs/hardware/hardware2.html">
+    <li><a href="http://developer.apple.com/legacy/mac/library/navigation/">
       Apple hardware developer ʸ½ñ</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2004.html">
+    <li><a href="http://web.archive.org/web/20080514111646/http://developer.apple.com/technotes/tn/tn2004.html">
       "TN2004: Debugging Open Firmware Using Telnet"</a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2023.html">
+    <li><a href="http://web.archive.org/web/20080509173539/http://developer.apple.com/technotes/tn/tn2023.html">
       "TN2023: Open Firmware Ethernet Debugging II - Telnet Downloading"
       </a></li>
 
-    <li><a href="http://developer.apple.com/technotes/tn/tn2001.html">
+    <li><a href="http://developer.apple.com/legacy/mac/library/#technotes/tn/tn2001.html">
       "TN2001: Running Files from a Hard Drive in Open Firmware"</a></li>
 
     <li><a href="http://sourceware.org/psim/">psim</a>

ja_JP.eucJP/htdocs/search/search.sgml

@@ -4,7 +4,7 @@
 <!ENTITY title "検索">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.122 -->
+<!-- Original revision: r39484 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -32,7 +32,6 @@
     <ul>
       <li><a href="http://fxr.watson.org/">
 	ソースコード</a></li>
-      <li><a href="http://www.google.com/bsd">Google Search BSD</a></li>
       <li><a href="http://freebsd.rambler.ru/">Rambler: FreeBSD メールアーカイブ検索</a></li>
       <li><a href="http://freebsd.markmail.org/">MarkMail: FreeBSD メールアーカイブ検索</a></li>
     </ul>

ja_JP.eucJP/htdocs/support/bugreports.sgml

@@ -5,7 +5,7 @@
 ]>
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.6 -->
+<!-- Original revision: r39495 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -32,7 +32,7 @@
 	      コレクションに加えるために準備された port に関しての報告です。</p>
 
 	    <p>障害報告は 'open'
-	      状態から始まり、報告された問題が解決すると閉じられます。
+	      状態から始まり、報告された問題が解決すると 'closed' になります。
 	      なお、見失うことがないように、各障害報告には固有の追跡 ID
 	      が割り当てられます。FreeBSD
 	      に加えられた変更の履歴には、その変更を促した障害報告の追跡 ID
@@ -47,16 +47,13 @@
 
 	<h2>障害報告 (PR) の提出</h2>
 
-	    <p>&os; システムの
+	    <p>障害報告は、&os; システムの
 	      <a href="&cgibase;/man.cgi?query=send-pr&amp;sektion=1">send-pr(1)</a>
-	      コマンドで開発チームに障害報告を提出できます。
+	      コマンドや、ウェブの
-	      ウェブの <a href="&base;/send-pr.html">入力フォーム</a> を利用したり、
+	      <a href="&base;/send-pr.html">入力フォーム</a> を利用して、
-	      <a href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>
+	      開発チームに提出できます。
-	      にメールを送ることでも提出できます。
 	      メーリングリストに提出された報告は、
-	      公式の障害報告としては追跡され<em>ない</em>ので、<a
+	      公式の障害報告としては追跡され<em>ない</em>ことに注意してください。</p>
-	      href="&base;/send-pr.html">send-pr</a>
-	      が推奨されています!</p>
 
 	    <p>障害報告を提出する前に <a
 	      href="&enbase;/doc/ja_JP.eucJP/articles/problem-reports/">FreeBSD

mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml

@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 38879
+     Original revision 39399
 
      $FreeBSD$
 -->
@@ -708,13 +708,12 @@ Fetching 133 new ports or files... done.</screen>
       сүүлийн үеийн баримтын цуглуулгын локал хуулбарыг арчлан хувилбар бүртэй цуг
       ирдэг баримтыг шинэчлэх хэд хэдэн арга байдаг.</para>
 
-    <sect2 id="csup-doc">
+    <sect2 id="dsvn-doc">
-      <title>Баримтыг шинэчлэхийн тулд CVSup-г ашиглах нь</title>
+      <title>Баримтыг шинэчлэхийн тулд <application>Subversion</application>-г ашиглах нь</title>
 
-      <para>Үндсэн системийг шинэчлэхтэй төстэй аргыг ашиглан
+      <para>&os;-ийн 
-	<application>CVSup</application> хэрэглэн эх болон &os;-ийн
+	баримтуудын эхийг <application>Subversion</application> 
-	баримтуудын суулгагдсан хуулбарыг шинэчилж болно
+	ашиглан авч болно. Энэ хэсэг дараах зүйлсийг 
-	(<xref linkend="makeworld"/>). Энэ хэсэг дараах зүйлсийг
 	  тайлбарладаг:</para>
 
       <itemizedlist>
@@ -725,7 +724,7 @@ 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>
 	</listitem>
@@ -746,7 +745,7 @@ Fetching 133 new ports or files... done.</screen>
     </sect2>
 
     <sect2 id="installing-documentation-toolchain">
-      <title>CVSup болон баримтын хэрэгслүүдийг суулгах нь</title>
+      <title><application>Subversion</application> болон баримтын хэрэгслүүдийг суулгах нь</title>
 
       <para>&os;-ийн баримтыг эхээс нь бүтээхэд нэлээн олон
 	тооны хэрэгслүүдийг шаарддаг. Эдгээр хэрэгслүүд нь
@@ -775,66 +774,35 @@ Fetching 133 new ports or files... done.</screen>
 	  байдаг.</para>
       </note>
 
-      <para><application>CVSup</application>-г суулгаж ашиглах талаарх
+      <para><application>Subversion</application> нь 
-	дэлгэрэнгүй мэдээллийг <link
+	<filename role="package">textproc/docproj</filename> порттой цуг суудаг.</para>
-	  linkend="cvsup">CVSup-г ашиглах</link> хэсгээс үзнэ үү.</para>
     </sect2>
 
     <sect2 id="updating-documentation-sources">
       <title>Баримтын эхийг шинэчлэх нь</title>
 
-      <para><application>CVSup</application> нь
+      <para><application>Subversion</application> нь 
-	<filename>/usr/share/examples/cvsup/doc-supfile</filename> файлыг
+	баримтын эхийн цэвэр хуулбарыг татан 
-	тохиргооны загвар болгон ашиглаж баримтын эхийн цэвэр хуулбарыг татан
+	авч чаддаг.</para>
-	авч чаддаг. Анхдагч шинэчлэлтийн хост нь <filename>doc-supfile</filename>
-	файлд зааснаар байгаа боловч &man.cvsup.1; нь тушаалын мөрөөс хостын
-	нэрийг авдаг бөгөөд баримтын эхийг аль нэг <application>CVSup</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>
+	<screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
-
-      <para><replaceable>cvsup.FreeBSD.org</replaceable>-г хамгийн ойр
-	<application>CVSup</application> серверээр солих хэрэгтэй. Толин
-	тусгал сайтуудын бүрэн жагсаалтыг <xref
-	  linkend="cvsup-mirrors"/>-с үзнэ үү.</para>
 
       <para>Баримтын эхийн эхний таталт хугацаа шаардаж болох юм. Дуустал нь
 	хүлээх хэрэгтэй.</para>
 
-      <para>Баримтын эхийн дараа дараагийн шинэчлэлтүүдийг дээрх тушаалыг
+      <para>Баримтын эхийн дараа дараагийн шинэчлэлтүүдийг доорх тушаалыг 
-	ашиглан татан авч болно. <application>CVSup</application> хэрэгсэл нь
+	ашиглан татан авч болно.</para>
-	хамгийн сүүлийн удаа ажилласнаашаа хойших шинэчлэлтүүдийг зөвхөн татан
+
-	авч хуулдаг учир эхний удаа бүрэн ажилласнаас хойш дараа дараагийн
+      <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
-	удаа <application>CVSup</application>-г ажиллуулахад илүү хурдан
-	байдаг.</para>
 
       <para>Эхийг татан авсныхаа дараа баримтыг шинэчлэх өөр нэг арга нь 
 	<filename
 	  class="directory">/usr/doc</filename> сангийн 
-	<filename>Makefile</filename>-аар дэмжигдсэн байдаг.
+	<filename>Makefile</filename>-аар дэмжигдсэн байдаг бөгөөд 
-	<filename>/etc/make.conf</filename> файлд
+	дараахийг ажиллуулна:</para>
-	<makevar>SUP_UPDATE</makevar>, <makevar>SUPHOST</makevar> болон
-	<makevar>DOCSUPFILE</makevar>-ийг тохируулснаар доорхийг
-	ажиллуулах боломжтой болно:</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>-г
-	  өгснөөр бүтээх тушаалын мөрөөс өөрчлөх боломжийг бүрдүүлдэг.
-	  Энэ нь <filename>make.conf</filename>-д тохируулгууд нэмэх
-	  зөвлөсөн арга юм. Ингэснээр өөр өөр тохируулгын утгыг тест хийх
-	  болгонд файлыг засварлах шаардлагагүй болгодог.</para>
-      </note>
     </sect2>
 
     <sect2 id="updating-documentation-options">
@@ -873,15 +841,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	</varlistentry>
 
         <varlistentry>
-	  <term><makevar>SUPHOST</makevar></term>
-
-	  <listitem>
-	    <para>Шинэчлэхэд ашиглах <application>CVSup</application>
-	      серверийн хостын нэр.</para>
-	  </listitem>
-	</varlistentry>
-         <varlistentry>
-
           <term><makevar>DOCDIR</makevar></term>
 
           <listitem>
@@ -914,15 +873,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>
@@ -964,7 +914,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	практикийн биш байж болох юм. Баримтжуулалтын эхүүдийг
 	бүтээх нь нэлээн их хэмжээний хэрэгслийн цуглуулга буюу
 	<emphasis>баримтжуулалт бүтээх хэрэгслийн олонлог</emphasis>,
-	<application>CVS</application>-ийг тодорхой хэмжээгээр мэдэх,
+	<application>Subversion</application>-ийг тодорхой хэмжээгээр мэдэх, 
 	репозиториос эхийг татаж авах болон татаж авсан эхээ 
 	бүтээх хэд хэдэн шат дарааллуудыг шаарддаг. Энэ хэсэгт 
 	бид &os;-ийн баримтжуулалтын суулгагдсан хуулбаруудыг 
@@ -1099,7 +1049,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 		  байдаг.</para>
 
 		<note>
-		  <para>Анхдагч суулгах сан нь <application>CVSup</application>
+		  <para>Анхдагч суулгах сан нь <application>Subversion</application> 
 		    аргын ашигладаг сангаас ялгаатайг санаарай. 
 		    Энэ нь яагаад гэвэл бид порт суулгаж байгаа 
 		    бөгөөд портууд нь ихэвчлэн <filename

mn_MN.UTF-8/books/handbook/filesystems/chapter.sgml

@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.16
+     Original revision 39361
 
      $FreeBSD$
 -->
@@ -770,12 +770,12 @@ errors: No known data errors</screen>
 
       <para>Эхлээд цөмийн дуудагдах модулийг ачаална:</para>
 
-      <screen>kldload ext2fs</screen>
+      <screen>&prompt.root; <userinput>kldload ext2fs</userinput></screen>
 
       <para>Дараа нь <filename>/dev/ad1s1</filename>-д байрлах
 	&man.ext2fs.5; эзлэхүүнийг холбоно:</para>
 
-      <screen><userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
+      <screen>&prompt.root; <userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
     </sect2>
     <sect2>
       <title>XFS</title>
@@ -791,7 +791,7 @@ errors: No known data errors</screen>
       <para><acronym>XFS</acronym>-г цөмийн дуудагдах
 	модуль хэлбэрээр ачаалахын тулд:</para>
 
-      <screen>kldload xfs</screen>
+      <screen>&prompt.root; <userinput>kldload xfs</userinput></screen>
 
       <para>&man.xfs.5; драйвер нь &os;-д XFS файлын
 	систем рүү хандах боломжийг олгодог. Гэхдээ одоогоор
@@ -801,7 +801,7 @@ errors: No known data errors</screen>
       <para><filename>/dev/ad1s1</filename>-д байрлах
 	&man.xfs.5; эзлэхүүнийг холбохын тулд дараахийг хийнэ:</para>
 
-      <screen><userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
+      <screen>&prompt.root; <userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
 
       <para><filename role="package">sysutils/xfsprogs</filename> порт нь
 	<acronym>XFS</acronym> файлын системийг үүсгэх боломжийг
@@ -829,12 +829,12 @@ errors: No known data errors</screen>
 
       <para>Эхлээд цөмийн дуудагдах модулийг ачаалах хэрэгтэй:</para>
 
-      <screen>kldload reiserfs</screen>
+      <screen>&prompt.root; <userinput>kldload reiserfs</userinput></screen>
 
       <para>Дараа нь <filename>/dev/ad1s1</filename>-д байгаа
 	ReiserFS эзлэхүүнийг холбохын тулд:</para>
 
-      <screen><userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
+      <screen>&prompt.root; <userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
     </sect2>
   </sect1>
 

mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml

@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39186
+     Original revision 39467
 
      $FreeBSD$
 -->
@@ -229,6 +229,111 @@
 	CD эсвэл DVD дээр шарж болох юм.</para>
   </sect1>
 
+  <sect1 id="mirrors-svn">
+    <title>Subversion сайтууд</title>
+
+    <indexterm>
+      <primary>svn</primary>
+    </indexterm>
+
+    <para>2012 оны 7 сараас &os;-н бүх эх код, баримтжуулалт болон 
+      портын цуглуулгыг хадгалахдаа <ulink url="http://subversion.apache.org/">Subversion</ulink>
+      (<emphasis>svn</emphasis>)-г үндсэн хувилбар удирдах систем 
+      болгон ашиглаж эхэлсэн.</para>
+
+    <note>
+      <para>Subversion хөгжүүлэлтийн хэрэгсэл юм.
+	Ихэнх хэрэглэгчид 
+	<link linkend="updating-upgrading-freebsdupdate">FreeBSD-г
+	  шинэчлэх</link> хэсэгт зааснаар &os;-н үндсэн системийг 
+	шинэчлэх ёстой бөгөөд &os;-н портын цуглуулгыг шинэчлэхдээ 
+	<link linkend="updating-upgrading-portsnap">Portsnap</link>-г 
+	ашиглах ёстой.</para>
+    </note>
+
+    <para>&os; svn толин сүлжээ нь эхний шатандаа байгаа бөгөөд 
+      өөрчлөгдөх магадлалтай. Эдгээр толин тусгалуудыг статик 
+      гэж тооцоолж болохгүй. Ялангуяа серверүүдийн SSL сертификатууд
+      хэзээ нэг цагт шинэчлэгдэх болно.</para>
+
+    <para>Subversion-д URL-г ашиглан репозиторыг заадаг бөгөөд 
+      <literal>protocol://hostname/path</literal> хэлбэрийн байна.
+      Доор заасан шиг толин тусгалууд өөр өөр протоколуудыг 
+      дэмжиж болно. Замын эхний хэсэг нь хандаж болох &os;-н 
+      репозитор юм. Гурван өөр репозитор байдаг: &os;-н үндсэн 
+      системийн эх кодод зориулсан <literal>base</literal>, 
+      Портын цуглуулгад зориулсан <literal>ports</literal>, 
+      баримтжуулалтад зориулсан <literal>doc</literal> байдаг. 
+      Жишээ нь URL
+      <literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal> нь 
+      svn протоколыг ашиглан <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> толин дээрх 
+      портын репозиторын гол салбарыг зааж байна.</para>
+
+    <para>Бүх толин тусгалууд бүх репозиторыг агуулдаг.</para>
+
+    <para>&os;-н мастер Subversion сервер 
+      <hostid role="fqdn">svn.FreeBSD.org</hostid>-д олон 
+      нийт хандах боломжтой байх бөгөөд зөвхөн уншигдах боломжтой 
+      байдаг. Энэ нь ирээдүйд өөрчлөгдөж болох бөгөөд хэрэглэгчдийг
+      аль болох албан ёсны толин тусгалуудыг ашиглахыг зөвлөдөг. 
+      &os; Subversion репозиториудыг хөтөч ашиглан харахын 
+      тулд <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>Нэр</entry>
+
+	    <entry>Протоколууд</entry>
+
+	    <entry>Байрлал</entry>
+
+	    <entry>SSL хээ</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>Нэргүй CVS</title>
 

mn_MN.UTF-8/books/handbook/ports/chapter.sgml

@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39234
+     Original revision 39474
 
      $FreeBSD$
 -->
@@ -891,7 +891,35 @@ docbook                     =
 	</note>
 
 	<note>
-	  <para>Зарим shells буюу бүрхүүлийн орчнууд нь <envar>PATH</envar>
+	  <para>Зөвхөн <command>make
+	      <maketarget>install</maketarget></command> тушаал 
+	    ашиглан порт суулгахад заримдаа хэрэглэгчээс 
+	    сонголт оруулахыг хүлээж удах тохиолдлууд байж болдог.
+	    Учир нь зарим тохиолдолд анхдагчаар хэрэглэгчээс сонголт хийхийг 
+	    асуухаар хийгдсэн байдаг. Иймээс олон хамааралтай үед 
+	    заримдаа нэг портыг бүтээж эмхэтгэхэд төвөгтэй болгодог. 
+	    Үүнээс гарахын тулд <command>make
+	      <maketarget>config-recursive</maketarget></command> 
+	    тушаал ашиглан тохиргоог нэг удаагаар хийх хэрэгтэй.
+	    Дараа нь <command>make <maketarget>install
+	      [clean]</maketarget></command> тушаалыг ажиллуулах 
+	    хэрэгтэй.</para>
+	</note>
+
+	<tip>
+	  <para><maketarget>config-recursive</maketarget> гэдгийг 
+	    ашиглахад тохиргоо хийгдэх портуудын жагсаалт
+	    <maketarget>all-depends-list</maketarget> гэсэн &man.make.1;-н 
+	    нэмэлт боломжоор нэгтгэгддэг. 
+	    Хамааралтай бүх портуудын тохиргоонууд тодорхой болтол буюу 
+	    &man.dialog.1; дэлгэц гарч ирэхгүй болж бүх портуудын тохиргоо 
+	    зөвөөр хийгдтэл <command>make
+	      <maketarget>config-recursive</maketarget></command> тушаалыг 
+	    ажиллуулахыг ихэвчлэн зөвлөдөг.</para>
+	</tip>
+
+	<note>
+	  <para>Зарим бүрхүүлийн орчнууд нь <envar>PATH</envar>
 	    орчны хувьсагч дотор буй сангууд доторх ачаалагдаж болдог
 		програмуудын тушаалын хайлтыг түргэвчлэх зорилгоор түр хадгалагчид
 		хадгалсан байдаг. Та хэрэв ийм төрлийн бүрхүүлийн орчин

mn_MN.UTF-8/books/handbook/users/chapter.sgml

@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.63
+     Original revision 39362
 
      $FreeBSD$
 -->

share/sgml/commercial.consult.xml

@@ -967,7 +967,7 @@
 
   <entry id="Pendulosoftware" category="samerica">
     <name>Pendulo Software</name>
-    <url>http://www.pendulosoftware.com.ve</url>
+    <url>http://www.pendulosoftware.com</url>
     <description>
       Based in Caracas, Venezuela, Pendulo Software provides and
       specializes in support and consulting for FreeBSD and Linux
@@ -979,12 +979,12 @@
       routine of server management, security audits and updates, to high
       performance computing and mitigating attacks.  For more information
       about our services, please visit our multilanguage <a
-      href="http://www.pendulosoftware.com.ve">website</a>, send an
+      href="http://www.pendulosoftware.com">website</a>, send an
       email to <a
-      href="mailto:atencioncliente@pendulosoftware.com.ve">atencioncliente@pendulosoftware.com.ve</a>
+      href="mailto:atencioncliente@pendulosoftware.com">atencioncliente@pendulosoftware.com</a>
       or <a
-      href="mailto:infocorp@pendulosoftware.com.ve">infocorp@pendulosoftware.com.ve</a>
+      href="mailto:infocorp@pendulosoftware.com">infocorp@pendulosoftware.com</a>
-      or call us under +58 (212) 637-1074, +1 (407) 536-9895, or
+      or call us under +58 (212) 625-0708, +1 (407) 536-9895 or
       +1 (253) 642-6484.
     </description>
   </entry>

share/sgml/mirrors.xml

@@ -765,13 +765,6 @@
       <url proto="http">http://www2.hu.FreeBSD.org/</url>
     </host>
 
-    <host type="ftp">
-      <name>ftp.hu.FreeBSD.org</name>
-      <url proto="ftp">ftp://ftp.hu.FreeBSD.org/pub/FreeBSD/</url>
-      <url proto="http">http://ftp.hu.FreeBSD.org/pub/FreeBSD/</url>
-      <url proto="rsync"></url>
-    </host>
-
     <host type="cvsup">
       <name>cvsup.hu.FreeBSD.org</name>
     </host>

zh_CN.GB2312/books/handbook/geom/chapter.sgml

@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.50
+     Original Revision: r38401
      $FreeBSD$
 -->
 
@@ -152,7 +152,8 @@
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
 
-      <step><para>确定将被做成条带卷的磁盘的设备名，
+      <step>
+	<para>确定将被做成条带卷的磁盘的设备名，
 	  并创建新的条带设备。 举例而言，
 	  要将两个未用的、 尚未分区的 <acronym>ATA</acronym> 磁盘
 	  <filename>/dev/ad2</filename> 和
@@ -165,14 +166,15 @@ Done.</screen>
 
       </step>
 
-      <step><para>接着需要写标准的 label， 也就是通常所说的分区表到新卷上，
+      <step>
+	<para>接着需要写标准的 label， 也就是通常所说的分区表到新卷上，
 	  并安装标准的引导代码：</para>
 
         <screen>&prompt.root; <userinput>bsdlabel -wB /dev/stripe/st0</userinput></screen>
-
       </step>
 
-      <step><para>上述过程将在
+      <step>
+	<para>上述过程将在
 	  <filename class="directory">/dev/stripe</filename>
 	  目录中的 <devicename>st0</devicename> 设备基础上建立两个新设备。
 	  这包括 <devicename>st0a</devicename> 和
@@ -185,6 +187,7 @@ Done.</screen>
 	<para>在屏幕上将滚过一些数字， 整个操作应该能在数秒内完成。
 	  现在可以挂接刚刚做好的卷了。</para>
       </step>
+
   </procedure>
 
   <para>要挂接刚创建的条带盘：</para>
@@ -194,8 +197,9 @@ Done.</screen>
     <para>要在启动过程中自动挂接这个条带上的文件系统，
       需要把关于卷的信息放到
       <filename>/etc/fstab</filename> 文件中。为达到此目的，
-    需要创建一个叫 <filename class="directory">stripe</filename>
+      需要创建一个叫
-    永久的挂载点：</para>
+      <filename class="directory">stripe</filename>
+      的永久的挂载点：</para>
 
   <screen>&prompt.root; <userinput>mkdir /stripe</userinput>
 &prompt.root; <userinput>echo "/dev/stripe/st0a /stripe ufs rw 2 2" \</userinput>
@@ -203,7 +207,7 @@ Done.</screen>
 
     <para>此外， <filename>geom_stripe.ko</filename> 模块也必须通过在
       <filename>/boot/loader.conf</filename> 中增加下述设置，
-    以便在系统初始化过程中自动加载。</para>
+      以便在系统初始化过程中自动加载：</para>
 
   <screen>&prompt.root; <userinput>echo 'geom_stripe_load="YES"' &gt;&gt; /boot/loader.conf</userinput></screen>
 
@@ -220,8 +224,8 @@ Done.</screen>
     </indexterm>
 
     <para>镜像是许多公司和家庭用户使用的一种无须中断的备份技术。
-      简单地说， 镜像的概念就是 磁盘B 是同步复制 (replicate) 的 磁盘A 的副本， 或者 磁盘C+D
+      简单地说， 镜像的概念就是 磁盘B 是同步复制 (replicate) 的 磁盘A 的副本，
-      是 diskA+B 的同步复制副本， 等等。 无论磁盘配置如何，
+      或者 磁盘C+D 是 diskA+B 的同步复制副本， 等等。 无论磁盘配置如何，
       这种技术的共同特点都是一块磁盘或分区的内容会同步复制到另外的地方。
       这样， 除了能够很容易地恢复信息之外，
       还能够在无须中断服务或访问的情况下进行备份，
@@ -250,9 +254,13 @@ Done.</screen>
 	<filename class="devicefile">/dev/mirror/gm</filename> 设备：</para>
 
       <warning>
-        <para>如果有数据被存放在磁盘最后的扇区，
+	<para>在引导用的设备基础上新建镜像时，
-          并在启动设备上创建镜像的话可能导致数据丢失。
+	  有可能会导致保存在磁盘上最后一个扇区的数据丢失。
-          在新安装 &os; 之后立即创建镜像可以减低此风险。</para>
+	  在新安装 &os; 之后立即创建镜像可以减低此风险。
+	  下面的操作与默认的 &os;&nbsp;9.<replaceable>X</replaceable>
+	  安装过程不兼容， 因为它采用了新的 <acronym>GPT</acronym>
+	  分区格式。 GEOM 会覆盖 <acronym>GPT</acronym> 元数据，
+	  这会导致数据丢失， 并有可能导致系统无法引导。</para>
       </warning>
 
       <screen>&prompt.root; <userinput>gmirror label -vb round-robin gm0 /dev/da0</userinput></screen>
@@ -291,8 +299,8 @@ Done.</screen>
 	<para>在 &man.vi.1; 中备份现有的
 	  <filename>fstab</filename> 内容， 具体操作是
 	  <userinput>:w /etc/fstab.bak</userinput>。 接着，
-	  把所有旧的 <devicename>da0</devicename> 替换成 <devicename>gm0</devicename>，
+	  把所有旧的 <devicename>da0</devicename>
-	  也就是输入命令
+	  替换成 <devicename>gm0</devicename>， 也就是输入命令
 	  <userinput>:%s/da/mirror\/gm/g</userinput>。</para>
       </note>
 
@@ -399,6 +407,156 @@ OK? <userinput>boot</userinput></screen>
     </sect2>
   </sect1>
 
+  <sect1 id="GEOM-raid3">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Mark</firstname>
+	  <surname>Gladman</surname>
+	  <contrib>Written by </contrib>
+	</author>
+	<author>
+	  <firstname>Daniel</firstname>
+	  <surname>Gerzo</surname>
+	</author>
+      </authorgroup>
+      <authorgroup>
+	<author>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	  <contrib>Based on documentation by </contrib>
+	</author>
+	<author>
+	  <firstname>Murray</firstname>
+	  <surname>Stokely</surname>
+	</author>
+      </authorgroup>
+    </sect1info>
+
+    <title><acronym>RAID</acronym>3 - 使用专用校验设备的字节级条带</title>
+
+    <indexterm>
+      <primary>GEOM</primary>
+    </indexterm>
+    <indexterm>
+      <primary>RAID3</primary>
+    </indexterm>
+
+    <para><acronym>RAID</acronym>3 是一种将多个磁盘组成一个卷的技术，
+      在这个配置中包含一个专用于校验的盘。
+      在 <acronym>RAID</acronym>3 系统中，
+      数据会以字节为单位拆分并写入除校验盘之外的全部驱动器中。 这意味着从
+      <acronym>RAID</acronym>3 中读取数据时将会访问所有的驱动器。
+      采用多个磁盘控制器可以进一步改善性能。 <acronym>RAID</acronym>3
+      阵列最多可以容忍其中的 1 个驱动器出现故障，
+      它可以提供全部驱动器总容量的 1 - 1/n，
+      此处 n 是阵列中的磁盘数量。 这类配置比较适合保存大容量的数据，
+      例如多媒体文件。</para>
+
+    <para>在建立
+      <acronym>RAID</acronym>3 阵列时， 至少需要 3 块磁盘。
+      所有的盘的尺寸必须一致， 因为 I/O 请求会并发分派到不同的盘上。
+      另外， 由于
+      <acronym>RAID</acronym>3 本身的设计，
+      盘的数量必须恰好是 3, 5, 9, 17, 等等 (2^n + 1)。</para>
+
+    <sect2>
+      <title>建立专用的 <acronym>RAID</acronym>3 阵列</title>
+
+      <para>在 &os; 中， <acronym>RAID</acronym>3
+	是通过 &man.graid3.8; <acronym>GEOM</acronym>
+	class 实现的。 在 &os; 中建立专用的
+	<acronym>RAID</acronym>3 阵列需要下述步骤。</para>
+
+      <note>
+	<para>虽然理论上从
+	  <acronym>RAID</acronym>3 阵列启动 &os; 是可行的，
+	  但这并不常见， 也不推荐您这样做。</para>
+      </note>
+
+      <procedure>
+	<step>
+	  <para>首先， 在引导加载器中用下面的命令加载 <filename>geom_raid3.ko</filename>
+	    内核模块：</para>
+
+	  <screen>&prompt.root; <userinput>graid3 load</userinput></screen>
+
+	  <para>此外， 也可以通过命令行手工加载
+	    <filename>geom_raid3.ko</filename> 模块：</para>
+
+	  <screen>&prompt.root; <userinput>kldload geom_raid3.ko</userinput></screen>
+	</step>
+
+	<step>
+	  <para>创建用于挂载卷的挂点目录：</para>
+
+	  <screen>&prompt.root; <userinput>mkdir <replaceable>/multimedia/</replaceable></userinput></screen>
+	</step>
+
+	<step>
+	  <para>确定将要加入阵列的磁盘设备名， 并创建新的
+	    <acronym>RAID</acronym>3 设备。 最终， 这个设备将代表整个阵列。
+	    下面的例子使用三个未经分区的
+	    <acronym>ATA</acronym> 磁盘：
+	    <devicename><replaceable>ada1</replaceable></devicename>
+	    和 <devicename><replaceable>ada2</replaceable></devicename>
+	    保存数据， 而
+	    <devicename><replaceable>ada3</replaceable></devicename>
+	    用于校验。</para>
+
+	  <screen>&prompt.root; <userinput>graid3 label -v gr0 /dev/ada1 /dev/ada2 /dev/ada3</userinput>
+Metadata value stored on /dev/ada1.
+Metadata value stored on /dev/ada2.
+Metadata value stored on /dev/ada3.
+Done.</screen>
+	</step>
+
+	<step>
+	  <para>为新建的
+	    <devicename>gr0</devicename> 设备分区，
+	    并在其上创建 UFS 文件系统：</para>
+
+	  <screen>&prompt.root; <userinput>gpart create -s GPT /dev/raid3/gr0</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs /dev/raid3/gr0</userinput>
+&prompt.root; <userinput>newfs -j /dev/raid3/gr0p1</userinput></screen>
+
+	  <para>屏幕上会滚过许多数字， 这个过程需要一段时间才能完成。
+	    此后， 您就完成了创建卷的全部操作，
+	    可以挂载它了。</para>
+	</step>
+
+	<step>
+	  <para>最后一步是挂载文件系统：</para>
+
+	  <screen>&prompt.root; <userinput>mount /dev/raid3/gr0p1 /multimedia/</userinput></screen>
+
+	  <para>现在可以使用 <acronym>RAID</acronym>3 阵列了。</para>
+	</step>
+      </procedure>
+
+      <para>为了让上述配置在系统重启后继续可用， 还需要进行一些额外的配置操作。</para>
+
+      <procedure>
+	<step>
+	  <para>在挂载卷之前必须首先加载 <filename>geom_raid3.ko</filename> 模块。
+	    将下面的配置添加到
+	    <filename>/boot/loader.conf</filename> 文件中，
+	    可以让系统在引导过程中自动加载这个模块：</para>
+
+	  <programlisting>geom_raid3_load="YES"</programlisting>
+	</step>
+
+	<step>
+	  <para>您需要在
+	    <filename>/etc/fstab</filename> 文件中加入下列配置，
+	    以便让系统引导时自动挂载阵列上的文件系统：</para>
+
+	  <programlisting>/dev/raid3/gr0p1	/multimedia	ufs	rw	2	2</programlisting>
+	</step>
+      </procedure>
+    </sect2>
+  </sect1>
+
   <sect1 id="geom-ggate">
     <title>GEOM Gate 网络设备</title>
 
@@ -668,7 +826,7 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</screen>
 
     <para>如果使用日志的卷需要在启动的时候被挂载， 还需加载
       <filename>geom_journal.ko</filename> 内核模块，
-      将以下着行加入 <filename>/boot/loader.conf</filename>：</para>
+      将以下这行加入 <filename>/boot/loader.conf</filename>：</para>
 
     <programlisting>geom_journal_load="YES"</programlisting>
 
@@ -707,11 +865,11 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</screen>
     </note>
 
     <para>出于性能考虑， 可能会希望在其他磁盘上保存日志。 对于这类情形，
-      日志提供者或存储设备， 应在启用日志的设备后给出。 在暨存的文件系统上，
+      应该在启用日志的设备后面，给出日志提供者或存储设备。 在暨存的文件系统上，
       可以用 <command>tunefs</command> 来启用日志； 不过，
       在尝试修改文件系统之前， 您应对其进行备份。 多数情况下，
-      <command>gjournal</command> 会因为无法建立日志而失败， 在误用
+      如果无法创建实际的日志， <command>gjournal</command> 就会失败， 
-      <command>tunefs</command> 时， 这可能导致失败。</para>
+      并且不会防止由于不当使用 <command>tunefs</command> 而造成的数据丢失。</para>
 
     <para>对于 &os; 系统的启动磁盘使用日志也是可能的。
       请参阅 <ulink