[svnbook commit] r1625 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Fri Aug 19 12:01:55 CDT 2005
Author: sunny256
Date: Fri Aug 19 12:01:54 2005
New Revision: 1625
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/appa.xml
trunk/src/nb/book/ch01.xml
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
Log:
Sync the Norwegian book against the English files, r1587:1624.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/book/appa.xml
* src/nb/book/ch06.xml
Updated r1619.
* src/nb/book/ch01.xml
Updated r1593.
* src/nb/book/ch02.xml
Updated r1593, r1619, r1624.
* src/nb/book/ch03.xml
Updated r1619.
* src/nb/book/ch04.xml
Updated r1619, r1624.
* src/nb/book/ch05.xml
Updated r1613, r1619.
* src/nb/book/ch07.xml
Updated r1614.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Fri Aug 19 12:01:54 2005
@@ -1 +1 @@
-1587
+1624
Modified: trunk/src/nb/book/appa.xml
==============================================================================
--- trunk/src/nb/book/appa.xml (original)
+++ trunk/src/nb/book/appa.xml Fri Aug 19 12:01:54 2005
@@ -49,12 +49,12 @@
<!-- @ENGLISH {{{
<para>In CVS, revision numbers are per-file. This is because CVS
- uses RCS as a backend; each file has a corresponding RCS file in
- the repository, and the repository is roughly laid out according
- to the structure of your project tree.</para>
+ stores its data in RCS files; each file has a corresponding RCS
+ file in the repository, and the repository is roughly laid out
+ according to the structure of your project tree.</para>
@ENGLISH }}} -->
<para>I CVS er revisjonsnumrene konstruert for hver enkelt fil.
- Dette er fordi CVS bruker bruker RCS som støtteprogram;
+ Dette er fordi CVS lagrer dataene sine i RCS-filer;
hver fil har en tilsvarende RCS-fil i depotet, og depotet er lagt
ut på bortimot samme måte som prosjekttreet ditt.</para>
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Fri Aug 19 12:01:54 2005
@@ -592,17 +592,31 @@
<title>Installering av Subversion</title>
<!-- @ENGLISH {{{
- <para>Subversion is built on a portability layer called APR (the
- Apache Portable Runtime library). This means Subversion should
- work on any operating system that the Apache httpd server runs
- on: Windows, Linux, all flavors of BSD, Mac OS X, Netware, and
- others.</para>
- @ENGLISH }}} -->
- <para>Subversion er bygget på et portabilitetslag kalt APR
- (biblioteket <foreignphrase>Apache Portable
- Runtime</foreignphrase>).
- Dette betyr at Subversion skal kunne virke på alle
- operativsystemer som Apache httpd-serveren kjører på:
+ <para>Subversion is built on a portability layer called
+ APR—the Apache Portable Runtime library. The APR library
+ provides all the interfaces that Subversion needs to function on
+ different operating systems: disk access, network access, memory
+ management, and so on. While Subversion is able to use Apache
+ as one of its network server programs, its dependence on APR
+ <emphasis>does not</emphasis> mean that Apache is a required
+ component. APR is a standalone library useable by any
+ application. It does mean, however, that like Apache,
+ Subversion clients and servers run on any operating system that
+ the Apache httpd server runs on: Windows, Linux, all flavors of
+ BSD, Mac OS X, Netware, and others.</para>
+ @ENGLISH }}} -->
+ <para>Subversion er bygget på et portabilitetslag kalt APR –
+ <foreignphrase>Apache Portable Runtime</foreignphrase>.
+ APR-biblioteket inneholder alle grensesnitt som Subversion trenger
+ for å fungere på forskjellige operativsystemer: Diskaksess,
+ nettverkstilgang, styring av hukommelsen og så videre.
+ Selv om Subversion er i stand til å bruke Apache som
+ nettverkstjener, fører <emphasis>ikke</emphasis> Subversions
+ APR-avhengighet til at Apache er en nødvendig komponent.
+ APR er et selvstendig bibliotek som kan brukes av mange
+ programmer.
+ Det det derimot betyr, er at Subversion skal kunne kjøre på alle
+ operativsystemer som Apache httpd-tjeneren kjører på:
Windows, Linux, alle varianter av BSD, Mac OS X, Netware og
andre.</para>
@@ -898,7 +912,10 @@
in <xref linkend="svn.reposadmin.projects.chooselayout"/>.
Either way, the repository only manages files and directories,
so it's up to humans to interpret particular directories
- as <quote>projects</quote>.</para>
+ as <quote>projects</quote>. So while you might see references
+ to projects throughout this book, keep in mind that we're only
+ ever talking about some directory (or collection of directories)
+ in the repository.</para>
@ENGLISH }}} -->
<para>Subversion har ikke noen oppfatning av et
<quote>prosjekt</quote>.
@@ -911,7 +928,10 @@
linkend="svn.reposadmin.projects.chooselayout"/>.
Uansett, depotet holder bare rede på filer og kataloger, så det er
opp til mennesker å se på spesielle kataloger som
- <quote>prosjekter</quote>.</para>
+ <quote>prosjekter</quote>.
+ Så selv om du ser referanser til prosjekter i denne boken, husk på
+ at vi bare snakker om en katalog (eller samling av kataloger) i
+ depotet.</para>
<!-- @ENGLISH {{{
<para>In this example, we assume that you already have some sort
@@ -919,7 +939,7 @@
to import into your newly created Subversion repository. Begin
by organizing them into a single directory
called <filename>myproject</filename> (or whatever you wish).
- For reasons that will be clear later on (see
+ For reasons that will be clear later (see
<xref linkend="svn.branchmerge"/>), your project's tree
structure should contain three top-level directories
named <filename>branches</filename>,
@@ -934,7 +954,7 @@
importere inn i det nyopprettede Subversiondepotet ditt.
Start med å organisere dem i en enkel katalog kalt
<filename>mittprosjekt</filename> eller noe annet, hvis du vil.
- Av grunner som vi vil forklare senere (se <xref
+ På grunn av ting som bli avklart senere (se <xref
linkend="svn.branchmerge"/>), bør katalogstrukturen til prosjektet
inneholde tre kataloger på toppnivå som kalles
<filename>branches</filename>, <filename>tags</filename> og
@@ -965,6 +985,18 @@
</screen>
<!-- @ENGLISH {{{
+ <para>The <filename>branches</filename>, <filename>tags</filename>,
+ and <filename>trunk</filename> subdirectories aren't actually
+ required by Subversion. They're merely a popular convention
+ that you'll most likely want to use later on.</para>
+ @ENGLISH }}} -->
+ <para>Katalogene <filename>branches</filename>,
+ <filename>tags</filename> og <filename>trunk</filename> er
+ egentlig ikke nødvendig for at Subversion skal fungere.
+ Det er bare en utbredt konvensjonell måte å gjøre ting på som du
+ også sannsynligvis vil komme til å bruke.</para>
+
+ <!-- @ENGLISH {{{
<para>Once you have your tree of data ready to go, import it into
the repository with the <command>svn import</command> command
(see <xref linkend="svn.tour.other.import"/>):</para>
Modified: trunk/src/nb/book/ch02.xml
==============================================================================
--- trunk/src/nb/book/ch02.xml (original)
+++ trunk/src/nb/book/ch02.xml Fri Aug 19 12:01:54 2005
@@ -104,7 +104,7 @@
example, a client can ask historical questions like, <quote>What
did this directory contain last Wednesday?</quote> or <quote>Who
was the last person to change this file, and what changes did
- they make?</quote> These are the sorts of questions that are at
+ he make?</quote> These are the sorts of questions that are at
the heart of any <firstterm>version control system</firstterm>:
systems that are designed to record and track changes to data
over time.
@@ -622,7 +622,8 @@
way. Your working copy is your own private work area:
Subversion will never incorporate other people's changes, nor
make your own changes available to others, until you
- explicitly tell it to do so.</para>
+ explicitly tell it to do so. You can even have multiple
+ working copies of the same project.</para>
@ENGLISH }}} -->
<para>En arbeidskopi i Subversion er et vanlig katalogtre på ditt
lokale system, og inneholder en samling filer.
@@ -631,7 +632,9 @@
Arbeidskopien din er ditt eget private arbeidsområde:
Subversion vil aldri legge inn andre folks forandringer, heller
ikke gjøre dine egne forandringer tilgjengelig for andre før du
- eksplisitt ber programmet om å gjøre det.</para>
+ eksplisitt ber programmet om å gjøre det.
+ Du kan til og med ha flere arbeidskopier av det samme
+ prosjektet.</para>
<!-- @ENGLISH {{{
<para>After you've made some changes to the files in your
@@ -1060,14 +1063,14 @@
number selects an entire tree, a particular state of the
repository after some committed change. Another way to
think about it is that revision N represents the state of
- the repository filesystem after the Nth commit. When a
- Subversion user talks about <quote>revision 5 of
+ the repository filesystem after the Nth commit. When
+ Subversion users talk about <quote>revision 5 of
<filename>foo.c</filename></quote>, they really mean
- <quote><filename>foo.c</filename> as it appears in revision 5.</quote>
- Notice that in general, revisions N and M of a file do
- <emphasis>not</emphasis> necessarily differ! Because CVS
- uses per-file revisions numbers, CVS users might want to see
- <xref linkend="svn.forcvs"/> for more details.</para>
+ <quote><filename>foo.c</filename> as it appears in revision
+ 5.</quote> Notice that in general, revisions N and M of a
+ file do <emphasis>not</emphasis> necessarily differ! Because
+ CVS uses per-file revisions numbers, CVS users might want to
+ see <xref linkend="svn.forcvs"/> for more details.</para>
@ENGLISH }}} -->
<para>Ulikt mange av de andre versjonskontrollsystemene, gjelder
Subversions revisjonsnumre for <emphasis>hele trær</emphasis>,
@@ -1076,10 +1079,10 @@
tilstand til depotet etter at noen la inn en forandring.
En annen måte å tenke seg det er at revisjon N representerer
tilstanden til depotfilsystemet etter den Nte innleggingen.
- Når en Subversionbruker snakker om <quote>revisjon 5 av
- <filename>foo.c</filename></quote>, mener han egentlig
+ Når Subversionbrukere snakker om <quote>revisjon 5 av
+ <filename>foo.c</filename></quote>, mener de egentlig
<quote><filename>foo.c</filename> som den fremstår i revisjon
- 5.</quote>
+ 5</quote>.
Legg merke til at vanligvis vil innholdet av en fil for
revisjonene N og M <emphasis>ikke</emphasis> være forskjellig!
Fordi CVS bruker egne revisjonsnumre for hver fil, vil kanskje
Modified: trunk/src/nb/book/ch03.xml
==============================================================================
--- trunk/src/nb/book/ch03.xml (original)
+++ trunk/src/nb/book/ch03.xml Fri Aug 19 12:01:54 2005
@@ -328,7 +328,7 @@
$ svn diff -ﳢ-revision HEAD
# compares your working file (with local mods) to the latest version
-# in the repository.
+# in the repository
$ svn diff -ﳢ-revision BASE:HEAD foo.c
# compares your <quote>pristine</quote> foo.c (no local mods) with the
@@ -338,8 +338,8 @@
# shows all commit logs since you last updated
$ svn update -ﳢ-revision PREV foo.c
-# rewinds the last change on foo.c.
-# (foo.c's working revision is decreased.)
+# rewinds the last change on foo.c
+# (foo.c's working revision is decreased)
</screen>
@ENGLISH }}} -->
<screen>
@@ -351,18 +351,18 @@
$ svn diff --revision HEAD
# sammenligner arbeidsfilen din (med lokale forandringer) med den
-# seneste versjonen i depotet.
+# seneste versjonen i depotet
$ svn diff --revision BASE:HEAD foo.c
# sammenligner din <quote>uberørte</quote> foo.c (ingen lokale
-# modifikasjoner) mot den seneste versjonen i depotet.
+# modifikasjoner) mot den seneste versjonen i depotet
$ svn log --revision BASE:HEAD
# viser alle loggmeldinger siden du sist oppdaterte
$ svn update --revision PREV foo.c
-# setter tilbake til den forrige forandringen på foo.c .
-# (Arbeidsrevisjonen til foo.c minsker.)
+# setter tilbake til den forrige forandringen på foo.c
+# (Arbeidsrevisjonen til foo.c minsker)
</screen>
<!-- @ENGLISH {{{
@@ -3281,12 +3281,13 @@
<term><command>svn log</command></term>
<listitem>
<!-- @ENGLISH {{{
- <para>Shows you broad information: log messages attached
- to revisions, and which paths changed in each
- revision.</para>
- @ENGLISH }}} -->
- <para>Viser deg bred informasjon: Loggmeldinger sammen med
- revisjoner og hvilke stier som forandret seg i hver
+ <para>Shows you broad information: log messages with date
+ and author information attached to revisions, and which
+ paths changed in each revision.</para>
+ @ENGLISH }}} -->
+ <para>Viser deg bred informasjon:
+ Loggmeldinger med dato- og forfatterinformasjon for
+ revisjonene og hvilke stier som forandret seg i hver
revisjon.</para>
</listitem>
</varlistentry>
Modified: trunk/src/nb/book/ch04.xml
==============================================================================
--- trunk/src/nb/book/ch04.xml (original)
+++ trunk/src/nb/book/ch04.xml Fri Aug 19 12:01:54 2005
@@ -1180,11 +1180,11 @@
<footnote>
<para>In the future, the Subversion project plans to use
(or invent) an expanded patch format that describes
- tree-changes.</para>
+ changes in tree structure and properties.</para>
</footnote>
The <command>svn merge</command> command, however, can express
- tree-changes by directly applying them to your working
- copy.</para>
+ changes in tree structure and properties by directly applying
+ them to your working copy.</para>
@ENGLISH }}} -->
<para>Ja, i dette spesielle tilfellet er det egentlig ingen
forskjell.
@@ -1204,11 +1204,11 @@
det rett og slett ikke kan vise.<footnote>
<para>I fremtiden planlegger Subversionprosjektet å bruke
(eller finne opp) et utvidet patchformat som beskriver
- treforandringer.</para>
+ forandringer i trestruktur og egenskaper.</para>
</footnote>
<command>svn merge</command>-kommandoen, derimot, kan uttrykke
- treforandringer ved å legge dem direkte inn i arbeidskopien
- din.</para>
+ forandringer i trestruktur og egenskaper ved å legge dem
+ direkte inn i arbeidskopien din.</para>
</sidebar>
@@ -1700,11 +1700,11 @@
Somebody can then run <command>svn log -r9238</command> to
read about the exact changeset which fixed the bug, and run
<command>svn diff -r9237:9238</command> to see the patch
- itself. And Subversion's merge command also uses revision
- numbers. You can merge specific changesets from one branch
- to another by naming them in the merge arguments:
- <command>svn merge -r9237:9238</command> would merge
- changeset #9238 into your working copy.</para>
+ itself. And Subversion's <literal>merge</literal> command
+ also uses revision numbers. You can merge specific changesets
+ from one branch to another by naming them in the merge
+ arguments: <command>svn merge -r9237:9238</command> would
+ merge changeset #9238 into your working copy.</para>
@ENGLISH }}} -->
<para>I Subversion gir et globalt revisjonsnummer N navn til et
tre i depotet:
@@ -1723,7 +1723,8 @@
om det eksakte forandringssettet som ordnet feilen, og kjøre
<command>svn diff -r9237:9238</command> for å se selve
patchen.
- Og Subversions flettekommando bruker også revisjonsnumre.
+ Og Subversions <literal>merge</literal>-kommando bruker også
+ revisjonsnumre.
Du kan flette spesifikke forandringssett fra en gren til en
annen ved å gi dem navn i fletteargumentene:
<command>svn merge -r9237:9238</command> vil flette
@@ -1973,13 +1974,12 @@
ancestry, while the latter command is quite sensitive to it.
For example, if you asked <command>svn diff</command> to
compare revisions 99 and 102 of <filename>foo.c</filename>,
- you would see line-based diffs; the diff command is blindly
- comparing two paths. But if you asked <command>svn
- merge</command> to compare the same two objects, it would
- notice that they're unrelated and first attempt to delete
- the old file, then add the new file; you would see a
- <literal>D foo.c</literal> followed by a <literal>A
- foo.c</literal>.</para>
+ you would see line-based diffs; the <literal>diff</literal>
+ command is blindly comparing two paths. But if you asked
+ <command>svn merge</command> to compare the same two objects,
+ it would notice that they're unrelated and first attempt to
+ delete the old file, then add the new file; the output would
+ indicate a deletion followed by an add:</para>
@ENGLISH }}} -->
<para>Grunnen til at vi tar dette opp er for å fremheve en
viktig forskjell mellom <command>svn diff</command> og
@@ -1988,22 +1988,30 @@
kommandoen er ganske følsom for det.
Hvis du for eksempel ber <command>svn diff</command> om å
sammenligne revisjon 99 og 102 av <filename>foo.c</filename>,
- vil du se linjebaserte forskjeller; diffkommandoen
- sammenligner blindt to stier.
+ vil du se linjebaserte forskjeller;
+ <literal>diff</literal>-kommandoen sammenligner blindt to
+ stier.
Men hvis du ber <command>svn merge</command> om å sammenligne
de samme to objektene, vil den oppdage at de er urelaterte og
- forsøker først å slette den gamle filen og deretter legge til
- den nye filen; du vil se en <literal>D foo.c</literal> fulgt
- av en <literal>A foo.c</literal>.</para>
+ først prøve å slette den gamle filen og deretter legge til den
+ nye filen.
+ Utdataene fra programmet vil indikere en sletting etterfulgt
+ av en tillegging:</para>
+
+ <screen>
+D foo.c
+A foo.c
+</screen>
<!-- @ENGLISH {{{
<para>Most merges involve comparing trees that are ancestrally
related to one another, and therefore <command>svn
merge</command> defaults to this behavior. Occasionally,
- however, you may want the merge command to compare two
- unrelated trees. For example, you may have imported two
- source-code trees representing different vendor releases of
- a software project (see <xref linkend="svn.advanced.vendorbr"/>).
+ however, you may want the <literal>merge</literal> command to
+ compare two unrelated trees. For example, you may have
+ imported two source-code trees representing different vendor
+ releases of a software project (see <xref
+ linkend="svn.advanced.vendorbr"/>).
If you asked <command>svn merge</command> to compare the two
trees, you'd see the entire first tree being deleted,
followed by an add of the entire second tree!</para>
@@ -2011,10 +2019,11 @@
<para>De fleste flettinger involverer sammenligning av trær som
er slektsmessig relatert til hverandre, og derfor har
<command>svn merge</command> denne oppførselen som standard.
- Men nå og da vil du kanskje bruke flettekommandoen til å
- sammenligne to urelaterte trær.
- For eksempel har du kanskje to kildekodetrær som representerer
- forskjellige <!-- ¤ vendor --> utgivelser av et
+ Men nå og da vil du kanskje bruke
+ <literal>merge</literal>-kommandoen til å sammenligne to
+ urelaterte trær.
+ For eksempel har du kanskje importert to kildekodetrær som
+ representerer forskjellige <!-- ¤ vendor --> utgivelser av et
programprosjekt (se <xref linkend="svn.advanced.vendorbr"/>).
Hvis du ber <command>svn merge</command> om å sammenligne de
to trærne, vil du se at hele det første treet blir slettet,
@@ -2028,8 +2037,8 @@
command, and it will behave just like <command>svn
diff</command>. (And conversely, the
<option>-ﳢ-notice-ancestry</option> option will cause
- <command>svn diff</command> to behave like the merge
- command.)</para>
+ <command>svn diff</command> to behave like the
+ <literal>merge</literal> command.)</para>
@ENGLISH }}} -->
<para>I disse situasjonene vil du at <command>svn
merge</command> bare gjør en stibasert sammenligning og
@@ -2040,7 +2049,7 @@
(Og på motsatt måte vil
<option>--notice-ancestry</option>-valget få <command>svn
diff</command> til å oppføre seg som
- <command>merge</command>-kommandoen.</para>
+ <literal>merge</literal>-kommandoen.</para>
</sect3>
@@ -2618,7 +2627,7 @@
directory, it may be gone from the <literal>HEAD</literal>
revision, but the object still exists in earlier revisions.
One of the most common questions new users ask is, <quote>How
- do I get my old file or directory back?</quote></para>
+ do I get my old file or directory back?</quote>.</para>
@ENGLISH }}} -->
<para>Det som er fint med versjonskontrollsystemer er at
informasjon aldri går tapt.
@@ -3486,13 +3495,13 @@
<!-- @ENGLISH {{{
<para>Have you noticed that the output of <command>svn
switch</command> and <command>svn update</command> look the
- same? The switch command is actually a superset of the
- update command.</para>
+ same? The <literal>switch</literal> command is actually a
+ superset of the update command.</para>
@ENGLISH }}} -->
<para>Har du lagt merke til at utdataene fra <command>svn
switch</command> og <command>svn update</command> ser likedan
ut?
- <command>switch</command>-kommandoen er faktisk en <!-- ¤
+ <literal>switch</literal>-kommandoen er faktisk en <!-- ¤
«superset»: Overordnet? Utvidet versjon? Eller noe annet? Tror
«utvidet versjon» skal gå, i og med at den som sagt lengre nede
også flytter kopien gjennom «rom» i tillegg til «tid».
@@ -3505,7 +3514,8 @@
and then sends a description of the differences back to the
client. The only difference between <command>svn
switch</command> and <command>svn update</command> is that the
- update command always compares two identical paths.</para>
+ <literal>update</literal> command always compares two identical
+ paths.</para>
@ENGLISH }}} -->
<para>Når du kjører <command>svn update</command>, ber du depotet
om å sammenligne to trær.
@@ -3513,7 +3523,7 @@
forskjellene tilbake til klienten.
Den eneste forskjellen mellom <command>svn switch</command> og
<command>svn update</command> er at
- <command>update</command>-kommandoen alltid sammenligner to
+ <literal>update</literal>-kommandoen alltid sammenligner to
identiske stier.</para>
<!-- @ENGLISH {{{
@@ -3866,11 +3876,12 @@
changes made to your working copy, and you'd like a
collaborator to see them. Instead of running <command>svn
diff</command> and sending a patch file (which won't capture
- tree changes), you can instead use <command>svn copy</command>
- to <quote>upload</quote> your working copy to a private area
- of the repository. Your collaborator can then either checkout
- a verbatim copy of your working copy, or use <command>svn
- merge</command> to receive your exact changes.</para>
+ tree changes, symlink changes or changes in properties), you can
+ instead use <command>svn copy</command> to <quote>upload</quote>
+ your working copy to a private area of the repository. Your
+ collaborator can then either checkout a verbatim copy of your
+ working copy, or use <command>svn merge</command> to receive
+ your exact changes.</para>
@ENGLISH }}} -->
<para>Andre brukere har funnet interessante måter å bruke denne
funksjonaliteten på.
@@ -3878,7 +3889,8 @@
forandringer i arbeidskopien, og du vil at en kollega skal se på
dem.
Istedenfor å kjøre <command>svn diff</command> og sende
- patchfilen (som ikke vil fange opp treforandringer), kan du
+ patchfilen (som ikke vil fange opp treforandringer eller
+ forandringer i symbolske linker eller egenskaper), kan du
istedenfor bruke <command>svn copy</command> for å
<quote>sende</quote> arbeidskopien til et privat område i
depotet.
@@ -4001,8 +4013,8 @@
working copies. If a user has a working copy of a particular
repository directory, your <command>svn move</command>
operation might remove the path from the latest revision.
- When the user next runs <command>svn update</command>, they'll
- be told that their working copy represents a path that no
+ When the user next runs <command>svn update</command>, she will
+ be told that her working copy represents a path that no
longer exists, and the user will be forced to <command>svn
switch</command> to the new location.
</para>
@@ -4015,7 +4027,7 @@
kan <command>svn move</command>-operasjonen fjerne stien fra den
seneste revisjonen.
Når brukeren kjører <command>svn update</command> neste gang,
- vil han bli fortalt at arbeidskopien hans representerer en sti
+ vil hun bli fortalt at arbeidskopien hennes representerer en sti
som ikke lenger finnes, og brukeren vil bli tvunget til å bruke
<command>svn switch</command> for å sette arbeidskopien til den
nye plasseringen.</para>
@@ -4121,10 +4133,10 @@
branch. In software development, though, it's also common to
have two <quote>main</quote> branches running side-by-side for
very long periods. For example, suppose it's time to release
- a stable <filename>calc</filename> project to the public, and
- you know it's going to take a couple of months to shake bugs
- out of the software. You don't want people to add new
- features to the project, but you don't want to tell all
+ a stable version of the <filename>calc</filename> project to the
+ public, and you know it's going to take a couple of months to
+ shake bugs out of the software. You don't want people to add
+ new features to the project, but you don't want to tell all
developers to stop programming either. So instead, you create
a <quote>stable</quote> branch of the software that won't
change much:</para>
Modified: trunk/src/nb/book/ch05.xml
==============================================================================
--- trunk/src/nb/book/ch05.xml (original)
+++ trunk/src/nb/book/ch05.xml Fri Aug 19 12:01:54 2005
@@ -2359,23 +2359,23 @@
</varlistentry>
<varlistentry>
- <term><literal>log</literal></term>
+ <term><literal>lock</literal></term>
<listitem>
<!-- @ENGLISH {{{
- <para>Print the tree's log message.</para>
+ <para>If a path is locked, describe the lock attributes.</para>
@ENGLISH }}} -->
- <para>Skriv treets loggmelding.</para>
+ <para>Hvis en sti er låst, beskriv
+ låseattributtene.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>lock</literal></term>
+ <term><literal>log</literal></term>
<listitem>
<!-- @ENGLISH {{{
- <para>If a path is locked, describe the lock attributes.</para>
+ <para>Print the tree's log message.</para>
@ENGLISH }}} -->
- <para>Hvis en sti er låst, beskriv
- låseattributtene.</para>
+ <para>Vis loggmeldingen for treet.</para>
</listitem>
</varlistentry>
@@ -3926,7 +3926,7 @@
equal to the size of the original data, it only takes up
enough space to say, <quote>I look just like this other
piece of data over here, except for the following couple of
- changes.</quote> Specifically, each time a new version of a
+ changes</quote>. Specifically, each time a new version of a
file is committed to the repository, Subversion encodes the
previous version (actually, several previous versions) as a
delta against the new version. The result is that most of
@@ -4369,7 +4369,7 @@
requested range of revisions. Note that <command>svnadmin
dump</command> is reading revision trees from the repository
just like any other <quote>reader</quote> process would
- (<command>svn checkout</command>, for example.) So it's safe
+ (<command>svn checkout</command>, for example). So it's safe
to run this command at any time.</para>
@ENGLISH }}} -->
<para>Når denne prosessen er ferdig, vil du ha en enkelt fil
@@ -4825,7 +4825,7 @@
<command>cvs2svn</command> utility (see <xref
linkend="svn.forcvs.convert"/>) uses the dump format to represent the
contents of a CVS repository so that those contents can be
- moved in a Subversion repository.</para>
+ copied into a Subversion repository.</para>
@ENGLISH }}} -->
<para>Vi vil nevne en siste måte å bruke depotdumpformatet i
Subversion på – konvertering fra en annen lagringsmekanisme
@@ -4838,7 +4838,7 @@
sett med forandringer – ved å bruke dette filformatet.
Faktisk bruker programmet <command>cvs2svn</command> (se <xref
linkend="svn.forcvs.convert"/>) dumpformatet for å representere
- innholdet i et CVS-depot så dette innholdet kan bli flyttet inn
+ innholdet i et CVS-depot så dette innholdet kan bli kopiert inn
i et Subversiondepot.</para>
</sect2>
Modified: trunk/src/nb/book/ch06.xml
==============================================================================
--- trunk/src/nb/book/ch06.xml (original)
+++ trunk/src/nb/book/ch06.xml Fri Aug 19 12:01:54 2005
@@ -759,7 +759,7 @@
<para>If the client successfully authenticates by any of the
methods listed above, it will attempt to cache the credentials
on disk (unless the user has disabled this behavior, as
- mentioned earlier.)</para>
+ mentioned earlier).</para>
@ENGLISH }}} -->
<para>Hvis klienten klarer å legitimere seg ved hjelp av noen av
metodene nevnt ovenfor, vil den prøve å lagre brukerdataene på
@@ -987,7 +987,7 @@
repository directly needs to have proper read and write
permissions on the entire repository. If you're not
careful, this can lead to a number of headaches, especially
- if you're using a BerkeleyDB database rather than FSFS. Be
+ if you're using a Berkeley DB database rather than FSFS. Be
sure to read <xref linkend="svn.serverconfig.multimethod"/>.</para>
@ENGLISH }}} -->
<para>For det første, husk at et Subversiondepot er en samling
@@ -1277,7 +1277,7 @@
client displays it in the authentication prompt, and uses it
as a key (along with the server's hostname and port) for
caching credentials on disk (see <xref
- linkend="svn.serverconfig.netmodel.credcache"/>.) The
+ linkend="svn.serverconfig.netmodel.credcache"/>). The
<literal>password-db</literal> variable points to a separate
file that contains a list of usernames and passwords, using
the same familiar format. For example:</para>
@@ -1659,7 +1659,7 @@
<para>You'd think that the story of SSH tunneling would end
here, but it doesn't. Subversion allows you to create custom
tunnel behaviors in your run-time <filename>config</filename>
- file (see <xref linkend="svn.advanced.confarea"/>.) For example,
+ file (see <xref linkend="svn.advanced.confarea"/>). For example,
suppose you want to use RSH instead of SSH. In the
<literal>[tunnels]</literal> section of your
<filename>config</filename> file, simply define it like
@@ -1688,7 +1688,7 @@
scenes. If you include a username in the URL (for example,
<literal>svn+rsh://username@host/path</literal>) the client
will also include that in its command (<command>rsh
- username at host svnserve -t</command>.) But you can define new
+ username at host svnserve -t</command>). But you can define new
tunneling schemes to be much more clever than that:</para>
@ENGLISH }}} -->
<para>Og nå kan du bruke denne nye tunneldefinsjonen ved å bruke
@@ -2044,7 +2044,7 @@
available to clients via the WebDAV/DeltaV protocol, which is an
extension to HTTP 1.1
(see <systemitem class="url">http://www.webdav.org/</systemitem>
- for more information.) This protocol takes the ubiquitous HTTP
+ for more information). This protocol takes the ubiquitous HTTP
protocol that is the core of the World Wide Web, and adds
writing—specifically, versioned
writing—capabilities. The result is a standardized,
@@ -3041,9 +3041,9 @@
will be cached in your private run-time
<filename>auth/</filename> area in just the same way your
username and password are cached (see <xref
- linkend="svn.serverconfig.netmodel.credcache"/>.) If cached, Subversion will
- automatically remember to trust this certificate in future
- negotiations.</para>
+ linkend="svn.serverconfig.netmodel.credcache"/>). If cached,
+ Subversion will automatically remember to trust this certificate
+ in future negotiations.</para>
@ENGLISH }}} -->
<para>Denne dialogen skulle se kjent ut, det er hovedsaklig det
samme spørsmålet som du har sett i nettleseren din (som jo
@@ -4600,7 +4600,7 @@
<!-- @ENGLISH {{{
<para>Another common problem is often encountered on Unix-like
- systems. As a repository is used, BerkeleyDB occasionally
+ systems. As a repository is used, Berkeley DB occasionally
creates new log files to journal its actions. Even if the
repository is wholly owned by the <command>svn</command> group,
these newly created files won't necessarily be owned by that
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Fri Aug 19 12:01:54 2005
@@ -1669,10 +1669,11 @@
an ordinary file. However, when a client sees this property
during checkouts or updates, it interprets the contents of
the file and translates the item back into the special type
- of object. In Subversion 1.1, only versioned symbolic links
- have this property attached, but in future versions of
- Subversion other special types of nodes will probably use
- this property as well.</para>
+ of object. In versions of Subversion current at the time of
+ writing, only versioned symbolic links have this property
+ attached, but in future versions of Subversion other special
+ types of nodes will probably use this property as
+ well.</para>
<para>Note: Windows clients don't have symbolic links, and
thus ignore any <literal>svn:special</literal> files coming
More information about the svnbook-dev
mailing list