[svnbook commit] r1545 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Wed Jul 13 10:11:51 CDT 2005
Author: sunny256
Date: Wed Jul 13 10:11:50 2005
New Revision: 1545
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/book/ch01.xml
trunk/src/nb/book/ch07.xml
Log:
New update of the Norwegian svnbook. Updating changes between
r1540:1544.
* src/nb/LAST_UPDATED
Updated by make sync.
* src/nb/book/ch01.xml
* src/nb/book/ch07.xml
Updated r1542.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Wed Jul 13 10:11:50 2005
@@ -1 +1 @@
-1540
+1544
Modified: trunk/src/nb/book/ch01.xml
==============================================================================
--- trunk/src/nb/book/ch01.xml (original)
+++ trunk/src/nb/book/ch01.xml Wed Jul 13 10:11:50 2005
@@ -838,23 +838,15 @@
<para>The following example assumes that you have
<command>svn</command>, the Subversion command-line client,
and <command>svnadmin</command>, the administrative tool,
- ready to go. It also assumes that your <command>svn</command>
- client has been compiled against Berkeley DB. To verify this,
- run <command>svn -ﳢ-version</command> and make sure the
- <literal>ra_local</literal> module is available. Without this
- module, the client cannot access <literal>file://</literal>
- URLs.</para>
+ ready to go. It also assumes you are using Subversion 1.2 or
+ later (run <command>svn -ﳢ-version</command> to check.)</para>
@ENGLISH }}} -->
<para>Det følgende eksempelet forutsetter at du har
<command>svn</command>, kommandolinjeklienten, og
<command>svnadmin</command>, det administrative verktøyet, klar
til kjøring.
- Det forutsetter også at <command>svn</command>-klienten er
- kompilert med støtte for Berkeley DB.
- For å kontrollere dette, kjør <command>svn --version</command>
- og sjekk at <literal>ra_local</literal>-modulen er tilgjengelig.
- Uten denne modulen kan ikke klienten få adgang til URLer av
- typen <literal>file://</literal>.</para>
+ Det forutsetter også at du bruker Subversion 1.2 eller senere
+ (kjør <command>svn --version</command> for å sjekke).</para>
</note>
<!-- @ENGLISH {{{
@@ -880,111 +872,161 @@
<!-- @ENGLISH {{{
<para>This command creates a new directory
<filename>/path/to/repos</filename> which contains a Subversion
- repository. Make sure that this directory lives on a local
- disk, <emphasis>not</emphasis> a network share. This new
- directory mainly contains a collection of Berkeley DB database
- files. You won't see your versioned files if you peek inside.
- For more information about repository creation and maintenance,
- see <xref linkend="svn.reposadmin"/>.</para>
+ repository. This new directory contains (among other things) a
+ collection of database files. You won't see your versioned
+ files if you peek inside. For more information about repository
+ creation and maintenance, see
+ <xref linkend="svn.reposadmin"/>.</para>
@ENGLISH }}} -->
<para>Denne kommandoen lager en ny katalog
<filename>/sti/til/depot</filename> som inneholder et
Subversiondepot.
- Vær sikker på at denne katalogen er på en lokal disk,
- <emphasis>ikke</emphasis> en disk på nettverket.
- Denne nye katalogen inneholder inneholder hovedsaklig en samling
- med Berkeley DB databasefiler.
+ Denne nye katalogen inneholder (sammen med andre ting) en samling
+ databasefiler.
Du vil ikke se dine versjonerte filer hvis du tar en kikk
innenfor.
For mer informasjon om opprettelse og vedlikehold av depot, se
<xref linkend="svn.reposadmin"/>.</para>
<!-- @ENGLISH {{{
- <para>Next, create a tree of files and directories to import into
- the repository. For reasons that will be clear later on (see
- <xref linkend="svn.branchmerge"/>), your structure should contain three
- top-level directories named <filename>branches</filename>,
+ <para>Subversion has no concept of a <quote>project</quote>. The
+ repository is just a virtual versioned filesystem, a large tree
+ that can hold anything you wish. Some administrators prefer to
+ store only one project in a repository, and others prefer to
+ store multiple projects in a repository by placing them into
+ separate directories. The merits of each approach are discussed
+ 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>
+ @ENGLISH }}} -->
+ <para>Subversion har ikke noen oppfatning av et
+ <quote>prosjekt</quote>.
+ Depotet er kun et virtuelt versjonert filsystem, et stort tre som
+ kan inneholde hva du vil.
+ Noen administratorer foretrekker å lagre bare ett prosjekt i et
+ depot, andre foretrekker å lagre flere prosjekter i et depot ved å
+ plassere dem i egne kataloger.
+ Fordeler og ulemper med hvert system diskuteres i <xref
+ 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>
+
+ <!-- @ENGLISH {{{
+ <para>In this example, we assume that you already have some sort
+ of project (a collection of files and directories) that you wish
+ 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
+ <xref linkend="svn.branchmerge"/>), your project's tree
+ structure should contain three top-level directories
+ named <filename>branches</filename>,
<filename>tags</filename>, and
- <filename>trunk</filename>:</para>
- @ENGLISH }}} -->
- <para>Deretter, lag et tre av filer og kataloger som skal importeres
- inn i depotet.
- For grunner som vil bli forklart senere (se <xref
- linkend="svn.branchmerge"/>), bør strukturen inneholde tre
- toppkataloger kalt <filename>branches</filename>,
- <filename>tags</filename> og <filename>trunk</filename>:</para>
+ <filename>trunk</filename>. The <filename>trunk</filename>
+ directory should contain all of your data,
+ while <filename>branches</filename>
+ and <filename>tags</filename> directories are empty:</para>
+ @ENGLISH }}} -->
+ <para>I dette eksempelet går vi ut i fra at du allerede har en form
+ for prosjekt (en samling av filer og kataloger) som du vil
+ 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
+ linkend="svn.branchmerge"/>), bør katalogstrukturen til prosjektet
+ inneholde tre kataloger på toppnivå som kalles
+ <filename>branches</filename>, <filename>tags</filename> og
+ <filename>trunk</filename>.
+ <filename>trunk</filename>-katalogen inneholder alle dine data,
+ mens katalogene <filename>branches</filename> og
+ <filename>tags</filename> er tomme:</para>
<!-- @ENGLISH {{{
<screen>
-/tmp/project/branches/
-/tmp/project/tags/
-/tmp/project/trunk/
- foo.c
- bar.c
- Makefile
- …
+/tmp/myproject/branches/
+/tmp/myproject/tags/
+/tmp/myproject/trunk/
+ foo.c
+ bar.c
+ Makefile
+ …
</screen>
@ENGLISH }}} -->
<screen>
-/tmp/project/branches/
-/tmp/project/tags/
-/tmp/project/trunk/
- foo.c
- bar.c
- Makefile
- …
+/tmp/mittprosjekt/branches/
+/tmp/mittprosjekt/tags/
+/tmp/mittprosjekt/trunk/
+ foo.c
+ bar.c
+ Makefile
+ …
</screen>
<!-- @ENGLISH {{{
- <para>Once you have a tree of data ready to go, import the data
- into the repository with the <command>svn import</command>
- command (see <xref linkend="svn.tour.other.import"/>):</para>
+ <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>
@ENGLISH }}} -->
- <para>Når du har klargjort et tre med data, importer dataene inn i
- depotet med kommandoen <command>svn import</command> (se <xref
+ <para>Når du har klargjort treet med data, importer det inn i
+ depotet med kommandoen <command>svn import</command> (se <xref
linkend="svn.tour.other.import"/>):</para>
<!-- @ENGLISH {{{
<screen>
-$ svn import /tmp/project file:///path/to/repos -m "initial import"
-Adding /tmp/project/branches
-Adding /tmp/project/tags
-Adding /tmp/project/trunk
-Adding /tmp/project/trunk/foo.c
-Adding /tmp/project/trunk/bar.c
-Adding /tmp/project/trunk/Makefile
+$ svn import /tmp/myproject file:///path/to/repos/myproject -m "initial import"
+Adding /tmp/myproject/branches
+Adding /tmp/myproject/tags
+Adding /tmp/myproject/trunk
+Adding /tmp/myproject/trunk/foo.c
+Adding /tmp/myproject/trunk/bar.c
+Adding /tmp/myproject/trunk/Makefile
…
Committed revision 1.
$
</screen>
@ENGLISH }}} -->
<screen>
-$ svn import /tmp/project file:///sti/til/depot -m "Grunnleggende import"
-Adding /tmp/project/branches
-Adding /tmp/project/tags
-Adding /tmp/project/trunk
-Adding /tmp/project/trunk/foo.c
-Adding /tmp/project/trunk/bar.c
-Adding /tmp/project/trunk/Makefile
+$ svn import /tmp/mittprosjekt file:///sti/til/depot/mittprosjekt -m "Innledende import"
+Adding /tmp/mittprosjekt/branches
+Adding /tmp/mittprosjekt/tags
+Adding /tmp/mittprosjekt/trunk
+Adding /tmp/mittprosjekt/trunk/foo.c
+Adding /tmp/mittprosjekt/trunk/bar.c
+Adding /tmp/mittprosjekt/trunk/Makefile
…
Committed revision 1.
$
</screen>
<!-- @ENGLISH {{{
- <para>Now the repository contains this tree of data. Note that
- the original <filename>/tmp/project</filename> directory is
- unchanged; Subversion is unaware of it. (In fact, you can even
- delete that directory if you wish.) In order to start
- manipulating repository data, you need to create a new
+ <para>Now the repository contains this tree of data. As mentioned
+ earlier, you won't see your files by directly peeking into the
+ repository; they're all stored within a database. But the
+ repository's imaginary filesystem now contains a top-level
+ directory named <filename>myproject</filename>, which in turn
+ contains your data.</para>
+ @ENGLISH }}} -->
+ <para>Nå inneholder depotet dette treet med data.
+ Som nevnt tidligere, vil du ikke se filene dine ved å se direkte
+ inn i depotet; de er lagret i en database.
+ Men depotets virtuelle filsystem inneholder nå en toppkatalog kalt
+ <filename>mittprosjekt</filename>, som igjen inneholder dine
+ data.</para>
+
+ <!-- @ENGLISH {{{
+ <para>Note that the original <filename>/tmp/myproject</filename>
+ directory is unchanged; Subversion is unaware of it. (In fact,
+ you can even delete that directory if you wish.) In order to
+ start manipulating repository data, you need to create a new
<quote>working copy</quote> of the data, a sort of private
workspace. Ask Subversion to <quote>check out</quote> a working
- copy of the repository's <filename>trunk</filename>
- directory:</para>
+ copy of the <filename>myproject/trunk</filename> directory in
+ the repository:</para>
@ENGLISH }}} -->
- <para>Nå inneholder depotet dette treet med data.
- Legg merke til at den originale
- <filename>/tmp/project</filename>-katalogen er uforandret,
+ <para>Legg merke til at den originale
+ <filename>/tmp/mittprosjekt</filename>-katalogen er uforandret,
Subversion kjenner ikke til den.
(Faktisk kan du til og med slette denne katalogen hvis du ønsker
det.)
@@ -992,35 +1034,36 @@
<quote>arbeidskopi</quote> av dataene, et slags personlig
arbeidsområde.
Be Subversion om å <quote>hente ut</quote> en arbeidskopi fra
- katalogen <filename>trunk</filename> i depotet:</para>
+ katalogen <filename>mittprosjekt/trunk</filename> i
+ depotet:</para>
<!-- @ENGLISH {{{
<screen>
-$ svn checkout file:///path/to/repos/trunk project
-A project/foo.c
-A project/bar.c
-A project/Makefile
+$ svn checkout file:///path/to/repos/myproject/trunk myproject
+A myproject/foo.c
+A myproject/bar.c
+A myproject/Makefile
…
Checked out revision 1.
</screen>
@ENGLISH }}} -->
<screen>
-$ svn checkout file:///sti/til/depot/trunk project
-A project/foo.c
-A project/bar.c
-A project/Makefile
+$ svn checkout file:///sti/til/depot/mittprosjekt/trunk mittprosjekt
+A mittprosjekt/foo.c
+A mittprosjekt/bar.c
+A mittprosjekt/Makefile
…
Checked out revision 1.
</screen>
<!-- @ENGLISH {{{
<para>Now you have a personal copy of part of the repository in a
- new directory named <filename>project</filename>. You can edit
+ new directory named <filename>myproject</filename>. You can edit
the files in your working copy and then commit those changes
back into the repository.</para>
@ENGLISH }}} -->
<para>Nå har du en personlig kopi av en del av depotet i en ny
- katalog kalt <filename>project</filename>.
+ katalog kalt <filename>mittprosjekt</filename>.
Du kan redigere filene i arbeidskopien og deretter legge disse
forandringene inn i depotet.</para>
Modified: trunk/src/nb/book/ch07.xml
==============================================================================
--- trunk/src/nb/book/ch07.xml (original)
+++ trunk/src/nb/book/ch07.xml Wed Jul 13 10:11:50 2005
@@ -2453,7 +2453,7 @@
form:</para>
<screen>
-$ svn <emphasis>command</emphasis> -r <emphasis>OPERATIVE-REV</emphasis> item@<emphasis>PEG-REV</emphasis>
+$ svn <replaceable>command</replaceable> -r <replaceable>OPERATIVE-REV</replaceable> item@<replaceable>PEG-REV</replaceable>
</screen>
<para>...it performs the following algorithm:</para>
@@ -2461,15 +2461,15 @@
<itemizedlist>
<listitem>
- <para>Go to revision <emphasis>PEG-REV</emphasis>, and
- find <emphasis>item</emphasis>. This locates a unique
+ <para>Go to revision <replaceable>PEG-REV</replaceable>, and
+ find <replaceable>item</replaceable>. This locates a unique
object in the repository.</para>
</listitem>
<listitem>
<para>Trace the object's history backwards (through any
possible renames) to its ancestor in
- revision <emphasis>OPERATIVE-REV</emphasis>.</para>
+ revision <replaceable>OPERATIVE-REV</replaceable>.</para>
</listitem>
<listitem>
More information about the svnbook-dev
mailing list