[svnbook commit] r1892 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Thu Dec 8 16:13:29 CST 2005
Author: sunny256
Date: Thu Dec 8 16:13:20 2005
New Revision: 1892
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/ch04.xml
trunk/src/nb/book/ch07.xml
trunk/src/nb/book/ch09.xml
Log:
More updates to the Norwegian book, merged r1796:1881 from the English
files.
* src/nb/LAST_UPDATED
Updated by "make sync HEAD=1881".
* src/nb/book/appa.xml
* src/nb/book/appb.xml
* src/nb/book/ch01.xml
* src/nb/book/ch03.xml
* src/nb/book/ch04.xml
* src/nb/book/ch07.xml
* src/nb/book/ch09.xml
Updated r1831, r1863, r1865, r1874.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu Dec 8 16:13:20 2005
@@ -1 +1 @@
-1796
+1881
Modified: trunk/src/nb/book/appa.xml
==============================================================================
--- trunk/src/nb/book/appa.xml (original)
+++ trunk/src/nb/book/appa.xml Thu Dec 8 16:13:20 2005
@@ -349,7 +349,7 @@
<!-- @ENGLISH {{{
<para>The last subcommand in the list is new; it will not only
- remove local mods, but it will un-schedule operations such as
+ remove local changes, but it will un-schedule operations such as
adds and deletes. It's the preferred way to revert a file;
running <command>rm file; svn update</command> will still work, but
it blurs the purpose of updating. And, while we're on this
@@ -391,11 +391,12 @@
copy, and second, to show the user which files are out-of-date.
Unfortunately, because of CVS's hard-to-read status output, many
CVS users don't take advantage of this command at all. Instead,
- they've developed a habit of running <command>cvs update</command>
- or <command>cvs update -n</command> to quickly see their mods. If
- users forget to use the <option>-n</option> option, this has the
- side effect of merging repository changes they may not be ready
- to deal with.</para>
+ they've developed a habit of running <command>cvs
+ update</command> or <command>cvs -n update</command> to quickly
+ see their changes. If users forget to use
+ the <option>-n</option> option, this has the side effect of
+ merging repository changes they may not be ready to deal
+ with.</para>
@ENGLISH }}} -->
<para>Kommandoen <command>cvs status</command> har to formål:
For det første å vise brukeren alle lokale forandringer i
Modified: trunk/src/nb/book/appb.xml
==============================================================================
--- trunk/src/nb/book/appb.xml (original)
+++ trunk/src/nb/book/appb.xml Thu Dec 8 16:13:20 2005
@@ -37,7 +37,7 @@
universal read/write medium. The basic idea is that a
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>
+ NFS or SMB filesystems.</para>
<para>The tragedy, though, is that the RFC 2518 WebDAV
specification does not provide any sort of model for version
@@ -329,7 +329,7 @@
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
+ performing a commit under the hood. In other words, it allows a
DeltaV server to interoperate with ordinary WebDAV
clients.</para>
@@ -533,7 +533,7 @@
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
+ is free software (GPL license) and is available at <ulink
url="http://www.webdav.org/cadaver/"/>.</para>
<para>Using cadaver is similar to using a commandline FTP
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Thu Dec 8 16:13:20 2005
@@ -195,7 +195,7 @@
he'd already come up with not only the name
<quote>Subversion</quote>, but also with the basic design of the
Subversion repository. When CollabNet called, Karl immediately
- agreed to work on the project, and Jim got his employer, RedHat
+ agreed to work on the project, and Jim got his employer, Red Hat
Software, to essentially donate him to the project for an
indefinite period of time. CollabNet hired Karl and Ben
Collins-Sussman, and detailed design work began in May. With
@@ -220,7 +220,7 @@
kommet opp med ikke bare navnet <quote>Subversion</quote>, men
også med den grunnleggende designen av depotet for Subversion.
Da forespørselen kom fra CollabNet, gikk Karl øyeblikket med på å
- arbeide med prosjektet, og Jim fikk sin arbeidsgiver, RedHat
+ arbeide med prosjektet, og Jim fikk sin arbeidsgiver, Red Hat
Software, til å hovedsaklig donere ham til prosjektet for en
udefinert tidsperiode.
CollabNet ansatte Karl og Ben Collins-Sussman, og detaljert
@@ -549,15 +549,15 @@
<title>Subversions arkitektur</title>
<!-- @ENGLISH {{{
- <para><xref linkend="svn.intro.architecure.dia-1"/> illustrates what one might
+ <para><xref linkend="svn.intro.architecture.dia-1"/> illustrates what one might
call a <quote>mile-high</quote> view of Subversion's
design.</para>
@ENGLISH }}} -->
- <para><xref linkend="svn.intro.architecure.dia-1"/> illustrerer hva
+ <para><xref linkend="svn.intro.architecture.dia-1"/> illustrerer hva
man kan kalle en <quote>milehøy</quote> oversikt over Subversions
design.</para>
- <figure id="svn.intro.architecure.dia-1">
+ <figure id="svn.intro.architecture.dia-1">
<!-- @ENGLISH {{{
<title>Subversion's Architecture</title>
@ENGLISH }}} -->
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Thu Dec 8 16:13:20 2005
@@ -327,11 +327,11 @@
# shows log message for the latest repository commit
$ svn diff -ﳢ-revision HEAD
-# compares your working file (with local mods) to the latest version
+# compares your working file (with local changes) to the latest version
# in the repository
$ svn diff -ﳢ-revision BASE:HEAD foo.c
-# compares your <quote>pristine</quote> foo.c (no local mods) with the
+# compares your <quote>pristine</quote> foo.c (no local changes) with the
# latest version in the repository
$ svn log -ﳢ-revision BASE:HEAD
@@ -2484,7 +2484,7 @@
<command>svn revert</command>) can be used without any
network access. This makes it easy to manage your
changes-in-progress when you are somewhere without a network
- connection, such as traveling on an airplane, riding a
+ connection, such as travelling on an airplane, riding a
commuter train or hacking on the beach.</para>
@ENGLISH }}} -->
<para>Alle disse tre kommandoene (<command>svn status</command>,
@@ -2630,7 +2630,7 @@
<listitem>
<!-- @ENGLISH {{{
- <para>If Subversion considers the file to be of a mergable
+ <para>If Subversion considers the file to be of a mergeable
type, it places <firstterm>conflict
markers</firstterm>—special strings of text which
delimit the <quote>sides</quote> of the
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Thu Dec 8 16:13:20 2005
@@ -1442,7 +1442,7 @@
</screen>
<!-- @ENGLISH {{{
- <para>The first syntax lays out all three arguments explictly,
+ <para>The first syntax lays out all three arguments explicitly,
naming each tree in the form <emphasis>URL at REV</emphasis> and
naming the working copy target. The second syntax can be used
as a shorthand for situations when you're comparing two
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Thu Dec 8 16:13:20 2005
@@ -791,6 +791,18 @@
$
</screen>
+ <para>There are some restrictions on the names you can use for
+ properties. A property name must start with a letter, a colon
+ (<literal>:</literal>), or an underscore
+ (<literal>_</literal>); after that, you can also use digits,
+ hyphens (<literal>-</literal>), and periods
+ (<literal>.</literal>).
+ <footnote>
+ <para>If you're familiar with XML, this is pretty much the
+ ASCII subset of the syntax for XML "Name".</para>
+ </footnote>
+ </para>
+
<para>In addition to the <command>propset</command> command, the
<command>svn</command> program supplies the
<command>propedit</command> command. This command uses the
@@ -1349,7 +1361,7 @@
order for the keyword to be expanded. You should consider the
value of the <literal>svn:keywords</literal> property to be
case-sensitive too—certain keyword names will be recognized
- regardless of case, but this behaviour is deprecated.</para>
+ regardless of case, but this behavior is deprecated.</para>
<para>Subversion defines the list of keywords available for
substitution. That list contains the following five keywords,
@@ -2063,7 +2075,7 @@
on the object.</para>
<para>So in this particular example, Sally can see that Harry
- locked the file on Feburary 16th to <quote>make a quick
+ locked the file on February 16th to <quote>make a quick
tweak</quote>. It being June, she suspects that he probably
forgot all about the lock. She might phone Harry to complain
and ask him to release the lock. If he's unavailable, she
@@ -2247,7 +2259,7 @@
<para>We've seen how <command>svn lock</command>
and <command>svn unlock</command> can be used to create,
- release, break, and steal locks. This satisifies the goal of
+ release, break, and steal locks. This satisfies the goal of
serializing commit access to a file. But what about the
larger problem of preventing wasted time?</para>
@@ -2345,7 +2357,7 @@
manipulating your unversioned ones. But that flexibility means
that across the lifetime of your repository, a given versioned
resource might have many paths, and a given path might represent
- serveral entirely different versioned resources.</para>
+ several entirely different versioned resources.</para>
<para>Subversion is pretty smart about noticing when an object's
version history includes such <quote>changes of address</quote>.
@@ -3196,8 +3208,8 @@
<screen>
$ export LC_MESSAGES=de_DE
$ svn help cat
-cat: Ausgabe des Inhaltes der angegebenen Dateien oder URLs
-Aufruf: cat ZIEL...
+cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.
+Aufruf: cat ZIEL[@REV]...
…
</screen>
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Thu Dec 8 16:13:20 2005
@@ -3887,8 +3887,7 @@
<refentry id="svn.ref.svn.c.unlock">
<refnamediv>
<refname>svn unlock</refname>
- <refpurpose>Unlock working copy paths or
- URLs..</refpurpose>
+ <refpurpose>Unlock working copy paths or URLs.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -4521,7 +4520,7 @@
<para>Berkeley DB creates logs of all changes to the
repository, which allow it to recover in the face of
catastrophe. Unless you enable
- <literal>DB_LOGS_AUTOREMOVE</literal>, the log files
+ <literal>DB_LOG_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
@@ -4547,7 +4546,7 @@
<para>Berkeley DB creates logs of all changes to the
repository, which allow it to recover in the face of
catastrophe. Unless you enable
- <literal>DB_LOGS_AUTOREMOVE</literal>, the log files
+ <literal>DB_LOG_AUTOREMOVE</literal>, the log files
accumulate, although most are no longer used and can be
deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
@@ -5923,7 +5922,7 @@
<varlistentry>
<term><option>--tunnel-user NAME</option></term>
<listitem>
- <para>Used in conjuction with <option>--tunnel</option>
+ <para>Used in conjunction with <option>--tunnel</option>
switch; tells svnserve to assume that
<replaceable>NAME</replaceable> is the authenticated
user, rather than the UID of the svnserve
More information about the svnbook-dev
mailing list