From owner-svn-doc-head@FreeBSD.ORG Thu Jan 17 22:52:02 2013 Return-Path: <owner-svn-doc-head@FreeBSD.ORG> Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A6F1B59C; Thu, 17 Jan 2013 22:52:02 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8DD13A3D; Thu, 17 Jan 2013 22:52:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0HMq2dU032687; Thu, 17 Jan 2013 22:52:02 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0HMq2Yd032686; Thu, 17 Jan 2013 22:52:02 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201301172252.r0HMq2Yd032686@svn.freebsd.org> From: Warren Block <wblock@FreeBSD.org> Date: Thu, 17 Jan 2013 22:52:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40675 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head <svn-doc-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head> List-Post: <mailto:svn-doc-head@freebsd.org> List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 17 Jan 2013 22:52:02 -0000 Author: wblock Date: Thu Jan 17 22:52:01 2013 New Revision: 40675 URL: http://svnweb.freebsd.org/changeset/doc/40675 Log: Whitespace-only cleanup. Translators, please ignore. 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 Thu Jan 17 22:37:35 2013 (r40674) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Jan 17 22:52:01 2013 (r40675) @@ -164,9 +164,9 @@ <title>Warning</title> <warning> - <para>CVS has been deprecated by the project, and its use is not - recommended. <application>Subversion</application> should be - used instead.</para> + <para>CVS has been deprecated by the project, and its use is + not recommended. <application>Subversion</application> + should be used instead.</para> </warning> </sect2> </sect1> @@ -539,9 +539,9 @@ <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> + (<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 @@ -554,17 +554,17 @@ <para>In <application>Subversion</application>, URLs are used to designate a repository, taking the form of - <replaceable>protocol://hostname/path</replaceable>. Mirrors may - support different protocols as specified below. The first + <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 <hostid - role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror, using the - <literal>svn</literal> protocol.</para> + specifies the main branch of the ports repository on the + <hostid role="fqdn">svn0.us-east.FreeBSD.org</hostid> mirror, + using the <literal>svn</literal> protocol.</para> </sect2> <sect2 id="svn-install"> @@ -585,9 +585,9 @@ <screen>&prompt.root; <userinput>pkg_add -r subversion</userinput></screen> - <para>If <application>pkgng</application> is being used to manage - packages, <application>Subversion</application> can be installed - with it instead:</para> + <para>If <application>pkgng</application> is being used to + manage packages, <application>Subversion</application> can be + installed with it instead:</para> <screen>&prompt.root; <userinput>pkg install devel/subversion</userinput></screen> </sect2> @@ -598,7 +598,8 @@ <para>The <command>svn</command> command is used to fetch a clean copy of the sources into a local directory. The files in this directory are called a <emphasis>local working - copy</emphasis>.</para> + copy</emphasis>.</para> + <warning> <para>If the local directory already exists but was not created by <command>svn</command>, rename or delete it @@ -619,13 +620,14 @@ <listitem> <para><replaceable>svn-mirror</replaceable> is a URL for one of the <link linkend="svn-mirrors">Subversion mirror - sites</link>.</para> + sites</link>.</para> </listitem> <listitem> <para><replaceable>repository</replaceable> is one of the Project repositories, i.e., <literal>base</literal>, - <literal>ports</literal>, or <literal>doc</literal>.</para> + <literal>ports</literal>, or + <literal>doc</literal>.</para> </listitem> <listitem> @@ -643,14 +645,14 @@ </listitem> <listitem> - <para><replaceable>lwcdir</replaceable> is the target directory - where the contents of the specified branch should be placed. - This is usually <filename - class="directory">/usr/ports</filename> for - <literal>ports</literal>, <filename - class="directory">/usr/src</filename> for - <literal>base</literal>, and <filename - class="directory">/usr/doc</filename> for + <para><replaceable>lwcdir</replaceable> is the target + directory where the contents of the specified branch + should be placed. This is usually + <filename class="directory">/usr/ports</filename> for + <literal>ports</literal>, + <filename class="directory">/usr/src</filename> for + <literal>base</literal>, and + <filename class="directory">/usr/doc</filename> for <literal>doc</literal>.</para> </listitem> </itemizedlist> @@ -683,10 +685,9 @@ <para>The update is much quicker than a checkout, only transferring files that have changed.</para> - <para>An alternate way of - updating the local working copy after checkout is provided by the - <filename>Makefile</filename> in the <filename - class="directory">/usr/ports</filename>, + <para>An alternate way of updating the local working copy after + checkout is provided by the <filename>Makefile</filename> in + the <filename class="directory">/usr/ports</filename>, <filename class="directory">/usr/src</filename>, and <filename class="directory">/usr/doc</filename> directories. Set <makevar>SVN_UPDATE</makevar> and use the @@ -703,10 +704,10 @@ <para>For other information about using <application>Subversion</application>, please see the <quote>Subversion Book</quote>, titled <ulink - url="http://svnbook.red-bean.com/">Version Control with + url="http://svnbook.red-bean.com/">Version Control with Subversion</ulink>, or the <ulink - url="http://subversion.apache.org/docs/">Subversion - Documentation</ulink>.</para> + url="http://subversion.apache.org/docs/">Subversion + Documentation</ulink>.</para> </sect2> </sect1> @@ -1275,7 +1276,7 @@ doc/zh_*</programlisting> <para>where <filename><replaceable>supfile</replaceable></filename> is of course the name of the <filename>supfile</filename> you have - just created. Assuming you are running under X11, + just created. Assuming you are running under X11, <command>cvsup</command> will display a GUI window with some buttons to do the usual things. Press the <guibutton>go</guibutton> button, and watch it run.</para> @@ -2355,7 +2356,7 @@ doc/zh_*</programlisting> <para>When obtaining or updating sources using <application>cvs</application> or <application>CVSup</application>, a revision tag must be - specified. A revision tag refers to either a particular line of + specified. A revision tag refers to either a particular line of &os; development, or a specific point in time. The first type are called <quote>branch tags</quote>, and the second type are called <quote>release tags</quote>.</para>