[svnbook commit] r2106 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Sun Mar 26 11:20:19 CST 2006
Author: sunny256
Date: Sun Mar 26 11:20:15 2006
New Revision: 2106
Modified:
trunk/src/nb/LAST_UPDATED
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:
Sync the Norwegian and English book, r2073:2105.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/book/ch05.xml
* src/nb/book/ch06.xml
* src/nb/book/ch07.xml
* src/nb/book/ch09.xml
Updated r2090, r2095, r2097, r2099.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Sun Mar 26 11:20:15 2006
@@ -1 +1 @@
-2073
+2105
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Sun Mar 26 11:20:15 2006
@@ -3005,7 +3005,7 @@
and <filename>branches</filename> directories to live in the
root of your repository, you might wish to edit your
dump files, tweaking the <literal>Node-path</literal> and
- <literal>Copyfrom-path</literal> headers to no longer have
+ <literal>Node-copyfrom-path</literal> headers to no longer have
that first <filename>calc/</filename> path component. Also,
you'll want to remove the section of dump data that creates
the <filename>calc</filename> directory. It will look
@@ -3022,9 +3022,9 @@
<filename>tags</filename> og <filename>branches</filename>
skal være i roten av depotet, vil du kanskje ønske å redigere
dumpfilene og forandre <literal>Node-path</literal> og
- <literal>Copyfrom-path</literal> i headerne så de ikke lengre
- inneholder denne <filename>calc/</filename>-komponenten i
- stien.
+ <literal>Node-copyfrom-path</literal> i headerne så de ikke
+ lengre inneholder denne <filename>calc/</filename>-komponenten
+ i stien.
I tillegg ønsker du å fjerne seksjonen i dumpdataene som
oppretter <filename>calc</filename>-katalogen.
Det vil se ut omtrent som dette:</para>
@@ -3179,7 +3179,7 @@
to path semantics. Pay attention to whether paths in your
dump file are specified with or without leading slashes.
You'll want to look at the <literal>Node-path</literal> and
- <literal>Copyfrom-path</literal> headers.</para>
+ <literal>Node-copyfrom-path</literal> headers.</para>
@ENGLISH }}} -->
<para>Selv om <command>svndumpfilter</command> kan være veldig
nyttig og sparer masse tid, er det dessverre et par ting å
@@ -3189,7 +3189,7 @@
Legg merke til om stiene i dumpfilen er spesifisert med eller
uten skråstreker i starten.
Dette vil du se i <literal>Node-path</literal> og
- <literal>Copyfrom-path</literal> i headerne.</para>
+ <literal>Node-copyfrom-path</literal> i headerne.</para>
<!-- @ENGLISH {{{
<screen>
Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml (original)
+++ trunk/src/nb/book/ch06.xml Sun Mar 26 11:20:15 2006
@@ -229,17 +229,17 @@
<entry>Web viewing</entry>
<entry>limited built-in support, or via 3rd-party tools
- such as ViewCVS</entry>
+ such as ViewVC</entry>
- <entry>via 3rd-party tools such as ViewCVS</entry>
+ <entry>via 3rd-party tools such as ViewVC</entry>
@ENGLISH }}} -->
<entry>Visning på web</entry>
<entry>begrenset innebygget støtte, eller via tredjeparts
- verktøy som for eksempel ViewCVS</entry>
+ verktøy som for eksempel ViewVC</entry>
<entry>via tredjeparts verktøy som for eksempel
- ViewCVS</entry>
+ ViewVC</entry>
</row>
<row>
@@ -4349,9 +4349,13 @@
list</command> and <command>svn cat</command> commands.
To browse old revisions with your web browser, however,
you can use third-party software. A good example of this
- is ViewCVS (<ulink url="http://viewvc.tigris.org/"/>).
- ViewCVS was originally written to display CVS repositories
- through the web, and the latest bleeding-edge versions (at
+ is ViewVC (<ulink url="http://viewvc.tigris.org/"/>).
+ ViewVC was originally written to display CVS repositories
+ through the web,
+ <footnote>
+ <para>Back then, it was called <quote>ViewCVS</quote>.</para>
+ </footnote>
+ and the latest bleeding-edge versions (at
the time of writing) are able to understand Subversion
repositories as well.</para>
@ENGLISH }}} -->
@@ -4361,12 +4365,15 @@
<command>svn list</command> og <command>svn cat</command>.
Men for å bla gjennom gamle revisjoner med nettleseren må du
bruke tredjeparts programvare.
- Et godt eksempel på dette er ViewCVS (<ulink
+ Et godt eksempel på dette er ViewVC (<ulink
url="http://viewvc.tigris.org/"/>).
- ViewCVS ble egentlig skrevet for å vise CVS-depoter på <!--
- ¤ Merkes fordi den er kontroversiell. -->web, og de aller
- siste <!-- ¤ bleeding-edge --> versjonene (når dette
- skrives) forstår seg også på Subversiondepoter.</para>
+ ViewVC ble egentlig skrevet for å vise CVS-depoter på <!-- ¤
+ Merkes fordi den er kontroversiell. -->web,<footnote>
+ <para>På den tiden ble den kalt
+ <quote>ViewCVS</quote>.</para>
+ </footnote> og de aller siste <!-- ¤ bleeding-edge -->
+ versjonene (når dette skrives) forstår seg også på
+ Subversiondepoter.</para>
</sidebar>
</sect3>
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Sun Mar 26 11:20:15 2006
@@ -916,12 +916,8 @@
user wishes to edit, and the edits take place right
in the editor program (see <xref
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>,
- <literal>VISUAL</literal>, and
- <literal>EDITOR</literal> (in that order) for an
- editor command.</para>
+ value is empty. The order of priority for determining the
+ editor command is:</para>
@ENGLISH }}} -->
<para>Dette spesifiserer hvilket program Subversion vil
kjøre når brukeren skal skrive inn en loggmelding under
@@ -936,11 +932,68 @@
tekstbehandleren (se <xref linkend="svn.advanced.props"
/>).
Standardverdien til dette valget er tom.
- Hvis valget ikke er satt, prøver Subversion å sjekke
- miljøvariablene <literal>SVN_EDITOR</literal>,
- <literal>VISUAL</literal> og <literal>EDITOR</literal>
- (i denne rekkefølgen) for en
- tekstbehandlingskommando.</para>
+ Prioriteringsrekkefølgen som brukes for å avgjøre
+ hvilken kommando for tekstbehandleren som skal brukes,
+ er:</para>
+ <orderedlist>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Command-line option <literal>-ﳢ-editor-cmd</literal></para>
+ @ENGLISH }}} -->
+ <para>Kommandolinjevalget
+ <literal>--editor-cmd</literal></para>
+ </listitem>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Environment variable <literal>SVN_EDITOR</literal></para>
+ @ENGLISH }}} -->
+ <para>Miljøvariabelen
+ <literal>SVN_EDITOR</literal></para>
+ </listitem>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Configuration option <literal>editor-cmd</literal></para>
+ @ENGLISH }}} -->
+ <para>Konfigurasjonsvalget
+ <literal>editor-cmd</literal></para>
+ </listitem>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Environment variable <literal>VISUAL</literal></para>
+ @ENGLISH }}} -->
+ <para>Miljøvariabelen <literal>VISUAL</literal></para>
+ </listitem>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Environment variable <literal>EDITOR</literal></para>
+ @ENGLISH }}} -->
+ <para>Miljøvariabelen <literal>EDITOR</literal></para>
+ </listitem>
+ <listitem>
+ <!-- @ENGLISH {{{
+ <para>Possibly, a default value built in to Subversion
+ (not present in the official builds)</para>
+ @ENGLISH }}} -->
+ <para>Muligens en standardverdi som er bygget inn i
+ Subversion (ikke lagt inn i de offisielle
+ versjonene)</para>
+ </listitem>
+ </orderedlist>
+ <!-- @ENGLISH {{{
+ <para>The value of any of these options or variables is
+ (unlike <literal>diff-cmd</literal>) the beginning of a
+ command line to be executed by the shell. Subversion
+ appends a space and the pathname of the temporary file to be
+ edited. The editor should modify the temporary file and
+ return a zero exit code to indicate success.</para>
+ @ENGLISH }}} -->
+ <para>Verdien til alle disse valgene eller variablene er
+ (i motsetning til <literal>diff-cmd</literal>)
+ begynnelsen av en kommandolinje som kjøres av skallet.
+ Subversion legger til et mellomrom og stien til den
+ midlertidige fila og returnerer en avslutningskode med
+ verdien 0 for å indikere at operasjonen var
+ vellykket.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -2640,7 +2693,7 @@
<para>This means that by default, Subversion doesn't pay any
attention to the type of <firstterm>end-of-line (EOL)
markers</firstterm> used in your files. Unfortunately,
- different operating system use different tokens to represent
+ different operating systems use different tokens to represent
the end of a line of text in a file. For example, the usual
line ending token used by software on the Windows platform
is a pair of ASCII control characters—carriage return
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Sun Mar 26 11:20:15 2006
@@ -108,7 +108,9 @@
<replaceable>CMD</replaceable></term>
<listitem>
<para>Specifies an external program to use to edit a log message
- or a property value.</para>
+ or a property value. See the <literal>editor-cmd</literal>
+ section in <xref linkend="svn.advanced.confarea.opts.config"/>
+ for ways to specify a default editor.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list