Whitespace-only fixes. Translators, please ignore.
This commit is contained in:
parent
6fa4d6ceac
commit
31ab76bcfa
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40788
1 changed files with 33 additions and 33 deletions
|
@ -636,7 +636,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
|
||||||
command may be used to automate this process. The following
|
command may be used to automate this process. The following
|
||||||
commands may be used to begin this process:</para>
|
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>rm /var/db/pkg/pkgdb.db</userinput>
|
||||||
&prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput>
|
&prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput>
|
||||||
&prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</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.</screen>
|
||||||
</indexterm>
|
</indexterm>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Use the <link linkend="svn">svn</link> program to
|
<para>Use the <link linkend="svn">svn</link> program
|
||||||
check out the desired development or release branch.
|
to check out the desired development or release
|
||||||
This is the recommended method, providing access to
|
branch. This is the recommended method, providing
|
||||||
&os; development as it occurs. Checkout the
|
access to &os; development as it occurs. Checkout
|
||||||
-CURRENT code from the <literal>head</literal>
|
the -CURRENT code from the <literal>head</literal>
|
||||||
branch of one of the <link
|
branch of one of the
|
||||||
linkend="svn-mirrors">Subversion mirror
|
<link linkend="svn-mirrors">Subversion mirror
|
||||||
sites</link>.
|
sites</link>. Because of the size of the
|
||||||
Because of the size of the repository, it is
|
repository, it is recommended that only desired
|
||||||
recommended that only desired subtrees be checked
|
subtrees be checked out.</para>
|
||||||
out.</para>
|
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
|
@ -1660,7 +1659,7 @@ Fetching 133 new ports or files... done.</screen>
|
||||||
<para>Join the relevant <application>SVN</application>
|
<para>Join the relevant <application>SVN</application>
|
||||||
list for the branch you are tracking. For example, if
|
list for the branch you are tracking. For example, if
|
||||||
you are tracking the 9-STABLE branch, join the
|
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,
|
view the commit log entry for each change as it is made,
|
||||||
along with any pertinent information on possible
|
along with any pertinent information on possible
|
||||||
side-effects.</para>
|
side-effects.</para>
|
||||||
|
@ -1742,7 +1741,8 @@ Fetching 133 new ports or files... done.</screen>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Essentially, if you need rapid on-demand access to
|
<para>Essentially, if you need rapid on-demand access to
|
||||||
the source and communications bandwidth is not a
|
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>
|
<application>CTM</application>.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
|
@ -1795,16 +1795,16 @@ Fetching 133 new ports or files... done.</screen>
|
||||||
</indexterm>
|
</indexterm>
|
||||||
|
|
||||||
<para><application>Subversion</application> uses the
|
<para><application>Subversion</application> uses the
|
||||||
<emphasis>pull</emphasis> model of updating sources.
|
<emphasis>pull</emphasis> model of updating sources. The user
|
||||||
The user (or a <command>cron</command> script) invokes the
|
(or a <command>cron</command> script) invokes the
|
||||||
<command>svn</command> program, and it brings files up-to-date.
|
<command>svn</command> program, and it brings files up-to-date.
|
||||||
<application>Subversion</application> is the preferred means of
|
<application>Subversion</application> is the preferred means of
|
||||||
updating local source trees.
|
updating local source trees. The updates you receive are
|
||||||
The updates you receive are up-to-the-minute and
|
up-to-the-minute and you get them when, and only when, you want
|
||||||
you get them when, and only when, you want them. You can easily
|
them. You can easily restrict your updates to the specific
|
||||||
restrict your updates to the specific files or directories that
|
files or directories that are of interest to you. Updates are
|
||||||
are of interest to you. Updates are generated on the fly by the
|
generated on the fly by the server, according to what you have
|
||||||
server, according to what you have and what you want to have.</para>
|
and what you want to have.</para>
|
||||||
|
|
||||||
<indexterm>
|
<indexterm>
|
||||||
<primary><application>CTM</application></primary>
|
<primary><application>CTM</application></primary>
|
||||||
|
@ -1821,17 +1821,17 @@ Fetching 133 new ports or files... done.</screen>
|
||||||
&man.ctm.rmail.1; utility which will automatically decode,
|
&man.ctm.rmail.1; utility which will automatically decode,
|
||||||
verify and apply the changes to the user's copy of the sources.
|
verify and apply the changes to the user's copy of the sources.
|
||||||
This process is far more efficient than
|
This process is far more efficient than
|
||||||
<application>Subversion</application>, and places less strain on our
|
<application>Subversion</application>, and places less strain on
|
||||||
server resources since it is a <emphasis>push</emphasis> rather
|
our server resources since it is a <emphasis>push</emphasis>
|
||||||
than a <emphasis>pull</emphasis> model.</para>
|
rather than a <emphasis>pull</emphasis> model.</para>
|
||||||
|
|
||||||
<para>There are other trade-offs, of course. If you inadvertently
|
<para>There are other trade-offs, of course. If you inadvertently
|
||||||
wipe out portions of your archive,
|
wipe out portions of your archive,
|
||||||
<application>Subversion</application> will detect and rebuild the
|
<application>Subversion</application> will detect and rebuild
|
||||||
damaged portions for you. <application>CTM</application> will
|
the damaged portions for you. <application>CTM</application>
|
||||||
not do this, and if you wipe some portion of your source tree
|
will not do this, and if you wipe some portion of your source
|
||||||
out (and do not have it backed up) then you will have to start
|
tree out (and do not have it backed up) then you will have to
|
||||||
from scratch (from the most recent CTM
|
start from scratch (from the most recent CTM
|
||||||
<quote>base delta</quote>) and rebuild it all with
|
<quote>base delta</quote>) and rebuild it all with
|
||||||
<application>CTM</application>.</para>
|
<application>CTM</application>.</para>
|
||||||
</sect1>
|
</sect1>
|
||||||
|
@ -2727,7 +2727,7 @@ Script done, …</screen>
|
||||||
<para>This will build the necessary directory structure and
|
<para>This will build the necessary directory structure and
|
||||||
install the files. A lot of the subdirectories that have
|
install the files. A lot of the subdirectories that have
|
||||||
been created under <filename>/var/tmp/root</filename> are
|
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>
|
to:</para>
|
||||||
|
|
||||||
<screen>&prompt.root; <userinput>cd /var/tmp/root</userinput>
|
<screen>&prompt.root; <userinput>cd /var/tmp/root</userinput>
|
||||||
|
@ -2890,8 +2890,8 @@ Script done, …</screen>
|
||||||
<answer>
|
<answer>
|
||||||
<para>There is no easy answer to this one, as it depends
|
<para>There is no easy answer to this one, as it depends
|
||||||
on the nature of the change. For example, if you just
|
on the nature of the change. For example, if you just
|
||||||
ran <application>Subversion</application>, and it has shown
|
ran <application>Subversion</application>, and it has
|
||||||
the following files as being updated:</para>
|
shown the following files as being updated:</para>
|
||||||
|
|
||||||
<screen><filename>src/games/cribbage/instr.c</filename>
|
<screen><filename>src/games/cribbage/instr.c</filename>
|
||||||
<filename>src/games/sail/pl_main.c</filename>
|
<filename>src/games/sail/pl_main.c</filename>
|
||||||
|
|
Loading…
Reference in a new issue