[svnbook commit] r2330 - in trunk/src/nb: . book
sunny256
noreply at red-bean.com
Thu Jul 20 06:23:52 CDT 2006
Author: sunny256
Date: Thu Jul 20 06:23:52 2006
New Revision: 2330
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/appa.xml
trunk/src/nb/book/appb.xml
trunk/src/nb/book/ch01.xml
trunk/src/nb/book/ch03.xml
trunk/src/nb/book/ch05.xml
trunk/src/nb/book/ch06.xml
trunk/src/nb/book/ch07.xml
trunk/src/nb/book/ch09.xml
Log:
Updated the Norwegian book to match the English r2139. It now
corresponds to the en-1.2-final tag.
* src/nb/LAST_UPDATED
Updated by "make sync HEAD=2139".
* src/nb/book/appa.xml
* src/nb/book/appb.xml
* src/nb/book/ch01.xml
* src/nb/book/ch03.xml
* src/nb/book/ch05.xml
* src/nb/book/ch06.xml
* src/nb/book/ch07.xml
* src/nb/book/ch09.xml
Merged and updated r2121, r2122, r2128, r2129, r2130, r2136, r2138,
r2139.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu Jul 20 06:23:52 2006
@@ -1 +1 @@
-2112
+2139
Modified: trunk/src/nb/book/appa.xml
==============================================================================
--- trunk/src/nb/book/appa.xml (original)
+++ trunk/src/nb/book/appa.xml Thu Jul 20 06:23:52 2006
@@ -425,81 +425,86 @@
update</command> seg til kun å inneholde filer som blir oppdatert,
<emphasis>ikke</emphasis> lokale endringer.</para>
- <!-- @ENGLISH {{{
- <para><command>svn status</command> prints all files that have
- local modifications. By default, the repository is not
- contacted. While this subcommand accepts a fair number of
- options, the following are the most commonly used ones:</para>
- @ENGLISH }}} -->
- <para><command>svn status</command> lister alle filer som inneholder
- lokale forandringer.
- Standard oppførsel er å ikke kontakte depotet og nettverkskontakt
- er derfor ikke nødvendig.
- Denne delkommandoen godtar en god del valg, dette er de mest
- vanlige:</para>
-
- <variablelist>
- <varlistentry>
- <term><option>-u</option></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Contact the repository to determine, and then display,
- out-of-dateness information.</para>
- @ENGLISH }}} -->
- <para>Kontakt depotet for å finne ut, og deretter vise
- informasjon om utdaterte elementer.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-v</option></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Show <emphasis>all</emphasis> entries under
- version control.</para>
- @ENGLISH }}} -->
- <para>Vis <emphasis>alle</emphasis> elementer som er under
- versjonskontroll.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-N</option></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Run non-recursively (do not descend into
- subdirectories).</para>
- @ENGLISH }}} -->
- <para>Kjør kommandoen ikke-rekursivt (ikke gå inn i
- underkataloger).</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <!-- @ENGLISH {{{
- <para>The <command>status</command> command has two output
- formats. In the default <quote>short</quote> format, local
- modifications look like this:</para>
- @ENGLISH }}} -->
- <para>Status-kommandoen har to visningsformater.
- Med det vanlige <quote>korte</quote> formatet ser lokale
- forandringer ut som dette:</para>
+ <sect2 id="svn.forcvs.status-vs-update.status">
+ <title>Status</title>
+
+ <!-- @ENGLISH {{{
+ <para><command>svn status</command> prints all files that have
+ local modifications. By default, the repository is not
+ contacted. While this subcommand accepts a fair number of
+ options, the following are the most commonly used ones:</para>
+ @ENGLISH }}} -->
+ <para><command>svn status</command> lister alle filer som
+ inneholder lokale forandringer.
+ Standard oppførsel er å ikke kontakte depotet og
+ nettverkskontakt er derfor ikke nødvendig.
+ Denne delkommandoen godtar en god del valg, dette er de mest
+ vanlige:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-u</option></term>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Contact the repository to determine, and then display,
+ out-of-dateness information.</para>
+ @ENGLISH }}} -->
+ <para>Kontakt depotet for å finne ut, og deretter vise
+ informasjon om utdaterte elementer.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-v</option></term>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Show <emphasis>all</emphasis> entries under
+ version control.</para>
+ @ENGLISH }}} -->
+ <para>Vis <emphasis>alle</emphasis> elementer som er under
+ versjonskontroll.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-N</option></term>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Run non-recursively (do not descend into
+ subdirectories).</para>
+ @ENGLISH }}} -->
+ <para>Kjør kommandoen ikke-rekursivt (ikke gå inn i
+ underkataloger).</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
- <screen>
+ <!-- @ENGLISH {{{
+ <para>The <command>status</command> command has two output
+ formats. In the default <quote>short</quote> format, local
+ modifications look like this:</para>
+ @ENGLISH }}} -->
+ <para><command>status</command>-kommandoen har to
+ visningsformater.
+ Med det vanlige <quote>korte</quote> formatet ser lokale
+ forandringer ut som dette:</para>
+
+ <screen>
$ svn status
M foo.c
M bar/baz.c
</screen>
- <!-- @ENGLISH {{{
- <para>If you specify the <option>-ﳢ-show-updates</option>
- (<option>-u</option>) switch, a longer output format is
- used:</para>
- @ENGLISH }}} -->
- <para>Hvis du spesifisererer valget <option>--show-updates</option>
- (<option>-u</option>), brukes et lengre format:</para>
+ <!-- @ENGLISH {{{
+ <para>If you specify the <option>-ﳢ-show-updates</option>
+ (<option>-u</option>) switch, a longer output format is
+ used:</para>
+ @ENGLISH }}} -->
+ <para>Hvis du spesifisererer valget
+ <option>--show-updates</option> (<option>-u</option>), brukes et
+ lengre format:</para>
- <screen>
+ <screen>
$ svn status -u
M 1047 foo.c
* 1045 faces.html
@@ -508,96 +513,115 @@
Status against revision: 1066
</screen>
- <!-- @ENGLISH {{{
- <para>In this case, two new columns appear. The second column
- contains an asterisk if the file or directory is out-of-date.
- The third column shows the working-copy's revision number of the
- item. In the example above, the asterisk indicates that
- <filename>faces.html</filename> would be patched if we updated,
- and that <filename>bloo.png</filename> is a newly added file in
- the repository. (The absence of any revision number next to
- <filename>bloo.png</filename> means that it doesn't yet exist in
- the working copy.)</para>
- @ENGLISH }}} -->
- <para>I dette tilfellet kommer to nye kolonner til syne.
- Den andre kolonnen inneholder en asterisk hvis filen eller
- katalogen er utdatert.
- Den tredje kolonnen viser arbeidskopiens revisjonsnummer for
- elementet.
- I eksempelet ovenfor indikerer asterisken at
- <filename>faces.html</filename> vil bli patchet hvis vi
- oppdaterer, og at <filename>bloo.png</filename> er en fil som
- nylig er lagt til i depotet.
- (Når revisjonsnummeret ved siden av <filename>bloo.png</filename>
- mangler, betyr det at at fila ikke eksisterer enda i
- arbeidskopien.)</para>
-
- <!-- ###TODO describe -v here as well as -uv. -u and -v use
- different <quote>long</quote> formats and need to be
- documented separately. Moreover, as you can combine -u and
- -v, it needs to be explained what each of them does. As -u is
- much more important than -v, and the example following that
- paragraph *is* about -u, not -v, my patch concentrated on
- that. -->
+ <!-- @ENGLISH {{{
+ <para>In this case, two new columns appear. The second column
+ contains an asterisk if the file or directory is out-of-date.
+ The third column shows the working-copy's revision number of the
+ item. In the example above, the asterisk indicates that
+ <filename>faces.html</filename> would be patched if we updated,
+ and that <filename>bloo.png</filename> is a newly added file in
+ the repository. (The absence of any revision number next to
+ <filename>bloo.png</filename> means that it doesn't yet exist in
+ the working copy.)</para>
+ @ENGLISH }}} -->
+ <para>I dette tilfellet kommer to nye kolonner til syne.
+ Den andre kolonnen inneholder en asterisk hvis filen eller
+ katalogen er utdatert.
+ Den tredje kolonnen viser arbeidskopiens revisjonsnummer for
+ elementet.
+ I eksempelet ovenfor indikerer asterisken at
+ <filename>faces.html</filename> vil bli patchet hvis vi
+ oppdaterer, og at <filename>bloo.png</filename> er en fil som
+ nylig er lagt til i depotet.
+ (Når revisjonsnummeret ved siden av
+ <filename>bloo.png</filename> mangler, betyr det at at fila ikke
+ eksisterer enda i arbeidskopien.)</para>
+
+ <!-- ###TODO describe -v here as well as -uv. -u and -v use
+ different <quote>long</quote> formats and need to be
+ documented separately. Moreover, as you can combine -u and
+ -v, it needs to be explained what each of them does. As -u is
+ much more important than -v, and the example following that
+ paragraph *is* about -u, not -v, my patch concentrated on
+ that. -->
- <!-- @ENGLISH {{{
- <para>Lastly, here's a quick summary of the most common status codes that
- you may see:</para>
- @ENGLISH }}} -->
- <para>Til sist, her er en rask oversikt over de vanligste
- statuskodene som du vil se:</para>
+ <!-- @ENGLISH {{{
+ <para>Lastly, here's a quick summary of the most common status codes that
+ you may see:</para>
+ @ENGLISH }}} -->
+ <para>Til sist, her er en rask oversikt over de vanligste
+ statuskodene som du vil se:</para>
<!-- @ENGLISH {{{
- <screen>
+ <screen>
A Resource is scheduled for Addition
D Resource is scheduled for Deletion
-M Resource has local modifications
-C Resource has conflicts (changes have not been completely merged
+M Resource has local Modifications
+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.advanced.props.special.externals" />)
+X Resource is eXternal to this working copy (may come from another
+ 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)
</screen>
@ENGLISH }}} -->
- <screen>
-A Ressursen er klargjort for tillegging (<quote>Added</quote>)
-D Ressursen er klargjort for sletting (<quote>Deleted</quote>)
-M Ressursen inneholder lokale forandringer (<quote>Modified</quote>)
+ <screen>
+A Ressursen er klargjort for tillegging (<quote>Addition</quote>)
+D Ressursen er klargjort for sletting (<quote>Deletion</quote>)
+M Ressursen inneholder lokale forandringer (<quote>Modifications</quote>)
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
+ flettet sammen med depotet og arbeidskopien) (<quote>Conflicts</quote>)
+X Ressursen er ekstern i denne arbeidskopien (kan komme fra et annet
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)
</screen>
- <!-- ###TODO: This paragraph should be moved elsewhere. We are
- talking about status codes here, and not update.
- Although CVS uses update as a form of status... -->
- <!-- @ENGLISH {{{
- <para>Subversion has combined the CVS <literal>P</literal> and
- <literal>U</literal> codes into just <literal>U</literal>. When
- a merge or conflict occurs, Subversion simply prints
- <literal>G</literal> or <literal>C</literal>, rather than a
- whole sentence about it.</para>
- @ENGLISH }}} -->
- <para>Subversion har kombinert CVSs <literal>P</literal>- og
- <literal>U</literal>-kode inn i en <command>U</command>.
- Når en fletting eller konflikt oppstår, skriver Subversion rett og
- slett bare <command>G</command> eller <command>C</command>,
- istedenfor en hel setning om det.</para>
-
- <!-- @ENGLISH {{{
- <para>For a more detailed discussion of <command>svn
- 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.tour.cycle.examine.status"
- />.</para>
+ <!-- @ENGLISH {{{
+ <para>For a more detailed discussion of <command>svn
+ 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.tour.cycle.examine.status" />.</para>
+
+ </sect2>
+
+ <sect2 id="svn.forcvs.status-vs-update.update">
+ <title>Update</title>
+
+ <!-- @ENGLISH {{{
+ <para><command>svn update</command> updates your working copy,
+ and only prints information about files that it updates.</para>
+ @ENGLISH }}} -->
+ <para><command>svn update</command> oppdaterer arbeidskopien din
+ og skriver kun informasjon om filer som blir oppdatert.</para>
+
+ <!-- @ENGLISH {{{
+ <para>Subversion has combined the CVS <literal>P</literal> and
+ <literal>U</literal> codes into just <literal>U</literal>. When
+ a merge or conflict occurs, Subversion simply prints
+ <literal>G</literal> or <literal>C</literal>, rather than a
+ whole sentence about it.</para>
+ @ENGLISH }}} -->
+ <para>Subversion har kombinert CVSs <literal>P</literal>- og
+ <literal>U</literal>-kode inn i den ene
+ <command>U</command>-koden.
+ Når en fletting eller konflikt oppstår, skriver Subversion rett
+ og slett bare <command>G</command> eller <command>C</command>,
+ istedenfor en hel setning om det.</para>
+
+ <!-- @ENGLISH {{{
+ <para>For a more detailed discussion of <command>svn
+ update</command>, see <xref linkend="svn.tour.cycle.update" />.</para>
+ @ENGLISH }}} -->
+ <para>For en mer detaljert diskusjon om <command>svn
+ update</command>, se <xref linkend="svn.tour.cycle.update"
+ />.</para>
+ </sect2>
</sect1>
Modified: trunk/src/nb/book/appb.xml
==============================================================================
--- trunk/src/nb/book/appb.xml (original)
+++ trunk/src/nb/book/appb.xml Thu Jul 20 06:23:52 2006
@@ -327,11 +327,11 @@
<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,
+ basic WebDAV clients are accepted. The server behaves as if the
+ client had issued the proper series of versioning requests,
performing a commit under the hood. In other words, it allows a
DeltaV server to interoperate with ordinary WebDAV
- clients.</para>
+ clients that don't understand versioning.</para>
<para>Because so many operating systems already have integrated
WebDAV clients, the use case for this feature borders on
@@ -373,17 +373,53 @@
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
+ <para>If you have a post-commit hook program that sends email, 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>
+ <para>Another feature that may be a useful complement
+ for <literal>SVNAutoversioning</literal> comes from
+ Apache's <literal>mod_mime</literal> module. If a generic
+ WebDAV client adds a new file to the repository, there's no
+ opportunity for the user to set the
+ the <literal>svn:mime-type</literal> property. This might cause
+ the file to appear as <quote>generic</quote> icon when viewed
+ within a WebDAV shared folder, not having an association with
+ any application. One remedy is to have a sysadmin (or other
+ Subversion-knowledgable person) check out a working copy and
+ manually set the <literal>svn:mime-type</literal> property on
+ necessary files. But there's potentially no end to such cleanup
+ tasks. Instead, you can use
+ the <literal>ModMimeUsePathInfo</literal> directive in
+ your Subversion <literal><Location></literal>
+ block:</para>
+
+ <screen>
+<Location /repos>
+ DAV svn
+ SVNPath /path/to/repository
+ SVNAutoversioning on
+
+ ModMimeUsePathInfo on
+
+</Location>
+</screen>
+
+ <para>This directive allows <literal>mod_mime</literal> to attempt
+ automatic deduction of the mime-type on new files that enter the
+ repository via autoversioning. The module looks at the file's
+ named extension and possibly the contents as well; if the file
+ matches some common patterns, then the the
+ file's <literal>svn;mime-type</literal> property will be set
+ automatically.</para>
+
</sect1>
<!-- ================================================================= -->
@@ -667,6 +703,15 @@
client for Windows XP, then use a third-party program like
WebDrive or NetDrive.</para>
+ <para>A final tip: if you're attempting to use XP Web Folders,
+ make sure you have the absolute latest version from
+ Microsoft. For example, Microsoft released a bug-fixed
+ version in January 2005, available at
+ <ulink url="http://support.microsoft.com/?kbid=892211"/>.
+ In particular, this release is known to fix a bug whereby
+ browsing a DAV share shows an unexpected infinite
+ recursion.</para>
+
</sect3>
<sect3 id="svn.webdav.clients.file-explorer-extensions.linux-de">
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Thu Jul 20 06:23:52 2006
@@ -826,10 +826,10 @@
<!-- @ENGLISH {{{
<para>Some people have trouble absorbing a new technology by
- reading the sort of <quote>top down</quote> approach provided by this
- book. This section is a very short introduction to Subversion, and is
- designed to give <quote>bottom up</quote> learners a fighting chance.
- If you're one of those folks who prefers to learn by
+ reading the sort of <quote>top down</quote> approach provided by
+ this book. This section is a very short introduction to
+ Subversion, and is designed to give <quote>bottom up</quote>
+ learners a fighting chance. If you prefer to learn by
experimentation, the following demonstration will get you up and
running. Along the way, we give links to the relevant chapters
of this book.</para>
@@ -837,11 +837,11 @@
<para>Noen personer har problemer med å absorbere en ny teknologi
ved å lese dokumentasjon lagt ut etter et <quote>ovenfra og
ned</quote>-prinsipp som i denne boken.
- Denne seksjonen er en veldig kort introduksjon til Subversion., og
+ Denne seksjonen er en veldig kort introduksjon til Subversion, og
er ment å gi personer som lærer <quote>nedenfra og opp</quote> en
sjanse.
- Hvis du er en av dem som liker å lære gjennom eksperimentering,
- vil den følgende demonstrasjonen få deg i gang.
+ Hvis du foretrekker å lære gjennom eksperimentering, vil den
+ følgende demonstrasjonen få deg i gang.
Under gjennomgangen vil vi gi deg lenker til de relevante
kapitlene i denne boken.</para>
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Thu Jul 20 06:23:52 2006
@@ -633,7 +633,7 @@
<para>Subversion tries hard not to limit the type of data you
can place under version control. The contents of files and
property values are stored and transmitted as binary data, and
- the <xref linkend="svn.advanced.props.special.mime-type"/>
+ <xref linkend="svn.advanced.props.special.mime-type"/>
tells you how to give Subversion a hint that
<quote>textual</quote> operations don't make sense for a
particular file. There are a few places, however, where
@@ -651,28 +651,26 @@
hvordan informasjonen kan lagres.</para>
<!-- @ENGLISH {{{
- <para>Subversion handles text internally as UTF-8 encoded
- Unicode. As a result, certain items which are inherently
- <quote>textual</quote>, such as property names, path names,
- and log messages, can only contain legal UTF-8 characters. It
- also provides a minimum requirement for use of the
- <literal>svn:mime-type</literal> property—if a file's
- contents aren't compatible with UTF-8, you should mark it as a
- binary file. Otherwise, Subversion will attempt to merge
- differences using UTF-8, which is likely to leave garbage in
- the file.</para>
- @ENGLISH }}} -->
- <para>Internt behandler Subversion tekst som UTF-8-kodet Unicode.
- Som et resultat av dette kan enkelte elementer som er
- <quote>tekstbaserte</quote>, som for eksempel loggmeldinger og
- navn på egenskaper og filstier, kun inneholde lovlige tegn i
- UTF-8.
- Det medfører også et minimumskrav for bruken av
- <literal>svn:mime-type</literal>-egenskapen – hvis filinnholdet
- ikke er kompatibelt med UTF-8, bør du merke den som en binær
- fil.
- Hvis ikke, vil Subversion prøve å flette inn forskjeller ved å
- bruke UTF-8, noe som kan etterlate skrot i fila.</para>
+ <para>Subversion internally handles certain bits of
+ data—for example, property names, path names, and log
+ messages—as UTF-8 encoded Unicode. This is not to say
+ that all your interactions with Subversion must involve UTF-8,
+ though. As a general rule, Subversion clients will gracefully
+ and transparently handle conversions between UTF-8 and the
+ encoding system in use on your computer, if such a conversion
+ can meaningfully be done (which is the case for most common
+ encodings in use today).</para>
+ @ENGLISH }}} -->
+ <para>Internt behandler Subversion visse typer data – som for
+ eksempel egenskapsnavn, filstier og loggmeldinger – som
+ UTF-8-kodet Unicode.
+ Men dette betyr ikke at all omgangen din med Subversion må
+ involvere UTF-8.
+ Som en generell regel vil Subversionklienter ta seg av
+ konvertering mellom UTF-8 og ditt lokale tegnsett på maskinen
+ uten at du merker noe som helst, hvis dette kan gjøres på en
+ skikkelig måte (som er tilfellet med de fleste vanlige
+ tegnkodinger i bruk i dag).</para>
<!-- @ENGLISH {{{
<para>In addition, path names are used as XML attribute values
@@ -2037,12 +2035,16 @@
<!-- @ENGLISH {{{
<para>The sixth column shows information about locks, which is
- further explained in <xref
- linkend="svn.advanced.locking"/>.</para>
+ further explained in <xref linkend="svn.advanced.locking"/>.
+ (These are not the same locks as the ones indicated by an
+ <computeroutput>L</computeroutput> in the third column;
+ see <xref linkend="svn.advanced.locking.meanings"/>.)</para>
@ENGLISH }}} -->
<para>Den sjette kolonnen viser informasjon om låser, som er
- nærmere forklart i <xref
- linkend="svn.advanced.locking"/>.</para>
+ nærmere forklart i <xref linkend="svn.advanced.locking"/>.
+ (Dette er ikke de samme låsene som de som vises som en
+ <computeroutput>L</computeroutput> i den tredje kolonnen; se
+ <xref linkend="svn.advanced.locking.meanings"/>.)</para>
<!-- @ENGLISH {{{
<para>If you pass a specific path to <command>svn
@@ -4118,11 +4120,14 @@
<para>When Subversion modifies your working copy (or any
information within <filename>.svn</filename>), it tries to do
so as safely as possible. Before changing the working copy,
- Subversion writes its intentions to a log file. Next it executes
- the commands in the log file to apply the requested change.
- Finally, Subversion removes the log file. Architecturally, this
- is similar to a journaled filesystem. If a Subversion operation is
- interrupted (if the process is killed, or if the machine
+ Subversion writes its intentions to a log file. Next it
+ executes the commands in the log file to apply the requested
+ change, holding a lock on the relevant part of the working
+ copy while it works — to prevent othe Subversion clients
+ from accessing the working copy in mid-change. Finally,
+ Subversion removes the log file. Architecturally, this is
+ similar to a journaled filesystem. If a Subversion operation
+ is interrupted (if the process is killed, or if the machine
crashes, for example), the log files remain on disk. By
re-executing the log files, Subversion can complete the
previously started operation, and your working copy can get
@@ -4134,7 +4139,10 @@
Før arbeidskopien blir forandret, skriver Subversion det som
skal utføres til en loggfil.
Deretter kjører programmet kommandoene i loggfilen for å utføre
- forandringen det blir bedt om.
+ forandringen det blir bedt om mens det setter opp en lås på den
+ relevante delen av arbeidskopien mens det arbeider – dette er
+ for å hindre andre Subversionklienter fra å aksessere
+ arbeidskopien midt under forandringer.
Til slutt fjerner Subversion loggfilen.
Arkitekturmessig er dette likt et journalfilsystem.
Hvis en Subversionoperasjon blir avbrutt (hvis prosessen blir
@@ -4147,16 +4155,16 @@
<!-- @ENGLISH {{{
<para>And this is exactly what <command>svn cleanup</command>
does: it searches your working copy and runs any leftover
- logs, removing locks in the process. If Subversion ever tells
- you that some part of your working copy is
- <quote>locked</quote>, then this is the command that you
+ logs, removing working copy locks in the process.
+ If Subversion ever tells you that some part of your working copy
+ is <quote>locked</quote>, then this is the command that you
should run. Also, <command>svn status</command> will display
an <literal>L</literal> next to locked items:</para>
@ENGLISH }}} -->
<para>Og dette er nøyaktig hva <command>svn cleanup</command>
gjør:
Den leter gjennom arbeidskopien og kjører alle etterlatte logger
- mens den fjerner låser under prosessen.
+ mens den fjerner låser i arbeidskopien under prosessen.
Hvis Subversion noen ganger forteller deg at en del av
arbeidskopien er <quote>låst</quote>
(<foreignphrase>locked</foreignphrase>), er dette kommandoen du
@@ -4175,6 +4183,20 @@
M somedir/foo.c
</screen>
+ <!-- @ENGLISH {{{
+ <para>Don't confuse these working copy locks with the ordinary
+ locks that Subversion users create when using
+ the <quote>lock-modify-unlock</quote> model of concurrent
+ version control; see
+ <xref linkend="svn.advanced.locking.meanings"/> for
+ clarification.</para>
+ @ENGLISH }}} -->
+ <para>Du må ikke forveksle disse arbeidskopilåsene med de vanlige
+ låsene som Subversionbrukere oppretter når de bruker
+ <quote>lås-modifiser-lås opp</quote>-versjonskontrollmodellen;
+ se <xref linkend="svn.advanced.locking.meanings"/> mer
+ forklaring på dette.</para>
+
</sect2>
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Thu Jul 20 06:23:52 2006
@@ -1812,7 +1812,7 @@
<para>A Berkeley DB environment is an encapsulation of one or
more databases, log files, region files and configuration
files. The Berkeley DB environment has its own set of default
- configuration values for things like the number of locks
+ configuration values for things like the number of database locks
allowed to be taken out at any given time, or the maximum size
of the journaling log files, etc. Subversion's filesystem
code additionally chooses default values for some of the
@@ -1824,8 +1824,8 @@
<para>Et Berkeley DB-miljø er en innkapsling av en eller flere
databaser, loggfiler, regionfiler og konfigurasjonsfiler.
Berkeley DB-miljøet har sitt eget sett med konfigurasjonsverdier
- for ting som antallet låser som er tillatt brukt på en gang,
- maksimal størrelse på journalloggfiler og så videre.
+ for ting som antallet databaselåser som er tillatt brukt på en
+ gang, maksimal størrelse på journalloggfiler og så videre.
Subversions filsystemkode velger i tillegg standardverdier for
noen av konfigurasjonsvalgene i Berkeley DB.</para>
@@ -4023,7 +4023,11 @@
data, makes the change it wants to make, and then unlocks the
data. Other processes are forced to wait until that lock is
removed before they are permitted to continue accessing that
- section of the database.</para>
+ section of the database. (This has nothing to do with the
+ locks that you, as a user, can apply to versioned files within
+ the repository; see
+ <xref linkend="svn.advanced.locking.meanings"/> for more
+ information.)</para>
@ENGLISH }}} -->
<para>For å beskytte dataene i depotet ditt, bruker Berkeley DB en
låsemekanisme.
@@ -4038,7 +4042,11 @@
dataene.
Andre prosesser blir tvunget til å vente inntil denne låsen er
fjernet før de får lov til å fortsette med tilgangen til denne
- seksjonen av databasen.</para>
+ seksjonen av databasen.
+ (Dette har ingenting å gjøre med de låsene som du, brukeren, kan
+ bruke på versjonerte filer i depotet; se <xref
+ linkend="svn.advanced.locking.meanings"/> for mer
+ informasjon.)</para>
<!-- @ENGLISH {{{
<para>In the course of using your Subversion repository, fatal
Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml (original)
+++ trunk/src/nb/book/ch06.xml Thu Jul 20 06:23:52 2006
@@ -424,8 +424,9 @@
<para>Happily, the Subversion client has a remedy for this: a
built-in system for caching authentication credentials on
disk. By default, whenever the command-line client
- successfully authenticates itself to a server, it saves the
- credentials in the user's private runtime configuration
+ successfully responds to a server's authentication challenge,
+ it saves the credentials in the user's private runtime
+ configuration
area—in <filename>~/.subversion/auth/</filename> on
Unix-like systems or
<filename>%APPDATA%/Subversion/auth/</filename> on Windows.
@@ -436,9 +437,10 @@
@ENGLISH }}} -->
<para>Heldigvis har Subversion en løsning på dette:
Et innebygget system for å lagre legitimasjonen på disk.
- Normalt sett, når kommandolinjeklienten klarer å legitimere seg
- ovenfor en &server;, lagres denne legitimasjonsinformasjonen i
- brukerens private <!-- ¤ runtime -->konfigurasjonsområde – i
+ Normalt sett, når kommandolinjeklienten klarer å svare riktig på
+ en autentiseringsforespørsel fra en &server;, lagres denne
+ legitimasjonsinformasjonen i brukerens private <!-- ¤ runtime
+ -->konfigurasjonsområde – i
<filename>~/.subversion/auth/</filename> på Unix-lignende
systemer eller <filename>%APPDATA%/Subversion/auth/</filename> i
Windows.
@@ -452,13 +454,14 @@
<!-- @ENGLISH {{{
<para>When the client receives an authentication challenge, it
- first looks for the appropriate credentials in the disk cache;
- if not present, or if the cached credentials fail to
+ first looks for the appropriate credentials in the user's disk
+ cache; if not present, or if the cached credentials fail to
authenticate, then the client simply prompts the user for the
information.</para>
@ENGLISH }}} -->
<para>Når klienten må gjennom en autentiseringsprosess, ser den
- først etter passende legitimasjonsdata i lageret på disken.
+ først etter passende legitimasjonsdata i brukerens lager på
+ disken.
Hvis dette ikke finnes, eller de lagrede legitimasjonsdataene
ikke er tilstrekkelig for å fullføre autentiseringen, spør
klienten ganske enkelt brukeren etter informasjonen.</para>
@@ -500,10 +503,10 @@
password on disk. Because the encryption key is managed
by Windows and is tied to the user's own login
credentials, only the user can decrypt the cached
- password. (Note: if the user's Windows account
- password is changed, all of the cached passwords become
- undecipherable. The Subversion client will behave as if
- they don't exist, prompting for passwords when
+ password. (Note: if the user's Windows account password
+ is reset by an administrator, all of the cached passwords
+ become undecipherable. The Subversion client will behave
+ as if they don't exist, prompting for passwords when
required.)</para>
@ENGLISH }}} -->
<para>På Windows 2000 og senere bruker Subversionklienten
@@ -514,8 +517,8 @@
-->innloggingsbrukerdata, kan bare brukeren dekryptere det
lagrede passordet.
(Merk:
- Hvis brukerens passord i Windows blir forandret, kan ikke de
- lagrede passordene dekrypteres.
+ Hvis brukerens passord i Windows blir resatt av en
+ administrator, kan ikke de lagrede passordene dekrypteres.
Subversionklienten vil oppføre seg som om de ikke eksisterer
og spørre etter passord når det er nødvendig.)</para>
</listitem>
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Thu Jul 20 06:23:52 2006
@@ -1133,22 +1133,27 @@
<!-- @ENGLISH {{{
<para>As well as <command>svn status</command>, the
<command>svn add</command> and <command>svn import</command>
- commands also ignore files that match the list.
- You can override this option for a single instance
- of any of these commands by using
- the <option>-ﳢ-no-ignore</option> command-line flag.
- For information on more fine-grained control of
+ commands also ignore files that match the list
+ when they are scanning a directory. You can override this
+ behaviour for a single instance of any of these commands
+ by explicitly specifying the file name, or by using
+ the <option>-ﳢ-no-ignore</option> command-line flag.</para>
+ @ENGLISH }}} -->
+ <para>I likhet med <command>svn status</command> ignorerer
+ <command>svn add</command>- og <command>svn
+ import</command>-kommandoen filer som samsvarer med
+ listen når de tråler en katalog.
+ Du kan overstyre denne oppførselen for en enkelt kjøring
+ av alle disse kommandoene ved å spesifisere filnavnet
+ eller ved å bruke kommandolinjevalget
+ <option>--no-ignore</option>.</para>
+
+ <!-- @ENGLISH {{{
+ <para>For information on more fine-grained control of
ignored items, see <xref linkend="svn.advanced.props.special.ignore"
/>.</para>
@ENGLISH }}} -->
- <para>I likhet med <command>svn status</command> ignoreres
- de filene som samsvarer med denne listen også av
- kommandoene <command>svn add</command> og <command>svn
- import</command>.
- Du kan overstyre dette valget for en enkelt kjøring av
- disse kommandoene ved å bruke kommandolinjevalget
- <option>--no-ignore</option>.
- For informasjon om mer finkontroll av ignorerte
+ <para>For informasjon om mer finkontroll av ignorerte
elementer, se <xref
linkend="svn.advanced.props.special.ignore" />.</para>
</listitem>
@@ -2963,6 +2968,46 @@
only—it's not yet possible to reserve access to a whole
directory tree.</para>
+ <sidebar id="svn.advanced.locking.meanings">
+ <title>Three meanings of <quote>lock</quote></title>
+
+ <para>In this section, and almost everywhere in this book, the
+ words <quote>lock</quote> and <quote>locking</quote> describe
+ a mechanism for mutual exclusion between users to avoid
+ clashing commits. Unfortunately, there are two other sorts
+ of <quote>lock</quote> with which Subversion, and therefore
+ this book, sometimes needs to be concerned.</para>
+
+ <itemizedlist>
+
+ <listitem><para><firstterm>Working copy locks</firstterm>,
+ used internally by Subversion to prevent clashes between
+ multiple Subversion clients operating on the same working
+ copy. This is the sort of lock indicated by
+ an <computeroutput>L</computeroutput> in the third column
+ of <command>svn status</command> output, and removed by
+ the <command>svn cleanup</command> command, as described in
+ <xref linkend="svn.tour.other.cleanup"/>.</para>
+ </listitem>
+
+ <listitem><para><firstterm>Database locks</firstterm>, used
+ internally by the Berkeley DB backend to prevent clashes
+ between multiple programs trying to access the
+ database. This is the sort of lock whose unwanted
+ persistence after an error can cause a repository to
+ be <quote>wedged</quote>, as described in
+ <xref linkend="svn.reposadmin.maint.recovery"/>.</para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>You can generally forget about these other sorts of lock,
+ until something goes wrong that requires you to care about
+ them. In this book, <quote>lock</quote> means the first sort
+ unless the contrary is either clear from context or explicitly
+ stated.</para>
+ </sidebar>
+
<!-- =============================================================== -->
<sect2 id="svn.advanced.locking.creation">
<title>Creating locks</title>
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Thu Jul 20 06:23:52 2006
@@ -910,9 +910,9 @@
<title>Description</title>
<para>Recursively clean up the working copy, removing
- locks resuming unfinished operations. If you ever get a
- <quote>working copy locked</quote> error, run this
- command to remove stale locks and get your working copy
+ working copy locks and resuming unfinished operations.
+ If you ever get a <quote>working copy locked</quote> error,
+ run this command to remove stale locks and get your working copy
into a usable state again.</para>
<para>If, for some reason, an <command>svn update</command>
@@ -3397,7 +3397,10 @@
<varlistentry>
<term>'R'</term>
<listitem>
- <para>Item has been replaced in your working copy.</para>
+ <para>Item has been replaced in your working copy.
+ This means the file was scheduled for deletion, and
+ then a new file with the same name was scheduled for
+ addition in its place.</para>
</listitem>
</varlistentry>
@@ -3485,7 +3488,8 @@
</variablelist>
<para>The third column is populated only if the
- working copy directory is locked.</para>
+ working copy directory is locked. (See
+ <xref linkend="svn.tour.other.cleanup"/>.)</para>
<variablelist>
@@ -3992,7 +3996,9 @@
synchronizes the working copy to the revision given by the
<option>--revision</option> switch. As part of the
synchronization, <command>svn update</command> also
- removes any stale locks found in the working copy.</para>
+ removes any stale locks (see <xref
+ linkend="svn.tour.other.cleanup"/>) found in the
+ working copy.</para>
<para>For each updated item a line will start with a
character reporting the action taken. These characters
@@ -4748,9 +4754,10 @@
</screen>
<para>Recovering the database requires an exclusive lock on
- the repository. If another process is accessing the
- repository, then <command>svnadmin recover</command> will
- error:</para>
+ the repository. (This is a <quote>database lock</quote>;
+ see <xref linkend="svn.advanced.locking.meanings"/>.)
+ If another process is accessing the repository,
+ then <command>svnadmin recover</command> will error:</para>
<screen>
$ svnadmin recover /usr/local/svn/repos
svn: Failed to get exclusive repository access; perhaps another process
@@ -6240,6 +6247,204 @@
</refentry>
</sect1>
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.ref.properties">
+
+ <title><command>Subversion properties</command></title>
+
+
+ <refentry id="svn.ref.svnprops">
+ <refnamediv>
+
+ <refname>Subversion-defined properties</refname> <refpurpose>
+ properties defined by Subversion to control behavior.</refpurpose>
+
+ </refnamediv>
+
+ <refsect1 id="svn.ref.svnprops.desc">
+ <title>Description</title>
+
+ <para>Subversion allows users to invent arbitrarily-named
+ versioned properties on files and directories, as well as
+ unversioned properties on revisions. The only restriction
+ is on properties prefixed with <quote>svn:</quote>.
+ Properties in that namespace are reserved for Subversion's
+ own use. While these properties may be set by users to
+ control Subversion's behavior, users may not invent new
+ <quote>svn:</quote> properties.</para>
+
+ </refsect1>
+
+ <refsect1 id="svn.ref.properties.versioned-props">
+ <title>Versioned Properties</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>svn:executable</literal></term>
+ <listitem>
+
+ <para>If present on a file, the client will make the
+ file executable in Unix-hosted working copies. See
+ <xref
+ linkend="svn.advanced.props.special.executable"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:mime-type</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value indicates the
+ file's mime-type. This allows the client to decide
+ whether line-based contextual merging is safe to
+ perform during updates, and can also affect how the
+ file behaves when fetched via web browser. See
+ <xref
+ linkend="svn.advanced.props.special.mime-type"/>. </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:ignore</literal></term>
+ <listitem>
+
+ <para>If present on a directory, the value is a list of
+ unversioned file patterns to be ignored
+ by <command>svn status</command> and other
+ subcommands. See
+ <xref
+ linkend="svn.advanced.props.special.ignore"/></para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:keywords</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value tells the client
+ how to expand particular keywords within the file.
+ See
+ <xref
+ linkend="svn.advanced.props.special.keywords"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:eol-style</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value tells the client
+ how to manipulate the file's line-endings in the
+ working copy. See
+ <xref
+ linkend="svn.advanced.props.special.eol-style"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:externals</literal></term>
+ <listitem>
+
+ <para>If present on a directory, the value is a
+ multi-line list of other paths and URLs the client
+ should check out. See
+ <xref
+ linkend="svn.advanced.props.special.externals"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:special</literal></term>
+ <listitem>
+
+ <para>If present on a file, indicates that the file is
+ not an ordinary file, but a symbolic link or other
+ special object. See
+ <xref
+ linkend="svn.advanced.props.special.special"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:needs-lock</literal></term>
+ <listitem>
+
+ <para>If present on a file, tells the client to make the
+ file read-only in the working copy, as a reminder that
+ the file should be locked before editing begins. See
+ <xref
+ linkend="svn.advanced.locking.lock-communication"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1 id="svn.ref.properties.unversioned-props">
+ <title>Unversioned Properties</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>svn:author</literal></term>
+ <listitem>
+
+ <para>If present, contains the authenticated username of
+ the person who created the revision. (If not present,
+ then the revision was committed anonymously.)</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:date</literal></term>
+ <listitem>
+
+ <para>Contains the UTC time the revision was created, in
+ ISO format. The value comes from the server
+ machine's clock.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:log</literal></term>
+ <listitem>
+
+ <para>Contains the log message describing the
+ revision.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:autoversioned</literal></term>
+ <listitem>
+
+ <para>If present, the revision was created via the
+ autoversioning feature. See
+ <xref linkend="svn.webdav.autoversioning"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ </refentry>
+ </sect1>
+
</chapter>
More information about the svnbook-dev
mailing list