From fba7dbab1feaee628739c9abbe2c095105b554e0 Mon Sep 17 00:00:00 2001 From: Warren Block Date: Tue, 1 Sep 2015 03:16:50 +0000 Subject: [PATCH] Simplify the Subversion section. Make the lone Subversion mirror visible rather than inline with the text. Unflustigate some counter-guideline text. --- .../books/handbook/mirrors/chapter.xml | 117 +++++++++--------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml index dbc0eca344..43de273576 100644 --- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml @@ -112,13 +112,13 @@ This site doesn't have any products newer than 8.1 which is now EOL'd direct users to the closest available mirror. Additionally, &os; is available via anonymous - FTP from the following mirror sites. If you - choose to obtain &os; via anonymous FTP, - please try to use a site near you. The mirror sites listed as + FTP from the following mirror sites. When + obtaining &os; via anonymous FTP, + please try to use a nearby site. The mirror sites listed as Primary Mirror Sites typically have the entire &os; archive (all the currently available versions for each of - the architectures) but you will probably have faster download - times from a site that is in your country or region. The + the architectures) but faster download speeds are probably available + from a site that is in your country or region. The regional sites carry the most recent versions for the most popular architecture(s) but might not carry the entire &os; archive. All sites provide access via anonymous @@ -446,57 +446,62 @@ Comment out for now until these can be verified. Collection. - This chapter demonstrates how to install + This section demonstrates how to install Subversion on a &os; system and - then use it to create a local copy of a &os; repository. It - includes additional information on how to use - Subversion. + use it to create a local copy of a &os; repository. + Additional information on the use of + Subversion is included. + + + + Root <acronym>SSL</acronym> Certificates + + Installing + security/ca_root_nss allows + Subversion to verify the identity + of HTTPS repository servers. The root + SSL certificates can be installed from a + port: + + &prompt.root; cd /usr/ports/security/ca_root_nss +&prompt.root; make install clean + + or as a package: + + &prompt.root; pkg install ca_root_nss - Svnlite + <application>Svnlite</application> - A fully functional but light weight version of - Subversion may be already installed - on your &os; system as svnlite. You do not - have to install a separate copy if svnlite - is sufficient for your needs. + A lightweight version of + Subversion is already installed + on &os; as svnlite. The port or package + version of Subversion is only + needed if the Python or Perl API is needed, + or if a later version of Subversion is desired. - If you wish to access HTTPS servers with - svnlite then a root certificate bundle - should be installed: - - &prompt.root; pkg install ca_root_nss - - Installing a certificate bundle allows - svnlite to verify that it is securely - communicating with the repository server without tampering. - - If you are using svnlite then you should - adjust the examples below. + The only difference from normal Subversion + use is that the command name is svnlite. Installation - If the svnlite is unavailable or you wish to - use the full version of Subversion then + If svnlite is unavailable or the + full version of Subversion is needed, then it must be installed. - If a copy of the ports tree is already present, - one can install Subversion like - this: + Subversion can be installed + from the Ports Collection: &prompt.root; cd /usr/ports/devel/subversion -&prompt.root; make install clean -&prompt.root; cd /usr/ports/security/ca_root_nss &prompt.root; make install clean - Subversion can easily be + Subversion can also be installed as a package: - &prompt.root; pkg install subversion -&prompt.root; pkg install ca_root_nss + &prompt.root; pkg install subversion @@ -508,8 +513,8 @@ Comment out for now until these can be verified. copy. - Move or delete the local directory before - using checkout. + Move or delete an existing destination directory before + using checkout for the first time. Checkout over an existing non-svn directory can cause conflicts @@ -520,7 +525,6 @@ Comment out for now until these can be verified. Subversion uses URLs to designate a repository, taking the form of protocol://hostname/path. - 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, base for the &os; base system source code, @@ -534,20 +538,14 @@ Comment out for now until these can be verified. A checkout from a given repository is performed with a command like this: - &prompt.root; svn checkout svn-mirror/repository/branch lwcdir + &prompt.root; svn checkout https://svn.FreeBSD.org/repository/branch lwcdir where: - - svn-mirror is a URL for one - of the Subversion mirror - sites. - - repository is one of the - Project repositories, i.e., base, + Project repositories: base, ports, or doc. @@ -589,9 +587,9 @@ Comment out for now until these can be verified. present but was not created by svn, remember to rename or delete it before the checkout. - &prompt.root; svn checkout https://svn.FreeBSD.org/ports/head /usr/ports + &prompt.root; svn checkout https://svn.FreeBSD.org/ports/head /usr/ports - Because the initial checkout has to download the full + Because the initial checkout must download the full branch of the remote repository, it can take a while. Please be patient. @@ -632,8 +630,11 @@ Comment out for now until these can be verified. The &os; Subversion - repository, svn.FreeBSD.org, is + repository is: + + svn.FreeBSD.org + + This is a publicly accessible mirror network that uses GeoDNS to select an appropriate back end server. To view the &os; Subversion repositories through a @@ -730,9 +731,9 @@ Comment out for now until these can be verified. - If you are seeing one of these legacy certificate - fingerprints then it is likely you are using a deprecated - server name. + Seeing one of these legacy certificate + fingerprints means it is likely that a deprecated + server name is being used. @@ -751,14 +752,14 @@ Comment out for now until these can be verified. Using <application>rsync</application> - The following sites make &os; available through the rsync + These sites make &os; available through the rsync protocol. The rsync 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; - FTP server, or the CVS repository. The + is most useful for mirror sites of the &os; + FTP server. The rsync suite is available for many operating systems, on &os;, see the net/rsync port or use the package.