svn commit: r44592 - head/en_US.ISO8859-1/books/handbook/mirrors
Dru Lavigne
dru at FreeBSD.org
Wed Apr 16 21:07:49 UTC 2014
Author: dru
Date: Wed Apr 16 21:07:48 2014
New Revision: 44592
URL: http://svnweb.freebsd.org/changeset/doc/44592
Log:
White space fix only. Translators can ignore.
Sponsored by: iXsystems
Modified:
head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Apr 16 20:50:50 2014 (r44591)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Apr 16 21:07:48 2014 (r44592)
@@ -11,36 +11,35 @@
<title><acronym>CD</acronym> and
<acronym>DVD</acronym> Sets</title>
- <para>&os; <acronym>CD</acronym> and <acronym>DVD</acronym> sets
- are available from several online
- retailers:</para>
+ <para>&os; <acronym>CD</acronym> and <acronym>DVD</acronym> sets
+ are available from several online retailers:</para>
- <itemizedlist>
- <listitem>
- <address>&os; Mall, Inc.
- <street>2420 Sand Creek Rd C-1 #347</street>
- <city>Brentwood</city>, <state>CA</state>
- <postcode>94513</postcode>
- <country>USA</country>
- Phone: <phone>+1 925 240-6652</phone>
- Fax: <fax>+1 925 674-0821</fax>
- Email: <email>info at freebsdmall.com</email>
- WWW: <otheraddr
- xlink:href="http://www.freebsdmall.com/">http://www.freebsdmall.com/</otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>Dr. Hinner EDV
- <street>Kochelseestr. 11</street>
- <postcode>D-81371</postcode> <city>München</city>
- <country>Germany</country>
- Phone: <phone>(0177) 428 419 0</phone>
- Email: <email>infow at hinner.de</email>
- WWW: <otheraddr
- xlink:href="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</otheraddr>
- </address>
- </listitem>
+ <itemizedlist>
+ <listitem>
+ <address>&os; Mall, Inc.
+ <street>2420 Sand Creek Rd C-1 #347</street>
+ <city>Brentwood</city>, <state>CA</state>
+ <postcode>94513</postcode>
+ <country>USA</country>
+ Phone: <phone>+1 925 240-6652</phone>
+ Fax: <fax>+1 925 674-0821</fax>
+ Email: <email>info at freebsdmall.com</email>
+ WWW: <otheraddr
+ xlink:href="http://www.freebsdmall.com/">http://www.freebsdmall.com/</otheraddr>
+ </address>
+ </listitem>
+
+ <listitem>
+ <address>Dr. Hinner EDV
+ <street>Kochelseestr. 11</street>
+ <postcode>D-81371</postcode> <city>München</city>
+ <country>Germany</country>
+ Phone: <phone>(0177) 428 419 0</phone>
+ Email: <email>infow at hinner.de</email>
+ WWW: <otheraddr
+ xlink:href="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</otheraddr>
+ </address>
+ </listitem>
<!--
This site is just showing the Apache test page.
@@ -56,7 +55,7 @@ This site is just showing the Apache tes
</address>
</listitem>
-This site doesn't have any products newer than 8.1 which is now EOL'd
+This site doesn't have any products newer than 8.1 which is now EOL'd
<listitem>
<address>The Linux Emporium
<street>The Techno Centre, Puma Way</street>
@@ -70,20 +69,20 @@ This site doesn't have any products newe
</address>
</listitem>
-->
-
- <listitem>
- <address>Linux Center
- <street>Galernaya Street, 55</street>
- <city>Saint-Petersburg</city>
- <postcode>190000</postcode>
- <country>Russia</country>
- Phone: <phone>+7-812-309-06-86</phone>
- Email: <email>info at linuxcenter.ru</email>
- WWW: <otheraddr
- xlink:href="http://linuxcenter.ru/shop/freebsd">http://linuxcenter.ru/shop/freebsd</otheraddr>
- </address>
- </listitem>
- </itemizedlist>
+
+ <listitem>
+ <address>Linux Center
+ <street>Galernaya Street, 55</street>
+ <city>Saint-Petersburg</city>
+ <postcode>190000</postcode>
+ <country>Russia</country>
+ Phone: <phone>+7-812-309-06-86</phone>
+ Email: <email>info at linuxcenter.ru</email>
+ WWW: <otheraddr
+ xlink:href="http://linuxcenter.ru/shop/freebsd">http://linuxcenter.ru/shop/freebsd</otheraddr>
+ </address>
+ </listitem>
+ </itemizedlist>
</sect1>
<sect1 xml:id="mirrors-ftp">
@@ -423,23 +422,23 @@ Comment out for now until these can be v
<title>Introduction</title>
<para>As of July 2012, &os; uses
- <application>Subversion</application>
- as the primary version control
- system for storing all of &os;'s source code, documentation,
- and the Ports Collection.</para>
+ <application>Subversion</application> as the primary version
+ control system for storing all of &os;'s source code,
+ documentation, and the Ports Collection.</para>
<note>
- <para><application>Subversion</application> is generally a developer tool. Most users
- should use <command>freebsd-update</command> (<xref
+ <para><application>Subversion</application> is generally a
+ developer tool. Most users should use
+ <command>freebsd-update</command> (<xref
linkend="updating-upgrading-freebsdupdate"/>) to update
the &os; base system, and <command>portsnap</command> (<xref
- linkend="ports-using"/>) to
- update the &os; Ports Collection.</para>
+ linkend="ports-using"/>) to update the &os; Ports
+ Collection.</para>
</note>
<para>This chapter demonstrates how to install
- <application>Subversion</application> on a &os; system and then
- use it to create a local copy of a &os; repository. It
+ <application>Subversion</application> on a &os; system and
+ then use it to create a local copy of a &os; repository. It
includes a list of the available &os;
<application>Subversion</application> mirrors and resources to
additional information on how to use
@@ -489,14 +488,15 @@ Comment out for now until these can be v
</warning>
<para><application>Subversion</application> uses
- <acronym>URL</acronym>s to designate a repository, taking the form of
- <replaceable>protocol://hostname/path</replaceable>. Mirrors
- may support different protocols as specified below. The first
- component of the path is the &os; repository to access. There
- are three different repositories, <literal>base</literal> for
- the &os; base system source code, <literal>ports</literal> for
- the Ports Collection, and <literal>doc</literal> for
- documentation. For example, the URL
+ <acronym>URL</acronym>s to designate a repository, taking the
+ form of <replaceable>protocol://hostname/path</replaceable>.
+ Mirrors may support different protocols as specified below.
+ The first component of the path is the &os; repository to
+ access. There are three different repositories,
+ <literal>base</literal> for the &os; base system source code,
+ <literal>ports</literal> for the Ports Collection, and
+ <literal>doc</literal> for documentation. For example, the
+ URL
<literal>svn://svn0.us-east.FreeBSD.org/ports/head/</literal>
specifies the main branch of the ports repository on the
<systemitem
@@ -594,112 +594,115 @@ Comment out for now until these can be v
&prompt.root; <userinput>make update SVN_UPDATE=yes</userinput></screen>
</sect2>
- <sect2 xml:id="svn-mirrors">
- <title><application>Subversion</application> Mirror Sites</title>
-
- <indexterm>
- <primary>Subversion Repository</primary>
- <secondary>Mirror Sites</secondary>
- </indexterm>
+ <sect2 xml:id="svn-mirrors">
+ <title><application>Subversion</application> Mirror
+ Sites</title>
+
+ <indexterm>
+ <primary>Subversion Repository</primary>
+ <secondary>Mirror Sites</secondary>
+ </indexterm>
+
+ <para>All mirrors carry all repositories.</para>
+
+ <para>The master &os; <application>Subversion</application>
+ server, <systemitem
+ class="fqdomainname">svn.FreeBSD.org</systemitem>, 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;
+ <application>Subversion</application> repositories through a
+ browser, use <link
+ xlink:href="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</link>.</para>
- <para>All mirrors carry all repositories.</para>
+ <note>
+ <para>The &os; <application>Subversion</application> 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 <acronym>SSL</acronym> certificates of the
+ servers will likely change at some point.</para>
+ </note>
- <para>The master &os; <application>Subversion</application>
- server, <systemitem
- class="fqdomainname">svn.FreeBSD.org</systemitem>, 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; <application>Subversion</application> repositories
- through a browser, use <link
- xlink:href="http://svnweb.FreeBSD.org/">http://svnweb.FreeBSD.org/</link>.</para>
-
- <note>
- <para>The &os; <application>Subversion</application> 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 <acronym>SSL</acronym> certificates of the
- servers will likely change at some point.</para>
- </note>
-
- <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><acronym>SSL</acronym> Fingerprint</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry><systemitem
- class="fqdomainname">svn0.us-west.FreeBSD.org</systemitem></entry>
-
- <entry><literal>svn</literal>, <link
- xlink:href="http://svn0.us-west.FreeBSD.org/"><literal>http</literal></link>,
- <link
- xlink:href="https://svn0.us-west.FreeBSD.org/"><literal>https</literal></link></entry>
-
- <entry>USA, California</entry>
-
- <entry>SHA1
- <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
- </row>
-
- <row>
- <entry><systemitem
- class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem></entry>
-
- <entry><literal>svn</literal>, <link
- xlink:href="http://svn0.us-east.FreeBSD.org/"><literal>http</literal></link>,
- <link
- xlink:href="https://svn0.us-east.FreeBSD.org/"><literal>https</literal></link>,
- rsync</entry>
-
- <entry>USA, New Jersey</entry>
-
- <entry>SHA1
- <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
- </row>
-
- <row>
- <entry><systemitem
- class="fqdomainname">svn0.eu.FreeBSD.org</systemitem></entry>
-
- <entry><literal>svn</literal>, <link
- xlink:href="http://svn0.eu.FreeBSD.org/"><literal>http</literal></link>,
- <link
- xlink:href="https://svn0.eu.FreeBSD.org/"><literal>https</literal></link>,
- rsync</entry>
-
- <entry>Europe, UK</entry>
-
- <entry>SHA1
- <literal>39:B0:53:35:CE:60:C7:BB:00:54:96:96:71:10:94:BB:CE:1C:07:A7</literal></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para><acronym>HTTPS</acronym> is the preferred protocol,
- providing protection against another computer pretending to be
- the &os; mirror (commonly known as a <quote>man in the
- middle</quote> attack) or otherwise trying to send bad content
- to the end user.</para>
-
- <para>On the first connection to an <acronym>HTTPS</acronym>
- mirror, the user will be asked to verify the server
- <emphasis>fingerprint</emphasis>:</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><acronym>SSL</acronym> Fingerprint</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><systemitem
+ class="fqdomainname">svn0.us-west.FreeBSD.org</systemitem></entry>
+
+ <entry><literal>svn</literal>, <link
+ xlink:href="http://svn0.us-west.FreeBSD.org/"><literal>http</literal></link>,
+ <link
+ xlink:href="https://svn0.us-west.FreeBSD.org/"><literal>https</literal></link></entry>
+
+ <entry>USA, California</entry>
+
+ <entry>SHA1
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
+ </row>
+
+ <row>
+ <entry><systemitem
+ class="fqdomainname">svn0.us-east.FreeBSD.org</systemitem></entry>
+
+ <entry><literal>svn</literal>, <link
+ xlink:href="http://svn0.us-east.FreeBSD.org/"><literal>http</literal></link>,
+ <link
+ xlink:href="https://svn0.us-east.FreeBSD.org/"><literal>https</literal></link>,
+ rsync</entry>
+
+ <entry>USA, New Jersey</entry>
+
+ <entry>SHA1
+ <literal>1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61</literal></entry>
+ </row>
+
+ <row>
+ <entry><systemitem
+ class="fqdomainname">svn0.eu.FreeBSD.org</systemitem></entry>
+
+ <entry><literal>svn</literal>, <link
+ xlink:href="http://svn0.eu.FreeBSD.org/"><literal>http</literal></link>,
+ <link
+ xlink:href="https://svn0.eu.FreeBSD.org/"><literal>https</literal></link>,
+ rsync</entry>
+
+ <entry>Europe, UK</entry>
+
+ <entry>SHA1
+ <literal>39:B0:53:35:CE:60:C7:BB:00:54:96:96:71:10:94:BB:CE:1C:07:A7</literal></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+
+ <para><acronym>HTTPS</acronym> is the preferred protocol,
+ providing protection against another computer pretending to be
+ the &os; mirror (commonly known as a <quote>man in the
+ middle</quote> attack) or otherwise trying to send bad
+ content to the end user.</para>
+
+ <para>On the first connection to an <acronym>HTTPS</acronym>
+ mirror, the user will be asked to verify the server
+ <emphasis>fingerprint</emphasis>:</para>
- <screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
+ <screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
- The certificate is not issued by a trusted authority. Use the
fingerprint to validate the certificate manually!
- The certificate hostname does not match.
@@ -710,22 +713,22 @@ Certificate information:
- Fingerprint: 1C:BD:85:95:11:9F:EB:75:A5:4B:C8:A3:FE:08:E4:02:73:06:1E:61
(R)eject, accept (t)emporarily or accept (p)ermanently?</screen>
- <para>Compare the fingerprint shown to those listed in the table
- above. If the fingerprint matches, the server security
- certificate can be accepted temporarily or permanently. A
- temporary certificate will expire after a single session with
- the server, and the verification step will be repeated on the
- next connection. Accepting the certificate permanently will
- store the authentication credentials in
- <filename>~/.subversion/auth/</filename> and
- the user will not be asked to verify the fingerprint again until
- the certificate expires.</para>
-
- <para>If <literal>https</literal> cannot be used due to firewall
- or other problems, <literal>svn</literal> is the next choice,
- with slightly faster transfers. When neither can be used, use
- <literal>http</literal>.</para>
- </sect2>
+ <para>Compare the fingerprint shown to those listed in the table
+ above. If the fingerprint matches, the server security
+ certificate can be accepted temporarily or permanently. A
+ temporary certificate will expire after a single session with
+ the server, and the verification step will be repeated on the
+ next connection. Accepting the certificate permanently will
+ store the authentication credentials in
+ <filename>~/.subversion/auth/</filename> and the user will not
+ be asked to verify the fingerprint again until the certificate
+ expires.</para>
+
+ <para>If <literal>https</literal> cannot be used due to firewall
+ or other problems, <literal>svn</literal> is the next choice,
+ with slightly faster transfers. When neither can be used, use
+ <literal>http</literal>.</para>
+ </sect2>
<sect2>
<title>For More Information</title>
@@ -737,7 +740,7 @@ Certificate information:
Control with Subversion</link>, or the <link
xlink:href="http://subversion.apache.org/docs/">Subversion
Documentation</link>.</para>
- </sect2>
+ </sect2>
</sect1>
<sect1 xml:id="mirrors-rsync">
@@ -745,15 +748,14 @@ Certificate information:
<para>The following sites make &os; available through the rsync
protocol. The <application>rsync</application> utility works in
- much the same way as the &man.rcp.1; command,
- but has more options and uses the rsync remote-update protocol
- which transfers only the differences between two sets of files,
- thus greatly speeding up the synchronization over the network.
- This is most useful if you are a mirror site for the
- &os; <acronym>FTP</acronym> server, or the CVS repository. The
+ much the same way as the &man.rcp.1; command, but has more
+ options and uses the rsync remote-update protocol which
+ transfers only the differences between two sets of files, thus
+ greatly speeding up the synchronization over the network. This
+ is most useful if you are a mirror site for the &os;
+ <acronym>FTP</acronym> server, or the CVS repository. The
<application>rsync</application> suite is available for many
- operating systems, on &os;, see the
- <package>net/rsync</package>
+ operating systems, on &os;, see the <package>net/rsync</package>
port or use the package.</para>
<variablelist>
@@ -881,7 +883,9 @@ Certificate information:
<para>This server may only be used by &os; primary mirror
sites.</para>
+
<para>Available collections:</para>
+
<itemizedlist>
<listitem>
<para>&os;: The master archive of the &os;
More information about the svn-doc-all
mailing list