[svnbook commit] r3384 - trunk/src/en/book
sussman
noreply at red-bean.com
Fri Dec 19 08:19:20 CST 2008
Author: sussman
Date: Fri Dec 19 08:19:20 2008
New Revision: 3384
Log:
Fix spelling of 'caret', use <literal>, reword a couple things.
Modified:
trunk/src/en/book/ch01-fundamental-concepts.xml
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch01-fundamental-concepts.xml
==============================================================================
--- trunk/src/en/book/ch01-fundamental-concepts.xml (original)
+++ trunk/src/en/book/ch01-fundamental-concepts.xml Fri Dec 19 08:19:20 2008
@@ -381,20 +381,21 @@
marks so that your shell treats the whole thing as a single
argument to the <command>svn</command> program.</para>
- <para>In Subversion 1.6, a new carat (<command>^</command>)
- notation was introduced as a shorthand for <quote>root of the
- repository</quote>. For example:</para>
+ <para>In Subversion 1.6, a new caret (<literal>^</literal>)
+ notation was introduced as a shorthand for <quote>the URL of
+ the repository's root directory</quote>. For example:</para>
<screen>
$ svn list ^/tags/bigsandwich/
</screen>
- <para>In this example, we're specifying
+ <para>In this example, we're specifying a URL for
the <filename>/tags/bigsandwich</filename> directory in the
root of the repository. Note that this URL
- syntax <emphasis>only</emphasis> works when you're sitting
- within a working copy—the commandline client infers the
- repository's URL by looking at the working copy.</para>
+ syntax <emphasis>only</emphasis> works when your current
+ working directory is a working copy—the commandline
+ client knows the repository's root URL by looking at the
+ working copy's metadata.</para>
<sidebar id="svn.basic.in-action.wc.sb-1">
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Fri Dec 19 08:19:20 2008
@@ -552,8 +552,8 @@
<replaceable>URL</replaceable></userinput>—tells
Subversion to merge all recent changes from the URL to the
current working directory (which is typically the root of your
- working copy). Also notice that we're using the carat
- (<command>^</command>) syntax<footnote><para>This was
+ working copy). Also notice that we're using the caret
+ (<literal>^</literal>) syntax<footnote><para>This was
introduced in svn 1.6.</para></footnote> to avoid having to
type out the entire <filename>/trunk</filename> URL.</para>
More information about the svnbook-dev
mailing list