[svnbook commit] r1944 - trunk/src/ru/book

dmitriy svnbook-dev at red-bean.com
Sun Jan 22 11:07:48 CST 2006


Author: dmitriy
Date: Sun Jan 22 11:07:28 2006
New Revision: 1944

Modified:
   trunk/src/ru/book/appa.xml   (contents, props changed)
   trunk/src/ru/book/appb.xml   (props changed)
   trunk/src/ru/book/appc.xml   (contents, props changed)
   trunk/src/ru/book/book.xml   (contents, props changed)
   trunk/src/ru/book/ch00.xml   (contents, props changed)
   trunk/src/ru/book/ch01.xml   (contents, props changed)
   trunk/src/ru/book/ch02.xml   (contents, props changed)
   trunk/src/ru/book/ch03.xml   (props changed)
   trunk/src/ru/book/ch04.xml   (props changed)
   trunk/src/ru/book/ch05.xml   (contents, props changed)
   trunk/src/ru/book/ch06.xml   (contents, props changed)
   trunk/src/ru/book/ch07.xml   (props changed)
   trunk/src/ru/book/ch08.xml   (contents, props changed)
   trunk/src/ru/book/ch09.xml   (props changed)
   trunk/src/ru/book/copyright.xml   (props changed)
   trunk/src/ru/book/foreword.xml   (props changed)
   trunk/src/ru/book/styles.css   (props changed)

Log:
Book Russian. Merged changes between r1877:r1943 from the English trunk

Modified: trunk/src/ru/book/appa.xml
==============================================================================
--- trunk/src/ru/book/appa.xml	(original)
+++ trunk/src/ru/book/appa.xml	Sun Jan 22 11:07:28 2006
@@ -255,9 +255,9 @@
       modifications look like this:</para>
 
     <screen>
-% svn status
-M     ./foo.c
-M     ./bar/baz.c
+$ svn status
+M      foo.c
+M      bar/baz.c
 </screen>
 
     <para>If you specify the <option>--show-updates</option>
@@ -265,11 +265,11 @@
       used:</para>
 
     <screen>
-% svn status -u
-M             1047    ./foo.c
-       *      1045    ./faces.html
-       *         -    ./bloo.png
-M             1050    ./bar/baz.c
+$ svn status -u
+M            1047   foo.c
+       *     1045   faces.html
+       *            bloo.png
+M            1050   bar/baz.c
 Status against revision:   1066
 </screen>
 
@@ -279,11 +279,11 @@
       item.  In the example above, the asterisk indicates that
       <filename>faces.html</filename> would be patched if we updated,
       and that <filename>bloo.png</filename> is a newly added file in
-      the repository.  (The <literal>-</literal> next to
+      the repository.  (The absence of any revision number next to
       <filename>bloo.png</filename> means that it doesn't yet exist in
       the working copy.)</para>
 
-    <!-- ###TODO describe -u here as well as -uv. -u and -v use
+    <!-- ###TODO describe -v here as well as -uv. -u and -v use
          different <quote>long</quote> formats and need to be
          documented separately. Moreover, as you can combine -u and
          -v, it needs to be explained what each of them does. As -u is
@@ -490,7 +490,7 @@
       directory) unless you tell it not to by using the
       <option>--no-auth-cache</option> switch.</para>
 
-    <para>The exception to this behaviors, however, is in the case of
+    <para>The exception to this behavior, however, is in the case of
       accessing an <command>svnserve</command> server over an SSH
       tunnel, using the <literal>svn+ssh://</literal> URL schema.  In
       that case, the <command>ssh</command> program unconditionally
@@ -519,14 +519,14 @@
       claiming to at least partially support the ability to convert
       existing CVS repositories into Subversion ones.</para>
 
