You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Francois Beausoleil <fb...@ftml.net> on 2003/02/28 21:44:32 UTC
[PATCH] Some more Subversion book corrections
Hello all !
Here are some more modifications to the book.
Hope everything's correct this first time :)
Bye !
Francois Beausoleil
Creator of Java Gui Builder - http://jgb.sourceforge.net/
Log message:
* ch08.xml, appa.xml:
Corrected some more grammatical mistakes in the Subversion book.
Corrected a renamed option on svn status in the appendix.
Added missing status codes in appendix A.
Splitted extra long lines into multiple lines using Unix
continuation char.
------------------------------- BEGIN PATCH -------------------------------
Index: doc/book/book/appa.xml
===================================================================
--- doc/book/book/appa.xml (revision 5154)
+++ doc/book/book/appa.xml (working copy)
@@ -260,7 +260,7 @@
M ./bar/baz.c
</screen>
- <para>If you specify the <option>--update</option>
+ <para>If you specify the <option>--show-updates</option>
(<option>-u</option>) switch, a longer output format is
used:</para>
@@ -293,13 +293,13 @@
see:</para>
<screen>
-A Add
-D Delete
-R Replace (delete, then re-add)
-M local Modification
-U Updated
-G merGed
-C Conflict
+A Scheduled for addition
+D Scheduled for deletion
+M Has local modifications
+C Has conflicts
+? Item not under version control
+! Item is missing
+~ Conflict between node kind (file is now a folder or vice versa)
</screen>
<para>Subversion has combined the CVS <command>P</command> and
@@ -412,7 +412,7 @@
Subversion examines the <literal>svn:mime-type</literal>
property. If the file has no <literal>svn:mime-type</literal>
property, or has a mime-type that is textual (e.g. text/*),
- Subversion assumes it is text. Otherwise, Subversion it assumes
+ Subversion assumes it is text. Otherwise, Subversion assumes
the file is binary. Subversion also helps users by running a
binary-detection algorithm in the <command>svn import</command>
and <command>svn add</command> commands. These commands will
Index: doc/book/book/ch08.xml
===================================================================
--- doc/book/book/ch08.xml (revision 5154)
+++ doc/book/book/ch08.xml (working copy)
@@ -1195,7 +1195,7 @@
local directory name.</para>
<para>The second form exports a clean directory tree from
- the working copy specified by PATH1 into PATH2. all
+ the working copy specified by PATH1 into PATH2. All
local changes will be preserved, but files not under
revision control will not be copied.</para>
</refsect1>
@@ -1369,7 +1369,8 @@
recursively create directories for you:</para>
<screen>
-$ svn import -m "New import" http://svn.red-bean.com/repos/test myproj trunk/vendors/myproj
+$ svn import -m "New import" http://svn.red-bean.com/repos/test \
+ myproj trunk/vendors/myproj
Adding myproj/sample.txt
...
Transmitting file data .........
@@ -1439,7 +1440,7 @@
<para><command>svn info</command> will show you all the
useful information that it has for items in your working
- copy. It will show informtion for files:</para>
+ copy. It will show information for files:</para>
<screen>
$ svn info foo.c
@@ -1488,7 +1489,7 @@
<title>Description</title>
<para>List directory entries of a URL. If URL is a file,
- just file entry will be displayed. <command>svn
+ just the file entry will be displayed. <command>svn
list</command> does not work on paths in your working
copy.</para>
</refsect1>
@@ -1583,10 +1584,10 @@
add paths past the URL, only messages for those paths
under that URL will be printed.</para>
- <para>With <option>--verbose</option>, also print all
- affected paths with each log message. With
- <option>--quiet</option>, <command>svn log</command>
- don't print the log message body itself (this is
+ <para>With <option>--verbose</option>, <command>svn log</command>
+ will also print all affected paths with each log message.
+ With <option>--quiet</option>, <command>svn log</command>
+ will not print the log message body itself (this is
compatible with <option>--verbose</option>).</para>
<para>Each log message is printed just once, even if more
@@ -1862,7 +1863,8 @@
you have a working copy of the trunk):</para>
<screen>
-$ svn merge http://svn.red-bean.com/repos/trunk/vendors http://svn.red-bean.com/repos/branches/vendors-with-fix
+$ svn merge http://svn.red-bean.com/repos/trunk/vendors \
+ http://svn.red-bean.com/repos/branches/vendors-with-fix
U myproj/tiny.txt
U myproj/thhgttg.txt
U myproj/win.txt
@@ -1898,7 +1900,7 @@
<para>Create a directory with a name given by the final
component of TARGET. If TARGET is a working copy path
the directory is scheduled for addition in the working
- copy. If TARGET is an URL the directory is created in
+ copy. If TARGET is a URL the directory is created in
the repository via an immediate commit. In both cases
all the intermediate directories must already
exist.</para>
@@ -1944,7 +1946,7 @@
A newdir
</screen>
- <para>Create on in the repository (instant commit, so a
+ <para>Create one in the repository (instant commit, so a
log message is required):</para>
<screen>
@@ -2050,7 +2052,8 @@
so it requires a commit message): </para>
<screen>
-$ svn move -m "Move a file" http://svn.red-bean.com/repos/foo.c http://svn.red-bean.com/repos/bar.c
+$ svn move -m "Move a file" http://svn.red-bean.com/repos/foo.c \
+ http://svn.red-bean.com/repos/bar.c
Committed revision 27.
</screen>
@@ -2075,7 +2078,7 @@
<para>Set PROPNAME to PROPVAL on files, directories, or
revisions. The first example creates a versioned, local
- propchange in working copy, and the second creates an
+ propchange in the working copy, and the second creates an
unversioned, remote propchange on a repository revision.</para>
<tip>
@@ -2683,7 +2686,7 @@
<varlistentry>
<term>'D'</term>
<listitem>
- <para>Item is scheduled for Addition.</para>
+ <para>Item is scheduled for Deletion.</para>
</listitem>
</varlistentry>
@@ -2954,8 +2957,8 @@
a new URL—usually a URL which shares a common
ancestor with your working copy, although not
necessarily. This is the Subversion way to move a
- working copy to a new branch. (See <xref
- linkend="svn-ch-4-sect-5"/>) for an in-depth look at
+ working copy to a new branch. See <xref
+ linkend="svn-ch-4-sect-5"/> for an in-depth look at
switching.</para>
</refsect1>
-------------------------------- END PATCH --------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Some more Subversion book corrections
Posted by Sander Roobol <ph...@wanadoo.nl>.
Filed as issue #1187.
Sander
On Fri, Feb 28, 2003 at 04:44:32PM -0500, Francois Beausoleil wrote:
> Hello all !
>
> Here are some more modifications to the book.
>
> Hope everything's correct this first time :)
>
> Bye !
> Francois Beausoleil
> Creator of Java Gui Builder - http://jgb.sourceforge.net/
>
> Log message:
> * ch08.xml, appa.xml:
> Corrected some more grammatical mistakes in the Subversion book.
> Corrected a renamed option on svn status in the appendix.
> Added missing status codes in appendix A.
> Splitted extra long lines into multiple lines using Unix
> continuation char.
> [snip]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org