[svnbook commit] r3202 - in trunk/src/nb: . book
sunny256
noreply at red-bean.com
Thu Jul 17 01:07:28 CDT 2008
Author: sunny256
Date: Thu Jul 17 01:07:28 2008
New Revision: 3202
Log:
Sync the Norwegian and English book: "make sync HEAD=2652".
* src/nb/book/ch-server-configuration.xml
* src/nb/LAST_SYNC
* src/nb/TRANSLATION-STATUS
Merged and resolved r2652.
Modified:
trunk/src/nb/LAST_SYNC
trunk/src/nb/TRANSLATION-STATUS
trunk/src/nb/book/ch-server-configuration.xml
Modified: trunk/src/nb/LAST_SYNC
==============================================================================
--- trunk/src/nb/LAST_SYNC (original)
+++ trunk/src/nb/LAST_SYNC Thu Jul 17 01:07:28 2008
@@ -1 +1 @@
-2631
+2652
Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS (original)
+++ trunk/src/nb/TRANSLATION-STATUS Thu Jul 17 01:07:28 2008
@@ -26,8 +26,8 @@
* book/ch-repository-admin.xml
Untranslated: 2.84% - 131 lines in 9 blocks
* book/ch-server-configuration.xml
- Untranslated: 23.46% - 745 lines in 17 blocks
- Need proofreading: 66.49% - 2004 lines in 6 blocks
+ Untranslated: 23.52% - 745 lines in 17 blocks
+ Need proofreading: 66.45% - 2004 lines in 6 blocks
* book/ch-customizing-svn.xml
Untranslated: 35.66% - 412 lines in 2 blocks
Need proofreading: 63.98% - 711 lines in 1 block
@@ -49,4 +49,4 @@
* book/index.xml
Translation complete
-Summa summarum: 56.08% translated, 16.40% need proofreading
+Summa summarum: 56.06% translated, 16.38% need proofreading
Modified: trunk/src/nb/book/ch-server-configuration.xml
==============================================================================
--- trunk/src/nb/book/ch-server-configuration.xml (original)
+++ trunk/src/nb/book/ch-server-configuration.xml Thu Jul 17 01:07:28 2008
@@ -3,7 +3,7 @@
<title>Server Configuration</title>
@ENGLISH }}} -->
<title>&Server;konfigurasjon</title>
-
+
<!-- @ENGLISH {{{
<para>A Subversion repository can be accessed simultaneously by
clients running on the same machine on which the repository
@@ -18,7 +18,7 @@
Men det typiske Subversionoppsettet involverer en enkelt
&server;maskin som blir aksessert fra klienter på maskiner over hele
kontoret – eller kanskje over hele verden.</para>
-
+
<!-- @ENGLISH {{{
<para>This section describes how to get your Subversion repository
exposed outside its host machine for use by remote clients. We
@@ -36,18 +36,18 @@
Etter å ha lest denne seksjonen vil du være i stand til å avgjøre
hvilket nettverksoppsett som er det riktige for dine behov, og
forstå hvordan du skal sette dette opp på &server;maskinen.</para>
-
-
+
+
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.serverconfig.overview">
-
+
<!-- @ENGLISH {{{
<title>Overview</title>
@ENGLISH }}} -->
<title>Oversikt</title>
-
+
<!-- @ENGLISH {{{
<para>Subversion was designed with an abstract network layer.
This means that a repository can be programmatically accessed by
@@ -66,7 +66,7 @@
nettverksimplementasjoner.
I praksis er det for tiden bare to &server;modeller
tilgjengelig.</para>
-
+
<!-- @ENGLISH {{{
<para>Apache is an extremely popular webserver; using the
<command>mod_dav_svn</command> module, Apache can access a
@@ -225,7 +225,7 @@
<varlistentry>
<term>How it works:</term>
<listitem>
- <para>Install and configure and standard Apache 2.0
+ <para>Install and configure a standard Apache 2.0
server, then activate a special subversion-server module.
Clients speak to server via HTTP or HTTPS, using the WebDAV
protocol.</para>
@@ -500,7 +500,7 @@
URLs — from a security standpoint, it's effectively
the same as local users accessing
via <literal>file:///</literal>, and can entail all the
- same problems if the administrator isn't careful.)</para>
+ same problems if the administrator isn't careful.</para>
</listitem>
</itemizedlist>
<!-- @TR }} -->
@@ -871,7 +871,7 @@
<screen>
$ ls ~/.subversion/auth/svn.simple/
-5671adf2865e267db74f09ba6f872c28
+5671adf2865e267db74f09ba6f872c28
3893ed123b39500bca8a0b382839198e
5c3c22968347b390f349ff340196ed39
@@ -920,7 +920,7 @@
they're surprised to see that they're never used, i.e. new
revisions still appear to have been committed
anonymously!</para></footnote>
-
+
Typically, these options are used when:</para>
@ENGLISH }}} -->
<para>Et siste ord om oppførselen under klientautentisering, en
@@ -962,7 +962,7 @@
brukerdata.</para>
</listitem>
</itemizedlist>
-
+
<!-- @ENGLISH {{{
<para>Here is a final summary that describes how a Subversion
@@ -1031,7 +1031,7 @@
<!-- ================================================================= -->
<!-- @CHK {{ -->
<sect1 id="svn.serverconfig.svnserve">
-
+
<!-- @ENGLISH {{{
<title>svnserve, a custom server</title>
@ENGLISH }}} -->
@@ -1163,7 +1163,7 @@
Klienter bruker dermed URLer som har fjernet denne delen av
stien, noe som gir mye kortere (og mindre avslørende)
URLer:</para>
-
+
<!-- @ENGLISH {{{
<screen>
$ svn checkout svn://host.example.com/project1
@@ -2092,13 +2092,13 @@
eksakte <command>svnserve</command>-kommandoen som blir kjørt av
<command>sshd</command>, og også hvordan du får flere brukere
til å dele en enkel systemkonto.</para>
-
+
<sect3 id="svn.serverconfig.svnserve.sshtricks.setup">
<!-- @ENGLISH {{{
<title>Initial setup</title>
@ENGLISH }}} -->
<title>Innledende oppsett</title>
-
+
<!-- @ENGLISH {{{
<para>To begin, locate the home directory of the account
you'll be using to launch <command>svnserve</command>. Make
@@ -2142,7 +2142,7 @@
<screen>
ssh-dsa AAAABtce9euch… bruker at example.com
</screen>
-
+
<!-- @ENGLISH {{{
<para>The first field describes the type of key, the second
field is the uuencoded key itself, and the third field is a
@@ -2191,7 +2191,7 @@
</screen>
</sect3>
-
+
<sect3 id="svn.serverconfig.svnserve.sshtricks.fixedcmd">
<!-- @ENGLISH {{{
<title>Controlling the invoked command</title>
@@ -2207,7 +2207,7 @@
&server;siden, er det lett å navngi en spesifikk
<command>svnserve</command>-binærfil som skal kjøres og levere
et ekstra parameter til den:</para>
-
+
<!-- @ENGLISH {{{
<screen>
command="/path/to/svnserve -t -r /virtual/root" TYPE KEY COMMENT
@@ -2242,7 +2242,7 @@
systemet, eller ganske enkelt spare brukeren for å måtte
skrive inn en absolutt sti i
<literal>svn+ssh://</literal>-URLen.</para>
-
+
<!-- @ENGLISH {{{
<para>It's also possible to have multiple users share a single
account. Instead of creating a separate system account for
@@ -2331,7 +2331,7 @@
</sect3>
</sect2>
-
+
</sect1>
@@ -2339,7 +2339,7 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.serverconfig.httpd">
-
+
<!-- @ENGLISH {{{
<title>httpd, the Apache HTTP server</title>
@ENGLISH }}} -->
@@ -2408,7 +2408,7 @@
En generell oversikt over konfigurasjonsdirektivene er for
eksempel tilgjengelig på <ulink
url="http://httpd.apache.org/docs-2.0/mod/directives.html"/>.</para>
-
+
<!-- @ENGLISH {{{
<para>Also, as you make changes to your Apache setup, it is likely
that somewhere along the way a mistake will be made. If you are
@@ -2437,7 +2437,7 @@
Du kan alltids gå gjennom innholdet av disse filene etter
informasjon som kan vise kilden til et problem som ellers ikke er
lett å få øye på.</para>
-
+
<sidebar>
<!-- @ENGLISH {{{
<title>Why Apache 2?</title>
@@ -2509,7 +2509,7 @@
<title>Prerequisites</title>
@ENGLISH }}} -->
<title>Systemkrav</title>
-
+
<!-- @ENGLISH {{{
<para>To network your repository over HTTP, you basically need
four components, available in two packages. You'll need
@@ -2528,7 +2528,7 @@
sammen med Subversion.
Når du har alle disse komponentene er prosessen å få depotet på
nett så enkel som å:</para>
-
+
<itemizedlist>
<listitem>
<!-- @ENGLISH {{{
@@ -2556,7 +2556,7 @@
å eksportere (eller vise) depotet.</para>
</listitem>
</itemizedlist>
-
+
<!-- @ENGLISH {{{
<para>You can accomplish the first two items either by
compiling <command>httpd</command> and Subversion from
@@ -2575,7 +2575,7 @@
hvordan kompilere og sette opp selve Apache for dette, se
<filename>INSTALL</filename>-fila på toppnivået av
kildekodetreet til Subversion.</para>
-
+
</sect2>
<!-- =============================================================== -->
@@ -2584,7 +2584,7 @@
<title>Basic Apache Configuration</title>
@ENGLISH }}} -->
<title>Grunnleggende oppsett av Apache</title>
-
+
<!-- @ENGLISH {{{
<para>Once you have all the necessary components installed on
your system, all that remains is the configuration of Apache
@@ -2615,7 +2615,7 @@
<literal>LoadModule</literal>-direktivet har en enkel syntaks
som <!-- ¤ mapping --> kobler en navngitt modul til plasseringen
av et delt bibliotek på disken:</para>
-
+
<screen>
LoadModule dav_svn_module modules/mod_dav_svn.so
</screen>
@@ -2640,7 +2640,7 @@
LoadModule dav_svn_module modules/mod_dav_svn.so
</screen>
-
+
<!-- @ENGLISH {{{
<para>At a later location in your configuration file, you now
need to tell Apache where you keep your Subversion repository
@@ -2681,7 +2681,7 @@
plassert som <filename>/absolutt/sti/til/depotet</filename> ved
å bruke den følgende
<filename>httpd.conf</filename>-syntaksen:</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /repos>
@@ -2696,7 +2696,7 @@
SVNPath /absolutt/sti/til/depotet
</Location>
</screen>
-
+
<!-- @ENGLISH {{{
<para>If you plan to support multiple Subversion repositories
that will reside in the same parent directory on your local
@@ -2722,7 +2722,7 @@
<uri>http://min.&server;.com/svn/depot2</uri> og så videre, kan
du bruke <filename>httpd.conf</filename>-konfigurasjonssyntaksen
i det følgende eksempelet:</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /svn>
@@ -2741,7 +2741,7 @@
SVNParentPath /usr/local/svn
</Location>
</screen>
-
+
<!-- @ENGLISH {{{
<para>Using the previous syntax, Apache will delegate the
handling of all URLs whose path portions begin with
@@ -2752,7 +2752,7 @@
convenient syntax in that, unlike the use of the
<literal>SVNPath</literal> directive, you don't have to
restart Apache in order to create and network new
- repositories.</para>
+ repositories.</para>
@ENGLISH }}} -->
<para>Ved å bruke den foregående syntaksen vil Apache delegere
håndteringen av alle URLer der stien begynner med
@@ -2798,7 +2798,7 @@
<title>Server Names and the COPY Request</title>
@ENGLISH }}} -->
<title>&Server;navn og COPY-forespørselen</title>
-
+
<!-- @ENGLISH {{{
<para>Subversion makes use of the <literal>COPY</literal>
request type to perform server-side copies of files and
@@ -2938,7 +2938,7 @@
<literal>Location</literal>-direktivet generelt være
tilgjengelig for alle.
Med andre ord,</para>
-
+
<itemizedlist>
<listitem>
<!-- @ENGLISH {{{
@@ -2973,7 +2973,7 @@
<title>Basic HTTP Authentication</title>
@ENGLISH }}} -->
<title>Enkel HTTP-autentisering</title>
-
+
<!-- @ENGLISH {{{
<para>The easiest way to authenticate a client is via the
HTTP Basic authentication mechanism, which simply uses a
@@ -2995,13 +2995,13 @@
La oss gi Sally og Harry tilgang til å legge inn forandringer
i depotet.
Først må vi legge dem til passordfila.</para>
-
+
<!-- @ENGLISH {{{
<screen>
$ ### First time: use -c to create the file
$ ### Use -m to use MD5 encryption of the password, which is more secure
$ htpasswd -cm /etc/svn-auth-file harry
-New password: *****
+New password: *****
Re-type new password: *****
Adding password for user harry
$ htpasswd -m /etc/svn-auth-file sally
@@ -3057,7 +3057,7 @@
Til sist, bruk <literal>AuthUserFile</literal>-direktivet for
å angi plasseringen til passordfila som du opprettet ved å
bruke <command>htpasswd</command>.</para>
-
+
<!-- @ENGLISH {{{
<para>After adding these three directives, your
<literal><Location></literal> block should look
@@ -3066,7 +3066,7 @@
<para>Etter at du har lagt til disse tre direktivene, skal
<literal><Location></literal>-blokken din se ut omtrent
som dette:</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /svn>
@@ -3197,7 +3197,7 @@
<title>SSL Certificate Management</title>
@ENGLISH }}} -->
<title>Håndtering av SSL-sertifikater</title>
-
+
<!-- @ENGLISH {{{
<para>Businesses that need to expose their repositories for access
outside the company firewall should be conscious of the
@@ -3386,7 +3386,7 @@
[global]
ssl-authority-files = /sti/til/CAcert1.pem;/sti/til/CAcert2.pem
</screen>
-
+
<!-- @ENGLISH {{{
<para>Many OpenSSL installations also have a pre-defined set
of <quote>default</quote> CAs that are nearly universally
@@ -3524,7 +3524,7 @@
</sect3>
</sect2>
-
+
<!-- =============================================================== -->
<sect2 id="svn.serverconfig.httpd.authz">
<!-- @ENGLISH {{{
@@ -3585,7 +3585,7 @@
for de respektive brukernavnene vil få tilgang til å gjøre
<!-- ¤ «anything» i denne sammenhengen -->noe med
Subversiondepotet:</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /svn>
@@ -3596,7 +3596,7 @@
AuthType Basic
AuthName "Subversion repository"
AuthUserFile /path/to/users/file
-
+
# only authenticated users may access the repository
Require valid-user
</Location>
@@ -3645,7 +3645,7 @@
I likhet med <literal>Location</literal>-direktivet har disse
blokkene start- og sluttelementer, og du legger dem inn i
<literal><Location></literal>-blokken.</para>
-
+
<!-- @ENGLISH {{{
<para>The parameters present on the <literal>Limit</literal>
and <literal>LimitExcept</literal> directives are HTTP
@@ -3674,7 +3674,7 @@
<literal>Require valid-user</literal> inne i
<literal><LimitExcept></literal>-blokken istedenfor bare
inne i <literal><Location></literal>-blokken.</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /svn>
@@ -3724,7 +3724,7 @@
en kikk på <literal>Security</literal>-seksjonen i
dokmentasjonssamlingen for Apache på <ulink
url="http://httpd.apache.org/docs-2.0/misc/tutorials.html"/>.</para>
-
+
</sect3>
@@ -3834,7 +3834,7 @@
SVNParentPath /usr/local/svn
# our access control policy
- AuthzSVNAccessFile /path/to/access/file
+ AuthzSVNAccessFile /path/to/access/file
</Location>
</programlisting>
@ENGLISH }}} -->
@@ -3874,17 +3874,17 @@
<Location /repos>
DAV svn
SVNParentPath /usr/local/svn
-
+
# our access control policy
- AuthzSVNAccessFile /path/to/access/file
-
+ AuthzSVNAccessFile /path/to/access/file
+
# only authenticated users may access the repository
Require valid-user
-
+
# how to authenticate a user
AuthType Basic
AuthName "Subversion repository"
- AuthUserFile /path/to/users/file
+ AuthUserFile /path/to/users/file
</Location>
</programlisting>
@ENGLISH }}} -->
@@ -3947,19 +3947,19 @@
<Location /repos>
DAV svn
SVNParentPath /usr/local/svn
-
+
# our access control policy
- AuthzSVNAccessFile /path/to/access/file
-
- # try anonymous access first, resort to real
+ AuthzSVNAccessFile /path/to/access/file
+
+ # try anonymous access first, resort to real
# authentication if necessary.
Satisfy Any
Require valid-user
-
+
# how to authenticate a user
AuthType Basic
AuthName "Subversion repository"
- AuthUserFile /path/to/users/file
+ AuthUserFile /path/to/users/file
</Location>
</programlisting>
@ENGLISH }}} -->
@@ -4105,9 +4105,9 @@
<Location /repos>
DAV svn
SVNParentPath /usr/local/svn
-
+
SVNPathAuthz off
-</Location>
+</Location>
</programlisting>
</example>
@@ -4150,7 +4150,7 @@
<title>Repository Browsing</title>
@ENGLISH }}} -->
<title>Bla gjennom depotet</title>
-
+
<!-- @ENGLISH {{{
<para>One of the most useful benefits of an Apache/WebDAV
configuration for your Subversion repository is that the
@@ -4359,7 +4359,7 @@
<filename>httpd.conf</filename> vil instruere mod_dav_svn
til å generere XML-data når den viser en katalogutlisting og
referere til XSLT-stilsettet som du har valgt:</para>
-
+
<!-- @ENGLISH {{{
<screen>
<Location /svn>
@@ -4590,7 +4590,7 @@
I ekstreme tilfeller kan denne minskede nettverksoverføringen
utgjøre forskjellen på enten å få et tidsavbrudd eller å
fullføre operasjonen.</para>
-
+
<!-- @ENGLISH {{{
<para>Less interesting, but equally useful, are other features
of the Apache and Subversion relationship, such as the
@@ -4630,7 +4630,7 @@
linkend="svn.webdav"/>.</para>
<!-- @CHK }} -->
-
+
</sect3>
</sect2>
@@ -5051,7 +5051,7 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.serverconfig.multimethod">
-
+
<!-- @CHK {{ -->
<!-- @ENGLISH {{{
<title>Supporting Multiple Repository Access Methods</title>
@@ -5069,14 +5069,14 @@
forskjellige måter.
Men er det mulig – eller trygt – for depotet å bli aksessert på
flere forskjellige måter samtidig?</para>
-
+
<!-- @ENGLISH {{{
<para>At any given time, these processes may require read and
write access to your repository:</para>
@ENGLISH }}} -->
<para>Til enhver tid kan disse prosessene kreve lese- og
skriveaksess til depotet:</para>
-
+
<itemizedlist>
<listitem>
<!-- @ENGLISH {{{
@@ -5118,7 +5118,7 @@
en spesiell <!-- ¤ fixed --> bruker.</para>
</listitem>
</itemizedlist>
-
+
<!-- @ENGLISH {{{
<para>The most common problem administrators run into is repository
ownership and permissions. Does every process (or user) in the
@@ -5142,7 +5142,7 @@
Men til og med dette er ikke nok, fordi en prosess kan skrive til
databasefilene med en utrivelig umask – en som forbyr tilgang for
andre brukere.</para>
-
+
<!-- @ENGLISH {{{
<para>So the next step beyond setting up a common group for
repository users is to force every repository-accessing process
@@ -5214,7 +5214,7 @@
Det kan se rotete og komplisert ut, men problemene med å ha flere
brukere som skal dele skrivetilgang til vanlige filer er klassiske
og må løses på måter som ikke er spesielt elegante.</para>
-
+
<!-- @ENGLISH {{{
<para>Fortunately, most repository administrators will never
<emphasis>need</emphasis> to have such a complex configuration.
@@ -5317,7 +5317,7 @@
</chapter>
<!--
-local variables:
+local variables:
sgml-parent-document: ("book.xml" "chapter")
end:
vim: set ft=svnbook :
More information about the svnbook-dev
mailing list