To be more in accordance with guidelines I've split my patch
submission "Docpatch" of Oct 16 into three parts. This is part 2.
* doc/handbook/getting_started.texi: Fix internal links
* doc/handbook/appendices.texi: Fix grammar nits, fix internal links
* doc/handbook/client.texi: Fix grammar nits, typos and add internal links
* doc/handbook/repos_admin.texi: Grammar nits, typos
Index: doc/handbook/getting_started.texi
===================================================================
--- doc/handbook/getting_started.texi
+++ doc/handbook/.svn/tmp/getting_started.texi.63256.00001.tmp Wed Oct 16 07:37:07 2002
@@ -534,7 +534,7 @@
The subversion @samp{status} command will show you the state of any item in
your working copy. @xref{Basic Work Cycle}, in particular the
-subsection ``Examine your changes''.
+subsection @ref{status-diff-revert, Examine your changes}.
@node Subversion Does Not Lock Files
@subsubsection Subversion Does Not Lock Files
@@ -589,7 +589,7 @@
notice when a file is in a binary format, or is of any mime-type other
than text/*. For these rigid-format files, Subversion simply presents
you with the two original texts to choose from. @xref{Basic Work
-Cycle}, in particular the subsection ``Merge others' changes''.
+Cycle}, in particular the subsection @ref{conflict-resolution, Merge others' changes}.
@c ------------------------------------
@@ -600,7 +600,7 @@
The previous section gave an abstract overview of the Subversion
development model. Here's an opportunity to play with Subversion in
some hands-on examples. The Subversion commands demoed here are just
-small examples of what Subversion can do; see Chapter 2 for full
+small examples of what Subversion can do; @xref{Client Cookbook}, for a full
explanations of each.
@@ -727,7 +727,7 @@
According to this output, three items are scheduled to be (D)eleted from
the repository, one item is scheduled to be (A)dded to the repository,
and two items have had their contents (M)odified in some way. For more
-details, be sure to read about @command{svn status} in Chapter 2.
+details, be sure to read about @command{svn status} in @ref{status-diff-revert, Examine your changes}.
Now we decide to commit our changes, creating Revision 2 in the
repository:
@@ -777,6 +777,7 @@
The merge can go smoothly. That is, the two sets of changes do not
overlap. In this case, @samp{svn update} prints a @samp{G} (``mer(G)ed'').
@item
-The sets of changes overlap, and a @samp{C} for (C)onflict is printed. See
-section ??? for information about how conflict resolution works.
+The sets of changes overlap, and a @samp{C} for (C)onflict is printed.
+@xref{conflict-resolution, Merge others' changes},
+for information about how conflict resolution works.
@end itemize
Index: doc/handbook/appendices.texi
===================================================================
--- doc/handbook/appendices.texi
+++ doc/handbook/.svn/tmp/appendices.texi.63256.00001.tmp Wed Oct 16 07:37:07 2002
@@ -47,7 +47,7 @@
In CVS, revision numbers are per-file. This is because CVS uses RCS
as a backend; each file has a corresponding RCS file in the
repository, and the repository is roughly laid out according to
-structure of your project tree.
+the structure of your project tree.
In Subversion, the repository looks like a single filesystem. Each
commit results in an entirely new filesystem tree; in essence, the
@@ -252,7 +252,7 @@
Subversion solves this problem by making conflicts more tangible.
Read about it: @xref{Basic Work Cycle}. In particular, read the
-section about ``Merging others' changes''.
+section about @ref{conflict-resolution, Merge others' changes}.
@node Binary files
@@ -512,7 +512,7 @@
copy) in situations that aren't always perfectly, theoretically ``safe''
or pure.
-Second, the client tries to keep the working copy in correctly in sync
+Second, the client tries to keep the working copy correctly in sync
with the repository using as little communication as possible. Of
course, this is made much harder by the first goal!
@@ -549,7 +549,7 @@
@node FAQ
@section FAQ
-The main FAQ for the project can viewed directly in Subversion's
+The main FAQ for the project can be viewed directly in Subversion's
repository:
@uref{http://svn.collab.net/repos/svn/trunk/www/project_faq.html}
Index: doc/handbook/client.texi
===================================================================
--- doc/handbook/client.texi
+++ doc/handbook/.svn/tmp/client.texi.63256.00001.tmp Wed Oct 16 07:37:07 2002
@@ -81,7 +81,7 @@
You can run @samp{svn help checkout} for command line options to
checkout, although one option is very common and worth mentioning: you
can specify a directory after your repository url. This places your working
-copy into a new directory that you name. For example:
+copy into the new directory that you name. For example:
@example
$ svn co http://svn.collab.net/repos/svn/trunk subv
@@ -200,7 +200,7 @@
commit, @file{foo} will become a permanent child of its parent
directory. Note that if @file{foo} is a directory, only the directory
itself will be scheduled for addition. If you want to add its
-contents as well, pass the @option{--recursive} switch.
+contents as well, pass the @option{--recursive} (@option{-r}) switch.
@item @samp{svn rm @file{foo}}
Schedule @file{foo} to be removed from the repository. If @file{foo}
is a file, it immediately vanishes from the working copy -- but it can
@@ -210,7 +210,7 @@
@item @samp{svn cp @file{foo} @file{bar}}
Create new item @file{bar} as a duplicate of @file{foo}. @file{bar}
is automatically scheduled for addition. When @file{bar} is added to
-the repository on the next commit, it's copy-history is recorded (as
+the repository on the next commit, its copy-history is recorded (as
having originally come from @file{foo}.)
@item @samp{svn mv @file{foo} @file{bar}}
This command is exactly the same as running @samp{svn cp foo bar;
@@ -225,6 +225,7 @@
mkdir}, @samp{svn cp}, @samp{svn mv}, and @samp{svn rm} can work with
URLs. See @samp{svn help} on these commands for more details.)
+@anchor{status-diff-revert}
@subsection Examine your changes (@samp{svn status}, @samp{svn diff}, @samp{svn revert})
So now you've finished your changes@dots{} or so you think. But what
@@ -307,7 +308,7 @@
that the properties are modified and not the contents.
The third column will only show whitespace or a @samp{L} which means
-that @command{svn} has locked item locked in the @file{.svn} working
+that @command{svn} has locked an item in the @file{.svn} working
area. You will see @samp{L} if you run @samp{svn status} in a directory
you are currently running @samp{svn commit} when you are editing the log
message. If there are no running @command{svn}'s, then presumably
@@ -460,6 +465,7 @@
makes it easy to manage your changes-in-progress while traveling on
an airplane, etc.
+@anchor{conflict-resolution}
@subsection Merge others' changes (conflict resolution)
We've already seen how @samp{svn status -u} can predict conflicts.
@@ -1055,7 +1061,7 @@
@itemize @bullet
@item
Can be run at any point in time to bring an existing directory in the
-repository to exactly match an external directory. This scripts run all
+repository to exactly match an external directory. This script runs all
the @samp{svn add}, @samp{svn rm} and optionally any @samp{svn mv}
commands as necessary.
@item
@@ -1689,7 +1695,7 @@
The resulting directory will not contain any @file{.svn}
administrative areas, and all property metadata will be lost. (Hint:
-don't use this tecnique for backing up; it's probably better for
+don't use this technique for backing up; it's probably better for
rolling source distributions.)
@@ -1718,9 +1724,9 @@
_ 2785 brane 0 Jul 29 19:07 trunk/
@end example
-The columns tell you if there file has any properties (``P'' if it does,
+The columns tell you if a file has any properties (``P'' if it does,
``_'' if it doesn't), the revision it was last updated at, the user who
-last updated it, it's size, the date it was last updated, and the filename.
+last updated it, its size, the date it was last updated, and the filename.
@subheading @samp{svn mkdir}
Index: doc/handbook/repos_admin.texi
===================================================================
--- doc/handbook/repos_admin.texi
+++ doc/handbook/.svn/tmp/repos_admin.texi.63256.00001.tmp Wed Oct 16 07:37:07 2002
@@ -576,7 +576,7 @@
Alternately, you can use the @samp{SVNParentPath} directive to
indicate a ``parent'' directory whose immediate subdirectories are
-are assumed to be independent repositories:
+assumed to be independent repositories:
@example
<Location /repos>
@@ -780,7 +780,7 @@
Voila, your revisions have been recommitted into the new repository.
-And because @command{svnadmin} uses standand input and output streams for
+And because @command{svnadmin} uses standard input and output streams for
the repository dump and load process, people who are feeling saucy with
Unix can try things like this:
@@ -918,7 +918,7 @@
will address more complete WebDAV interoperability.
At the moment, most DAV browsers and clients do not yet support
-DeltaV; this means that a Subversion repository can viewed or mounted
+DeltaV; this means that a Subversion repository can be viewed or mounted
only as a read-only resource. (An HTTP ``PUT'' request is valid when
sent to a WebDAV-only server, but a DeltaV server such as mod_dav_svn
will not allow it. The client must use special version-control
--
andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 18 12:53:59 2002