-    <para>One such tool is cvs2svn (<systemitem
-      class="url">http://cvs2svn.tigris.org/</systemitem>), a Python
-      script originally created by members of Subversion's own
-      development community.  Others include Chia-liang Kao's
-      Subversion converter plugin to the VCP tool (<systemitem
-      class="url">http://svn.clkao.org/revml/branches/svn-perl/</systemitem>)
-      and Lev Serebryakov's RefineCVS (<systemitem
-      class="url">http://lev.serebryakov.spb.ru/refinecvs/</systemitem>).
+    <para>One such tool is cvs2svn
+      (<ulink url="http://cvs2svn.tigris.org/"/>), a Python script
+      originally created by members of Subversion's own development
+      community.  Others include Chia-liang Kao's Subversion converter
+      plugin to the VCP tool
+      (<ulink url="http://svn.clkao.org/revml/branches/svn-perl/"/>)
+      and Lev Serebryakov's RefineCVS
+      (<ulink url="http://lev.serebryakov.spb.ru/refinecvs/"/>).
       These tools have various levels of completeness, and may make
       entirely different decisions about how to handle your CVS
       repository history.  Whichever tool you decide to use, be sure
@@ -535,8 +535,8 @@
       that history!</para>
 
     <para>For an updated collection of links to known converter tools,
-      visit the Links page of the Subversion website (<systemitem
-      class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para>
+      visit the Links page of the Subversion website
+      (<ulink url="http://subversion.tigris.org/project_links.html"/>).</para>
 
   </sect1>
 

Modified: trunk/src/ru/book/appc.xml
==============================================================================
--- trunk/src/ru/book/appc.xml	(original)
+++ trunk/src/ru/book/appc.xml	Sun Jan 22 11:07:28 2006
@@ -13,15 +13,10 @@
       language bindings (as described in <xref
       linkend="svn.developer.usingapi.otherlangs"/>) make it a likely
       candidate for use as an extension or backend to other pieces of
-      software.  In this appendix, we'll briefly introduce you to some
-      of the many third-party tools that are using Subversion
-      functionality under-the-hood.</para>
-
-    <para>For a more recently updated version of this information,
-      check out the Links page on the Subversion website (<systemitem
-      class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para>
-
-    <para><emphasis>THIS APPENDIX IS UNDER CONSTRUCTION</emphasis></para>
+      software.  For a listing of many third-party tools that are using
+      Subversion functionality under-the-hood, check out the Links page on the
+      Subversion website (<ulink
+        url="http://subversion.tigris.org/project_links.html"/>).</para>
 
   </simplesect>
 

Modified: trunk/src/ru/book/book.xml
==============================================================================
--- trunk/src/ru/book/book.xml	(original)
+++ trunk/src/ru/book/book.xml	Sun Jan 22 11:07:28 2006
@@ -81,16 +81,16 @@
     <!-- @ENGLISH {{{
     <legalnotice><para>This work is licensed under the Creative
       Commons Attribution License. To view a copy of this license,
-      visit http://creativecommons.org/licenses/by/2.0/ or send a
-      letter to Creative Commons, 559 Nathan Abbott Way, Stanford,
-      California 94305, USA.</para></legalnotice>
+      visit <ulink url="http://creativecommons.org/licenses/by/2.0/"/>
+      or send a letter to Creative Commons, 559 Nathan Abbott Way,
+      Stanford, California 94305, USA.</para></legalnotice>
     @ENGLISH }}} -->
     <legalnotice><para>Этот труд выпущен на условиях Creative Commons
         Attribution License. С текстом данной лицензии можно
         ознакомиться в интернете по адресу
-        http://creativecommons.org/licenses/by/2.0/, или получить его по
-        почте, отправив заявку по адресу Creative Commons, 559 Nathan
-        Abbott Way, Stanford, California 94305,
+        <ulink url="http://creativecommons.org/licenses/by/2.0/"/>,
+        или получить его по почте, отправив заявку по адресу
+        Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305,
         USA.</para></legalnotice>
 
   </bookinfo>

Modified: trunk/src/ru/book/ch00.xml
==============================================================================
--- trunk/src/ru/book/ch00.xml	(original)
+++ trunk/src/ru/book/ch00.xml	Sun Jan 22 11:07:28 2006
@@ -145,22 +145,22 @@
       самые незначительные различия.</para>
 
     <!-- @ENGLISH {{{
-    <para>Most readers are probably programmers or sysadmins who need
-      to track changes to source code.  This is the most common use
-      for Subversion, and therefore it is the scenario underlying all
-      of the book's examples.  But Subversion can be used to manage
-      changes to any sort of information: images, music, databases,
-      documentation, and so on.  To Subversion, all data is just
-      data.</para>
-    @ENGLISH }}} -->
-    <para>Многие наши читатели — программисты или сисадмины,
-      испытывающие потребность отслеживать изменения в исходном коде.
-      Такое использование Subversion является самым распространённым и
-      положено в основу всех примеров в этой книге. Однако, Subversion
-      можно использовать для управления информацией самого разного
-      рода: графика, музыка, базы данных, документация — этот
-      список можно продолжать до бесконечности. Для Subversion любые
-      данные — это просто данные.</para>
+    <para>Most readers are probably programmers or system
+      administrators who need to track changes to source code.  This
+      is the most common use for Subversion, and therefore it is the
+      scenario underlying all of the book's examples.  But Subversion
+      can be used to manage changes to any sort of information:
+      images, music, databases, documentation, and so on.  To
+      Subversion, all data is just data.</para>
+    @ENGLISH }}} -->
+    <para>Многие наши читатели — программисты или системные
+      администраторы, испытывающие потребность отслеживать изменения
+      в исходном коде. Такое использование Subversion является самым
+      распространённым и положено в основу всех примеров в этой книге.
+      Однако, Subversion можно использовать для управления информацией
+      самого разного рода: графика, музыка, базы данных, документация
+      — этот список можно продолжать до бесконечности. Для Subversion
+      любые данные — это просто данные.</para>
 
     <!-- @ENGLISH {{{
     <para>While this book is written with the assumption that the
@@ -191,43 +191,48 @@
     <!-- @ENGLISH {{{
     <para>This book aims to be useful to people of widely different
       backgrounds—from people with no previous experience in
-      version control to experienced sysadmins.  Depending on your own
-      background, certain chapters may be more or less important to
-      you.  The following can be considered a <quote>recommended
-      reading list</quote> for various types of readers:</para>
+      version control to experienced system administrators.  Depending
+      on your own background, certain chapters may be more or less
+      important to you.  The following can be considered a
+      <quote>recommended reading list</quote> for various types of
+      readers:</para>
     @ENGLISH }}} -->
     <para>Книга предназначена для людей с самым разным уровнем
       подготовки — от новичков, не имевших дела с управлением
-      версиями ранее, до опытных сисадминов. Важность той или иной
-      главы для читателя будет зависеть от уровня его подготовки.
+      версиями ранее, до опытных системных администраторов. Важность
+      той или иной главы для читателя будет зависеть от уровня его подготовки.
       Приведём наши рекомендации для разных групп читателей:</para>
 
     <!-- @ENGLISH {{{
     <variablelist>
       <varlistentry>
-        <term>Experienced sysadmins</term>
+        <term>Experienced System Administrators</term>
         <listitem>
           <para>The assumption here is that you've probably used CVS
             before, and are dying to get a Subversion server up and
-            running ASAP.  Chapters 5 and 6 will show you how to create
+            running ASAP.  <xref linkend="svn.reposadmin"/> and <xref
+              linkend="svn.serverconfig"/> will show you how to create
             your first repository and make it available over the
-            network.  After that's done, chapter 3 and appendix A are
-            the fastest routes to learning the Subversion client while
-            drawing on your CVS experience.</para>
+            network.  After that's done, <xref linkend="svn.tour"/> and
+            <xref linkend="svn.forcvs"/> are the fastest routes to
+            learning the Subversion client while drawing on your CVS
+            experience.</para>
         </listitem>
       </varlistentry>
       @ENGLISH }}} -->
     <variablelist>
       <varlistentry>
-        <term>Опытные сисадмины</term>
+        <term>Опытные системные администраторы</term>
         <listitem>
           <para>Предполагается, что читатели этой группы раннее уже
             использовали CVS и теперь им не терпится поднять сервер
-            Subversion как можно скорее. В главах 5 и 6 показано, как
+            Subversion как можно скорее. В <xref linkend="svn.reposadmin"/>
+            и <xref linkend="svn.serverconfig"/> показано, как
             создать первое хранилище и сделать его доступным в сети.
             Далее можно перейти к изучению клиента Subversion, причём
             для пользователей CVS наиболее быстрым путём к цели будет
-            чтение главы 3 и приложения A.</para>
+            чтение <xref linkend="svn.tour"/> и <xref
+            linkend="svn.forcvs"/>.</para>
         </listitem>
       </varlistentry>
 
@@ -238,7 +243,8 @@
           <para>Your administrator has probably set up Subversion
             already, and you need to learn how to use the client.  If
             you've never used a version control system (like CVS),
-            then chapters 2 and 3 are a vital introduction.  If you're
+            then <xref linkend="svn.basic"/> and <xref
+              linkend="svn.tour"/> are a vital introduction.  If you're
             already an old hand at CVS, chapter 3 and appendix A are
             the best place to start.</para>
         </listitem>
@@ -250,10 +256,10 @@
           <para>По-видимому, администратор уже установил Subversion в
             сети и вам необходимо научиться пользоваться клиентом. Если
             вы раньше не использовали систему управления версиями
-            (например, CVS), то начать следует с глав 2 и 3, где
-            содержатся основные вводные сведения. Если же вы хорошо
-            знакомы с CVS, то вам больше подойдёт изучение главы 3 и
-            приложения A.</para>
+            (например, CVS), то начать следует с <xref linkend="svn.basic"/>
+            и <xref linkend="svn.tour"/>, где содержатся основные вводные
+            сведения. Если же вы хорошо знакомы с CVS, то вам больше подойдёт
+            изучение главы 3 и приложения A.</para>
         </listitem>
       </varlistentry>
 
@@ -264,11 +270,12 @@
           <para>Whether you're a user or administrator, eventually
             your project will grow larger.  You're going to want to
             learn how to do more advanced things with Subversion, such
-            as how to use branches and perform merges (chapter 4),
-            how to use Subversion's property support, how to configure
-            runtime options (chapter 7), and other things.  Chapters 4
-            and 7 aren't vital at first, but be sure to read them once
-            you're comfortable with the basics.</para>
+            as how to use branches and perform merges (<xref
+              linkend="svn.branchmerge"/>), how to use Subversion's
+            property support, how to configure runtime options (<xref
+              linkend="svn.advanced"/>), and other things.  These two
+            chapters aren't vital at first, but be sure to read them
+            once you're comfortable with the basics.</para>
         </listitem>
       </varlistentry>
       @ENGLISH }}} -->
@@ -278,9 +285,10 @@
           <para>Рано или поздно ваш проект будет разрастаться, и тогда,
             независимо от того, администратор вы или пользователь, вам
             потребуется узнать, как делать в Subversion более сложные
-            вещи: использовать ветки и осуществлять слияния (глава 4),
-            работать со свойствами, настраивать рабочую среду (глава 7)
-            и т.д. Главы 4 и 7 не являются важными в самом начале
+            вещи: использовать ветки и осуществлять слияния (<xref
+            linkend="svn.branchmerge"/>), работать со свойствами,
+            настраивать рабочую среду (<xref linkend="svn.advanced"/>)
+            и т.д. Эти главы не являются важными в самом начале
             работы, но их следует прочесть, когда вы разберётесь с
             основами.</para>
         </listitem>
@@ -292,7 +300,8 @@
         <listitem>
           <para>Presumably, you're already familiar with Subversion,
             and now want to either extend it or build new software on
-            top of its many APIs.  Chapter 8 is just for you.</para>
+            top of its many APIs.  <xref linkend="svn.developer"/> is
+            just for you.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -304,24 +313,26 @@
             либо расширить её, либо создать новое программное
             обеспечение на основе её многочисленных
             API<footnote><para>Application Program
-                Interface, интерфейс прикладного
-                программирования</para></footnote>. Что ж, глава 8
+            Interface, интерфейс прикладного
+            программирования</para></footnote>. Что ж,
+            <xref linkend="svn.developer"/>
             написана именно для вас.</para>
         </listitem>
       </varlistentry>
     </variablelist>
 
     <!-- @ENGLISH {{{
-    <para>The book ends with reference material—chapter 9 is a
-      reference guide for all Subversion commands, and the appendices
-      cover a number of useful topics.  These are the chapters you're
-      mostly likely to come back to after you've finished the
-      book.</para>
-    @ENGLISH }}} -->
-    <para>Книга завершается справочным материалом — глава 9 представляет
-      собой справочное руководство по всем командам Subversion, а несколько
-      полезных тем раскрыто в приложениях. К этим разделам вы
-      скорее всего будете обращаться уже после прочтения книги.</para>
+    <para>The book ends with reference material—<xref
+        linkend="svn.ref"/> is a reference guide for all Subversion
+      commands, and the appendices cover a number of useful topics.
+      These are the chapters you're mostly likely to come back to after
+      you've finished the book.</para>
+    @ENGLISH }}} -->
+    <para>Книга завершается справочным материалом — <xref
+      linkend="svn.ref"/> представляет собой справочное руководство
+      по всем командам Subversion, а несколько полезных тем раскрыто в
+      приложениях. К этим разделам вы скорее всего будете обращаться
+      уже после прочтения книги.</para>
 
   </sect1>
 
