Index: doc/book/book/ch00.xml
===================================================================
--- doc/book/book/ch00.xml (revision 9893)
+++ doc/book/book/ch00.xml (working copy)
@@ -132,7 +132,7 @@
<para>Whether you're a user or administrator, eventually
your project will grow larger. You're going to want to
learn how to do more advanced things with Subversion, such
- as how to use branches and perform mergees (chapter 4),
+ as how to use branches and perform merges (chapter 4),
how to use Subversion's property support, how to configure
runtime options (chapter 7), and other things. Chapters 4
and 7 aren't vital at first, but be sure to read them once
Index: doc/book/book/ch05.xml
===================================================================
--- doc/book/book/ch05.xml (revision 9893)
+++ doc/book/book/ch05.xml (working copy)
@@ -1072,7 +1072,7 @@
dump data, and <command>svnadmin load</command> to populate
a new repository with it (see <xref
linkend="svn-ch-5-sect-3.5"/>). The great thing about the
- human-readibility aspect of the dump format is that, if you
+ human-readability aspect of the dump format is that, if you
aren't careless about it, you can manually inspect and
modify it. Of course, the downside is that if you have two
years' worth of repository activity encapsulated in what is
@@ -2393,7 +2393,7 @@
projects, you might want to arrange them in groups inside the
repository, perhaps putting projects with similar goals or
shared code in the same subdirectory, or maybe just grouping
- them alphabetically. Such an arrangment might look
+ them alphabetically. Such an arrangement might look
like:</para>
<screen>
Index: doc/book/book/ch06.xml
===================================================================
--- doc/book/book/ch06.xml (revision 9893)
+++ doc/book/book/ch06.xml (working copy)
@@ -429,7 +429,7 @@
</screen>
<para>Make sure <quote>svnowner</quote> is a user which has
- appopriate permissions to access your repositories. Now, when
+ appropriate permissions to access your repositories. Now, when
a client connection comes into your server on port 3690,
<command>inetd</command> will spawn an
<command>svnserve</command> process to service it. </para>
Index: doc/book/book/ch07.xml
===================================================================
--- doc/book/book/ch07.xml (revision 9893)
+++ doc/book/book/ch07.xml (working copy)
@@ -395,7 +395,7 @@
<varlistentry>
<term><literal>ssl-client-cert-file</literal></term>
<listitem>
- <para>If host (or set of hosts) requries an SSL client
+ <para>If host (or set of hosts) requires an SSL client
certificate, you'll normally be prompted for a path to
your certificate. By setting this variable to that
same path, Subversion will be able to find your client
@@ -1790,7 +1790,7 @@
not affect what gets checked out as an external (though the
relative local target subdirectory will, of course, move with
renamed directory). This can be confusing—even
- frustrating—in certain situtations. For example, if you
+ frustrating—in certain situations. For example, if you
use externals definitions on a directory in your
<filename>/trunk</filename> development line which point to
other areas of that same line, and then you use <command>svn
Regards,
Øyvind A. Holm
---------------------
cat /dev/urandom >SCO
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 27 02:57:52 2004