[svnbook commit] r3238 - in trunk/src/en: . book
cmpilato
noreply at red-bean.com
Mon Aug 4 11:57:52 CDT 2008
Author: cmpilato
Date: Mon Aug 4 11:57:51 2008
New Revision: 3238
Log:
Up-to-date/out-of-date hyphen juggling.
Modified:
trunk/src/en/HACKING
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch03-advanced-topics.xml
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/HACKING
==============================================================================
--- trunk/src/en/HACKING (original)
+++ trunk/src/en/HACKING Mon Aug 4 11:57:51 2008
@@ -46,6 +46,8 @@
datatype (n.)
logfile (n.)
+ out of date (see "up to date")
+ out-of-date (see "up-to-date")
plain-text (adj.)
up to date (as in, "bring the working copy up to date")
up-to-date (adj., as is "an up-to-date working copy")
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Mon Aug 4 11:57:51 2008
@@ -477,7 +477,7 @@
<para>When the server sends changes to your working copy via
<command>svn update</command>, a letter code is displayed next
to each item to let you know what actions Subversion performed
- to bring your working copy up-to-date. To find out what these
+ to bring your working copy up to date. To find out what these
letters mean, run <userinput>svn help update</userinput>.</para>
</sect2>
@@ -2201,7 +2201,7 @@
<para>If you're likely to use a working copy again, there's
nothing wrong with just leaving it on disk until you're ready
to use it again, at which point all it takes is an
- <command>svn update</command> to bring it up-to-date and ready
+ <command>svn update</command> to bring it up to date and ready
for use.</para>
<para>However, if you're definitely not going to use a working
Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml (original)
+++ trunk/src/en/book/ch03-advanced-topics.xml Mon Aug 4 11:57:51 2008
@@ -1526,7 +1526,7 @@
file changes, and more importantly, just
<emphasis>after</emphasis> the file changes, it is a hassle
for any process except the version control system to keep
- the data completely up-to-date. Left to human authors, the
+ the data completely up to date. Left to human authors, the
information would inevitably grow stale.</para>
<para>For example, say you have a document in which you would
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Mon Aug 4 11:57:51 2008
@@ -3253,7 +3253,7 @@
<title>Examples</title>
<para>Merge a branch back into the trunk (assuming that
- you have an up to date working copy of the trunk).</para>
+ you have an up-to-date working copy of the trunk).</para>
<screen>
$ svn merge --reintegrate \
@@ -4768,7 +4768,7 @@
</screen>
<para>If you want to find out what files in your working
- copy are out-of-date, pass the
+ copy are out of date, pass the
<option>--show-updates</option> option (this will
<emphasis>not</emphasis> make any changes to your
working copy). Here you can see that
More information about the svnbook-dev
mailing list