@@ -473,7 +484,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 1, <emphasis>Introduction</emphasis></term>
+          <term><xref linkend="svn.intro"/></term>
           <listitem>
             <para>Covers the history of Subversion as well as its
               features, architecture, components, and install
@@ -482,7 +493,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 1. <emphasis>Введение</emphasis>.</term>
+          <term><xref linkend="svn.intro"/></term>
           <listitem>
             <para>В этой главе приводятся сведения об истории
               Subversion, обсуждаются её возможности, архитектура,
@@ -495,7 +506,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 2, <emphasis>Basic Concepts</emphasis></term>
+          <term><xref linkend="svn.basic"/></term>
           <listitem>
             <para>Explains the basics of version control and different
               versioning models, along with Subversion's repository,
@@ -504,7 +515,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 2. <emphasis>Основные понятия</emphasis>.</term>
+          <term><xref linkend="svn.basic"/></term>
           <listitem>
             <para>Глава объясняет основы управления версиями, в ней
               разбираются различные модели работы с версиями, а также
@@ -515,7 +526,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 3, <emphasis>Guided Tour</emphasis></term>
+          <term><xref linkend="svn.tour"/></term>
           <listitem>
             <para>Walks you through a day in the life of a Subversion
               user.  It demonstrates how to use Subversion to obtain,
@@ -524,7 +535,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 3. <emphasis>Экскурсия по Subversion</emphasis>.</term>
+          <term><xref linkend="svn.tour"/></term>
           <listitem>
             <para>Один день из жизни пользователя Subversion. Глава
               поясняет, как использовать Subversion для получения
@@ -535,7 +546,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 4, <emphasis>Branching and Merging</emphasis></term>
+          <term><xref linkend="svn.branchmerge"/></term>
           <listitem>
             <para>Discusses branches, merges, and tagging, including
               best practices for branching and merging, common
@@ -545,7 +556,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 4. <emphasis>Ветвление и слияние</emphasis>.</term>
+          <term><xref linkend="svn.branchmerge"/></term>
           <listitem>
             <para>В этой главе рассматриваются ветки, метки и слияния,
               показаны эффективные методы выполнения ветвления и
