[svnbook commit] r3112 - trunk/src/en/book
sussman
noreply at red-bean.com
Wed Jun 11 13:46:44 CDT 2008
Author: sussman
Date: Wed Jun 11 13:46:43 2008
New Revision: 3112
Log:
* ch01-fundamental-concepts.xml: some suggestions from Karl Heinz Marbaise <khmarbaise at gmx.de>.
Modified:
trunk/src/en/book/ch01-fundamental-concepts.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 Wed Jun 11 13:46:43 2008
@@ -382,6 +382,64 @@
marks, so that your shell treats the whole thing as a single
argument to the <command>svn</command> program.</para>
+ <sidebar id="svn.basic.in-action.wc.sb-1">
+ <title>Repository URLs</title>
+
+ <para>Subversion repositories can be accessed through many
+ different methods—on local disk or through various
+ network protocols, depending on how your administrator has
+ set things up for you. A repository location, however, is
+ always a URL.
+ <xref linkend="svn.basic.in-action.wc.tbl-1"/> describes how
+ different URL schemes map to the available access
+ methods.</para>
+
+ <table id="svn.basic.in-action.wc.tbl-1">
+ <title>Repository access URLs</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Schema</entry>
+ <entry>Access method</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>file:///</literal></entry>
+ <entry>Direct repository access (on local disk)</entry>
+ </row>
+ <row>
+ <entry><literal>http://</literal></entry>
+ <entry>Access via WebDAV protocol to Subversion-aware
+ Apache server</entry>
+ </row>
+ <row>
+ <entry><literal>https://</literal></entry>
+ <entry>Same as <literal>http://</literal>, but with
+ SSL encryption.</entry>
+ </row>
+ <row>
+ <entry><literal>svn://</literal></entry>
+ <entry>Access via custom protocol to an
+ <literal>svnserve</literal> server</entry>
+ </row>
+ <row>
+ <entry><literal>svn+ssh://</literal></entry>
+ <entry>Same as <literal>svn://</literal>, but through
+ an SSH tunnel.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>For more information on how Subversion parses URLs, see
+ <xref linkend="svn.advanced.reposurls"/>. For more
+ information on the different types of network servers
+ available for Subversion, see
+ <xref linkend="svn.serverconfig"/>.</para>
+
+ </sidebar>
+
</sect2>
<!-- =============================================================== -->
@@ -408,7 +466,7 @@
changes to the other people working with you on your project
(by writing to the repository). If other people publish their
own changes, Subversion provides you with commands to merge
- those changes into your working directory (by reading from the
+ those changes into your working copy (by reading from the
repository).</para>
<para>A working copy also contains some extra files, created and
@@ -524,64 +582,6 @@
information in the repository, to decide which files need to
be brought up to date.</para>
- <sidebar id="svn.basic.in-action.wc.sb-1">
- <title>Repository URLs</title>
-
- <para>Subversion repositories can be accessed through many
- different methods—on local disk or through various
- network protocols, depending on how your administrator has
- set things up for you. A repository location, however, is
- always a URL.
- <xref linkend="svn.basic.in-action.wc.tbl-1"/> describes how
- different URL schemes map to the available access
- methods.</para>
-
- <table id="svn.basic.in-action.wc.tbl-1">
- <title>Repository access URLs</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Schema</entry>
- <entry>Access method</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><literal>file:///</literal></entry>
- <entry>Direct repository access (on local disk)</entry>
- </row>
- <row>
- <entry><literal>http://</literal></entry>
- <entry>Access via WebDAV protocol to Subversion-aware
- Apache server</entry>
- </row>
- <row>
- <entry><literal>https://</literal></entry>
- <entry>Same as <literal>http://</literal>, but with
- SSL encryption.</entry>
- </row>
- <row>
- <entry><literal>svn://</literal></entry>
- <entry>Access via custom protocol to an
- <literal>svnserve</literal> server</entry>
- </row>
- <row>
- <entry><literal>svn+ssh://</literal></entry>
- <entry>Same as <literal>svn://</literal>, but through
- an SSH tunnel.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>For more information on how Subversion parses URLs, see
- <xref linkend="svn.advanced.reposurls"/>. For more
- information on the different types of network servers
- available for Subversion, see
- <xref linkend="svn.serverconfig"/>.</para>
-
- </sidebar>
-
</sect2>
More information about the svnbook-dev
mailing list