[svnbook commit] r2755 - in trunk/src/nb: . book
sunny256
noreply at red-bean.com
Mon Mar 26 13:03:39 CDT 2007
Author: sunny256
Date: Mon Mar 26 13:03:38 2007
New Revision: 2755
Log:
Sync the Norwegian and English book up to r2571. Merged r2571 from the
ora-2e-reorg branch.
In addition to the changes in r2571:
* src/nb/TRANSLATION-STATUS
Various file renames.
(In progress): The translation percent increased to 32% for
ch-advanced-topics.xml .
* src/nb/LAST_UPDATED
Updated to 2571.
* src/nb/book/ch-basic-concepts.xml
(svn.advanced.reposurls): After being moved here from
ch-advanced-topics.xml it had to be translated.
* src/nb/Makefile
($BOOKFILES, $BDFILES): Renamed ch-introduction.xml to
app-quickstart.xml and added ch-customizing-svn-xml .
Added:
trunk/src/nb/book/app-quickstart.xml
- copied, changed from r2754, /trunk/src/nb/book/ch-introduction.xml
trunk/src/nb/book/ch-customizing-svn.xml
- copied, changed from r2754, /trunk/src/nb/book/ch-advanced-topics.xml
Removed:
trunk/src/nb/book/ch-introduction.xml
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/Makefile
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/book.xml
trunk/src/nb/book/ch-advanced-topics.xml
trunk/src/nb/book/ch-basic-concepts.xml
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Mon Mar 26 13:03:38 2007
@@ -1 +1 @@
-2570
+2571
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Mon Mar 26 13:03:38 2007
@@ -11,19 +11,21 @@
BUILDTMP_DIR = build.tmp
BOOKFILES = app-svn-for-cvs-users.xml app-webdav.xml \
app-third-party-tools.xml book.xml ch-preface.xml \
- ch-introduction.xml ch-basic-concepts.xml ch-guided-tour.xml \
+ app-quickstart.xml ch-basic-concepts.xml \
+ ch-customizing-svn.xml ch-guided-tour.xml \
ch-branching-and-merging.xml ch-repository-admin.xml \
ch-server-configuration.xml ch-advanced-topics.xml \
ch-developer-info.xml ch-reference.xml copyright.xml \
foreword.xml
BDTMP = bd.tmp
-BDFILES = book.xml foreword.xml ch-preface.xml ch-introduction.xml \
+BDFILES = book.xml foreword.xml ch-preface.xml app-quickstart.xml \
ch-basic-concepts.xml ch-guided-tour.xml \
- ch-branching-and-merging.xml app-svn-for-cvs-users.xml \
- ch-repository-admin.xml ch-server-configuration.xml \
- ch-advanced-topics.xml ch-developer-info.xml ch-reference.xml \
- app-webdav.xml app-third-party-tools.xml copyright.xml
+ ch-branching-and-merging.xml ch-customizing-svn.xml \
+ app-svn-for-cvs-users.xml ch-repository-admin.xml \
+ ch-server-configuration.xml ch-advanced-topics.xml \
+ ch-developer-info.xml ch-reference.xml app-webdav.xml \
+ app-third-party-tools.xml copyright.xml
build: dircheck htmlbook copytobuild
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Mon Mar 26 13:03:38 2007
@@ -17,7 +17,7 @@
book/app-svn-for-cvs-users.xml
book/book.xml
book/ch-preface.xml
- book/ch-introduction.xml
+ book/app-quickstart.xml
book/ch-basic-concepts.xml
book/ch-guided-tour.xml
book/ch-branching-and-merging.xml
@@ -35,7 +35,7 @@
2.1.2. In progress
- book/ch-advanced-topics.xml (29%) -- sunny256
+ book/ch-advanced-topics.xml (32%) -- sunny256
2.1.3. Needs update
@@ -45,7 +45,7 @@
book/app-webdav.xml
book/app-third-party-tools.xml
- book/appd.xml
+ book/ch-customizing-svn.xml
book/ch-developer-info.xml
book/ch-reference.xml
book/copyright.xml
@@ -75,7 +75,7 @@
book/foreword.xml
book/ch-preface.xml
- book/ch-introduction.xml
+ book/app-quickstart.xml
book/ch-basic-concepts.xml
book/ch-guided-tour.xml
book/ch-branching-and-merging.xml
@@ -90,7 +90,7 @@
4.2. Finished
- book/ch-introduction.xml
+ book/app-quickstart.xml
book/ch-basic-concepts.xml
book/ch-guided-tour.xml
book/ch-branching-and-merging.xml
Copied: trunk/src/nb/book/app-quickstart.xml (from r2754, /trunk/src/nb/book/ch-introduction.xml)
==============================================================================
--- /trunk/src/nb/book/ch-introduction.xml (original)
+++ trunk/src/nb/book/app-quickstart.xml Mon Mar 26 13:03:38 2007
@@ -1,41 +1,43 @@
-<chapter id="svn.intro">
+<appendix id="svn.intro">
<!-- @ENGLISH {{{
- <title>Introduction</title>
+ <title>Subversion Quick-Start Guide</title>
@ENGLISH }}} -->
- <title>Introduksjon</title>
+ <title>Hurtiginnføring i Subversion</title>
<simplesect>
+
+ <!-- @ENGLISH {{{
+ <para>Some people have trouble absorbing a new technology by
+ reading the sort of <quote>top down</quote> approach provided by
+ this book. This appendix contains a very short introduction to
+ Subversion, and is designed to give <quote>bottom up</quote>
+ learners a fighting chance. If you prefer to learn by
+ experimentation, the following demonstration will get you up and
+ running. Along the way, we give links to the relevant chapters
+ of this book.</para>
+ @ENGLISH }}} -->
+ <para>Noen personer har problemer med å absorbere en ny teknologi
+ ved å lese dokumentasjon lagt ut etter et <quote>ovenfra og
+ ned</quote>-prinsipp som i denne boka.
+ Dette tillegget er en veldig kort introduksjon til Subversion, og
+ er ment å gi personer som lærer <quote>nedenfra og opp</quote> en
+ sjanse.
+ Hvis du foretrekker å lære gjennom eksperimentering, vil den
+ følgende demonstrasjonen få deg i gang.
+ Under gjennomgangen vil vi gi deg lenker til de relevante
+ kapitlene i denne boka.</para>
+
<!-- @ENGLISH {{{
- <para>Version control is the art of managing changes to
- information. It has long been a critical tool for programmers,
- who typically spend their time making small changes to software
- and then undoing those changes the next day. But the usefulness
- of version control software extends far beyond the bounds of the
- software development world. Anywhere you can find people using
- computers to manage information that changes often, there is
- room for version control. And that's where Subversion comes
- into play.</para>
- @ENGLISH }}} -->
- <para>Versjonskontroll er kunsten å behandle forandringer i
- informasjon.
- Det har lenge vært et kritisk verktøy for programmerere, som
- typisk nok bruker tiden sin på å gjøre små forandringer i
- programvare og deretter forandrer det tilbake dagen etterpå.
- Men nyttigheten av versjonskontroll rekker langt forbi grensene
- for programutviklingsverdenen.
- Alle steder du finner folk som bruker datamaskiner til å behandle
- informasjon som forandrer seg ofte, der er det plass for
- versjonskontroll.
- Og det er her Subversion kommer inn i bildet.</para>
-
- <!-- @ENGLISH {{{
- <para>This chapter contains a high-level introduction to
- Subversion—what it is; what it does; how to get it.</para>
- @ENGLISH }}} -->
- <para>Dette kapitlet inneholder en høytsvevende introduksjon til
- Subversion – hva det er, hva det gjør og hvordan få tak i
- det.</para>
+ <para>If you're new to the entire concept of version control or to
+ the <quote>copy-modify-merge</quote> model used by both CVS and
+ Subversion, then you should read <xref linkend="svn.basic"/>
+ before going any further.</para>
+ @ENGLISH }}} -->
+ <para>Hvis du er ny innen hele konseptet med versjonskontroll eller
+ til <quote>kopier-rediger-flett</quote>-modellen brukt av både CVS
+ og Subversion, bør du lese <xref linkend="svn.basic"/> før du går
+ videre.</para>
</simplesect>
@@ -144,52 +146,42 @@
<sect1 id="svn.intro.quickstart">
<!-- @ENGLISH {{{
- <title>A Quick Start</title>
- @ENGLISH }}} -->
- <title>En rask start</title>
-
- <!-- @ENGLISH {{{
- <para>Some people have trouble absorbing a new technology by
- reading the sort of <quote>top down</quote> approach provided by
- this book. This section is a very short introduction to
- Subversion, and is designed to give <quote>bottom up</quote>
- learners a fighting chance. If you prefer to learn by
- experimentation, the following demonstration will get you up and
- running. Along the way, we give links to the relevant chapters
- of this book.</para>
+ <title>High-speed Tutorial</title>
@ENGLISH }}} -->
- <para>Noen personer har problemer med å absorbere en ny teknologi
- ved å lese dokumentasjon lagt ut etter et <quote>ovenfra og
- ned</quote>-prinsipp som i denne boka.
- Denne seksjonen er en veldig kort introduksjon til Subversion, og
- er ment å gi personer som lærer <quote>nedenfra og opp</quote> en
- sjanse.
- Hvis du foretrekker å lære gjennom eksperimentering, vil den
- følgende demonstrasjonen få deg i gang.
- Under gjennomgangen vil vi gi deg lenker til de relevante
- kapitlene i denne boka.</para>
+ <title>Høyhastighetsopplæring</title>
+
+ <blockquote>
+ <!-- @ENGLISH {{{
+ <para><quote>Please make sure your seat backs are in their full,
+ upgright position, and that your tray tables are stored.
+ Flight attendants, prepare for take-off….</quote></para>
+ @ENGLISH }}} -->
+ <para><quote>Vennligst rett opp seteryggen, fest setebeltet og
+ rett opp bordene.
+ Flight attendants, prepare for take-off …</quote></para>
+ </blockquote>
<!-- @ENGLISH {{{
- <para>If you're new to the entire concept of version control or to
- the <quote>copy-modify-merge</quote> model used by both CVS and
- Subversion, then you should read <xref linkend="svn.basic"/>
- before going any further.</para>
- @ENGLISH }}} -->
- <para>Hvis du er ny innen hele konseptet med versjonskontroll eller
- til <quote>kopier-rediger-flett</quote>-modellen brukt av både CVS
- og Subversion, bør du lese <xref linkend="svn.basic"/> før du går
- videre.</para>
+ <para>The following is a very high-level tutorial which will walk
+ you through some basic Subversion configuration and operation.
+ By the time you complete the tutorial, you should have a basic
+ understanding of Subversion's typical usage.</para>
+ @ENGLISH }}} -->
+ <para>Det som kommer nå er en høytflygende innføring som vil ta deg
+ gjennom litt grunnleggende konfigurasjon og bruk av Subversion.
+ Når du har fullført innføringen, vil du ha en grunnleggende
+ forståelse av Subversions typiske bruksmåter.</para>
<note>
<!-- @ENGLISH {{{
- <para>The following example assumes that you have
+ <para>The examples used in this appendix assume that you have
<command>svn</command>, the Subversion command-line client,
and <command>svnadmin</command>, the administrative tool,
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
+ <para>Eksemplene som brukes i dette tillegget forutsetter at du
+ har <command>svn</command>, kommandolinjeklienten, og
<command>svnadmin</command>, det administrative verktøyet, klar
til kjøring.
Det forutsetter også at du bruker Subversion 1.2 eller senere
@@ -489,14 +481,17 @@
forskjellige &server;prosessene tilgjengelig og hvordan du setter
dem opp.</para>
+ <para>### TODO: Let's make this into a full tutorial, rather than
+ simply referring off to other sections. ###</para>
+
</sect1>
-</chapter>
+</appendix>
<!--
local variables:
-sgml-parent-document: ("book.xml" "chapter")
+sgml-parent-document: ("book.xml" "appendix")
end:
vim: set ft=svnbook :
-->
Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml (original)
+++ trunk/src/nb/book/book.xml Mon Mar 26 13:03:38 2007
@@ -6,18 +6,19 @@
%vers;
<!ENTITY foreword SYSTEM "foreword.xml">
<!ENTITY ch00 SYSTEM "ch-preface.xml">
-<!ENTITY ch01 SYSTEM "ch-introduction.xml">
-<!ENTITY ch02 SYSTEM "ch-basic-concepts.xml">
-<!ENTITY ch03 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch01 SYSTEM "ch-basic-concepts.xml">
+<!ENTITY ch02 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch03 SYSTEM "ch-advanced-topics.xml">
<!ENTITY ch04 SYSTEM "ch-branching-and-merging.xml">
<!ENTITY ch05 SYSTEM "ch-repository-admin.xml">
<!ENTITY ch06 SYSTEM "ch-server-configuration.xml">
-<!ENTITY ch07 SYSTEM "ch-advanced-topics.xml">
+<!ENTITY ch07 SYSTEM "ch-customizing-svn.xml">
<!ENTITY ch08 SYSTEM "ch-developer-info.xml">
<!ENTITY ch09 SYSTEM "ch-reference.xml">
-<!ENTITY appa SYSTEM "app-svn-for-cvs-users.xml">
-<!ENTITY appb SYSTEM "app-webdav.xml">
-<!ENTITY appc SYSTEM "app-third-party-tools.xml">
+<!ENTITY appa SYSTEM "app-quickstart.xml">
+<!ENTITY appb SYSTEM "app-svn-for-cvs-users.xml">
+<!ENTITY appc SYSTEM "app-webdav.xml">
+<!ENTITY appd SYSTEM "app-third-party-tools.xml">
<!ENTITY license SYSTEM "copyright.xml">
]>
@ENGLISH }}} -->
@@ -27,18 +28,19 @@
%vers;
<!ENTITY foreword SYSTEM "foreword.xml">
<!ENTITY ch00 SYSTEM "ch-preface.xml">
-<!ENTITY ch01 SYSTEM "ch-introduction.xml">
-<!ENTITY ch02 SYSTEM "ch-basic-concepts.xml">
-<!ENTITY ch03 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch01 SYSTEM "ch-basic-concepts.xml">
+<!ENTITY ch02 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch03 SYSTEM "ch-advanced-topics.xml">
<!ENTITY ch04 SYSTEM "ch-branching-and-merging.xml">
<!ENTITY ch05 SYSTEM "ch-repository-admin.xml">
<!ENTITY ch06 SYSTEM "ch-server-configuration.xml">
-<!ENTITY ch07 SYSTEM "ch-advanced-topics.xml">
+<!ENTITY ch07 SYSTEM "ch-customizing-svn.xml">
<!ENTITY ch08 SYSTEM "ch-developer-info.xml">
<!ENTITY ch09 SYSTEM "ch-reference.xml">
-<!ENTITY appa SYSTEM "app-svn-for-cvs-users.xml">
-<!ENTITY appb SYSTEM "app-webdav.xml">
-<!ENTITY appc SYSTEM "app-third-party-tools.xml">
+<!ENTITY appa SYSTEM "app-quickstart.xml">
+<!ENTITY appb SYSTEM "app-svn-for-cvs-users.xml">
+<!ENTITY appc SYSTEM "app-webdav.xml">
+<!ENTITY appd SYSTEM "app-third-party-tools.xml">
<!ENTITY license SYSTEM "copyright.xml">
<!ENTITY Server "Server">
@@ -169,6 +171,7 @@
&appa;
&appb;
&appc;
+ &appd;
&license;
</book>
Modified: trunk/src/nb/book/ch-advanced-topics.xml
==============================================================================
--- trunk/src/nb/book/ch-advanced-topics.xml (original)
+++ trunk/src/nb/book/ch-advanced-topics.xml Mon Mar 26 13:03:38 2007
@@ -4375,492 +4375,6 @@
</sect2>
</sect1>
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.l10n">
- <title>Localization</title>
-
- <para><firstterm>Localization</firstterm> is the act of making
- programs behave in a region-specific way. When a program
- formats numbers or dates in a way specific to your part of the
- world, or prints messages (or accepts input) in your native
- language, the program is said to
- be <firstterm>localized</firstterm>. This section describes
- steps Subversion has made towards localization.</para>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.l10n.understanding">
- <title>Understanding locales</title>
-
- <para>Most modern operating systems have a notion of the
- <quote>current locale</quote>—that is, the region or
- country whose localization conventions are honored. These
- conventions—typically chosen by some runtime
- configuration mechanism on the computer—affect the way
- in which programs present data to the user, as well as the way
- in which they accept user input.</para>
-
- <para>On Unix-like systems, you can check the values of the
- locale-related runtime configuration options by running the
- <command>locale</command> command:</para>
-
- <screen>
-$ locale
-LANG=
-LC_COLLATE="C"
-LC_CTYPE="C"
-LC_MESSAGES="C"
-LC_MONETARY="C"
-LC_NUMERIC="C"
-LC_TIME="C"
-LC_ALL="C"
-</screen>
-
- <para>The output is a list of locale-related environment
- variables and their current values. In this example, the
- variables are all set to the default <literal>C</literal>
- locale, but users can set these variables to specific
- country/language code combinations. For example, if one were
- to set the <literal>LC_TIME</literal> variable to
- <literal>fr_CA</literal>, then programs would know to present
- time and date information formatted according a
- French-speaking Canadian's expectations. And if one were to
- set the <literal>LC_MESSAGES</literal> variable to
- <literal>zh_TW</literal>, then programs would know to present
- human-readable messages in Traditional Chinese. Setting the
- <literal>LC_ALL</literal> variable has the effect of changing
- every locale variable to the same value. The value of
- <literal>LANG</literal> is used as a default value for any
- locale variable that is unset. To see the list of available
- locales on a Unix system, run the command <command>locale
- -a</command>.</para>
-
- <para>On Windows, locale configuration is done via the
- <quote>Regional and Language Options</quote> control panel
- item. There you can view and select the values of individual
- settings from the available locales, and even customize (at a
- sickening level of detail) several of the display formatting
- conventions.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.l10n.svnuse">
- <title>Subversion's use of locales</title>
-
- <para>The Subversion client, <command>svn</command>, honors the
- current locale configuration in two ways. First, it notices
- the value of the <literal>LC_MESSAGES</literal> variable and
- attempts to print all messages in the specified language. For
- example:</para>
-
- <screen>
-$ export LC_MESSAGES=de_DE
-$ svn help cat
-cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.
-Aufruf: cat ZIEL[@REV]...
-…
-</screen>
-
- <para>This behavior works identically on both Unix and Windows
- systems. Note, though, that while your operating system might
- have support for a certain locale, the Subversion client still
- may not be able to speak the particular language. In order to
- produce localized messages, human volunteers must provide
- translations for each language. The translations are written
- using the GNU gettext package, which results in translation
- modules that end with the <filename>.mo</filename> filename
- extension. For example, the German translation file is named
- <filename>de.mo</filename>. These translation files are
- installed somewhere on your system. On Unix, they typically
- live in <filename>/usr/share/locale/</filename>, while
- on Windows they're often found in the
- <filename>\share\locale\</filename> folder in Subversion's
- installation area. Once installed, a module is named after
- the program it provides translations for. For example, the
- <filename>de.mo</filename> file may ultimately end up
- installed as
- <filename>/usr/share/locale/de/LC_MESSAGES/subversion.mo</filename>.
- By browsing the installed <filename>.mo</filename> files, you
- can see which languages the Subversion client is able to
- speak.</para>
-
- <para>The second way in which the locale is honored involves how
- <command>svn</command> interprets your input. The repository
- stores all paths, filenames, and log messages in Unicode,
- encoded as UTF-8. In that sense, the repository is
- <firstterm>internationalized</firstterm>—that is, the
- repository is ready to accept input in any human language.
- This means, however, that the Subversion client is responsible
- for sending only UTF-8 filenames and log messages into the
- repository. In order to do this, it must convert the data
- from the native locale into UTF-8.</para>
-
- <para>For example, suppose you create a file
- named<filename>caffè.txt</filename>, and then when committing
- the file, you write the log message as <quote>Adesso il caffè
- è più forte</quote>. Both the filename and log message
- contain non-ASCII characters, but because your locale is set
- to <literal>it_IT</literal>, the Subversion client knows to
- interpret them as Italian. It uses an Italian character set
- to convert the data to UTF-8 before sending them off to the
- repository.</para>
-
- <para>Note that while the repository demands UTF-8 filenames and
- log messages, it <emphasis>does not</emphasis> pay attention
- to file contents. Subversion treats file contents as opaque
- strings of bytes, and neither client nor server makes an
- attempt to understand the character set or encoding of the
- contents.</para>
-
- <sidebar>
- <title>Character set conversion errors</title>
-
- <para>While using Subversion, you might get hit with an error
- related to character set conversions:</para>
-
- <screen>
-svn: Can't convert string from native encoding to 'UTF-8':
-…
-svn: Can't convert string from 'UTF-8' to native encoding:
-…
-</screen>
-
- <para>Errors like this typically occur when the Subversion
- client has received a UTF-8 string from the repository, but
- not all of the characters in that string can be represented
- using the encoding of the current locale. For example, if
- your locale is <literal>en_US</literal> but a collaborator
- has committed a Japanese filename, you're likely to see this
- error when you receive the file during an <command>svn
- update</command>.</para>
-
- <para>The solution is either to set your locale to something
- which <emphasis>can</emphasis> represent the incoming UTF-8
- data, or to change the filename or log message in the
- repository. (And don't forget to slap your collaborator's
- hand—projects should decide on common languages ahead of
- time, so that all participants are using the same
- locale.)</para>
- </sidebar>
-
- </sect2>
-
- </sect1>
-
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.externaldifftools">
- <title>Using External Differencing Tools</title>
-
- <para>The presence of <option>--diff-cmd</option> and
- <option>--diff3-cmd</option> options, and similarly named
- runtime configuration parameters (see <xref
- linkend="svn.advanced.confarea.opts.config"/>), can lead to a
- false notion of how easy it is to use external differencing (or
- <quote>diff</quote>) and merge tools with Subversion. While
- Subversion can use most of popular such tools available, the
- effort invested in setting this up often turns out to be
- non-trivial.</para>
-
- <para>The interface between Subversion and external diff and merge
- tools harkens back to a time when Subversion's only contextual
- differencing capabilities were built around invocations of the
- GNU diffutils toolchain, specifically the
- <command>diff</command> and <command>diff3</command> utilities.
- To get the kind of behavior Subversion needed, it called these
- utilities with more than a handful of options and parameters,
- most of which were quite specific to the utilities. Some time
- later, Subversion grew its own internal differencing library,
- and as a failover mechanism,
- <footnote>
- <para>Subversion developers are good, but even the best make
- mistakes.</para>
- </footnote>
- the <option>--diff-cmd</option> and <option>--diff3-cmd</option>
- options were added to the Subversion command-line client so
- users could more easily indicate that they preferred to use the
- GNU diff and diff3 utilities instead of the newfangled internal
- diff library. If those options were used, Subversion would
- simply ignore the internal diff library, and fall back to
- running those external programs, lengthy argument lists and all.
- And that's where things remain today.</para>
-
- <para>It didn't take long for folks to realize that having such
- easy configuration mechanisms for specifying that Subversion
- should use the external GNU diff and diff3 utilities located at
- a particular place on the system could be applied toward the use
- of other diff and merge tools, too. After all, Subversion
- didn't actually verify that the things it was being told to run
- were members of the GNU diffutils toolchain. But the only
- configurable aspect of using those external tools is their
- location on the system—not the option set, parameter
- order, etc. Subversion continues throwing all those GNU utility
- options at your external diff tool regardless of whether or not
- that program can understand those options. And that's where
- things get unintuitive for most users.</para>
-
- <para>The key to using external diff and merge tools (other than
- GNU diff and diff3, of course) with Subversion is to use wrapper
- scripts which convert the input from Subversion into something
- that your differencing tool can understand, and then to convert
- the output of your tool back into a format which Subversion
- expects—the format that the GNU tools would have used.
- The following sections cover the specifics of those
- expectations.</para>
-
- <note>
- <para>The decision on when to fire off a contextual diff or
- merge as part of a larger Subversion operation is made
- entirely by Subversion, and is affected by, among other
- things, whether or not the files being operated on are
- human-readable as determined by their
- <literal>svn:mime-type</literal> property. This means, for
- example, that even if you had the niftiest Microsoft
- Word-aware differencing or merging tool in the Universe, it
- would never be invoked by Subversion so long as your versioned
- Word documents had a configured MIME type that denoted that
- they were not human-readable (such as
- <literal>application/msword</literal>). For more about MIME
- type settings, see <xref
- linkend="svn.advanced.props.special.mime-type"/></para>
- </note>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.externaldifftools.diff">
- <title>External diff</title>
-
- <para>Subversion calls external diff programs with parameters
- suitable for the GNU diff utility, and expects only that the
- external program return with a successful error code. For
- most alternative diff program, only the sixth and seventh
- arguments, the paths of the files which represent the left and
- right sides of the diff, respectively, are of interest. Note
- that Subversion runs the diff program once per modified file
- covered by the Subversion operation, so if your program runs
- in an asynchronous fashion (or <quote>backgrounded</quote>),
- you might have several instances of it all running
- simultaneously. Finally, Subversion expects that your program
- return an errorcode of 1 if your program detected differences,
- or 0 if it did not—any other errorcode is considered a
- fatal error.
- <footnote>
- <para>The GNU diff manual page puts it this way: <quote>An
- exit status of 0 means no differences were found, 1 means some
- differences were found, and 2 means trouble.</quote></para>
- </footnote>
- </para>
-
- <para><xref linkend="svn.advanced.externaldifftools.diff.ex-1"/>
- and <xref linkend="svn.advanced.externaldifftools.diff.ex-2"/>
- are templates for external diff tool wrappers in the Bourne
- shell and Windows batch scripting languages,
- respectively.</para>
-
- <example id="svn.advanced.externaldifftools.diff.ex-1">
- <title>diffwrap.sh</title>
- <programlisting>
-#!/bin/sh
-
-# Configure your favorite diff program here.
-DIFF="/usr/local/bin/my-diff-tool"
-
-# Subversion provides the paths we need as the sixth and seventh
-# parameters.
-LEFT=${6}
-RIGHT=${7}
-
-# Call the diff command (change the following line to make sense for
-# your merge program).
-$DIFF --left $LEFT --right $RIGHT
-
-# Return an errorcode of 0 if no differences were detected, 1 if some were.
-# Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- <example id="svn.advanced.externaldifftools.diff.ex-2">
- <title>diffwrap.bat</title>
- <programlisting>
- at ECHO OFF
-
-REM Configure your favorite diff program here.
-SET DIFF="C:\Program Files\Funky Stuff\My Diff Tool.exe"
-
-REM Subversion provides the paths we need as the sixth and seventh
-REM parameters.
-SET LEFT=%6
-SET RIGHT=%7
-
-REM Call the diff command (change the following line to make sense for
-REM your merge program).
-%DIFF% --left %LEFT% --right %RIGHT%
-
-REM Return an errorcode of 0 if no differences were detected, 1 if some were.
-REM Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.externaldifftools.diff3">
- <title>External diff3</title>
-
- <para>Subversion calls external merge programs with parameters
- suitable for the GNU diff3 utility, expecting that the
- external program return with a successful error code and that
- the full file contents which result from the completed merge
- operation are printed on the standard output stream (so that
- Subversion can redirect them into the appropriate version
- controlled file). For most alternative merge programs, only
- the ninth, tenth, and eleventh arguments, the paths of the
- files which represent the <quote>mine</quote>,
- <quote>older</quote>, and <quote>yours</quote> inputs,
- respectively, are of interest. Note that because Subversion
- depends on the output of your merge program, you wrapper
- script must not exit before that output has been delivered to
- Subversion. When it finally does exit, it should return an
- errorcode of 0 if the merge was successful, or 1 if unresolved
- conflicts remain in the output—any other errorcode is
- considered a fatal error.</para>
-
- <para><xref linkend="svn.advanced.externaldifftools.diff3.ex-1"/>
- and <xref linkend="svn.advanced.externaldifftools.diff3.ex-2"/> are
- templates for external merge tool wrappers in the Bourne shell
- and Windows batch scripting languages, respectively.</para>
-
- <example id="svn.advanced.externaldifftools.diff3.ex-1">
- <title>diff3wrap.sh</title>
- <programlisting>
-#!/bin/sh
-
-# Configure your favorite diff3/merge program here.
-DIFF3="/usr/local/bin/my-merge-tool"
-
-# Subversion provides the paths we need as the ninth, tenth, and eleventh
-# parameters.
-MINE=${9}
-OLDER=${10}
-YOURS=${11}
-
-# Call the merge command (change the following line to make sense for
-# your merge program).
-$DIFF3 --older $OLDER --mine $MINE --yours $YOURS
-
-# After performing the merge, this script needs to print the contents
-# of the merged file to stdout. Do that in whatever way you see fit.
-# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
-# remain in the result. Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- <example id="svn.advanced.externaldifftools.diff3.ex-2">
- <title>diff3wrap.bat</title>
- <programlisting>
- at ECHO OFF
-
-REM Configure your favorite diff3/merge program here.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
-
-REM Subversion provides the paths we need as the ninth, tenth, and eleventh
-REM parameters. But we only have access to nine parameters at a time, so we
-REM shift our nine-parameter window twice to let us get to what we need.
-SHIFT
-SHIFT
-SET MINE=%7
-SET OLDER=%8
-SET YOURS=%9
-
-REM Call the merge command (change the following line to make sense for
-REM your merge program).
-%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%
-
-REM After performing the merge, this script needs to print the contents
-REM of the merged file to stdout. Do that in whatever way you see fit.
-REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
-REM remain in the result. Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- </sect2>
- </sect1>
-
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.reposurls">
- <title>Subversion Repository URLs</title>
-
- <para>As illustrated throughout this book, Subversion uses URLs to
- identify versioned resources in Subversion repositories. For
- the most part, these URLs use the standard syntax, allowing for
- server names and port numbers to be specified as part of the
- URL:</para>
-
- <screen>
-$ svn checkout http://svn.example.com:9834/repos
-…
-</screen>
-
- <para>But there are some nuances in Subversion's handling of URLs
- that are notable. For example, URLs containing the
- <literal>file:</literal> access method (used for local
- repositories) must, in accordance with convention, have either a
- server name of <literal>localhost</literal> or no server name at
- all:</para>
-
- <screen>
-$ svn checkout file:///path/to/repos
-…
-$ svn checkout file://localhost/path/to/repos
-…
-</screen>
-
- <para>Also, users of the <literal>file:</literal> scheme on
- Windows platforms will need to use an unofficially
- <quote>standard</quote> syntax for accessing repositories
- that are on the same machine, but on a different drive than
- the client's current working drive. Either of the two
- following URL path syntaxes will work where
- <literal>X</literal> is the drive on which the repository
- resides:</para>
-
- <screen>
-C:\> svn checkout file:///X:/path/to/repos
-…
-C:\> svn checkout "file:///X|/path/to/repos"
-…
-</screen>
-
- <para>In the second syntax, you need to quote the URL so that the
- vertical bar character is not interpreted as a pipe. Also, note
- that a URL uses ordinary slashes even though the native
- (non-URL) form of a path on Windows uses backslashes.</para>
-
- <para>Finally, it should be noted that the Subversion client will
- automatically encode URLs as necessary, just like a web browser
- does. For example, if a URL contains a space or upper-ASCII
- character:</para>
-
- <screen>
-$ svn checkout "http://host/path with space/project/españa"
-</screen>
-
- <para>…then Subversion will escape the unsafe characters
- and behave as if you had typed:</para>
-
- <screen>
-$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a
-</screen>
-
- <para>If the URL contains spaces, be sure to place it within quote
- marks, so that your shell treats the whole thing as a single
- argument to the <command>svn</command> program.</para>
-
- </sect1>
-
</chapter>
<!--
Modified: trunk/src/nb/book/ch-basic-concepts.xml
==============================================================================
--- trunk/src/nb/book/ch-basic-concepts.xml (original)
+++ trunk/src/nb/book/ch-basic-concepts.xml Mon Mar 26 13:03:38 2007
@@ -599,6 +599,163 @@
Subversion.</para>
<!-- =============================================================== -->
+ <sect2 id="svn.advanced.reposurls">
+ <!-- @ENGLISH {{{
+ <title>Subversion Repository URLs</title>
+ @ENGLISH }}} -->
+ <title>Depot-URLer i Subversion</title>
+
+ <!-- @ENGLISH {{{
+ <para>As illustrated throughout this book, Subversion uses URLs to
+ identify versioned resources in Subversion repositories. For
+ the most part, these URLs use the standard syntax, allowing for
+ server names and port numbers to be specified as part of the
+ URL:</para>
+ @ENGLISH }}} -->
+ <para>Som vist gjennom denne boka, bruker Subversion URLer for å
+ identifisere versjonerte ressurser i Subversion-depoter.
+ For det meste bruker disse URLene standard syntaks, som tillater
+ &server;navn og portnummer å bli spesifisert som en del av
+ URLen:</para>
+
+ <!-- @ENGLISH {{{
+ <screen>
+ $ svn checkout http://svn.example.com:9834/repos
+ …
+ </screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout http://svn.example.com:9834/repos
+…
+</screen>
+
+ <!-- @ENGLISH {{{
+ <para>But there are some nuances in Subversion's handling of URLs
+ that are notable. For example, URLs containing the
+ <literal>file:</literal> access method (used for local
+ repositories) must, in accordance with convention, have either a
+ server name of <literal>localhost</literal> or no server name at
+ all:</para>
+ @ENGLISH }}} -->
+ <para>Men det er noen nyanser i Subversions behandling av URLer
+ som legges merke
+ til.
+ For eksempel, URLer som bruker
+ <literal>file:</literal>-aksesseringsmetoden (brukt for lokale
+ depoter) må, i henhold til konvensjonene, enten ha
+ &server;navnet <literal>localhost</literal> eller ikke noe
+ &server;navn:</para>
+
+ <!-- @ENGLISH {{{
+ <screen>
+ $ svn checkout file:///path/to/repos
+ …
+ $ svn checkout file://localhost/path/to/repos
+ …
+ </screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout file:///sti/til/depot
+…
+$ svn checkout file://localhost/sti/til/depot
+…
+</screen>
+
+ <!-- @ENGLISH {{{
+ <para>Also, users of the <literal>file:</literal> scheme on
+ Windows platforms will need to use an unofficially
+ <quote>standard</quote> syntax for accessing repositories
+ that are on the same machine, but on a different drive than
+ the client's current working drive. Either of the two
+ following URL path syntaxes will work where
+ <literal>X</literal> is the drive on which the repository
+ resides:</para>
+ @ENGLISH }}} -->
+ <para>I tillegg må brukere av <literal>file:</literal>-skjemaet på
+ MS Windows-plattformer bruke en uoffisiell
+ <quote>standard</quote> syntaks for å aksessere depoter smo er
+ på den samme maskinen, men på en annen disk enn klientens
+ nåværende arbeidsdisk.
+ En av de to følgende URL-syntaksene vil virke der
+ <literal>X</literal> er disken hvor depotet ligger:</para>
+
+ <!-- @ENGLISH {{{
+ <screen>
+ C:\> svn checkout file:///X:/path/to/repos
+ …
+ C:\> svn checkout "file:///X|/path/to/repos"
+ …
+ </screen>
+ @ENGLISH }}} -->
+ <screen>
+C:\> svn checkout file:///X:/sti/til/depot
+…
+C:\> svn checkout "file:///X|/sti/til/depot"
+…
+</screen>
+
+ <!-- @ENGLISH {{{
+ <para>In the second syntax, you need to quote the URL so that the
+ vertical bar character is not interpreted as a pipe. Also, note
+ that a URL uses ordinary slashes even though the native
+ (non-URL) form of a path on Windows uses backslashes.</para>
+ @ENGLISH }}} -->
+ <para>I den andre syntaksen må du sette URLen i hermetegn
+ (<literal>""</literal>) så det vertikale stolpetegnet ikke blir
+ tolket som et rør.
+ Legg også merke til at en URL bruker vanlige skråstreker selv om
+ den lokale (ikke-URL) formen i en sti i MS Windows bruker
+ omvendte skråstreker.</para>
+
+ <!-- @ENGLISH {{{
+ <para>Finally, it should be noted that the Subversion client will
+ automatically encode URLs as necessary, just like a web browser
+ does. For example, if a URL contains a space or upper-ASCII
+ character:</para>
+ @ENGLISH }}} -->
+ <para>Til slutt må det legges merke til at Subversionklienten
+ automatisk vil kode URLer etter behov, akkurat som en nettleser
+ gjør det.
+ For eksempel, hvis en URL inneholder et mellomrom eller store
+ bokstaver:</para>
+
+ <!-- @ENGLISH {{{
+ <screen>
+ $ svn checkout "http://host/path with space/project/españa"
+ </screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout "http://&server;/sti med mellomrom/prosjekt/españa"
+</screen>
+
+ <!-- @ENGLISH {{{
+ <para>…then Subversion will escape the unsafe characters
+ and behave as if you had typed:</para>
+ @ENGLISH }}} -->
+ <para>… så vil Subversion beskytte de usikre tegnene og oppføre
+ seg som om du hadde skrevet:</para>
+
+ <!-- @ENGLISH {{{
+ <screen>
+ $ svn checkout http://host/path%20with%20space/project/espa%C3%B1a
+ </screen>
+ @ENGLISH }}} -->
+ <screen>
+$ svn checkout http://&server;/sti%20med%20mellomrom/prosjekt/espa%C3%B1a
+</screen>
+
+ <!-- @ENGLISH {{{
+ <para>If the URL contains spaces, be sure to place it within quote
+ marks, so that your shell treats the whole thing as a single
+ argument to the <command>svn</command> program.</para>
+ @ENGLISH }}} -->
+ <para>Hvis URLen inneholder mellomrom, pass på å plassere den
+ innenfor hermetegn, så skallet behandler hele URLen som et
+ enkelt argument til <command>svn</command>-programmet.</para>
+
+ </sect2>
+
+ <!-- =============================================================== -->
<sect2 id="svn.basic.in-action.wc">
<!-- @ENGLISH {{{
<title>Working Copies</title>
Copied: trunk/src/nb/book/ch-customizing-svn.xml (from r2754, /trunk/src/nb/book/ch-advanced-topics.xml)
==============================================================================
--- /trunk/src/nb/book/ch-advanced-topics.xml (original)
+++ trunk/src/nb/book/ch-customizing-svn.xml Mon Mar 26 13:03:38 2007
@@ -1,4380 +1,12 @@
-<chapter id="svn.advanced">
- <!-- @ENGLISH {{{
- <title>Advanced Topics</title>
- @ENGLISH }}} -->
- <title>Avanserte emner</title>
+<chapter id="svn.customization">
+ <title>Customizing Your Subversion Experience</title>
<simplesect>
- <!-- @ENGLISH {{{
- <para>If you've been reading this book chapter by chapter, from
- start to finish, you should by now have acquired enough
- knowledge to use the Subversion client to perform the most
- common version control operations. You understand how to
- checkout a working copy from a Subversion repository. You are
- comfortable with submitting and receiving changes using the
- <command>svn commit</command> and <command>svn update</command>
- functions. You've probably even developed a reflex which causes
- you to run the <command>svn status</command> command almost
- unconsciously. For all intents and purposes, you are ready to
- use Subversion in a typical environment.</para>
- @ENGLISH }}} -->
- <para>Hvis du har lest denne boka kapittel for kapittel, fra start
- til slutt, skal du nå ha samlet opp nok kunnskap til å kunne bruke
- Subversionklienten til å utføre de vanligste operasjonene innen
- versjonskontroll.
- Du forstår hvordan du henter ut en arbeidskopi fra et
- Subversiondepot.
- Du er komfortabel med å legge inn og hente ut forandringer ved å
- bruke kommandoene <command>svn commit</command> og <command>svn
- update</command>.
- Du har til og med kanskje utviklet en refleks som gjør at du
- kjører <command>svn status</command> nærmest ubevisst.
- Hva oppgaven enn er, er du klar til å bruke Subversion i et typisk
- arbeidsmiljø.</para>
-
- <!-- @ENGLISH {{{
- <para>But the Subversion feature set doesn't stop at <quote>common
- version control operations</quote>.</para>
- @ENGLISH }}} -->
- <para>Men funksjonaliteten til Subversion stopper ikke ved
- <quote>vanlige versjonskontrolloperasjoner</quote>.</para>
-
- <!-- @ENGLISH {{{
- <para>This chapter highlights some of Subversion's features that
- aren't quite so regularly used. In it, we will discuss
- Subversion's property (or <quote>metadata</quote>) support, and
- how to modify Subversion's default behaviors by tweaking its
- run-time configuration area. We will describe how you can use
- externals definitions to instruct Subversion to pull data from
- multiple repositories. We'll cover in detail some of the
- additional client- and server-side tools that are part of the
- Subversion distribution.</para>
- @ENGLISH }}} -->
- <para>Dette kapittelet setter fokus på litt av funksjonaliteten til
- Subversion som ikke blir brukt i like stor grad.
- Her vil vi diskutere Subversions støtte for egenskaper (eller
- <quote>metadata</quote>) og hvordan standardoppførselen til
- Subversion kan forandres ved å gjøre forandringer i
- konfigurasjonsområdet.
- Vi vil beskrive hvordan du kan bruke eksterne defineringer for å
- instruere Subversion til å hente data fra flere depoter.
- Vi vil dekke i detalj noen av de verktøyene som er med i
- Subversiondistribusjonen for bruk på klient- og
- &server;siden.</para>
-
- <!-- @ENGLISH {{{
- <para>Before reading this chapter, you should be familiar with the
- basic file and directory versioning capabilities of Subversion.
- If you haven't already read about those, or if you need a
- refresher, we recommend that you check out <xref
- linkend="svn.basic" /> and <xref linkend="svn.tour" />. Once
- you've mastered the basics and consumed this chapter, you'll be
- a Subversion power-user!
- </para>
- @ENGLISH }}} -->
- <para>Før du leser dette kapittelet bør du gjøre deg kjent med de
- grunnleggende mulighetene Subversion har for versjonering av filer
- og kataloger.
- Hvis du ikke allerede har lest om dette, eller hvis du trenger å
- friske det opp, anbefaler vi at du leser <xref linkend="svn.basic"
- /> og <xref linkend="svn.tour" />.
- Når du mestrer de grunnleggende tingene og har fordøyd dette
- kapittelet, vil du være en <!-- ¤
- -->Subversionmuskelbruker!</para>
+ <para>### TODO ###</para>
</simplesect>
- <sect1 id="svn.advanced.confarea">
- <!-- @ENGLISH {{{
- <title>Runtime Configuration Area</title>
- @ENGLISH }}} -->
- <title><!-- ¤ Må finne en bedre omskriving for «runtime». Nuh!
- -->Konfigurasjonsområdet for bruk under kjøring</title>
-
- <!-- @ENGLISH {{{
- <para>Subversion provides many optional behaviors that can be
- controlled by the user. Many of these options are of the kind
- that a user would wish to apply to all Subversion operations.
- So, rather than forcing users to remember command-line arguments
- for specifying these options, and to use them for each and every
- operation they perform, Subversion uses configuration files,
- segregated into a Subversion configuration area.</para>
- @ENGLISH }}} -->
- <para>Subversion inneholder mange valg for å modifisere oppførselen
- under kjøring, og dette kan kontrolleres av brukeren.
- Mange av disse valgene er av typen som en bruker ønsker å bruke
- ved alle Subversionoperasjoner.
- Så, istedenfor å tvinge brukere til å huske
- kommandolinjeargumenter for å spesifisere disse valgene, og å
- bruke dem for hver eneste operasjon som utføres, bruker Subversion
- konfigurasjonsfiler som er lagt for seg selv i et eget
- konfigurasjonsområde.</para>
-
- <!-- @ENGLISH {{{
- <para>The Subversion <firstterm>configuration area</firstterm> is
- a two-tiered hierarchy of option names and their values.
- Usually, this boils down to a special directory that contains
- <firstterm>configuration files</firstterm> (the first tier),
- which are just text files in standard INI format (with
- <quote>sections</quote> providing the second tier). These files
- can be easily edited using your favorite text editor (such as
- Emacs or vi), and contain directives read by the client to
- determine which of several optional behaviors the user
- prefers.</para>
- @ENGLISH }}} -->
- <para>Subversions <firstterm>konfigurasjonsområde</firstterm> er et
- to-lags hierarki med valgnavn og deres verdier.
- Vanligvis koker dette ned til en spesiell katalog som inneholder
- <firstterm>konfigurasjonsfiler</firstterm> (første lag) som er
- rene tekstfiler i standard INI-format (med
- <quote>seksjoner</quote> som er det andre laget).
- Disse filene kan enkelt redigeres med favoritt-tekstbehandleren
- din (som for eksempel Emacs eller vi), og inneholder direktiver
- som leses av klienten for å anslå hvilken av de valgfrie
- oppførslene brukeren foretrekker.</para>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.layout">
- <!-- @ENGLISH {{{
- <title>Configuration Area Layout</title>
- @ENGLISH }}} -->
- <title>Oppbygningen av konfigurasjonsområdet</title>
-
- <!-- @ENGLISH {{{
- <para>The first time that the <command>svn</command>
- command-line client is executed, it creates a per-user
- configuration area. On Unix-like systems, this area appears
- as a directory named <filename>.subversion</filename> in the
- user's home directory. On Win32 systems, Subversion creates a
- folder named <filename>Subversion</filename>, typically inside
- the <filename>Application Data</filename> area of the user's
- profile directory (which, by the way, is usually a hidden
- directory). However, on this platform the exact location
- differs from system to system, and is dictated by the Windows
- registry.
- <footnote>
- <para>The <literal>APPDATA</literal> environment variable
- points to the <filename>Application Data</filename> area,
- so you can always refer to this folder as
- <filename>%APPDATA%\Subversion</filename>.</para>
- </footnote>
- We will refer to the per-user configuration area using its Unix
- name, <filename>.subversion</filename>.</para>
- @ENGLISH }}} -->
- <para>Den første gangen kommandolinjeklienten
- <command>svn</command> kjøres, lages et eget
- konfigurasjonsområde for brukeren.
- På Unix-lignende systemer opptrer dette området som en katalog
- kalt <filename>.subversion</filename> i brukerens hjemmekatalog.
- På Win32-systemer oppretter Subversion en katalog kalt
- <filename>Subversion</filename>, vanligvis i <!-- ¤ Finn ut hva
- det heter på norsk. --><filename>Application
- Data</filename>-området til brukerens profilkatalog (som
- forresten er en skjult katalog).
- På denne plattformen varierer imidlertid den eksakte
- plasseringen fra system til system, og bestemmes av
- registryen.<footnote>
- <para>Miljøvariabelen <literal>APPDATA</literal> peker til
- <!-- ¤ Mulig fornorsking her når jeg finner ut hva det heter
- på norsk. --><filename>Application Data</filename>-området,
- så du kan alltids henvise til denne katalogen som
- <filename>%APPDATA%\Subversion</filename>.</para>
- </footnote>
- Vi vil referere til brukerkonfigurasjonsområdet ved å bruke
- navnet som brukes under Unix,
- <filename>.subversion</filename>.</para>
-
- <!-- @ENGLISH {{{
- <para>In addition to the per-user configuration area, Subversion
- also recognizes the existence of a system-wide configuration
- area. This gives system administrators the ability to
- establish defaults for all users on a given machine. Note
- that the system-wide configuration area does not alone dictate
- mandatory policy—the settings in the per-user
- configuration area override those in the system-wide one, and
- command-line arguments supplied to the <command>svn</command>
- program have the final word on behavior. On Unix-like
- platforms, the system-wide configuration area is
- expected to be the <filename>/etc/subversion</filename>
- directory; on Windows machines, it looks for a
- <filename>Subversion</filename> directory inside the common
- <filename>Application Data</filename> location (again, as
- specified by the Windows Registry). Unlike the per-user
- case, the <command>svn</command> program does not attempt
- to create the system-wide configuration area.</para>
- @ENGLISH }}} -->
- <para>I tillegg til konfigurasjonsområdet som brukes på
- brukernivå, kjenner også Subversion til eksistensen av et
- konfigurasjonsområde som gjelder for hele systemet på maskinen.
- Dette gir systemadministratorer muligheten til å opprette
- standardinnstillinger for alle brukerne på en gitt maskin.
- Legg merke til at det felles konfigurasjonsområdet på maskinen
- ikke alene bestemmer <!-- ¤ mandatory policy
- -->standardoppførselen – oppsettet i konfigurasjonsområdet for
- brukeren overstyrer de som er i området som er felles for alle
- brukerne, og kommandolinjeargumenter som gis til
- <command>svn</command>-programmet har det siste ordet hva
- oppførsel angår.
- På Unix-lignende plattformer forventes det at
- konfigurasjonsområdet som er felles for alle brukerne er i
- katalogen <filename>/etc/subversion</filename>; på MS
- Windows-maskiner letes det etter en
- <filename>Subversion</filename>-katalog i det felles <!-- ¤ Finn
- ut norsk navn --><filename>Application Data</filename>-området
- (og igjen, som spesifisert i Windowsregistryen).
- Ulikt med det brukerbaserte tilfellet, vil ikke
- <command>svn</command>-klienten prøve å opprette et nytt
- maskinkonfigurasjonsområde.</para>
-
- <!-- @ENGLISH {{{
- <para>The configuration area currently contains three
- files—two configuration files (<filename>config</filename> and
- <filename>servers</filename>), and a <filename>README.txt</filename>
- file which describes the INI format. At the time of their
- creation, the files contain default values for each of the
- supported Subversion options, mostly commented out and grouped
- with textual descriptions about how the values for the key
- affect Subversion's behavior. To change a certain behavior,
- you need only to load the appropriate configuration file into
- a text editor, and modify the desired option's value. If at
- any time you wish to have the default configuration settings
- restored, you can simply remove (or rename) your configuration
- directory and then run some innocuous <command>svn</command>
- command, such as <command>svn -ﳢ-version</command>. A new
- configuration directory with the default contents will be
- created.</para>
- @ENGLISH }}} -->
- <para>Konfigurasjonsområdet inneholder for tiden tre filer – to
- konfigurasjonsfiler (<filename>config</filename> og
- <filename>servers</filename>) og en
- <filename>README.txt</filename>-fil som beskriver INI-formatet.
- På tidspunktet de ble laget, inneholder filene standardverdier
- for alle valgene som Subversion støtter.
- For det meste er de kommentert ut og gruppert sammen med
- beskrivelser om hvordan verdiene påvirker oppførselen til
- Subversion.
- For å forandre en viss oppførsel, trenger du bare å forandre
- verdien til et valg med en vanlig teksteditor.
- Hvis du en eller annen gang du vil ha tilbake
- standardinnstillingene, kan du fjerne (eller skifte navn på)
- katalogen med konfigurasjonsfilene og deretter kjøre noen
- uskyldige <command>svn</command>-kommandoer som for eksempel
- <command>svn --version</command> som oppretter en ny
- konfigurasjonskatalog som inneholder
- standardinnstillingene.</para>
-
- <!-- @ENGLISH {{{
- <para>The per-user configuration area also contains a cache of
- authentication data. The <filename>auth</filename> directory
- holds a set of subdirectories that contain pieces of cached
- information used by Subversion's various supported
- authentication methods. This directory is created in such a
- way that only the user herself has permission to read its
- contents.</para>
- @ENGLISH }}} -->
- <para>Brukerkonfigurasjonsområdet inneholder også et lager med
- autentiseringsdata.
- <filename>auth</filename>-katalogen inneholder et sett med
- underkataloger som inneholder deler av lagret informasjon som
- brukes av Subversions forskjellige autentiseringsmetoder.
- Denne katalogen er laget på en måte som gjør at kun den ene
- brukeren har tillatelse til å lese innholdet.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.windows-registry">
- <!-- @ENGLISH {{{
- <title>Configuration and the Windows Registry</title>
- @ENGLISH }}} -->
- <title>Konfigurasjon og Windows-registryen</title>
-
- <!-- @ENGLISH {{{
- <para>In addition to the usual INI-based configuration area,
- Subversion clients running on Windows platforms may also use
- the Windows registry to hold the configuration data. The
- option names and their values are the same as in the INI
- files. The <quote>file/section</quote> hierarchy is
- preserved as well, though addressed in a slightly different
- fashion—in this schema, files and sections are just
- levels in the registry key tree.</para>
- @ENGLISH }}} -->
- <para>I tillegg til det vanlige INI-baserte konfigurasjonsområdet,
- kan Subversionklienter som kjører på MS Windows-plattformer også
- bruke registryen til å lagre konfigurasjonsdataene.
- Valgnavnene og deres verdier er de samme som i INI-filene.
- <quote>fil/seksjon</quote>-hierarkiet blir også tatt vare på,
- selv om det noteres på en litt annen måte – i dette skjemaet er
- filer og seksjoner kun nivåer i nøkkeltreet i registryen.</para>
-
- <!-- @ENGLISH {{{
- <para>Subversion looks for system-wide configuration values
- under the
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>
- key. For example, the <literal>global-ignores</literal> option,
- which is in the <literal>miscellany</literal> section of the
- <filename>config</filename> file, would be found at
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>.
- Per-user configuration values should be stored under
- <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.
- </para>
- @ENGLISH }}} -->
- <para>Subversion ser etter konfigurasjonsverdier for hele systemet
- under nøkkelen
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>.
- For eksempel, valget <literal>global-ignores</literal> som er i
- <literal>miscellany</literal>-seksjonen i
- <filename>config</filename>-fila finnes i
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>.
- Konfigurasjonsverdier for hver enkelt bruker bør lagres under
- <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.</para>
-
- <!-- @ENGLISH {{{
- <para>Registry-based configuration options are parsed
- <emphasis>before</emphasis> their file-based counterparts,
- so are overridden by values found in the configuration
- files. In other words, configuration priority is granted in
- the following order on a Windows system:</para>
- @ENGLISH }}} -->
- <para><!-- ¤ Den setninga der er uklar, og jeg vet ikke hvordan
- windowsversjonen virker. Så foreløpig får den være uoversatt.
- Stygg sak. -->Registry-based configuration options are parsed
- <emphasis>before</emphasis> their file-based counterparts,
- so are overridden by values found in the configuration
- files.
- Med andre ord er dette rekkefølgen konfigurasjonen blir
- prioritert på et MS Windows-system:</para>
-
- <orderedlist>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Command-line options</para>
- @ENGLISH }}} -->
- <para>Valg på kommandolinja</para>
- </listitem>
- <listitem>
- <!-- @ENGLISH {{{
- <para>The per-user INI files</para>
- @ENGLISH }}} -->
- <para>Brukerbaserte INI-filer</para>
- </listitem>
- <listitem>
- <!-- @ENGLISH {{{
- <para>The per-user Registry values</para>
- @ENGLISH }}} -->
- <para>Brukerbaserte verdier i registryen</para>
- </listitem>
- <listitem>
- <!-- @ENGLISH {{{
- <para>The system-wide INI files</para>
- @ENGLISH }}} -->
- <para>INI-filer som gjelder for hele systemet</para>
- </listitem>
- <listitem>
- <!-- @ENGLISH {{{
- <para>The system-wide Registry values</para>
- @ENGLISH }}} -->
- <para>Registry-verdier for hele systemet</para>
- </listitem>
- </orderedlist>
-
- <!-- @ENGLISH {{{
- <para>Also, the Windows Registry doesn't really support the
- notion of something being <quote>commented out</quote>.
- However, Subversion will ignore any option key whose name
- begins with a hash (<literal>#</literal>) character. This
- allows you to effectively comment out a Subversion option
- without deleting the entire key from the Registry, obviously
- simplifying the process of restoring that option.</para>
- @ENGLISH }}} -->
- <para>I tillegg støtter ikke Windows-registryen at noe kan
- <quote>kommenteres ut</quote>.
- Subversion vil imidlertid ignorere valg der navnet begynner med
- et <!-- ¤ Det heter vel hash på norsk også? -->hash-tegn
- (<literal>#</literal>),
- Dette lar deg kommentere bort et Subversionvalg uten å slette
- hele nøkkelen fra registryen, noe som selvfølgelig gjør det
- lettere å hente tilbake dette valget.</para>
-
- <!-- @ENGLISH {{{
- <para>The <command>svn</command> command-line client never
- attempts to write to the Windows Registry, and will not
- attempt to create a default configuration area there. You can
- create the keys you need using the <command>REGEDIT</command>
- program. Alternatively, you can create a
- <filename>.reg</filename> file, and then double-click on that
- file from the Explorer shell, which will cause the data to be
- merged into your registry.</para>
- @ENGLISH }}} -->
- <para>Kommandolinjeklienten <command>svn</command> vil aldri prøve
- å skrive til Windowsregistryen, og vil ikke prøve å lage et <!--
- ¤ «default» – trengs den? --> område der.
- Du kan lage nøklene du trenger ved å bruke
- <command>REGEDIT</command>-programmet.
- Alternativt kan du lage en <filename>.reg</filename>-fil og
- deretter dobbeltklikke på denne fila i Utforskeren, noe som vil
- flette dataene inn i registryen.</para>
-
- <example id="svn.advanced.confarea.windows-registry.ex-1">
- <!-- @ENGLISH {{{
- <title>Sample Registration Entries (.reg) File.</title>
- @ENGLISH }}} -->
- <title>Eksempel på registryposter i en
- <filename>.reg</filename>-fil.</title>
-
- <programlisting>
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Servers\groups]
-
-[HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Servers\global]
-"#http-proxy-host"=""
-"#http-proxy-port"=""
-"#http-proxy-username"=""
-"#http-proxy-password"=""
-"#http-proxy-exceptions"=""
-"#http-timeout"="0"
-"#http-compression"="yes"
-"#neon-debug-mask"=""
-"#ssl-authority-files"=""
-"#ssl-trust-default-ca"=""
-"#ssl-client-cert-file"=""
-"#ssl-client-cert-password"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auth]
-"#store-auth-creds"="no"
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\helpers]
-"#editor-cmd"="notepad"
-"#diff-cmd"=""
-"#diff3-cmd"=""
-"#diff3-has-program-arg"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\miscellany]
-"#global-ignores"="*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store"
-"#log-encoding"=""
-"#use-commit-times"=""
-"#template-root"=""
-"#enable-auto-props"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\tunnels]
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props]
-</programlisting>
- </example>
-
- <!-- @ENGLISH {{{
- <para>The previous example shows the contents of a
- <filename>.reg</filename> file which contains some of the most
- commonly used configuration options and their default values.
- Note the presence of both system-wide (for network
- proxy-related options) and per-user settings (editor programs
- and password storage, among others). Also note that all the
- options are effectively commented out. You need only to
- remove the hash (<literal>#</literal>) character from the
- beginning of the option names, and set the values as you
- desire.</para>
- @ENGLISH }}} -->
- <para>Det foregående eksemplet viser innholdet av en
- <filename>.reg</filename>-fil som inneholder noen av de mest
- brukte konfigurasjonsvalgene og deres standardverdier.
- Legg merke til <!-- ¤ Blir det litt sånn … formelt?
- -->tilstedeværelsen av både valg som gjelder for hele systemet
- (for valg relatert til mellom&servers; i nettverket og
- innstillinger for hver enkelt bruker (tekstbehandlingsprogrammer
- og lagring av passord, blant annet).
- Legg også merke til at alle valgene er kommentert ut.
- Du trenger bare å fjerne hash-tegnet (<literal>#</literal>) fra
- begynnelsen av valgnavnene og sette inn de verdiene du
- vil.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.opts">
- <!-- @ENGLISH {{{
- <title>Configuration Options</title>
- @ENGLISH }}} -->
- <title>Konfigurasjonsvalg</title>
-
- <!-- @ENGLISH {{{
- <para>In this section, we will discuss the specific
- run-time configuration options that are currently supported
- by Subversion.</para>
- @ENGLISH }}} -->
- <para>I denne seksjonen vil vi diskutere de spesifikke
- konfigurasjonsvalgene som brukes av Subversion under
- kjøring.</para>
-
- <sect3 id="svn.advanced.confarea.opts.servers">
- <!-- @ENGLISH {{{
- <title>Servers</title>
- @ENGLISH }}} -->
- <title>&Servers;</title>
-
- <!-- @ENGLISH {{{
- <para>The <filename>servers</filename> file contains
- Subversion configuration options related to the network
- layers. There are two special section names in this
- file—<literal>groups</literal> and
- <literal>global</literal>. The <literal>groups</literal>
- section is essentially a cross-reference table. The keys in
- this section are the names of other sections in the file;
- their values are <firstterm>globs</firstterm>—textual
- tokens which possibly contain wildcard
- characters—that are compared against the hostnames of
- the machine to which Subversion requests are sent.</para>
- @ENGLISH }}} -->
- <para><filename>servers</filename>-fila inneholder valg for
- konfigurering av Subversion og som er relatert til
- nettverkslag.
- Det er to spesielle seksjonsnavn i denne fila –
- <literal>groups</literal> og <literal>global</literal>.
- <literal>groups</literal>-seksjonen er hovedsaklig en tabell
- med kryssreferanser.
- Nøklene i denne seksjonen er navnene til andre seksjoner i
- fila; verdiene deres er <!-- ¤ Skal vel kanskje ikke
- oversettes + at det brukes en foreignphrase her.
- --><foreignphrase><firstterm>globs</firstterm></foreignphrase>
- – tekstbaserte <!-- ¤ token -->nøkkelord som kan inneholde
- jokertegn — som blir sammenlignet med <!-- ¤ Er det skirveleif
- i den engelske? -->&server;navnene til maskinen som det sendes
- Subversionforespørsler til.</para>
-
- <!-- @ENGLISH {{{
- <programlisting>
-[groups]
-beanie-babies = *.red-bean.com
-collabnet = svn.collab.net
-
-[beanie-babies]
-…
-
-[collabnet]
-…
-</programlisting>
- @ENGLISH }}} -->
- <programlisting>
-[groups]
-beanie-babies = *.red-bean.com
-collabnet = svn.collab.net
-
-[beanie-babies]
-…
-
-[collabnet]
-…
-</programlisting>
-
- <!-- @ENGLISH {{{
- <para>When Subversion is used over a network, it attempts to
- match the name of the server it is trying to reach with a
- group name under the <literal>groups</literal> section. If
- a match is made, Subversion then looks for a section in the
- <filename>servers</filename> file whose name is the matched
- group's name. From that section it reads the actual network
- configuration settings.</para>
- @ENGLISH }}} -->
- <para>Når Subversion brukes over nettverket, forsøker den å
- matche navnet til &the_server; som den prøver å nå med et
- gruppenavn under <literal>groups</literal>-seksjonen.
- Hvis dette stemmer, ser Subversion etter en seksjon i
- <filename>servers</filename>-fila som stemmer med navnet i den
- samsvarende gruppens navn.
- Fra denne seksjonen leser den det faktiske
- nettverksoppsettet.</para>
-
- <!-- @ENGLISH {{{
- <para>The <literal>global</literal> section contains the
- settings that are meant for all of the servers not matched
- by one of the globs under the <literal>groups</literal>
- section. The options available in this section are
- exactly the same as those valid for the other server
- sections in the file (except, of course, the special
- <literal>groups</literal> section), and are as
- follows:</para>
- @ENGLISH }}} -->
- <para><literal>global</literal>-seksjonen inneholder
- innstillingene som er ment for alle &the_servers; som ikke
- samsvarer med en av søkestrengene i
- <literal>groups</literal>-seksjonen.
- Valgene som er tilgjengelig i denne seksjonen er nøyaktig de
- samme som de som er gyldig for de andre &server;seksjonene i
- fila (selvfølgelig unntatt den spesielle
- <literal>groups</literal>-seksjonen), og er som følger:</para>
-
- <variablelist>
- <varlistentry>
- <term><literal>http-proxy-host</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the hostname of the proxy computer
- through which your HTTP-based Subversion requests must
- pass. It defaults to an empty value, which means that
- Subversion will not attempt to route HTTP requests
- through a proxy computer, and will instead attempt to
- contact the destination machine directly.</para>
- @ENGLISH }}} -->
- <para>Dette spesifiserer &server;navnet til
- mellom&the_server; som de HTTP-baserte
- Subversionforespørslene som du foretar må gå gjennom.
- Standardverdien er en tom verdi, noe som betyr at
- Subversion ikke vil prøve å rute HTTP-forespørsler
- gjennom en mellom&server; og vil istedenfor prøve å
- kontakte målmaskinen direkte.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-port</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the port number on the proxy host
- to use. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Dette spesifiserer hvilket portnummer som skal
- brukes på mellom&the_server;.
- Standardverdien er en tom verdi.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-username</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the username to supply to the proxy
- machine. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Spesifiserer brukernavnet som oppgis til
- mellom&the_server;.
- Standardverdien er tom.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-password</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the password to supply to the proxy
- machine. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Spesifiserer passordet som oppgis til
- mellom&the_server;.
- Standardverdien er tom.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-timeout</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the amount of time, in seconds, to
- wait for a server response. If you experience
- problems with a slow network connection causing
- Subversion operations to timeout, you should increase
- the value of this option. The default value is
- <literal>0</literal>, which instructs the underlying
- HTTP library, Neon, to use its default timeout
- setting.</para>
- @ENGLISH }}} -->
- <para>Dette spesifiserer antall sekunder det ventes på
- respons fra &the_server;.
- Hvis du opplever problemer med en sen
- nettvorksforbindelse som fører til at
- Subversionoperasjoner blir avbrutt, bør du øke verdien
- for dette valget.
- Standardverdien er <literal>0</literal>, som ber det
- underliggende HTTP-biblioteket, Neon, til å bruke
- standardverdien for tidsavbrudd.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-compression</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies whether or not Subversion should
- attempt to compress network requests made to DAV-ready
- servers. The default value is <literal>yes</literal>
- (though compression will only occur if that capability
- is compiled into the network layer). Set this to
- <literal>no</literal> to disable compression, such as
- when debugging network transmissions.</para>
- @ENGLISH }}} -->
- <para>Dette spesifiserer om Subversion skal prøve å
- komprimere nettverksforespørsler som blir gjort til
- &servers; som er klargjort for DAV.
- Srandardverdien er <literal>yes</literal> (selv om
- komprimering bare vil utføres hvis denne muligheten er
- kompilert inn i nettverkslaget).
- Sett denne til <literal>no</literal> for å unngå
- komprimering, for eksempel når nettverkstrafikken skal
- analyseres under debugging.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>neon-debug-mask</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This is an integer mask that the underlying HTTP
- library, Neon, uses for choosing what type of
- debugging output to yield. The default value is
- <literal>0</literal>, which will silence all debugging
- output. For more information about how Subversion
- makes use of Neon, see <xref linkend="svn.developer" />.</para>
- @ENGLISH }}} -->
- <para>Dette er en heltallsmaske som det underliggende
- HTTP-biblioteket, Neon, bruker for å velge hvilke
- debuggingsmeldinger som skal vises.
- Standardverdien er <literal>0</literal>, som vil
- forhindre visning av alle debuggingsdata.
- For mer informasjon om hvordan Subversion gjør bruk av
- Neon, se <xref linkend="svn.developer" />.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>ssl-authority-files</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This is a semicolon-delimited list of paths to files
- containing certificates of the certificate authorities
- (or CAs) that
- are accepted by the Subversion client when accessing the
- repository over HTTPS.</para>
- @ENGLISH }}} -->
- <para>Dette er en semikolon-separert liste over stier til
- filer som inneholder sertifikater fra
- sertifikatutstedere som aksepteres av Subversionklienten
- under aksessering av depotet over HTTPS.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>ssl-trust-default-ca</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Set this variable to <literal>yes</literal> if you
- want Subversion to automatically trust the set of
- default CAs that ship with OpenSSL.</para>
- @ENGLISH }}} -->
- <para>Sett denne variabelen til <literal>yes</literal>
- hvis du vil at Subversion skal automatisk stole på
- settet med standard sertifikatutstedere som leveres med
- OpenSSL.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>ssl-client-cert-file</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>If a host (or set of hosts) requires an SSL client
- certificate, you'll normally be prompted for a path to
- your certificate. By setting this variable to that
- same path, Subversion will be able to find your client
- certificate automatically without prompting you.
- There's no standard place to store your certificate on
- disk; Subversion will grab it from any path you
- specify.</para>
- @ENGLISH }}} -->
- <para>Hvis en &server; (eller et sett av &servers;) krever
- et SSL-klientsertifikat, vil du normalt bli spurt etter
- en sti til sertifikatet ditt.
- Ved å sette denne variabelen til den samme stien, vil
- Subversion være i stand til å finne klientsertifikatet
- automatisk uten å spørre.
- Det finnes ingen standard plass der sertifikatene blir
- lagret på disken; Subversion vil hente det fra enhver
- sti som du spesifiserer.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>ssl-client-cert-password</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>If your SSL client certificate file is encrypted
- by a passphrase, Subversion will prompt you for the
- passphrase whenever the certificate is used. If you
- find this annoying (and don't mind storing the
- password in the <filename>servers</filename> file),
- then you can set this variable to the certificate's
- passphrase. You won't be prompted anymore.</para>
- @ENGLISH }}} -->
- <para>Hvis fila med SSL-klientsertifikatet er krypter med
- et passord, vil Subversion be deg om passordet hver gang
- sertifikatet brukes.
- Hvis du synes dette er irriterende (og synes det er
- greit at passordet lagres i
- <filename>servers</filename>-fila), kan du sette denne
- variabelen til passordet for for sertifikatet.
- Etter dette blir du ikke bedt om å skrive det flere
- ganger.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </sect3>
- <sect3 id="svn.advanced.confarea.opts.config">
- <!-- @ENGLISH {{{
- <title>Config</title>
- @ENGLISH }}} -->
- <title>Konfigurasjon</title>
-
- <!-- @ENGLISH {{{
- <para>The <filename>config</filename> file contains the rest
- of the currently available Subversion run-time options,
- those not related to networking. There are only a few
- options in use at this time, but they are again grouped into
- sections in expectation of future additions.</para>
- @ENGLISH }}} -->
- <para><filename>config</filename>-fila inneholder resten av de
- kjørevalgene som for øyeblikket er tilgjengelig i Subversion
- og ikke er relatert til nettverk.
- Det er bare noen få valg som er i bruk nå, men de er gruppert
- i seksjoner med tanke på framtidige utvidelser.</para>
-
- <!-- @ENGLISH {{{
- <para>The <literal>auth</literal> section contains settings
- related to Subversion's authentication and authorization
- against the repository. It contains:</para>
- @ENGLISH }}} -->
- <para><literal>auth</literal>-seksjonen inneholder innstillinger
- relatert til Subversions autentisering og autorisasjon i
- depotet.
- Den inneholder:</para>
-
- <variablelist>
- <varlistentry>
- <term><literal>store-passwords</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This instructs Subversion to cache, or not to
- cache, passwords that are supplied by the user in
- response to server authentication challenges. The
- default value is <literal>yes</literal>. Set this to
- <literal>no</literal> to disable this on-disk password
- caching. You can override this option for a single
- instance of the <command>svn</command> command using
- the <option>-ﳢ-no-auth-cache</option> command-line
- parameter (for those subcommands that support it).
- For more information, see <xref
- linkend="svn.serverconfig.netmodel.credcache"/>.</para>
- @ENGLISH }}} -->
- <para>Dette ber Subversion om å lagre, eller ikke lagre,
- passord som blir skrevet av brukeren som respons til
- autentiseringskrav fra &servers;.
- Standardverdien er <literal>yes</literal>.
- Sett dette til <literal>no</literal> for å forhindre
- lagring av passord på disken.
- Du kan overstyre dette valget for en enkeltstående
- <command>svn</command>-kjøring ved å bruke
- kommanolinjevalget <option>--no-auth-cache</option>
- sammen med de delkommandoene som støtter det.
- For mer informasjon, se <xref
- linkend="svn.serverconfig.netmodel.credcache"/>.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>store-auth-creds</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This setting is the same as
- <literal>store-passwords</literal>, except that it
- enables or disables disk-caching of
- <emphasis>all</emphasis> authentication information:
- usernames, passwords, server certificates, and any
- other types of cacheable credentials.</para>
- @ENGLISH }}} -->
- <para>Denne valget er det samme som
- <literal>store-passwords</literal>, unntatt at det slår
- av/på disklagring av <emphasis>all</emphasis>
- autentiseringsinformasjon:
- Brukernavn, passord, &server;sertifikater og alle andre
- typer <!-- ¤ -->lagringsbar legitimasjon.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <!-- @ENGLISH {{{
- <para>The <literal>helpers</literal> section controls which
- external applications Subversion uses to accomplish its
- tasks. Valid options in this section are:</para>
- @ENGLISH }}} -->
- <para><literal>helpers</literal>-seksjonen kontrollerer hvilke
- eksterne programmer Subversion bruker for å utføre oppgavene
- sine.
- Gyldige valig i denne seksjonen er:</para>
-
- <variablelist>
- <varlistentry>
- <term><literal>editor-cmd</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the program Subversion will use to
- query the user for a log message during a commit
- operation, such as when using <command>svn
- commit</command> without either the
- <option>-ﳢ-message</option> (<option>-m</option>) or
- <option>-ﳢ-file</option> (<option>-F</option>) options.
- This program is also used with the <command>svn
- propedit</command> command—a temporary file is
- populated with the current value of the property the
- 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. 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
- en innleggingsoperasjon, som for eksempel ved bruk av
- <command>svn commit</command> uten valgene
- <option>--message</option> (<option>-m</option>) og
- <option>--file</option> (<option>-F</option>).
- Dette programmet brukes også sammen med kommandoen
- <command>svn propedit</command> – en midlertidig fil
- blir fylt med den nåværende verdien til egenskapen
- brukeren vil redigere, og redigeringen skjer i
- tekstbehandleren (se <xref linkend="svn.advanced.props"
- />).
- Standardverdien til dette valget er tom.
- 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 som skal redigeres.
- Denne midlertidige fila redigeres med tekstbehandleren
- som returnerer en avslutningskode med verdien 0 for å
- indikere at operasjonen var vellykket.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>diff-cmd</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the absolute path of a differencing
- program, used when Subversion generates
- <quote>diff</quote> output (such as when using the
- <command>svn diff</command> command). By default
- Subversion uses an internal differencing
- library—setting this option will cause it to
- perform this task using an external program. See
- <xref linkend="svn.advanced.externaldifftools"/> for
- more details on using such programs.</para>
- @ENGLISH }}} -->
- <para>Dette spesifiserer den absolutte stien til et
- diff-program (viser forskjeller mellom filer) som blir
- brukt når Subversion lager <quote>diff</quote>-data (som
- når <command>svn diff</command>-kommandoen brukes).
- Vanligvis bruker Subversion et internt diff-bibliotek,
- men ved å sette dette valget brukes et eksternt program.
- Se <xref linkend="svn.advanced.externaldifftools"/> for
- flere detaljer om bruk av sånne programmer.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>diff3-cmd</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the absolute path of a three-way
- differencing program. Subversion uses this program to
- merge changes made by the user with those received
- from the repository. By default Subversion uses an
- internal differencing library—setting this
- option will cause it to perform this task using an
- external program. See <xref
- linkend="svn.advanced.externaldifftools"/> for more
- details on using such programs.</para>
- @ENGLISH }}} -->
- <para>Her spesifiseres den absolutte stien til et treveis
- diff-program.
- Subversion bruker dette programmet til å flette
- forandringer gjort av brukeren sammen med de som mottas
- fra depotet.
- Vanligvis bruker Subversion et internt diff-bibliotek,
- men ved å sette dette valget brukes et eksternt program.
- Se <xref linkend="svn.advanced.externaldifftools"/> for
- flere detaljer om bruk av sånne programmer.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>diff3-has-program-arg</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This flag should be set to <literal>true</literal>
- if the program specified by the
- <literal>diff3-cmd</literal> option accepts a
- <option>-ﳢ-diff-program</option> command-line
- parameter.</para>
- @ENGLISH }}} -->
- <para>Dette flagget bør settes til <literal>true</literal>
- hvis programmet spesifisert i
- <literal>diff3-cmd</literal>-valget aksepterer et
- <option>--diff-program</option>-parameter på
- kommandolinja.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <!-- @ENGLISH {{{
- <para>The <literal>tunnels</literal> section allows you to
- define new tunnel schemes for use with
- <command>svnserve</command> and <literal>svn://</literal>
- client connections. For more details, see <xref
- linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
- @ENGLISH }}} -->
- <para><literal>tunnels</literal>-seksjonen lar deg definere nye
- tunnelskjemaer for bruk sammen med <command>svnserve</command>
- og klienttilkoblinger med <literal>svn://</literal>.
- For flere detaljer, se <xref
- linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
-
- <!-- @ENGLISH {{{
- <para>The <literal>miscellany</literal> section is where
- everything that doesn't belong elsewhere winds up.
- <footnote>
- <para>Anyone for potluck dinner?</para>
- </footnote>
- In this section, you can find:</para>
- @ENGLISH }}} -->
- <para><literal>miscellany</literal>-seksjonen er der alt som
- ikke hører hjemme andre steder ender opp.<!-- ¤ --><!--
- <footnote>
- <para></para>
- </footnote> -->
- I denne seksjonen finner du:</para>
-
- <variablelist>
- <varlistentry>
- <term><literal>global-ignores</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>When running the <command>svn status</command>
- command, Subversion lists unversioned files and
- directories along with the versioned ones, annotating
- them with a <literal>?</literal> character (see <xref
- linkend="svn.tour.cycle.examine.status" />). Sometimes, it can
- be annoying to see uninteresting, unversioned
- items—for example, object files that result from
- a program's compilation—in this display. The
- <literal>global-ignores</literal> option is a list of
- whitespace-delimited globs which describe the names of
- files and directories that Subversion should not
- display unless they are versioned. The default value
- is <literal>*.o *.lo *.la #*# .*.rej *.rej .*~ *~
- .#* .DS_Store</literal>.</para>
- @ENGLISH }}} -->
- <para>Ved kjøring av <command>svn
- status</command>-kommandoen lister Subversion
- uversjonerte filer og kataloger sammen med de
- versjonerte og merker dem med et
- <literal>?</literal>-tegn (se <xref
- linkend="svn.tour.cycle.examine.status" />).
- Noen ganger kan det være plagsomt å se uinteressante,
- uversjonerte elementer – for eksempel objektfiler som
- ligger igjen etter at et program er kompilert – i denne
- visningen.
- Valget <literal>global-ignores</literal> er en liste med
- blanktegn-separerte <!-- ¤ globs --> strenger som
- beskriver navn på filer og kataloger som Subversion ikke
- skal vise unntatt hvis de er versjonert.
- Standardverdien er <literal>*.o *.lo *.la #*# .*.rej
- *.rej .*~ *~ .#* .DS_Store</literal>.</para>
-
- <!-- @ENGLISH {{{
- <para>As well as <command>svn status</command>, the
- <command>svn add</command> and <command>svn import</command>
- commands also ignore files that match the list
- when they are scanning a directory. You can override this
- behaviour for a single instance of any of these commands
- by explicitly specifying the file name, or by using
- the <option>-ﳢ-no-ignore</option> command-line flag.</para>
- @ENGLISH }}} -->
- <para>I likhet med <command>svn status</command> ignorerer
- <command>svn add</command>- og <command>svn
- import</command>-kommandoen filer som samsvarer med
- listen når de tråler en katalog.
- Du kan overstyre denne oppførselen for en enkelt kjøring
- av alle disse kommandoene ved å spesifisere filnavnet
- eller ved å bruke kommandolinjevalget
- <option>--no-ignore</option>.</para>
-
- <!-- @ENGLISH {{{
- <para>For information on more fine-grained control of
- ignored items, see <xref linkend="svn.advanced.props.special.ignore"
- />.</para>
- @ENGLISH }}} -->
- <para>For informasjon om mer finkontroll av ignorerte
- elementer, se <xref
- linkend="svn.advanced.props.special.ignore" />.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>enable-auto-props</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This instructs Subversion to automatically set
- properties on newly added or imported files. The
- default value is <literal>no</literal>, so set this to
- <literal>yes</literal> to enable Auto-props.
- The <literal>auto-props</literal> section of this file
- specifies which properties are to be set on which files.</para>
- @ENGLISH }}} -->
- <para>Dette ber Subversion om å automatisk sette
- egenskaper på nye filer som legges til eller importeres.
- Standardverdien er <literal>no</literal>, så sett denne
- til <literal>yes</literal> for å slå på autoegenskaper.
- Seksjonen <literal>auto-props</literal> i denne fila
- spesifiserer hvilke egenskaper som skal settes på hvilke
- filer.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>log-encoding</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This variable sets the default character set
- encoding for commit log messages. It's a permanent
- form of the <option>-ﳢ-encoding</option> option (see
- <xref linkend="svn.ref.svn.sw"/>). The Subversion
- repository stores log messages in UTF-8, and assumes
- that your log message is written using your operating
- system's native locale. You should specify a
- different encoding if your commit messages are written
- in any other encoding.</para>
- @ENGLISH }}} -->
- <para>Denne variabelen setter standardtegnsettet for
- loggmeldinger ved innlegging.
- Det er en permanent form av
- <option>--encoding</option>-valget (se <xref
- linkend="svn.ref.svn.sw"/>).
- Subversiondepotet lagrer loggmeldinger i UTF-8, og går
- ut i fra at loggmeldingene dine er skrevet med
- operativsystemets lokale tegnsett.
- Du bør spesifisere en annen koding hvis loggmeldingene
- dine skrives med et annet tegnsett.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>use-commit-times</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>Normally your working copy files have timestamps
- that reflect the last time they were touched by any
- process, whether that be your own editor or by some
- <command>svn</command> subcommand. This is generally
- convenient for people developing software, because
- build systems often look at timestamps as a way of
- deciding which files need to be recompiled.</para>
- @ENGLISH }}} -->
- <para>Normalt har filene i arbeidskopien din fildatoer som
- viser forrige gang de ble rørt av en prosess, enten det
- er tekstbehandleren din eller av en eller annen
- delkommando i <command>svn</command>.
- Det er vanligvis praktisk for folk som utvikler
- programvare, fordi byggesystemer ofte ser på fildatoer
- som en måte å bestemme hvilke filer som trenger en ny
- kompilering.</para>
-
- <!-- @ENGLISH {{{
- <para>In other situations, however, it's sometimes nice
- for the working copy files to have timestamps that
- reflect the last time they were changed in the
- repository. The <command>svn export</command> command
- always places these <quote>last-commit
- timestamps</quote> on trees that it produces. By
- setting this config variable to
- <literal>yes</literal>, the <command>svn
- checkout</command>, <command>svn update</command>,
- <command>svn switch</command>, and <command>svn
- revert</command> commands will also set last-commit
- timestamps on files that they touch.</para>
- @ENGLISH }}} -->
- <para>I andre situasjoner, derimot, er det greit å la
- filene i arbeidskopien ha fildatoen satt til tidspunktet
- de sist ble forandret i depotet.
- Kommandoen <command>svn export</command> setter alltid
- disse <quote>tidspunktene for siste innlegging</quote>
- på trær som den produserer.
- Ved å sette denne konfigurasjonsvariabelen til
- <literal>yes</literal>, vil kommandoene <command>svn
- checkout</command>, <command>svn update</command>,
- <command>svn switch</command> og <command>svn
- revert</command> også sette fildatoen på filer som
- berøres til forrige gangen de ble lagt inn i
- depotet.</para>
- </listitem>
- </varlistentry>
-
- <!-- ###TODO add description of other options shown in example
- registry file, e.g., template-root -->
- </variablelist>
-
- <!-- @ENGLISH {{{
- <para>The <literal>auto-props</literal> section controls
- the Subversion client's ability to automatically set
- properties on files when they are added or imported.
- It contains any number of key-value pairs in the
- format <literal>PATTERN = PROPNAME=PROPVALUE</literal>
- where <literal>PATTERN</literal> is a file pattern
- that matches a set of filenames and the rest of the
- line is the property and its value. Multiple matches
- on a file will result in multiple propsets for that
- file; however, there is no guarantee that auto-props
- will be applied in the order in which they are listed
- in the config file, so you can't have one rule
- <quote>override</quote> another. You can find several
- examples of auto-props usage in the
- <filename>config</filename> file. Lastly, don't
- forget to set <literal>enable-auto-props</literal> to
- <literal>yes</literal> in the <literal>miscellany</literal>
- section if you want to enable auto-props.</para>
- @ENGLISH }}} -->
- <para>Seksjonen <literal>auto-props</literal> kontrollerer
- Subversionklientens mulighet til å automatisk sette egenskaper
- på filer når de legges til eller importeres.
- Den inneholder et vilkårlig antall nøkkel/verdi-par på
- formatet <literal>MØNSTER =
- EGENSKAPSNAVN=EGENSKAPSVERDI</literal> der
- <literal>MØNSTER</literal> er en filnavnsøkestreng som passer
- med et sett av filnavn og resten av linja er egenskapen og
- dens verdi.
- Flere samsvar på en fil vil resultere i flere
- egenskapsforandringer for denne fila; imidlertid er det ingen
- garanti at autoegenskaper vil bli lagt til i den rekkefølgen
- som de listes i konfigurasjonsfila.
- Du kan derfor ikke la en regel <quote>overstyre</quote> en
- annen.
- Du kan finne flere eksempler på bruk av autoegenskaper i
- <filename>config</filename>-fila.
- Til sist, ikke glem å sette
- <literal>enable-auto-props</literal> til
- <literal>yes</literal> i
- <literal>miscellany</literal>-seksjonen hvis du vil at
- autoegenskaper skal brukes.</para>
-
- </sect3>
-
- </sect2>
- </sect1>
-
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.props">
- <!-- @ENGLISH {{{
- <title>Properties</title>
- @ENGLISH }}} -->
- <title>Egenskaper</title>
-
- <!-- @ENGLISH {{{
- <para>We've already covered in detail how Subversion stores and
- retrieves various versions of files and directories in its
- repository. Whole chapters have been devoted to this most
- fundamental piece of functionality provided by the tool. And
- if the versioning support stopped there, Subversion would still
- be complete from a version control perspective. But it
- doesn't stop there.</para>
- @ENGLISH }}} -->
- <para>Vi har allerede dekket i detalj hvordan Subversion lagrer og
- henter diverse versjoner av filer og kataloger i depotet.
- Hele kapitler er viet til disse mest fundamentale delene av
- funksjonalitet som verktøyet har.
- Og hvis versjoneringsmulighetene stoppet der, ville Subversion
- fortsatt være komplett sett fra et versjonskontrollsynspunkt.
- Men det stopper ikke der.</para>
-
- <!-- @ENGLISH {{{
- <para>In addition to versioning your directories and files,
- Subversion provides interfaces for adding, modifying, and
- removing versioned metadata on each of your versioned
- directories and files. We refer to this metadata as
- <firstterm>properties</firstterm>, and they can be thought of as
- two-column tables that map property names to arbitrary values
- attached to each item in your working copy. Generally speaking,
- the names and values of the properties can be whatever you want
- them to be, with the constraint that the names must be
- human-readable text. And the best part about these properties
- is that they, too, are versioned, just like the textual contents
- of your files. You can modify, commit, and revert property
- changes as easily as committing textual changes. And you
- receive other people's property changes as you update your
- working copy.</para>
- @ENGLISH }}} -->
- <para>I tillegg til å versjonere kataloger og filer, har Subversion
- grensesnitt for å legge til, forandre og fjerne versjonerte
- metadata på alle versjonerte kataloger og filer.
- Vi refererer til disse metadataene som
- <firstterm>egenskaper</firstterm> (engelsk:
- <foreignphrase>propertie