@@ -558,8 +569,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 5, <emphasis>Repository
-            Administration</emphasis></term>
+          <term><xref linkend="svn.reposadmin"/></term>
           <listitem>
             <para>Describes the basics of the Subversion repository,
               how to create, configure, and maintain a repository, and
@@ -568,8 +578,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 5. <emphasis>Администрирование
-              хранилища</emphasis>.</term>
+          <term><xref linkend="svn.reposadmin"/></term>
           <listitem>
             <para>В главе рассматриваются основные особенности хранилища
               Subversion, включая использование инструментов для
@@ -579,7 +588,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 6, <emphasis>Server Configuration</emphasis></term>
+          <term><xref linkend="svn.serverconfig"/></term>
           <listitem>
             <para>Explains how to configure your Subversion server and
               the three ways to access your repository:
@@ -591,7 +600,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 6. <emphasis>Настройка сервера</emphasis>.</term>
+          <term><xref linkend="svn.serverconfig"/></term>
           <listitem>
             <para>В этой главе показано, как настроить сервер
               Subversion. Здесь же рассматриваются три способа
@@ -605,7 +614,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 7, <emphasis>Advanced Topics</emphasis></term>
+          <term><xref linkend="svn.advanced"/></term>
           <listitem>
             <para>Explores the Subversion client configuration files,
               file and directory properties, how to
@@ -616,8 +625,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 7. <emphasis>Профессиональное использование
-              Subversion</emphasis>.</term>
+          <term><xref linkend="svn.advanced"/></term>
           <listitem>
             <para>В этой главе подробно рассмотрены файлы для настройки
               клиента Subversion, свойства файлов и каталогов, показано,
@@ -629,7 +637,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 8, <emphasis>Developer Information</emphasis></term>
+          <term><xref linkend="svn.developer"/></term>
           <listitem>
             <para>Describes the internals of Subversion, the
               Subversion filesystem, and the working copy
@@ -641,8 +649,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 8. <emphasis>Информация для
-              разработчиков</emphasis>.</term>
+          <term><xref linkend="svn.developer"/></term>
           <listitem>
             <para>В этой главе обсуждается внутреннее устройство
               Subversion, файловая система Subversion и служебные
@@ -656,8 +663,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Chapter 9, <emphasis>Subversion Complete
-            Reference</emphasis></term>
+          <term><xref linkend="svn.ref"/></term>
           <listitem>
             <para>Explains in great detail every subcommand of
               <command>svn</command>, <command>svnadmin</command>, and
@@ -667,8 +673,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Глава 9. <emphasis>Полное справочное руководство по
-              Subversion</emphasis>.</term>
+          <term><xref linkend="svn.ref"/></term>
           <listitem>
             <para>Глава подробно объясняет использование всех подкоманд
               <command>svn</command>, <command>svnadmin</command> и
@@ -679,8 +684,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Appendix A, <emphasis>Subversion for CVS
-            Users</emphasis></term>
+          <term><xref linkend="svn.forcvs"/></term>
           <listitem>
             <para>Covers the similarities and differences between
               Subversion and CVS, with numerous suggestions on how to
@@ -694,8 +698,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Приложение A. <emphasis>Subversion для пользователей
-              CVS</emphasis>.</term>
+          <term><xref linkend="svn.forcvs"/></term>
           <listitem>
             <para>В приложении рассматриваются сходства и различия между
               Subversion и CVS, приводится ряд рекомендаций, позволяющих
@@ -713,8 +716,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Appendix B, <emphasis>WebDAV and
-            Autoversioning</emphasis></term>
+          <term><xref linkend="svn.webdav"/></term>
           <listitem>
             <para>Describes the details of WebDAV and DeltaV, and how
               you can configure your Subversion repository to be
@@ -723,8 +725,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Приложение B. <emphasis>WebDAV и автоматическое управление
-              версиями</emphasis>.</term>
+          <term><xref linkend="svn.webdav"/></term>
           <listitem>
             <para>Это приложение подробно рассматривает WebDAV и DeltaV
               и показывает, как настроить хранилище Subversion для
@@ -735,7 +736,7 @@
 
         <!-- @ENGLISH {{{
         <varlistentry>
-          <term>Appendix C, <emphasis>Third Party Tools</emphasis></term>
+          <term><xref linkend="svn.3rdparty"/></term>
           <listitem>
             <para>Discusses tools that support or use Subversion,
               including alternative client programs, repository
@@ -744,8 +745,7 @@
         </varlistentry>
         @ENGLISH }}} -->
         <varlistentry>
-          <term>Приложение C. <emphasis>Инструменты от сторонних
-              разработчиков</emphasis>.</term>
+          <term><xref linkend="svn.3rdparty"/></term>
           <listitem>
             <para>Здесь представлены некоторые программы, которые
               используют Subversion в своей работе, включая
@@ -816,21 +816,21 @@
     </itemizedlist>
 
     <!-- @ENGLISH {{{
+    <!-ﳢ- O'Reilly Hardcopy Only
     <para>You can send publishing comments and questions to O'Reilly
-      here: ###insert boilerplate.</para>
+      here: <remark>###insert boilerplate.</remark></para>
+    -ﳢ->
     @ENGLISH }}} -->
-    <para>Комментарии и вопросы, связанные с публикацией книги,
+    <!--<para>Комментарии и вопросы, связанные с публикацией книги,
       направляйте в адрес издательства O'Reilly:
-      ###insert boilerplate.</para>
+      ###insert boilerplate.</para>-->
 
     <!-- @ENGLISH {{{
     <para>A relatively recent online version of this book can be found
-      at <systemitem
-      class="url">http://svnbook.red-bean.com</systemitem>.</para>
+      at <ulink url="http://svnbook.red-bean.com"/>.</para>
     @ENGLISH }}} -->
     <para>Относительно свежую версию этой книги можно взять в Интернете
-      по адресу <systemitem
-        class="url">http://svnbook.red-bean.com</systemitem>.</para>
+      по адресу <ulink url="http://svnbook.red-bean.com"/>.</para>
 
   </sect1>
 

