[svnbook commit] r2005 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Thu Feb 16 14:08:09 CST 2006
Author: sunny256
Date: Thu Feb 16 14:08:01 2006
New Revision: 2005
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/ch02.xml
trunk/src/nb/book/ch03.xml
trunk/src/nb/book/ch05.xml
trunk/src/nb/book/ch07.xml
trunk/src/nb/book/ch08.xml
Log:
Sync the Norwegian book against the English files, r1965:2004.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/book/ch02.xml
* src/nb/book/ch03.xml
* src/nb/book/ch05.xml
* src/nb/book/ch07.xml
* src/nb/book/ch08.xml
Updated r1980, r1989, r1996, r1997, r1998, r2000.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu Feb 16 14:08:01 2006
@@ -1 +1 @@
-1965
+2004
Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml (original)
+++ trunk/src/nb/book/ch02.xml Thu Feb 16 14:08:01 2006
@@ -167,19 +167,20 @@
<!-- @ENGLISH {{{
<para>Consider the scenario shown in <xref
- 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
- later) Sally could accidentally overwrite them with her own
- new version of the file. While Harry's version of the file
- won't be lost forever (because the system remembers every
- change), any changes Harry made <emphasis>won't</emphasis> be
- present in Sally's newer version of the file, because she
- never saw Harry's changes to begin with. Harry's work is
- still effectively lost—or at least missing from the
- latest version of the file—and probably by accident.
- This is definitely a situation we want to avoid!</para>
+ 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 later) Sally could accidentally
+ overwrite them with her own new version of the file. While
+ Harry's version of the file won't be lost forever (because the
+ system remembers every change), any changes Harry made
+ <emphasis>won't</emphasis> be present in Sally's newer version
+ of the file, because she never saw Harry's changes to begin
+ with. Harry's work is still effectively lost—or at
+ least missing from the 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.basic.vsn-models.problem-sharing.dia-1"/>.
@@ -217,36 +218,35 @@
<!-- @ENGLISH {{{
<para>Many version control systems use a
- <firstterm>lock-modify-unlock</firstterm> model to address
- this problem. In such a system, the repository allows only
- one person to change a file at a time. First Harry must
- <quote>lock</quote> the file before he can begin making
- changes to it. Locking a file is a lot like borrowing a book
- from the library; if Harry has locked a file, then Sally
- cannot make any changes to it. If she tries to lock the file,
- the repository will deny the request. All she can do is read
- 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.basic.vsn-models.lock-unlock.dia-1"/> demonstrates this simple
- solution.</para>
+ <firstterm>lock-modify-unlock</firstterm> model to address the
+ problem of many authors clobbering each other's work. In this
+ model, the repository allows only one person to change a file
+ at a time. This exclusivity policy is managed using locks.
+ Harry must <quote>lock</quote> a file before he can begin
+ making changes to it. If Harry has locked a file, then Sally
+ cannot also lock it, and therefore cannot make any changes to
+ that file. All she can do is read the file, and wait for
+ Harry to finish his changes and release his lock. After Harry
+ unlocks the file, Sally can take her turn by locking and
+ editing the file. <xref
+ linkend="svn.basic.vsn-models.lock-unlock.dia-1"/>
+ demonstrates this simple solution.</para>
@ENGLISH }}} -->
<para>Mange versjonskontrollsystemer bruker en modell av typen
<firstterm>lås-rediger-lås opp</firstterm> når de tar for seg
- dette problemet.
- I et sånt system tillater depotet bare en person å forandre en
+ problemet med at mange forfattere roter til hverandres arbeid.
+ I denne modellen tillater depotet bare en person å forandre en
fil om gangen.
- Først må Harry <quote>låse</quote> filen før han kan begynne med
- å gjøre forandringer i den.
- Låsing av en fil er mye likt det å låne en bok på biblioteket;
- hvis Harry har låst en fil kan ikke Sally gjøre forandringer i
- den.
- Hvis hun prøver å låse filen, vil ikke depotet tillate dette.
- Alt hun kan gjøre er å lese filen, og vente på at Harry gjør seg
+ Denne eksklusive arbeidsmåten styres ved bruk av låser.
+ Harry må <quote>låse</quote> en fil før han kan begynne å gjøre
+ forandringer i den.
+ Hvis Harry har låst en fil, kan ikke Sally også låse den, og kan
+ derfor ikke gjøre noen forandringer i denne filen.
+ Alt hun kan gjøre er å lese filen og vente på at Harry gjør seg
ferdig med sine forandringer og så slipper låsen han har satt
opp.
- Etter at Harry låser opp filen, er hans tur over, og nå kan
- Sally ta sin runde med låsing og redigering.
+ Etter at Harry låser opp filen kan Sally ta sin runde med å låse
+ og redigere filen.
<xref linkend="svn.basic.vsn-models.lock-unlock.dia-1"/>
demonstrerer denne enkle løsningen.</para>
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Thu Feb 16 14:08:01 2006
@@ -251,9 +251,11 @@
<term>HEAD</term>
<listitem>
<!-- @ENGLISH {{{
- <para>The latest revision in the repository.</para>
+ <para>The latest (or <quote>youngest</quote>) revision in
+ the repository.</para>
@ENGLISH }}} -->
- <para>Den seneste revisjonen i depotet.</para>
+ <para>Den seneste (eller <quote>yngste</quote>) revisjonen i
+ depotet.</para>
</listitem>
</varlistentry>
@@ -261,11 +263,15 @@
<term>BASE</term>
<listitem>
<!-- @ENGLISH {{{
- <para>The <quote>pristine</quote> revision of an item in a
- working copy.</para>
- @ENGLISH }}} -->
- <para>Den <quote>uberørte</quote> revisjonen for et element
- i en arbeidskopi.</para>
+ <para>The revision number of an item in a working copy.
+ If the item has been locally modified, the <quote>BASE
+ version</quote> refers to the way the item appears
+ without those local modifications.</para>
+ @ENGLISH }}} -->
+ <para>Revisjonsnummeret til et element i en arbeidskopi.
+ Hvis elementet inneholder lokale forandringer, refererer
+ <quote>BASE-versjonen</quote> til det som elementet ser ut
+ som når disse forandringene ikke er til stede.</para>
</listitem>
</varlistentry>
@@ -273,11 +279,12 @@
<term>COMMITTED</term>
<listitem>
<!-- @ENGLISH {{{
- <para>The last revision in which an item changed before (or
- at) <literal>BASE</literal>.</para>
+ <para>The most recent revision prior to, or equal to,
+ <literal>BASE</literal>, in which an item changed.</para>
@ENGLISH }}} -->
- <para>Den siste revisjonen som et element forandret seg i
- før (eller på) <literal>BASE</literal>.</para>
+ <para>Den seneste revisjonen før eller lik
+ <literal>BASE</literal>, der et element ble
+ forandret.</para>
</listitem>
</varlistentry>
@@ -285,12 +292,12 @@
<term>PREV</term>
<listitem>
<!-- @ENGLISH {{{
- <para>The revision just <emphasis>before</emphasis> the last
- revision in which an item changed. (Technically,
- <literal>COMMITTED</literal> - 1.)</para>
+ <para>The revision immediately <emphasis>before</emphasis>
+ the last revision in which an item changed.
+ (Technically, <literal>COMMITTED</literal> - 1.)</para>
@ENGLISH }}} -->
- <para>Revisjonen akkurat <emphasis>før</emphasis> den siste
- revisjonen der et element forandret seg.
+ <para>Revisjonen like <emphasis>før</emphasis> den siste
+ revisjonen der et element ble forandret.
(Teknisk sett, <literal>COMMITTED</literal> - 1.)</para>
</listitem>
</varlistentry>
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Thu Feb 16 14:08:01 2006
@@ -3794,7 +3794,7 @@
data need to remain on the live site, which need to be
backed up, and which can be safely removed. This section is
specific to Berkeley DB; FSFS repositories have no extra
- data that be cleaned up or reclaimed.</para>
+ data to be cleaned up or reclaimed.</para>
@ENGLISH }}} -->
<para>Selv om prisen på datalagring har stupt de siste årene, er
bruken av diskplass fortsatt noe administratorer må tenke på
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Thu Feb 16 14:08:01 2006
@@ -873,7 +873,7 @@
<listitem>
<!-- @ENGLISH {{{
<para>This setting is the same as
- <literal>store-passwords</literal>, except that
+ <literal>store-passwords</literal>, except that it
enables or disables disk-caching of
<emphasis>all</emphasis> authentication information:
usernames, passwords, server certificates, and any
@@ -1128,8 +1128,8 @@
<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.ref.svn.sw"/>.) The Subversion
- repository stores log messages in UTF8, and assumes
+ <xref linkend="svn.ref.svn.sw"/>). The Subversion
+ repository stores log messages in UTF-8, and assumes
that your log message is written using your operating
system's native locale. You should specify a
different encoding if your commit messages are written
@@ -2711,7 +2711,7 @@
This behavior is also semi-permanently tweakable, by setting
<literal>no-unlock = yes</literal> in your run-time
<filename>config</filename> file (see <xref
- linkend="svn.advanced.confarea"/>.)</para>
+ linkend="svn.advanced.confarea"/>).</para>
<para>Of course, locking a file doesn't oblige one to commit a
change to it. The lock can be released at any time with a
Modified: trunk/src/nb/book/ch08.xml
==============================================================================
--- trunk/src/nb/book/ch08.xml (original)
+++ trunk/src/nb/book/ch08.xml Thu Feb 16 14:08:01 2006
@@ -1028,9 +1028,14 @@
% (os.path.basename(sys.argv[0])))
sys.exit(1)
+ # Canonicalize (enough for Subversion, at least) the repository path.
+ repos_path = os.path.normpath(sys.argv[1])
+ if repos_path == '.':
+ repos_path = ''
+
# Call the app-wrapper, which takes care of APR initialization/shutdown
# and the creation and cleanup of our top-level memory pool.
- svn.core.run_app(crawl_youngest, os.path.normpath(sys.argv[1]))
+ svn.core.run_app(crawl_youngest, repos_path)
</programlisting>
</example>
@@ -1146,9 +1151,14 @@
if len(args) != 1:
usage_and_exit(2)
+ # Canonicalize (enough for Subversion, at least) the working copy path.
+ wc_path = os.path.normpath(args[0])
+ if wc_path == '.':
+ wc_path = ''
+
# Call the app-wrapper, which takes care of APR initialization/shutdown
# and the creation and cleanup of our top-level memory pool.
- svn.core.run_app(do_status, os.path.normpath(args[0]), verbose)
+ svn.core.run_app(do_status, wc_path, verbose)
</programlisting>
</example>
@@ -1156,7 +1166,7 @@
the level of attention given to the core Subversion modules.
However, there have been significant efforts towards creating
functional bindings for Python, Perl, and Ruby. To some extent,
- the work done preparing the SWIG interface files for the these
+ the work done preparing the SWIG interface files for these
languages is reusable in efforts to generate bindings for other
languages supported by SWIG (which includes versions of C#,
Guile, Java, MzScheme, OCaml, PHP, Tcl, and others).
More information about the svnbook-dev
mailing list