[svnbook] r4144 committed - Remove whitespace between the opening <para> tag and the...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Nov 3 14:22:09 CDT 2011
Revision: 4144
Author: ptburba at gmail.com
Date: Thu Nov 3 12:21:54 2011
Log: Remove whitespace between the opening <para> tag and the
content of the paragraph.
* en/book/ch04-branching-and-merging.xml
* en/book/ch06-server-configuration.xml
http://code.google.com/p/svnbook/source/detail?r=4144
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
/trunk/en/book/ch06-server-configuration.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Thu Nov 3 12:11:16 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Thu Nov 3 12:21:54 2011
@@ -1135,8 +1135,7 @@
<primary>mergeinfo inheritance</primary>
</indexterm>
- <para>
- When a path has the <literal>svn:mergeinfo</literal>
+ <para>When a path has the <literal>svn:mergeinfo</literal>
property set on it we say it has <quote>explicit</quote>
mergeinfo. This explicit mergeinfo describes not only what
changes were merged into that particular directory, but also
@@ -1176,8 +1175,7 @@
its nearest parent with explicit mergeinfo,
<filename>/branches/proj-X</filename>.</para>
- <para>
- There are two cases in which mergeinfo is not inherited.
+ <para>There are two cases in which mergeinfo is not inherited.
First, if a path has explicit mergeinfo, then it never inherits
mergeinfo. Another way to think of this is that explicit
mergeinfo is always a complete record of the merges to a given
@@ -1209,8 +1207,7 @@
</screen>
</informalexample>
- <para>
- You might never have to think about mergeinfo inheritance
+ <para>You might never have to think about mergeinfo inheritance
or encounter non-inheritable mergeinfo in your own repository.
A discussion of the full ramifications of mergeinfo inheritance
are beyond the scope of this book. If you have more questions
=======================================
--- /trunk/en/book/ch06-server-configuration.xml Fri Oct 21 10:48:48 2011
+++ /trunk/en/book/ch06-server-configuration.xml Thu Nov 3 12:21:54 2011
@@ -4144,9 +4144,7 @@
single group.</para>
</listitem>
<listitem>
- <para>
- Make the repository wholly owned by that group.
- </para>
+ <para>Make the repository wholly owned by that group.</para>
</listitem>
<listitem>
<para>Set the group permissions to
More information about the svnbook-dev
mailing list