Modified: trunk/src/ru/book/ch01.xml
==============================================================================
--- trunk/src/ru/book/ch01.xml	(original)
+++ trunk/src/ru/book/ch01.xml	Sun Jan 22 11:07:28 2006
@@ -139,11 +139,11 @@
     <title>История Subversion</title>
 
     <!-- @ENGLISH {{{
-    <para>In early 2000, CollabNet, Inc. (<systemitem
-      class="url">http://www.collab.net</systemitem>) began seeking
+    <para>In early 2000, CollabNet,
+      Inc. (<ulink url="http://www.collab.net"/>) began seeking
       developers to write a replacement for CVS.  CollabNet offers a
-      collaboration software suite called CollabNet Enterprise
-      Edition (CEE)
+      collaboration software suite called CollabNet Enterprise Edition
+      (CEE)
       <footnote>
         <para>There's also a CollabNet Team Edition (CTE)
           offering aimed at smaller groups.</para>
@@ -159,8 +159,8 @@
       write a new version control system from scratch, retaining the
       basic ideas of CVS, but without the bugs and misfeatures.</para>
     @ENGLISH }}} -->
-    <para>В начале 2000 года компания CollabNet, Inc. (<systemitem
-        class="url">http://www.collab.net</systemitem>) решила начать
+    <para>В начале 2000 года компания CollabNet, Inc. (<ulink
+      url="http://www.collab.net"/>) решила начать
       разработку программного обеспечения, призванного прийти на смену
       CVS, и стала искать людей, способных решить эту задачу. CollabNet
       предлагает комплекс программных средств для совместной работы,
@@ -647,20 +647,18 @@
     <!-- @ENGLISH {{{
     <para>The easiest way to get Subversion is to download a binary
       package built for your operating system.  Subversion's website
-      (<systemitem
-      class="url">http://subversion.tigris.org</systemitem>) often has
-      these packages available for download, posted by volunteers.
-      The site usually contains graphical installer packages for users
-      of Microsoft operating systems.  If you run a Unix-like
-      operating system, you can use your system's native package
-      distribution system (RPMs, DEBs, the ports tree, etc.) to get
+      (<ulink url="http://subversion.tigris.org"/>) often has these
+      packages available for download, posted by volunteers.  The site
+      usually contains graphical installer packages for users of
+      Microsoft operating systems.  If you run a Unix-like operating
+      system, you can use your system's native package distribution
+      system (RPMs, DEBs, the ports tree, etc.) to get
       Subversion.</para>
     @ENGLISH }}} -->
     <para>Наиболее простой способ получить Subversion - скачать бинарный
       пакет, собранный для вашей операционной системы. Как правило, эти
       пакеты присланные волонтерами, доступны для загрузки с веб-сайта
-      Subversion (<systemitem
-      class="url">http://subversion.tigris.org</systemitem>). Сайт обычно
+      Subversion (<ulink url="http://subversion.tigris.org"/>). Сайт обычно
       содержит графический инсталлятор для пользователей операционных
       систем Microsoft. Если вы используете Unix-подобную ОС то для получения
       Subversion вы можете использовать пакетную систему, специфичную для
@@ -974,10 +972,10 @@
 /tmp/myproject/branches/
 /tmp/myproject/tags/
 /tmp/myproject/trunk/
-                    foo.c
-                    bar.c
-                    Makefile
-                    …
+                     foo.c
+                     bar.c
+                     Makefile
+                     …
 </screen>
 
     <!-- @ENGLISH {{{

Modified: trunk/src/ru/book/ch02.xml
==============================================================================
--- trunk/src/ru/book/ch02.xml	(original)
+++ trunk/src/ru/book/ch02.xml	Sun Jan 22 11:07:28 2006
@@ -697,10 +697,10 @@
 
       <screen>
 $ svn checkout http://svn.example.com/repos/calc
-A  calc
-A  calc/Makefile
-A  calc/integer.c
-A  calc/button.c
+A    calc/Makefile
+A    calc/integer.c
+A    calc/button.c
+Checked out revision 56.
 
 $ ls -A calc
 Makefile  integer.c  button.c  .svn/
@@ -896,7 +896,8 @@
 .svn/ Makefile integer.c button.c
 
 $ svn update
-U button.c
+U    button.c
+Updated to revision 57.
 </screen>
 
       <!-- @ENGLISH {{{
@@ -1013,7 +1014,7 @@
           <quote><filename>foo.c</filename> as it appears in revision
           5.</quote> Notice that in general, revisions N and M of a
           file do <emphasis>not</emphasis> necessarily differ!  Because
-          CVS uses per-file revisions numbers, CVS users might want to
+          CVS uses per-file revision numbers, CVS users might want to
           see <xref linkend="svn.forcvs"/> for more details.</para>
         @ENGLISH }}} -->
         <para>В отличие от многих других систем управления версиями, номера правок

Modified: trunk/src/ru/book/ch05.xml
==============================================================================
--- trunk/src/ru/book/ch05.xml	(original)
+++ trunk/src/ru/book/ch05.xml	Sun Jan 22 11:07:28 2006
@@ -1723,8 +1723,8 @@
           regular Berkeley DB environment directory, and can therefore
           be used in conjunction with any of the Berkeley database
           tools (you can see the documentation for these tools at
-          SleepyCat's website, <systemitem
-          class="url">http://www.sleepycat.com/</systemitem>).</para>
+          SleepyCat's website,
+          <ulink url="http://www.sleepycat.com/"/>).</para>
 
         <para>For day-to-day Subversion use, these tools are
           unnecessary.  Most of the functionality typically needed for

Modified: trunk/src/ru/book/ch06.xml
==============================================================================
--- trunk/src/ru/book/ch06.xml	(original)
+++ trunk/src/ru/book/ch06.xml	Sun Jan 22 11:07:28 2006
@@ -1021,8 +1021,7 @@
       network server that Subversion can leverage.  Via a custom
       module, <command>httpd</command> makes Subversion repositories
       available to clients via the WebDAV/DeltaV protocol, which is an
-      extension to HTTP 1.1
-      (see <systemitem class="url">http://www.webdav.org/</systemitem>
+      extension to HTTP 1.1 (see <ulink url="http://www.webdav.org/"/>
       for more information). This protocol takes the ubiquitous HTTP
       protocol that is the core of the World Wide Web, and adds
       writing—specifically, versioned
@@ -1043,10 +1042,9 @@
       of the use of these directives, describing them in full is
       outside the scope of this chapter.  The Apache team maintains
       excellent documentation, publicly available on their website at
-      <systemitem class="url">http://httpd.apache.org</systemitem>.
-      For example, a general reference for the configuration
-      directives is located at <systemitem class="url">
-      http://httpd.apache.org/docs-2.0/mod/directives.html</systemitem>.</para>
+      <ulink url="http://httpd.apache.org"/>.  For example, a general
+      reference for the configuration directives is located at <ulink url="
+      http://httpd.apache.org/docs-2.0/mod/directives.html"/>.</para>
 
     <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
@@ -1629,18 +1627,17 @@
 
         <para>Sometimes you don't need to run such a tight ship.  For
           example, Subversion's own source code repository at
-          <systemitem
-          class="url">http://svn.collab.net/repos/svn</systemitem>
-          allows anyone in the world to perform read-only repository
-          tasks (like checking out working copies and browsing the
-          repository with a web browser), but restricts all write
-          operations to authenticated users.  To do this type of
-          selective restriction, you can use the
-          <literal>Limit</literal> and <literal>LimitExcept</literal>
-          configuration directives.  Like the
-          <literal>Location</literal> directive, these blocks have
-          starting and ending tags, and you would nest them inside
-          your <literal><Location></literal> block.</para>
+          <ulink url="http://svn.collab.net/repos/svn"/> allows anyone
+          in the world to perform read-only repository tasks (like
+          checking out working copies and browsing the repository with
+          a web browser), but restricts all write operations to
+          authenticated users.  To do this type of selective
+          restriction, you can use the <literal>Limit</literal> and
+          <literal>LimitExcept</literal> configuration directives.
+          Like the <literal>Location</literal> directive, these blocks
+          have starting and ending tags, and you would nest them
+          inside your <literal><Location></literal>
+          block.</para>
 
         <para>The parameters present on the <literal>Limit</literal>
           and <literal>LimitExcept</literal> directives are HTTP
@@ -1677,8 +1674,8 @@
           information about Apache access control and the
           <literal>Require</literal> directive, take a look at the
           <literal>Security</literal> section of the Apache
-          documentation's tutorials collection at <systemitem
-          class="url">http://httpd.apache.org/docs-2.0/misc/tutorials.html</systemitem>.</para>
+          documentation's tutorials collection at <ulink
+           url="http://httpd.apache.org/docs-2.0/misc/tutorials.html"/>.</para>
 
 
       </sect3>
@@ -2122,8 +2119,7 @@
             list</command> and <command>svn cat</command> commands.
             To browse old revisions with your web browser, however,
             you can use third-party software.  A good example of this
-            is ViewCVS (<systemitem
-            class="url">http://viewcvs.sourceforge.net/</systemitem>).
+            is ViewCVS (<ulink url="http://viewvc.tigris.org/"/>).
             ViewCVS was originally written to display CVS repositories
             through the web, and the latest bleeding-edge versions (at
             the time of writing) are able to understand Subversion

Modified: trunk/src/ru/book/ch08.xml
==============================================================================
--- trunk/src/ru/book/ch08.xml	(original)
+++ trunk/src/ru/book/ch08.xml	Sun Jan 22 11:07:28 2006
@@ -64,11 +64,15 @@
           </row>
           <row>
             <entry>libsvn_delta</entry>
-            <entry>Tree and text differencing routines</entry>
+            <entry>Tree and byte-stream differencing routines</entry>
+          </row>
+          <row>
+            <entry>libsvn_diff</entry>
+            <entry>Contextual differencing and merging routines</entry>
           </row>
           <row>
             <entry>libsvn_fs</entry>
-            <entry>The Subversion filesystem library</entry>
+            <entry>Filesystem commons and module loader</entry>
           </row>
           <row>
             <entry>libsvn_fs_base</entry>
@@ -92,7 +96,7 @@
           </row>
           <row>
             <entry>libsvn_ra_svn</entry>
-            <entry>A custom protocol Repository Access module</entry>
+            <entry>The custom protocol Repository Access module</entry>
           </row>
           <row>
             <entry>libsvn_repos</entry>
@@ -137,7 +141,9 @@
       libsvn_ra_local, and libsvn_ra_svn all implement the same
       interface.  And all three communicate with the Repository
       Layer—libsvn_ra_dav and libsvn_ra_svn do so across a
-      network, and libsvn_ra_local connects to it directly.</para>
+      network, and libsvn_ra_local connects to it directly.  The
+      libsvn_fs_base and libsvn_fs_fs libraries are another example of
+      this.</para>
 
     <para>The client itself also highlights modularity in the
       Subversion design.  While Subversion currently comes with only a
@@ -352,7 +358,7 @@
         use of both the repository and filesystem interfaces to create
         a new revision of the filesystem in which a directory is
         added.  Note that in this example (and all others throughout
-        this book), the <function>SVN_ERR</function> macro simply
+        this book), the <function>SVN_ERR()</function> macro simply
         checks for a non-successful error return from the function it
         wraps, and returns that error if it exists.</para>
 
@@ -439,7 +445,7 @@
       <para>In the previous code segment, calls were made to both the
         repository and filesystem interfaces.  We could just as easily
         have committed the transaction using
-        <function>svn_fs_commit_txn</function>.  But the filesystem
+        <function>svn_fs_commit_txn()</function>.  But the filesystem
         API knows nothing about the repository library's hook
         mechanism.  If you want your Subversion repository to
         automatically perform some set of non-Subversion tasks every
@@ -447,7 +453,7 @@
         email that describes all the changes made in that transaction
         to your developer mailing list), you need to use the
         libsvn_repos-wrapped version of that
-        function—<function>svn_repos_fs_commit_txn</function>.
+        function—<function>svn_repos_fs_commit_txn()</function>.
         This function will actually first run the
         <literal>pre-commit</literal> hook script if one exists, then
         commit the transaction, and finally will run a
@@ -524,22 +530,23 @@
 
       <screen>
 $ svn --version
-svn, version 1.0.1 (r9023)
-   compiled Mar 17 2004, 09:31:13
+svn, version 1.2.3 (r15833)
+   compiled Sep 13 2005, 22:45:22
 
-Copyright (C) 2000-2004 CollabNet.
+Copyright (C) 2000-2005 CollabNet.
 Subversion is open source software, see http://subversion.tigris.org/
 This product includes software developed by CollabNet (http://www.Collab.Net/).
 
 The following repository access (RA) modules are available:
 
 * ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
-  - handles 'http' schema
-  - handles 'https' schema
-* ra_local : Module for accessing a repository on local disk.
-  - handles 'file' schema
+  - handles 'http' scheme
+  - handles 'https' scheme
 * ra_svn : Module for accessing a repository using the svn network protocol.
-  - handles 'svn' schema
+  - handles 'svn' scheme
+* ra_local : Module for accessing a repository on local disk.
+  - handles 'file' scheme
+
 </screen>
 
       <sect3 id="svn.developer.layerlib.ra.dav">
@@ -565,9 +572,9 @@
           optimizations like network pipelining and caching.  By using
           Apache as a server, Subversion gets all of these features
           for free.  And since most firewalls already allow HTTP
-          traffic to pass through, sysadmins typically don't even have
-          to change their firewall configurations to allow Subversion
-          to work.</para>
+          traffic to pass through, system administrators typically
+          don't even have to change their firewall configurations to
+          allow Subversion to work.</para>
 
         <para>Subversion uses HTTP and WebDAV (with DeltaV) to
           communicate with an Apache server.  You can read more about
@@ -591,14 +598,14 @@
           receives these requests (exactly as it does generic HTTP
           requests that your web browser might make), notices that the
           requests are directed at a URL that is configured as a DAV
-          location (using the <sgmltag>Location</sgmltag> directive in
-          <filename>httpd.conf</filename>), and hands the request off
-          to its own mod_dav module.  When properly configured,
-          mod_dav knows to use Subversion's mod_dav_svn for any
-          filesystem-related needs, as opposed to the generic
-          mod_dav_fs that comes with Apache.  So ultimately, the
-          client is communicating with mod_dav_svn, which binds
-          directly to the Subversion Repository Layer.</para>
+          location (using the <literal><Location></literal>
+          directive in <filename>httpd.conf</filename>), and hands the
+          request off to its own mod_dav module.  When properly
+          configured, mod_dav knows to use Subversion's mod_dav_svn for
+          any filesystem-related needs, as opposed to the generic
+          mod_dav_fs that comes with Apache.  So ultimately, the client
+          is communicating with mod_dav_svn, which binds directly to the
+          Subversion Repository Layer.</para>
 
         <para>That was a simplified description of the actual
           exchanges taking place, though.  For example, the Subversion
@@ -658,15 +665,16 @@
 
         <para>This RA implementation lacks most of the advantages of
           Apache mentioned in the previous section; however, it may be
-          appealing to some sysadmins nonetheless.  It is dramatically
-          easier to configure and run; setting up an
+          appealing to some system administrators nonetheless.  It is
+          dramatically easier to configure and run; setting up an
           <filename>svnserve</filename> process is nearly
           instantaneous.  It is also much smaller (in terms of lines
           of code) than Apache, making it much easier to audit, for
-          security reasons or otherwise.  Furthermore, some sysadmins
-          may already have an SSH security infrastructure in place,
-          and want Subversion to use it.  Clients using ra_svn can
-          easily tunnel the protocol over SSH.</para>
+          security reasons or otherwise.  Furthermore, some system
+          administrators may already have an SSH security
+          infrastructure in place, and want Subversion to use it.
+          Clients using ra_svn can easily tunnel the protocol over
+          SSH.</para>
 
       </sect3>
 
@@ -754,7 +762,7 @@
         Repository Access Layer, and then to provide the highest-level
         API to any application that wishes to perform general revision
         control actions.  For example, the function
-        <function>svn_client_checkout</function> takes a URL as an
+        <function>svn_client_checkout()</function> takes a URL as an
         argument.  It passes this URL to the RA layer and opens an
         authenticated session with a particular repository.  It then
         asks the repository for a certain tree, and sends this tree
@@ -839,7 +847,7 @@
     <sect2 id="svn.developer.usingapi.apr">
       <title>The Apache Portable Runtime Library</title>
 
-      <para>Along with Subversion's own datatype, you will see many
+      <para>Along with Subversion's own datatypes, you will see many
         references to datatypes that begin with
         <literal>apr_</literal>—symbols from the Apache
         Portable Runtime (APR) library.  APR is Apache's portability
@@ -867,7 +875,7 @@
         uses these types extensively throughout the codebase.  But
         perhaps the most pervasive APR datatype, found in nearly every
         Subversion API prototype, is the
-        <literal>apr_pool_t</literal>—the APR memory pool.
+        <structname>apr_pool_t</structname>—the APR memory pool.
         Subversion uses pools internally for all its memory allocation
         needs (unless an external library requires a different memory
         management schema for data passed through its API),
@@ -915,8 +923,8 @@
         class="url">file:///home/username/My%20File.txt</systemitem>.
         Again, Subversion supplies helper functions that your
         application can
-        use—<function>svn_path_uri_encode</function> and
-        <function>svn_path_uri_decode</function>, for URI encoding and
+        use—<function>svn_path_uri_encode()</function> and
+        <function>svn_path_uri_decode()</function>, for URI encoding and
         decoding, respectively.</para>
     </sect2>
 
@@ -926,15 +934,14 @@
 
       <para>If you are interested in using the Subversion libraries in
         conjunction with something other than a C program—say a
-        Python script or Java application—Subversion has some
-        initial support for this via the Simplified Wrapper and
-        Interface Generator (SWIG).  The SWIG bindings for Subversion
-        are located in <filename>subversion/bindings/swig</filename>
-        and are slowly maturing into a usable state.  These bindings
-        allow you to call Subversion API functions indirectly, using
-        wrappers that translate the datatypes native to your
-        scripting language into the datatypes needed by Subversion's
-        C libraries.</para>
+        Python or Perl script—Subversion has some support for this
+        via the Simplified Wrapper and Interface Generator (SWIG).  The
+        SWIG bindings for Subversion are located in
+        <filename>subversion/bindings/swig</filename> and whilst still
+        maturing, they are in a usable state.  These bindings allow you
+        to call Subversion API functions indirectly, using wrappers that
+        translate the datatypes native to your scripting language into
+        the datatypes needed by Subversion's C libraries.</para>
 
       <para>There is an obvious benefit to accessing the Subversion
         APIs via a language binding—simplicity.  Generally
@@ -1154,16 +1161,15 @@
       <para>Subversion's language bindings unfortunately tend to lack
         the level of attention given to the core Subversion modules.
         However, there have been significant efforts towards creating
-        functional bindings for Python, Perl, and Java.  Once you have
-        the SWIG interface files properly configured, generation of
-        the specific wrappers for all the supported SWIG languages
-        (which currently includes versions of C#, Guile, Java,
-        MzScheme, OCaml, Perl, PHP, Python, Ruby, and Tcl) should
-        theoretically be trivial.  Still, some extra programming is
-        required to compensate for complex APIs that SWIG needs some
-        help generalizing.  For more information on SWIG itself, see
-        the project's website at <systemitem
-        class="url">http://www.swig.org/</systemitem>.</para>
+        functional bindings for Python, Perl, and Ruby.  To some extent,
+        the work done preparing the SWIG interface files for the these
+        languages is reusable in efforts to generate bindings for other
+        languages supported by SWIG (which includes versions of C#,
+        Guile, Java, MzScheme, OCaml, PHP, Tcl, and others).
+        However, some extra programming is required to compensate for
+        complex APIs that SWIG needs some help interfacing with.  For
+        more information on SWIG itself, see the project's website at
+        <ulink url="http://www.swig.org/"/>.</para>
 
     </sect2>
   </sect1>
@@ -1249,30 +1255,34 @@
 <entry
    committed-rev="1"
    name=""
-   committed-date="2002-09-24T17:12:44.064475Z"
-   url="http://svn.red-bean.com/tests/.greek-repo/A/D"
+   committed-date="2005-04-04T13:32:28.526873Z"
+   url="http://svn.red-bean.com/repos/greek-tree/A/D"
+   last-author="jrandom"
    kind="dir"
+   uuid="4e820d15-a807-0410-81d5-aa59edf69161"
    revision="1"/>
 <entry
+   name="lambda"
+   copied="true"
+   kind="file"
+   copyfrom-rev="1"
+   schedule="add"
+   copyfrom-url="http://svn.red-bean.com/repos/greek-tree/A/B/lambda"/>
+<entry
    committed-rev="1"
    name="gamma"
-   text-time="2002-09-26T21:09:02.000000Z"
-   committed-date="2002-09-24T17:12:44.064475Z"
-   checksum="QSE4vWd9ZM0cMvr7/+YkXQ=="
+   text-time="2005-12-11T16:32:46.000000Z"
+   committed-date="2005-04-04T13:32:28.526873Z"
+   checksum="ada10d942b1964d359e048dbacff3460"
+   last-author="jrandom"
    kind="file"
-   prop-time="2002-09-26T21:09:02.000000Z"/>
+   prop-time="2005-12-11T16:32:45.000000Z"/>
 <entry
    name="zeta"
    kind="file"
    schedule="add"
    revision="0"/>
 <entry
-   url="http://svn.red-bean.com/tests/.greek-repo/A/B/delta"
-   name="delta"
-   kind="file"
-   schedule="add"
-   revision="0"/>
-<entry
    name="G"
    kind="dir"/>
 <entry
@@ -1384,8 +1394,7 @@
       both readable and writable objects—over the web.  RFCs
       2518 and 3253 describe the WebDAV/DeltaV extensions to HTTP, and
       are available (along with a lot of other useful information) at
-      <systemitem
-      class="url">http://www.webdav.org/</systemitem>.</para>
+      <ulink url="http://www.webdav.org/"/>.</para>
 
     <para>A number of operating system file browsers are already able
       to mount networked directories using WebDAV.  On Win32, the
@@ -1600,14 +1609,13 @@
     <title>Contributing to Subversion</title>
 
     <para>The official source of information about the Subversion
-      project is, of course, the project's website at <systemitem
-      class="url">http://subversion.tigris.org/</systemitem>.  There
-      you can find information about getting access to the source code
-      and participating on the discussion lists.  The Subversion
-      community always welcomes new members.  If you are
-      interested in participating in this community by contributing
-      changes to the source code, here are some hints on how to get
-      started.</para>
+      project is, of course, the project's website at
+      <ulink url="http://subversion.tigris.org/"/>.  There you can
+      find information about getting access to the source code and
+      participating on the discussion lists.  The Subversion community
+      always welcomes new members.  If you are interested in
+      participating in this community by contributing changes to the
+      source code, here are some hints on how to get started.</para>
 
     <!-- =============================================================== -->
     <sect2 id="svn.developer.contrib.join">
@@ -1663,8 +1671,8 @@
 
       <para>After you have a working Subversion client, you are now
         poised to checkout a working copy of the Subversion source
-        repository from <systemitem
-        class="url">http://svn.collab.net/repos/svn/trunk/</systemitem>:
+        repository from <ulink
+         url="http://svn.collab.net/repos/svn/trunk/"/>:
         <footnote>
           <para>Note that the URL checked out in the example above
             ends not with <literal>svn</literal>, but with a
@@ -1675,11 +1683,11 @@
 
       <screen>
 $ svn checkout http://svn.collab.net/repos/svn/trunk subversion
-A  subversion/HACKING
-A  subversion/INSTALL
-A  subversion/README
-A  subversion/autogen.sh
-A  subversion/build.conf
+A    subversion/HACKING
+A    subversion/INSTALL
+A    subversion/README
+A    subversion/autogen.sh
+A    subversion/build.conf
 …
 </screen>
 
@@ -1702,15 +1710,18 @@
 
       <para>Now that you have a working copy containing the latest
         Subversion source code, you will most certainly want to take a
-        cruise through the <filename>HACKING</filename> file in that
-        working copy's top-level directory.  The
-        <filename>HACKING</filename> file contains general
-        instructions for contributing to Subversion, including how to
-        properly format your source code for consistency with the rest
-        of the codebase, how to describe your proposed changes with an
-        effective change log message, how to test your changes, and so
-        on.  Commit privileges on the Subversion source repository are
-        earned—a government by meritocracy.
+        cruise through the <quote>Hacker's Guide to Subversion</quote>,
+        which is available either as the
+        <filename>www/hacking.html</filename> file in the working copy,
+        or on the Subversion website at <ulink
+          url="http://subversion.tigris.org/hacking.html"/>.  This guide
+        contains general instructions for contributing to Subversion,
+        including how to properly format your source code for
+        consistency with the rest of the codebase, how to describe your
+        proposed changes with an effective change log message, how to
+        test your changes, and so on.  Commit privileges on the
+        Subversion source repository are earned—a government by
+        meritocracy.
         <footnote>
           <para>While this may superficially appear as some sort of
             elitism, this <quote>earn your commit privileges</quote>
@@ -1720,10 +1731,10 @@
             potential costs of undoing changes that are
             dangerous.</para>
         </footnote>
-        The <filename>HACKING</filename> file is an invaluable
-        resource when it comes to making sure that your proposed
-        changes earn the praises they deserve without being rejected
-        on technicalities.</para>
+        The <quote>Hacker's Guide</quote> is an invaluable resource when
+        it comes to making sure that your proposed changes earn the
+        praises they deserve without being rejected on
+        technicalities.</para>
 
     </sect2>
 




More information about the svnbook-dev mailing list