[svnbook commit] r1872 - in trunk/src/nb: book
sunny256
svnbook-dev at red-bean.com
Thu Dec 1 06:06:29 CST 2005
Author: sunny256
Date: Thu Dec 1 06:06:27 2005
New Revision: 1872
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/ch00.xml
trunk/src/nb/book/ch01.xml
trunk/src/nb/book/ch07.xml
trunk/src/nb/book/ch09.xml
Log:
Update the Norwegian book a bit, merged r1708:1736 from the English
files.
* src/nb/LAST_UPDATED: Updated by "make sync HEAD=1736".
* src/nb/book/ch00.xml: Updated r1736.
* src/nb/book/ch01.xml: Updated r1722.
* src/nb/book/ch07.xml: Updated r1727.
* src/nb/book/ch09.xml: Updated r1730, r1732.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu Dec 1 06:06:27 2005
@@ -1 +1 @@
-1708
+1736
Modified: trunk/src/nb/book/ch00.xml
==============================================================================
--- trunk/src/nb/book/ch00.xml (original)
+++ trunk/src/nb/book/ch00.xml Thu Dec 1 06:06:27 2005
@@ -666,22 +666,7 @@
<varlistentry>
<!-- @ENGLISH {{{
- <term>Appendix B, <emphasis>Troubleshooting</emphasis></term>
- <listitem>
- <para>Addresses common problems and difficulties using and
- building Subversion.</para>
- </listitem>
- @ENGLISH }}} -->
- <term>Tillegg B, <emphasis>Feilsøking</emphasis></term>
- <listitem>
- <para>Adresserer vanlige problemer og vanskeligheter ved
- bruk og kompilering av Subversion.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <!-- @ENGLISH {{{
- <term>Appendix C, <emphasis>WebDAV and
+ <term>Appendix B, <emphasis>WebDAV and
Autoversioning</emphasis></term>
<listitem>
<para>Describes the details of WebDAV and DeltaV, and how
@@ -689,7 +674,7 @@
mounted read/write as a DAV share.</para>
</listitem>
@ENGLISH }}} -->
- <term>Tillegg C, <emphasis>WebDAV og
+ <term>Tillegg B, <emphasis>WebDAV og
autoversjonering</emphasis></term>
<listitem>
<para>Beskriver detaljene om WebDAV og DeltaV, og hvordan du
@@ -700,14 +685,14 @@
<varlistentry>
<!-- @ENGLISH {{{
- <term>Appendix D, <emphasis>Third Party Tools</emphasis></term>
+ <term>Appendix C, <emphasis>Third Party Tools</emphasis></term>
<listitem>
<para>Discusses tools that support or use Subversion,
including alternative client programs, repository
browser tools, and so on.</para>
</listitem>
@ENGLISH }}} -->
- <term>Tillegg D, <emphasis>Tredjeparts
+ <term>Tillegg C, <emphasis>Tredjeparts
verktøy</emphasis></term>
<listitem>
<para>Diskuterer verktøy som støtter eller bruker
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Thu Dec 1 06:06:27 2005
@@ -142,27 +142,37 @@
<para>In early 2000, CollabNet, Inc. (<systemitem
class="url">http://www.collab.net</systemitem>) began seeking
developers to write a replacement for CVS. CollabNet offers a
- collaboration software suite called SourceCast, of which one
- component is version control. Although SourceCast used CVS as
- its initial version control system, CVS's limitations were
- obvious from the beginning, and CollabNet knew it would
- eventually have to find something better. Unfortunately, CVS
- had become the <foreignphrase>de facto</foreignphrase> standard
- in the open source world largely because there
- <emphasis>wasn't</emphasis> anything better, at least not under
- a free license. So CollabNet determined to write a new version
- control system from scratch, retaining the basic ideas of CVS,
- but without the bugs and misfeatures.</para>
+ collaboration software suite called CollabNet Enterprise
+ Edition (CEE)
+ <footnote>
+ <para>There's also a CollabNet Team Edition (CTE)
+ offering aimed at smaller groups.</para>
+ </footnote>
+ of which one component is version control. Although
+ CEE used CVS as its initial version control system, CVS's
+ limitations were obvious from the beginning, and CollabNet knew
+ it would eventually have to find something better.
+ Unfortunately, CVS had become the <foreignphrase>de
+ facto</foreignphrase> standard in the open source world largely
+ because there <emphasis>wasn't</emphasis> anything better, at
+ least not under a free license. So CollabNet determined to
+ write a new version control system from scratch, retaining the
+ basic ideas of CVS, but without the bugs and misfeatures.</para>
@ENGLISH }}} -->
<para>Tidlig i år 2000 startet CollabNet, Inc. (<systemitem
class="url">http://www.collab.net</systemitem>) letingen etter
utviklere for å lage en erstatning for CVS.
CollabNet tilbyr programvare for å muliggjøre samarbeid –
- SourceCast – der en komponent er versjonskontroll.
- Selv om SourceCast brukte CVS som sitt første
- versjonskontrollsystem, var begrensningene i CVS helt fra
- begynnelsen veldig tydelige, og CollabNet visste at noe bedre
- måtte finnes på et eller annet tidspunkt.
+ CollabNet Enterprise Edition (CEE)<footnote>
+ <para>Det finnes også en versjon kalt <!-- ¤ Denne taggen er
+ ikke i den engelske teksten, men kommer nok. --><application
+ class="software">CollabNet Team Edition</application> (CTE)
+ som er beregnet på mindre grupper.</para>
+ </footnote> – der en komponent er versjonskontroll.
+ Selv om CEE brukte CVS som sitt første versjonskontrollsystem, var
+ begrensningene i CVS helt fra begynnelsen veldig tydelige, og
+ CollabNet visste at noe bedre måtte finnes på et eller annet
+ tidspunkt.
Uheldigvis hadde CVS blitt <foreignphrase>de
facto</foreignphrase>-standarden i opensource-verdenen fordi det
<emphasis>ikke fantes</emphasis> noe bedre, ihvertfall ikke under
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Thu Dec 1 06:06:27 2005
@@ -754,7 +754,7 @@
<para>How (and if) you use Subversion properties is up to you.
As we mentioned, Subversion has it own uses for properties,
which we'll discuss a little later in this chapter. But
- first, let's discuss how to manipulate options using the
+ first, let's discuss how to manipulate properties using the
<command>svn</command> program.</para>
</sect2>
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Thu Dec 1 06:06:27 2005
@@ -779,9 +779,9 @@
<para>Check out a working copy from a repository. If
<replaceable>PATH</replaceable> is omitted, the
- basename of the URL will be used as the
- destination. If multiple URLs are given each will be
- checked out into a subdirectory of PATH, with the
+ basename of the URL will be used as the destination.
+ If multiple URLs are given each will be checked out into a
+ subdirectory of <replaceable>PATH</replaceable>, with the
name of the subdirectory being the basename of the
URL.</para>
@@ -954,8 +954,8 @@
<para>Well, there's not much to the examples here as
<command>svn cleanup</command> generates no output. If
- you pass no PATH, <quote><filename>.</filename></quote> is
- used.</para>
+ you pass no <replaceable>PATH</replaceable>,
+ <quote><filename>.</filename></quote> is used.</para>
<screen>
$ svn cleanup
@@ -1768,7 +1768,8 @@
<refentry id="svn.ref.svn.c.import">
<refnamediv>
<refname>svn import</refname>
- <refpurpose>Recursively commit a copy of PATH to URL.</refpurpose>
+ <refpurpose>Commit an unversioned file or tree into the
+ repository.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -1862,7 +1863,8 @@
<refentry id="svn.ref.svn.c.info">
<refnamediv>
<refname>svn info</refname>
- <refpurpose>Print information about PATHs.</refpurpose>
+ <refpurpose>Display information about a local or remote
+ item.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -3166,15 +3168,15 @@
<refsect1>
<title>Description</title>
- <para>Remove <quote>conflicted</quote> state on working
- copy files or directories. This routine does not
- semantically resolve conflict markers; it merely removes
- 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
+ <para>Remove <quote>conflicted</quote> state on working copy
+ files or directories. This routine does not semantically
+ resolve conflict markers; it merely removes
+ conflict-related artifact files and allows
+ <replaceable>PATH</replaceable> to be committed again;
+ that is, it tells Subversion that the conflicts have been
+ <quote>resolved</quote>. See <xref
linkend="svn.tour.cycle.resolve"/> for an in-depth look at
- resolving conflicts.</para>
- </refsect1>
+ resolving conflicts.</para> </refsect1>
<refsect1>
<title>Alternate Names</title>
@@ -5378,8 +5380,7 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svnlook history REPOS_PATH
- [PATH_IN_REPOS]</programlisting>
+ <programlisting>svnlook history REPOS_PATH [PATH_IN_REPOS]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -5673,10 +5674,10 @@
</refsect1>
<refsect1>
<title>Description</title>
-
- <para>Print the tree, starting at <replaceable>PATH_IN_REPOS</replaceable> (if
- supplied, at the root of the tree otherwise), optionally
- showing node revision IDs.</para>
+ <para>Print the tree, starting at
+ <replaceable>PATH_IN_REPOS</replaceable> (if supplied, at
+ the root of the tree otherwise), optionally showing node
+ revision IDs.</para>
</refsect1>
<refsect1>
@@ -5724,8 +5725,8 @@
<para>Print the <literal>UUID</literal> for the repository.
the UUID is the repository's
- <emphasis>U</emphasis>niversal <emphasis>U</emphasis>nique
- <emphasis>ID</emphasis>entifier. The Subversion client
+ <emphasis>u</emphasis>niversal <emphasis>u</emphasis>nique
+ <emphasis>id</emphasis>entifier. The Subversion client
uses this identifier to differentiate between one
repository and another.</para>
</refsect1>
@@ -5897,11 +5898,13 @@
<varlistentry>
<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,
- rather than the UID of the svnserve process. Useful for
- users wishing to share a single system account over SSH,
- but maintaining separate commit identities.</para>
+ <para>Used in conjuction with <option>--tunnel</option>
+ switch; tells svnserve to assume that
+ <replaceable>NAME</replaceable> is the authenticated
+ user, rather than the UID of the svnserve
+ process. Useful for users wishing to share a single
+ system account over SSH, but maintaining separate commit
+ identities.</para>
</listitem>
</varlistentry>
@@ -5958,10 +5961,12 @@
resultant revision number, or revision range, is written to
standard output.</para>
- <para>TRAIL_URL, if present, is the trailing portion of the
- URL used to determine if WC_PATH itself is switched
- (detection of switches within WC_PATH does not rely on
- TRAIL_URL).</para>
+ <para><replaceable>TRAIL_URL</replaceable>, if present, is the
+ trailing portion of the URL used to determine if
+ <replaceable>WC_PATH</replaceable> itself is switched
+ (detection of switches within
+ <replaceable>WC_PATH</replaceable> does not rely on
+ <replaceable>TRAIL_URL</replaceable>).</para>
</refsect1>
More information about the svnbook-dev
mailing list