[svnbook] r5921 committed - trunk/en/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Mon May 20 07:57:18 CDT 2019
Revision: 5921
http://sourceforge.net/p/svnbook/source/5921
Author: wuzhouhui
Date: 2019-05-20 12:57:11 +0000 (Mon, 20 May 2019)
Log Message:
-----------
* en/book/ref-svn.xml
Fix some typos.
Modified Paths:
--------------
trunk/en/book/ref-svn.xml
Modified: trunk/en/book/ref-svn.xml
===================================================================
--- trunk/en/book/ref-svn.xml 2019-05-20 03:24:04 UTC (rev 5920)
+++ trunk/en/book/ref-svn.xml 2019-05-20 12:57:11 UTC (rev 5921)
@@ -2183,7 +2183,8 @@
</variablelist>
<para>If no peg revision (i.e.,
- <replaceable>@REV</replaceable>) is supplied, by default
+ <literal>@<replaceable>REV</replaceable></literal>) is supplied,
+ by default
the <literal>BASE</literal> revision will be used for
files copied from the working copy, while the
<literal>HEAD</literal> revision will be used for files
@@ -2233,8 +2234,7 @@
</screen>
</informalexample>
- <para>Copy several files in a working copy into a
- subdirectory:</para>
+ <para>Copy several files in a working copy into a directory:</para>
<informalexample>
<screen>
@@ -2422,7 +2422,7 @@
</informalexample>
<para>Here's an example of how to force deletion of a file
- that has local mods:</para>
+ that has local modifications:</para>
<informalexample>
<screen>
@@ -2560,7 +2560,7 @@
<para><userinput>svn diff OLD-URL[@OLDREV]
NEW-URL[@NEWREV]</userinput> is shorthand for <userinput>svn
diff --old=OLD-URL[@OLDREV]
- --new=NEW-URL[@NEWREV].</userinput></para>
+ --new=NEW-URL[@NEWREV]</userinput>.</para>
<para><userinput>svn diff -r N:M URL</userinput> is shorthand
for <userinput>svn diff -r N:M --old=URL
@@ -2571,7 +2571,8 @@
N[:M]] --old=URL1 --new=URL2</userinput>.</para>
<para>If <replaceable>TARGET</replaceable> is a URL, then
- revs <literal>N</literal> and <literal>M</literal> can be
+ revisions <replaceable>N</replaceable> and <replaceable>M</replaceable>
+ can be
given either via the
<option>--revision</option> (<option>-r</option>) option
or by using the
@@ -4019,8 +4020,8 @@
(<replaceable>SOURCE</replaceable>).
<quote>Eligible</quote> changes are defined as those that
were not previously merged from
- (<replaceable>SOURCE</replaceable>) to
- (<replaceable>TARGET_WCPATH</replaceable>). See
+ <replaceable>SOURCE</replaceable> to
+ <replaceable>TARGET_WCPATH</replaceable>. See
<xref linkend="svn.branchmerge.basicmerging.stayinsync"/>.
<quote>Reintegrate</quote> merges merge changes from a
feature branch (<replaceable>SOURCE</replaceable>)
@@ -6354,7 +6355,7 @@
<refsynopsisdiv>
<para><literal>svn switch URL[@PEGREV] [PATH]</literal></para>
- <para><literal>switch --relocate FROM TO [PATH...]</literal></para>
+ <para><literal>svn switch --relocate FROM TO [PATH...]</literal></para>
</refsynopsisdiv>
<!-- =============================================================== -->
More information about the svnbook-dev
mailing list