[svnbook commit] r1709 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Wed Sep 28 09:41:35 CDT 2005
Author: sunny256
Date: Wed Sep 28 09:41:34 2005
New Revision: 1709
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/ch02.xml
trunk/src/nb/book/ch03.xml
trunk/src/nb/book/ch04.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:
Sync the Norwegian book with the English files, r1624:1708.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/book/ch02.xml
Updated r1695, r1705.
* src/nb/book/ch03.xml
* src/nb/book/ch04.xml
* src/nb/book/ch06.xml
* src/nb/book/ch07.xml
Updated r1695.
* src/nb/book/ch05.xml
Updated r1660, r1699.
* src/nb/book/ch09.xml
Updated r1707.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Wed Sep 28 09:41:34 2005
@@ -1 +1 @@
-1624
+1708
Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml (original)
+++ trunk/src/nb/book/ch02.xml Wed Sep 28 09:41:34 2005
@@ -730,7 +730,7 @@
For eksempel, hvis du henter ut <filename>/calc</filename>, vil
du få en arbeidskopi som dette:</para>
-<screen>
+ <screen>
$ svn checkout http://svn.example.com/repos/calc
A calc
A calc/Makefile
@@ -880,15 +880,15 @@
<para>For å publisere dine forandringer til andre, kan du bruke
Subversions <command>commit</command>-kommando:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn commit button.c
Sending button.c
Transmitting file data .
Committed revision 57.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn commit button.c
Sender button.c
Sender fildata .
@@ -938,7 +938,7 @@
så vel som alle andre forandringer som er blitt lagt inn i
depotet siden hun sist hentet det ut.</para>
-<screen>
+ <screen>
$ pwd
/home/sally/calc
@@ -1103,7 +1103,7 @@
For eksempel, tenk at du henter ut en arbeidskopi fra et depot
der den siste revisjonen er 4:</para>
-<screen>
+ <screen>
calc/Makefile:4
integer.c:4
button.c:4
@@ -1125,7 +1125,7 @@
innlegging opprette revisjon 5 i depotet, og arbeidskopien din
vil se ut som dette:</para>
-<screen>
+ <screen>
calc/Makefile:4
integer.c:4
button.c:5
@@ -1143,7 +1143,7 @@
Hvis du bruker <command>svn update</command> for å oppdatere
arbeidskopien, vil den se ut som dette:</para>
-<screen>
+ <screen>
calc/Makefile:6
integer.c:6
button.c:6
@@ -1435,9 +1435,11 @@
users would expect the working copy to be entirely at
revision 15, but that's not the case! Any number of changes
might have happened in the repository between revisions 10
- and 15. It would be a lie to claim that we had a working
- copy of revision 15, the client simply doesn't know. If, on
- the other hand, <command>svn commit</command> were to
+ and 15. The client knows nothing of those changes in the
+ repository, since you haven't yet run <command>svn
+ update</command>, and <command>svn commit</command> doesn't
+ pull down new changes. If, on the other hand,
+ <command>svn commit</command> <emphasis>were</emphasis> to
automatically download the newest changes, then it would be
possible to set the entire working copy to revision
15—but then we'd be breaking the fundamental rule
@@ -1460,12 +1462,13 @@
tilfellet!
Alle mulige forandringer kan ha skjedd mellom revisjonene 10
og 15.
- Det ville vært en løgn å påstå at vi har en arbeidskopi av
- revisjon 15, klienten kan rett og slett ikke vite det.
- Hvis <command>svn commit</command> på den annen side hentet de
- nyeste forandringene automatisk, ville det være mulig å sette
- hele arbeidskopien til revisjon 15 – men da ville vi brutt den
- fundamentale regelen om at <!-- ¤
+ Klienten vet ingenting om disse forandringene i depotet, siden
+ du ikke har kjørt <command>svn update</command> enda, og
+ <command>svn commit</command> ikke henter nye forandringer.
+ <emphasis>Hvis</emphasis> <command>svn commit</command> på den
+ annen side hentet de nyeste forandringene automatisk, ville
+ det være mulig å sette hele arbeidskopien til revisjon 15 –
+ men da ville vi brutt den fundamentale regelen om at <!-- ¤
--><quote>skyveoperasjoner</quote> og
<quote>trekkoperasjoner</quote> skal være separate handlinger.
Derfor, den eneste trygge tingen som Subversionklienten kan
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Wed Sep 28 09:41:34 2005
@@ -3193,15 +3193,15 @@
innleggingen feile med en melding om at en eller flere av filene
dine er utdaterte:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn commit -ﳢ-message "Add another rule"
Sending rules.txt
svn: Commit failed (details follow):
svn: Out of date: 'rules.txt' in transaction 'g'
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn commit --message "La til en ny regel"
Sender rules.txt
svn: Innsending feilet (detaljer følger):
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Wed Sep 28 09:41:34 2005
@@ -346,7 +346,7 @@
Til å begynne med, hent ut en arbeidskopi av prosjektets
rotkatalog, <filename>/calc</filename>:</para>
-<screen>
+ <screen>
$ svn checkout http://svn.example.com/repos/calc bigwc
A bigwc/trunk/
A bigwc/trunk/Makefile
@@ -364,7 +364,7 @@
<para>For å lage en kopi er det nå bare å angi to arbeidskopistier
til kommandoen <command>svn copy</command>:</para>
-<screen>
+ <screen>
$ cd bigwc
$ svn copy trunk branches/my-calc-branch
$ svn status
@@ -401,8 +401,8 @@
å kopiere <filename>/calc/trunk</filename> istedenfor å sende
hele arbeidskopien over nettverket en gang til:</para>
-<!-- ¤ -->
-<screen>
+ <!-- ¤ -->
+ <screen>
$ svn commit -m "Creating a private branch of /calc/trunk."
Adding branches/my-calc-branch
Committed revision 341.
@@ -418,16 +418,16 @@
<command>svn copy</command> kan operere direkte mot to
URLer.</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/my-calc-branch \
-m "Creating a private branch of /calc/trunk."
Committed revision 341.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/my-calc-branch \
-m "Lager en privat gren av /calc/trunk."
@@ -568,8 +568,8 @@
<para>Nå som du har laget en gren av prosjektet, kan du hente ut
en ny arbeidskopi for å starte bruken av den:</para>
-<!-- ¤ -->
-<screen>
+ <!-- ¤ -->
+ <screen>
$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A my-calc-branch/Makefile
A my-calc-branch/integer.c
@@ -671,8 +671,8 @@
forandringene gjort i din kopi av
<filename>integer.c</filename>:</para>
-<!-- ¤ Eksemplene tas seinere -->
-<screen>
+ <!-- ¤ Eksemplene tas seinere -->
+ <screen>
$ pwd
/home/user/my-calc-branch
@@ -727,8 +727,8 @@
Se nå hva som skjer når Sally kjører den samme kommandoen på
hennes kopi av filen:</para>
-<!-- ¤ -->
-<screen>
+ <!-- ¤ -->
+ <screen>
$ pwd
/home/sally/calc
@@ -965,7 +965,7 @@
deg den eksakte forandringen gjort av Sally i revisjon
344:</para>
-<screen>
+ <screen>
$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk
Index: integer.c
@@ -1022,7 +1022,7 @@
lagt direkte til arbeidskopien din som <emphasis>lokale
modifikasjoner</emphasis>:</para>
-<screen>
+ <screen>
$ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk
U integer.c
@@ -1097,15 +1097,15 @@
fra en gren til en annen.
For eksempel:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn commit -m "integer.c: ported r344 (spelling fixes) from trunk."
Sending integer.c
Transmitting file data .
Committed revision 360.
</screen>
- at ENGLISH }}} -->
-<!-- ¤ --><screen>
+ @ENGLISH }}} -->
+ <!-- ¤ --><screen>
$ svn commit -m "integer.c: Flettet r344 (retting av skrivefeil) fra trunk."
Sending integer.c
Transmitting file data .
@@ -1141,8 +1141,8 @@
jobben?
For eksempel:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk > patchfile
$ patch -p0 < patchfile
Patching file integer.c using Plan A...
@@ -1152,8 +1152,8 @@
Hunk #4 succeeded at 249.
done
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk > patchfil
$ patch -p0 < patchfile
Patching file integer.c using Plan A...
@@ -1287,8 +1287,8 @@
arbeidskopien din, må du spesifisere målkatalogen som skal motta
forandringene:</para>
-<!-- ¤ -->
-<screen>
+ <!-- ¤ -->
+ <screen>
$ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk my-calc-branch
U my-calc-branch/integer.c
</screen>
@@ -1420,8 +1420,8 @@
spesifisere de tre nødvendige argumentene ganske fleksibelt.
Her er noen eksempler:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn merge http://svn.example.com/repos/branch1@150 \
http://svn.example.com/repos/branch2@212 \
my-working-copy
@@ -1430,7 +1430,7 @@
$ svn merge -r 100:200 http://svn.example.com/repos/trunk
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<screen>
$ svn merge http://svn.example.com/repos/branch1@150 \
http://svn.example.com/repos/branch2@212 \
@@ -1808,8 +1808,8 @@
<command>svn merge</command> klage over <!-- ¤
--><quote>skipped targets</quote>:</para>
-<!-- ¤ -->
-<screen>
+ <!-- ¤ -->
+ <screen>
$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
U foo.c
U bar.c
@@ -2199,8 +2199,8 @@
@ENGLISH }}} -->
<para>Så hvis vi går videre i eksempelet,</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn log -ﳢ-verbose -ﳢ-stop-on-copy \
http://svn.example.com/repos/calc/branches/my-calc-branch
…
@@ -2211,7 +2211,7 @@
$
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<screen>
$ svn log --verbose --stop-on-copy \
http://svn.example.com/repos/calc/branches/my-calc-branch
@@ -2241,8 +2241,8 @@
@ENGLISH }}} -->
<para>Her er den siste fletteprosedyren, og deretter:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ cd calc/trunk
$ svn update
At revision 405.
@@ -2266,7 +2266,7 @@
Transmitting file data ...
Committed revision 406.
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<!-- ¤ --><screen>
$ cd calc/trunk
$ svn update
@@ -2376,8 +2376,8 @@
bare vil flette grenforandringene etter dette – ved å
sammenligne revisjonene 406 og <literal>HEAD</literal>.</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ cd calc/trunk
$ svn update
At revision 480.
@@ -2396,7 +2396,7 @@
Transmitting file data ...
Committed revision 481.
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<!-- ¤ --><screen>
$ cd calc/trunk
$ svn update
@@ -2467,8 +2467,8 @@
<emphasis>omvendt</emphasis> forskjell:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn merge -r 303:302 http://svn.example.com/repos/calc/trunk
U integer.c
@@ -2485,7 +2485,7 @@
Transmitting file data .
Committed revision 350.
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<!-- ¤ --><screen>
$ svn merge -r 303:302 http://svn.example.com/repos/calc/trunk
U integer.c
@@ -3337,7 +3337,7 @@
arbeidskopien din av <filename>/calc/trunk</filename> til å
avspeile plasseringen til den nye grenen:</para>
-<screen>
+ <screen>
$ cd calc
$ svn info | grep URL
@@ -3659,17 +3659,17 @@
<literal>HEAD</literal>-revisjonen, kan du lage en kopi av
den:</para>
-<!-- ¤ -->
-<!-- @ENGLISH {{{
-<screen>
+ <!-- ¤ -->
+ <!-- @ENGLISH {{{
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/tags/release-1.0 \
-m "Tagging the 1.0 release of the 'calc' project."
Committed revision 351.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/tags/versjon-1.0 \
-m "Merker 1.0-versjonen av «calc»-prosjektet."
@@ -3838,9 +3838,9 @@
inkludert muligheten til å kopiere et tre av en arbeidskopi til
depotet:</para>
-<!-- ¤ -->
-<!-- @ENGLISH {{{
-<screen>
+ <!-- ¤ -->
+ <!-- @ENGLISH {{{
+ <screen>
$ ls
my-working-copy/
@@ -3848,8 +3848,8 @@
Committed revision 352.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ ls
min-arbeidskopi/
@@ -3953,7 +3953,7 @@
Hvis et depot bare inneholder ett prosjekt, lager man ofte disse
toppkatalogene:</para>
-<screen>
+ <screen>
/trunk
/branches
/tags
@@ -3970,7 +3970,7 @@
linkend="svn.reposadmin.projects.chooselayout"/> for å lese mer
om <quote>prosjektrøtter</quote>):</para>
-<screen>
+ <screen>
/paint/trunk
/paint/branches
/paint/tags
@@ -4061,16 +4061,16 @@
<filename>/calc/trunk</filename>, trenger ikke grenkatalogen å
ligge der mer:</para>
-<!-- ¤ -->
-<!-- @ENGLISH {{{
-<screen>
+ <!-- ¤ -->
+ <!-- @ENGLISH {{{
+ <screen>
$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
-m "Removing obsolete branch of calc project."
Committed revision 375.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn delete http://svn.example.com/repos/calc/branches/min-calc-gren \
-m "Fjerner avlegs gren i calc-prosjektet."
@@ -4111,15 +4111,15 @@
copy -r</command> for å kopiere den fra den gamle
revisjonen:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn copy -r 374 http://svn.example.com/repos/calc/branches/my-calc-branch \
http://svn.example.com/repos/calc/branches/my-calc-branch
Committed revision 376.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn copy -r 374 http://svn.example.com/repos/calc/branches/min-calc-gren \
http://svn.example.com/repos/calc/branches/min-calc-gren
@@ -4158,17 +4158,17 @@
Så istedenfor lager du en <quote>stabil</quote> gren av
programmet som ikke vil forandre seg så mye:</para>
-<!-- ¤ -->
-<!-- @ENGLISH {{{
-<screen>
+ <!-- ¤ -->
+ <!-- @ENGLISH {{{
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/stable-1.0 \
-m "Creating stable branch of calc project."
Committed revision 377.
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/stabil-1.0 \
-m "Lager stabil gren av calc-prosjektet."
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Wed Sep 28 09:41:34 2005
@@ -310,7 +310,7 @@
<!-- =============================================================== -->
<sect2 id="svn.reposadmin.basics.backends">
<!-- @ENGLISH {{{
- <title>Repository Data-Stores</title>
+ <title>Repository Data Stores</title>
@ENGLISH }}} -->
<title>Datalagring i depotet</title>
@@ -320,9 +320,14 @@
stores everything in a Berkeley DB database; the other kind
stores data in ordinary flat files, using a custom
format. Because Subversion developers often refer to a
- repository as <quote>The [Versioned] Filesystem</quote>, they have
+ repository as <quote>the (versioned) filesystem</quote>, they have
adopted the habit of referring to the latter type of repository as
- <firstterm>FSFS</firstterm>: that is, it's a versioned
+ <firstterm>FSFS</firstterm>
+ <footnote>
+ <para>Pronounced <quote>fuzz-fuzz</quote>, if Jack
+ Repenning has anything to say about it.</para>
+ </footnote>
+ —a versioned
filesystem implementation that uses the native OS filesystem
to store data.</para>
@ENGLISH }}} -->
@@ -332,11 +337,13 @@
typen lagrer data som ordinære <quote>flate filer</quote> i et
tilpasset format.
Fordi Subversionutviklere ofte referer til et depot som
- <quote>det [versjonerte] filsystemet</quote>, har de lagt seg
+ <quote>det (versjonerte) filsystemet</quote>, har de lagt seg
til vanen med å refere til den sistnevnte typen depot som
- <firstterm>FSFS</firstterm>:
- Det vil si, det er en versjonert filsystemimplementasjon som
- bruker det vanlige filsystemet til operativsystemet for å lagre
+ <firstterm>FSFS</firstterm><footnote>
+ <para>Uttales <quote>fuzz-fuzz</quote>, hvis Jack Repenning
+ har noe å si angående det.</para>
+ </footnote> – en versjonert filsystemimplementasjon som bruker
+ det vanlige filsystemet til operativsystemet for å lagre
data.</para>
<!-- @ENGLISH {{{
@@ -372,7 +379,7 @@
<table id="svn.reposadmin.basics.backends.tbl-1">
<!-- @ENGLISH {{{
- <title>Repository Data-Store Comparison</title>
+ <title>Repository Data Store Comparison</title>
@ENGLISH }}} -->
<title>Sammenligning av datalagring i depoter</title>
<tgroup cols="3">
@@ -5288,7 +5295,12 @@
to create various named branches of the main development line;
<filename>tags</filename>, which is a directory of branches
that are created, and perhaps destroyed, but never
- changed.</para>
+ changed.
+ <footnote>
+ <para>The <filename>trunk</filename>, <filename>tags</filename>,
+ and <filename>branches</filename> trio are sometimes referred
+ to as <quote>the TTB directories</quote>.</para>
+ </footnote></para>
@ENGLISH }}} -->
<para>Etter å ha avgjort hvordan du vil organisere prosjektene i
henhold til depotene, vil du kanskje tenke over
@@ -5304,7 +5316,12 @@
katalog som er ment for å lage diverse navngitte grener av
hovedutviklingen; <filename>tags</filename> som er en katalog av
grener som er laget, og kanskje ødelagt, men aldri
- forandret.</para>
+ forandret.<footnote>
+ <para>Trioen <filename>trunk</filename>,
+ <filename>tags</filename> og <filename>branches</filename>
+ blir noen ganger referert til som
+ <quote>TTB-katalogene</quote>.</para>
+ </footnote></para>
<!-- @ENGLISH {{{
<para>For example, your repository might look like:</para>
Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml (original)
+++ trunk/src/nb/book/ch06.xml Wed Sep 28 09:41:34 2005
@@ -534,8 +534,8 @@
<para>For å forhindre lagring for en enkelt kommando, spesifiser
valget <option>--no-auth-cache</option>:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn commit -F log_msg.txt -ﳢ-no-auth-cache
Authentication realm: <svn://host.example.com:3690> example realm
Username: joe
@@ -553,8 +553,8 @@
Username: joe
…
</screen>
- at ENGLISH }}} -->
- <!-- ¤ --><screen>
+ @ENGLISH }}} -->
+ <!-- ¤ --><screen>
$ svn commit -F log_msg.txt --no-auth-cache
Authentication realm: <svn://host.example.com:3690> example realm
Username: joe
@@ -589,7 +589,7 @@
<literal>no</literal> vil ingen legitimasjon bli lagret på
disken i det hele tatt.</para>
-<screen>
+ <screen>
[auth]
store-auth-creds = no
</screen>
@@ -614,7 +614,7 @@
<literal>svn:realmstring</literal>-nøkkelen viser hvilket
tjenerområde filen er assosiert med:</para>
-<screen>
+ <screen>
$ ls ~/.subversion/auth/svn.simple/
5671adf2865e267db74f09ba6f872c28
3893ed123b39500bca8a0b382839198e
@@ -826,7 +826,7 @@
prosessen, kan du angi valget <option>-i</option>
(<option>--inetd</option>):</para>
-<screen>
+ <screen>
$ svnserve -i
( success ( 1 2 ( ANONYMOUS ) ( edit-pipeline ) ) )
</screen>
@@ -854,7 +854,7 @@
<filename>/etc/services</filename> (hvis de ikke allerede
eksisterer):</para>
-<screen>
+ <screen>
svn 3690/tcp # Subversion
svn 3690/udp # Subversion
</screen>
@@ -868,11 +868,11 @@
<command>inetd</command>-daemon, kan du legge denne linjen til
<filename>/etc/inetd.conf</filename>:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<screen>
svn stream tcp nowait svnbruker /usr/bin/svnserve svnserve -i
</screen>
@@ -1055,12 +1055,12 @@
<command>svnserve</command> som begrenser den til å kun
ekportere depoter som ligger under denne stien:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svnserve -d -r /usr/local/repositories
…
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<screen>
$ svnserve -d -r /usr/local/depoter
…
@@ -1080,12 +1080,12 @@
stien, noe som gir mye kortere (og mindre avslørende)
URLer:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ svn checkout svn://host.example.com/project1
…
</screen>
- at ENGLISH }}} -->
+ @ENGLISH }}} -->
<screen>
$ svn checkout svn://tjener.example.com/prosjekt1
…
@@ -1257,14 +1257,14 @@
Start ved å definere en fil som inneholder brukernavn og
passord, og et autentiseringsområde:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
[general]
password-db = userfile
realm = example realm
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
[general]
password-db = brukerfil
realm = eksempelområde
@@ -1295,14 +1295,14 @@
bruker det samme kjente formatet.
For eksempel:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
[users]
harry = foopassword
sally = barpassword
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
[users]
harry = foopassord
sally = barpassord
@@ -1377,10 +1377,11 @@
lese/skrive-tilgang til depotet.
For eksempel:</para>
-<!-- ¤ Her kopieres skjermteksten nøyaktig likt, så det med at «verdiene
-har den standardverdien» blir riktig. Eller er de L10N’et? Sjekkes. -->
-<!-- @ENGLISH {{{
-<screen>
+ <!-- ¤ Her kopieres skjermteksten nøyaktig likt, så det med at
+ «verdiene har den standardverdien» blir riktig. Eller er de
+ L10N’et? Sjekkes. -->
+ <!-- @ENGLISH {{{
+ <screen>
[general]
password-db = userfile
realm = example realm
@@ -1391,8 +1392,8 @@
# authenticated users can both read and write
auth-access = write
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
[general]
password-db = userfile
realm = example realm
@@ -1415,8 +1416,8 @@
Hvis du vil være enda mer konservativ, kan du blokkere anonym
tilgang fullstendig:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
[general]
password-db = userfile
realm = example realm
@@ -1427,8 +1428,8 @@
# authenticated users can both read and write
auth-access = write
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
[general]
password-db = brukerfil
realm = eksempelområde
@@ -1515,8 +1516,8 @@
Klienten bruker ganske enkelt URL-skjemaet
<literal>svn+ssh://</literal> for å koble seg til:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
$ whoami
harry
@@ -1528,8 +1529,8 @@
baz
…
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
$ whoami
harry
@@ -1674,7 +1675,7 @@
<filename>config</filename>-filen kan du enkelt definere det på
denne måten:</para>
-<screen>
+ <screen>
[tunnels]
rsh = rsh
</screen>
@@ -1704,7 +1705,7 @@
Men du kan definere nye tunnelskjema til å være mye mer
avanserte enn som så:</para>
-<screen>
+ <screen>
[tunnels]
joessh = $JOESSH /opt/alternate/ssh -p 29934
</screen>
@@ -1826,12 +1827,12 @@
lov til å koble seg til.
Linjene har vanligvis dette formatet:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
ssh-dsa AAAABtce9euch.... user at example.com
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
ssh-dsa AAAABtce9euch.... bruker at example.com
</screen>
@@ -1848,12 +1849,12 @@
En lite kjent funksjonalitet er at hele linjen kan bli
innledet av et <literal>command</literal>-felt:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
command="program" ssh-dsa AAAABtce9euch.... user at example.com
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
command="program" ssh-dsa AAAABtce9euch.... bruker at example.com
</screen>
@@ -1873,12 +1874,12 @@
I de følgende eksemplene forkorter vi linjene i filen
som:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
command="program" TYPE KEY COMMENT
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
command="program" TYPE NØKKEL KOMMENTAR
</screen>
@@ -1900,12 +1901,12 @@
<command>svnserve</command>-binærfil som skal kjøres og levere
et ekstra parameter til den:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
command="/path/to/svnserve -t -r /virtual/root" TYPE KEY COMMENT
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
command="/sti/til/svnserve -t -r /virtuell/rot" TYPE NØKKEL KOMMENTAR
</screen>
@@ -1951,13 +1952,13 @@
<filename>authorized_users</filename>-filen, en per linje, og
bruk valget <option>--tunnel-user</option>:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
command="svnserve -t -ﳢ-tunnel-user=harry" TYPE1 KEY1 harry at example.com
command="svnserve -t -ﳢ-tunnel-user=sally" TYPE2 KEY2 sally at example.com
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
command="svnserve -t --tunnel-user=harry" TYPE1 NØKKEL1 harry at example.com
command="svnserve -t --tunnel-user=sally" TYPE2 NØKKEL2 sally at example.com
</screen>
@@ -2007,14 +2008,14 @@
kanskje spesifisere et antall begrensningsvalg like etter
<literal>command</literal>:</para>
-<!-- @ENGLISH {{{
-<screen>
+ <!-- @ENGLISH {{{
+ <screen>
command="svnserve -t -ﳢ-tunnel-user=harry",no-port-forwarding,\
no-agent-forwarding,no-X11-forwarding,no-pty \
TYPE1 KEY1 harry at example.com
</screen>
- at ENGLISH }}} -->
-<screen>
+ @ENGLISH }}} -->
+ <screen>
command="svnserve -t --tunnel-user=harry",no-port-forwarding,\
no-agent-forwarding,no-X11-forwarding,no-pty \
TYPE1 NØKKEL1 harry at example.com
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Wed Sep 28 09:41:34 2005
@@ -1292,7 +1292,7 @@
<para>If you want to see the ignored files, you can pass the
<option>--no-ignore</option> option to Subversion:</para>
-<screen>
+ <screen>
$ svn status --no-ignore
M calc/button.c
I calc/calculator
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Wed Sep 28 09:41:34 2005
@@ -5123,13 +5123,54 @@
<title>Description</title>
<para>Print the paths that were changed in a particular
- revision or transaction, as well as an <quote>svn
- update-style</quote> status letter in the first column:
- <literal>A</literal> for added, <literal>D</literal> for
- deleted, and <literal>U</literal> for updated
- (modified).</para>
+ revision or transaction, as well as <quote>svn
+ update-style</quote> status letters in the first two
+ columns:</para>
- </refsect1>
+ <variablelist>
+
+ <varlistentry>
+ <term>'<literal>A </literal>'</term>
+ <listitem>
+ <para>Item added to repository.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>'<literal>D </literal>'</term>
+ <listitem>
+ <para>Item deleted from repository.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>'<literal>U </literal>'</term>
+ <listitem>
+ <para>File contents changed.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>'<literal>_U</literal>'</term>
+ <listitem>
+ <para>Properties of item changed.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>'<literal>UU</literal>'</term>
+ <listitem>
+ <para>File contents and properties changed.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <para>Files and directories can be distinguished, as directory
+ paths are displayed with a trailing '<literal>/</literal>'
+ character.</para>
+
+ </refsect1>
<refsect1>
<title>Switches</title>
@@ -5152,6 +5193,10 @@
A trunk/vendors/deli/chips.txt
A trunk/vendors/deli/sandwich.txt
A trunk/vendors/deli/pickle.txt
+U trunk/vendors/baker/bagel.txt
+_U trunk/vendors/baker/croissant.txt
+UU trunk/vendors/baker/pretzel.txt
+D trunk/vendors/baker/baguette.txt
</screen>
</refsect1>
More information about the svnbook-dev
mailing list