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/27 18:32:23 UTC
[PATCH] Subversion book corrections
Hi,
Second try :) Sorry about not following the guidelines.
Francois Beausoleil (fbos@users.sourceforge.net)
Developper of Java Gui Builder - http://jgb.sourceforge.net/
Log Message
* ch00.xml, ch01.xml, ch03.xml, ch06.xml, ch07.xml, ch08.xml:
Corrected spelling and grammatical mistakes.
---------------------------- BEGIN PATCH ----------------------------
Index: doc/book/book/ch00.xml
===================================================================
--- doc/book/book/ch00.xml (revision 5132)
+++ doc/book/book/ch00.xml (working copy)
@@ -30,7 +30,7 @@
feel") as CVS, and by attempting to fix most of CVS's noticeable
flaws. While the result isn't necessarily the next great
evolution in version control design, Subversion
- <emphasis>is</emphasis> is very powerful, very useable, and very
+ <emphasis>is</emphasis> very powerful, very useable, and very
flexible.
</para>
Index: doc/book/book/ch01.xml
===================================================================
--- doc/book/book/ch01.xml (revision 5132)
+++ doc/book/book/ch01.xml (working copy)
@@ -251,7 +251,6 @@
</para>
<variablelist>
-
<varlistentry>
<term>svn</term>
<listitem>
Index: doc/book/book/ch03.xml
===================================================================
--- doc/book/book/ch03.xml (revision 5132)
+++ doc/book/book/ch03.xml (working copy)
@@ -967,7 +967,7 @@
<para>Notice the two asterisks: if you were to run
<command>svn update</command> at this point, you would
receive changes to <filename>README</filename>
- and<filename>trout.c</filename>. This tells you some very
+ and <filename>trout.c</filename>. This tells you some very
useful information—you'll need to update and get the
server changes on <filename>README</filename> before you
commit, or the repository will reject your commit for being
@@ -1469,7 +1469,7 @@
<screen>
$ svn commit --message "Corrected number of cheese slices."
-Sending sandwich
+Sending sandwich.txt
Transmitting file data .
Committed revision 3.
</screen>
Index: doc/book/book/ch06.xml
===================================================================
--- doc/book/book/ch06.xml (revision 5132)
+++ doc/book/book/ch06.xml (working copy)
@@ -1381,7 +1381,7 @@
line.</para>
<para>This sensitivity to foreign EOL markers can become
- frustraing for folks who share a file across different
+ frustrating for folks who share a file across different
operating systems. For example, consider a source code
file, and developers that edit this file on both Windows and
Unix systems. If all the developers always use tools which
@@ -1404,7 +1404,7 @@
Or, he can simply commit the file—new EOL markers and
all.</para>
- <para>The result of scenarios like there include wasted time
+ <para>The result of scenarios like these include wasted time
and unnecessary modifications to committed files. Wasted
time is painful enough. But when commits change every line
in a file, this complicates the job of determining which of
@@ -1627,7 +1627,7 @@
house its custom modifications to the third-party data in some
disjointed fashion, such as using patch files or full-fledged
alternate versions of files and directories. But these quickly
- become maintainance headaches, requiring some mechanism by which
+ become maintenance headaches, requiring some mechanism by which
to apply your custom changes to the third-party data, and
necessitating regeneration of those changes with each successive
version of the third-party data that you track.</para>
Index: doc/book/book/ch07.xml
===================================================================
--- doc/book/book/ch07.xml (revision 5132)
+++ doc/book/book/ch07.xml (working copy)
@@ -1492,7 +1492,7 @@
<para>Pools might not be ideal for every application, but they are
extremely useful in Subversion. As a Subversion developer,
- you'll need to grow comfortable with pools and how to weild them
+ you'll need to grow comfortable with pools and how to wield them
correctly. Memory usage bugs and bloating can be difficult to
diagnose and fix regardless of the API, but the pool construct
provided by APR has proven a tremendously convenient,
@@ -1561,7 +1561,7 @@
Subversion's source code is versioned using Subversion itself,
you actually need to "bootstrap" by getting a working
Subversion client via some other method. The most common
- methods inclue downloading the latest binary distribution (if
+ methods include downloading the latest binary distribution (if
such is available for your platform), or downloading the
latest source tarball and building your own Subversion client.
If you build from source, make sure read the INSTALL file in
Index: doc/book/book/ch08.xml
===================================================================
--- doc/book/book/ch08.xml (revision 5132)
+++ doc/book/book/ch08.xml (working copy)
@@ -18,10 +18,10 @@
<command>svn</command></title>
<para>To use the command line client, you type
- <command>svn</command>, the subcommand you wish to use,
+ <command>svn</command>, the subcommand you wish to use
<footnote><para>Yes, yes, you don't need a subcommand to use the
<option>--version</option> switch, but we'll get to that in just
- a minute.</para> </footnote> and any switches or targets that
+ a minute.</para> </footnote>, and any switches or targets that
you wish to operate on—there is no specific order that the
subcommand and the switches must appear in. For example, all of
the following are valid ways to use <command>svn
@@ -180,7 +180,7 @@
insufficient credentials, prevents prompting for credentials
(e.g. username or password). This is useful if you're
running Subversion inside of an automated script and it's
- more appropriate to have Subversion fail then to prompt
+ more appropriate to have Subversion fail than to prompt
for more information.</para>
</listitem>
</varlistentry>
@@ -197,7 +197,7 @@
</varlistentry>
<varlistentry>
-
<term><option>--password</option><replaceable>PASS</replaceable></term>
+ <term><option>--password</option>
<replaceable>PASS</replaceable></term>
<listitem>
<para>Indicates that you are providing your password for
authentication on the command line—otherwise, if
@@ -297,7 +297,7 @@
</varlistentry>
<varlistentry>
-
<term><option>--username</option><replaceable>NAME</replaceable></term>
+ <term><option>--username</option>
<replaceable>NAME</replaceable></term>
<listitem>
<para>Indicates that you are providing your username for
authentication on the command line—otherwise, if
@@ -322,7 +322,7 @@
<listitem>
<para>Prints the client version info. This information
not only includes the version number of the client,
- but als a listing of all repository access modules
+ but also a listing of all repository access modules
that the client can use to access a Subversion
repository.</para>
</listitem>
@@ -662,7 +662,7 @@
commit by using either the <option>--file</option> or
<option>--message</option> switch,
<command>svn</command> will launch your editor for you
- to compose acommit message. See the
+ to compose a commit message. See the
<literal>editor-cmd</literal> section in <xref
linkend="svn-ch-6-sect-1.3.2"/>.</para>
</refsect1>
@@ -845,7 +845,7 @@
<title>Examples</title>
<para>Copy an item within your working copy (just
- schedules the copy--nothing goes into the repository
+ schedules the copy—nothing goes into the repository
until you commit):</para>
<screen>
@@ -865,7 +865,7 @@
</screen>
<para>Copy an item from the repository to your working
- copy (Just schedules the copy--nothing goes into the
+ copy (Just schedules the copy—nothing goes into the
repository until you commit):</para>
<tip>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Subversion book corrections
Posted by Francois Beausoleil <fb...@ftml.net>.
Thanks !
Most probably a problem with Mozilla's mailer. I'll use another mailer
or attach the file next time.
Have a nice day !
Francois
On Thu, 27 Feb 2003 12:15:12 -0700, "Larry Shatzer" <fu...@zyx.net>
said:
> On Thu, Feb 27, 2003 at 12:50:41PM -0600, cmpilato@collab.net wrote:
> > Francois Beausoleil <fb...@ftml.net> writes:
> >
> > > Hi,
> > >
> > > Second try :) Sorry about not following the guidelines.
> > > Francois Beausoleil (fbos@users.sourceforge.net)
> > > Developper of Java Gui Builder - http://jgb.sourceforge.net/
> > >
> > > Log Message
> > >
> > > * ch00.xml, ch01.xml, ch03.xml, ch06.xml, ch07.xml, ch08.xml:
> > > Corrected spelling and grammatical mistakes.
> >
> > Xlnt. I think my mailer is horking your patch, so I'll defer to
> > someone else for application.
>
> It was borked on my end too. It might have been Francois's mailer that
> wrapped a
> few of the lines.
>
[snip]
--
http://www.fastmail.fm - Choose from over 50 domains or use your own
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Subversion book corrections
Posted by Larry Shatzer <fu...@zyx.net>.
On Thu, Feb 27, 2003 at 12:50:41PM -0600, cmpilato@collab.net wrote:
> Francois Beausoleil <fb...@ftml.net> writes:
>
> > Hi,
> >
> > Second try :) Sorry about not following the guidelines.
> > Francois Beausoleil (fbos@users.sourceforge.net)
> > Developper of Java Gui Builder - http://jgb.sourceforge.net/
> >
> > Log Message
> >
> > * ch00.xml, ch01.xml, ch03.xml, ch06.xml, ch07.xml, ch08.xml:
> > Corrected spelling and grammatical mistakes.
>
> Xlnt. I think my mailer is horking your patch, so I'll defer to
> someone else for application.
It was borked on my end too. It might have been Francois's mailer that wrapped a
few of the lines.
I applied his patch by hand, and think I got it all in there. If I missed
anything, let me know.
-- Larry
Index: doc/book/book/ch00.xml
===================================================================
--- doc/book/book/ch00.xml (revision 5133)
+++ doc/book/book/ch00.xml (working copy)
@@ -30,7 +30,7 @@
feel") as CVS, and by attempting to fix most of CVS's noticeable
flaws. While the result isn't necessarily the next great
evolution in version control design, Subversion
- <emphasis>is</emphasis> is very powerful, very useable, and very
+ <emphasis>is</emphasis> very powerful, very useable, and very
flexible.
</para>
Index: doc/book/book/ch01.xml
===================================================================
--- doc/book/book/ch01.xml (revision 5133)
+++ doc/book/book/ch01.xml (working copy)
@@ -106,7 +106,6 @@
control.</para>
<variablelist>
-
<varlistentry>
<term>Directory versioning</term>
<listitem>
Index: doc/book/book/ch03.xml
===================================================================
--- doc/book/book/ch03.xml (revision 5133)
+++ doc/book/book/ch03.xml (working copy)
@@ -967,7 +967,7 @@
<para>Notice the two asterisks: if you were to run
<command>svn update</command> at this point, you would
receive changes to <filename>README</filename>
- and<filename>trout.c</filename>. This tells you some very
+ and <filename>trout.c</filename>. This tells you some very
useful information—you'll need to update and get the
server changes on <filename>README</filename> before you
commit, or the repository will reject your commit for being
@@ -1469,7 +1469,7 @@
<screen>
$ svn commit --message "Corrected number of cheese slices."
-Sending sandwich
+Sending sandwich.txt
Transmitting file data .
Committed revision 3.
</screen>
Index: doc/book/book/ch06.xml
===================================================================
--- doc/book/book/ch06.xml (revision 5133)
+++ doc/book/book/ch06.xml (working copy)
@@ -1381,7 +1381,7 @@
line.</para>
<para>This sensitivity to foreign EOL markers can become
- frustraing for folks who share a file across different
+ frustrating for folks who share a file across different
operating systems. For example, consider a source code
file, and developers that edit this file on both Windows and
Unix systems. If all the developers always use tools which
@@ -1404,7 +1404,7 @@
Or, he can simply commit the file—new EOL markers and
all.</para>
- <para>The result of scenarios like there include wasted time
+ <para>The result of scenarios like these include wasted time
and unnecessary modifications to committed files. Wasted
time is painful enough. But when commits change every line
in a file, this complicates the job of determining which of
@@ -1627,7 +1627,7 @@
house its custom modifications to the third-party data in some
disjointed fashion, such as using patch files or full-fledged
alternate versions of files and directories. But these quickly
- become maintainance headaches, requiring some mechanism by which
+ become maintenance headaches, requiring some mechanism by which
to apply your custom changes to the third-party data, and
necessitating regeneration of those changes with each successive
version of the third-party data that you track.</para>
Index: doc/book/book/ch07.xml
===================================================================
--- doc/book/book/ch07.xml (revision 5133)
+++ doc/book/book/ch07.xml (working copy)
@@ -1492,7 +1492,7 @@
<para>Pools might not be ideal for every application, but they are
extremely useful in Subversion. As a Subversion developer,
- you'll need to grow comfortable with pools and how to weild them
+ you'll need to grow comfortable with pools and how to wield them
correctly. Memory usage bugs and bloating can be difficult to
diagnose and fix regardless of the API, but the pool construct
provided by APR has proven a tremendously convenient,
@@ -1561,7 +1561,7 @@
Subversion's source code is versioned using Subversion itself,
you actually need to "bootstrap" by getting a working
Subversion client via some other method. The most common
- methods inclue downloading the latest binary distribution (if
+ methods include downloading the latest binary distribution (if
such is available for your platform), or downloading the
latest source tarball and building your own Subversion client.
If you build from source, make sure read the INSTALL file in
Index: doc/book/book/ch08.xml
===================================================================
--- doc/book/book/ch08.xml (revision 5133)
+++ doc/book/book/ch08.xml (working copy)
@@ -18,10 +18,10 @@
<command>svn</command></title>
<para>To use the command line client, you type
- <command>svn</command>, the subcommand you wish to use,
+ <command>svn</command>, the subcommand you wish to use
<footnote><para>Yes, yes, you don't need a subcommand to use the
<option>--version</option> switch, but we'll get to that in just
- a minute.</para> </footnote> and any switches or targets that
+ a minute.</para> </footnote>, and any switches or targets that
you wish to operate on—there is no specific order that the
subcommand and the switches must appear in. For example, all of
the following are valid ways to use <command>svn
@@ -180,7 +180,7 @@
insufficient credentials, prevents prompting for credentials
(e.g. username or password). This is useful if you're
running Subversion inside of an automated script and it's
- more appropriate to have Subversion fail then to prompt
+ more appropriate to have Subversion fail than to prompt
for more information.</para>
</listitem>
</varlistentry>
@@ -197,7 +197,7 @@
</varlistentry>
<varlistentry>
- <term><option>--password</option><replaceable>PASS</replaceable></term>
+ <term><option>--password</option><replaceable>PASS</replaceable></term>
<listitem>
<para>Indicates that you are providing your password for
authentication on the command line—otherwise, if
@@ -322,7 +322,7 @@
<listitem>
<para>Prints the client version info. This information
not only includes the version number of the client,
- but als a listing of all repository access modules
+ but also a listing of all repository access modules
that the client can use to access a Subversion
repository.</para>
</listitem>
@@ -662,7 +662,7 @@
commit by using either the <option>--file</option> or
<option>--message</option> switch,
<command>svn</command> will launch your editor for you
- to compose acommit message. See the
+ to compose a commit message. See the
<literal>editor-cmd</literal> section in <xref
linkend="svn-ch-6-sect-1.3.2"/>.</para>
</refsect1>
@@ -845,7 +845,7 @@
<title>Examples</title>
<para>Cos the copy—nothing goes into the repository
until you commit):</para>
<screen>
@@ -865,7 +865,7 @@
</screen>
<para>Copy an ite repository to your working
- copy (Just schedules the copy--nothing goes into the
+ copy (Just schedules the copy—nothing goes into the
repository until you commit):</para>
<tip>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Subversion book corrections
Posted by cm...@collab.net.
Francois Beausoleil <fb...@ftml.net> writes:
> Hi,
>
> Second try :) Sorry about not following the guidelines.
> Francois Beausoleil (fbos@users.sourceforge.net)
> Developper of Java Gui Builder - http://jgb.sourceforge.net/
>
> Log Message
>
> * ch00.xml, ch01.xml, ch03.xml, ch06.xml, ch07.xml, ch08.xml:
> Corrected spelling and grammatical mistakes.
Xlnt. I think my mailer is horking your patch, so I'll defer to
someone else for application.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org