[svnbook] r3961 committed - * src/en/book/ch04-branching-and-merging.xml, ...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Aug 5 22:02:10 CDT 2011
Revision: 3961
Author: cmpilato at gmail.com
Date: Fri Aug 5 20:01:09 2011
Log: * src/en/book/ch04-branching-and-merging.xml,
* src/en/book/ch06-server-configuration.xml
More mostly non-content edits.
http://code.google.com/p/svnbook/source/detail?r=3961
Modified:
/trunk/src/en/book/ch04-branching-and-merging.xml
/trunk/src/en/book/ch06-server-configuration.xml
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml Thu Jul 28 08:28:00
2011
+++ /trunk/src/en/book/ch04-branching-and-merging.xml Fri Aug 5 20:01:09
2011
@@ -7,7 +7,6 @@
(It is upon the Trunk that a gentleman works.)</quote></para>
</blockquote>
-
<para>Branching, tagging, and merging are concepts common to
almost all version control systems. If you're not familiar with
these ideas, we provide a good introduction in this chapter. If
@@ -20,7 +19,6 @@
assumes that you're already familiar with Subversion's basic
concepts (<xref linkend="svn.basic"/>).</para>
-
<!-- =================================================================
-->
<!-- =================================================================
-->
<!-- =================================================================
-->
@@ -48,18 +46,17 @@
<indexterm>
<primary>branches</primary>
</indexterm>
-
- This is the basic concept of a branch—namely, a line
- of development that exists independently of another line, yet
- still shares a common history if you look far enough back in
+ This is the basic concept of a branch—namely,
+ a line of development that exists independently of another line,
+ yet still shares a common history if you look far enough back in
time. A branch always begins life as a copy of something, and
moves on from there, generating its own history (see
<xref linkend="svn.branchmerge.whatis.dia-1"/>).</para>
- <figure id="svn.branchmerge.whatis.dia-1">
- <title>Branches of development</title>
- <graphic fileref="images/ch04dia1.png"/>
- </figure>
+ <figure id="svn.branchmerge.whatis.dia-1">
+ <title>Branches of development</title>
+ <graphic fileref="images/ch04dia1.png"/>
+ </figure>
<para>Subversion has commands to help you maintain parallel
branches of your files and directories. It allows you to create
@@ -93,10 +90,10 @@
<filename>trunk</filename> and <filename>branches</filename>.
The reason for this will soon become clear.</para>
- <figure id="svn.branchmerge.using.dia-1">
- <title>Starting repository layout</title>
- <graphic fileref="images/ch04dia2.png"/>
- </figure>
+ <figure id="svn.branchmerge.using.dia-1">
+ <title>Starting repository layout</title>
+ <graphic fileref="images/ch04dia2.png"/>
+ </figure>
<para>As before, assume that Sally and you both have working
copies of the <quote>calc</quote> project. Specifically, you
=======================================
--- /trunk/src/en/book/ch06-server-configuration.xml Fri Aug 5 09:34:57
2011
+++ /trunk/src/en/book/ch06-server-configuration.xml Fri Aug 5 20:01:09
2011
@@ -650,7 +650,7 @@
</informalexample>
<para>This defines a new Windows service named
- <quote>svn,</quote> which executes a particular
+ <literal>svn</literal> which executes a particular
<command>svnserve.exe</command> command when started (in
this case, rooted at <filename>C:\repos</filename>). There
are a number of caveats in the prior example,
More information about the svnbook-dev
mailing list