[svnbook commit] r1362 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Thu May 26 06:37:14 CDT 2005
Author: sunny256
Date: Thu May 26 06:37:13 2005
New Revision: 1362
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/appa.xml
trunk/src/nb/book/appb.xml
trunk/src/nb/book/appc.xml
trunk/src/nb/book/appd.xml
trunk/src/nb/book/book.xml
trunk/src/nb/book/ch00.xml
trunk/src/nb/book/ch01.xml
trunk/src/nb/book/ch02.xml
trunk/src/nb/book/ch03.xml
trunk/src/nb/book/ch04.xml
trunk/src/nb/book/ch05.xml
trunk/src/nb/book/ch06.xml
trunk/src/nb/book/ch07.xml
trunk/src/nb/book/ch08.xml
trunk/src/nb/book/ch09.xml
trunk/src/nb/book/copyright.xml
trunk/src/nb/book/foreword.xml
Log:
Sync the Norwegian book with the English version, r1306:1360. Phew, that
was a tough one. All the IDs have changed, and some stuff have been
moved around. This is also the first checkin after the 1.1-final tag,
but no 1.2.x-specific stuff has been added to the book yet. At least not
on trunk.
* src/nb/LAST_UPDATED
Updated to 1360 by make sync.
* src/nb/book/appa.xml
* src/nb/book/appb.xml
* src/nb/book/appd.xml
* src/nb/book/ch01.xml
* src/nb/book/ch04.xml
Merged r1352, r1354.
* src/nb/book/appc.xml
Merged r1349, r1352, r1354.
* src/nb/book/book.xml
Merged r1344.
* src/nb/book/ch00.xml
Merged r1337, r1352, r1354.
* src/nb/book/ch02.xml
Merged r1332, r1345, r1352, r1354.
* src/nb/book/ch03.xml
Merged r1347, r1352, r1354.
* src/nb/book/ch05.xml
Merged r1324, r1333, r1352, r1353, r1354.
* src/nb/book/ch06.xml
Merged r1324, r1352, r1354.
* src/nb/book/ch07.xml
Merged r1320, r1330, r1332, r1335, r1336, r1352, r1354.
* src/nb/book/ch08.xml
Merged r1331, r1334, r1352, r1354.
* src/nb/book/ch09.xml
Merged r1311, r1313, r1314, r1319, r1352, r1354.
* src/nb/book/copyright.xml
Merged r1354, r1358.
* src/nb/book/foreword.xml
Merged r1354.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu May 26 06:37:13 2005
@@ -1 +1 @@
-1306
+1360
Modified: trunk/src/nb/book/appa.xml
==============================================================================
--- trunk/src/nb/book/appa.xml (original)
+++ trunk/src/nb/book/appa.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<appendix id="svn-ap-a">
+<appendix id="svn.forcvs">
<!-- @ENGLISH {{{
<title>Subversion for CVS Users</title>
@ENGLISH }}} -->
@@ -41,7 +41,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-1">
+ <sect1 id="svn.forcvs.revnums">
<!-- @ENGLISH {{{
<title>Revision Numbers Are Different Now</title>
@ENGLISH }}} -->
@@ -100,17 +100,17 @@
<!-- @ENGLISH {{{
<para>For more details on this topic, see <xref
- linkend="svn-ch-2-sect-3.2" />.</para>
+ linkend="svn.basic.in-action.revs" />.</para>
@ENGLISH }}} -->
<para>For flere detaljer om dette emnet, se <xref
- linkend="svn-ch-2-sect-3.2" />.</para>
+ linkend="svn.basic.in-action.revs" />.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-2">
+ <sect1 id="svn.forcvs.directories">
<!-- @ENGLISH {{{
<title>Directory Versions</title>
@ENGLISH }}} -->
@@ -256,10 +256,11 @@
<!-- @ENGLISH {{{
<para>For more discussion about the limitations of directory
- versioning, see <xref linkend="svn-ch-2-sect-3.4"/>.</para>
+ versioning, see <xref linkend="svn.basic.in-action.mixedrevs"/>.</para>
@ENGLISH }}} -->
<para>For videre diskusjon om begrensningene på versjonskontroll for
- kataloger, se <xref linkend="svn-ch-2-sect-3.4"/>.</para>
+ kataloger, se <xref
+ linkend="svn.basic.in-action.mixedrevs"/>.</para>
</sect1>
@@ -267,7 +268,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-3">
+ <sect1 id="svn.forcvs.disconnected">
<!-- @ENGLISH {{{
<title>More Disconnected Operations</title>
@ENGLISH }}} -->
@@ -305,10 +306,10 @@
<listitem>
<!-- @ENGLISH {{{
<para>Shows you any local changes you've made (see <xref
- linkend="svn-ch-3-sect-5.3.1"/>)</para>
+ linkend="svn.tour.cycle.examine.status"/>)</para>
@ENGLISH }}} -->
<para>Viser deg alle lokale forandringer du har gjort (se
- <xref linkend="svn-ch-3-sect-5.3.1"/>)</para>
+ <xref linkend="svn.tour.cycle.examine.status"/>)</para>
</listitem>
</varlistentry>
@@ -317,10 +318,10 @@
<listitem>
<!-- @ENGLISH {{{
<para>Shows you the details of your changes (see <xref
- linkend="svn-ch-3-sect-5.3.2"/>)</para>
+ linkend="svn.tour.cycle.examine.diff"/>)</para>
@ENGLISH }}} -->
<para>Viser deg forandringene dine i detalj (se <xref
- linkend="svn-ch-3-sect-5.3.2"/>)</para>
+ linkend="svn.tour.cycle.examine.diff"/>)</para>
</listitem>
</varlistentry>
@@ -329,10 +330,10 @@
<listitem>
<!-- @ENGLISH {{{
<para>Removes your local changes (see <xref
- linkend="svn-ch-3-sect-5.3.3"/>)</para>
+ linkend="svn.tour.cycle.examine.revert"/>)</para>
@ENGLISH }}} -->
<para>Tilbakestiller dine lokale forandringer (se <xref
- linkend="svn-ch-3-sect-5.3.3"/>)</para>
+ linkend="svn.tour.cycle.examine.revert"/>)</para>
</listitem>
</varlistentry>
@@ -369,7 +370,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-4">
+ <sect1 id="svn.forcvs.status-vs-update">
<!-- @ENGLISH {{{
<title>Distinction Between Status and Update</title>
@ENGLISH }}} -->
@@ -553,7 +554,7 @@
C Resource has conflicts (changes have not been completely merged
between the repository and working copy version)
X Resource is external to this working copy (comes from another
- repository. See <xref linkend="svn-ch-7-sect-2.3.6" />)
+ repository. See <xref linkend="svn.advanced.props.special.externals" />)
? Resource is not under version control
! Resource is missing or incomplete (removed by another tool than
Subversion)
@@ -566,7 +567,7 @@
C Ressursen inneholder konflikter (forandringer er enda ikke blitt
flettet sammen med depotet og arbeidskopien) (<quote>Conflict</quote>)
X Ressursen er ekstern i denne arbeidskopien (kommer fra et annet
- depot. (<quote>eXternal</quote>) Se <xref linkend="svn-ch-7-sect-2.3.6" />)
+ depot. (<quote>eXternal</quote>) Se <xref linkend="svn.advanced.props.special.externals" />)
? Ressursen er ikke under versjonskontroll
! Ressursen mangler eller er ikke komplett (fjernet av et annet
verktøy enn Subversion)
@@ -590,10 +591,10 @@
<!-- @ENGLISH {{{
<para>For a more detailed discussion of <command>svn
- status</command>, see <xref linkend="svn-ch-3-sect-5.3.1" />.</para>
+ status</command>, see <xref linkend="svn.tour.cycle.examine.status" />.</para>
@ENGLISH }}} -->
<para>For en mer detaljert diskusjon om <command>svn
- status</command>, se <xref linkend="svn-ch-3-sect-5.3.1"
+ status</command>, se <xref linkend="svn.tour.cycle.examine.status"
/>.</para>
@@ -602,7 +603,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================= -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-5">
+ <sect1 id="svn.forcvs.branches-and-tags">
<!-- @ENGLISH {{{
<title>Branches and Tags</title>
@ENGLISH }}} -->
@@ -613,14 +614,14 @@
<quote>branch</quote> space; branches and tags are ordinary
directories within the filesystem. This is probably the single
biggest mental hurdle a CVS user will need to climb. Read all
- about it in <xref linkend="svn-ch-4"/>.</para>
+ about it in <xref linkend="svn.branchmerge"/>.</para>
@ENGLISH }}} -->
<para>Subversion skiller ikke mellom områder i filsystemet og
områder for <quote>forgreninger</quote>, forgreninger og merker er
vanlige kataloger i filsystemet.
Dette er muligens det største enkeltstående mentale hinderet en
CVS-bruker må forsere.
- Les alt om det i <xref linkend="svn-ch-4"/>.</para>
+ Les alt om det i <xref linkend="svn.branchmerge"/>.</para>
<warning>
@@ -657,7 +658,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-6">
+ <sect1 id="svn.forcvs.properties">
<!-- @ENGLISH {{{
<title>Metadata Properties</title>
@ENGLISH }}} -->
@@ -687,17 +688,17 @@
proplist</command>.</para>
<!-- @ENGLISH {{{
- <para>For more information, see <xref linkend="svn-ch-7-sect-2"/>.</para>
+ <para>For more information, see <xref linkend="svn.advanced.props"/>.</para>
@ENGLISH }}} -->
<para>For mer informasjon, se <xref
- linkend="svn-ch-7-sect-2"/>.</para>
+ linkend="svn.advanced.props"/>.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 7 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-7">
+ <sect1 id="svn.forcvs.conflicts">
<!-- @ENGLISH {{{
<title>Conflict Resolution</title>
@ENGLISH }}} -->
@@ -728,20 +729,21 @@
tangible. It remembers that a file is in a state of conflict,
and won't allow you to commit your changes until you run
<command>svn resolved</command>. See <xref
- linkend="svn-ch-3-sect-5.4"/> for more details.</para>
+ linkend="svn.tour.cycle.resolve"/> for more details.</para>
@ENGLISH }}} -->
<para>Subversion løser dette problemet ved å gjøre konflikter mer
synlige.
Den husker at en fil har en konflikt, og vil ikke tillate deg å
legge inn forandringene dine før du kjører <command>svn
resolved</command>.
- Se <xref linkend="svn-ch-3-sect-5.4"/> for flere detaljer.</para>
+ Se <xref linkend="svn.tour.cycle.resolve"/> for flere
+ detaljer.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 8 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-8">
+ <sect1 id="svn.forcvs.binary-and-trans">
<!-- @ENGLISH {{{
<title>Binary Files and Translation</title>
@ENGLISH }}} -->
@@ -785,8 +787,8 @@
<para>Subversion takes the more paranoid route: first, it never
performs any kind of keyword or line-ending translation unless
you explicitly ask it do so (see <xref
- linkend="svn-ch-7-sect-2.3.4"/> and <xref
- linkend="svn-ch-7-sect-2.3.5"/> for more details). By default,
+ linkend="svn.advanced.props.special.keywords"/> and <xref
+ linkend="svn.advanced.props.special.eol-style"/> for more details). By default,
Subversion treats all file data as literal byte strings, and
files are always stored in the repository in an untranslated
state.</para>
@@ -794,8 +796,9 @@
<para>Subversion tar den mer paranoide ruten:
Til å begynne med utfører den ingen form for nøkkelordutvidelser
hvis du ikke ber den spesielt om å gjøre det (Se <xref
- linkend="svn-ch-7-sect-2.3.4"/> og <xref
- linkend="svn-ch-7-sect-2.3.5"/> for flere detaljer).
+ linkend="svn.advanced.props.special.keywords"/> og <xref
+ linkend="svn.advanced.props.special.eol-style"/> for flere
+ detaljer).
Standard oppførsel for Subversion er å behandle alle fildata som
rene strenger av bytes, og filer blir alltid lagret i depotet i en
uoversatt tilstand.</para>
@@ -852,7 +855,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 9 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-9">
+ <sect1 id="svn.forcvs.modules">
<!-- @ENGLISH {{{
<title>Versioned Modules</title>
@@ -875,18 +878,18 @@
<!-- @ENGLISH {{{
<para>Subversion defines modules as a list of directories within a
- directory property: see <xref linkend="svn-ch-7-sect-3"/>.</para>
+ directory property: see <xref linkend="svn.advanced.externals"/>.</para>
@ENGLISH }}} -->
<para>Subversion definerer moduler som en liste av kataloger
innenfor en katalogegenskap:
- Se <xref linkend="svn-ch-7-sect-3"/>.</para>
+ Se <xref linkend="svn.advanced.externals"/>.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 10 ============================= -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-10">
+ <sect1 id="svn.forcvs.auth">
<!-- @ENGLISH {{{
<title>Authentication</title>
@@ -949,7 +952,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 11 ============================= -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-a-sect-11">
+ <sect1 id="svn.forcvs.convert">
<!-- @ENGLISH {{{
<title>Converting a Repository from CVS to Subversion</title>
Modified: trunk/src/nb/book/appb.xml
==============================================================================
--- trunk/src/nb/book/appb.xml (original)
+++ trunk/src/nb/book/appb.xml Thu May 26 06:37:13 2005
@@ -1,10 +1,10 @@
- <appendix id="svn-ap-b">
+ <appendix id="svn.tshoot">
<title>Troubleshooting</title>
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ap-b-sect-1">
+ <sect1 id="svn.tshoot.c">
<title>Common Problems</title>
<para>There are a number of problems you may run into in the
@@ -31,13 +31,13 @@
</footnote></para>
- <sect2 id="svn-ap-b-sect-1.2">
+ <sect2 id="svn.tshoot.c.faq">
<title>Problems Using Subversion</title>
<para>Here are some of the most popular questions from
Subversion's FAQ.</para>
- <sect3 id="svn-ap-b-sect-1.2.1">
+ <sect3 id="svn.tshoot.c.faq.bdb-recovery">
<title>Every time I try to access my repository, my Subversion
client just hangs.</title>
@@ -77,7 +77,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.2">
+ <sect3 id="svn.tshoot.c.faq.wedged-wc">
<title>Every time I try to run <command>svn</command>, it
says my working copy is locked.</title>
@@ -103,25 +103,25 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.3">
+ <sect3 id="svn.tshoot.c.faq.db-recover">
<title>I'm getting errors finding or opening a repository,
but I know my repository URL is correct.</title>
- <para>See <xref linkend="svn-ap-b-sect-1.2.1"/>.</para>
+ <para>See <xref linkend="svn.tshoot.c.faq.bdb-recovery"/>.</para>
<para>You might also have a permissions problem opening the
- repository. See <xref linkend="svn-ch-6-sect-5"/>.</para>
+ repository. See <xref linkend="svn.serverconfig.multimethod"/>.</para>
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.4">
+ <sect3 id="svn.tshoot.c.faq.windows-drive-letter">
<title>How can I specify a Windows drive letter in a
<literal>file://</literal> URL?</title>
- <para>See <xref linkend="svn-ch-2-sidebar-1"/>.</para>
+ <para>See <xref linkend="svn.basic.in-action.wc.sb-1"/>.</para>
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.5">
+ <sect3 id="svn.tshoot.c.faq.write-over-dav">
<title>I'm having trouble doing write operations to a
Subversion repository over a network.</title>
@@ -155,7 +155,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.6">
+ <sect3 id="svn.tshoot.c.faq.windows-xp-server">
<title>Under Windows XP, the Subversion server sometimes
seems to send out corrupted data.</title>
@@ -166,7 +166,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.7">
+ <sect3 id="svn.tshoot.c.faq.ethereal">
<title>What is the best method of doing a network trace of
the conversation between a Subversion client and
Apache server?</title>
@@ -232,7 +232,7 @@
file.</para>
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.8">
+ <sect3 id="svn.tshoot.c.faq.unrecognized-url-error">
<title>I just built the distribution binary, and when I try to
check out Subversion, I get an error about an <quote>Unrecognized
URL scheme.</quote></title>
@@ -263,7 +263,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.9">
+ <sect3 id="svn.tshoot.c.faq.revert">
<title>Why does the <command>svn revert</command> command
require an explicit target? Why is it not recursive by
default? This behavior differs from almost all the other
@@ -288,7 +288,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.10">
+ <sect3 id="svn.tshoot.c.faq.db3db4">
<title>When I start Apache, mod_dav_svn complains about a
<quote>bad database version</quote>, that it found db-3.X,
rather than db-4.X.</title>
@@ -306,7 +306,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.11">
+ <sect3 id="svn.tshoot.c.faq.redhat-db">
<title>I'm getting <quote>Function not implemented</quote>
errors on RedHat 9, and nothing works. How do I fix
this?</title>
@@ -350,7 +350,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.12">
+ <sect3 id="svn.tshoot.c.faq.no-author">
<title>Why does log say <quote>(no author)</quote> for files
committed or imported via Apache (ra_dav)?</title>
@@ -368,11 +368,11 @@
</screen>
<para>Read about adding authentication in <xref
- linkend="svn-ch-6"/>.</para>
+ linkend="svn.serverconfig"/>.</para>
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.13">
+ <sect3 id="svn.tshoot.c.faq.windows-access-denied">
<title>I'm getting occasional <quote>Access Denied</quote>
errors on Windows. They seem to happen at random.</title>
@@ -388,7 +388,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.14">
+ <sect3 id="svn.tshoot.c.faq.freebsd-hang">
<title>On FreeBSD, certain operations (especially svnadmin
create) sometimes hang.</title>
@@ -407,7 +407,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.15">
+ <sect3 id="svn.tshoot.c.faq.301-error">
<title>I can see my repository in a web browser, but
<command>svn checkout</command> gives me an error about
<literal>301 Moved Permanently</literal>.</title>
@@ -438,7 +438,7 @@
</sect3>
- <sect3 id="svn-ap-b-sect-1.2.16">
+ <sect3 id="svn.tshoot.c.faq.no-copy-history">
<title>I'm trying to look at an old version of my file, but
svn says something about <quote>path not
found</quote>.</title>
Modified: trunk/src/nb/book/appc.xml
==============================================================================
--- trunk/src/nb/book/appc.xml (original)
+++ trunk/src/nb/book/appc.xml Thu May 26 06:37:13 2005
@@ -1,11 +1,11 @@
-<appendix id="svn-ap-c">
+<appendix id="svn.webdav">
<title>WebDAV and Autoversioning</title>
<simplesect>
<para>WebDAV is an extension to HTTP, and is growing more and more
popular as a standard for file-sharing. Today's operating
- systems are becoming extremely Web-aware, and many have now
+ systems are becoming extremely Web-aware, and many now have
built-in support for mounting <quote>shares</quote> exported by
WebDAV servers.</para>
@@ -17,39 +17,49 @@
</simplesect>
- <sect1 id="svn-ap-c-sect-1">
+ <sect1 id="svn.webdav.basic">
<title>Basic WebDAV Concepts</title>
<para>This section provides a very brief, very general overview to
the ideas behind WebDAV. It should lay the foundation for
understanding WebDAV compatibility issues between clients and
servers.</para>
-
- <sect2 id="svn-ap-c-sect-1.1">
- <title>Just Plain WebDAV</title>
-
+
+ <para>This section provides a very brief overview to the ideas
+ behind WebDAV. It should lay the foundation for understanding
+ WebDAV compatibility issues between clients and servers.</para>
+
+ <sect2 id="svn.webdav.basic.original">
+ <title>Original WebDAV</title>
+
<para>RFC 2518 defines a set of concepts and accompanying
extension methods to HTTP 1.1 that make the web into a more
universal read/write medium. The basic idea is that a
- WebDAV-compliant web server can act like a generic file server;
- clients can mount WebDAV <quote>shares</quote> that behave
- much like NFS or SMB shares.</para>
+ WebDAV-compliant web server can act like a generic file
+ server; clients can mount shared folders that behave much like
+ NFS or SMB filesystems..</para>
- <para>However, it's important to note that RFC 2518 does
- <emphasis>not</emphasis> provide any sort of model for version
- control, despite the <quote>V</quote> in DAV. Basic WebDAV
- clients and servers assume only one version of each file or
- directory exists, and can be repeatedly overwritten.
- <footnote><para>For this reason, some people jokingly refer to
- generic WebDAV clients as <quote>WebDA</quote>
- clients!</para></footnote></para>
-
- <para>Here are the new concepts and methods introduced in basic
+ <para>The tragedy, though, is that the RFC 2518 WebDAV
+ specification does not provide any sort of model for version
+ control, despite the "V" in DAV. Basic WebDAV clients and
+ servers assume only one version of each file or directory
+ exists, and can be repeatedly overwritten.</para>
+
+ <para>Here are the concepts and terms introduced in basic
WebDAV:</para>
<variablelist>
<varlistentry>
+ <term>Resources</term>
+ <listitem>
+ <para> WebDAV lingo refers to any server-side object
+ (that can be described with a URI) as a
+ <firstterm>resource</firstterm>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>New write methods</term>
<listitem>
<para>Beyond the standard HTTP <literal>PUT</literal>
@@ -59,17 +69,16 @@
rearranging resources.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Collections</term>
<listitem>
- <para>This is simply the WebDAV term for a grouping of
- resources (URIs). In most cases, it is analogous to a
- <quote>directory</quote>. You can tell something is a
- collection if it ends with a trailing <quote>/</quote>.
- Whereas file resources can be written or created with a
- <literal>PUT</literal> method, collection resources are
- created with the new <literal>MKCOL</literal>
+ <para>A <firstterm>collection</firstterm> is the WebDAV
+ term for a grouping of resources. In most cases, it
+ is analogous to a directory. Whereas file resources
+ can be written or created with a
+ <literal>PUT</literal> method, collection resources
+ are created with the new <literal>MKCOL</literal>
method.</para>
</listitem>
</varlistentry>
@@ -81,15 +90,16 @@
Subversion—metadata attached to files and
collections. A client can list or retrieve properties
attached to a resource with the new
- <literal>PROPFIND</literal> method, and can change them
- with the <literal>PROPPATCH</literal> method. Some
- properties are wholly created and controlled by users
- (e.g. a property called <quote>color</quote>), and
- others are wholly created and controlled by the WebDAV
- server (e.g. a property that contains the last
+ <literal>PROPFIND</literal> method, and can change
+ them with the <literal>PROPPATCH</literal> method.
+ Some properties are wholly created and controlled by
+ users (e.g. a property called <quote>color</quote>),
+ and others are wholly created and controlled by the
+ WebDAV server (e.g. a property that contains the last
modification time of a file). The former kind are
- called <quote>dead</quote> properties, and the latter
- kind are called <quote>live</quote> properties.</para>
+ called <firstterm>dead properties</firstterm>, and the
+ latter kind are called <firstterm>live
+ properties</firstterm>.</para>
</listitem>
</varlistentry>
@@ -97,538 +107,679 @@
<term>Locking</term>
<listitem>
<para>A WebDAV server may decide to offer a locking
- feature to clients—this part of the specification
- is optional, although most WebDAV servers do offer the
- feature. If present, then clients can use the new
- <literal>LOCK</literal> and <literal>UNLOCK</literal>
- methods to mediate access to a resource. In most cases
- these methods are used to create exclusive write locks
- (as discussed in <xref linkend="svn-ch-2-sect-2.2"/>),
- although shared write locks are also possible.</para>
+ feature to clients—this part of the
+ specification is optional, although most WebDAV
+ servers do offer the feature. If present, then
+ clients can use the new <literal>LOCK</literal> and
+ <literal>UNLOCK</literal> methods to mediate access to
+ a resource. In most cases these methods are used to
+ create exclusive write locks (as discussed in <xref
+ linkend="svn.basic.vsn-models.lock-unlock"/>), although shared write
+ locks are also possible in some server
+ implementations.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Access control</term>
+ <listitem>
+ <para>A more recent specification (RFC 3744) defines a
+ system for defining access control lists (ACLs) on
+ WebDAV resources. Some clients and servers have begun
+ to implement this feature.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
-
+
</sect2>
-
- <sect2 id="svn-ap-c-sect-1.2">
+
+ <sect2 id="svn.webdav.basic.deltav">
<title>DeltaV Extensions</title>
-
+
<para>Because RFC 2518 left out versioning concepts, another
- capable group was left with the responsibility of writing RFC
- 3253, which adds versioning to WebDAV. WebDAV/DeltaV clients
- and servers are often called just <quote>DeltaV</quote>
- clients and servers, since DeltaV implies the existence of
- basic WebDAV.</para>
+ committee was left with the responsibility of writing RFC
+ 3253, which adds versioning to WebDAV,
+ a.k.a. <quote>DeltaV</quote>. WebDAV/DeltaV clients and
+ servers are often called just <quote>DeltaV</quote> programs,
+ since DeltaV implies the existence of basic WebDAV.</para>
<para>DeltaV introduces a whole slew of new acronyms, but don't
- be intimidated. The ideas are fairly straightforward. Here
- are the new concepts and methods introduced in DeltaV:</para>
+ be intimidated. The ideas are fairly straightforward:</para>
<variablelist>
-
+
<varlistentry>
<term>Per-resource versioning</term>
<listitem>
- <para>Like CVS and other version-control systems, DeltaV
- assumes that each resource has a potentially infinite
- number of states. A client begins by placing a resource
- under version control using the new
- <literal>VERSION-CONTROL</literal> method. This creates
- a new Version Controlled Resource (VCR). Every time you
- change the VCR (via <literal>PUT</literal>,
- <literal>PROPPATCH</literal>, etc.), a new state of the
- resource is created, called a Version Resource (VR).
- VCRs and VRs are still ordinary web resources, defined
- by URLs. Specific VRs can have human-friendly names as
- well.</para>
+ <para> Like CVS and other version-control systems,
+ DeltaV assumes that each resource has a potentially
+ infinite number of states. A client begins by placing
+ a resource under version control using the new
+ <literal>VERSION-CONTROL</literal> method.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Server-side working-copy model</term>
<listitem>
- <para>Some DeltaV servers support the ability to create a
- virtual <quote>workspace</quote> on the server, where
- all of your work is performed. Clients use the
+ <para>Some DeltaV servers support the ability to create
+ a virtual workspace on the server, where all of your
+ work is performed. Clients use the
<literal>MKWORKSPACE</literal> method to create a
- private area, then indicate they want to change specific
- VCRs by <quote>checking them out</quote> into the
- workspace, editing them, and <quote>checking them
- in</quote> again. In HTTP terms, the sequence of
+ private area, then indicate they want to change
+ specific resources by <quote>checking them out</quote>
+ into the workspace, editing them, and <quote>checking
+ them in</quote> again. In HTTP terms, the sequence of
methods would be <literal>CHECKOUT</literal>,
- <literal>PUT</literal>, <literal>CHECKIN</literal>.
- After each <literal>CHECKIN</literal>, a new VR is
- created, and the edited VCR's contents now <quote>point
- to</quote> the latest VR. Each VCR has also has a
- <quote>history</quote> resource which tracks and orders
- its various VR states.</para>
+ <literal>PUT</literal>,
+ <literal>CHECKIN</literal>.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Client-side working-copy model</term>
<listitem>
<para>Some DeltaV servers also support the idea that the
- client may have a private working copy full of
- specific VRs. (This is how CVS and Subversion work.)
+ client may have a private working copy on local disk.
When the client wants to commit changes to the server,
it begins by creating a temporary server transaction
- (called an activity) with the
+ (called an <firstterm>activity</firstterm>) with the
<literal>MKACTIVITY</literal> method. The client then
- performs a <literal>CHECKOUT</literal> on each VR it
- wishes to change, which creates a number of temporary
- <quote>working resources</quote> in the activity, that
- can be modified using <literal>PUT</literal> and
- <literal>PROPPATCH</literal> methods. Finally, the
- client performs a <literal>CHECKIN</literal> on each
- working resource, which creates a new VR within each
- VCR, and the entire activity is deleted.</para>
+ performs a <literal>CHECKOUT</literal> on each
+ resource it wishes to change and sends
+ <literal>PUT</literal> requests. Finally, the client
+ performs a <literal>CHECKIN</literal> resource, or
+ sends a <literal>MERGE</literal> request to check in
+ all resources at once.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Configurations</term>
<listitem>
<para>DeltaV allows you define flexible collections of
- VCRs called <quote>configurations</quote>, which don't
- necessarily correspond to particular directories. Each VCR's
- contents can be made to point to a specific VR using the
- <literal>UPDATE</literal> method. Once the configuration
- is perfect, the client can create a
- <quote>snapshot</quote> of the whole configuration, called
- a <quote>baseline</quote>. Clients use the
- <literal>CHECKOUT</literal> and <literal>CHECKIN</literal>
- methods to capture specific states of configurations, much
- like they use these methods to create specific VR states
- of VCRs.</para>
+ resources called <quote>configurations</quote>, which
+ don't necessarily correspond to particular
+ directories. A configuration can be made to point to
+ specific versions of files, and then a
+ <quote>baseline</quote> snapshot can be made, much
+ like a tag.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Extensibility</term>
<listitem>
<para>DeltaV defines a new method,
<literal>REPORT</literal>, which allows the client and
- server to perform customized data exchanges. The client
- sends a <literal>REPORT</literal> request with a
+ server to perform customized data exchanges. While
+ DeltaV defines a number of standardized history reports
+ that a client can request, the the server is also free
+ to define custom reports. The client sends a
+ <literal>REPORT</literal> request with a
properly-labeled XML body full of custom data; assuming
the server understands the specific report-type, it
- responds with an equally custom XML body. This technique
- is very similar to XML-RPC.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Autoversioning</term>
- <listitem>
- <para>For many, this is the <quote>killer</quote> feature
- of DeltaV. If the DeltaV server supports this feature,
- then basic WebDAV clients (i.e. those unaware of
- versioning) can still write to the server, and the server
- will silently perform versioning anyway. In the simplest
- example, an ignorant <literal>PUT</literal> from a basic
- WebDAV client might be translated by the server as a
- <literal>CHECKOUT</literal>, <literal>PUT</literal>,
- <literal>CHECKIN</literal>.</para>
+ responds with an equally custom XML body. This
+ technique is very similar to XML-RPC.</para>
</listitem>
</varlistentry>
</variablelist>
+
+ </sect2>
- </sect2>
-
</sect1>
-
- <sect1 id="svn-ap-c-sect-2">
+
+ <sect1 id="svn.webdav.svn-and-deltav">
<title>Subversion and DeltaV</title>
-
- <para>So how <quote>compatible</quote> is Subversion with other
- DeltaV software? In two words: not very. At least not yet, not
- in Subversion 1.0.</para>
-
- <para>While libsvn_ra_dav sends DeltaV requests to the server, the
- Subversion client is <emphasis>not</emphasis> a general-purpose
- DeltaV client. In fact, it expects some custom features from
- the server (especially through custom <literal>REPORT</literal>
- requests). Further, mod_dav_svn is <emphasis>not</emphasis> a
- general-purpose DeltaV server. It only implements a strict
- subset of the DeltaV specification. A more general WebDAV or
- DeltaV client may very well be able to interoperate against it,
- but only if that client operates within the narrow confines of
- those features that the server has implemented. The Subversion
- development team plans to address general WebDAV
- interoperability in a future release of Subversion.</para>
- <sect2 id="svn-ap-c-sect-2.1">
- <title>Mapping Subversion to DeltaV</title>
-
- <para>Here is a very <quote>high-level</quote> description of
- how various Subversion client operations use DeltaV. In many
- cases, these explanations are gross oversimplifications. They
- should <emphasis>not</emphasis> be taken as a substitute for
- reading Subversion's source code or talking with its
- developers.</para>
-
- <variablelist>
+ <para>The original WebDAV standard has been widely successful.
+ Every modern computer operating system has a general WebDAV
+ client built-in (details to follow), and a number of popular
+ standalone applications are also able to speak WebDAV —
+ Microsoft Office, Dreamweaver, and Photoshop to name a few. On
+ the server end, the Apache webserver has been able to provide
+ WebDAV services since 1998 and is considered the de-facto
+ open-source standard. There are several other commercial WebDAV
+ servers available, including Microsoft's own IIS.</para>
+
+ <para>DeltaV, unfortunately, has not been so successful. It's
+ very difficult to find any DeltaV clients or servers. The few
+ that do exist are relatively unknown commercial products, and
+ thus it's very difficult to test interoperability. It's not
+ entirely clear as to why DeltaV has remained stagnant. Some
+ argue that the specification is just too complex, others argue
+ that while WebDAV's features have mass appeal (even the least
+ technical users appreciate network file-sharing), version
+ control features aren't interesting or necessary for most users.
+ Finally, some have argued that DeltaV remains unpopular because
+ there's still no open-source server product which implements
+ it.</para>
+
+ <para>When Subversion was still in its design phase, it seemed
+ like a great idea to use Apache httpd as the main network
+ server. It already had a module to provide WebDAV services.
+ DeltaV was a relatively new specification. The hope was that
+ the Subversion server module (mod_dav_svn) would eventually
+ evolve into an open-source DeltaV reference implementation.
+ Unfortunately, DeltaV has a very specific versioning model that
+ doesn't quite line up with Subversion's model. Some concepts
+ were mappable, others were not.</para>
+
+ <para>The upshot is that</para>
+
+ <orderedlist>
+
+ <listitem>
+ <para>The Subversion client is not a fully-implemented DeltaV
+ client.</para>
- <varlistentry>
- <term>svn checkout/list</term>
- <listitem>
- <para>
- Perform a <literal>PROPFIND</literal> of depth 1 on the
- collection to get a list of immediate children. Perform
- a <literal>GET</literal> (and possibly a
- <literal>PROPFIND</literal>) on each child. Recurse
- into collections and repeat.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>svn commit</term>
- <listitem>
- <para>
- Create an activity with <literal>MKACTIVITY</literal>,
- and do a <literal>CHECKOUT</literal> of each changed
- item, followed by a <literal>PUT</literal> of new data.
- Finally, a <literal>MERGE</literal> request causes an
- implicit <literal>CHECKIN</literal> of all working
- resources.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>svn update/switch/status/merge/diff</term>
- <listitem>
- <para>
- Send a custom <literal>REPORT</literal> request that
- describes the mixed-revision (and mixed-URL) state of
- the working copy. The server sends a custom response
- that describes which items need updating and includes
- binary deltas of file contents. Parses the response.
- For updates and switches, install the new data in the
- working copy. For diff and merge commands, compare the
- data to the working copy, possibly applying changes as
- local modifications.
- </para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
- <sect2 id="svn-ap-c-sect-2.2">
- <title>Autoversioning Support</title>
-
- <para>At the time of writing, the truth is that there are very
- few DeltaV clients in the world; RFC 3253 is still relatively
- new. However users do have access to <quote>generic</quote>
- clients, because almost every modern operating system now has
- an integrated basic WebDAV client. With this in mind,
- Subversion developers realized that if Subversion 1.0 was to
- have <emphasis>any</emphasis> interoperability features,
- support for DeltaV autoversioning would be the best
- approach.</para>
+ <para>The client needs certain things from the server that
+ DeltaV cannot provide, and thus is largely dependent on a
+ number of Subversion-specific <literal>REPORT</literal>
+ requests that only mod_dav_svn understands.</para>
+ </listitem>
+
+ <listitem>
+ <para>mod_dav_svn is not a fully-implemented DeltaV server.</para>
+
+ <para>Many portions of the DeltaV specification were irrelevant to
+ Subversion, and thus left unimplemented.</para>
+ </listitem>
- <para>To activate autoversioning in mod_dav_svn, use the
- <literal>SVNAutoversioning</literal> directive within the
- <filename>httpd.conf</filename> <literal>Location</literal>
- block, like so:</para>
-
- <screen>
-<Location /repos>
- DAV svn
- SVNPath /absolute/path/to/repository
- SVNAutoversioning on
-</Location>
-</screen>
+ </orderedlist>
- <para>Normally, if a generic WebDAV client attempted a
- <literal>PUT</literal> to a path within your repository
- location, mod_dav_svn would outright reject the request. (It
- normally only allows such operations on <quote>working
- resources</quote> within DeltaV <quote>activities</quote>.)
- With <literal>SVNAutoversioning</literal> turned on, however,
- the server interprets the <literal>PUT</literal> request as an
- internal <literal>MKACTIVITY</literal>,
- <literal>CHECKOUT</literal>, <literal>PUT</literal>, and
- <literal>CHECKIN</literal>. A generic log message is
- auto-generated, and a new filesystem revision is
- created.</para>
-
- <para>Because so many operating systems already have integrated
- WebDAV abilities, the use case for this feature borders on
- fantastical: imagine an office of ordinary users running
- Microsoft Windows or Mac OS. Each computer
- <quote>mounts</quote> the Subversion repository, which appears
- to be an ordinary network share. They use the server as they
- always do: open files from the server, edit them, and
- save them back to the server. But in this fantasy, the server
- is automatically versioning everything. Later on, a sysadmin
- can use a Subversion client to search and retrieve all older
- versions.</para>
-
- <para>Is this fantasy real? Not quite. The main snag is that
- Subversion 1.0 has no support whatsoever for the WebDAV
- <literal>LOCK</literal> or <literal>UNLOCK</literal> methods.
- Most operating system DAV clients attempt to
- <literal>LOCK</literal> a resource opened directly from a
- DAV-mounted network share. For now, users may have to copy a
- file from the DAV share to local disk, edit the file, then
- copy it back again. Not ideal autoversioning, but still
- doable.</para>
+ <para>There is still some debate in the developer community as to
+ whether or not it's worthwhile to remedy either of these
+ situations. It's fairly unrealistic to change Subversion's
+ design to match DeltaV, so there's probably no way the client
+ can ever learn to get everything it needs from a general DeltaV
+ server. On the other hand, mod_dav_svn *could* be further
+ developed to implement all of DeltaV, but it's hard to find
+ motivation to do so — here are almost no DeltaV clients to
+ interoperate with.</para>
- </sect2>
+ </sect1>
- <sect2 id="svn-ap-c-sect-2.3">
- <title>The mod_dav_lock Alternative</title>
-
- <para>The mod_dav Apache module is a complex beast: it
- understands and parses all of the WebDAV and DeltaV methods,
- yet it depends on a back-end <quote>provider</quote> to
- access the resources themselves.</para>
-
- <para>In its simplest incarnation, a user can use mod_dav_fs as
- a provider for mod_dav. mod_dav_fs uses the ordinary
- filesystem to store files and directories, and only
- understands vanilla WebDAV methods, not DeltaV.</para>
-
- <para>Subversion, on the other hand, uses mod_dav_svn as a
- provider for mod_dav. mod_dav_svn understands all WebDAV
- methods except <literal>LOCK</literal>, and understands a
- sizable subset of DeltaV methods. It accesses data in the
- Subversion repository, rather than in the real filesystem.
- Subversion 1.0 doesn't support locking, because it would
- actually be quite difficult to implement, since Subversion uses
- the copy-modify-merge model.<footnote><para>Subversion may
- someday develop a reserved-checkout locking model that can
- live peaceably with copy-modify-merge, but it probably won't
- happen soon.</para></footnote></para>
-
- <para>In Apache httpd-2.0, mod_dav supports the
- <literal>LOCK</literal> method by tracking locks in a private
- database, assuming that the provider is willing to accept
- them. In Apache httpd-2.1 or later, however, this locking
- support has been broken into an independent module,
- mod_dav_lock. It allows any mod_dav provider to take
- advantage of the lock database, including mod_dav_svn, even
- though mod_dav_svn doesn't actually understand locking.</para>
-
- <para>Confused yet?</para>
-
- <para>In a nutshell, you can use mod_dav_lock in Apache
- httpd-2.1 (or later) to create the
- <emphasis>illusion</emphasis> that mod_dav_svn is honoring
- <literal>LOCK</literal> requests. Make sure mod_dav_lock is
- either compiled into httpd, or being loaded in your
- <filename>httpd.conf</filename>. Then simply add the
- <literal>DAVGenericLockDB</literal> directive to your
- <literal>Location</literal> like so:</para>
+ <sect1 id="svn.webdav.autoversioning">
+ <title>Autoversioning </title>
+
+ <para>All is not lost. There's still a bright gleam of
+ interoperability around this cloud, one which justifies
+ Subversion's original adoption of WebDAV: it's called
+ autoversioning.</para>
+
+ <para>Autoversioning is an optional feature defined in the DeltaV
+ standard. A typical DeltaV server will reject an ignorant
+ WebDAV client attempting to do a <literal>PUT</literal> to a
+ file that's under version control. To change a
+ version-controlled file, the server expects a series proper
+ versioning requests: something like
+ <literal>MKACTIVITY</literal>, <literal>CHECKOUT</literal>,
+ <literal>PUT</literal>, <literal>CHECKIN</literal>. But if the
+ DeltaV server supports autoversioning, then write-requests from
+ basic WebDAV clients are accepted. The server behaves *as if*
+ the client had issued the proper series of versioning requests,
+ peforming a commit under the hood. In other words, it allows a
+ DeltaV server to interoperate with ordinary WebDAV
+ clients.</para>
+
+ <para>Because so many operating systems already have integrated
+ WebDAV clients, the use case for this feature borders on
+ fantastical: imagine an office of ordinary users running
+ Microsoft Windows or Mac OS. Each user <quote>mounts</quote>
+ the Subversion repository, which appears to be an ordinary
+ network folder. They use the shared folder as they always do:
+ open files, edit them, save them. Meanwhile, the server is
+ automatically versioning everything. Any administrator (or
+ knowledgeable user) can still use a Subversion client to search
+ history and retrieve older versions of data.</para>
+
+ <para>This scenario isn't fiction: it's real and it works, as of
+ Subversion 1.2 and later. To activate autoversioning in
+ mod_dav_svn, use the <literal>SVNAutoversioning</literal>
+ directive within the <filename>httpd.conf</filename> Location
+ block, like so:</para>
<screen>
<Location /repos>
DAV svn
- SVNPath /absolute/path/to/repository
+ SVNPath /path/to/repository
SVNAutoversioning on
- DavGenericLockDB /path/to/store/locks
</Location>
</screen>
- <para>This technique is a risky business; in some sense, the
- mod_dav_svn is now lying to the WebDAV client. It claims to
- accept the <literal>LOCK</literal> request, but in reality the
- lock isn't being enforced at all levels. If a second WebDAV
- client attempts to <literal>LOCK</literal> the same resource,
- then mod_dav_lock will notice and correctly deny the request.
- But there's absolutely nothing preventing an ordinary
- Subversion client from changing the file via a normal
- <command>svn commit</command>! If you use this technique,
- you're giving users the opportunity to stomp on each others'
- changes. In particular, a WebDAV client might accidentally
- overwrite a change committed by a regular Subversion client.</para>
-
- <para>On the other hand, if you set up your environment very
- carefully, you may mitigate the risk. For example, if
- <emphasis>all</emphasis> of your users are working though
- basic WebDAV clients (rather than Subversion clients), then
- things should be fine.</para>
- </sect2>
-
+ <para>When SVNAutoversioning is active, write requests from WebDAV
+ clients result in automatic commits. A generic log message is
+ auto-generated and attached to each revision.</para>
+
+ <para>Before activating this feature, however, understand what
+ you're getting into. WebDAV clients tend to do
+ <emphasis>many</emphasis> write requests, resulting in a huge
+ number of automatically committed revisions. For example, when
+ saving data, many clients will do a <literal>PUT</literal> of a
+ 0-byte file (as a way of reserving a name) followed by another
+ <literal>PUT</literal> with the real filedata. The single
+ file-write results in two separate commits. Also consider that
+ many applications auto-save every few minutes, resulting in even
+ more commits.</para>
+
+ <para>If you have a post-commit hook program that sends email, for
+ example, you may want to disable email generation either
+ altogether, or on certain sections of the repository; it depends
+ on whether you think the influx of emails will still prove to be
+ valuable notifications or not. Also, a smart post-commit hook
+ program can distinguish between a transaction created via
+ autoversioning and one created through a normal <command>svn
+ commit</command>. The trick is to look for a revision property
+ named <literal>svn:autoversioned</literal>. If present, the
+ commit was made by a generic WebDAV client.</para>
+
</sect1>
-
- <sect1 id="svn-ap-c-sect-3">
- <title>Autoversioning Interoperability</title>
- <para>In this section, we'll describe the most common generic
- WebDAV clients (at the time of writing), and how well they
- operate against a mod_dav_svn server using the
- <literal>SVNAutoversioning</literal> directive. RFC 2518 is a
- bit large, and perhaps a bit too flexible. Every WebDAV
- client behaves slightly differently, and creates slightly
- different problems.</para>
-
- <!-- list of subsections goes here. -->
-
- <sect2 id="svn-ap-c-sect-3.1">
- <title>Win32 WebFolders</title>
-
- <para>Windows 98, 2000, and XP have an integrated WebDAV client
- known as <quote>WebFolders</quote>. On Windows 98, the
- feature might need to be explicitly installed; if present, a
- <quote>WebFolders</quote> directory appears directly within My
- Computer. On Windows 2000 and XP, simply open My Network
- Places, and run the Add Network Place icon. When prompted,
- enter the WebDAV URL. The shared folder will appear within My
- Network Places.</para>
+ <sect1 id="svn.webdav.clients">
+ <title>Client Interoperability</title>
- <para>Most write operations work fine against an autoversioning
- mod_dav_svn server, but there are a few problems:</para>
+ <para>In this section, we'll describe the most common WebDAV clients (at
+ the time of writing), and how well they operate against an
+ autoversioning mod_dav_svn server.</para>
- <itemizedlist>
+ <para>All WebDAV clients fall into one of three categories. These
+ categories are the main definers of what users can and cannot
+ do.</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term>Standalone application</term>
+
+ <listitem>
+ <para>The WebDAV functionality is buried within a single
+ application. For example, Microsoft Word is able to open a
+ file directly from a URL. It locks the file when this
+ happens, and every subsequent <quote>save</quote> command
+ results in a PUT request.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>File-explorer extension</term>
+
+ <listitem>
+ <para>The WebDAV functionality is an extension to a GUI
+ program that is normally used to browse filesystems,
+ either local or remote. For example, Windows Explorer is
+ able to browse a WebDAV server as a <quote>network
+ place</quote>. Users can drag files to and from the
+ desktop, or can rename, copy, or delete files in the usual
+ way. But because it's only a feature of the
+ file-explorer, the DAV share isn't visible to ordinary
+ applications. All DAV interaction must happen through the
+ explorer interface.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Filesystem implementation</term>
+
+ <listitem>
+ <para>This the best sort of WebDAV client. It's implemented
+ as a low-level filesystem (typically within the operating
+ system's kernel.) This means that the DAV share is
+ mounted like any other network filesystem, similar to
+ mounting an NFS share on Unix, or attaching an SMB share
+ as drive-letter in Windows. As a result, this sort of
+ client provides completely transparent read/write WebDAV
+ access to all programs. Applications aren't even aware
+ that WebDAV requests are happening.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <para>There are many WebDAV clients, far too many to list. Here
+ we provide some details about our experiences with some of the
+ more popular ones.</para>
+
+ <table id="svn.webdav.clients.tbl-1">
+ <title>Common WebDAV Clients</title>
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>DAV Client</entry>
+ <entry>Standalone</entry>
+ <entry>File-explorer</entry>
+ <entry>Filesystem</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
+ <entry>Windows Webfolders</entry>
+ <entry></entry>
+ <entry>x</entry>
+ <entry>x</entry>
+ </row>
+
+ <row>
+ <entry>WebDrive</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>x</entry>
+ </row>
+
+ <row>
+ <entry>NetDrive</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>x</entry>
+ </row>
+
+ <row>
+ <entry>Mac OS X</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>x</entry>
+ </row>
+
+ <row>
+ <entry>GNOME Nautilus</entry>
+ <entry></entry>
+ <entry>x</entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>KDE Konqueror</entry>
+ <entry></entry>
+ <entry>x</entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>Linux davfs2</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>x</entry>
+ </row>
+
+ <row>
+ <entry>Cadaver</entry>
+ <entry>x</entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>DAV Explorer</entry>
+ <entry>x</entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>Microsoft Office</entry>
+ <entry>x</entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>Dreamweaver</entry>
+ <entry>x</entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>Photoshop</entry>
+ <entry>x</entry>
+ <entry></entry>
+ <entry></entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ <sect2 id="svn.webdav.clients.windows">
+ <title>Windows Webfolders, WebDrive, Netdrive</title>
+
+ <para>Microsoft was one of the original backers of the WebDAV
+ specification, and first started shipping a client in Windows
+ 98, known as <quote>Webfolders</quote>. This client was also
+ shipped in Windows NT4 and 2000.</para>
+
+ <para>The original Webfolders client was an extension to
+ Explorer, the main GUI program used to browse filesystems. It
+ works well enough. In Windows 98, the feature might need to
+ be explicitly installed if Webfolders aren't already visible
+ inside <quote>My Computer</quote>. In Windows 2000, simply
+ add a new <quote>network place</quote>, enter the URL, and the
+ WebDAV share will pop up for browsing.</para>
+
+ <para>With the release of Windows XP, Microsoft started shipping
+ a new implementation of Webfolders, known as the <quote>WebDAV
+ mini-redirector</quote>. The new implementation is a
+ filesystem-level client, allowing WebDAV shares to be mounted
+ as drive letters. Unfortunately, this implementation is
+ incredibly buggy. The client usually tries to convert http
+ URLs (<literal>http://host/repos</literal>) into UNC share
+ notation (<literal>\\host\repos</literal>); it also often
+ tries to use Windows Domain authentication to respond to
+ basic-auth HTTP challenges, sending usernames as
+ <literal>HOST\username</literal>. These interoperability
+ problems are severe and documented in numerous places around
+ the web, to the frustration of many users. Even Greg Stein,
+ the original author of Apache's WebDAV module, recommends
+ against trying to use XP Webfolders against an Apache
+ server.</para>
+
+ <para>It turns out that the original
+ <quote>Explorer-only</quote> Webfolders implementation isn't
+ dead in XP, it's just buried. It's still possible to find it
+ by using this technique:</para>
+
+ <orderedlist>
+
+ <listitem>
+ <para>Go to 'Network Places'.</para>
+ </listitem>
<listitem>
- <para>If a Windows XP computer is a member of an NT Domain,
- then it seems to be unable to connect to the WebDAV share.
- It repeatedly asks for a name and password, even when the
- Apache server isn't issuing an authentication challenge!
- If the machine isn't part of an NT Domain, then the share
- is mounted without a problem.</para>
-
- <para>This problem seems to stem from changes in the way
- Windows XP creates WebFolder shortcuts (
- <filename>.lnk</filename> files). It sometimes replaces
- the URL of the WebDAV share with a Windows
- <quote>UNC</quote> (Universal Naming Convention) path
- instead. This causes Explorer to attempt a connection
- using SMB instead of HTTP.</para>
-
- <para>A workaround for this problem is to create the
- <filename>.lnk</filename> shortcut on a Windows 2000
- computer and then copy this shortcut to the Windows XP
- computer. It would probably also be possible to
- <quote>fix</quote> the shortcut using a HEX editor, if
- one were to reverse-engineer the <filename>.lnk</filename>
- file format.</para>
+ <para>Add a new network place.</para>
</listitem>
<listitem>
- <para>A file can't be opened for direct editing from the
- share; it always comes up read-only. The mod_dav_lock
- technique doesn't help, because WebFolders doesn't use the
- <literal>LOCK</literal> method at all. The previously
- mentioned <quote>copy, edit, re-copy</quote> method does
- work, however. The file on the share can be successfully
- overwritten by a locally edited copy.</para>
+ <para>When prompted, enter the URL of the repository, but
+ <emphasis>include a port number</emphasis> in the URL.
+ For example, <literal>http://host/repos</literal> would be
+ entered as <literal>http://host:80/repos</literal> instead.
+ </para>
</listitem>
+ <listitem>
+ <para>Respond to any authentication prompts.</para>
+ </listitem>
+
+ </orderedlist>
+
+ <para>There are a number of other rumored workarounds to the
+ problems, but none of them seem to work on all versions and
+ patchlevels of Windows XP. In our tests, only the previous
+ algorithm seems to work consistently on every system. The
+ general consensus of the WebDAV community is:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Avoid the new Webfolders implementation, use the old
+ one.</para>
+ </listitem>
+
+ <listitem>
+ <para>If you need real a real filesystem-level client for
+ Windows XP, then use either WebDrive or NetDrive.</para>
+ </listitem>
</itemizedlist>
+ <para>Both WebDrive and NetDrive are excellent commercial
+ products which allows a WebDAV share to be attached as drive
+ letters. We've had nothing but success with these products.
+ At the time of writing, WebDrive can be purchased from South
+ River Technologies (<ulink
+ url="http://www.southrivertech.com"/>). NetDrive ships with
+ Netware, is free of charge, and can be found by searching the
+ web for <quote>netdrive.exe</quote>. (If that sounds odd to
+ you, you're not alone. See this page on Novell's website:
+ <ulink
+ url="http://www.novell.com/coolsolutions/qna/999.html"/>)</para>
+
</sect2>
- <sect2 id="svn-ap-c-sect-3.2">
- <title>Mac OS X</title>
- <para>Apple's OS X operating system has an integrated WebDAV
- client. From the Finder, select the <quote>Connect to
- Server</quote> item from the Go menu. Enter a WebDAV URL,
- and it appears as a disk on the desktop, just like any file
- server.<footnote><para>Unix users can also run <command>mount
- -t webdav URL /mountpoint</command>.</para></footnote></para>
-
- <para>Unfortunately, this client refuses to work against an
- autoversioning mod_dav_svn because of its lack of
- <literal>LOCK</literal> support. Mac OS X discovers the
- missing <literal>LOCK</literal> ability during the initial
- HTTP <literal>OPTIONS</literal> feature exchange, and thus
- decides to mount the Subversion repository as a read-only
- share. After that, no write operations are possible at all.
- In order to mount the repository as a read-write share, you
- <emphasis>must</emphasis> use the mod_dav_lock trick discussed
- previously. Once locking seems to work, the share behaves
- very nicely: files can be opened directly in read/write mode,
- although each save operation will cause the client to do a
- <literal>PUT</literal> to a temporary location, a
- <literal>DELETE</literal> of original file, and a
- <literal>MOVE</literal> of the temporary resource to the
- original filename. That's three new Subversion revisions per
- save!</para>
-
- <para>One more word of warning: OS X's WebDAV client can be
- overly sensitive to HTTP redirects. If you're unable to mount
- the repository at all, you may need to enable the
- <literal>BrowserMatch</literal> directive in your
+ <sect2 id="svn.webdav.clients.macosx">
+ <title>Mac OS X</title>
+
+ <para>Apple's OS X operating system has an integrated
+ filesystem-level WebDAV client. From the Finder, select the
+ "Connect to Server" item from the Go menu. Enter a WebDAV
+ URL, and it appears as a disk on the desktop, just like any
+ other mounted volume.<footnote><para>From the Darwin terminal,
+ one can also run <literal>mount -t webdav URL
+ /mountpoint</literal></para></footnote>.</para>
+
+ <para>Note that if your mod_dav_svn is older than version 1.2,
+ OS X will refuse to mount the share as read-write; it will
+ appear as read-only. This is because the OS X insists on
+ locking support for read-write shares, and the ability to lock
+ files first appeared in Subversion 1.2.</para>
+
+ <para>One more word of warning: OS X's WebDAV client can
+ sometimes be overly sensitive to HTTP redirects. If OS X is
+ unable to mount the repository at all, you may need to enable
+ the BrowserMatch directive in the Apache server's
<filename>httpd.conf</filename>:</para>
- <screen>
+ <screen>
BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
</screen>
</sect2>
- <sect2 id="svn-ap-c-sect-3.3">
- <title>Unix: Nautilus 2</title>
+
+ <sect2 id="svn.webdav.clients.linux-de">
+ <title>Nautilus, Konqueror</title>
<para>Nautilus is the official file manager/browser for the
- GNOME desktop. Its main home page is at <systemitem
- class="url">http://www.gnome.org/projects/nautilus/</systemitem>.
- By simply typing a WebDAV URL into the Nautilus window,
- the DAV share appears like a local filesystem.</para>
+ GNOME desktop (<ulink url="http://www.gnome.org"/>), and
+ Konqueror is the manager/browser for KDE desktop (<ulink
+ url="http://www.kde.org"/>). Both of these applications have
+ an explorer-level WebDAV client built-in, and operate just
+ fine against an autoversioning repository.</para>
+
+ <para>In GNOME's Nautilus, from the File menu, select
+ <quote>Open location</quote> and enter the URL. The
+ repository should then be displayed like any other
+ filesystem.</para>
+
+ <para>In KDE's Konqueror, you need to use the
+ <literal>webdav://</literal> scheme when entering the URL in
+ the location bar. If you enter an <literal>http://</literal>
+ URL, Konqueror will behave like an ordinary web browser.
+ You'll likely see the generic HTML directory listing produced
+ by mod_dav_svn. By entering
+ <literal>webdav://host/repos</literal> instead of
+ <literal>http://host/repos</literal>, Konqueror becomes a
+ WebDAV client and displays the repository as a
+ filesystem.</para>
- <para>In general, Nautilus 2 works reasonably well against an
- autoversioning mod_dav_svn, with the following caveats:</para>
+ </sect2>
- <itemizedlist>
+ <sect2 id="svn.webdav.clients.linux-fs">
+ <title>Linux davfs2</title>
- <listitem>
- <para>Any files opened directly from the share are treated
- as read-only. Even the mod_dav_lock trick seems to have
- no effect. It seems that Nautilus never issues the
- <literal>LOCK</literal> method at all. The <quote>copy
- locally, edit, copy back</quote> trick does work, however.
- Unfortunately, Nautilus overwrites the old file by issuing
- a <literal>DELETE</literal> first, which creates an extra
- revision.</para>
- </listitem>
+ <para>Linux davfs2 is a filesystem module for the Linux kernel,
+ whose development is located at <ulink
+ url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
+ network share can be mounted with the usual Linux mount
+ command:</para>
- <listitem>
- <para>When overwriting or creating a file , Nautilus first
- does a <literal>PUT</literal> of an empty file, then
- overwrites it with a second <literal>PUT</literal>. This
- creates two Subversion filesystem revisions, rather than
- one.</para>
- </listitem>
+ <screen>
+mount.davfs http://host/repos /mnt/dav
+</screen>
- <listitem>
- <para>When deleting a collection, it issues an HTTP
- <literal>DELETE</literal> on each individual child instead
- of on the collection itself. This creates a whole bunch of
- new revisions.</para>
- </listitem>
+ </sect2>
- </itemizedlist>
+ <sect2 id="svn.webdav.clients.free-apps">
+ <title>Cadaver, DAV Explorer</title>
- </sect2>
+ <para>Cadaver is a bare-bones Unix commandline program for
+ browsing and changing WebDAV shares. Like the Subversion
+ client, it uses the neon HTTP library — not
+ surprisingly, both neon and cadaver are written by the same
+ author. Cadaver is free sofware (GPL license) and is
+ available at <ulink
+ url="http://www.webdav.org/cadaver/"/>.</para>
+
+ <para>Using cadaver is similar to using a commandline FTP
+ program, and thus it's extremely useful for basic WebDAV
+ debugging. It can be used to upload or download files in a
+ pinch, and also to examine properties, copy, move, lock or
+ unlock files:</para>
+
+ <screen>
+$ cadaver http://host/repos
+dav:/repos/> ls
+Listing collection `/repos/': succeeded.
+Coll: > foobar 0 May 10 16:19
+ > playwright.el 2864 May 4 16:18
+ > proofbypoem.txt 1461 May 5 15:09
+ > westcoast.jpg 66737 May 5 15:09
+
+dav:/repos/> put README
+Uploading README to `/repos/README':
+Progress: [=============================>] 100.0% of 357 bytes succeeded.
+
+dav:/repos/> get proofbypoem.txt
+Downloading `/repos/proofbypoem.txt' to proofbypoem.txt:
+Progress: [=============================>] 100.0% of 1461 bytes succeeded.
+</screen>
- <sect2 id="svn-ap-c-sect-3.4">
- <title>Linux davfs2</title>
+ <para>DAV Explorer is another standalone WebDAV client, written
+ in Java. It's under a free Apache-like license and is
+ available at <ulink url="http://www.ics.uci.edu/~webdav/"/>.
+ DAV Explorer does everything cadaver does, but has the
+ advantages of being portable and being more user-friendly GUI
+ application. It's also one of the first clients to support
+ the new WebDAV Access Control Protocol (RFC 3744).</para>
+
+ <para>Of course, DAV Explorer's ACL support is useless in this
+ case, since mod_dav_svn doesn't support it. The fact that
+ both Cadaver and DAV Explorer support some limited DeltaV
+ commands isn't particularly useful either, since they don't
+ allow <literal>MKACTIVITY</literal> requests. But it's not
+ relevant anyway; we're assuming all of these clients are
+ operating against an autoversioning repository.</para>
- <para>Linux davfs2 is a filesystem module for the Linux kernel,
- whose development is located at <systemitem
- class="url">http://dav.sourceforge.net/</systemitem>. Once
- installed, a WebDAV network share can be mounted with the
- usual Linux <command>mount</command> command.</para>
-
- <para>The word on the street is that this DAV client doesn't
- work at all with mod_dav_svn's autoversioning. Every single
- attempt to write to the server is preceded by a
- <literal>LOCK</literal> request, which mod_dav_svn doesn't
- support. At this time, there is no data indicating whether
- the use of mod_dav_lock resolves this problem.</para>
+ </sect2>
+
+ <sect2 id="svn.webdav.clients.win-apps">
+ <title>Microsoft Office, Dreamweaver, Photoshop</title>
+
+ <para>These are large well-known applications that contain
+ integrated WebDAV client functionality. They're able to
+ directly open a URL, save to a URL, and tend to make heavy use
+ of WebDAV locks when editing a file.</para>
+
+ <para>It appears that only the Windows versions of these
+ programs support WebDAV. On Mac OS X, the
+ <quote>File->Open</quote> dialog box doesn't allow one to type
+ a path or URL at all. It's likely that the the WebDAV
+ features were deliberately left out of Macintosh versions of
+ these programs, since OS X already provides such excellent
+ low-level filesystem support for WebDAV.</para>
</sect2>
Modified: trunk/src/nb/book/appd.xml
==============================================================================
--- trunk/src/nb/book/appd.xml (original)
+++ trunk/src/nb/book/appd.xml Thu May 26 06:37:13 2005
@@ -1,11 +1,11 @@
-<appendix id="svn-ap-d">
+<appendix id="svn.3rdparty">
<title>Third Party Tools</title>
<simplesect>
<para>Subversion's modular design (covered in <xref
- linkend="svn-ch-8-sect-1"/>) and the availability of language
- bindings (as described in <xref linkend="svn-ch-8-sect-2.3"/>)
+ linkend="svn.developer.layerlib"/>) and the availability of language
+ bindings (as described in <xref linkend="svn.developer.usingapi.otherlangs"/>)
make it a likely candidate for use as an extension or backend to
other pieces of software. In this appendix, we'll briefly
introduce you to some of the many third-party tools that are
@@ -20,7 +20,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 1: CLIENTS AND PLUGINS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ap-d-sect-1">
+ <sect1 id="svn.3rdparty.clients-and-plugins">
<title>Clients and Plugins</title>
<variablelist>
@@ -121,7 +121,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 2: LANGUAGE BINDINGS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ap-d-sect-2">
+ <sect1 id="svn.3rdparty.bindings">
<title>Language Bindings</title>
<variablelist>
@@ -153,7 +153,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 3: REPOSITORY CONVERTERS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ap-d-sect-3">
+ <sect1 id="svn.3rdparty.repos-converters">
<title>Repository Converters</title>
<variablelist>
@@ -182,7 +182,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 4: HIGHER LEVEL TOOLS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ap-d-sect-4">
+ <sect1 id="svn.3rdparty.higher-level">
<title>Higher Level Tools</title>
<variablelist>
@@ -238,7 +238,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 5: REPOSITORY BROWSING TOOLS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ap-d-sect-5">
+ <sect1 id="svn.3rdparty.repos-browsers">
<title>Repository Browsing Tools</title>
<variablelist>
Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml (original)
+++ trunk/src/nb/book/book.xml Thu May 26 06:37:13 2005
@@ -55,7 +55,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
- <subtitle>For Subversion 1.1</subtitle>
+ <subtitle>For Subversion 1.2</subtitle>
<!-- @ENGLISH {{{
<subtitle>(book compiled from &svn.version;)</subtitle>
@ENGLISH }}} -->
Modified: trunk/src/nb/book/ch00.xml
==============================================================================
--- trunk/src/nb/book/ch00.xml (original)
+++ trunk/src/nb/book/ch00.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<preface id="svn-ch-0">
+<preface id="svn.preface">
<!-- @ENGLISH {{{
<title>Preface</title>
@ENGLISH }}} -->
@@ -90,7 +90,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-1">
+ <sect1 id="svn.preface.audience">
<!-- @ENGLISH {{{
<title>Audience</title>
@@ -179,7 +179,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-2">
+ <sect1 id="svn.preface.howread">
<!-- @ENGLISH {{{
<title>How to Read this Book</title>
@ENGLISH }}} -->
@@ -317,7 +317,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-3">
+ <sect1 id="svn.preface.conventions">
<!-- @ENGLISH {{{
<title>Conventions Used in This Book</title>
@ENGLISH }}} -->
@@ -331,7 +331,7 @@
brukt i denne boken.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-0-sect-3.1">
+ <sect2 id="svn.preface.conventions.typo">
<!-- @ENGLISH {{{
<title>Typographic Conventions</title>
@ENGLISH }}} -->
@@ -385,7 +385,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-0-sect-3.2">
+ <sect2 id="svn.preface.conventions.icons">
<!-- @ENGLISH {{{
<title>Icons</title>
@ENGLISH }}} -->
@@ -436,7 +436,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-4">
+ <sect1 id="svn.preface.organization">
<!-- @ENGLISH {{{
<title>Organization of This Book</title>
@ENGLISH }}} -->
@@ -721,9 +721,308 @@
</sect1>
<!-- ================================================================= -->
+ <!-- ======================== SECTION 4b ============================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.preface.new-1-1">
+ <!-- @ENGLISH {{{
+ <title>New in Subversion 1.1</title>
+ @ENGLISH }}} -->
+ <title>Nytt i Subversion 1.1</title>
+
+ <!-- @ENGLISH {{{
+ <para>This edition of the book has been updated to cover new
+ features and behavioral changes in Subversion 1.1. Here's a
+ brief list of pointers to major 1.1 changes.</para>
+ @ENGLISH }}} -->
+ <para>Denne utgaven av boken er blitt oppdatert for å dekke nye
+ funksjoner og forandringer i oppførselen for Subversion 1.1.
+ Her er en rask oversikt over pekere til store forandringer i
+ 1.1.</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Non-database repositories</term>
+ <listitem>
+ <para>It's now possible to create repositories that don't
+ use a BerkeleyDB database. Instead, these new
+ repositories store data in the ordinary filesystem using a
+ custom file format. These repositories aren't susceptible
+ to <quote>wedging</quote>, but also aren't as well-tested
+ as Berkeley DB repositories. See <xref
+ linkend="svn.reposadmin.basics.backends"/>.</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Depot uten database</term>
+ <listitem>
+ <para>Det er nå mulig å opprette depot som ikke bruker en
+ Berkeley DB database.
+ Istedenfor lagrer disse nye depotene data i det ordinære
+ filsystemet ved å bruke et tilpasset format.
+ Disse depotene er ikke sårbare for <!-- ¤ wedge = kile
+ (subst), kile fast (verb). Kanskje det går an å bruke en
+ variasjon av det. «Fastkilt»? --><quote>wedging</quote>, men
+ er heller ikke så gjennomtestet som Berkeley DB-depot.
+ Se <xref linkend="svn.reposadmin.basics.backends"/>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Symbolic link versioning</term>
+ <listitem>
+ <para>Unix users can now create symbolic links and place
+ them under version control with the <command>svn
+ add</command> command. See <xref
+ linkend="svn.ref.svn.c.add"/> and <xref
+ linkend="svn.advanced.props.special.special"/>.</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Versjonering av symbolske lenker</term>
+ <listitem>
+ <para>Unixbrukere kan nå opprette symbolske lenker og plassere
+ dem under versjonskontroll med <command>svn
+ add</command>-kommandoen.
+ Se <xref linkend="svn.ref.svn.c.add"/> og <xref
+ linkend="svn.advanced.props.special.special"/>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Client follows copies and renames</term>
+ <listitem>
+ <para>Branches (copies) of files and directories maintain
+ historical connections to their source, but in Subversion
+ 1.0 only <command>svn log</command> ever followed that
+ copy/rename history, not other commands like <command>svn
+ diff</command>, <command>svn merge</command>, <command>svn
+ list</command>, or <command>svn cat</command>. In
+ Subversion 1.1, all client subcommands now transparently
+ trace backwards through copies and renames when examining
+ older versions of files and directories.</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Klienten følger kopieringer og navneskifter</term>
+ <listitem>
+ <para>Forgreninger (kopier) av filer og kataloger
+ vedlikeholder historiske forbindelser til kilden deres, men
+ i Subversion 1.0 fulgte bare <command>svn log</command>
+ denne kopierings/navneskiftehistorien, ikke andre kommandoer
+ som <command>svn diff</command>, <command>svn
+ merge</command>, <command>svn list</command> eller
+ <command>svn cat</command>.
+ I Subversion 1.1 tråler alle delkommandoene seg bakover
+ gjennom kopieringer og navneskifter ved undersøkelser av
+ eldre versjoner av filer og kataloger.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Client auto-escaping of URIs and IRIs</term>
+ <listitem>
+ <para>In the 1.0 command-line client, users had to escape
+ URLs manually. The client only accepted <quote>legally
+ correct</quote> URLs, such as
+ <literal>http://host/path%20with%20space/project/espa%F1a</literal>.
+ The 1.1 command-line client now knows how to do what
+ web-browsers have been doing for long time: it
+ auto-escapes characters like spaces and accented letters,
+ as long as the user places the
+ URL in quotes to protect characters from the shell:
+ <literal>"http://host/path with
+ space/project/españa"</literal></para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Autobeskytting i klienten av URI-er og IRI-er</term>
+ <listitem>
+ <para>I kommandolinjeklienten for 1.0 måtte brukere beskytte
+ (<quote>escape</quote>) URL-er manuelt.
+ Klienten aksepterte bare <quote>lovlige og korrekte</quote>
+ URL-er, som
+ <literal>http://tjener/sti%20med%20mellomrom/prosjekt/espa%F1a</literal>.
+ Kommandolinjeklienten for 1.1 vet nå hvordan den skal gjøre
+ det som nettlesere har gjort i lang tid:
+ Den autobeskytter tegn som mellomrom og bokstaver med
+ aksent, så lenge brukeren plasserer URL-en i hermetegn for å
+ beskytte tegn fra skallet:
+ <literal>"http://tjener/sti med
+ mellomrom/prosjekt/españa"</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Localized user messages</term>
+ <listitem>
+ <para>Subversion 1.1 is now using
+ <literal>gettext()</literal> to display translated error,
+ informational, and help messages to the user. There are
+ currently translations for German, Spanish, Polish,
+ Swedish, Traditional Chinese, Japanese, Brazilian
+ Portuguese and Norwegian Bokmal. To localize your
+ Subversion client, just set your shell's LANG environment
+ variable to a supported locale value (for example,
+ <literal>de_DE</literal>).</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Lokaliserte brukermeldinger</term>
+ <listitem>
+ <para>Subversion 1.1 bruker nå <literal>gettext()</literal>
+ for å vise oversatte feil-, informasjons- og hjelpemeldinger
+ til brukeren.
+ Det er foreløpige oversettelser for tysk, spansk, polsk,
+ svensk, tradisjonell kinesisk, japansk, portugisisk (Brasil)
+ og norsk (bokmål).
+ For å få Subversion til å bruke en av oversettelsene, sett
+ skallets LANG-variabel til en støttet verdi (for eksempel
+ <literal>nb_NO</literal>).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Shareable working copies</term>
+ <listitem>
+ <para>There have been historical problems with permissions
+ when multiple users share a working copy, which are
+ believed to be fixed now.</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Delbare arbeidskopier</term>
+ <listitem>
+ <para>Det har vært historiske problemer med
+ tilgangsrettigheter når flere brukere deler en arbeidskopi,
+ det ser ut til å være ordnet nå.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term><literal>store-passwords</literal> run-time variable</term>
+ <listitem>
+ <para>This is a new runtime variable which only disables
+ password caching, so that server certificates can still be
+ cached. See <xref linkend="svn.advanced.confarea.opts.config"/>.</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term><literal>store-passwords</literal> kjørevariabel</term>
+ <listitem>
+ <para>Dette er en ny variabel for bruk under kjøring som bare
+ kobler ut lagring av passord, så tjenersertifikater fortsatt
+ kan lagres. Se <xref
+ linkend="svn.advanced.confarea.opts.config"/>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>Optimizations and bug fixes</term>
+ <listitem>
+ <para>The <command>svn checkout</command>, <command>svn
+ update</command>, <command>svn status</command>, and
+ <command>svn blame</command> commands are faster. More
+ than fifty small bugs have been fixed, all described in
+ the Subversion project's CHANGES file (at <systemitem
+ class="url">http://svn.collab.net/repos/svn/trunk/CHANGES
+ </systemitem>).</para>
+ </listitem>
+ @ENGLISH }}} -->
+ <term>Optimaliseringer og feilrettinger</term>
+ <listitem>
+ <para>Kommandoene <command>svn checkout</command>,
+ <command>svn update</command>, <command>svn status</command>
+ og <command>svn blame</command> er raskere.
+ Mer enn femti små feil er blitt fikset, alle beskrevet i
+ Subversionprosjektets CHANGES-fil (på <systemitem
+ class="url">http://svn.collab.net/repos/svn/trunk/CHANGES
+ </systemitem>).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <!-- @ENGLISH {{{
+ <term>New command switches</term>
+ @ENGLISH }}} -->
+ <term>Nye kommandobrytere</term>
+ <listitem>
+ <itemizedlist>
+ <!-- @ENGLISH {{{
+ <listitem><para><command>svn blame -ﳢ-verbose</command>: see
+ <xref linkend="svn.ref.svn.c.blame"/>.
+ </para></listitem>
+
+ <listitem><para><command>svn export -ﳢ-native-eol EOL</command>: see
+ <xref linkend="svn.ref.svn.c.export"/>.
+ </para></listitem>
+
+ <listitem><para><command>svn add -ﳢ-force</command>: see
+ <xref linkend="svn.ref.svn.c.add"/>.
+ </para></listitem>
+
+ <listitem><para><command>svnadmin dump -ﳢ-deltas</command>: see
+ <xref linkend="svn.reposadmin.maint.migrate"/>.
+ </para></listitem>
+
+ <listitem><para><command>svnadmin create -ﳢ-fs-type TYPE</command>: see
+ <xref linkend="svn.ref.svnadmin.c.create"/>.
+ </para></listitem>
+
+ <listitem><para><command>svnadmin recover -ﳢ-wait</command>: see
+ <xref linkend="svn.ref.svnadmin.c.recover"/>.
+ </para></listitem>
+
+ <listitem><para><command>svnserve -ﳢ-tunnel-user=NAME</command>: see
+ <xref linkend="svn.ref.svnserve.sw"/>.
+ </para></listitem>
+ @ENGLISH }}} -->
+ <listitem>
+ <para><command>svn blame --verbose</command>: Se <xref
+ linkend="svn.ref.svn.c.blame"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svn export --native-eol EOL</command>: Se
+ <xref linkend="svn.ref.svn.c.export"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svn add --force</command>: Se <xref
+ linkend="svn.ref.svn.c.add"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svnadmin dump --deltas</command>: Se <xref
+ linkend="svn.reposadmin.maint.migrate"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svnadmin create --fs-type TYPE</command>:
+ Se <xref linkend="svn.ref.svnadmin.c.create"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svnadmin recover --wait</command>: Se <xref
+ linkend="svn.ref.svnadmin.c.recover"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para><command>svnserve --tunnel-user=NAME</command>: Se
+ <xref linkend="svn.ref.svnserve.sw"/>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </sect1>
+
+ <!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-5">
+ <sect1 id="svn.preface.free">
<!-- @ENGLISH {{{
<title>This Book is Free</title>
@ENGLISH }}} -->
@@ -733,7 +1032,7 @@
<para>This book started out as bits of documentation written by
Subversion project developers, which were then coalesced into a
single work and rewritten. As such, it has always been under a
- free license. (See <xref linkend="svn-copyright"/>.) In fact,
+ free license. (See <xref linkend="svn.copyright"/>.) In fact,
the book was written in the public eye, as a part of Subversion.
This means two things:</para>
@ENGLISH }}} -->
@@ -741,7 +1040,7 @@
Subversions prosjektutviklere, og deretter satt sammen til et
enkeltstående verk og omskrevet.
Som sådan har den alltid hatt en fri lisens.
- (Se <xref linkend="svn-copyright"/>.)
+ (Se <xref linkend="svn.copyright"/>.)
Boken ble faktisk skrevet under offentlig oppsyn, som en del av
Subversion.
Dette betyr to ting:</para>
@@ -763,7 +1062,7 @@
rather than distribute your own private version of this
book, we'd much rather you send feedback and patches to the
Subversion developer community. See <xref
- linkend="svn-ch-8-sect-6"/> to learn about joining this
+ linkend="svn.developer.contrib"/> to learn about joining this
community.</para>
@ENGLISH }}} -->
<para>Du kan distribuere og gjøre forandringer til denne boken
@@ -771,8 +1070,8 @@
Selvfølgelig, istedenfor at du distribuerer din egen private
versjon av boken, vil vi heller at du sender respons og
patcher til utviklermiljøet for Subversion.
- Se <xref linkend="svn-ch-8-sect-6"/> for å lære hvordan du
- deltar i dette fellesskapet.</para>
+ Se <xref linkend="svn.developer.contrib"/> for å lære hvordan
+ du deltar i dette fellesskapet.</para>
</listitem>
</itemizedlist>
@@ -797,7 +1096,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-6">
+ <sect1 id="svn.preface.acks">
<!-- @ENGLISH {{{
<title>Acknowledgments</title>
@ENGLISH }}} -->
@@ -882,7 +1181,7 @@
Blair Zajac, og hele Subversion-fellesskapet.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-0-sect-6.1">
+ <sect2 id="svn.preface.acks.sussman">
<!-- @ENGLISH {{{
<title>From Ben Collins-Sussman</title>
@ENGLISH }}} -->
@@ -947,7 +1246,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-0-sect-6.2">
+ <sect2 id="svn.preface.acks.fitz">
<!-- @ENGLISH {{{
<title>From Brian W. Fitzpatrick</title>
@ENGLISH }}} -->
@@ -1029,7 +1328,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-0-sect-6.3">
+ <sect2 id="svn.preface.acks.cmpilato">
<!-- @ENGLISH {{{
<title>From C. Michael Pilato</title>
@ENGLISH }}} -->
@@ -1110,299 +1409,6 @@
</sect1>
- <!-- ================================================================= -->
- <!-- ======================== SECTION 7 ============================== -->
- <!-- ================================================================= -->
- <sect1 id="svn-ch-0-sect-7">
- <!-- @ENGLISH {{{
- <title>New in Subversion 1.1</title>
- @ENGLISH }}} -->
- <title>Nytt i Subversion 1.1</title>
-
- <!-- @ENGLISH {{{
- <para>This edition of the book has been updated to cover new
- features and behavioral changes in Subversion 1.1. Here's a
- brief list of pointers to major 1.1 changes.</para>
- @ENGLISH }}} -->
- <para>Denne utgaven av boken er blitt oppdatert for å dekke nye
- funksjoner og forandringer i oppførselen for Subversion 1.1.
- Her er en rask oversikt over pekere til store forandringer i
- 1.1.</para>
-
- <variablelist>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Non-database repositories</term>
- <listitem>
- <para>It's now possible to create repositories that don't
- use a BerkeleyDB database. Instead, these new
- repositories store data in the ordinary filesystem using a
- custom file format. These repositories aren't susceptible
- to <quote>wedging</quote>, but also aren't as well-tested
- as Berkeley DB repositories. See <xref
- linkend="svn-ch-5-sect-1.3"/>.</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Depot uten database</term>
- <listitem>
- <para>Det er nå mulig å opprette depot som ikke bruker en
- Berkeley DB database.
- Istedenfor lagrer disse nye depotene data i det ordinære
- filsystemet ved å bruke et tilpasset format.
- Disse depotene er ikke sårbare for <!-- ¤ wedge = kile
- (subst), kile fast (verb). Kanskje det går an å bruke en
- variasjon av det. «Fastkilt»? --><quote>wedging</quote>, men
- er heller ikke så gjennomtestet som Berkeley DB-depot.
- Se <xref linkend="svn-ch-5-sect-1.3"/>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Symbolic link versioning</term>
- <listitem>
- <para>Unix users can now create symbolic links and place
- them under version control with the <command>svn
- add</command> command. See <xref
- linkend="svn-ch-9-sect-1.2-re-add"/> and <xref
- linkend="svn-ch-7-sect-2.3.7"/>.</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Versjonering av symbolske lenker</term>
- <listitem>
- <para>Unixbrukere kan nå opprette symbolske lenker og plassere
- dem under versjonskontroll med <command>svn
- add</command>-kommandoen.
- Se <xref linkend="svn-ch-9-sect-1.2-re-add"/> og <xref
- linkend="svn-ch-7-sect-2.3.7"/>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Client follows copies and renames</term>
- <listitem>
- <para>Branches (copies) of files and directories maintain
- historical connections to their source, but in Subversion
- 1.0 only <command>svn log</command> ever followed that
- copy/rename history, not other commands like <command>svn
- diff</command>, <command>svn merge</command>, <command>svn
- list</command>, or <command>svn cat</command>. In
- Subversion 1.1, all client subcommands now transparently
- trace backwards through copies and renames when examining
- older versions of files and directories.</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Klienten følger kopieringer og navneskifter</term>
- <listitem>
- <para>Forgreninger (kopier) av filer og kataloger
- vedlikeholder historiske forbindelser til kilden deres, men
- i Subversion 1.0 fulgte bare <command>svn log</command>
- denne kopierings/navneskiftehistorien, ikke andre kommandoer
- som <command>svn diff</command>, <command>svn
- merge</command>, <command>svn list</command> eller
- <command>svn cat</command>.
- I Subversion 1.1 tråler alle delkommandoene seg bakover
- gjennom kopieringer og navneskifter ved undersøkelser av
- eldre versjoner av filer og kataloger.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Client auto-escaping of URIs and IRIs</term>
- <listitem>
- <para>In the 1.0 command-line client, users had to escape
- URLs manually. The client only accepted <quote>legally
- correct</quote> URLs, such as
- <literal>http://host/path%20with%20space/project/espa%F1a</literal>.
- The 1.1 command-line client now knows how to do what
- web-browsers have been doing for long time: it
- auto-escapes characters like spaces and accented letters,
- as long as the user places the
- URL in quotes to protect characters from the shell:
- <literal>"http://host/path with
- space/project/españa"</literal></para>
- </listitem>
- @ENGLISH }}} -->
- <term>Autobeskytting i klienten av URI-er og IRI-er</term>
- <listitem>
- <para>I kommandolinjeklienten for 1.0 måtte brukere beskytte
- (<quote>escape</quote>) URL-er manuelt.
- Klienten aksepterte bare <quote>lovlige og korrekte</quote>
- URL-er, som
- <literal>http://tjener/sti%20med%20mellomrom/prosjekt/espa%F1a</literal>.
- Kommandolinjeklienten for 1.1 vet nå hvordan den skal gjøre
- det som nettlesere har gjort i lang tid:
- Den autobeskytter tegn som mellomrom og bokstaver med
- aksent, så lenge brukeren plasserer URL-en i hermetegn for å
- beskytte tegn fra skallet:
- <literal>"http://tjener/sti med
- mellomrom/prosjekt/españa"</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Localized user messages</term>
- <listitem>
- <para>Subversion 1.1 is now using
- <literal>gettext()</literal> to display translated error,
- informational, and help messages to the user. There are
- currently translations for German, Spanish, Polish,
- Swedish, Traditional Chinese, Japanese, Brazilian
- Portuguese and Norwegian Bokmal. To localize your
- Subversion client, just set your shell's LANG environment
- variable to a supported locale value (for example,
- <literal>de_DE</literal>).</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Lokaliserte brukermeldinger</term>
- <listitem>
- <para>Subversion 1.1 bruker nå <literal>gettext()</literal>
- for å vise oversatte feil-, informasjons- og hjelpemeldinger
- til brukeren.
- Det er foreløpige oversettelser for tysk, spansk, polsk,
- svensk, tradisjonell kinesisk, japansk, portugisisk (Brasil)
- og norsk (bokmål).
- For å få Subversion til å bruke en av oversettelsene, sett
- skallets LANG-variabel til en støttet verdi (for eksempel
- <literal>nb_NO</literal>).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Shareable working copies</term>
- <listitem>
- <para>There have been historical problems with permissions
- when multiple users share a working copy, which are
- believed to be fixed now.</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Delbare arbeidskopier</term>
- <listitem>
- <para>Det har vært historiske problemer med
- tilgangsrettigheter når flere brukere deler en arbeidskopi,
- det ser ut til å være ordnet nå.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term><literal>store-passwords</literal> run-time variable</term>
- <listitem>
- <para>This is a new runtime variable which only disables
- password caching, so that server certificates can still be
- cached. See <xref linkend="svn-ch-7-sect-1.3.2"/>.</para>
- </listitem>
- @ENGLISH }}} -->
- <term><literal>store-passwords</literal> kjørevariabel</term>
- <listitem>
- <para>Dette er en ny variabel for bruk under kjøring som bare
- kobler ut lagring av passord, så tjenersertifikater fortsatt
- kan lagres. Se <xref linkend="svn-ch-7-sect-1.3.2"/>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Optimizations and bug fixes</term>
- <listitem>
- <para>The <command>svn checkout</command>, <command>svn
- update</command>, <command>svn status</command>, and
- <command>svn blame</command> commands are faster. More
- than fifty small bugs have been fixed, all described in
- the Subversion project's CHANGES file (at <systemitem
- class="url">http://svn.collab.net/repos/svn/trunk/CHANGES
- </systemitem>).</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Optimaliseringer og feilrettinger</term>
- <listitem>
- <para>Kommandoene <command>svn checkout</command>,
- <command>svn update</command>, <command>svn status</command>
- og <command>svn blame</command> er raskere.
- Mer enn femti små feil er blitt fikset, alle beskrevet i
- Subversionprosjektets CHANGES-fil (på <systemitem
- class="url">http://svn.collab.net/repos/svn/trunk/CHANGES
- </systemitem>).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>New command switches</term>
- @ENGLISH }}} -->
- <term>Nye kommandobrytere</term>
- <listitem>
- <itemizedlist>
- <!-- @ENGLISH {{{
- <listitem><para><command>svn blame -ﳢ-verbose</command>: see
- <xref linkend="svn-ch-9-sect-1.2-re-blame"/>.
- </para></listitem>
-
- <listitem><para><command>svn export -ﳢ-native-eol EOL</command>: see
- <xref linkend="svn-ch-9-sect-1.2-re-export"/>.
- </para></listitem>
-
- <listitem><para><command>svn add -ﳢ-force</command>: see
- <xref linkend="svn-ch-9-sect-1.2-re-add"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin dump -ﳢ-deltas</command>: see
- <xref linkend="svn-ch-5-sect-3.5"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin create -ﳢ-fs-type TYPE</command>: see
- <xref linkend="svn-ch-9-sect-2.2-re-create"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin recover -ﳢ-wait</command>: see
- <xref linkend="svn-ch-9-sect-2.2-re-recover"/>.
- </para></listitem>
-
- <listitem><para><command>svnserve -ﳢ-tunnel-user=NAME</command>: see
- <xref linkend="svn-ch-9-sect-4.1"/>.
- </para></listitem>
- @ENGLISH }}} -->
- <listitem><para><command>svn blame --verbose</command>: Se
- <xref linkend="svn-ch-9-sect-1.2-re-blame"/>.
- </para></listitem>
-
- <listitem><para><command>svn export --native-eol
- EOL</command>: Se <xref
- linkend="svn-ch-9-sect-1.2-re-export"/>.
- </para></listitem>
-
- <listitem><para><command>svn add --force</command>: Se <xref
- linkend="svn-ch-9-sect-1.2-re-add"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin dump --deltas</command>:
- Se <xref linkend="svn-ch-5-sect-3.5"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin create --fs-type
- TYPE</command>: Se <xref
- linkend="svn-ch-9-sect-2.2-re-create"/>.
- </para></listitem>
-
- <listitem><para><command>svnadmin recover --wait</command>:
- Se <xref linkend="svn-ch-9-sect-2.2-re-recover"/>.
- </para></listitem>
-
- <listitem><para><command>svnserve
- --tunnel-user=NAME</command>: Se <xref
- linkend="svn-ch-9-sect-4.1"/>.
- </para></listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </sect1>
</preface>
<!--
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-1">
+<chapter id="svn.intro">
<!-- @ENGLISH {{{
<title>Introduction</title>
@@ -43,7 +43,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-1">
+ <sect1 id="svn.intro.whatis">
<!-- @ENGLISH {{{
<title>What is Subversion?</title>
@@ -131,7 +131,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-2">
+ <sect1 id="svn.intro.history">
<!-- @ENGLISH {{{
<title>Subversion's History</title>
@@ -285,7 +285,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-3">
+ <sect1 id="svn.intro.features">
<!-- @ENGLISH {{{
<title>Subversion's Features</title>
@@ -299,7 +299,7 @@
familiar with CVS, you may not understand all of these features.
And if you're not familiar with version control at all, your
eyes may glaze over unless you first read <xref
- linkend="svn-ch-2"/>, in which we provide a gentle introduction
+ linkend="svn.basic"/>, in which we provide a gentle introduction
to version control in general.</para>
@ENGLISH }}} -->
<para>Når vi diskuterer funksjonalitetene som Subversion bringer til
@@ -310,7 +310,7 @@
disse funksjonene.
Og hvis du ikke er kjent med versjonskontroll i det hele tatt, kan
nok blikket sløves såfremt du ikke har lest <xref
- linkend="svn-ch-2"/>, hvor vi foretar en forsiktig introduksjon
+ linkend="svn.basic"/>, hvor vi foretar en forsiktig introduksjon
til versjonskontroll generelt.</para>
<!-- @ENGLISH {{{
@@ -531,7 +531,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-4">
+ <sect1 id="svn.intro.architecture">
<!-- @ENGLISH {{{
<title>Subversion's Architecture</title>
@@ -539,14 +539,15 @@
<title>Subversions arkitektur</title>
<!-- @ENGLISH {{{
- <para><xref linkend="svn-ch-1-dia-1"/> illustrates what one might
+ <para><xref linkend="svn.intro.architecure.dia-1"/> illustrates what one might
call a <quote>mile-high</quote> view of Subversion's
design.</para>
@ENGLISH }}} -->
- <para><xref linkend="svn-ch-1-dia-1"/> illustrerer hva man kan kalle
- en <quote>milehøy</quote> oversikt over Subversions design.</para>
+ <para><xref linkend="svn.intro.architecure.dia-1"/> illustrerer hva
+ man kan kalle en <quote>milehøy</quote> oversikt over Subversions
+ design.</para>
- <figure id="svn-ch-1-dia-1">
+ <figure id="svn.intro.architecure.dia-1">
<!-- @ENGLISH {{{
<title>Subversion's Architecture</title>
@ENGLISH }}} -->
@@ -583,7 +584,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-5">
+ <sect1 id="svn.intro.install">
<!-- @ENGLISH {{{
<title>Installing Subversion</title>
@@ -643,7 +644,7 @@
If you plan to work on Subversion itself, you can use your
client program to grab the latest, bleeding-edge source code.
This is documented in <xref
- linkend="svn-ch-8-sect-6.2"/>.</para>
+ linkend="svn.developer.contrib.get-code"/>.</para>
@ENGLISH }}} -->
<para>Du kan også bygge Subversion direkte fra kildekode.
Siste versjon av programmet kan hentes fra Subversions hjemmeside.
@@ -659,14 +660,15 @@
har alle pakkene dokumentert i <filename>INSTALL</filename>-filen.
Hvis du planlegger å arbeide på selve Subversion, kan du bruke
svn-klienten din for å hente den siste rykende ferske kildekoden.
- Dette er dokumentert i <xref linkend="svn-ch-8-sect-6.2"/>.</para>
+ Dette er dokumentert i <xref
+ linkend="svn.developer.contrib.get-code"/>.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-6">
+ <sect1 id="svn.intro.components">
<!-- @ENGLISH {{{
<title>Subversion's Components</title>
@@ -792,7 +794,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 7 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-1-sect-7">
+ <sect1 id="svn.intro.quickstart">
<!-- @ENGLISH {{{
<title>A Quick Start</title>
@@ -823,12 +825,12 @@
<!-- @ENGLISH {{{
<para>If you're new to the entire concept of version control or to
the <quote>copy-modify-merge</quote> model used by both CVS and
- Subversion, then you should read <xref linkend="svn-ch-2"/>
+ Subversion, then you should read <xref linkend="svn.basic"/>
before going any further.</para>
@ENGLISH }}} -->
<para>Hvis du er ny innen hele konseptet med versjonskontroll eller
til <quote>kopier-rediger-flett</quote>-modellen brukt av både CVS
- og Subversion, bør du lese <xref linkend="svn-ch-2"/> før du går
+ og Subversion, bør du lese <xref linkend="svn.basic"/> før du går
videre.</para>
<note>
@@ -883,7 +885,7 @@
directory mainly contains a collection of Berkeley DB database
files. You won't see your versioned files if you peek inside.
For more information about repository creation and maintenance,
- see <xref linkend="svn-ch-5"/>.</para>
+ see <xref linkend="svn.reposadmin"/>.</para>
@ENGLISH }}} -->
<para>Denne kommandoen lager en ny katalog
<filename>/sti/til/depot</filename> som inneholder et
@@ -895,12 +897,12 @@
Du vil ikke se dine versjonerte filer hvis du tar en kikk
innenfor.
For mer informasjon om opprettelse og vedlikehold av depot, se
- <xref linkend="svn-ch-5"/>.</para>
+ <xref linkend="svn.reposadmin"/>.</para>
<!-- @ENGLISH {{{
<para>Next, create a tree of files and directories to import into
the repository. For reasons that will be clear later on (see
- <xref linkend="svn-ch-4"/>), your structure should contain three
+ <xref linkend="svn.branchmerge"/>), your structure should contain three
top-level directories named <filename>branches</filename>,
<filename>tags</filename>, and
<filename>trunk</filename>:</para>
@@ -908,9 +910,9 @@
<para>Deretter, lag et tre av filer og kataloger som skal importeres
inn i depotet.
For grunner som vil bli forklart senere (se <xref
- linkend="svn-ch-4"/>), bør strukturen inneholde tre toppkataloger
- kalt <filename>branches</filename>, <filename>tags</filename> og
- <filename>trunk</filename>:</para>
+ linkend="svn.branchmerge"/>), bør strukturen inneholde tre
+ toppkataloger kalt <filename>branches</filename>,
+ <filename>tags</filename> og <filename>trunk</filename>:</para>
<!-- @ENGLISH {{{
<screen>
@@ -936,11 +938,11 @@
<!-- @ENGLISH {{{
<para>Once you have a tree of data ready to go, import the data
into the repository with the <command>svn import</command>
- command (see <xref linkend="svn-ch-3-sect-7.3"/>):</para>
+ command (see <xref linkend="svn.tour.other.import"/>):</para>
@ENGLISH }}} -->
<para>Når du har klargjort et tre med data, importer dataene inn i
depotet med kommandoen <command>svn import</command> (se <xref
- linkend="svn-ch-3-sect-7.3"/>):</para>
+ linkend="svn.tour.other.import"/>):</para>
<!-- @ENGLISH {{{
<screen>
@@ -1062,21 +1064,22 @@
<!-- @ENGLISH {{{
<para>For a full tour of all the things you can do with your
- working copy, read <xref linkend="svn-ch-3"/>.</para>
+ working copy, read <xref linkend="svn.tour"/>.</para>
@ENGLISH }}} -->
<para>For en full gjennomgang av tingene som du kan gjøre med
- arbeidskopien din, les <xref linkend="svn-ch-3"/>.</para>
+ arbeidskopien din, les <xref linkend="svn.tour"/>.</para>
<!-- @ENGLISH {{{
<para>At this point, you have the option of making your repository
available to others over a network. See <xref
- linkend="svn-ch-6"/> to learn about the different sorts of
+ linkend="svn.serverconfig"/> to learn about the different sorts of
server processes available and how to configure them.</para>
@ENGLISH }}} -->
<para>Ved dette punktet har du valget å gjøre depotet ditt
tilgjengelig over et nettverk.
- Se <xref linkend="svn-ch-6"/> for å lære om de forskjellige
- tjenerprosessene tilgjengelig og hvordan du setter dem opp.</para>
+ Se <xref linkend="svn.serverconfig"/> for å lære om de
+ forskjellige tjenerprosessene tilgjengelig og hvordan du setter
+ dem opp.</para>
</sect1>
Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml (original)
+++ trunk/src/nb/book/ch02.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-2">
+<chapter id="svn.basic">
<!-- @ENGLISH {{{
<title>Basic Concepts</title>
@ENGLISH }}} -->
@@ -35,7 +35,7 @@
</simplesect>
- <sect1 id="svn-ch-2-sect-1">
+ <sect1 id="svn.basic.repository">
<!-- @ENGLISH {{{
<title>The Repository</title>
@ENGLISH }}} -->
@@ -51,7 +51,7 @@
then read or write to these files. By writing data, a client
makes the information available to others; by reading data, the
client receives information from others. <xref
- linkend="svn-ch-2-dia-1"/> illustrates this.</para>
+ linkend="svn.basic.repository.dia-1"/> illustrates this.</para>
@ENGLISH }}} -->
<para>Subversion er et sentralisert system for å dele informasjon.
Dens kjerne er et depot, som er et sentralt lager av data.
@@ -62,9 +62,10 @@
depotet, og leser eller skriver deretter til disse filene.
Ved å skrive data, gjør klienten informasjonen tilgjengelig for
andre; ved å lese data henter klienten informasjon fra andre.
- <xref linkend="svn-ch-2-dia-1"/> illustrerer dette.</para>
+ <xref linkend="svn.basic.repository.dia-1"/> illustrerer
+ dette.</para>
- <figure id="svn-ch-2-dia-1">
+ <figure id="svn.basic.repository.dia-1">
<!-- @ENGLISH {{{
<title>A typical client/server system</title>
@ENGLISH }}} -->
@@ -120,7 +121,7 @@
over tid.</para>
</sect1>
- <sect1 id="svn-ch-2-sect-2">
+ <sect1 id="svn.basic.vsn-models">
<!-- @ENGLISH {{{
<title>Versioning Models</title>
@ENGLISH }}} -->
@@ -136,7 +137,7 @@
Men forskjellige systemer bruker forskjellige strategier for å
oppnå dette.</para>
- <sect2 id="svn-ch-2-sect-2.1">
+ <sect2 id="svn.basic.vsn-models.problem-sharing">
<!-- @ENGLISH {{{
<title>The Problem of File-Sharing</title>
@ENGLISH }}} -->
@@ -159,7 +160,7 @@
<!-- @ENGLISH {{{
<para>Consider the scenario shown in <xref
- linkend="svn-ch-2-dia-2"/>. Suppose we have two co-workers,
+ linkend="svn.basic.vsn-models.problem-sharing.dia-1"/>. Suppose we have two co-workers,
Harry and Sally. They each decide to edit the same repository
file at the same time. If Harry saves his changes to the
repository first, then it's possible that (a few moments
@@ -173,7 +174,8 @@
latest version of the file—and probably by accident.
This is definitely a situation we want to avoid!</para>
@ENGLISH }}} -->
- <para>Tenk over scenariet vist i <xref linkend="svn-ch-2-dia-2"/>.
+ <para>Tenk over scenariet vist i <xref
+ linkend="svn.basic.vsn-models.problem-sharing.dia-1"/>.
Sett at vi har to arbeidskolleger, Harry og Sally.
De bestemmer seg begge for å redigere den samme filen i depotet
samtidig.
@@ -189,7 +191,7 @@
den siste versjonen av filen – og sannsynligvis ved en ulykke.
Dette er definitivt en situasjon vi vil unngå!</para>
- <figure id="svn-ch-2-dia-2">
+ <figure id="svn.basic.vsn-models.problem-sharing.dia-1">
<!-- @ENGLISH {{{
<title>The problem to avoid</title>
@ENGLISH }}} -->
@@ -199,7 +201,7 @@
</sect2>
- <sect2 id="svn-ch-2-sect-2.2">
+ <sect2 id="svn.basic.vsn-models.lock-unlock">
<!-- @ENGLISH {{{
<title>The Lock-Modify-Unlock Solution</title>
@ENGLISH }}} -->
@@ -218,7 +220,7 @@
the file, and wait for Harry to finish his changes and release
his lock. After Harry unlocks the file, his turn is over, and
now Sally can take her turn by locking and editing. <xref
- linkend="svn-ch-2-dia-3"/> demonstrates this simple
+ linkend="svn.basic.vsn-models.lock-unlock.dia-1"/> demonstrates this simple
solution.</para>
@ENGLISH }}} -->
<para>Mange versjonskontrollsystemer bruker en modell av typen
@@ -237,10 +239,10 @@
opp.
Etter at Harry låser opp filen, er hans tur over, og nå kan
Sally ta sin runde med låsing og redigering.
- <xref linkend="svn-ch-2-dia-3"/> demonstrerer denne enkle
- løsningen.</para>
+ <xref linkend="svn.basic.vsn-models.lock-unlock.dia-1"/>
+ demonstrerer denne enkle løsningen.</para>
- <figure id="svn-ch-2-dia-3">
+ <figure id="svn.basic.vsn-models.lock-unlock.dia-1">
<!-- @ENGLISH {{{
<title>The lock-modify-unlock solution</title>
@ENGLISH }}} -->
@@ -350,7 +352,7 @@
</sect2>
- <sect2 id="svn-ch-2-sect-2.3">
+ <sect2 id="svn.basic.vsn-models.copy-merge">
<!-- @ENGLISH {{{
<title>The Copy-Modify-Merge Solution</title>
@ENGLISH }}} -->
@@ -398,7 +400,7 @@
file A. Chances are that Sally's changes don't overlap with
his own; so once he has both sets of changes integrated, he
saves his working copy back to the repository. <xref
- linkend="svn-ch-2-dia-4"/> and <xref linkend="svn-ch-2-dia-5"/>
+ linkend="svn.basic.vsn-models.copy-merge.dia-1"/> and <xref linkend="svn.basic.vsn-models.copy-merge.dia-2"/>
show this process.</para>
@ENGLISH }}} -->
<para>Her er et eksempel.
@@ -417,10 +419,11 @@
Sjansene for at Sallys forandringer ikke overlapper med hans
egne er store; så når begges forandringer er lagt inn i filen,
lagrer han sin egen arbeidskopi til depotet. <xref
- linkend="svn-ch-2-dia-4"/> og <xref linkend="svn-ch-2-dia-5"/>
- viser denne prosessen.</para>
+ linkend="svn.basic.vsn-models.copy-merge.dia-1"/> og <xref
+ linkend="svn.basic.vsn-models.copy-merge.dia-2"/> viser denne
+ prosessen.</para>
- <figure id="svn-ch-2-dia-4">
+ <figure id="svn.basic.vsn-models.copy-merge.dia-1">
<!-- @ENGLISH {{{
<title>The copy-modify-merge solution</title>
@ENGLISH }}} -->
@@ -428,7 +431,7 @@
<graphic fileref="images/ch02dia4.png"/>
</figure>
- <figure id="svn-ch-2-dia-5">
+ <figure id="svn.basic.vsn-models.copy-merge.dia-2">
<!-- @ENGLISH {{{
<title>The copy-modify-merge solution (continued)</title>
@ENGLISH }}} -->
@@ -513,7 +516,7 @@
</sect1>
<!-- How svn implements the philosophy -->
- <sect1 id="svn-ch-2-sect-3">
+ <sect1 id="svn.basic.in-action">
<!-- @ENGLISH {{{
<title>Subversion in Action</title>
@ENGLISH }}} -->
@@ -528,7 +531,7 @@
I denne seksjonen vil vi vise reelle eksempler på bruk av
Subversion.</para>
- <sect2 id="svn-ch-2-sect-3.1">
+ <sect2 id="svn.basic.in-action.wc">
<!-- @ENGLISH {{{
<title>Working Copies</title>
@ENGLISH }}} -->
@@ -621,15 +624,15 @@
two software projects, <literal>paint</literal> and
<literal>calc</literal>. Each project lives in its own
top-level subdirectory, as shown in <xref
- linkend="svn-ch-2-dia-6"/>.</para>
+ linkend="svn.basic.in-action.wc.dia-1"/>.</para>
@ENGLISH }}} -->
<para>For eksempel, tenk deg at du har et depot som består av to
programprosjekter, <literal>paint</literal> og
<literal>calc</literal>.
Hvert prosjekt bor i hver sin toppkatalog, som vist i <xref
- linkend="svn-ch-2-dia-6"/>.</para>
+ linkend="svn.basic.in-action.wc.dia-1"/>.</para>
- <figure id="svn-ch-2-dia-6">
+ <figure id="svn.basic.in-action.wc.dia-1">
<!-- @ENGLISH {{{
<title>The repository's filesystem</title>
@ENGLISH }}} -->
@@ -683,7 +686,7 @@
<filename>.svn</filename> – som tidligere nevnt inneholder den
ekstra informasjonen som Subversion trenger.</para>
- <sidebar id="svn-ch-2-sidebar-1">
+ <sidebar id="svn.basic.in-action.wc.sb-1">
<!-- @ENGLISH {{{
<title>Repository URLs</title>
@ENGLISH }}} -->
@@ -693,17 +696,18 @@
<para>Subversion repositories can be accessed through many
different methods—on local disk, or through various
network protocols. A repository location, however, is
- always a URL. Table 2-1 describes how different URL
- schemas map to the available access methods.</para>
+ always a URL. <xref linkend="svn.basic.in-action.wc.tbl-1"/> describes how
+ different URL schemas map to the available access methods.</para>
@ENGLISH }}} -->
<para>Subversiondepot kan bli aksessert ved hjelp av mange
forskjellige metoder – på en lokal disk, eller gjennom diverse
nettverksprotokoller.
Beliggenheten til et depot er imidlertid alltid en URL.
- Tabell 2-1 viser hvordan forskjellige URL-skjemaer står i
- forhold til de forskjellige aksessmetodene.</para>
+ <xref linkend="svn.basic.in-action.wc.tbl-1"/> viser hvordan
+ forskjellige URL-skjemaer står i forhold til de forskjellige
+ aksessmetodene.</para>
- <table id="svn-ch-2-table-1">
+ <table id="svn.basic.in-action.wc.tbl-1">
<!-- @ENGLISH {{{
<title>Repository Access URLs</title>
@ENGLISH }}} -->
@@ -766,92 +770,16 @@
</tbody>
</tgroup>
</table>
-
- <!-- @ENGLISH {{{
- <para>For the most part, Subversion's URLs use the standard
- syntax, allowing for server names and port numbers to be
- specified as part of the URL. Remember that the
- <literal>file:</literal> access method is valid only for
- local repositories—in fact, in
- accordance with convention, the server name portion of the
- URL is required to be either absent or
- <literal>localhost</literal>:</para>
- @ENGLISH }}} -->
- <para>For det meste bruker Subversions URLer den vanlige
- syntaksen, og tillater tjenernavn og portnumre å bli
- spesifisert som en del av adressen.
- Husk at tilgangsmetoden <literal>file:</literal> bare er
- gyldig for lokale depot – faktisk, i overenskommelse med
- konvensjonen må delen som består av tjenernavnet enten være
- <literal>localhost</literal> eller ikke være der i det hele
- tatt:</para>
-
- <!-- @ENGLISH {{{
- <screen>
-$ svn checkout file:///path/to/repos
-…
-$ svn checkout file://localhost/path/to/repos
-…
-</screen>
- @ENGLISH }}} -->
- <screen>
-$ svn checkout file:///sti/til/depot
-…
-$ svn checkout file://localhost/sti/til/depot
-…
-</screen>
<!-- @ENGLISH {{{
- <para>Also, users of the <literal>file:</literal> scheme on
- Windows platforms will need to use an unofficially
- <quote>standard</quote> syntax for accessing repositories
- that are on the same machine, but on a different drive than
- the client's current working drive. Either of the two
- following URL path syntaxes will work where
- <literal>X</literal> is the drive on which the repository
- resides:</para>
+ <para>For more information on how Subversion parses URLs, see
+ <xref linkend="svn.advanced.reposurls"/>.</para>
@ENGLISH }}} -->
- <para>I tillegg må brukere av <literal>file:</literal>-skjemaet
- på Windows-plattformer bruke en uoffisiell
- <quote>standard</quote> syntaks for å få tilgang til depot som
- er på den samme maskinen, men på en annen disk enn klientens
- arbeidsdisk for øyeblikket.
- En av de to følgende syntaksene for URL-stier vil virke når
- <literal>X</literal> er disken som depotet ligger på:</para>
-
- <!-- @ENGLISH {{{
- <screen>
-C:\> svn checkout file:///X:/path/to/repos
-…
-C:\> svn checkout "file:///X|/path/to/repos"
-…
-</screen>
- @ENGLISH }}} -->
- <screen>
-C:\> svn checkout file:///X:/path/to/repos
-…
-C:\> svn checkout "file:///X|/path/to/repos"
-…
-</screen>
-
- <!-- @ENGLISH {{{
- <para>In the second syntax, you need to quote the URL so that
- the vertical bar character is not interpreted as a pipe.</para>
- @ENGLISH }}} -->
- <para>I den andre syntaksen må du kapsle inn URLen så den
- vertikale stolpen (<quote>|</quote>) ikke blir tolket som et
- rør.</para>
-
- <!-- @ENGLISH {{{
- <para>Note that a URL uses ordinary slashes even though the native
- (non-URL) form of a path on Windows uses backslashes.</para>
- @ENGLISH }}} -->
- <para>Legg merke til at en URL bruker ordinære skråstreker selv
- om det i den lokale (ikke-URL) formen for en sti på Windows
- brukes omvendte skråstreker.</para>
+ <para>For mer informasjon om hvordan Subversion tolker URLer, se
+ <xref linkend="svn.advanced.reposurls"/>.</para>
</sidebar>
-
+
<!-- @ENGLISH {{{
<para>Suppose you make changes to <filename>button.c</filename>.
Since the <filename>.svn</filename> directory remembers the
@@ -963,7 +891,7 @@
</sect2>
- <sect2 id="svn-ch-2-sect-3.2">
+ <sect2 id="svn.basic.in-action.revs">
<!-- @ENGLISH {{{
<title>Revisions</title>
@ENGLISH }}} -->
@@ -1019,22 +947,22 @@
og inneholder ingenting annet enn en tom rotkatalog.</para>
<!-- @ENGLISH {{{
- <para><xref linkend="svn-ch-2-dia-7"/> illustrates a nice way to
+ <para><xref linkend="svn.basic.in-action.revs.dia-1"/> illustrates a nice way to
visualize the repository. Imagine an array of revision
numbers, starting at 0, stretching from left to right. Each
revision number has a filesystem tree hanging below it, and
each tree is a <quote>snapshot</quote> of the way the
repository looked after a commit.</para>
@ENGLISH }}} -->
- <para><xref linkend="svn-ch-2-dia-7"/> illustrerer en fin måte å
- visualisere depotet på.
+ <para><xref linkend="svn.basic.in-action.revs.dia-1"/> illustrerer
+ en fin måte å visualisere depotet på.
Tenk deg en rekke av revisjonsnumre som starter på 0 og strekker
seg fra venstre mot høyre.
Hvert revisjonsnummer har et filsystemtre hengende under seg, og
hvert tre er et <quote>øyeblikksbilde</quote> av hvordan depotet
så ut etter en innlegging.</para>
- <figure id="svn-ch-2-dia-7">
+ <figure id="svn.basic.in-action.revs.dia-1">
<!-- @ENGLISH {{{
<title>The repository</title>
@ENGLISH }}} -->
@@ -1062,7 +990,7 @@
Notice that in general, revisions N and M of a file do
<emphasis>not</emphasis> necessarily differ! Because CVS
uses per-file revisions numbers, CVS users might want to see
- <xref linkend="svn-ap-a"/> for more details.</para>
+ <xref linkend="svn.forcvs"/> for more details.</para>
@ENGLISH }}} -->
<para>Ulikt mange av de andre versjonskontrollsystemene, gjelder
Subversions revisjonsnumre for <emphasis>hele trær</emphasis>,
@@ -1078,8 +1006,8 @@
Legg merke til at vanligvis vil innholdet av en fil for
revisjonene N og M <emphasis>ikke</emphasis> være forskjellig!
Fordi CVS bruker egne revisjonsnumre for hver fil, vil kanskje
- CVS-brukere ta en kikk på <xref linkend="svn-ap-a"/> for flere
- detaljer.</para>
+ CVS-brukere ta en kikk på <xref linkend="svn.forcvs"/> for
+ flere detaljer.</para>
</sidebar>
<!-- @ENGLISH {{{
@@ -1166,7 +1094,7 @@
</sect2>
- <sect2 id="svn-ch-2-sect-3.3">
+ <sect2 id="svn.basic.in-action.track-repos">
<!-- @ENGLISH {{{
<title>How Working Copies Track the Repository</title>
@ENGLISH }}} -->
@@ -1337,17 +1265,17 @@
<para>This may sound like a lot to keep track of, but the
<command>svn status</command> command will show you the state
of any item in your working copy. For more information on
- that command, see <xref linkend="svn-ch-3-sect-5.3.1" />.</para>
+ that command, see <xref linkend="svn.tour.cycle.examine.status" />.</para>
@ENGLISH }}} -->
<para>Dette kan høres ut som mye å holde greie på, men
<command>svn status</command>-kommandoen vil vise deg tilstanden
til ethvert element i arbeidskopien din.
For mer informasjon om denne kommandoen, se <xref
- linkend="svn-ch-3-sect-5.3.1" />.</para>
+ linkend="svn.tour.cycle.examine.status" />.</para>
</sect2>
- <sect2 id="svn-ch-2-sect-3.4">
+ <sect2 id="svn.basic.in-action.mixedrevs">
<!-- @ENGLISH {{{
<title>The Limitations of Mixed Revisions</title>
@ENGLISH }}} -->
@@ -1453,7 +1381,7 @@
</sect1>
- <sect1 id="svn-ch-2-sect-4">
+ <sect1 id="svn.basic.summary">
<!-- @ENGLISH {{{
<title>Summary</title>
@ENGLISH }}} -->
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-3">
+<chapter id="svn.tour">
<!-- @ENGLISH {{{
<title>Guided Tour</title>
@ENGLISH }}} -->
@@ -31,26 +31,26 @@
of all Subversion's commands—rather, it's a conversational
introduction to the most common Subversion tasks you'll
encounter. This chapter assumes that you've read and understood
- <xref linkend="svn-ch-2"/> and are familiar with the general
+ <xref linkend="svn.basic"/> and are familiar with the general
model of Subversion. For a complete reference of all commands,
- see <xref linkend="svn-ch-9"/>.</para>
+ see <xref linkend="svn.ref"/>.</para>
@ENGLISH }}} -->
<para>Merk at dette kapittelet ikke er ment å være en fullstendig
liste over Subversions kommandoer – det er heller en uformell
introduksjon til de mest vanlige Subversionoppgavene du vil komme
ut for.
Dette kapittelet forutsetter at du har lest og forstått <xref
- linkend="svn-ch-2"/> og er kjent med den generelle modellen til
+ linkend="svn.basic"/> og er kjent med den generelle modellen til
Subversion.
For en komplett referanse over alle kommandoene, se <xref
- linkend="svn-ch-9"/>.</para>
+ linkend="svn.ref"/>.</para>
</simplesect>
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-1">
+ <sect1 id="svn.tour.help">
<!-- @ENGLISH {{{
<title>Help!</title>
@ENGLISH }}} -->
@@ -78,7 +78,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-2">
+ <sect1 id="svn.tour.import">
<!-- @ENGLISH {{{
<title>Import</title>
@ENGLISH }}} -->
@@ -90,7 +90,7 @@
the very first thing you will do when you set up your Subversion
server, it's not something that happens very often. For a
detailed description of import, see <xref
- linkend="svn-ch-3-sect-7.3"/> later in this chapter.</para>
+ linkend="svn.tour.other.import"/> later in this chapter.</para>
@ENGLISH }}} -->
<para>Du bruker <command>svn import</command> for å importere et
nytt prosjekt inn i et Subversiondepot.
@@ -98,14 +98,14 @@
du setter opp Subversiontjeneren din, er det ikke noe som skjer
veldig ofte.
For en detaljert beskrivelse av import, se <xref
- linkend="svn-ch-3-sect-7.3"/> senere i dette kapitlet.</para>
+ linkend="svn.tour.other.import"/> senere i dette kapitlet.</para>
</sect1>
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-3">
+ <sect1 id="svn.tour.revs">
<!-- @ENGLISH {{{
<title>Revisions: Numbers, Keywords, and Dates, Oh My!</title>
@ENGLISH }}} -->
@@ -115,15 +115,16 @@
<!-- @ENGLISH {{{
<para>Before we go on, you should know a bit about how to identify
a particular revision in your repository. As you learned in
- <xref linkend="svn-ch-2-sect-3.2"/>, a revision is a
+ <xref linkend="svn.basic.in-action.revs"/>, a revision is a
<quote>snapshot</quote> of the repository at a particular moment
in time. As you continue to commit and grow your repository,
you need a mechanism for identifying these snapshots.</para>
@ENGLISH }}} -->
<para>Før vi går videre, bør du vite litt om hvordan du kan
identifisere en spesiell revisjon i depotet.
- Som du lærte i <xref linkend="svn-ch-2-sect-3.2"/>, er en revisjon
- et <quote>øyeblikksbilde</quote> av depotet på et visst tidspunkt.
+ Som du lærte i <xref linkend="svn.basic.in-action.revs"/>, er en
+ revisjon et <quote>øyeblikksbilde</quote> av depotet på et visst
+ tidspunkt.
Når du fortsetter med å legge inn revisjoner og øker størrelsen på
depotet ditt, trenger du en mekanisme for å identifisere disse
øyeblikksbildene.</para>
@@ -145,7 +146,7 @@
Og Subversion lar deg referere til disse revisjonene via nummer,
nøkkelord eller dato.</para>
- <sect2 id="svn-ch-3-sect-3.1">
+ <sect2 id="svn.tour.revs.numbers">
<!-- @ENGLISH {{{
<title>Revision Numbers</title>
@ENGLISH }}} -->
@@ -193,7 +194,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-3.2">
+ <sect2 id="svn.tour.revs.keywords">
<!-- @ENGLISH {{{
<title>Revision Keywords</title>
@ENGLISH }}} -->
@@ -376,7 +377,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-3.3">
+ <sect2 id="svn.tour.revs.dates">
<!-- @ENGLISH {{{
<title>Revision Dates</title>
@ENGLISH }}} -->
@@ -567,7 +568,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-4">
+ <sect1 id="svn.tour.initial">
<!-- @ENGLISH {{{
<title>Initial Checkout</title>
@ENGLISH }}} -->
@@ -620,13 +621,13 @@
<para>If you're wondering what <literal>trunk</literal> is all
about in the above URL, it's part of the way we recommend
you lay out your Subversion repository which we'll talk a lot
- more about in <xref linkend="svn-ch-4"/>.</para>
+ more about in <xref linkend="svn.branchmerge"/>.</para>
@ENGLISH }}} -->
<title>Oppbygning av depotet</title>
<para>Hvis du lurer på hva det er med <literal>trunk</literal> i
URLen ovenfor, så er den en del av måten vi anbefaler du legger
opp Subversiondepotet, noe som vi vil snakke en god del mer om i
- <xref linkend="svn-ch-4"/>.</para>
+ <xref linkend="svn.branchmerge"/>.</para>
</sidebar>
@@ -666,7 +667,7 @@
<!-- @ENGLISH {{{
<para>Since Subversion uses a <quote>copy-modify-merge</quote>
model instead of <quote>lock-modify-unlock</quote> (see <xref
- linkend="svn-ch-2"/>), you're already able to start making
+ linkend="svn.basic"/>), you're already able to start making
changes to the files and directories in your working copy. Your
working copy is just like any other collection of files and
directories on your system. You can edit and change them, move
@@ -676,7 +677,7 @@
<para>Siden Subversion bruker en
<quote>kopier-rediger-flett</quote>-modell istedenfor
<quote>lås-rediger-lås opp</quote> (se <xref
- linkend="svn-ch-2"/>), er du allerede i stand til å gjøre
+ linkend="svn.basic"/>), er du allerede i stand til å gjøre
forandringer i arbeidskopien din.
Den er som enhver annen samling av filer og kataloger på systemet.
Du kan redigere og forandre dem, flytte dem rundt, du kan til og
@@ -791,7 +792,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-5">
+ <sect1 id="svn.tour.cycle">
<!-- @ENGLISH {{{
<title>Basic Work Cycle</title>
@ENGLISH }}} -->
@@ -895,7 +896,7 @@
</listitem>
</itemizedlist>
- <sect2 id="svn-ch-3-sect-5.1">
+ <sect2 id="svn.tour.cycle.update">
<!-- @ENGLISH {{{
<title>Update Your Working Copy</title>
@ENGLISH }}} -->
@@ -1060,7 +1061,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-5.2">
+ <sect2 id="svn.tour.cycle.edit">
<!-- @ENGLISH {{{
<title>Make Changes to Your Working Copy</title>
@ENGLISH }}} -->
@@ -1360,7 +1361,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-5.3">
+ <sect2 id="svn.tour.cycle.examine">
<!-- @ENGLISH {{{
<title>Examine Your Changes</title>
@ENGLISH }}} -->
@@ -1428,7 +1429,7 @@
arbeidsfilene dine har forandret seg, og til og med tillate deg
å omgjøre forandringene dine uten å kontakte depotet.</para>
- <sect3 id="svn-ch-3-sect-5.3.1">
+ <sect3 id="svn.tour.cycle.examine.status">
<title><command>svn status</command></title>
<!-- @ENGLISH {{{
@@ -1662,7 +1663,7 @@
unversioned, but is related to a Subversion externals
definition. To find out more about externals
definitions, see <xref
- linkend="svn-ch-7-sect-3"/>.</para>
+ linkend="svn.advanced.externals"/>.</para>
@ENGLISH }}} -->
<term><computeroutput>X element</computeroutput></term>
<listitem>
@@ -1671,7 +1672,7 @@
Subversion.
For å finne ut mer om
<quote>externals</quote>-defineringer, se <xref
- linkend="svn-ch-7-sect-3"/>.</para>
+ linkend="svn.advanced.externals"/>.</para>
</listitem>
</varlistentry>
@@ -1687,7 +1688,7 @@
status</command>, or by setting the
<literal>svn:ignore</literal> property on the parent
directory. For more information on ignored files, see
- <xref linkend="svn-ch-7-sect-2.3.3" />.</para>
+ <xref linkend="svn.advanced.props.special.ignore" />.</para>
@ENGLISH }}} -->
<term><computeroutput>? element</computeroutput></term>
<listitem>
@@ -1700,7 +1701,7 @@
<literal>svn:ignore</literal>-egenskapen på
foreldrekatalogen.
For mer informasjon om ignorerte filer, se <xref
- linkend="svn-ch-7-sect-2.3.3" />.</para>
+ linkend="svn.advanced.props.special.ignore" />.</para>
</listitem>
</varlistentry>
@@ -1775,7 +1776,7 @@
<command>svn add</command>, <command>svn import</command>
and <command>svn status</command> operations. For more
information on ignored files, see <xref
- linkend="svn-ch-7-sect-2.3.3"/>. Note that this
+ linkend="svn.advanced.props.special.ignore"/>. Note that this
symbol only shows up if you pass the
<option>-ﳢ-no-ignore</option> option to <command>svn
status</command>—otherwise the file would be
@@ -1791,7 +1792,7 @@
add</command>, <command>svn import</command> og
<command>svn status</command>.
For mer informasjon om ignorerte filer, se <xref
- linkend="svn-ch-7-sect-2.3.3"/>.
+ linkend="svn.advanced.props.special.ignore"/>.
Merk at dette symbolet bare dukker opp hvis du
spesifiserer valget <option>--no-ignore</option> til
<command>svn status</command> – ellers ville filen bli
@@ -1804,15 +1805,14 @@
<!-- @ENGLISH {{{
<para>The second column tells the status of a file or
directory's properties (see <xref
- linkend="svn-ch-7-sect-2"/> for more information on
+ linkend="svn.advanced.props"/> for more information on
properties). If an <computeroutput>M</computeroutput>
appears in the second column, then the properties have been
modified, otherwise a whitespace will be printed.</para>
@ENGLISH }}} -->
<para>Den andre kolonnen forteller statusen på egenskapene til
- en fil eller katalog (se <xref
- linkend="svn-ch-7-sect-2"/> for mer informasjon om
- egenskaper).
+ en fil eller katalog (se <xref linkend="svn.advanced.props"/>
+ for mer informasjon om egenskaper).
Hvis en <computeroutput>M</computeroutput> viser seg i den
andre kolonnen, er egenskapene blitt modifisert, ellers vil et
blankt tegn bli skrevet.</para>
@@ -2003,7 +2003,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-5.3.2">
+ <sect3 id="svn.tour.cycle.examine.diff">
<title><command>svn diff</command></title>
<!-- @ENGLISH {{{
@@ -2145,7 +2145,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-5.3.3">
+ <sect3 id="svn.tour.cycle.examine.revert">
<title><command>svn revert</command></title>
<!-- @ENGLISH {{{
@@ -2315,7 +2315,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-5.4">
+ <sect2 id="svn.tour.cycle.resolve">
<!-- @ENGLISH {{{
<title>Resolve Conflicts (Merging Others' Changes)</title>
@ENGLISH }}} -->
@@ -2407,7 +2407,7 @@
overlapping areas. (Subversion uses the
<literal>svn:mime-type</literal> property to decide if a
file is capable of contextual, line-based merging. See
- <xref linkend="svn-ch-7-sect-2.3.2"/> to learn more.)</para>
+ <xref linkend="svn.advanced.props.special.mime-type"/> to learn more.)</para>
@ENGLISH }}} -->
<para>Hvis Subversion anser filen å være av en flettbar type,
plasserer den
@@ -2418,8 +2418,8 @@
<literal>svn:mime-type</literal>-egenskapen for å bestemme
om en fil er <!-- ¤ Halvslapp setning -->mulig å flette ved
hjelp av kontekst- og linjebaserert fletting.
- Se <xref linkend="svn-ch-7-sect-2.3.2"/> for å lære
- mer.)</para>
+ Se <xref linkend="svn.advanced.props.special.mime-type"/>
+ for å lære mer.)</para>
</listitem>
<listitem>
@@ -2622,7 +2622,7 @@
Resolved conflicted state of 'sandwich.txt'
</screen>
- <sect3 id="svn-ch-3-sect-5.4.1">
+ <sect3 id="svn.tour.cycle.resolve.byhand">
<!-- @ENGLISH {{{
<title>Merging Conflicts by Hand</title>
@ENGLISH }}} -->
@@ -2780,7 +2780,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-5.4.2">
+ <sect3 id="svn.tour.cycle.resolve.copyover">
<!-- @ENGLISH {{{
<title>Copying a File Onto Your Working File</title>
@ENGLISH }}} -->
@@ -2809,7 +2809,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-5.4.3">
+ <sect3 id="svn.tour.cycle.resolve.revert">
<!-- @ENGLISH {{{
<title>Punting: Using <command>svn revert</command></title>
@ENGLISH }}} -->
@@ -2864,7 +2864,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-5.5">
+ <sect2 id="svn.tour.cycle.commit">
<!-- @ENGLISH {{{
<title>Commit Your Changes</title>
@ENGLISH }}} -->
@@ -2929,15 +2929,15 @@
<option>-ﳢ-message</option> or <option>-ﳢ-file</option> switch,
then Subversion will automatically launch your favorite editor
(see the <literal>editor-cmd</literal> section in
- <xref linkend="svn-ch-7-sect-1.3.2"/>) for composing a log
+ <xref linkend="svn.advanced.confarea.opts.config"/>) for composing a log
message.</para>
@ENGLISH }}} -->
<para>Hvis du lar være å angi <option>--message</option>- eller
<option>--file</option>-valget, vil Subversion starte
favoritteditoren din automatisk (se seksjonen om
<literal>editor-cmd</literal> i <xref
- linkend="svn-ch-7-sect-1.3.2"/>) så du kan skrive en
- loggmelding.</para>
+ linkend="svn.advanced.confarea.opts.config"/>) så du kan skrive
+ en loggmelding.</para>
<tip>
@@ -3020,7 +3020,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-6">
+ <sect1 id="svn.tour.history">
<!-- @ENGLISH {{{
<title>Examining History</title>
@ENGLISH }}} -->
@@ -3113,7 +3113,7 @@
</variablelist>
- <sect2 id="svn-ch-3-sect-6.1">
+ <sect2 id="svn.tour.history.log">
<title><command>svn log</command></title>
<!-- @ENGLISH {{{
@@ -3304,8 +3304,8 @@
</sect2>
- <sect2 id="svn-ch-3-sect-6.2">
- <title>svn diff</title>
+ <sect2 id="svn.tour.history.diff">
+ <title><command>svn diff</command></title>
<!-- @ENGLISH {{{
<para>We've already seen <command>svn diff</command>
@@ -3352,7 +3352,7 @@
</itemizedlist>
- <sect3 id="svn-ch-3-sect-6.2.1">
+ <sect3 id="svn.tour.history.diff.local">
<!-- @ENGLISH {{{
<title>Examining Local Changes</title>
@ENGLISH }}} -->
@@ -3388,7 +3388,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-6.2.2">
+ <sect3 id="svn.tour.history.diff.wcrepos">
<!-- @ENGLISH {{{
<title>Comparing Working Copy to Repository</title>
@ENGLISH }}} -->
@@ -3424,7 +3424,7 @@
</sect3>
- <sect3 id="svn-ch-3-sect-6.2.3">
+ <sect3 id="svn.tour.history.diff.reposrepos">
<!-- @ENGLISH {{{
<title>Comparing Repository to Repository</title>
@ENGLISH }}} -->
@@ -3490,7 +3490,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-6.3">
+ <sect2 id="svn.tour.history.cat">
<title><command>svn cat</command></title>
<!-- @ENGLISH {{{
@@ -3564,7 +3564,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-6.4">
+ <sect2 id="svn.tour.history.list">
<title><command>svn list</command></title>
<!-- @ENGLISH {{{
@@ -3616,7 +3616,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-6.5">
+ <sect2 id="svn.tour.history.finalword">
<!-- @ENGLISH {{{
<title>A Final Word on History</title>
@ENGLISH }}} -->
@@ -3661,7 +3661,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 7 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-7">
+ <sect1 id="svn.tour.other">
<!-- @ENGLISH {{{
<title>Other Useful Commands</title>
@ENGLISH }}} -->
@@ -3676,7 +3676,7 @@
nevnt i dette kapitlet, vil du innimellom trenge disse
kommandoene.</para>
- <sect2 id="svn-ch-3-sect-7.1">
+ <sect2 id="svn.tour.other.cleanup">
<title><command>svn cleanup</command></title>
<!-- @ENGLISH {{{
@@ -3743,7 +3743,7 @@
</sect2>
- <sect2 id="svn-ch-3-sect-7.3">
+ <sect2 id="svn.tour.other.import">
<title><command>svn import</command></title>
<!-- @ENGLISH {{{
@@ -3822,7 +3822,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 8 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-3-sect-8">
+ <sect1 id="svn.tour.summary">
<!-- @ENGLISH {{{
<title>Summary</title>
@ENGLISH }}} -->
@@ -3831,9 +3831,9 @@
<!-- @ENGLISH {{{
<para>Now we've covered most of the Subversion client commands.
Notable exceptions are those dealing with branching and
- merging (see <xref linkend="svn-ch-4"/>) and properties (see
- <xref linkend="svn-ch-7-sect-2"/>). However, you may want to
- take a moment to skim through <xref linkend="svn-ch-9"/> to
+ merging (see <xref linkend="svn.branchmerge"/>) and properties (see
+ <xref linkend="svn.advanced.props"/>). However, you may want to
+ take a moment to skim through <xref linkend="svn.ref"/> to
get an idea of all the many different commands that Subversion
has—and how you can use them to make your work
easier.</para>
@@ -3841,10 +3841,10 @@
<para>Nå har vi dekket mesteparten av klientkommandoene i
Subversion.
Unntak som vi kan legge merke til er de som har med forgreninger
- og fletting å gjøre (se <xref linkend="svn-ch-4"/>) og
- egenskaper (se <xref linkend="svn-ch-7-sect-2"/>).
+ og fletting å gjøre (se <xref linkend="svn.branchmerge"/>) og
+ egenskaper (se <xref linkend="svn.advanced.props"/>).
Det kan være du ønsker å bruke litt tid på å skumme gjennom
- <xref linkend="svn-ch-9"/> for å få en idé om de mange
+ <xref linkend="svn.ref"/> for å få en idé om de mange
forskjellige kommandoene Subversion har – og hvordan du kan
bruke dem til å gjøre arbeidet ditt enklere.</para>
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-4">
+<chapter id="svn.branchmerge">
<!-- @ENGLISH {{{
<title>Branching and Merging</title>
@ENGLISH }}} -->
@@ -26,21 +26,21 @@
you're going to allow Subversion to manage your data, then this
is a feature you'll eventually come to depend on. This chapter
assumes that you're already familiar with Subversion's basic
- concepts (<xref linkend="svn-ch-2"/>).</para>
+ concepts (<xref linkend="svn.basic"/>).</para>
@ENGLISH }}} -->
<para>Forgreninger er en fundamental del av versjonskontroll.
Hvis du skal tillate Subversion å behandle dine data, er dette en
funksjon som du etterhvert kommer til å basere deg mye på.
Dette kapittelet går ut i fra at du allerede er kjent med
Subversions grunnleggende konsepter (<xref
- linkend="svn-ch-2"/>).</para>
+ linkend="svn.basic"/>).</para>
</simplesect>
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-1">
+ <sect1 id="svn.branchmerge.whatis">
<!-- @ENGLISH {{{
<title>What's a Branch?</title>
@ENGLISH }}} -->
@@ -95,7 +95,7 @@
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-ch-4-dia-1"/>).</para>
+ linkend="svn.branchmerge.whatis.dia-1"/>).</para>
@ENGLISH }}} -->
<para>Dette er det grunnleggende konseptet for en
<firstterm>forgrening</firstterm> – det vil si en utviklingslinje
@@ -103,9 +103,9 @@
en felles historie hvis du ser langt nok tilbake i tid.
En forgrening begynner bestandig livet som en kopi av noe, og går
videre derfra ved å lage sin egen historie (se <xref
- linkend="svn-ch-4-dia-1"/>).</para>
+ linkend="svn.branchmerge.whatis.dia-1"/>).</para>
- <figure id="svn-ch-4-dia-1">
+ <figure id="svn.branchmerge.whatis.dia-1">
<!-- @ENGLISH {{{
<title>Branches of development</title>
@ENGLISH }}} -->
@@ -139,7 +139,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-2">
+ <sect1 id="svn.branchmerge.using">
<!-- @ENGLISH {{{
<title>Using Branches</title>
@ENGLISH }}} -->
@@ -149,20 +149,20 @@
<para>At this point, you should understand how each commit creates
an entire new filesystem tree (called a <quote>revision</quote>)
in the repository. If not, go back and read about revisions in
- <xref linkend="svn-ch-2-sect-3.2"/>.</para>
+ <xref linkend="svn.basic.in-action.revs"/>.</para>
@ENGLISH }}} -->
<para>På dette punktet skal du ha fått forståelsen av hvordan hver
innlegging oppretter et helt nytt filsystemtre (kalt en
<quote>revisjon</quote>) i depotet.
Hvis ikke, gå tilbake og les om revisjoner i <xref
- linkend="svn-ch-2-sect-3.2"/>.</para>
+ linkend="svn.basic.in-action.revs"/>.</para>
<!-- @ENGLISH {{{
<para>For this chapter, we'll go back to the same example from
Chapter 2. Remember that you and your collaborator, Sally, are
sharing a repository that contains two projects,
<filename>paint</filename> and <filename>calc</filename>.
- Notice that in <xref linkend="svn-ch-4-dia-2"/>, however, each
+ Notice that in <xref linkend="svn.branchmerge.using.dia-1"/>, however, each
project directory now contains subdirectories named
<filename>trunk</filename> and <filename>branches</filename>.
The reason for this will soon become clear.</para>
@@ -172,12 +172,12 @@
Du husker at du og din kollega Sally deler et depot som inneholder
to prosjekter – <filename>paint</filename> og
<filename>calc</filename>.
- Merk imidlertid at i <xref linkend="svn-ch-4-dia-2"/> inneholder
- hver prosjektkatalog underkataloger kalt
+ Merk imidlertid at i <xref linkend="svn.branchmerge.using.dia-1"/>
+ inneholder hver prosjektkatalog underkataloger kalt
<filename>trunk</filename> og <filename>branches</filename>.
Grunnen til dette vil du snart få greie på.</para>
- <figure id="svn-ch-4-dia-2">
+ <figure id="svn.branchmerge.using.dia-1">
<!-- @ENGLISH {{{
<title>Starting repository layout</title>
@ENGLISH }}} -->
@@ -294,7 +294,7 @@
kan du velge ut informasjon som du vil dele med dine kolleger.
Du vil etter hvert få se nøyaktig hvordan dette fungerer.</para>
- <sect2 id="svn-ch-4-sect-2.1">
+ <sect2 id="svn.branchmerge.using.create">
<!-- @ENGLISH {{{
<title>Creating a Branch</title>
@ENGLISH }}} -->
@@ -439,7 +439,7 @@
Both procedures create a new directory in revision 341, and
the new directory is a copy of
<filename>/calc/trunk</filename>. This is shown in <xref
- linkend="svn-ch-4-dia-3"/>. Notice that the second method,
+ linkend="svn.branchmerge.using.create.dia-1"/>. Notice that the second method,
however, performs an <emphasis>immediate</emphasis> commit.
<footnote>
<para>Subversion does not support
@@ -455,7 +455,8 @@
<para>Det er egentlig ingen forskjell på disse to metodene.
Begge prosedyrene lager en ny katalog i revisjon 341, og den nye
katalogen er en kopi av <filename>/calc/trunk</filename>.
- Dette er vist i <xref linkend="svn-ch-4-dia-3"/>.
+ Dette er vist i <xref
+ linkend="svn.branchmerge.using.create.dia-1"/>.
Legg merke til at den andre metoden utfører en
<emphasis>øyeblikkelig</emphasis>
innlegging.<footnote><para>Subversion støtter ikke kopiering
@@ -468,7 +469,7 @@
Faktisk trenger du med denne teknikken ikke en arbeidskopi i det
hele tatt.</para>
- <figure id="svn-ch-4-dia-3">
+ <figure id="svn.branchmerge.using.create.dia-1">
<!-- @ENGLISH {{{
<title>Repository with new copy</title>
@ENGLISH }}} -->
@@ -551,7 +552,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-2.2">
+ <sect2 id="svn.branchmerge.using.work">
<!-- @ENGLISH {{{
<title>Working with Your Branch</title>
@ENGLISH }}} -->
@@ -579,7 +580,7 @@
commit changes, however, Sally won't ever see them when she
updates. Her working copy is of
<filename>/calc/trunk</filename>. (Be sure to read <xref
- linkend="svn-ch-4-sect-5"/> later in this chapter: the
+ linkend="svn.branchmerge.switchwc"/> later in this chapter: the
<command>svn switch</command> command is an alternate way of
creating a working copy of a branch.)</para>
@ENGLISH }}} -->
@@ -588,8 +589,8 @@
Men når du legger inn forandringer, vil ikke Sally se noen av
dem når hun oppdaterer.
Hennes arbeidskopi er fra <filename>/calc/trunk</filename>.
- (Pass på å lese <xref linkend="svn-ch-4-sect-5"/> senere i dette
- kapittelet:
+ (Pass på å lese <xref linkend="svn.branchmerge.switchwc"/>
+ senere i dette kapittelet:
Kommandoen <command>svn switch</command> er en alternativ måte å
lage en arbeidskopi av en forgrening.)</para>
@@ -643,14 +644,14 @@
<!-- @ENGLISH {{{
<para>There are now two independent lines of development, shown
- in <xref linkend="svn-ch-4-dia-4"/>, happening on
+ in <xref linkend="svn.branchmerge.using.work.dia-1"/>, happening on
<filename>integer.c</filename>.</para>
@ENGLISH }}} -->
<para>Det er nå to uavhengige utviklingslinjer, vist i <xref
- linkend="svn-ch-4-dia-4"/>, som skjer med
+ linkend="svn.branchmerge.using.work.dia-1"/>, som skjer med
<filename>integer.c</filename>.</para>
- <figure id="svn-ch-4-dia-4">
+ <figure id="svn.branchmerge.using.work.dia-1">
<!-- @ENGLISH {{{
<title>The branching of one file's history</title>
@ENGLISH }}} -->
@@ -776,7 +777,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-2.3">
+ <sect2 id="svn.branchmerge.using.concepts">
<!-- @ENGLISH {{{
<title>The Key Concepts Behind Branches</title>
@ENGLISH }}} -->
@@ -835,7 +836,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-3">
+ <sect1 id="svn.branchmerge.copychanges">
<!-- @ENGLISH {{{
<title>Copying Changes Between Branches</title>
@ENGLISH }}} -->
@@ -904,7 +905,7 @@
<filename>trunk</filename>.</para>
- <sect2 id="svn-ch-4-sect-3.1">
+ <sect2 id="svn.branchmerge.copychanges.specific">
<!-- @ENGLISH {{{
<title>Copying Specific Changes</title>
@ENGLISH }}} -->
@@ -1288,7 +1289,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-3.2">
+ <sect2 id="svn.branchmerge.copychanges.keyconcept">
<!-- @ENGLISH {{{
<title>The Key Concept Behind Merging</title>
@ENGLISH }}} -->
@@ -1455,13 +1456,13 @@
</sect2>
- <sect2 id="svn-ch-4-sect-3.3">
+ <sect2 id="svn.branchmerge.copychanges.bestprac">
<!-- @ENGLISH {{{
<title>Best Practices for Merging</title>
@ENGLISH }}} -->
<title>Beste praksiser for fletting</title>
- <sect3 id="svn-ch-4-sect-3.3.1">
+ <sect3 id="svn.branchmerge.copychanges.bestprac.track">
<!-- @ENGLISH {{{
<title>Tracking Merges Manually</title>
@ENGLISH }}} -->
@@ -1558,7 +1559,7 @@
</sect3>
- <sect3 id="svn-ch-4-sect-3.3.2">
+ <sect3 id="svn.branchmerge.copychanges.bestprac.preview">
<!-- @ENGLISH {{{
<title>Previewing Merges</title>
@ENGLISH }}} -->
@@ -1721,7 +1722,7 @@
forandringssett #9238 inn i arbeidskopien din.</para>
</sidebar>
- <sect3 id="svn-ch-4-sect-3.3.3">
+ <sect3 id="svn.branchmerge.copychanges.bestprac.merge">
<!-- @ENGLISH {{{
<title>Merge Conflicts</title>
@ENGLISH }}} -->
@@ -1868,7 +1869,7 @@
<para>Another small difference between <command>svn
update</command> and <command>svn merge</command> are the
names of the full-text files created when a conflict
- happens. In <xref linkend="svn-ch-3-sect-5.4"/>, we saw
+ happens. In <xref linkend="svn.tour.cycle.resolve"/>, we saw
that an update produces files named
<filename>filename.mine</filename>,
<filename>filename.rOLDREV</filename>, and
@@ -1887,8 +1888,9 @@
<para>En annen liten forskjell mellom <command>svn
update</command> og <command>svn merge</command> er navnene på
fulltekst-filene som blir opprettet når en konflikt oppstår.
- I <xref linkend="svn-ch-3-sect-5.4"/> så vi at en oppdatering
- produserer filene <filename>filnavn.mine</filename>,
+ I <xref linkend="svn.tour.cycle.resolve"/> så vi at en
+ oppdatering produserer filene
+ <filename>filnavn.mine</filename>,
<filename>filnavn.rGAMMELREV</filename> og
<filename>filnavn.rNYREV</filename>.
Men når <command>svn merge</command> produserer en konflikt,
@@ -1905,7 +1907,7 @@
</sect3>
- <sect3 id="svn-ch-4-sect-3.3.4">
+ <sect3 id="svn.branchmerge.copychanges.bestprac.ancestry">
<!-- @ENGLISH {{{
<title>Noticing or Ignoring Ancestry</title>
@ENGLISH }}} -->
@@ -1993,7 +1995,7 @@
however, you may want the merge command to compare two
unrelated trees. For example, you may have imported two
source-code trees representing different vendor releases of
- a software project (see <xref linkend="svn-ch-7-sect-4"/>).
+ a software project (see <xref linkend="svn.advanced.vendorbr"/>).
If you asked <command>svn merge</command> to compare the two
trees, you'd see the entire first tree being deleted,
followed by an add of the entire second tree!</para>
@@ -2005,7 +2007,7 @@
sammenligne to urelaterte trær.
For eksempel har du kanskje to kildekodetrær som representerer
forskjellige <!-- ¤ vendor --> utgivelser av et
- programprosjekt (se <xref linkend="svn-ch-7-sect-4"/>).
+ programprosjekt (se <xref linkend="svn.advanced.vendorbr"/>).
Hvis du ber <command>svn merge</command> om å sammenligne de
to trærne, vil du se at hele det første treet blir slettet,
fulgt av en tillegging av hele det andre treet!</para>
@@ -2042,7 +2044,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-4">
+ <sect1 id="svn.branchmerge.commonuses">
<!-- @ENGLISH {{{
<title>Common Use-Cases</title>
@ENGLISH }}} -->
@@ -2057,7 +2059,7 @@
<command>svn merge</command>, og denne seksjonen beskriver de
vanligste som du sannsynligvis vil komme over.</para>
- <sect2 id="svn-ch-4-sect-4.1">
+ <sect2 id="svn.branchmerge.commonuses.wholebr">
<!-- @ENGLISH {{{
<title>Merging a Whole Branch to Another</title>
@ENGLISH }}} -->
@@ -2289,7 +2291,7 @@
to your original feature or bug fix. The repository's
<literal>HEAD</literal> revision is now 480, and you're ready
to do another merge from your private branch to the trunk.
- But as discussed in <xref linkend="svn-ch-4-sect-3.3"/>, you
+ But as discussed in <xref linkend="svn.branchmerge.copychanges.bestprac"/>, you
don't want to merge the changes you've already merged before;
you only want to merge everything <quote>new</quote> on your
branch since the last time you merged. The trick is to figure
@@ -2301,10 +2303,11 @@
Depotets <literal>HEAD</literal>-revisjon er nå 480, og du er
klar til å utføre en ny fletting fra den private grenen din til
trunk.
- Men som diskutert i <xref linkend="svn-ch-4-sect-3.3"/> vil du
- ikke flette forandringene du allerede har flettet før; du vil
- bare flette alt <quote>nytt</quote> på grenen siden forrige gang
- du flettet.
+ Men som diskutert i <xref
+ linkend="svn.branchmerge.copychanges.bestprac"/> vil du ikke
+ flette forandringene du allerede har flettet før; du vil bare
+ flette alt <quote>nytt</quote> på grenen siden forrige gang du
+ flettet.
Trikset er å finne ut <emphasis>hva</emphasis> som er
nytt.</para>
@@ -2412,7 +2415,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-4.2">
+ <sect2 id="svn.branchmerge.commonuses.undo">
<!-- @ENGLISH {{{
<title>Undoing Changes</title>
@ENGLISH }}} -->
@@ -2559,7 +2562,7 @@
implement an <command>svnadmin obliterate</command>
command that would accomplish the task of permanently
deleting information. In the meantime, see <xref
- linkend="svn-ch-5-sect-3.1.3"/> for a possible
+ linkend="svn.reposadmin.maint.tk.svndumpfilter"/> for a possible
workaround.</para>
</footnote>
</para>
@@ -2585,12 +2588,13 @@
planer om å legge inn en <command>svnadmin
obliterate</command>-kommando som vil ta seg av oppgaven med å
permanent slette informasjon.
- I mellomtiden, se <xref linkend="svn-ch-5-sect-3.1.3"/> for en
- mulig omvei om problemet.</para></footnote></para>
+ I mellomtiden, se <xref
+ linkend="svn.reposadmin.maint.tk.svndumpfilter"/> for en mulig
+ omvei om problemet.</para></footnote></para>
</sect2>
- <sect2 id="svn-ch-4-sect-4.3">
+ <sect2 id="svn.branchmerge.commonuses.resurrect">
<!-- @ENGLISH {{{
<title>Resurrecting Deleted Items</title>
@ENGLISH }}} -->
@@ -2733,7 +2737,7 @@
<para>One option is to use <command>svn merge</command> to apply
revision 808 <quote>in reverse</quote>. (We've already
discussed how to undo changes, see <xref
- linkend="svn-ch-4-sect-4.2"/>.) This would have the effect of
+ linkend="svn.branchmerge.commonuses.undo"/>.) This would have the effect of
re-adding <filename>real.c</filename> as a local modification.
The file would be scheduled for addition, and after a commit,
the file would again exist in <literal>HEAD</literal>.</para>
@@ -2741,7 +2745,7 @@
<para>En måte er å bruke <command>svn merge</command> for å legge
inn revisjon 808 <quote>i revers</quote>.
(Vi har allerede gått gjennom hvordan vi omgjør forandringer, se
- <xref linkend="svn-ch-4-sect-4.2"/>.)
+ <xref linkend="svn.branchmerge.commonuses.undo"/>.)
Dette vil ha samme effekten som å legge til
<filename>real.c</filename> en gang til som en lokal
modifisering.
@@ -2835,7 +2839,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-4.4">
+ <sect2 id="svn.branchmerge.commonuses.patterns">
<!-- @ENGLISH {{{
<title>Common Branching Patterns</title>
@ENGLISH }}} -->
@@ -2868,7 +2872,7 @@
Men det kan hjelpe å se dem beskrevet i
Subversionterminologi.</para>
- <sect3 id="svn-ch-4-sect-4.4.1">
+ <sect3 id="svn.branchmerge.commonuses.patterns.release">
<!-- @ENGLISH {{{
<title>Release Branches</title>
@ENGLISH }}} -->
@@ -3033,7 +3037,7 @@
</sect3>
- <sect3 id="svn-ch-4-sect-4.4.2">
+ <sect3 id="svn.branchmerge.commonuses.patterns.feature">
<!-- @ENGLISH {{{
<title>Feature Branches</title>
@ENGLISH }}} -->
@@ -3154,10 +3158,10 @@
merge the last week's worth of trunk changes to the branch.
Take care when doing this; the merging needs to be
hand-tracked to avoid the problem of repeated merges (as
- described in <xref linkend="svn-ch-4-sect-3.3.1"/>). You'll
+ described in <xref linkend="svn.branchmerge.copychanges.bestprac.track"/>). You'll
need to write careful log messages detailing exactly which
revision ranges have been been merged already (as
- demonstrated in <xref linkend="svn-ch-4-sect-4.1"/>). It
+ demonstrated in <xref linkend="svn.branchmerge.commonuses.wholebr"/>). It
may sound intimidating, but it's actually pretty easy to
do.</para>
@ENGLISH }}} -->
@@ -3168,10 +3172,11 @@
grenen.
Vær nøye når du gjør dette; flettingen må <!-- ¤ -->sjekkes
for å unngå problemet med gjentatte flettinger (som beskrevet
- i <xref linkend="svn-ch-4-sect-3.3.1"/>).
+ i <xref
+ linkend="svn.branchmerge.copychanges.bestprac.track"/>).
Du må skrive nøyaktige loggmeldinger med detaljer om hvilket
revisjonsområde som allerede er blitt flettet (som demonstrert
- i <xref linkend="svn-ch-4-sect-4.1"/>).
+ i <xref linkend="svn.branchmerge.commonuses.wholebr"/>).
Det kan høres skremmende ut, men er faktisk ganske enkelt å
gjøre.</para>
@@ -3269,7 +3274,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-5">
+ <sect1 id="svn.branchmerge.switchwc">
<!-- @ENGLISH {{{
<title>Switching a Working Copy</title>
@ENGLISH }}} -->
@@ -3428,7 +3433,7 @@
<option>-ﳢ-relocate</option> switch if the URL of your server
changes and you don't want to abandon an existing working copy.
See the <command>svn switch</command> section in <xref
- linkend="svn-ch-9"/> for more information and an example.</para>
+ linkend="svn.ref"/> for more information and an example.</para>
</footnote></para>
@ENGLISH }}} -->
<para>Legg merke til at mens det er greit for arbeidskopien din å
@@ -3442,7 +3447,7 @@
<option>--relocate</option>-valget hvis URL-en til tjeneren
forandrer seg og du ikke vil forkaste en eksisterende arbeidskopi.
Se <command>svn switch</command>-seksjonen i <xref
- linkend="svn-ch-9"/> for mer informasjon og et
+ linkend="svn.ref"/> for mer informasjon og et
eksempel.</para></footnote></para>
<sidebar>
@@ -3554,7 +3559,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-6">
+ <sect1 id="svn.branchmerge.tags">
<!-- @ENGLISH {{{
<title>Tags</title>
@ENGLISH }}} -->
@@ -3592,7 +3597,7 @@
av et programprosjekt er en spesiell underkatalog av revisjon
4822.</para>
- <sect2 id="svn-ch-4-sect-6.1">
+ <sect2 id="svn.branchmerge.tags.mksimple">
<!-- @ENGLISH {{{
<title>Creating a Simple Tag</title>
@ENGLISH }}} -->
@@ -3623,7 +3628,7 @@
<!-- @ENGLISH {{{
<para>This example assumes that a
<filename>/calc/tags</filename> directory already exists. (If it
- doesn't, see <xref linkend="svn-ch-9-sect-1.2-re-mkdir"/>).
+ doesn't, see <xref linkend="svn.ref.svn.c.mkdir"/>).
After the copy completes, the new
<filename>release-1.0</filename> directory is forever a
snapshot of how the project looked in the
@@ -3639,7 +3644,7 @@
<para>Dette eksempelet forutsetter at en
<filename>/calc/tags</filename>-katalog allerede eksisterer.
(Hvis den ikke gjør det, se <xref
- linkend="svn-ch-9-sect-1.2-re-mkdir"/>.)
+ linkend="svn.ref.svn.c.mkdir"/>.)
Etter at kopieringen er fullført, vil den nye
<filename>release-1.0</filename>-katalogen for alltid være et
øyeblikksbilde av hvordan prosjektet så ut i
@@ -3689,7 +3694,7 @@
approach is more paranoid: you can use one of the
access-control scripts provided with Subversion to prevent
anyone from doing anything but creating new copies in the
- tags-area (See <xref linkend="svn-ch-6"/>.) The paranoid
+ tags-area (See <xref linkend="svn.serverconfig"/>.) The paranoid
approach, however, isn't usually necessary. If a user
accidentally commits a change to a tag-directory, you can
simply undo the change as discussed in the previous section.
@@ -3707,7 +3712,7 @@
Du kan bruke et av aksesskontrollskriptene som følger med
Subversion til å forhindre noen fra å gjøre noe annet enn å
opprette nye kopier i merkeområdet (se <xref
- linkend="svn-ch-6"/>).
+ linkend="svn.serverconfig"/>).
Den paranoide ruten er imidlertid vanligvis ikke nødvendig.
Hvis en bruker legger inn en forandring til en merkekatalog, kan
du enkelt og greit omgjøre forandringen som nevnt i den forrige
@@ -3716,7 +3721,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-6.2">
+ <sect2 id="svn.branchmerge.tags.mkcomplex">
<!-- @ENGLISH {{{
<title>Creating a Complex Tag</title>
@ENGLISH }}} -->
@@ -3834,7 +3839,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 7 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-7">
+ <sect1 id="svn.branchmerge.maint">
<!-- @ENGLISH {{{
<title>Branch Maintenance</title>
@ENGLISH }}} -->
@@ -3857,7 +3862,7 @@
I denne seksjonen vil vi komme med noen forslag for hvordan du kan
arrangere og vedlikeholde dataene dine over tid.</para>
- <sect2 id="svn-ch-4-sect-7.1">
+ <sect2 id="svn.branchmerge.maint.layout">
<!-- @ENGLISH {{{
<title>Repository Layout</title>
@ENGLISH }}} -->
@@ -3890,13 +3895,13 @@
<!-- @ENGLISH {{{
<para>If a repository contains multiple projects, admins
typically index their layout by project (see <xref
- linkend="svn-ch-5-sect-6.1"/> to read more about
+ linkend="svn.reposadmin.projects.chooselayout"/> to read more about
<quote>project roots</quote>):</para>
@ENGLISH }}} -->
<para>Hvis et depot inneholder flere prosjekter, legger
administratorer vanligvis depotet opp etter prosjekt (se <xref
- linkend="svn-ch-5-sect-6.1"/> for å lese mer om
- <quote>prosjektrøtter</quote>):</para>
+ linkend="svn.reposadmin.projects.chooselayout"/> for å lese mer
+ om <quote>prosjektrøtter</quote>):</para>
<screen>
/paint/trunk
@@ -3962,7 +3967,7 @@
</sect2>
- <sect2 id="svn-ch-4-sect-7.2">
+ <sect2 id="svn.branchmerge.maint.lifetime">
<!-- @ENGLISH {{{
<title>Data Lifetimes</title>
@ENGLISH }}} -->
@@ -4109,7 +4114,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 8 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-4-sect-8">
+ <sect1 id="svn.branchmerge.summary">
<!-- @ENGLISH {{{
<title>Summary</title>
@ENGLISH }}} -->
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-5">
+<chapter id="svn.reposadmin">
<!-- @ENGLISH {{{
<title>Repository Administration</title>
@ENGLISH }}} -->
@@ -71,7 +71,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 1: REPOSITORY BASICS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-5-sect-1">
+ <sect1 id="svn.reposadmin.basics">
<!-- @ENGLISH {{{
<title>Repository Basics</title>
@ENGLISH }}} -->
@@ -104,7 +104,7 @@
konseptene på et høyt nivå.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-1.1">
+ <sect2 id="svn.reposadmin.basics.txnsrevs">
<!-- @ENGLISH {{{
<title>Understanding Transactions and Revisions</title>
@ENGLISH }}} -->
@@ -225,7 +225,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-1.2">
+ <sect2 id="svn.reposadmin.basics.revprops">
<!-- @ENGLISH {{{
<title>Unversioned Properties</title>
@ENGLISH }}} -->
@@ -307,7 +307,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-1.3">
+ <sect2 id="svn.reposadmin.basics.backends">
<!-- @ENGLISH {{{
<title>Repository Data-Stores</title>
@ENGLISH }}} -->
@@ -368,7 +368,7 @@
mellom depoter av typen Berkeley DB og FSFS.
De neste seksjonene går inn i detalj.</para>
- <table id="svn-ch-5-table-1">
+ <table id="svn.reposadmin.basics.backends.tbl-1">
<!-- @ENGLISH {{{
<title>Repository Data-Store Comparison</title>
@ENGLISH }}} -->
@@ -578,7 +578,7 @@
</table>
<!-- ***************************************************************** -->
- <sect3 id="svn-ch-5-sect-1.3.1">
+ <sect3 id="svn.reposadmin.basics.backends.bdb">
<title>Berkeley DB</title>
<!-- @ENGLISH {{{
@@ -631,7 +631,7 @@
backups</firstterm>—the ability to backup the database
environment without taking it <quote>offline</quote>. We'll
discuss how to backup your repository in <xref
- linkend="svn-ch-5-sect-3.6"/>, but the benefits of being
+ linkend="svn.reposadmin.maint.backup"/>, but the benefits of being
able to make fully functional copies of your repositories
without any downtime should be obvious.</para>
@ENGLISH }}} -->
@@ -640,9 +640,9 @@
backups</foreignphrase>) – muligeten til å ta sikkerhetskopi
av databasen uten å ta den ned.
Vi vil diskutere hvordan du tar backup av depotet i <xref
- linkend="svn-ch-5-sect-3.6"/>, men fordelene med å kunne ta
- fullstendige fungerende kopier av depotene dine uten nedetid
- er innlysende.</para>
+ linkend="svn.reposadmin.maint.backup"/>, men fordelene med å
+ kunne ta fullstendige fungerende kopier av depotene dine uten
+ nedetid er innlysende.</para>
<!-- @ENGLISH {{{
<para>Berkeley DB is also a very reliable database system.
@@ -654,7 +654,7 @@
a previous <firstterm>checkpoint</firstterm>—a
location in the log files known not to be corrupt—and
replay transactions until the data is restored to a usable
- state. See <xref linkend="svn-ch-5-sect-3.3"/> for more
+ state. See <xref linkend="svn.reposadmin.maint.diskspace"/> for more
about Berkeley DB log files.</para>
@ENGLISH }}} -->
<para>Berkeley DB er også et veldig sikkert databasesystem.
@@ -667,8 +667,9 @@
<firstterm>sjekkpunkt</firstterm> – en posisjon i loggfilene
som den vet ikke er ødelagt – og <quote>spille av</quote>
transaksjoner inntil dataene er gjenopprettet til en
- fungerende tilstand. Se <xref linkend="svn-ch-5-sect-3.3"/>
- for mer angående loggfilene i Berkeley DB.</para>
+ fungerende tilstand. Se <xref
+ linkend="svn.reposadmin.maint.diskspace"/> for mer angående
+ loggfilene i Berkeley DB.</para>
<!-- @ENGLISH {{{
<para>But every rose has its thorn, and so we must note some
@@ -728,11 +729,11 @@
used by a single server process running as one
user—such as Apache's <command>httpd</command> or
<command>svnserve</command> (see <xref
- linkend="svn-ch-6"/>)—rather than accessing it as
+ linkend="svn.serverconfig"/>)—rather than accessing it as
many different users via <literal>file:///</literal> or
<literal>svn+ssh://</literal> URLs. If using a Berkeley DB
repository directly as multiple users, be sure to read <xref
- linkend="svn-ch-6-sect-5"/>.</para>
+ linkend="svn.serverconfig.multimethod"/>.</para>
@ENGLISH }}} -->
<para>Til sist, fordi Berkeley DB er et bibliotek linket direkte
inn i Subversion, er det mer sensibelt for avbrudd enn et
@@ -761,18 +762,18 @@
fungerer det best når det kun blir brukt av én enkelt
tjenerprosess som kjører som én bruker – som for eksempel
Apaches <command>httpd</command> eller
- <command>svnserve</command> (se <xref linkend="svn-ch-6"/>) –
- istedenfor å aksessere det med mange forskjellige brukere via
- <literal>file:///</literal> eller
- <literal>svn+ssh://</literal>-URLer.
+ <command>svnserve</command> (se <xref
+ linkend="svn.serverconfig"/>) – istedenfor å aksessere det med
+ mange forskjellige brukere via <literal>file:///</literal>
+ eller <literal>svn+ssh://</literal>-URLer.
Hvis et Berkeley DB-depot blir brukt direkte med flere
forskjellige brukere, pass på at du har lest <xref
- linkend="svn-ch-6-sect-5"/>.</para>
+ linkend="svn.serverconfig.multimethod"/>.</para>
</sect3>
<!-- ***************************************************************** -->
- <sect3 id="svn-ch-5-sect-1.3.2">
+ <sect3 id="svn.reposadmin.basics.backends.fsfs">
<title>FSFS</title>
<!-- @ENGLISH {{{
@@ -901,7 +902,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 2: REPOSITORY CREATION AND CONFIGURATION *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-5-sect-2">
+ <sect1 id="svn.reposadmin.create">
<!-- @ENGLISH {{{
<title>Repository Creation and Configuration</title>
@ENGLISH }}} -->
@@ -1002,7 +1003,7 @@
process (such as Apache or <command>svnserve</command>), store
the repository on a local filesystem which the server can
access, and make the repository available over a network.
- <xref linkend="svn-ch-6"/> covers this process in
+ <xref linkend="svn.serverconfig"/> covers this process in
detail.</para>
@ENGLISH }}} -->
<para>Hvis du trenger flere datamaskiner for å aksessere depotet,
@@ -1011,8 +1012,9 @@
Eller enda bedre, sett opp en skikkelig tjenerprosess (som for
eksempel Apache eller <command>svnserve</command>), legg depotet
i et lokalt filsystem som tjeneren aksessere, og gjør depotet
- tilgjengelig over et nettverk. <xref linkend="svn-ch-6"/> dekker
- denne prosessen i detalj.</para>
+ tilgjengelig over et nettverk. <xref
+ linkend="svn.serverconfig"/> dekker denne prosessen i
+ detalj.</para>
</warning>
<!-- @ENGLISH {{{
@@ -1185,7 +1187,7 @@
her.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-2.1">
+ <sect2 id="svn.reposadmin.create.hooks">
<!-- @ENGLISH {{{
<title>Hook Scripts</title>
@ENGLISH }}} -->
@@ -1408,7 +1410,7 @@
<command>mod_authz_svn</command> Apache httpd module,
which provides both read and write access control on
individual directories (see <xref
- linkend="svn-ch-6-sect-4.4.2"/>). In a future version
+ linkend="svn.serverconfig.httpd.authz.perdir"/>). In a future version
of Subversion, we plan to implement access control lists
(ACLs) directly in the filesystem.</para>
@ENGLISH }}} -->
@@ -1421,7 +1423,7 @@
En annen mulighet er å bruke Apache-modulen
<command>mod_authz_svn</command>, som gir både lese- og
skrivekontroll i individuelle kataloger (se <xref
- linkend="svn-ch-6-sect-4.4.2"/>).
+ linkend="svn.serverconfig.httpd.authz.perdir"/>).
I en fremtidig versjon av Subversion planlegger vi å legge
inn lister for aksesskontroll (ACL) direkte inn i
filsystemet.</para>
@@ -1677,7 +1679,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-2.2">
+ <sect2 id="svn.reposadmin.create.bdb">
<!-- @ENGLISH {{{
<title>Berkeley DB Configuration</title>
@ENGLISH }}} -->
@@ -1766,7 +1768,7 @@
<!-- *** SECTION 3: REPOSITORY MAINTENANCE *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-5-sect-3">
+ <sect1 id="svn.reposadmin.maint">
<!-- @ENGLISH {{{
<title>Repository Maintenance</title>
@ENGLISH }}} -->
@@ -1793,7 +1795,7 @@
sikkerhetskopier og opprydding.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.1">
+ <sect2 id="svn.reposadmin.maint.tk">
<!-- @ENGLISH {{{
<title>An Administrator's Toolkit</title>
@ENGLISH }}} -->
@@ -1816,7 +1818,7 @@
spesifikk til databasedelen i depotet som ikke Subversions egne
verktøy tar seg av.</para>
- <sect3 id="svn-ch-5-sect-3.1.1">
+ <sect3 id="svn.reposadmin.maint.tk.svnlook">
<title>svnlook</title>
<!-- @ENGLISH {{{
@@ -2314,7 +2316,7 @@
</sect3>
- <sect3 id="svn-ch-5-sect-3.1.2">
+ <sect3 id="svn.reposadmin.maint.tk.svnadmin">
<title>svnadmin</title>
<!-- @ENGLISH {{{
@@ -2364,14 +2366,14 @@
<!-- @ENGLISH {{{
<para>We've already mentioned <command>svnadmin</command>'s
<literal>create</literal> subcommand (see <xref
- linkend="svn-ch-5-sect-2"/>). Most of the others we will
+ linkend="svn.reposadmin.create"/>). Most of the others we will
cover in more detail later in this chapter. For now, let's
just take a quick glance at what each of the available
subcommands offers.</para>
@ENGLISH }}} -->
<para>Vi har allerede nevnt delkommandoen
<literal>create</literal> i <command>svnadmin</command> (se
- <xref linkend="svn-ch-5-sect-2"/>).
+ <xref linkend="svn.reposadmin.create"/>).
De fleste andre vil vi gå grundigere gjennom senere i dette
kapitlet.
Nå nøyer vi oss med å ta en rask kikk på hva de forskjellige
@@ -2566,7 +2568,7 @@
</sect3>
- <sect3 id="svn-ch-5-sect-3.1.3">
+ <sect3 id="svn.reposadmin.maint.tk.svndumpfilter">
<title>svndumpfilter</title>
<!-- @ENGLISH {{{
@@ -2617,7 +2619,7 @@
<command>svnadmin dump</command> command to generate the
dump data, and <command>svnadmin load</command> to populate
a new repository with it (see <xref
- linkend="svn-ch-5-sect-3.5"/>). The great thing about the
+ linkend="svn.reposadmin.maint.migrate"/>). The great thing about the
human-readability aspect of the dump format is that, if you
aren't careless about it, you can manually inspect and
modify it. Of course, the downside is that if you have two
@@ -2631,7 +2633,7 @@
Du bruker kommandoen <command>svnadmin dump</command> for å
generere dumpdataene, og <command>svnadmin load</command> for
å legge disse dataene inn i et nytt depot (se <xref
- linkend="svn-ch-5-sect-3.5"/>).
+ linkend="svn.reposadmin.maint.migrate"/>).
Den fine tingen med det menneskelesbare dumpformatet er at du
kan inspisere og modifisere det hvis du er forsiktig.
Selvfølgelig, bakdelen er at hvis du har to år med
@@ -2720,7 +2722,7 @@
<!-- @ENGLISH {{{
<para>Let's look a realistic example of how you might use this
program. We discuss elsewhere (see <xref
- linkend="svn-ch-5-sect-6.1"/>) the process of deciding how to
+ linkend="svn.reposadmin.projects.chooselayout"/>) the process of deciding how to
choose a layout for the data in your
repositories—using one repository per project or
combining them, arranging stuff within your repository, and
@@ -2733,10 +2735,11 @@
<para>La oss se på et realistisk eksempel på hvordan du vil
bruke dette programmet.
Vi diskuterer en annen plass (se <xref
- linkend="svn-ch-5-sect-6.1"/>) prosessen med å bestemme deg
- for hvordan dataene i depotene dine skal legges opp – om du
- vil bruke ett depot for hvert prosjekt eller kombinere dem,
- hvordan du arrangerer ting innenfor depotet og så videre.
+ linkend="svn.reposadmin.projects.chooselayout"/>) prosessen
+ med å bestemme deg for hvordan dataene i depotene dine skal
+ legges opp – om du vil bruke ett depot for hvert prosjekt
+ eller kombinere dem, hvordan du arrangerer ting innenfor
+ depotet og så videre.
Men noen ganger etter at nye revisjoner begynner å komme inn,
tenker du på nytt over layouten og vil gjøre noen
forandringer.
@@ -3114,222 +3117,7 @@
</sect3>
- <sect3 id="svn-ch-5-sect-3.1.4">
- <title>svnshell.py</title>
-
- <!-- @ENGLISH {{{
- <para>The Subversion source tree also comes with a shell-like
- interface to the repository. The
- <command>svnshell.py</command> Python script (located in
- <filename>tools/examples/</filename> in the source tree)
- uses Subversion's language bindings (so you must have
- those properly compiled and installed in order for this
- script to work) to connect to the repository and filesystem
- libraries.</para>
- @ENGLISH }}} -->
- <para>Kildekodetreet til Subversion kommer også med et
- skall-lignende grensesnitt til depotet.
- Python-skriptet <command>svnshell.py</command> (lokalisert i
- <filename>tools/examples/</filename> i kildekodetreet) bruker
- Subversions <!-- ¤ Det h̲ø̲r̲e̲s̲ riktig ut, men er det det?
- -->språkbindinger (så du må ha disse skikkelig kompilert og
- installert for at dette skriptet skal virke) for å koble seg
- til depot- og filsystembibliotekene.</para>
-
- <!-- @ENGLISH {{{
- <para>Once started, the program behaves similarly to a shell
- program, allowing you to browse the various directories in
- your repository. Initially, you are
- <quote>positioned</quote> in the root directory of the
- <literal>HEAD</literal> revision of the repository, and
- presented with a command prompt. You can use the
- <literal>help</literal> command at any time to display a
- list of available commands and what they do.</para>
- @ENGLISH }}} -->
- <para>Når det er startet, oppfører programmet som likt et skall
- og lar deg bla gjennom de forskjellige katalogene i depotet
- ditt.
- I starten er du <quote>plassert</quote> i rotkatalogen for
- <literal>HEAD</literal>-revisjonen i depotet, og du får en
- kommandolinje.
- Du kan bruke <literal>help</literal>-kommandoen til enhver tid
- for å vise en liste over tilgjengelige kommandoer og hva de
- gjør.</para>
-
- <!-- @ENGLISH {{{
- <screen>
-$ svnshell.py /path/to/repos
-<rev: 2 />$ help
-Available commands:
- cat FILE : dump the contents of FILE
- cd DIR : change the current working directory to DIR
- exit : exit the shell
- ls [PATH] : list the contents of the current directory
- lstxns : list the transactions available for browsing
- setrev REV : set the current revision to browse
- settxn TXN : set the current transaction to browse
- youngest : list the youngest browsable revision number
-<rev: 2 />$
-</screen>
- @ENGLISH }}} -->
- <!-- ¤ Den der bør virkelig fornorskes, men det tar vi seinere.
- Eller kan vi det? Det er jo ikke noe i18n-opplegg på svnshell.py
- for øyeblikket. Hm. --><screen>
-$ svnshell.py /sti/til/depot
-<rev: 2 />$ help
-Available commands:
- cat FILE : dump the contents of FILE
- cd DIR : change the current working directory to DIR
- exit : exit the shell
- ls [PATH] : list the contents of the current directory
- lstxns : list the transactions available for browsing
- setrev REV : set the current revision to browse
- settxn TXN : set the current transaction to browse
- youngest : list the youngest browsable revision number
-<rev: 2 />$
-</screen>
-
- <!-- @ENGLISH {{{
- <para>Navigating the directory structure of your repository is
- done in the same way you would navigate a regular Unix or
- Windows shell—using the <literal>cd</literal> command.
- At all times, the command prompt will show you what revision
- (prefixed by <literal>rev:</literal>) or transaction
- (prefixed by <literal>txn:</literal>) you are currently
- examining, and at what path location in that revision or
- transaction. You can change your current revision or
- transaction with the <literal>setrev</literal> and
- <literal>settxn</literal> commands, respectively. As in a
- Unix shell, you can use the <literal>ls</literal> command to
- display the contents of the current directory, and you can
- use the <literal>cat</literal> command to display the
- contents of a file.</para>
- @ENGLISH }}} -->
- <para>Navigering i katalogstrukturen til depotet ditt gjøres på
- samme måten som du gjør i et vanlig Unix- eller Windowsskall –
- ved å bruke kommandoen <literal>cd</literal>.
- Kommandolinjeprompten vil til enhver tid vise deg hvilken
- revisjon (inneholder forstavelsen <literal>rev:</literal>)
- eller transaksjon (inneholder forstavelsen
- <literal>txn:</literal>) du undersøker for øyeblikket, og
- stiplasseringen i denne revisjonen eller transaksjonen.
- Du kan forandre din nåværende revisjon eller transaksjon med
- henholdsvis <literal>setrev</literal>- og
- <literal>settxn</literal>-kommandoen.
- Som i et Unixskall kan du bruke kommandoen
- <literal>ls</literal> for å vise innholdet av den nåværende
- katalogen, og du kan bruke <literal>cat</literal>-kommandoen
- for å vise innholdet av en fil.</para>
-
- <example id="svn-ch-8-sect-3.1.3-ex-1">
- <!-- @ENGLISH {{{
- <title>Using svnshell to Navigate the Repository</title>
- @ENGLISH }}} -->
- <title>Bruk av svnshell for å navigere i depotet</title>
-
- <screen>
-<rev: 2 />$ ls
- REV AUTHOR NODE-REV-ID SIZE DATE NAME
-----------------------------------------------------------------------------
- 1 sally < 2.0.1> Nov 15 11:50 A/
- 2 harry < 1.0.2> 56 Nov 19 08:19 iota
-<rev: 2 />$ cd A
-<rev: 2 /A>$ ls
- REV AUTHOR NODE-REV-ID SIZE DATE NAME
-----------------------------------------------------------------------------
- 1 sally < 4.0.1> Nov 15 11:50 B/
- 1 sally < a.0.1> Nov 15 11:50 C/
- 1 sally < b.0.1> Nov 15 11:50 D/
- 1 sally < 3.0.1> 23 Nov 15 11:50 mu
-<rev: 2 /A>$ cd D/G
-<rev: 2 /A/D/G>$ ls
- REV AUTHOR NODE-REV-ID SIZE DATE NAME
-----------------------------------------------------------------------------
- 1 sally < e.0.1> 23 Nov 15 11:50 pi
- 1 sally < f.0.1> 24 Nov 15 11:50 rho
- 1 sally < g.0.1> 24 Nov 15 11:50 tau
-<rev: 2 /A>$ cd ../..
-<rev: 2 />$ cat iota
-This is the file 'iota'.
-Added this text in revision 2.
-
-<rev: 2 />$ setrev 1; cat iota
-This is the file 'iota'.
-
-<rev: 1 />$ exit
-$
-</screen>
- </example>
-
- <!-- @ENGLISH {{{
- <para>As you can see in the previous example, multiple
- commands may be specified at a single command prompt,
- separated by a semicolon. Also, the shell understands the
- notions of relative and absolute paths, and will properly
- handle the <literal>.</literal> and
- <literal>..</literal> special path components.</para>
- @ENGLISH }}} -->
- <para>Som du ser i det forrige eksempelet kan flere kommandoer
- bli spesifisert på en enkelt kommandolinje, separert med et
- semikolon.
- I tillegg forstår skallet <!-- ¤ notions of --> relative og
- absolutte stier og vil behandle stikomponentene
- <literal>.</literal> og <literal>..</literal> på en skikkelig
- måte.</para>
-
- <!-- @ENGLISH {{{
- <para>The <literal>youngest</literal> command displays the
- youngest revision. This is useful for determining the range
- of valid revisions you can use as arguments to the
- <literal>setrev</literal> command—you are allowed to
- browse all the revisions (recalling that they are named with
- integers) between 0 and the youngest, inclusively.
- Determining the valid browsable transactions isn't quite as
- pretty. Use the <command>lstxns</command> command to list
- the transactions that you are able to browse. The list of
- browsable transactions is the same list that
- <command>svnadmin lstxns</command> returns, and the same
- list that is valid for use with <command>svnlook</command>'s
- <option>-ﳢ-transaction</option> option.</para>
- @ENGLISH }}} -->
- <para><literal>youngest</literal>-kommandoen viser den yngste
- revisjonen.
- Dette er nyttig for å anslå området av gyldige revisjoner du
- kan bruke som argumenter til
- <literal>setrev</literal>-kommandoen – du har lov til å bla
- gjennom alle revisjonene (husk at de benevnes med heltall)
- mellom 0 til og med den yngste.
- Å anslå de gyldige transaksjonene som du kan bla gjennom er
- ikke like <!-- ¤ «Nydelig» blir forsåvidt ikke helt korrekt.
- Sjekkes ut når jeg kommer på en maskin med skikkelig python.
- -->enkelt.
- Bruk <command>lstxns</command>-kommandoen for å liste
- transaksjonene som du kan bla gjennom.
- Listen med transaksjoner som du kan bla gjennom er den samme
- som <command>svnadmin lstxns</command> returnerer, og den
- samme listen som er gyldig for bruk sammen med
- <command>svnlook</command>-valget
- <option>--transaction</option>.</para>
-
- <!-- @ENGLISH {{{
- <para>Once you've finished using the shell, you can exit
- cleanly by using the <command>exit</command> command.
- Alternatively, you can supply an end-of-file
- character—Control-D (though some Win32 Python
- distributions use the Windows Control-Z convention
- instead).</para>
- @ENGLISH }}} -->
- <para>Når du er ferdig med å bruke skallet, kan du trygt
- avslutte ved å bruke <command>exit</command>-kommandoen.
- Alternativt kan du skrive et filslutt-tegn – Ctrl-d (<!-- ¤
- «though» → «selv om». svnshell.py sjekker for EOF i linje 46.
- Betyr det at CTRL-d brukes uansett, eller varierer det med
- CTRL-z ? -->selv om noen Win32-distribusjoner av Python bruker
- Windows-varianten Ctrl-z istedenfor).</para>
-
- </sect3>
-
- <sect3 id="svn-ch-5-sect-3.1.5">
+ <sect3 id="svn.reposadmin.maint.tk.bdbutil">
<!-- @ENGLISH {{{
<title>Berkeley DB Utilities</title>
@ENGLISH }}} -->
@@ -3413,7 +3201,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.2">
+ <sect2 id="svn.reposadmin.maint.cleanup">
<!-- @ENGLISH {{{
<title>Repository Cleanup</title>
@ENGLISH }}} -->
@@ -3490,11 +3278,11 @@
repository is configured (using the
<literal>pre-revprop-change</literal> and
<literal>post-revprop-change</literal> hooks; see <xref
- linkend="svn-ch-5-sect-2.1"/>) to accept changes to this log
+ linkend="svn.reposadmin.create.hooks"/>) to accept changes to this log
message after the commit is finished, then the user can
<quote>fix</quote> her log message remotely using the
<command>svn</command> program's <literal>propset</literal>
- command (see <xref linkend="svn-ch-9"/>). However, because of
+ command (see <xref linkend="svn.ref"/>). However, because of
the potential to lose information forever, Subversion
repositories are not, by default, configured to allow changes
to unversioned properties—except by an administrator.</para>
@@ -3504,12 +3292,13 @@
Hvis depotet er satt opp (ved bruk av påhakningene
<literal>pre-rev-prop-change</literal> og
<literal>post-revprop-change</literal>; se <xref
- linkend="svn-ch-5-sect-2.1"/>) til å akseptere forandringer i
- denne loggmeldingen etter at innleggingen er ferdig, kan
- brukeren <quote>fikse</quote> loggmeldingen <!-- remotely -->fra
- en annen maskin ved bruk av <command>svn</command>-programmets
+ linkend="svn.reposadmin.create.hooks"/>) til å akseptere
+ forandringer i denne loggmeldingen etter at innleggingen er
+ ferdig, kan brukeren <quote>fikse</quote> loggmeldingen <!--
+ remotely -->fra en annen maskin ved bruk av
+ <command>svn</command>-programmets
<literal>propset</literal>-kommando (se <xref
- linkend="svn-ch-9"/>).
+ linkend="svn.ref"/>).
Men fordi det her er en potensiell sjanse for å miste
informasjon for alltid, er standard oppsett på et
Subversiondepot å ikke godta forandringer til uversjonerte
@@ -3581,17 +3370,20 @@
<!-- @ENGLISH {{{
<para>Another common use of <command>svnadmin</command> is to
query the repository for outstanding—possibly
- dead—Subversion transactions. In the event that a commit
- should fail, the transaction is usually cleaned up. That is,
- the transaction itself is removed from the repository, and any
- data associated with (and only with) that transaction is
- removed as well. Occasionally, though, a failure occurs in
- such a way that the cleanup of the transaction never happens.
- This could happen for several reasons: perhaps the client
- operation was inelegantly terminated by the user, or a network
- failure might have occurred in the middle of an operation, etc.
- Regardless of the reason, these dead transactions serve only
- to clutter the repository and consume resources.</para>
+ dead—Subversion transactions. In the event that a
+ commit should fail, the transaction is usually cleaned up.
+ That is, the transaction itself is removed from the
+ repository, and any data associated with (and only with) that
+ transaction is removed as well. Occasionally, though, a
+ failure occurs in such a way that the cleanup of the
+ transaction never happens. This could happen for several
+ reasons: perhaps the client operation was inelegantly
+ terminated by the user, or a network failure might have
+ occurred in the middle of an operation, etc. Regardless of
+ the reason, dead transactions can happen. They don't do any
+ real harm, other than consuming a small bit of disk space. A
+ fastidious administrator may nonetheless want to remove
+ them.</para>
@ENGLISH }}} -->
<para>En annen vanlig måte å bruke <command>svnadmin</command> på
er å spørre depotet om utestående – muligens døde –
@@ -3607,8 +3399,10 @@
Kanskje ble klientoperasjonen uelegant avsluttet av brukeren,
eller en nettverksfeil kan ha skjedd midt i en operasjon og så
videre.
- Uansett grunnen, disse døde transaksjonene er bare skrot i
- depotet og tar opp ressurser.</para>
+ Uansett grunnen, døde transaksjoner kan skje.
+ De gjør ingen reell skade utenom å okkupere en liten del av
+ diskplassen, og en pertentlig administrator vil nok ønske å
+ fjerne dem.</para>
<!-- @ENGLISH {{{
<para>You can use <command>svnadmin</command>'s
@@ -3689,7 +3483,7 @@
Det følgende er en skallsnutt som raskt kan generere informasjon
om hver utestående transaksjon i depotet ditt:</para>
- <example id="svn-ch-5-sect-3.2-ex-1">
+ <example id="svn.reposadmin.maint.cleanup.ex-1">
<!-- @ENGLISH {{{
<title>txn-info.sh (Reporting Outstanding Transactions)</title>
@ENGLISH }}} -->
@@ -3703,18 +3497,15 @@
### Generate informational output for all outstanding transactions in
### a Subversion repository.
-SVNADMIN=/usr/local/bin/svnadmin
-SVNLOOK=/usr/local/bin/svnlook
-
REPOS="${1}"
if [ "x$REPOS" = x ] ; then
echo "usage: $0 REPOS_PATH"
exit
fi
-for TXN in `${SVNADMIN} lstxns ${REPOS}`; do
+for TXN in `svnadmin lstxns ${REPOS}`; do
echo "-ﳢ-ﳢ-[ Transaction ${TXN} ]-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-ﳢ-"
- ${SVNLOOK} info "${REPOS}" -ﳢ-transaction "${TXN}"
+ svnlook info "${REPOS}" -ﳢ-transaction "${TXN}"
done
</programlisting>
@ENGLISH }}} -->
@@ -3724,18 +3515,15 @@
### Generer informasjon om alle utestående transaksjoner i et
### Subversiondepot.
-SVNADMIN=/usr/local/bin/svnadmin
-SVNLOOK=/usr/local/bin/svnlook
-
REPOS="${1}"
if [ "x$REPOS" = x ] ; then
echo "bruk: $0 STI_TIL_DEPOT"
exit
fi
-for TXN in `${SVNADMIN} lstxns ${REPOS}`; do
+for TXN in `svnadmin lstxns ${REPOS}`; do
echo "---[ Transaksjon ${TXN} ]-------------------------------------------"
- ${SVNLOOK} info "${REPOS}" --transaction "${TXN}"
+ svnlook info "${REPOS}" --transaction "${TXN}"
done
</programlisting>
</example>
@@ -3745,15 +3533,15 @@
<command>/path/to/txn-info.sh /path/to/repos</command>. The
output is basically a concatenation of several chunks of
<command>svnlook info</command> output (see <xref
- linkend="svn-ch-5-sect-3.1.1"/>), and will look something
+ linkend="svn.reposadmin.maint.tk.svnlook"/>), and will look something
like:</para>
@ENGLISH }}} -->
<para>Du kan kjøre det foregående skriptet ved å bruke
<command>/sti/til/txn-info.sh /sti/til/depot</command>.
Utdataene er hovedsaklig flere biter av utdataene fra
<command>svnlook info</command> som er satt sammen (se <xref
- linkend="svn-ch-5-sect-3.1.1"/>), og vil se ut som noe i denne
- retningen:</para>
+ linkend="svn.reposadmin.maint.tk.svnlook"/>), og vil se ut som
+ noe i denne retningen:</para>
<!-- @ENGLISH {{{
<screen>
@@ -3793,31 +3581,17 @@
</screen>
<!-- @ENGLISH {{{
- <para>Usually, if you see a dead transaction that has no log
- message attached to it, this is the result of a failed update
- (or update-like) operation. These operations use Subversion
- transactions under the hood to mimic working copy state.
- Since they are never intended to be committed, Subversion
- doesn't require a log message for those transactions.
- Transactions that do have log messages attached are almost
- certainly failed commits of some sort. Also, a transaction's
- datestamp can provide interesting information—for
- example, how likely is it that an operation begun nine months
- ago is still active?</para>
- @ENGLISH }}} -->
- <para>Vanligvis, hvis du ser en død transaksjon som ikke har noen
- loggmelding vedlagt, er dette et resultat av en
- oppdateringsoperasjon (eller noe i likhet med en oppdatering)
- som har feilet.
- Disse operasjonene bruker Subversiontransaksjoner under panseret
- for å <!-- ¤ -->simulere tilstanden til en arbeidskopi.
- Siden de aldri er ment å bli lagt inn i depotet, krever ikke
- Subversion en loggmelding for disse transaksjonene.
- Transaksjoner som har loggmeldinger vedlagt er omtrent helt
- sikkert mislykkede innlegginger av en eller annen type.
- I tillegg kan tidspunktet til en transaksjon bidra med
- interessant informasjon – for eksempel, hvor sannsynlig er det
- at en operasjon som begynte for ni måneder siden fortsatt er
+ <para>An long-abandoned transaction usually represents some sort
+ of failed or interrupted commit. A transaction's datestamp
+ can provide interesting information—for example, how
+ likely is it that an operation begun nine months ago is still
+ active?</para>
+ @ENGLISH }}} -->
+ <para>En transaksjon som har vært avbrutt over lengre tid
+ representerer vanligvis en feilet eller avbrutt innlegging.
+ Tidspunktet til en transaksjon kan bidra med interessant
+ informasjon – for eksempel, hvor sannsynlig er det at en
+ operasjon som begynte for ni måneder siden fortsatt er
aktiv?</para>
<!-- @ENGLISH {{{
@@ -3843,7 +3617,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.3">
+ <sect2 id="svn.reposadmin.maint.diskspace">
<!-- @ENGLISH {{{
<title>Managing Disk Space</title>
@ENGLISH }}} -->
@@ -3918,7 +3692,7 @@
DB_LOG_AUTOREMOVE</literal> directive, and then run
<command>svnadmin recover</command> on your repository to
force the configuration changes to take effect. See <xref
- linkend="svn-ch-5-sect-2.2"/> for more information about
+ linkend="svn.reposadmin.create.bdb"/> for more information about
database configuration.</para>
@ENGLISH }}} -->
<para>Heldigvis, fra og med 4.2-versjonen av Berkeley DB har
@@ -3938,8 +3712,8 @@
<literal>set_flags DB_LOG_AUTOREMOVE</literal> og kjører
deretter <command>svnadmin recover</command> på depotet ditt
for å aktivisere forandringene i konfigrasjonen.
- Se <xref linkend="svn-ch-5-sect-2.2"/> for mer informasjon om
- databasekonfigurasjon.</para>
+ Se <xref linkend="svn.reposadmin.create.bdb"/> for mer
+ informasjon om databasekonfigurasjon.</para>
<!-- @ENGLISH {{{
<para>Without some sort of automatic log file removal in
@@ -4058,22 +3832,23 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.4">
+ <sect2 id="svn.reposadmin.maint.recovery">
<!-- @ENGLISH {{{
<title>Repository Recovery</title>
@ENGLISH }}} -->
<title>Depotgjenoppretting</title>
<!-- @ENGLISH {{{
- <para>As mentioned in <xref linkend="svn-ch-5-sect-1.3.1"/>, a
+ <para>As mentioned in <xref linkend="svn.reposadmin.basics.backends.bdb"/>, a
Berkeley DB repository can sometimes be left in frozen state
if not closed properly. When this happens, an administrator
needs to rewind the database back into a consistent
state.</para>
@ENGLISH }}} -->
- <para>Som nevnt i <xref linkend="svn-ch-5-sect-1.3.1"/>, kan et
- Berkeley DB-depot noen ganger bli etterlatt i en frosset
- tilstand hvis den ikke blir skikkelig lukket.
+ <para>Som nevnt i <xref
+ linkend="svn.reposadmin.basics.backends.bdb"/>, kan et Berkeley
+ DB-depot noen ganger bli etterlatt i en frosset tilstand hvis
+ den ikke blir skikkelig lukket.
Når dette skjer, må en administrator rulle databasen tilbake i
funksjonell stand.</para>
@@ -4268,7 +4043,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.5">
+ <sect2 id="svn.reposadmin.maint.migrate">
<!-- @ENGLISH {{{
<title>Migrating a Repository</title>
@ENGLISH }}} -->
@@ -4381,14 +4156,14 @@
then you'll probably want to tell your users to run
<command>svn switch -ﳢ-relocate</command> on their existing
working copies. See <xref
- linkend="svn-ch-9-sect-1.2-re-switch"/>.</para>
+ linkend="svn.ref.svn.c.switch"/>.</para>
@ENGLISH }}} -->
<para>Hvis flytteprosessen gjør depotet ditt tilgjengelig på
en annen URL (for eksempel flyttet til en annen maskin eller
blir aksessert på en annen måte), bør du be alle brukerne
dine om å kjøre <command>svn switch --relocate</command> på
sine eksisterende arbeidskopier.
- Se <xref linkend="svn-ch-9-sect-1.2-re-switch"/>.</para>
+ Se <xref linkend="svn.ref.svn.c.switch"/>.</para>
</listitem>
</orderedlist>
@@ -4854,7 +4629,7 @@
changes—each of which should be treated as a new
revision—using this file format. In fact, the
<command>cvs2svn.py</command> utility (see <xref
- linkend="svn-ap-a-sect-11"/>) uses the dump format to represent the
+ linkend="svn.forcvs.convert"/>) uses the dump format to represent the
contents of a CVS repository so that those contents can be
moved in a Subversion repository.</para>
@ENGLISH }}} -->
@@ -4868,14 +4643,14 @@
beskrive generelle sett med forandringer – ved å bruke dette
filformatet.
Faktisk bruker programmet <command>cvs2svn.py</command> (se
- <xref linkend="svn-ap-a-sect-11"/>) dumpformatet for å
+ <xref linkend="svn.forcvs.convert"/>) dumpformatet for å
representere innholdet i et CVS-depot så dette innholdet kan bli
flyttet inn i et Subversiondepot.</para>
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-3.6">
+ <sect2 id="svn.reposadmin.maint.backup">
<!-- @ENGLISH {{{
<title>Repository Backup</title>
@ENGLISH }}} -->
@@ -4908,7 +4683,7 @@
full. We discussed in an earlier section of this chapter how
to use <command>svnadmin dump -ﳢ-incremental</command> to
perform an incremental backup (see <xref
- linkend="svn-ch-5-sect-3.5"/>). Essentially, the idea is to
+ linkend="svn.reposadmin.maint.migrate"/>). Essentially, the idea is to
only backup at a given time the changes to the repository
since the last time you made a backup.</para>
@ENGLISH }}} -->
@@ -4918,7 +4693,7 @@
Vi diskuterte i en tidligere seksjon i dette kapittelet hvordan
<command>svnadmin dump --incremental</command> kan brukes til å
utføre en inkrementell backup (se <xref
- linkend="svn-ch-5-sect-3.5"/>).
+ linkend="svn.reposadmin.maint.migrate"/>).
Essensen i idéen er at på det punktet kopien lages blir kun
forandringene i depotet siden forrige backup tatt med.</para>
@@ -4983,7 +4758,7 @@
systems). Or, if you prefer fine-grained backup solutions,
you could have your post-commit hook script call
<command>hot-backup.py</command> (see <xref
- linkend="svn-ch-5-sect-2.1" />), which will then cause a new
+ linkend="svn.reposadmin.create.hooks" />), which will then cause a new
backup of your repository to occur with every new revision
created. Simply add the following to the
<filename>hooks/post-commit</filename> script in your live
@@ -4998,8 +4773,8 @@
Eller, hvis du foretrekker finkornede backupløsninger, kan du
sette post-commit-skriptet til å kalle
<command>hot-backup.py</command> (se <xref
- linkend="svn-ch-5-sect-2.1" />), som vil lage en ny kopi av
- depotet for hver ny revisjon som er opprettet.
+ linkend="svn.reposadmin.create.hooks" />), som vil lage en ny
+ kopi av depotet for hver ny revisjon som er opprettet.
Bare legg det følgende til
<filename>hook/post-commit</filename>-skriptet i katalogen til
det aktive depotet:</para>
@@ -5169,7 +4944,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 6: ADDING PROJECTS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-5-sect-6">
+ <sect1 id="svn.reposadmin.projects">
<!-- @ENGLISH {{{
<title>Adding Projects</title>
@ENGLISH }}} -->
@@ -5200,7 +4975,7 @@
<!-- ¤ -->dette oppsettet.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-6.1">
+ <sect2 id="svn.reposadmin.projects.chooselayout">
<!-- @ENGLISH {{{
<title>Choosing a Repository Layout</title>
@ENGLISH }}} -->
@@ -5306,7 +5081,7 @@
to repositories, you'll probably want to think about directory
hierarchies in the repositories themselves. Because
Subversion uses regular directory copies for branching and
- tagging (see <xref linkend="svn-ch-4"/>), the Subversion
+ tagging (see <xref linkend="svn.branchmerge"/>), the Subversion
community recommends that you choose a repository location for
each <firstterm>project root</firstterm>—the
<quote>top-most</quote> directory which contains data related
@@ -5323,7 +5098,7 @@
henhold til depotene, vil du kanskje tenke over
kataloghierarkier i selve depotene.
Fordi Subversion bruker vanlige katalogkopier til forgrening og
- merking (se <xref linkend="svn-ch-4"/>), anbefaler
+ merking (se <xref linkend="svn.branchmerge"/>), anbefaler
Subversionmiljløet at du velger en katalogplassering for hver
<firstterm>prosjektrot</firstterm> – den <quote>øverste</quote>
katalogen som inneholder data relatert til det prosjektet – og
@@ -5457,7 +5232,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-5-sect-6.2">
+ <sect2 id="svn.reposadmin.projects.import">
<!-- @ENGLISH {{{
<title>Creating the Layout, and Importing Initial Data</title>
@ENGLISH }}} -->
@@ -5469,11 +5244,11 @@
repository with that layout and with initial project data.
There are a couple of ways to do this in Subversion. You
could use the <command>svn mkdir</command> command (see <xref
- linkend="svn-ch-9"/>) to create each directory in your
+ linkend="svn.ref"/>) to create each directory in your
skeletal repository layout, one-by-one. A quicker way to
accomplish the same task is to use the <command>svn
import</command> command (see <xref
- linkend="svn-ch-3-sect-7.3"/>). By first creating the layout
+ linkend="svn.tour.other.import"/>). By first creating the layout
in a temporary location on your drive, you can import the
whole layout tree into the repository in a single
commit:</para>
@@ -5483,11 +5258,11 @@
depotet med dette oppsettet og de innledende prosjektdataene.
Det er et par måter du kan gjøre dette i Subversion.
Du kan bruke <command>svn mkdir</command>-kommandoen (se <xref
- linkend="svn-ch-9"/>) for å opprette hver katalog i skjelettet
- av depotlayouten, en og en.
+ linkend="svn.ref"/>) for å opprette hver katalog i skjelettet av
+ depotlayouten, en og en.
En raskere måte å utføre den samme oppgaven på er å bruke
kommandoen <command>svn import</command> (se <xref
- linkend="svn-ch-3-sect-7.3"/>).
+ linkend="svn.tour.other.import"/>).
Ved å først opprette layouten i en midlertidig plassering på
harddisken, kan du importere hele katalogtreet inn i depotet i
en enkelt innlegging:</para>
@@ -5585,7 +5360,7 @@
such things, we're no longer discussing repository
administration. If you aren't already familiar with the
<command>svn</command> client program, see <xref
- linkend="svn-ch-3"/>.</para>
+ linkend="svn.tour"/>.</para>
@ENGLISH }}} -->
<para>Når du har skjelettet til oppsettet på plass, kan du begynne
å importere selve prosjektdataene inn i depotet ditt, hvis noen
@@ -5600,7 +5375,7 @@
lengre om depotadministrasjon.
Hvis du ikke allerede er kjent med
<command>svn</command>-klientprogrammet, se <xref
- linkend="svn-ch-3"/>.</para>
+ linkend="svn.tour"/>.</para>
</sect2>
</sect1>
@@ -5608,7 +5383,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 7: SUMMARY *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-5-sect-7">
+ <sect1 id="svn.reposadmin.summary">
<!-- @ENGLISH {{{
<title>Summary</title>
@ENGLISH }}} -->
Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml (original)
+++ trunk/src/nb/book/ch06.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-6">
+<chapter id="svn.serverconfig">
<!-- @ENGLISH {{{
<title>Server Configuration</title>
@ENGLISH }}} -->
@@ -45,7 +45,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-6-sect-1">
+ <sect1 id="svn.serverconfig.overview">
<!-- @ENGLISH {{{
<title>Overview</title>
@@ -97,7 +97,7 @@
and disadvantages. In fact, it's possible for different servers
to run in parallel, each accessing your repositories in its own
way, and each without hindering the other (see <xref
- linkend="svn-ch-6-sect-5"/>). Here's a brief overview and
+ linkend="svn.serverconfig.multimethod"/>). Here's a brief overview and
comparison of the two available Subversion servers—as an
administrator, it's up to you to choose whatever works best for
you and your users.</para>
@@ -109,13 +109,13 @@
borgere; hver tjenermodell har fordeler og ulemeper.
Faktisk er det mulig for forskjellige tjenere å kjøre parallelt og
aksessere depotet på hver sin måte uten å legge hindringer i veien
- for den andre (se <xref linkend="svn-ch-6-sect-5"/>).
+ for den andre (se <xref linkend="svn.serverconfig.multimethod"/>).
Her er en kort oversikt og sammenligning av de to tilgjengelige
Subversiontjenerne – som en administrator er det opp til deg å
velge hva som fungerer best for deg og dine brukere.</para>
- <table id="svn-ch-6-table-1">
+ <table id="svn.serverconfig.overview.tbl-1">
<!-- @ENGLISH {{{
<title>Network Server Comparison</title>
@ENGLISH }}} -->
@@ -276,7 +276,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-6-sect-2">
+ <sect1 id="svn.serverconfig.netmodel">
<title>Network Model</title>
@@ -287,7 +287,7 @@
different ways in which a client can be configured to
respond.</para>
- <sect2 id="svn-ch-6-sect-2.1">
+ <sect2 id="svn.serverconfig.netmodel.reqresp">
<title>Requests and Responses</title>
<para>The Subversion client spends most of its time managing
@@ -297,7 +297,7 @@
protocol are hidden from the user; the client attempts to
access a URL, and depending on the URL schema, a particular
protocol is used to contact the server (see <xref
- linkend="svn-ch-2-sidebar-1"/>). Users can run <command>svn
+ linkend="svn.basic.in-action.wc.sb-1"/>). Users can run <command>svn
--version</command> to see which URL schemas and protocols the
client knows how to use.</para>
@@ -324,7 +324,7 @@
revision tree is created. If the client's request was
authenticated, then the authenticated user's name is stored as
the value of the <literal>svn:author</literal> property on the
- new revision (see <xref linkend="svn-ch-5-sect-1.2"/>). If
+ new revision (see <xref linkend="svn.reposadmin.basics.revprops"/>). If
the client was not authenticated (in other words, the server
never issued an authentication challenge), then the revision's
<literal>svn:author</literal> property is empty.
@@ -333,7 +333,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-2.2">
+ <sect2 id="svn.serverconfig.netmodel.credcache">
<title>Client Credentials Caching</title>
<para>Many servers are configured to require authentication on
@@ -349,7 +349,7 @@
Unix-like systems or
<filename>%APPDATA%/Subversion/auth/</filename> on Windows.
(The runtime area is covered in more detail in <xref
- linkend="svn-ch-7-sect-1"/>.) Successful credentials are
+ linkend="svn.advanced.confarea"/>.) Successful credentials are
cached on disk, keyed on a combination of hostname, port, and
authentication realm.</para>
@@ -507,7 +507,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-6-sect-3">
+ <sect1 id="svn.serverconfig.svnserve">
<title>svnserve, a custom server</title>
@@ -521,7 +521,7 @@
to the server, and how to configure appropriate access control
to your repositories.</para>
- <sect2 id="svn-ch-6-sect-3.1">
+ <sect2 id="svn.serverconfig.svnserve.invoking">
<title>Invoking the Server</title>
<para>There are a few different ways to invoke the
@@ -556,7 +556,7 @@
<filename>/etc/inetd.conf</filename>:</para>
<screen>
-svn stream tcp nowait svnowner /usr/local/bin/svnserve svnserve -i
+svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i
</screen>
<para>Make sure <quote>svnowner</quote> is a user which has
@@ -598,11 +598,11 @@
invoked by a tunnel agent like this, be sure that the
authenticated user has full read and write access to the
repository database files. (See <xref
- linkend="svn-ch-6-sidebar-1"/>.) It's essentially the same as
+ linkend="svn.serverconfig.svnserve.invoking.sb-1"/>.) It's essentially the same as
a local user accessing the repository via
<literal>file:///</literal> URLs.</para>
- <sidebar id="svn-ch-6-sidebar-1">
+ <sidebar id="svn.serverconfig.svnserve.invoking.sb-1">
<title>Servers and Permissions: A Word of Warning</title>
<para>First, remember that a Subversion repository is a
@@ -611,7 +611,7 @@
permissions on the entire repository. If you're not
careful, this can lead to a number of headaches, especially
if you're using a BerkeleyDB database rather than FSFS. Be
- sure to read <xref linkend="svn-ch-6-sect-5"/>.</para>
+ sure to read <xref linkend="svn.serverconfig.multimethod"/>.</para>
<para>Secondly, when configuring <command>svnserve</command>,
Apache <command>httpd</command>, or any other server
@@ -659,7 +659,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-3.2">
+ <sect2 id="svn.serverconfig.svnserve.auth">
<title>Built-in authentication and authorization</title>
<para>When a client connects to an <command>svnserve</command>
@@ -708,13 +708,13 @@
<command>SSH</command>. In that case, the server simply
examines the user it's running as, and uses it as the
authenticated username. For more on this, see <xref
- linkend="svn-ch-6-sect-3.4"/>.</para>
+ linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
<para>As you've already guessed, a repository's
<filename>svnserve.conf</filename> file is the central
mechanism for controlling authentication and authorization
policies. The file has the same format as other configuration
- files (see <xref linkend="svn-ch-7-sect-1"/>): section names
+ files (see <xref linkend="svn.advanced.confarea"/>): section names
are marked by square brackets (<literal>[</literal> and
<literal>]</literal>), comments begin with hashes
(<literal>#</literal>), and each section contains
@@ -722,7 +722,7 @@
value</literal>). Let's walk through this file and learn how
to use them.</para>
- <sect3 id="svn-ch-6-sect-3.2.1">
+ <sect3 id="svn.serverconfig.svnserve.auth.users">
<title>Create a 'users' file and realm</title>
<para>For now, the <literal>[general]</literal> section of the
@@ -742,7 +742,7 @@
client displays it in the authentication prompt, and uses it
as a key (along with the server's hostname and port) for
caching credentials on disk (see <xref
- linkend="svn-ch-6-sect-2.2"/>.) The
+ linkend="svn.serverconfig.netmodel.credcache"/>.) The
<literal>password-db</literal> variable points to a separate
file that contains a list of usernames and passwords, using
the same familiar format. For example:</para>
@@ -770,7 +770,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-3.2.2">
+ <sect3 id="svn.serverconfig.svnserve.auth.general">
<title>Set access controls</title>
<para>There are two more variables to set in the
@@ -823,9 +823,9 @@
However, if you need per-directory access control, you'll
need to use either use Apache with
<command>mod_authz_svn</command> (see <xref
- linkend="svn-ch-6-sect-4.4.2"/>) or use a
+ linkend="svn.serverconfig.httpd.authz.perdir"/>) or use a
<command>pre-commit</command> hook script to control write
- access (see <xref linkend="svn-ch-5-sect-2.1"/>). The
+ access (see <xref linkend="svn.reposadmin.create.hooks"/>). The
Subversion distribution comes with
<command>commit-access-control.pl</command> and the more
sophisticated <command>svnperms.py</command> scripts for use
@@ -834,7 +834,7 @@
</sect3>
</sect2>
- <sect2 id="svn-ch-6-sect-3.4">
+ <sect2 id="svn.serverconfig.svnserve.sshauth">
<title>SSH authentication and authorization</title>
<para><command>svnserve</command>'s built-in authentication can
@@ -891,7 +891,7 @@
program prompting for authentication, and
<emphasis>not</emphasis> the <command>svn</command> client
program. That means there's no automatic password caching
- going on (see <xref linkend="svn-ch-6-sect-2.2"/>). The
+ going on (see <xref linkend="svn.serverconfig.netmodel.credcache"/>). The
Subversion client often makes multiple connections to the
repository, though users don't normally notice this due to the
password caching feature. When using
@@ -910,7 +910,7 @@
going to be accessing the repository directly, you may want to
place them into a common group, and you'll need to be careful
about umasks. (Be sure to read <xref
- linkend="svn-ch-6-sect-5"/>.) But even in the case of
+ linkend="svn.serverconfig.multimethod"/>.) But even in the case of
tunneling, the <filename>svnserve.conf</filename> file can
still be used to block access, by simply setting
<literal>auth-access = read</literal> or <literal>auth-access
@@ -919,7 +919,7 @@
<para>You'd think that the story of SSH tunneling would end
here, but it doesn't. Subversion allows you to create custom
tunnel behaviors in your run-time <filename>config</filename>
- file (see <xref linkend="svn-ch-7-sect-1"/>.) For example,
+ file (see <xref linkend="svn.advanced.confarea"/>.) For example,
suppose you want to use RSH instead of SSH. In the
<literal>[tunnels]</literal> section of your
<filename>config</filename> file, simply define it like
@@ -972,7 +972,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-3.5">
+ <sect2 id="svn.serverconfig.svnserve.sshtricks">
<title>SSH configuration tricks</title>
<para>It's not only possible to control the way in which the
@@ -983,7 +983,7 @@
by <command>sshd</command>, as well as how to have multiple
users share a single system account.</para>
- <sect3 id="svn-ch-6-sect-3.5.1">
+ <sect3 id="svn.serverconfig.svnserve.sshtricks.setup">
<title>Initial setup</title>
<para>To begin, locate the home directory of the account
@@ -1028,7 +1028,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-3.5.2">
+ <sect3 id="svn.serverconfig.svnserve.sshtricks.fixedcmd">
<title>Controlling the invoked command</title>
<para>Because we can specify the executed server-side command,
@@ -1042,7 +1042,7 @@
<para>In this example, <filename>/path/to/svnserve</filename>
might be a custom wrapper script
around <command>svnserve</command> which sets the umask (see
- <xref linkend="svn-ch-6-sect-5"/>). It also shows how to
+ <xref linkend="svn.serverconfig.multimethod"/>). It also shows how to
anchor <command>svnserve</command> in a virtual root
directory, just as one often does when
running <command>svnserve</command> as a daemon process.
@@ -1101,7 +1101,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-6-sect-4">
+ <sect1 id="svn.serverconfig.httpd">
<title>httpd, the Apache HTTP server</title>
@@ -1178,7 +1178,7 @@
</sidebar>
- <sect2 id="svn-ch-6-sect-4.1">
+ <sect2 id="svn.serverconfig.httpd.prereqs">
<title>Prerequisites</title>
<para>To network your repository over HTTP, you basically need
@@ -1217,7 +1217,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-4.2">
+ <sect2 id="svn.serverconfig.httpd.basic">
<title>Basic Apache Configuration</title>
<para>Once you have all the necessary components installed on
@@ -1358,7 +1358,7 @@
appropriately, that allows Apache to work with those files.
Apache, when used as a Subversion server, will also need the
correct permissions to read and write to your Subversion
- repository. (See <xref linkend="svn-ch-6-sidebar-1"/>.)</para>
+ repository. (See <xref linkend="svn.serverconfig.svnserve.invoking.sb-1"/>.)</para>
<para>You will need to determine a permission system setup that
satisfies Subversion's requirements without messing up any
@@ -1378,7 +1378,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-4.3">
+ <sect2 id="svn.serverconfig.httpd.authn">
<title>Authentication Options</title>
<para>At this point, if you configured
@@ -1414,7 +1414,7 @@
</listitem>
</itemizedlist>
- <sect3 id="svn-ch-6-sect-4.3.1">
+ <sect3 id="svn.serverconfig.httpd.authn.basic">
<title>Basic HTTP Authentication</title>
<para>The easiest way to authenticate a client is via the
@@ -1495,7 +1495,7 @@
</screen>
<para>Be sure to read the next section (<xref
- linkend="svn-ch-6-sect-4.4"/>) for more detail on the
+ linkend="svn.serverconfig.httpd.authz"/>) for more detail on the
<literal>Require</literal> directive and other ways to set
authorization policies.</para>
@@ -1520,7 +1520,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-4.3.2">
+ <sect3 id="svn.serverconfig.httpd.authn.sslcerts">
<title>SSL Certificate Management</title>
<para>Businesses that need to expose their repositories for access
@@ -1589,7 +1589,7 @@
will be cached in your private run-time
<filename>auth/</filename> area in just the same way your
username and password are cached (see <xref
- linkend="svn-ch-6-sect-2.2"/>.) If cached, Subversion will
+ linkend="svn.serverconfig.netmodel.credcache"/>.) If cached, Subversion will
automatically remember to trust this certificate in future
negotiations.</para>
@@ -1670,7 +1670,7 @@
</sect2>
- <sect2 id="svn-ch-6-sect-4.4">
+ <sect2 id="svn.serverconfig.httpd.authz">
<title>Authorization Options</title>
<para>At this point, you've configured authentication, but not
@@ -1680,7 +1680,7 @@
section describes two strategies for controlling access to
your repositories.</para>
- <sect3 id="svn-ch-6-sect-4.4.1">
+ <sect3 id="svn.serverconfig.httpd.authz.blanket">
<title>Blanket Access Control</title>
<para>The simplest form of access control is to authorize
@@ -1767,7 +1767,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-4.4.2">
+ <sect3 id="svn.serverconfig.httpd.authz.perdir">
<title>Per-Directory Access Control</title>
<para>It's possible to set up finer-grained permissions using
@@ -1812,7 +1812,7 @@
challenges, so all users are treated as
<quote>anonymous</quote>.</para>
- <example id="svn-ch-6-sect-4.4.2-ex-1">
+ <example id="svn.serverconfig.httpd.authz.perdir.ex-1">
<title>A sample configuration for anonymous access.</title>
<programlisting>
<Location /repos>
@@ -1832,7 +1832,7 @@
<literal>Require valid-user</literal> directive, and defines
a means to authenticate.</para>
- <example id="svn-ch-6-sect-4.4.2-ex-2">
+ <example id="svn.serverconfig.httpd.authz.perdir.ex-2">
<title>A sample configuration for authenticated access.</title>
<programlisting>
<Location /repos>
@@ -1865,7 +1865,7 @@
and <literal>Require valid-user</literal> directives
together.</para>
- <example id="svn-ch-6-sect-4.4.2-ex-3">
+ <example id="svn.serverconfig.httpd.authz.perdir.ex-3">
<title>A sample configuration for mixed
authenticated/anonymous access.</title>
<programlisting>
@@ -2037,7 +2037,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-4.4.3">
+ <sect3 id="svn.serverconfig.httpd.authz.pathauthzoff">
<title>Disabling Path-based Checks</title>
<para>The <command>mod_dav_svn</command> module goes through a
@@ -2083,7 +2083,7 @@
<filename>httpd.conf</filename> file, use the
<literal>SVNPathAuthz</literal> directive:</para>
- <example id="svn-ch-6-sect-4.4.3-ex-1">
+ <example id="svn.serverconfig.httpd.authz.pathauthzoff.ex-1">
<title>Disabling path checks altogether</title>
<programlisting>
<Location /repos>
@@ -2105,14 +2105,14 @@
</sect2>
- <sect2 id="svn-ch-6-sect-4.5">
+ <sect2 id="svn.serverconfig.httpd.extra">
<title>Extra Goodies</title>
<para>We've covered most of the authentication and authorization
options for Apache and mod_dav_svn. But there are a few other
nice features that Apache provides.</para>
- <sect3 id="svn-ch-6-sect-4.5.1">
+ <sect3 id="svn.serverconfig.httpd.extra.browsing">
<title>Repository Browsing</title>
<para>One of the most useful benefits of an Apache/WebDAV
@@ -2205,7 +2205,7 @@
</sect3>
- <sect3 id="svn-ch-6-sect-4.5.2">
+ <sect3 id="svn.serverconfig.httpd.extra.other">
<title>Other Features</title>
<para>Several of the features already provided by Apache in
@@ -2247,7 +2247,7 @@
Linux) have the built-in ability to mount a DAV server as a
standard network <quote>share</quote>. This is a
complicated topic; for details, read <xref
- linkend="svn-ap-c"/>.</para>
+ linkend="svn.webdav"/>.</para>
</sect3>
@@ -2260,7 +2260,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-6-sect-5">
+ <sect1 id="svn.serverconfig.multimethod">
<title>Supporting Multiple Repository Access Methods</title>
@@ -2318,12 +2318,12 @@
<filename>apachectl</filename>. For example:</para>
<screen>
-$ cat /usr/local/bin/svn
+$ cat /usr/bin/svn
#!/bin/sh
umask 002
-/usr/local/subversion/bin/svn "$@"
+/usr/bin/svn-real "$@"
</screen>
@@ -2378,7 +2378,7 @@
<listitem>
<para>Your users need to use a sane umask when accessing the
repository. Make sure that <command>svnserve</command>
- (<filename>/usr/local/bin/svnserve</filename>, or wherever
+ (<filename>/usr/bin/svnserve</filename>, or wherever
it lives in <literal>$PATH</literal>) is actually a
wrapper script which sets <command>umask 002</command> and
executes the real <command>svnserve</command>
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-7">
+<chapter id="svn.advanced">
<title>Advanced Topics</title>
<simplesect>
@@ -32,7 +32,7 @@
basic file and directory versioning capabilities of Subversion.
If you haven't already read about those, or if you need a
refresher, we recommend that you check out <xref
- linkend="svn-ch-2" /> and <xref linkend="svn-ch-3" />. Once
+ linkend="svn.basic" /> and <xref linkend="svn.tour" />. Once
you've mastered the basics and consumed this chapter, you'll be
a Subversion power-user!
</para>
@@ -42,7 +42,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 1: RUNTIME CONFIGURATION AREA *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-7-sect-1">
+ <sect1 id="svn.advanced.confarea">
<title>Runtime Configuration Area</title>
<para>Subversion provides many optional behaviors that can be
@@ -65,7 +65,7 @@
prefers.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-1.1">
+ <sect2 id="svn.advanced.confarea.layout">
<title>Configuration Area Layout</title>
<para>The first time that the <command>svn</command>
@@ -134,7 +134,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-1.2">
+ <sect2 id="svn.advanced.confarea.windows-registry">
<title>Configuration and the Windows Registry</title>
<para>In addition to the usual INI-based configuration area,
@@ -198,7 +198,7 @@
file from the Explorer shell, which will cause the data to be
merged into your registry.</para>
- <example id="svn-ch-7-sect-1.2-ex-1">
+ <example id="svn.advanced.confarea.windows-registry.ex-1">
<title>Sample Registration Entries (.reg) File.</title>
<programlisting>
@@ -256,14 +256,14 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-1.3">
+ <sect2 id="svn.advanced.confarea.opts">
<title>Configuration Options</title>
<para>In this section, we will discuss the specific
run-time configuration options that are currently supported
by Subversion.</para>
- <sect3 id="svn-ch-7-sect-1.3.1">
+ <sect3 id="svn.advanced.confarea.opts.servers">
<title>Servers</title>
<para>The <filename>servers</filename> file contains
@@ -373,7 +373,7 @@
debugging output to yield. The default value is
<literal>0</literal>, which will silence all debugging
output. For more information about how Subversion
- makes use of Neon, see <xref linkend="svn-ch-8" />.</para>
+ makes use of Neon, see <xref linkend="svn.developer" />.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -422,7 +422,7 @@
</variablelist>
</sect3>
- <sect3 id="svn-ch-7-sect-1.3.2">
+ <sect3 id="svn.advanced.confarea.opts.config">
<title>Config</title>
<para>The <filename>config</filename> file contains the rest
@@ -449,7 +449,7 @@
the <option>--no-auth-cache</option> command-line
parameter (for those subcommands that support it).
For more information, see <xref
- linkend="svn-ch-6-sect-2.2"/>.</para>
+ linkend="svn.serverconfig.netmodel.credcache"/>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -484,7 +484,7 @@
populated with the current value of the property the
user wishes to edit, and the edits take place right
in the editor program (see <xref
- linkend="svn-ch-7-sect-2" />). This option's default
+ linkend="svn.advanced.props" />). This option's default
value is empty. If the option is not set, Subversion
will fall back to checking the environment variables
<literal>SVN_EDITOR</literal>,
@@ -533,7 +533,7 @@
define new tunnel schemes for use with
<command>svnserve</command> and <literal>svn://</literal>
client connections. For more details, see <xref
- linkend="svn-ch-6-sect-3.4"/>.</para>
+ linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
<para>The <literal>miscellany</literal> section is where
everything that doesn't belong elsewhere winds up.
@@ -550,7 +550,7 @@
command, Subversion lists unversioned files and
directories along with the versioned ones, annotating
them with a <literal>?</literal> character (see <xref
- linkend="svn-ch-3-sect-5.3.1" />). Sometimes, it can
+ linkend="svn.tour.cycle.examine.status" />). Sometimes, it can
be annoying to see uninteresting, unversioned
items—for example, object files that result from
a program's compilation—in this display. The
@@ -568,7 +568,7 @@
of any of these commands by using
the <option>--no-ignore</option> command-line flag.
For information on more fine-grained control of
- ignored items, see <xref linkend="svn-ch-7-sect-2.3.3"
+ ignored items, see <xref linkend="svn.advanced.props.special.ignore"
/>.</para>
</listitem>
</varlistentry>
@@ -591,7 +591,7 @@
<para>This variable sets the default character set
encoding for commit log messages. It's a permanent
form of the <option>--encoding</option> option (see
- <xref linkend="svn-ch-9-sect-1.1"/>.) The Subversion
+ <xref linkend="svn.ref.svn.sw"/>.) The Subversion
repository stores log messages in UTF8, and assumes
that your log message is written using your operating
system's native locale. You should specify a
@@ -657,7 +657,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 2: PROPERTIES *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-7-sect-2">
+ <sect1 id="svn.advanced.props">
<title>Properties</title>
<para>We've already covered in detail how Subversion stores and
@@ -693,7 +693,7 @@
arbitrary properties attached to it. The same constraints
apply—human-readable, text names and anything-you-want,
binary values—except that revision properties are not
- versioned. See <xref linkend="svn-ch-5-sect-1.2" /> for more
+ versioned. See <xref linkend="svn.reposadmin.basics.revprops" /> for more
information on these unversioned properties.</para>
</sidebar>
@@ -706,7 +706,7 @@
enhance your version control experience.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-2.1">
+ <sect2 id="svn.advanced.props.why">
<title>Why Properties?</title>
<para>Properties can be very useful additions to your working
@@ -746,7 +746,7 @@
scripts know better. They know that they can use
<command>svn</command> (or better yet, they can use the
Subversion language bindings—see <xref
- linkend="svn-ch-8-sect-2.3" />) to dig out the extra
+ linkend="svn.developer.usingapi.otherlangs" />) to dig out the extra
information that your site needs to display without having to
read an index file or play path manipulation games.</para>
@@ -759,7 +759,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-2.2">
+ <sect2 id="svn.advanced.props.manip">
<title>Manipulating Properties</title>
<para>The <command>svn</command> command affords a few ways to
@@ -794,7 +794,7 @@
<command>svn</command> program supplies the
<command>propedit</command> command. This command uses the
configured editor program (see <xref
- linkend="svn-ch-7-sect-1.3.2" />) to add or modify properties.
+ linkend="svn.advanced.confarea.opts.config" />) to add or modify properties.
When you run the command, <command>svn</command> invokes your
editor program on a temporary file that contains the current
value of the property (or which is empty, if you are adding a
@@ -937,7 +937,7 @@
<para>Note that the ability to modify these unversioned
properties must be explicitly added by the repository
- administrator (see <xref linkend="svn-ch-5-sect-2.1" />).
+ administrator (see <xref linkend="svn.reposadmin.create.hooks" />).
Since the properties aren't versioned, you run the risk of
losing information if you aren't careful with your edits.
The repository administrator can setup methods to protect
@@ -975,7 +975,7 @@
<filename>calc/button.c</filename>, but not modified its
textual contents. Had we changed both, we would have seen
<literal>M</literal> in the first column, too (see <xref
- linkend="svn-ch-3-sect-5.3.1" />).</para>
+ linkend="svn.tour.cycle.examine.status" />).</para>
<sidebar>
<title>Property Conflicts</title>
@@ -1045,7 +1045,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-2.3">
+ <sect2 id="svn.advanced.props.special">
<title>Special Properties</title>
@@ -1059,7 +1059,7 @@
we'll untangle the mystery, and describe how these special
properties make your life just a little easier.</para>
- <sect3 id="svn-ch-7-sect-2.3.1">
+ <sect3 id="svn.advanced.props.special.executable">
<title><literal>svn:executable</literal></title>
<para>The <literal>svn:executable</literal> property is used
@@ -1099,7 +1099,7 @@
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.2">
+ <sect3 id="svn.advanced.props.special.mime-type">
<title><literal>svn:mime-type</literal></title>
<para>The <literal>svn:mime-type</literal> property serves
@@ -1140,7 +1140,7 @@
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.3">
+ <sect3 id="svn.advanced.props.special.ignore">
<title><literal>svn:ignore</literal></title>
<para>The <literal>svn:ignore</literal> property contains a
@@ -1148,7 +1148,7 @@
will ignore. Perhaps the most commonly used special
property, it works in conjunction with the
<literal>global-ignores</literal> run-time configuration
- option (see <xref linkend="svn-ch-7-sect-1.3.2" />) to
+ option (see <xref linkend="svn.advanced.confarea.opts.config" />) to
filter unversioned files and directories out of commands
<command>svn status</command>, <command>svn
add</command>, and <command>svn import</command>.</para>
@@ -1314,7 +1314,7 @@
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.4">
+ <sect3 id="svn.advanced.props.special.keywords">
<title><literal>svn:keywords</literal></title>
<para>Subversion has the ability to substitute
@@ -1516,7 +1516,7 @@
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.5">
+ <sect3 id="svn.advanced.props.special.eol-style">
<title><literal>svn:eol-style</literal></title>
<para>Unless otherwise noted using a versioned file's
@@ -1645,18 +1645,18 @@
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.6">
+ <sect3 id="svn.advanced.props.special.externals">
<title><literal>svn:externals</literal></title>
<para>The <literal>svn:externals</literal> property contains
instructions for Subversion to populate a versioned
directory with one or more other checked-out Subversion
working copies. For more information on this keyword and
- its use, see <xref linkend="svn-ch-7-sect-3"/>.</para>
+ its use, see <xref linkend="svn.advanced.externals"/>.</para>
</sect3>
- <sect3 id="svn-ch-7-sect-2.3.7">
+ <sect3 id="svn.advanced.props.special.special">
<title><literal>svn:special</literal></title>
<para>The <literal>svn:special</literal> property is the only
@@ -1683,7 +1683,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-2.4">
+ <sect2 id="svn.advanced.props.auto">
<title>Automatic Property Setting</title>
<para>Properties are a powerful feature of Subversion, acting as
@@ -1731,17 +1731,17 @@
<literal>native</literal>, and <literal>svn:keywords</literal>
set to <literal>Id</literal>. Auto-prop support is perhaps
the handiest property related tool in the Subversion toolbox.
- See <xref linkend="svn-ch-7-sect-1.3.2"/> for more about
+ See <xref linkend="svn.advanced.confarea.opts.config"/> for more about
configuring that support.</para>
</sect2>
</sect1>
<!-- ******************************************************************* -->
- <!-- *** SECTION 2 1/2: ADDRESSING HISTORICAL AMBIGUITY *** -->
+ <!-- *** SECTION 2 1/2: PEG AND OPERATIVE REVISIONS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-7-sect-2b">
- <title>Addressing Historical Ambiguity</title>
+ <sect1 id="svn.advanced.pegrevs">
+ <title>Peg and Operative Revisions</title>
<para>The ability to copy, move, and rename files and directories;
to be able to create an object, then delete it and then add a
@@ -1859,9 +1859,25 @@
sorts, and we know <emphasis>exactly</emphasis> where to
go.</para>
- <!-- Drop algorithm here -->
+ <para>Subversion performs a fairly straightforward algorithm when
+ using peg and operative revisions to find real stuff to work on.
+ First, the path associated with the peg revision is located in
+ that revision in the repository. From there, Subversion begins
+ stepping backwards through historical predecessors of the object
+ located at that path and peg revision. Each of these
+ predecessors represents an earlier version of the object, and
+ each stores a record of which revision it was created in, and at
+ what path. So, while traversing the set of predecessors,
+ Subversion notices whenever one of them is the youngest version
+ of the object to exist as of one of the operative revisions, and
+ if so, maps that operative revision to the created path/created
+ revision pair of the predecessor. The algorithm terminates
+ either when all the operative revisions have been mapped to real
+ object locations, or once there are no more predecessors to
+ traverse, in which case any unmapped operative revisions are
+ marked as invalid for the object being operated on.</para>
- <para>Say long ago we created our repository, and in revision 1
+ <para>Say that long ago we created our repository, and in revision 1
added our first <filename>concept</filename> directory, plus an
<filename>IDEA</filename> file in that directory talking about
the concept. After several revisions in which real code was
@@ -1980,7 +1996,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 3: EXTERNALS DEFINITIONS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-7-sect-3">
+ <sect1 id="svn.advanced.externals">
<title>Externals Definitions</title>
<para>Sometimes it is useful to construct a working copy that is
@@ -2002,7 +2018,7 @@
definitions in groups using the <literal>svn:externals</literal>
property. You can create or modify this property using
<command>svn propset</command> or <command>svn
- propedit</command> (see <xref linkend="svn-ch-7-sect-2.1"/>).
+ propedit</command> (see <xref linkend="svn.advanced.props.why"/>).
It can be set on any versioned directory,
and its value is a multi-line table of subdirectories (relative
to the versioned directory on which the property is set) and
@@ -2104,7 +2120,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 4: VENDOR BRANCHES *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-7-sect-4">
+ <sect1 id="svn.advanced.vendorbr">
<title>Vendor branches</title>
<para>As is especially the case when developing software, the data
@@ -2120,7 +2136,7 @@
<para>For example, software developers might be working on an
application which makes use of a third-party library.
Subversion has just such a relationship with the Apache Portable
- Runtime library (see <xref linkend="svn-ch-8-sect-2.1" />). The
+ Runtime library (see <xref linkend="svn.developer.usingapi.apr" />). The
Subversion source code depends on the APR library for all its
portability needs. In earlier stages of Subversion's
development, the project closely tracked APR's changing API,
@@ -2139,7 +2155,7 @@
repository, you could also use Subversion's externals
definitions to effectively <quote>pin down</quote> specific
versions of that information to some location in your own
- working copy directory (see <xref linkend="svn-ch-7-sect-3" />).</para>
+ working copy directory (see <xref linkend="svn.advanced.externals" />).</para>
<para>But sometimes you want to maintain custom modifications to
third-party data in your own version control system. Returning
@@ -2179,7 +2195,7 @@
worse, manual) method for swapping in your customizations.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-4.1">
+ <sect2 id="svn.advanced.vendorbr.general">
<title>General Vendor Branch Management Procedure</title>
<para>Managing vendor branches generally works like this. You
@@ -2218,7 +2234,7 @@
<para>We now have the current version of the libcomplex source
code in <filename>/vendor/libcomplex/current</filename>. Now,
- we tag that version (see <xref linkend="svn-ch-4-sect-6" />)
+ we tag that version (see <xref linkend="svn.branchmerge.tags" />)
and then copy it into the main development branch. Our copy
will create a new directory called
<filename>libcomplex</filename> in our existing
@@ -2333,7 +2349,7 @@
running with just svn merge, now that it ignores ancestry. -->
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-7-sect-4.2">
+ <sect2 id="svn.advanced.vendorbr.svn_load_dirs">
<title><command>svn_load_dirs.pl</command></title>
<para>Vendor drops that contain more than a few deletes,
@@ -2460,6 +2476,249 @@
</sect2>
</sect1>
+ <!-- ******************************************************************* -->
+ <!-- *** SECTION 5: LOCALIZATION *** -->
+ <!-- ******************************************************************* -->
+ <sect1 id="svn.advanced.l10n">
+ <title>Localization</title>
+
+ <para><firstterm>Localization</firstterm> is the act of making
+ programs behave in a region-specific way. When a program
+ formats numbers or dates in a way specific to your part of the
+ world, or prints messages (or accepts input) in your native
+ language, the program is said to
+ be <firstterm>localized</firstterm>. This section describes
+ steps Subversion has made towards localization.</para>
+
+ <sect2 id="svn.advanced.l10n.understanding">
+ <title>Understanding locales</title>
+
+ <para>Most modern operating systems have a notion of the
+ <quote>current locale</quote>—that is, the region or
+ country whose localization conventions are honored. These
+ conventions—typically chosen by some runtime
+ configuration mechanism on the computer—affect the way
+ in which programs present data to the user, as well as the way
+ in which they accept user input.</para>
+
+ <para>On Unix-like systems, you can check the values of the
+ locale-related runtime configuration options by running the
+ <command>locale</command> command:</para>
+
+ <screen>
+$ locale
+LANG=
+LC_COLLATE="C"
+LC_CTYPE="C"
+LC_MESSAGES="C"
+LC_MONETARY="C"
+LC_NUMERIC="C"
+LC_TIME="C"
+LC_ALL="C"
+</screen>
+
+ <para>The output is a list of locale-related environment
+ variables and their current values. In this example, the
+ variables are all set to the default <literal>C</literal>
+ locale, but users can set these variables to specific
+ country/language code combinations. For example, if one were
+ to set the <literal>LC_TIME</literal> variable to
+ <literal>fr_CA</literal>, then programs would know to present
+ time and date information formatted according a
+ French-speaking Canadian's expectations. And if one were to
+ set the <literal>LC_MESSAGES</literal> variable to
+ <literal>zh_TW</literal>, then programs would know to present
+ human-readable messages in Traditional Chinese. Setting the
+ <literal>LC_ALL</literal> variable has the effect of changing
+ every locale variable to the same value. The value of
+ <literal>LANG</literal> is used as a default value for any
+ locale variable that is unset. To see the list of available
+ locales on a Unix system, run the command <command>locale
+ -a</command>.</para>
+
+ <para>On Windows, locale configuration is done via the
+ <quote>Regional and Language Options</quote> control panel
+ item. There you can view and select the values of individual
+ settings from the available locales, and even customize (at a
+ sickening level of detail) several of the display formatting
+ conventions.</para>
+
+ </sect2>
+
+ <sect2 id="svn.advanced.l10n.svnuse">
+ <title>Subversion's use of locales</title>
+
+ <para>The Subversion client, <command>svn</command>, honors the
+ current locale configuration in two ways. First, it notices
+ the value of the <literal>LC_MESSAGES</literal> variable and
+ attempts to print all messages in the specified language. For
+ example:</para>
+
+ <screen>
+$ export LC_MESSAGES=de_DE
+$ svn help cat
+cat: Ausgabe des Inhaltes der angegebenen Dateien oder URLs
+Aufruf: cat ZIEL...
+…
+</screen>
+
+ <para>This behavior works identically on both Unix and Windows
+ systems. Note, though, that while your operating system might
+ have support for a certain locale, the Subversion client still
+ may not be able to speak the particular language. In order to
+ produce localized messages, human volunteers must provide
+ translations for each language. The translations are written
+ using the GNU gettext package, which results in translation
+ modules that end with the <filename>.mo</filename> filename
+ extension. For example, the German translation file is named
+ <filename>de.mo</filename>. These translation files are
+ installed somewhere on your system. On Unix, they typically
+ live in <filename>/usr/share/locale/</filename>, while
+ on Windows they're often found in the
+ <filename>\share\locale\</filename> folder in Subversion's
+ installation area. Once installed, a module is named after
+ the program it provides translations for. For example, the
+ <filename>de.mo</filename> file may ultimately end up
+ installed as
+ <filename>/usr/share/locale/de/LC_MESSAGES/subversion.mo</filename>.
+ By browsing the installed <filename>.mo</filename> files, you
+ can see which languages the Subversion client is able to
+ speak.</para>
+
+ <para>The second way in which the locale is honored involves how
+ <command>svn</command> interprets your input. The repository
+ stores all paths, filenames, and log messages in Unicode,
+ encoded as UTF-8. In that sense, the repository is
+ <firstterm>internationalized</firstterm>— that is, the
+ repository is ready to accept input in any human language.
+ This means, however, that the Subversion client is responsible
+ for sending only UTF-8 filenames and log messages into the
+ repository. In order to do this, it must convert the data
+ from the native locale into UTF-8.</para>
+
+ <para>For example, suppose you create a file
+ named<filename>caffè.txt</filename>, and then when committing
+ the file, you write the log message as <quote>Adesso il caffè
+ è più forte</quote>. Both the filename and log message
+ contain non-ASCII characters, but because your locale is set
+ to <literal>it_IT</literal>, the Subversion client knows to
+ interpret them as Italian. It uses an Italian character set
+ to convert the data to UTF-8 before sending them off to the
+ repository.</para>
+
+ <para>Note that while the repository demands UTF-8 filenames and
+ log messages, it <emphasis>does not</emphasis> pay attention
+ to file contents. Subversion treats file contents as opaque
+ strings of bytes, and neither client nor server makes an
+ attempt to understand the character set or encoding of the
+ contents.</para>
+
+ <sidebar>
+ <title>Character set conversion errors</title>
+
+ <para>While using Subversion, you might get hit with an error
+ related to character set conversions:</para>
+
+ <screen>
+svn: Can't recode string.
+</screen>
+
+ <para>The message is cryptic, but generally occurs when the
+ Subversion client has received a UTF-8 string from the
+ repository, but the characters can't be converted to the
+ current locale. For example, if your locale is
+ <literal>en_US</literal> but a collaborator has committed a
+ Japanese filename, you're likely to see this error when you
+ receive the file during an <command>svn
+ update</command>.</para>
+
+ <para>The solution is either to set your locale to something
+ which <emphasis>can</emphasis> represent the incoming UTF-8
+ data, or to change the filename or log message in the
+ repository. (And don't forget to slap your collaborator's
+ hand—projects should decide on common languages ahead of
+ time, so that all participants are using the same
+ locale.)</para>
+ </sidebar>
+
+ </sect2>
+
+ </sect1>
+
+ <!-- ******************************************************************* -->
+ <!-- *** SECTION 6: SUBVERSION REPOSITORY URLS *** -->
+ <!-- ******************************************************************* -->
+ <sect1 id="svn.advanced.reposurls">
+ <title>Subversion Repository URLs</title>
+
+ <para>As illustrated throughout this book, Subversion uses URLs to
+ identify versioned resources in Subversion repositories. For
+ the most part, these URLs use the standard syntax, allowing for
+ server names and port numbers to be specified as part of the
+ URL:</para>
+
+ <screen>
+$ svn checkout http://svn.example.com:9834/repos
+…
+</screen>
+
+ <para>But there are some nuances in Subversion's handling of URLs
+ that are notable. For example, URLs containing the
+ <literal>file:</literal> access method (used for local
+ repositories) must, in accordance with convention, have either a
+ server name of <literal>localhost</literal> or no server name at
+ all:</para>
+
+ <screen>
+$ svn checkout file:///path/to/repos
+…
+$ svn checkout file://localhost/path/to/repos
+…
+</screen>
+
+ <para>Also, users of the <literal>file:</literal> scheme on
+ Windows platforms will need to use an unofficially
+ <quote>standard</quote> syntax for accessing repositories
+ that are on the same machine, but on a different drive than
+ the client's current working drive. Either of the two
+ following URL path syntaxes will work where
+ <literal>X</literal> is the drive on which the repository
+ resides:</para>
+
+ <screen>
+C:\> svn checkout file:///X:/path/to/repos
+…
+C:\> svn checkout "file:///X|/path/to/repos"
+…
+</screen>
+
+ <para>In the second syntax, you need to quote the URL so that the
+ vertical bar character is not interpreted as a pipe. Also, note
+ that a URL uses ordinary slashes even though the native
+ (non-URL) form of a path on Windows uses backslashes.</para>
+
+ <para>Finally, it should be noted that the Subversion client will
+ automatically encode URLs as necessary, just like a web browser
+ does. For example, if a URL contains a space or upper-ASCII
+ character:</para>
+
+ <screen>
+$ svn checkout "http://host/path with space/project/españa"
+</screen>
+
+ <para>…then Subversion will escape the unsafe characters
+ and behave as if you had typed:</para>
+
+ <screen>
+$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a
+</screen>
+
+ <para>If the URL contains spaces, be sure to place it within quote
+ marks, so that your shell treats the whole thing as a single
+ argument to the <command>svn</command> program.</para>
+
+ </sect1>
+
</chapter>
<!--
Modified: trunk/src/nb/book/ch08.xml
==============================================================================
--- trunk/src/nb/book/ch08.xml (original)
+++ trunk/src/nb/book/ch08.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-8">
+<chapter id="svn.developer">
<title>Developer Information</title>
<simplesect>
@@ -28,7 +28,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 1: LAYERED LIBRARY DESIGN *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-1">
+ <sect1 id="svn.developer.layerlib">
<title>Layered Library Design</title>
<para>Subversion has a modular design, implemented as a collection
@@ -37,12 +37,12 @@
main layers—the Repository Layer, the Repository Access
(RA) Layer, or the Client Layer. We will examine these layers
shortly, but first, see our brief inventory of Subversion's
- libraries in <xref linkend="svn-ch-8-table-1"/>. For the sake
+ libraries in <xref linkend="svn.developer.layerlib.tbl-1"/>. For the sake
of consistency, we will refer to the libraries by their
extensionless Unix library names (e.g.: libsvn_fs, libsvn_wc,
mod_dav_svn).</para>
- <table id="svn-ch-8-table-1">
+ <table id="svn.developer.layerlib.tbl-1">
<title>A Brief Inventory of the Subversion Libraries</title>
<tgroup cols="2">
<thead>
@@ -65,6 +65,14 @@
<entry>The Subversion filesystem library</entry>
</row>
<row>
+ <entry>libsvn_fs_base</entry>
+ <entry>The Berkeley DB filesystem back-end</entry>
+ </row>
+ <row>
+ <entry>libsvn_fs_fs</entry>
+ <entry>The native filesystem (FSFS) back-end</entry>
+ </row>
+ <row>
<entry>libsvn_ra</entry>
<entry>Repository Access commons and module loader</entry>
</row>
@@ -107,7 +115,7 @@
</table>
<para>The fact that the word <quote>miscellaneous</quote> only
- appears once in <xref linkend="svn-ch-8-table-1"/> is a good
+ appears once in <xref linkend="svn.developer.layerlib.tbl-1"/> is a good
sign. The Subversion development team is serious about making
sure that functionality lives in the right layer and libraries.
Perhaps the greatest advantage of the modular design is its lack
@@ -133,10 +141,10 @@
command-line client does. Subversion's libsvn_client library is
the one-stop shop for most of the functionality necessary for
designing a working Subversion client (see <xref
- linkend="svn-ch-8-sect-1.3"/>).</para>
+ linkend="svn.developer.layerlib.client"/>).</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-1.1">
+ <sect2 id="svn.developer.layerlib.repos">
<title>Repository Layer</title>
<para>When referring to Subversion's Repository Layer, we're
@@ -154,19 +162,15 @@
but a virtual filesystem. Rather than storing
<quote>files</quote> and <quote>directories</quote> as real
files and directories (as in, the kind you can navigate
- through using your favorite shell program), it uses a database
- system for its back-end storage mechanism. Currently, the
- database system in use is Berkeley DB.
- <footnote>
- <para>The choice of Berkeley DB brought several automatic
- features that Subversion needed, such as data integrity,
- atomic writes, recoverability, and hot backups.</para>
- </footnote>
- However, there has been considerable interest by the
- development community in giving future releases of Subversion
- the ability to use other back-end database systems, perhaps
- through a mechanism such as Open Database Connectivity
- (ODBC).</para>
+ through using your favorite shell program), it uses one of two
+ available abstract storage backends—either a Berkeley DB
+ database environment, or a flat-file representation. (To
+ learn more about the two repository back-ends, see <xref
+ linkend="svn.reposadmin.basics.backends"/>.) However, there has been
+ considerable interest by the development community in giving
+ future releases of Subversion the ability to use other
+ back-end database systems, perhaps through a mechanism such as
+ Open Database Connectivity (ODBC).</para>
<para>The filesystem API exported by libsvn_fs contains the
kinds of functionality you would expect from any other
@@ -263,10 +267,10 @@
Subversion. Think of a directory tree as a two-dimensional
system, where a node's siblings represent a sort of
left-and-right motion, and descending into subdirectories a
- downward motion. <xref linkend="svn-ch-8-dia-1"/> shows
+ downward motion. <xref linkend="svn.developer.layerlib.repos.dia-1"/> shows
a typical representation of a tree as exactly that.</para>
- <figure id="svn-ch-8-dia-1">
+ <figure id="svn.developer.layerlib.repos.dia-1">
<title>Files and directories in two dimensions</title>
<graphic fileref="images/ch08dia1.png"/>
</figure>
@@ -289,10 +293,10 @@
third-dimensional context needed to understand the difference
between <filename>/foo/bar</filename> in revision 32, and the
same path as it exists in revision 98. <xref
- linkend="svn-ch-8-dia-2"/> shows revision history as an
+ linkend="svn.developer.layerlib.repos.dia-2"/> shows revision history as an
added dimension to the Subversion filesystem universe.</para>
- <figure id="svn-ch-8-dia-2">
+ <figure id="svn.developer.layerlib.repos.dia-2">
<title>Versioning time—the third dimension!</title>
<graphic fileref="images/ch08dia2.png"/>
</figure>
@@ -346,7 +350,7 @@
checks for a non-successful error return from the function it
wraps, and returns that error if it exists.</para>
- <example id="svn-ch-8-sect-1.1-ex-1">
+ <example id="svn.developer.layerlib.repos.ex-1">
<title>Using the Repository Layer</title>
<programlisting>
@@ -445,7 +449,7 @@
a special kind of reporting mechanism that does not really
belong in the core filesystem library itself. (For more
information regarding Subversion's repository hooks, see <xref
- linkend="svn-ch-5-sect-2.1" />.)</para>
+ linkend="svn.reposadmin.create.hooks" />.)</para>
<para>The hook mechanism requirement is but one of the reasons
for the abstraction of a separate repository library from the
@@ -486,7 +490,7 @@
</sect2>
<!-- ****************************************************************** -->
- <sect2 id="svn-ch-8-sect-1.2">
+ <sect2 id="svn.developer.layerlib.ra">
<title>Repository Access Layer</title>
<para>If the Subversion Repository Layer is at <quote>the other
@@ -532,7 +536,7 @@
- handles 'svn' schema
</screen>
- <sect3 id="svn-ch-8-sect-1.2.1">
+ <sect3 id="svn.developer.layerlib.ra.dav">
<title>RA-DAV (Repository Access Using HTTP/DAV)</title>
<para>The libsvn_ra_dav library is designed for use by clients
@@ -634,7 +638,7 @@
</sect3>
- <sect3 id="svn-ch-8-sect-1.2.2">
+ <sect3 id="svn.developer.layerlib.ra.svn">
<title>RA-SVN (Custom Protocol Repository Access)</title>
<para>In addition to the standard HTTP/WebDAV protocol,
@@ -660,7 +664,7 @@
</sect3>
- <sect3 id="svn-ch-8-sect-1.2.3">
+ <sect3 id="svn.developer.layerlib.ra.local">
<title>RA-Local (Direct Repository Access)</title>
<para>Not all communications with a Subversion repository
@@ -688,12 +692,12 @@
contents of the file at that location by examining the
filesystem directly. However, Subversion's resources exist
in a virtual filesystem (see <xref
- linkend="svn-ch-8-sect-1.1" />), and your browser will not
+ linkend="svn.developer.layerlib.repos" />), and your browser will not
understand how to read that filesystem.</para>
</sect3>
- <sect3 id="svn-ch-8-sect-1.2.4">
+ <sect3 id="svn.developer.layerlib.ra.yours">
<title>Your RA Library Here</title>
<para>For those who wish to access a Subversion repository
@@ -711,7 +715,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-1.3">
+ <sect2 id="svn.developer.layerlib.client">
<title>Client Layer</title>
<para>On the client side, the Subversion working copy is where
@@ -736,7 +740,7 @@
to the <filename>CVS</filename> administrative directories
found in CVS working copies. For more information about the
<filename>.svn</filename> administrative area, see <xref
- linkend="svn-ch-8-sect-3"/>in this chapter.</para>
+ linkend="svn.developer.insidewc"/>in this chapter.</para>
<para>The Subversion client library, libsvn_client, has the
broadest responsibility; its job is to mingle the
@@ -795,7 +799,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 2: USING THE APIS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-2">
+ <sect1 id="svn.developer.usingapi">
<title>Using the APIs</title>
<para>Developing applications against the Subversion library APIs
@@ -826,7 +830,7 @@
the scope of a given function or datatype.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-2.1">
+ <sect2 id="svn.developer.usingapi.apr">
<title>The Apache Portable Runtime Library</title>
<para>Along with Subversion's own datatype, you will see many
@@ -870,13 +874,13 @@
users of the Subversion API must also link against APR, must
call <function>apr_initialize()</function> to initialize the
APR subsystem, and then must acquire a pool for use with
- Subversion API calls. See <xref linkend="svn-ch-8-sect-5"/>
+ Subversion API calls. See <xref linkend="svn.developer.pools"/>
for more information.</para>
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-2.2">
+ <sect2 id="svn.developer.usingapi.urlpath">
<title>URL and Path Requirements</title>
<para>With remote version control operation as the whole point
@@ -911,7 +915,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-2.3">
+ <sect2 id="svn.developer.usingapi.otherlangs">
<title>Using Languages Other than C and C++</title>
<para>If you are interested in using the Subversion libraries in
@@ -945,7 +949,7 @@
example. Note the difference in size and complexity of the
function this time!</para>
- <example id="svn-ch-8-sect-2.3-ex-1">
+ <example id="svn.developer.usingapi.otherlangs.ex-1">
<title>Using the Repository Layer with Python</title>
<programlisting>
@@ -1003,7 +1007,7 @@
just a few lines of Python, you can check out a fully
functional Subversion working copy!</para>
- <example id="svn-ch-8-sect-2.3-ex-2">
+ <example id="svn.developer.usingapi.otherlangs.ex-2">
<title>A Simple Script to Check Out a Working Copy.</title>
<programlisting>
@@ -1054,7 +1058,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 3: INSIDE THE WORKING COPY ADMINISTRATION AREA *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-3">
+ <sect1 id="svn.developer.insidewc">
<title>Inside the Working Copy Administration Area</title>
<para>As we mentioned earlier, each directory of a Subversion
@@ -1088,7 +1092,7 @@
couple of the most important items.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-3.1">
+ <sect2 id="svn.developer.insidewc.entries">
<title>The Entries File</title>
<para>Perhaps the single most important file in the
@@ -1122,7 +1126,7 @@
<para>The following is an example of an actual entries
file:</para>
- <example id="svn-ch-8-sect-3-ex-1">
+ <example id="svn.developer.insidewc.entries.ex-1">
<title>Contents of a Typical <filename>.svn/entries</filename>
File</title>
<programlisting>
@@ -1216,7 +1220,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-3.2">
+ <sect2 id="svn.developer.insidewc.base-and-props">
<title>Pristine Copies and Property Files</title>
<para>As mentioned before, the <filename>.svn</filename>
@@ -1256,7 +1260,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 4: WEBDAV *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-4">
+ <sect1 id="svn.developer.webdav">
<title>WebDAV</title>
<para>WebDAV (shorthand for <quote>Web-based Distributed Authoring
@@ -1286,7 +1290,7 @@
</para>
<para>For a more thorough discussion of WebDAV, how it works, and
- how Subversion uses it, see <xref linkend="svn-ap-c"/>. Among
+ how Subversion uses it, see <xref linkend="svn.webdav"/>. Among
other things, that appendix discusses the degree to which
Subversion adheres to the generic WebDAV specification, and how
that affects interoperability with generic WebDAV
@@ -1296,7 +1300,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 5: PROGRAMMING WITH MEMORY POOLS *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-5">
+ <sect1 id="svn.developer.pools">
<title>Programming with Memory Pools</title>
<para>Almost every developer who has used the C programming
@@ -1366,7 +1370,7 @@
is fairly common—recursively crawling a directory tree,
doing some task to each thing in the tree.</para>
- <example id="svn-ch-8-sect-5-ex-1">
+ <example id="svn.developer.pools.ex-1">
<title>Effective Pool Usage</title>
<programlisting>
/* Recursively crawl over DIRECTORY, adding the paths of all its file
@@ -1479,7 +1483,7 @@
<!-- ******************************************************************* -->
<!-- *** SECTION 6: CONTRIBUTING TO SUBVERSION *** -->
<!-- ******************************************************************* -->
- <sect1 id="svn-ch-8-sect-6">
+ <sect1 id="svn.developer.contrib">
<title>Contributing to Subversion</title>
<para>The official source of information about the Subversion
@@ -1493,7 +1497,7 @@
started.</para>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-6.1">
+ <sect2 id="svn.developer.contrib.join">
<title>Join the Community</title>
<para>The first step in community participation is to find a way
@@ -1527,7 +1531,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-6.2">
+ <sect2 id="svn.developer.contrib.get-code">
<title>Get the Source Code</title>
<para>To edit the code, you need to have the code. This means
@@ -1580,7 +1584,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-6.3">
+ <sect2 id="svn.developer.contrib.hacking">
<title>Become Familiar with Community Policies</title>
<para>Now that you have a working copy containing the latest
@@ -1611,7 +1615,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-6.4">
+ <sect2 id="svn.developer.contrib.code-and-test">
<title>Make and Test Your Changes</title>
<para>With the code and community policy understanding in hand,
@@ -1661,7 +1665,7 @@
</sect2>
<!-- ***************************************************************** -->
- <sect2 id="svn-ch-8-sect-6.5">
+ <sect2 id="svn.developer.contrib.submit">
<title>Donate Your Changes</title>
<para>After making your modifications to the source code,
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Thu May 26 06:37:13 2005
@@ -1,4 +1,4 @@
-<chapter id="svn-ch-9">
+<chapter id="svn.ref">
<title>Subversion Complete Reference</title>
<simplesect>
@@ -13,7 +13,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 1 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-1">
+ <sect1 id="svn.ref.svn">
<title>The Subversion Command Line Client:
<command>svn</command></title>
@@ -34,10 +34,10 @@
</screen>
<para>You can find many more examples of how to use most client
- commands in <xref linkend="svn-ch-3"/> and commands for managing
- properties in <xref linkend="svn-ch-7-sect-2"/>.</para>
+ commands in <xref linkend="svn.tour"/> and commands for managing
+ properties in <xref linkend="svn.advanced.props"/>.</para>
- <sect2 id="svn-ch-9-sect-1.1">
+ <sect2 id="svn.ref.svn.sw">
<title><command>svn</command> Switches</title>
<para>While Subversion has different switches for its
@@ -269,8 +269,8 @@
normally be omitted since they match a pattern in the
<literal>global-ignores</literal> configuration option
or the <literal>svn:ignore</literal> property. See <xref
- linkend="svn-ch-7-sect-1.3.2"/> and <xref
- linkend="svn-ch-7-sect-2.3.3"/> for more
+ linkend="svn.advanced.confarea.opts.config"/> and <xref
+ linkend="svn.advanced.props.special.ignore"/> for more
information.</para>
</listitem>
</varlistentry>
@@ -376,7 +376,7 @@
$ svn log -r 1729:{2002-02-17}
</screen>
- <para>See <xref linkend="svn-ch-3-sect-3.2"/> for more
+ <para>See <xref linkend="svn.tour.revs.keywords"/> for more
information.</para>
</listitem>
</varlistentry>
@@ -389,7 +389,7 @@
This switch requires that you also pass a revision
with the <option>--revision</option>
(<option>-r</option>) switch. See <xref
- linkend="svn-ch-5-sect-1.2"/> for more details on
+ linkend="svn.reposadmin.basics.revprops"/> for more details on
unversioned properties.</para>
</listitem>
</varlistentry>
@@ -482,10 +482,10 @@
</sect2>
- <sect2 id="svn-ch-9-sect-1.2">
+ <sect2 id="svn.ref.svn.c">
<title><command>svn</command> Subcommands</title>
- <refentry id="svn-ch-9-sect-1.2-re-add">
+ <refentry id="svn.ref.svn.c.add">
<refnamediv>
<refname>svn add</refname>
<refpurpose>Add files, directories, or symbolic links.</refpurpose>
@@ -584,7 +584,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-blame">
+ <refentry id="svn.ref.svn.c.blame">
<refnamediv>
<refname>svn blame</refname>
<refpurpose>Show author and revision information in-line
@@ -648,7 +648,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-cat">
+ <refentry id="svn.ref.svn.c.cat">
<refnamediv>
<refname>svn cat</refname>
<refpurpose>Output the contents of the specified files or
@@ -656,7 +656,7 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn cat TARGET...</programlisting>
+ <programlisting>svn cat TARGET[@REV]...</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -727,14 +727,14 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-checkout">
+ <refentry id="svn.ref.svn.c.checkout">
<refnamediv>
<refname>svn checkout</refname>
<refpurpose>Check out a working copy from a repository.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn checkout URL... [PATH]</programlisting>
+ <programlisting>svn checkout URL[@REV]... [PATH]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -857,7 +857,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-cleanup">
+ <refentry id="svn.ref.svn.c.cleanup">
<refnamediv>
<refname>svn cleanup</refname>
<refpurpose>Recursively clean up the working copy.</refpurpose>
@@ -874,7 +874,7 @@
<quote>working copy locked</quote> error, run this
command to remove stale locks and get your working copy
into a usable state again. See <xref
- linkend="svn-ap-b"/>.</para>
+ linkend="svn.tshoot"/>.</para>
<para>If, for some reason, an <command>svn update</command>
fails due to a problem running an external diff program
@@ -903,7 +903,7 @@
</refsect1>
<refsect1>
- <title>Switches:</title>
+ <title>Switches</title>
<screen>
--diff3-cmd CMD
@@ -930,7 +930,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-commit">
+ <refentry id="svn.ref.svn.c.commit">
<refnamediv>
<refname>svn commit</refname>
<refpurpose>Send changes from your working copy to the repository.</refpurpose>
@@ -949,7 +949,7 @@
<command>svn</command> will launch your editor for you
to compose a commit message. See the
<literal>editor-cmd</literal> section in <xref
- linkend="svn-ch-7-sect-1.3.2"/>.</para>
+ linkend="svn.advanced.confarea.opts.config"/>.</para>
<tip>
<para>If you begin a commit and Subversion launches your
@@ -1057,7 +1057,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-copy">
+ <refentry id="svn.ref.svn.c.copy">
<refnamediv>
<refname>svn copy</refname>
<refpurpose>Copy a file or directory in a working copy or
@@ -1226,7 +1226,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-delete">
+ <refentry id="svn.ref.svn.c.delete">
<refnamediv>
<refname>svn delete</refname>
<refpurpose>Delete an item from a working copy
@@ -1333,17 +1333,16 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-diff">
+ <refentry id="svn.ref.svn.c.diff">
<refnamediv>
<refname>svn diff</refname>
<refpurpose>Display the differences between two paths.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn diff [-r N[:M]] [--old OLD-TGT] [--new NEW-TGT] [PATH...]</programlisting>
- <programlisting>svn diff -r N:M URL</programlisting>
- <programlisting>svn diff [-r N[:M]] URL1[@N] URL2[@M]</programlisting>
-
+ <programlisting>diff [-r N[:M]] [TARGET[@REV]...]</programlisting>
+ <programlisting>diff [-r N[:M]] --old OLD-TGT[@OLDREV] [--new NEW-TGT[@NEWREV]] [PATH...]</programlisting>
+ <programlisting>diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -1580,15 +1579,15 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-export">
+ <refentry id="svn.ref.svn.c.export">
<refnamediv>
<refname>svn export</refname>
<refpurpose>Export a clean directory tree.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn export [-r REV] URL [PATH]</programlisting>
- <programlisting>svn export PATH1 PATH2</programlisting>
+ <programlisting>svn export [-r REV] URL[@PEGREV] [PATH]</programlisting>
+ <programlisting>svn export PATH1[@PEGREV] PATH2</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -1686,7 +1685,7 @@
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-help">
+ <refentry id="svn.ref.svn.c.help">
<refnamediv>
<refname>svn help</refname>
<refpurpose>Help!</refpurpose>
@@ -1728,7 +1727,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-import">
+ <refentry id="svn.ref.svn.c.import">
<refnamediv>
<refname>svn import</refname>
<refpurpose>Recursively commit a copy of PATH to URL.</refpurpose>
@@ -1822,7 +1821,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-info">
+ <refentry id="svn.ref.svn.c.info">
<refnamediv>
<refname>svn info</refname>
<refpurpose>Print information about PATHs.</refpurpose>
@@ -1918,14 +1917,14 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-list">
+ <refentry id="svn.ref.svn.c.list">
<refnamediv>
<refname>svn list</refname>
<refpurpose>List directory entries in the repository.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn list [TARGET...]</programlisting>
+ <programlisting>svn list [TARGET[@REV]...]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -2018,13 +2017,13 @@
</screen>
<para>For further details, see <xref
- linkend="svn-ch-3-sect-6.4"/>.</para>
+ linkend="svn.tour.history.list"/>.</para>
</refsect1>
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-log">
+ <refentry id="svn.ref.svn.c.log">
<refnamediv>
<refname>svn log</refname>
<refpurpose>Display commit log messages.</refpurpose>
@@ -2261,7 +2260,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-merge">
+ <refentry id="svn.ref.svn.c.merge">
<refnamediv>
<refname>svn merge</refname>
<refpurpose>Apply the differences between two sources to a
@@ -2270,7 +2269,8 @@
<refsect1>
<title>Synopsis</title>
<programlisting>svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]</programlisting>
- <programlisting>svn merge -r N:M SOURCE [WCPATH]</programlisting>
+ <programlisting>svn merge sourceWCPATH1 at N sourceWCPATH2 at M [WCPATH]</programlisting>
+ <programlisting>svn merge -r N:M SOURCE[@REV] [WCPATH]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -2374,7 +2374,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-mkdir">
+ <refentry id="svn.ref.svn.c.mkdir">
<refnamediv>
<refname>svn mkdir</refname>
<refpurpose>Create a new directory under version control.</refpurpose>
@@ -2454,7 +2454,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-move">
+ <refentry id="svn.ref.svn.c.move">
<refnamediv>
<refname>svn move</refname>
<refpurpose>Move a file or directory.</refpurpose>
@@ -2562,7 +2562,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-propdel">
+ <refentry id="svn.ref.svn.c.propdel">
<refnamediv>
<refname>svn propdel</refname>
<refpurpose>Remove a property from an item.</refpurpose>
@@ -2634,7 +2634,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-propedit">
+ <refentry id="svn.ref.svn.c.propedit">
<refnamediv>
<refname>svn propedit</refname>
<refpurpose>Edit the property of one or more items under
@@ -2704,14 +2704,14 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-propget">
+ <refentry id="svn.ref.svn.c.propget">
<refnamediv>
<refname>svn propget</refname>
<refpurpose>Print the value of a property.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn propget PROPNAME [PATH...]</programlisting>
+ <programlisting>svn propget PROPNAME [TARGET[@REV]...]</programlisting>
<programlisting>svn propget PROPNAME --revprop -r REV [URL]</programlisting>
</refsect1>
<refsect1>
@@ -2722,7 +2722,7 @@
versioned property of an item or items in your working
copy, while the second prints unversioned remote
property on a repository revision. See <xref
- linkend="svn-ch-7-sect-2"/> for more information on
+ linkend="svn.advanced.props"/> for more information on
properties.</para>
</refsect1>
@@ -2781,14 +2781,14 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-proplist">
+ <refentry id="svn.ref.svn.c.proplist">
<refnamediv>
<refname>svn proplist</refname>
<refpurpose>List all properties.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn proplist [PATH...]</programlisting>
+ <programlisting>svn proplist [TARGET[@REV]...]</programlisting>
<programlisting>svn proplist --revprop -r REV [URL]</programlisting>
</refsect1>
<refsect1>
@@ -2862,7 +2862,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-propset">
+ <refentry id="svn.ref.svn.c.propset">
<refnamediv>
<refname>svn propset</refname>
<refpurpose>Set PROPNAME to PROPVAL on files, directories, or revisions.</refpurpose>
@@ -2886,7 +2886,7 @@
<tip>
<para>Subversion has a number of <quote>special</quote>
properties that affect its behavior. See <xref
- linkend="svn-ch-7-sect-2.3"/> for more on these
+ linkend="svn.advanced.props.special"/> for more on these
properties.</para>
</tip>
@@ -2985,7 +2985,7 @@
administrator must explicitly enable revision property
modifications by creating a hook named
<literal>pre-revprop-change</literal>. See <xref
- linkend="svn-ch-5-sect-2.1"/> for more information on
+ linkend="svn.reposadmin.create.hooks"/> for more information on
hook scripts.</para>
</note>
@@ -2993,7 +2993,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-resolved">
+ <refentry id="svn.ref.svn.c.resolved">
<refnamediv>
<refname>svn resolved</refname>
<refpurpose>Remove <quote>conflicted</quote> state on
@@ -3012,7 +3012,7 @@
conflict-related artifact files and allows PATH to be
committed again; that is, it tells Subversion that the
conflicts have been <quote>resolved</quote>. See <xref
- linkend="svn-ch-3-sect-5.4"/> for an in-depth look at
+ linkend="svn.tour.cycle.resolve"/> for an in-depth look at
resolving conflicts.</para>
</refsect1>
@@ -3077,7 +3077,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-revert">
+ <refentry id="svn.ref.svn.c.revert">
<refnamediv>
<refname>svn revert</refname>
<refpurpose>Undo all local edits.</refpurpose>
@@ -3175,7 +3175,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-status">
+ <refentry id="svn.ref.svn.c.status">
<refnamediv>
<refname>svn status</refname>
<refpurpose>Print the status of working copy files and directories.</refpurpose>
@@ -3366,7 +3366,7 @@
<para>The fifth column is populated only if the item is
switched relative to its parent (see <xref
- linkend="svn-ch-4-sect-5"/>).</para>
+ linkend="svn.branchmerge.switchwc"/>).</para>
<variablelist>
@@ -3507,13 +3507,13 @@
</screen>
<para>For many more examples of <command>svn status</command>,
- see <xref linkend="svn-ch-3-sect-5.3.1"/>.</para>
+ see <xref linkend="svn.tour.cycle.examine.status"/>.</para>
</refsect1>
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-switch">
+ <refentry id="svn.ref.svn.c.switch">
<refnamediv>
<refname>svn switch</refname>
<refpurpose>Update working copy to a different URL.</refpurpose>
@@ -3521,6 +3521,10 @@
<refsect1>
<title>Synopsis</title>
<programlisting>svn switch URL [PATH]</programlisting>
+
+ <programlisting>switch --relocate FROM TO [PATH...]</programlisting>
+
+
</refsect1>
<refsect1>
<title>Description</title>
@@ -3530,7 +3534,7 @@
ancestor with your working copy, although not
necessarily. This is the Subversion way to move a
working copy to a new branch. See <xref
- linkend="svn-ch-4-sect-5"/> for an in-depth look at
+ linkend="svn.branchmerge.switchwc"/> for an in-depth look at
switching.</para>
</refsect1>
@@ -3663,7 +3667,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-1.2-re-update">
+ <refentry id="svn.ref.svn.c.update">
<refnamediv>
<refname>svn update</refname>
<refpurpose>Update your working copy.</refpurpose>
@@ -3779,7 +3783,7 @@
<para>You can also update your working copy to an older
revision (Subversion doesn't have the concept of
<quote>sticky</quote> files like CVS does; see <xref
- linkend="svn-ap-a"/>):</para>
+ linkend="svn.forcvs"/>):</para>
<screen>
$ svn update -r30
@@ -3806,19 +3810,19 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 2 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-2">
+ <sect1 id="svn.ref.svnadmin">
<title><command>svnadmin</command></title>
<para><command>svnadmin</command> is the administrative tool for
monitoring and repairing your Subversion repository. For
detailed information, see <xref
- linkend="svn-ch-5-sect-3.1.2"/>.</para>
+ linkend="svn.reposadmin.maint.tk.svnadmin"/>.</para>
<para>Since <command>svnadmin</command> works via direct repository access
(and thus can only be used on the machine that holds the
repository), it refers to the repository with a path, not a URL.</para>
- <sect2 id="svn-ch-9-sect-2.1">
+ <sect2 id="svn.ref.svnadmin.sw">
<title><command>svnadmin</command> Switches</title>
<variablelist>
@@ -3916,11 +3920,11 @@
</sect2>
<!-- ================================================================= -->
- <sect2 id="svn-ch-9-sect-2.2">
+ <sect2 id="svn.ref.svnadmin.c">
<title><command>svnadmin</command> Subcommands</title>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-create">
+ <refentry id="svn.ref.svnadmin.c.create">
<refnamediv>
<refname>svnadmin create</refname>
<refpurpose>Create a new, empty repository.</refpurpose>
@@ -3974,7 +3978,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-deltify">
+ <refentry id="svn.ref.svnadmin.c.deltify">
<refnamediv>
<refname>svnadmin deltify</refname>
<refpurpose>Deltify changed paths in a revision range.</refpurpose>
@@ -4008,7 +4012,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-dump">
+ <refentry id="svn.ref.svnadmin.c.dump">
<refnamediv>
<refname>svnadmin dump</refname>
<refpurpose>Dump the contents of filesystem to stdout.</refpurpose>
@@ -4027,8 +4031,22 @@
<replaceable>UPPER</replaceable> rev. If no revisions are
given, dump all revision trees. If only
<replaceable>LOWER</replaceable> is given, dump that one
- revision tree. See <xref linkend="svn-ch-5-sect-3.5"/>
+ revision tree. See <xref linkend="svn.reposadmin.maint.migrate"/>
for a practical use.</para>
+
+ <para>If the size of your Subversion dumpfile is a concern,
+ you can use the <option>--deltas</option> switch to (in
+ some cases drastically) reduce the size of the dumpfile
+ that <command>svnadmin</command> creates. With this
+ switch, instead of writing the full content of each
+ revision to the dumpfile, <command>svnadmin dump</command>
+ will only emit the differences from one revision to the
+ next. There are, however, disadvantages to creating
+ deltified dumpfiles—it's more CPU intensive to
+ create them, <command>svndumpfilter</command> can't
+ operate on them, and non-deltified dumpfiles tend to
+ compress better.</para>
+
</refsect1>
<refsect1>
<title>Switches</title>
@@ -4073,7 +4091,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-help">
+ <refentry id="svn.ref.svnadmin.c.help">
<refnamediv>
<refname>svnadmin help</refname>
</refnamediv>
@@ -4099,14 +4117,14 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-hotcopy">
+ <refentry id="svn.ref.svnadmin.c.hotcopy">
<refnamediv>
<refname>svnadmin hotcopy</refname>
<refpurpose>Make a hot copy of a repository.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svnadmin hotcopy OLD_REPOS_PATH NEW_REPOS_PATH</programlisting>
+ <programlisting>svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH</programlisting>
</refsect1>
<refsect1>
@@ -4135,11 +4153,12 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-list-dblogs">
+ <refentry id="svn.ref.svnadmin.c.list-dblogs">
<refnamediv>
- <refname>svnadmin list-dblogs</refname>
- <refpurpose>Ask Berkeley DB which log files exist for a given
- Subversion repository.</refpurpose>
+ <refname>svnadmin list-dblogs</refname> <refpurpose>Ask
+ Berkeley DB which log files exist for a given Subversion
+ repository (applies only to repositories using the
+ <literal>bdb</literal> backend).</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -4154,18 +4173,19 @@
<literal>DB_LOGS_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
deleted to reclaim disk space. See <xref
- linkend="svn-ch-5-sect-3.3"/> for more
+ linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-list-unused-dblogs">
+ <refentry id="svn.ref.svnadmin.c.list-unused-dblogs">
<refnamediv>
<refname>svnadmin list-unused-dblogs</refname>
<refpurpose>Ask Berkeley DB which log files can be safely
- deleted.</refpurpose>
+ deleted (applies only to repositories using the
+ <literal>bdb</literal> backend).</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -4180,7 +4200,7 @@
<literal>DB_LOGS_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
deleted to reclaim disk space. See <xref
- linkend="svn-ch-5-sect-3.3"/> for more
+ linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
@@ -4203,7 +4223,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-load">
+ <refentry id="svn.ref.svnadmin.c.load">
<refnamediv>
<refname>svnadmin load</refname> <refpurpose>Read a
<quote>dumpfile</quote>-formatted stream from
@@ -4261,7 +4281,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-lstxns">
+ <refentry id="svn.ref.svnadmin.c.lstxns">
<refnamediv>
<refname>svnadmin lstxns</refname>
<refpurpose>Print the names of all uncommitted transactions.</refpurpose>
@@ -4274,7 +4294,7 @@
<title>Description</title>
<para>Print the names of all uncommitted transactions. See
- <xref linkend="svn-ch-5-sect-3.2"/> for information on how
+ <xref linkend="svn.reposadmin.maint.cleanup"/> for information on how
uncommitted transactions are created and what you should
do with them.</para>
</refsect1>
@@ -4295,11 +4315,12 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-recover">
+ <refentry id="svn.ref.svnadmin.c.recover">
<refnamediv>
<refname>svnadmin recover</refname>
<refpurpose>Bring a repository database back into a
- consistent state.</refpurpose>
+ consistent state (applies only to repositories using the
+ <literal>bdb</literal> backend).</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -4365,7 +4386,7 @@
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-rmtxns">
+ <refentry id="svn.ref.svnadmin.c.rmtxns">
<refnamediv>
<refname>svnadmin rmtxns</refname>
<refpurpose>Delete transactions from a repository.</refpurpose>
@@ -4379,7 +4400,7 @@
<para>Delete outstanding transactions from a repository.
This is covered in detail in <xref
- linkend="svn-ch-5-sect-3.2"/>.</para>
+ linkend="svn.reposadmin.maint.cleanup"/>.</para>
</refsect1>
<refsect1>
@@ -4414,7 +4435,7 @@
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-setlog">
+ <refentry id="svn.ref.svnadmin.c.setlog">
<refnamediv>
<refname>svnadmin setlog</refname>
<refpurpose>Set the log-message on a revision.</refpurpose>
@@ -4468,7 +4489,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-2.2-re-verify">
+ <refentry id="svn.ref.svnadmin.c.verify">
<refnamediv>
<refname>svnadmin verify</refname>
<refpurpose>Verify the data stored in the repository.</refpurpose>
@@ -4506,7 +4527,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 3 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-3">
+ <sect1 id="svn.ref.svnlook">
<title><command>svnlook</command></title>
<para><command>svnlook</command> is a command-line utility for
@@ -4525,7 +4546,7 @@
<command>svnlook</command> defaults to the youngest (most
recent) revision of the repository.</para>
- <sect2 id="svn-ch-9-sect-3.1">
+ <sect2 id="svn.ref.svnlook.sw">
<title><command>svnlook</command> Switches</title>
<para>Switches in <command>svnlook</command> are global, just
@@ -4579,10 +4600,10 @@
</sect2>
<!-- ================================================================= -->
- <sect2 id="svn-ch-9-sect-3.2">
+ <sect2 id="svn.ref.svnlook.c">
<title><command>svnlook</command></title>
- <refentry id="svn-ch-9-sect-3.2-re-author">
+ <refentry id="svn.ref.svnlook.c.author">
<refnamediv>
<refname>svnlook author</refname>
<refpurpose>Print the author.</refpurpose>
@@ -4622,7 +4643,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-cat">
+ <refentry id="svn.ref.svnlook.c.cat">
<refnamediv>
<refname>svnlook cat</refname>
<refpurpose>Print the contents of a file.</refpurpose>
@@ -4674,7 +4695,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-changed">
+ <refentry id="svn.ref.svnlook.c.changed">
<refnamediv>
<refname>svnlook changed</refname>
<refpurpose>Print the paths that were changed.</refpurpose>
@@ -4722,7 +4743,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-date">
+ <refentry id="svn.ref.svnlook.c.date">
<refnamediv>
<refname>svnlook date</refname>
<refpurpose>Print the datestamp.</refpurpose>
@@ -4762,7 +4783,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-diff">
+ <refentry id="svn.ref.svnlook.c.diff">
<refnamediv>
<refname>svnlook diff</refname>
<refpurpose>Print differences of changed files and properties.</refpurpose>
@@ -4826,7 +4847,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-dirs-changed">
+ <refentry id="svn.ref.svnlook.c.dirs-changed">
<refnamediv>
<refname>svnlook dirs-changed</refname>
<refpurpose>Print the directories that were themselves changed.</refpurpose>
@@ -4867,7 +4888,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-help">
+ <refentry id="svn.ref.svnlook.c.help">
<refnamediv>
<refname>svnlook help</refname>
</refnamediv>
@@ -4892,7 +4913,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-history">
+ <refentry id="svn.ref.svnlook.c.history">
<refnamediv>
<refname>svnlook history</refname>
<refpurpose>Print information about the history of a path in
@@ -4952,7 +4973,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-info">
+ <refentry id="svn.ref.svnlook.c.info">
<refnamediv>
<refname>svnlook info</refname>
<refpurpose>Print the author, datestamp, log message size,
@@ -4996,7 +5017,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-log">
+ <refentry id="svn.ref.svnlook.c.log">
<refnamediv>
<refname>svnlook log</refname>
<refpurpose>Print the log message.</refpurpose>
@@ -5035,7 +5056,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-propget">
+ <refentry id="svn.ref.svnlook.c.propget">
<refnamediv>
<refname>svnlook propget</refname>
<refpurpose>Print the raw value of a property on a path in
@@ -5043,7 +5064,7 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS</programlisting>
+ <programlisting>svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -5083,7 +5104,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-proplist">
+ <refentry id="svn.ref.svnlook.c.proplist">
<refnamediv>
<refname>svnlook proplist</refname>
<refpurpose>Print the names and values of versioned file and
@@ -5091,7 +5112,7 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svnlook proplist REPOS_PATH PATH_IN_REPOS</programlisting>
+ <programlisting>svnlook proplist REPOS_PATH [PATH_IN_REPOS]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -5142,7 +5163,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-tree">
+ <refentry id="svn.ref.svnlook.c.tree">
<refnamediv>
<refname>svnlook tree</refname>
<refpurpose>Print the tree.</refpurpose>
@@ -5190,7 +5211,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-uuid">
+ <refentry id="svn.ref.svnlook.c.uuid">
<refnamediv>
<refname>svnlook uuid</refname>
<refpurpose>Print the repository's
@@ -5223,7 +5244,7 @@
</refentry>
<!-- ================================================================= -->
- <refentry id="svn-ch-9-sect-3.2-re-youngest">
+ <refentry id="svn.ref.svnlook.c.youngest">
<refnamediv>
<refname>svnlook youngest</refname>
<refpurpose>Print the youngest revision number.</refpurpose>
@@ -5258,7 +5279,7 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 4 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-4">
+ <sect1 id="svn.ref.svnserve">
<title><command>svnserve</command></title>
@@ -5274,10 +5295,10 @@
<filename>conf/svnserve.conf</filename> in the repository
directory to determine repository-specific settings such as what
authentication database to use and what authorization policies
- to apply. See <xref linkend="svn-ch-6-sect-3"/> for details of
+ to apply. See <xref linkend="svn.serverconfig.svnserve"/> for details of
the <filename>svnserve.conf</filename> file.</para>
- <sect2 id="svn-ch-9-sect-4.1">
+ <sect2 id="svn.ref.svnserve.sw">
<title><command>svnserve</command> Switches</title>
<para>Unlike the previous commands we've
@@ -5376,7 +5397,7 @@
</varlistentry>
<varlistentry>
- <term><option>--tunnel-user=NAME</option></term>
+ <term><option>--tunnel-user NAME</option></term>
<listitem>
<para>Used in conjuction with <option>--tunnel</option> switch; tells
svnserve to assume that NAME is the authenticated user,
@@ -5415,23 +5436,23 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 5 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-5">
+ <sect1 id="svn.ref.svnversion">
<title><command>svnversion</command></title>
- <refentry id="svn-ch-9-sect-5.1">
+ <refentry id="svn.ref.svnversion.re">
<refnamediv>
<refname>svnversion</refname>
<refpurpose>Summarize the local revision(s) of a working
copy.</refpurpose>
</refnamediv>
- <refsect1 id="svn-ch-9-sect-5.1.1">
+ <refsect1 id="svn.ref.svnversion.re.syn">
<title>Synopsis</title>
<programlisting>svnversion [OPTIONS] WC_PATH [TRAIL_URL]</programlisting>
</refsect1>
- <refsect1 id="svn-ch-9-sect-5.1.2">
+ <refsect1 id="svn.ref.svnversion.re.desc">
<title>Description</title>
<para><command>svnversion</command> is a program for
@@ -5446,7 +5467,7 @@
</refsect1>
- <refsect1 id="svn-ch-9-sect-5.1.3">
+ <refsect1 id="svn.ref.svnversion.re.sw">
<title>Switches</title>
<para>Like <command>svnserve</command>,
@@ -5488,7 +5509,7 @@
</variablelist>
</refsect1>
- <refsect1 id="svn-ch-9-sect-5.1.4">
+ <refsect1 id="svn.ref.svnversion.re.examples">
<title>Examples</title>
<para>If the working copy is all at the same revision (for
@@ -5543,11 +5564,11 @@
<!-- ================================================================= -->
<!-- ======================== SECTION 6 ============================== -->
<!-- ================================================================= -->
- <sect1 id="svn-ch-9-sect-6">
+ <sect1 id="svn.ref.mod_dav_svn">
<title><command>mod_dav_svn</command></title>
- <refentry id="svn-ch-9-sect-6.1">
+ <refentry id="svn.ref.mod_dav_svn.conf">
<refnamediv>
<refname><literal>mod_dav_svn</literal> Configuration
@@ -5557,17 +5578,17 @@
</refnamediv>
- <refsect1 id="svn-ch-9-sect-6.1.1">
+ <refsect1 id="svn.ref.mod_dav_svn.conf.desc">
<title>Description</title>
<para>This section briefly describes each of the Subversion
Apache configuration directives. For an in-depth
description of configuring Apache with Subversion, see <xref
- linkend="svn-ch-6-sect-4"/>.)</para>
+ linkend="svn.serverconfig.httpd"/>.)</para>
</refsect1>
- <refsect1 id="svn-ch-9-sect-6.1.2">
+ <refsect1 id="svn.ref.mod_dav_svn.conf.directives">
<title>Directives</title>
<variablelist>
@@ -5661,7 +5682,7 @@
<para>Control path-based authorization by enabling or
disabling subrequests. See <xref
- linkend="svn-ch-6-sect-4.4.3"/> for details.</para>
+ linkend="svn.serverconfig.httpd.authz.pathauthzoff"/> for details.</para>
</listitem>
</varlistentry>
Modified: trunk/src/nb/book/copyright.xml
==============================================================================
--- trunk/src/nb/book/copyright.xml (original)
+++ trunk/src/nb/book/copyright.xml Thu May 26 06:37:13 2005
@@ -1,10 +1,10 @@
-<appendix id="svn-copyright">
+<appendix id="svn.copyright">
<title>Copyright</title>
<simplesect>
<programlisting>
-Copyright (c) 2002-2004
+Copyright (c) 2002-2005
Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato.
This work is licensed under the Creative Commons Attribution License.
Modified: trunk/src/nb/book/foreword.xml
==============================================================================
--- trunk/src/nb/book/foreword.xml (original)
+++ trunk/src/nb/book/foreword.xml Thu May 26 06:37:13 2005
@@ -3,7 +3,7 @@
the best solution for now, even though there's also a real preface in
ch00.xml. -->
-<preface id="svn-foreword">
+<preface id="svn.foreword">
<!-- @ENGLISH {{{
<title>Foreword</title>
@ENGLISH }}} -->
More information about the svnbook-dev
mailing list