Date: Mon, 28 Jan 2013 16:48:01 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40788 - head/en_US.ISO8859-1/books/handbook/cutting-edge Message-ID: <201301281648.r0SGm1L6041341@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Mon Jan 28 16:48:00 2013 New Revision: 40788 URL: http://svnweb.freebsd.org/changeset/doc/40788 Log: Whitespace-only fixes. Translators, please ignore. Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Mon Jan 28 16:40:40 2013 (r40787) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Mon Jan 28 16:48:00 2013 (r40788) @@ -636,7 +636,7 @@ before running "/usr/sbin/freebsd-update command may be used to automate this process. The following commands may be used to begin this process:</para> - <screen>&prompt.root; <userinput>portupgrade -f ruby</userinput> + <screen>&prompt.root; <userinput>portupgrade -f ruby</userinput> &prompt.root; <userinput>rm /var/db/pkg/pkgdb.db</userinput> &prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput> &prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</userinput> @@ -1505,17 +1505,16 @@ Fetching 133 new ports or files... done. </indexterm> <listitem> - <para>Use the <link linkend="svn">svn</link> program to - check out the desired development or release branch. - This is the recommended method, providing access to - &os; development as it occurs. Checkout the - -CURRENT code from the <literal>head</literal> - branch of one of the <link - linkend="svn-mirrors">Subversion mirror - sites</link>. - Because of the size of the repository, it is - recommended that only desired subtrees be checked - out.</para> + <para>Use the <link linkend="svn">svn</link> program + to check out the desired development or release + branch. This is the recommended method, providing + access to &os; development as it occurs. Checkout + the -CURRENT code from the <literal>head</literal> + branch of one of the + <link linkend="svn-mirrors">Subversion mirror + sites</link>. Because of the size of the + repository, it is recommended that only desired + subtrees be checked out.</para> </listitem> <listitem> @@ -1660,7 +1659,7 @@ Fetching 133 new ports or files... done. <para>Join the relevant <application>SVN</application> list for the branch you are tracking. For example, if you are tracking the 9-STABLE branch, join the - &a.svn-src-stable-9.name; list. This will allow you to + &a.svn-src-stable-9.name; list. This will allow you to view the commit log entry for each change as it is made, along with any pertinent information on possible side-effects.</para> @@ -1742,7 +1741,8 @@ Fetching 133 new ports or files... done. <listitem> <para>Essentially, if you need rapid on-demand access to the source and communications bandwidth is not a - consideration, use <application>Subversion</application>. Otherwise, use + consideration, use + <application>Subversion</application>. Otherwise, use <application>CTM</application>.</para> </listitem> @@ -1795,16 +1795,16 @@ Fetching 133 new ports or files... done. </indexterm> <para><application>Subversion</application> uses the - <emphasis>pull</emphasis> model of updating sources. - The user (or a <command>cron</command> script) invokes the + <emphasis>pull</emphasis> model of updating sources. The user + (or a <command>cron</command> script) invokes the <command>svn</command> program, and it brings files up-to-date. <application>Subversion</application> is the preferred means of - updating local source trees. - The updates you receive are up-to-the-minute and - you get them when, and only when, you want them. You can easily - restrict your updates to the specific files or directories that - are of interest to you. Updates are generated on the fly by the - server, according to what you have and what you want to have.</para> + updating local source trees. The updates you receive are + up-to-the-minute and you get them when, and only when, you want + them. You can easily restrict your updates to the specific + files or directories that are of interest to you. Updates are + generated on the fly by the server, according to what you have + and what you want to have.</para> <indexterm> <primary><application>CTM</application></primary> @@ -1821,17 +1821,17 @@ Fetching 133 new ports or files... done. &man.ctm.rmail.1; utility which will automatically decode, verify and apply the changes to the user's copy of the sources. This process is far more efficient than - <application>Subversion</application>, and places less strain on our - server resources since it is a <emphasis>push</emphasis> rather - than a <emphasis>pull</emphasis> model.</para> + <application>Subversion</application>, and places less strain on + our server resources since it is a <emphasis>push</emphasis> + rather than a <emphasis>pull</emphasis> model.</para> <para>There are other trade-offs, of course. If you inadvertently wipe out portions of your archive, - <application>Subversion</application> will detect and rebuild the - damaged portions for you. <application>CTM</application> will - not do this, and if you wipe some portion of your source tree - out (and do not have it backed up) then you will have to start - from scratch (from the most recent CTM + <application>Subversion</application> will detect and rebuild + the damaged portions for you. <application>CTM</application> + will not do this, and if you wipe some portion of your source + tree out (and do not have it backed up) then you will have to + start from scratch (from the most recent CTM <quote>base delta</quote>) and rebuild it all with <application>CTM</application>.</para> </sect1> @@ -2727,7 +2727,7 @@ Script done, …</screen> <para>This will build the necessary directory structure and install the files. A lot of the subdirectories that have been created under <filename>/var/tmp/root</filename> are - empty and should be deleted. The simplest way to do this is + empty and should be deleted. The simplest way to do this is to:</para> <screen>&prompt.root; <userinput>cd /var/tmp/root</userinput> @@ -2890,8 +2890,8 @@ Script done, …</screen> <answer> <para>There is no easy answer to this one, as it depends on the nature of the change. For example, if you just - ran <application>Subversion</application>, and it has shown - the following files as being updated:</para> + ran <application>Subversion</application>, and it has + shown the following files as being updated:</para> <screen><filename>src/games/cribbage/instr.c</filename> <filename>src/games/sail/pl_main.c</filename>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301281648.r0SGm1L6041341>