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

dmitriy svnbook-dev at red-bean.com
Sun Dec 4 07:21:17 CST 2005


Author: dmitriy
Date: Sun Dec  4 07:20:53 2005
New Revision: 1878

Modified:
   trunk/src/ru/book/appa.xml   (contents, props changed)
   trunk/src/ru/book/appb.xml   (contents, props changed)
   trunk/src/ru/book/appc.xml   (props changed)
   trunk/src/ru/book/book.xml   (props changed)
   trunk/src/ru/book/ch00.xml   (props changed)
   trunk/src/ru/book/ch01.xml   (contents, props changed)
   trunk/src/ru/book/ch02.xml   (props changed)
   trunk/src/ru/book/ch03.xml   (contents, props changed)
   trunk/src/ru/book/ch04.xml   (contents, 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   (contents, props changed)
   trunk/src/ru/book/ch08.xml   (props changed)
   trunk/src/ru/book/ch09.xml   (contents, 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:
Sync translation with English original text

Modified: trunk/src/ru/book/appa.xml
==============================================================================
--- trunk/src/ru/book/appa.xml	(original)
+++ trunk/src/ru/book/appa.xml	Sun Dec  4 07:20:53 2005
@@ -181,7 +181,7 @@
       to send differences when committing, which CVS cannot do.</para>
 
     <para>The last subcommand in the list is new; it will not only
-      remove local mods, but it will un-schedule operations such as
+      remove local changes, but it will un-schedule operations such as
       adds and deletes.  It's the preferred way to revert a file;
       running <command>rm file; svn update</command> will still work, but
       it blurs the purpose of updating.  And, while we're on this
@@ -206,11 +206,12 @@
       copy, and second, to show the user which files are out-of-date.
       Unfortunately, because of CVS's hard-to-read status output, many
       CVS users don't take advantage of this command at all.  Instead,
-      they've developed a habit of running <command>cvs update</command>
-      or <command>cvs update -n</command> to quickly see their mods.  If
-      users forget to use the <option>-n</option> option, this has the
-      side effect of merging repository changes they may not be ready
-      to deal with.</para>
+      they've developed a habit of running <command>cvs
+      update</command> or <command>cvs -n update</command> to quickly
+      see their changes.  If users forget to use
+      the <option>-n</option> option, this has the side effect of
+      merging repository changes they may not be ready to deal
+      with.</para>
 
     <para>With Subversion, we've tried to remove this muddle by making
       the output of <command>svn status</command> easy to read for
@@ -404,18 +405,17 @@
     <para>In the most general sense, Subversion handles binary files
       more gracefully than CVS does.  Because CVS uses RCS, it can
       only store successive full copies of a changing binary file.
-      But internally, Subversion expresses differences between files
-      using a binary-differencing algorithm, regardless of whether they
+      Subversion, however, expresses differences between files using a
+      binary-differencing algorithm, regardless of whether they
       contain textual or binary data.  That means that all files are
-      stored differentially (compressed) in the repository, and small
-      differences are always sent over the network.</para>
+      stored differentially (compressed) in the repository.</para>
 
     <para>CVS users have to mark binary files with
       <option>-kb</option> flags, to prevent data from being garbled
       (due to keyword expansion and line-ending translations).  They
       sometimes forget to do this.</para>
 
-    <para>Subversion takes the more paranoid route: first, it never
+    <para>Subversion takes the more paranoid route—first, it never
       performs any kind of keyword or line-ending translation unless
       you explicitly ask it do so (see <xref
       linkend="svn.advanced.props.special.keywords"/> and <xref

Modified: trunk/src/ru/book/appb.xml
==============================================================================
--- trunk/src/ru/book/appb.xml	(original)
+++ trunk/src/ru/book/appb.xml	Sun Dec  4 07:20:53 2005
@@ -42,7 +42,7 @@
         universal read/write medium.  The basic idea is that a
         WebDAV-compliant web server can act like a generic file
         server; clients can mount shared folders that behave much like
-        NFS or SMB filesystems..</para>
+        NFS or SMB filesystems.</para>
 
       <para>The tragedy, though, is that the RFC 2518 WebDAV
         specification does not provide any sort of model for version
@@ -158,7 +158,7 @@
         <varlistentry>
           <term>Per-resource versioning</term>
           <listitem>
-            <para> Like CVS and other version-control systems,
+            <para>Like CVS and other version-control systems,
               DeltaV assumes that each resource has a potentially
               infinite number of states. A client begins by placing
               a resource under version control using the new
@@ -233,7 +233,7 @@
 
       </variablelist>
 
-      </sect2>
+    </sect2>
 
   </sect1>
 
@@ -316,7 +316,7 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.webdav.autoversioning">
-    <title>Autoversioning </title>
+    <title>Autoversioning</title>
 
     <para>While the Subversion client is not a full DeltaV client, nor
       the Subversion server a full DeltaV server, there's still a
@@ -334,7 +334,7 @@
       DeltaV server supports autoversioning, then write-requests from
       basic WebDAV clients are accepted.  The server behaves *as if*
       the client had issued the proper series of versioning requests,
-      peforming a commit under the hood.  In other words, it allows a
+      performing a commit under the hood.  In other words, it allows a
       DeltaV server to interoperate with ordinary WebDAV
       clients.</para>
 
@@ -355,7 +355,7 @@
       directive within the <filename>httpd.conf</filename> Location
       block, like so:</para>
 
-              <screen>
+    <screen>
 <Location /repos>
   DAV svn
   SVNPath /path/to/repository
@@ -363,7 +363,6 @@
 </Location>
 </screen>
 
-
     <para>When SVNAutoversioning is active, write requests from WebDAV
       clients result in automatic commits.  A generic log message is
       auto-generated and attached to each revision.</para>
@@ -398,162 +397,99 @@
   <sect1 id="svn.webdav.clients">
     <title>Client Interoperability</title>
 
-    <para>In this section, we'll describe the most common WebDAV clients (at
-      the time of writing), and how well they operate against an
-      autoversioning mod_dav_svn server.</para>
-
-    <para>All WebDAV clients fall into one of three categories.  These
-      categories are the main definers of what users can and cannot
-      do.</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term>Standalone application</term>
-
-        <listitem>
-          <para>The WebDAV functionality is buried within a single
-            application.  For example, Microsoft Word is able to open a
-            file directly from a URL.  It locks the file when this
-            happens, and every subsequent <quote>save</quote> command
-            results in a PUT request.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>File-explorer extension</term>
-
-        <listitem>
-          <para>The WebDAV functionality is an extension to a GUI
-            program that is normally used to browse filesystems,
-            either local or remote.  For example, Windows Explorer is
-            able to browse a WebDAV server as a <quote>network
-            place</quote>.  Users can drag files to and from the
-            desktop, or can rename, copy, or delete files in the usual
-            way.  But because it's only a feature of the
-            file-explorer, the DAV share isn't visible to ordinary
-            applications.  All DAV interaction must happen through the
-            explorer interface.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Filesystem implementation</term>
-
-        <listitem>
-          <para>This the best sort of WebDAV client.  It's implemented
-            as a low-level filesystem (typically within the operating
-            system's kernel.)  This means that the DAV share is
-            mounted like any other network filesystem, similar to
-            mounting an NFS share on Unix, or attaching an SMB share
-            as drive-letter in Windows.  As a result, this sort of
-            client provides completely transparent read/write WebDAV
-            access to all programs.  Applications aren't even aware
-            that WebDAV requests are happening.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>There are many WebDAV clients, far too many to list.  Here
-      we provide some details about our experiences with some of the
-      more popular ones.</para>
+    <para>All WebDAV clients fall into one of three
+      categories—standalone applications, file-explorer
+      extensions, or filesystem implementations.  These categories
+      broadly define the types of WebDAV functionality available to
+      users.  <xref linkend="svn.webdav.clients.tbl-1"/> gives our
+      categorization and a quick description of some common pieces of
+      WebDAV-enabled software.  More details about these software
+      offerings, as well as their general category, can be found in
+      the sections that follow.</para>
 
     <table id="svn.webdav.clients.tbl-1">
       <title>Common WebDAV Clients</title>
-      <tgroup cols="4">
+      <tgroup cols="3">
         <thead>
           <row>
-            <entry>DAV Client</entry>
-            <entry>Standalone</entry>
-            <entry>File-explorer</entry>
-            <entry>Filesystem</entry>
+            <entry>Software</entry>
+            <entry>Category</entry>
+            <entry>Description</entry>
           </row>
         </thead>
         <tbody>
-
           <row>
-            <entry>Windows Webfolders</entry>
-            <entry></entry>
-            <entry>x</entry>
-            <entry>x</entry>
+            <entry>Adobe Photoshop</entry>
+            <entry>Standalone WebDAV applications</entry>
+            <entry>Image editing software, allowing direct opening
+              from, and writing to, WebDAV URLs</entry>
           </row>
-
           <row>
-            <entry>WebDrive</entry>
-            <entry></entry>
-            <entry></entry>
-            <entry>x</entry>
+            <entry>Cadaver</entry>
+            <entry>Standalone WebDAV applications</entry>
+            <entry>Command-line WebDAV client supporting file
+              transfer, tree, and locking operations</entry>
           </row>
-
           <row>
-            <entry>NetDrive</entry>
-            <entry></entry>
-            <entry></entry>
-            <entry>x</entry>
+            <entry>DAV Explorer</entry>
+            <entry>Standalone WebDAV applications</entry>
+            <entry>GUI tool for exploring WebDAV shares</entry>
           </row>
-
           <row>
-            <entry>Mac OS X</entry>
-            <entry></entry>
-            <entry></entry>
-            <entry>x</entry>
+            <entry>davfs2</entry>
+            <entry>WebDAV filesystem implementation</entry>
+            <entry>Linux file system driver that allows you to mount a
+              WebDAV share</entry>
           </row>
-
           <row>
             <entry>GNOME Nautilus</entry>
-            <entry></entry>
-            <entry>x</entry>
-            <entry></entry>
+            <entry>File-explorer WebDAV extensions</entry>
+            <entry>GUI file explorer able to perform tree
+              operations on a WebDAV share</entry>
           </row>
-
           <row>
             <entry>KDE Konqueror</entry>
-            <entry></entry>
-            <entry>x</entry>
-            <entry></entry>
+            <entry>File-explorer WebDAV extensions</entry>
+            <entry>GUI file explorer able to perform tree
+              operations on a WebDAV share</entry>
           </row>
-
           <row>
-            <entry>Linux davfs2</entry>
-            <entry></entry>
-            <entry></entry>
-            <entry>x</entry>
+            <entry>Mac OS X</entry>
+            <entry>WebDAV filesystem implementation</entry>
+            <entry>Operating system with built-in support for mounting
+              WebDAV shares locally</entry>
           </row>
-
           <row>
-            <entry>Cadaver</entry>
-            <entry>x</entry>
-            <entry></entry>
-            <entry></entry>
+            <entry>Macromedia Dreamweaver</entry>
+            <entry>Standalone WebDAV applications</entry>
+            <entry>Web production software able to directly read from
+              and write to WebDAV URLs</entry>
           </row>
-
           <row>
-            <entry>DAV Explorer</entry>
-            <entry>x</entry>
-            <entry></entry>
-            <entry></entry>
+            <entry>Microsoft Office</entry>
+            <entry>Standalone WebDAV applications</entry>
+            <entry>Office productivity suite with several components
+              able to directly read from and write to WebDAV
+              URLs</entry>
           </row>
-
           <row>
-            <entry>Microsoft Office</entry>
-            <entry>x</entry>
-            <entry></entry>
-            <entry></entry>
+            <entry>Microsoft Webfolders</entry>
+            <entry>File-explorer WebDAV extensions</entry>
+            <entry>GUI file explorer program able to perform tree
+              operations on a WebDAV share</entry>
           </row>
-
           <row>
-            <entry>Dreamweaver</entry>
-            <entry>x</entry>
-            <entry></entry>
-            <entry></entry>
+            <entry>Novell NetDrive</entry>
+            <entry>WebDAV filesystem implementation</entry>
+            <entry>Drive-mapping program for assigning Windows drive
+              letters to a mounted remote WebDAV share</entry>
           </row>
-
           <row>
-            <entry>Photoshop</entry>
-            <entry>x</entry>
-            <entry></entry>
-            <entry></entry>
+            <entry>SRT WebDrive</entry>
+            <entry>WebDAV filesystem implementation</entry>
+            <entry>File transfer software which, among other things,
+              allows the assignment of Windows drive letters to a
+              mounted remote WebDAV share</entry>
           </row>
 
         </tbody>
@@ -561,196 +497,57 @@
     </table>
 
     <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.windows">
-      <title>Windows Webfolders, WebDrive, Netdrive</title>
-
-      <para>Microsoft was one of the original backers of the WebDAV
-        specification, and first started shipping a client in Windows
-        98, known as <quote>Webfolders</quote>.  This client was also
-        shipped in Windows NT4 and 2000.</para>
-
-      <para>The original Webfolders client was an extension to
-        Explorer, the main GUI program used to browse filesystems.  It
-        works well enough.  In Windows 98, the feature might need to
-        be explicitly installed if Webfolders aren't already visible
-        inside <quote>My Computer</quote>.  In Windows 2000, simply
-        add a new <quote>network place</quote>, enter the URL, and the
-        WebDAV share will pop up for browsing.</para>
-
-      <para>With the release of Windows XP, Microsoft started shipping
-        a new implementation of Webfolders, known as the <quote>WebDAV
-        mini-redirector</quote>.  The new implementation is a
-        filesystem-level client, allowing WebDAV shares to be mounted
-        as drive letters.  Unfortunately, this implementation is
-        incredibly buggy.  The client usually tries to convert http
-        URLs (<literal>http://host/repos</literal>) into UNC share
-        notation (<literal>\\host\repos</literal>); it also often
-        tries to use Windows Domain authentication to respond to
-        basic-auth HTTP challenges, sending usernames as
-        <literal>HOST\username</literal>.  These interoperability
-        problems are severe and documented in numerous places around
-        the web, to the frustration of many users.  Even Greg Stein,
-        the original author of Apache's WebDAV module, recommends
-        against trying to use XP Webfolders against an Apache
-        server.</para>
-
-      <para>It turns out that the original
-        <quote>Explorer-only</quote> Webfolders implementation isn't
-        dead in XP, it's just buried.  It's still possible to find it
-        by using this technique:</para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>Go to 'Network Places'.</para>
-        </listitem>
-
-        <listitem>
-          <para>Add a new network place.</para>
-        </listitem>
-
-        <listitem>
-          <para>When prompted, enter the URL of the repository, but
-            <emphasis>include a port number</emphasis> in the URL.
-            For example, <literal>http://host/repos</literal> would be
-            entered as <literal>http://host:80/repos</literal> instead.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Respond to any authentication prompts.</para>
-        </listitem>
-
-      </orderedlist>
-
-      <para>There are a number of other rumored workarounds to the
-        problems, but none of them seem to work on all versions and
-        patchlevels of Windows XP.  In our tests, only the previous
-        algorithm seems to work consistently on every system.  The
-        general consensus of the WebDAV community is:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Avoid the new Webfolders implementation, use the old
-          one.</para>
-        </listitem>
-
-        <listitem>
-          <para>If you need real a real filesystem-level client for
-            Windows XP, then use either WebDrive or NetDrive.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>Both WebDrive and NetDrive are excellent commercial
-        products which allows a WebDAV share to be attached as drive
-        letters.  We've had nothing but success with these products.
-        At the time of writing, WebDrive can be purchased from South
-        River Technologies (<ulink
-        url="http://www.southrivertech.com"/>).  NetDrive ships with
-        Netware, is free of charge, and can be found by searching the
-        web for <quote>netdrive.exe</quote>.  (If that sounds odd to
-        you, you're not alone.  See this page on Novell's website:
-        <ulink
-        url="http://www.novell.com/coolsolutions/qna/999.html"/>)</para>
-
-    </sect2>
-
-
-    <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.macosx">
-      <title>Mac OS X</title>
-
-      <para>Apple's OS X operating system has an integrated
-        filesystem-level WebDAV client. From the Finder, select the
-        <guimenuitem>Connect to Server</guimenuitem> item from the
-        <guimenu>Go menu</guimenu>.  Enter a WebDAV URL, and it
-        appears as a disk on the desktop, just like any other mounted
-        volume.<footnote><para>From the Darwin terminal, one can also
-        run <literal>mount -t webdav URL
-        /mountpoint</literal></para></footnote>.</para>
-
-      <para>Note that if your mod_dav_svn is older than version 1.2,
-        OS X will refuse to mount the share as read-write; it will
-        appear as read-only.  This is because the OS X insists on
-        locking support for read-write shares, and the ability to lock
-        files first appeared in Subversion 1.2.</para>
-
-      <para>One more word of warning: OS X's WebDAV client can
-        sometimes be overly sensitive to HTTP redirects. If OS X is
-        unable to mount the repository at all, you may need to enable
-        the BrowserMatch directive in the Apache server's
-        <filename>httpd.conf</filename>:</para>
-
-      <screen>
-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
-</screen>
-
-    </sect2>
-
-
-    <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.linux-de">
-      <title>Nautilus, Konqueror</title>
+    <sect2 id="svn.webdav.clients.standalone">
+      <title>Standalone WebDAV applications</title>
 
-      <para>Nautilus is the official file manager/browser for the
-        GNOME desktop (<ulink url="http://www.gnome.org"/>), and
-        Konqueror is the manager/browser for KDE desktop (<ulink
-        url="http://www.kde.org"/>).  Both of these applications have
-        an explorer-level WebDAV client built-in, and operate just
-        fine against an autoversioning repository.</para>
-
-      <para>In GNOME's Nautilus, from the <guimenu>File
-        menu</guimenu>, select <guimenuitem>Open
-        location</guimenuitem> and enter the URL.  The repository
-        should then be displayed like any other filesystem.</para>
-
-      <para>In KDE's Konqueror, you need to use the
-        <literal>webdav://</literal> scheme when entering the URL in
-        the location bar.  If you enter an <literal>http://</literal>
-        URL, Konqueror will behave like an ordinary web browser.
-        You'll likely see the generic HTML directory listing produced
-        by mod_dav_svn.  By entering
-        <literal>webdav://host/repos</literal> instead of
-        <literal>http://host/repos</literal>, Konqueror becomes a
-        WebDAV client and displays the repository as a
-        filesystem.</para>
-
-    </sect2>
-
-    <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.linux-fs">
-      <title>Linux davfs2</title>
-
-      <para>Linux davfs2 is a filesystem module for the Linux kernel,
-        whose development is located at <ulink
-        url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
-        network share can be mounted with the usual Linux mount
-        command:</para>
-
-      <screen>
-mount.davfs http://host/repos /mnt/dav
-</screen>
-
-    </sect2>
-
-    <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.free-apps">
-      <title>Cadaver, DAV Explorer</title>
-
-      <para>Cadaver is a bare-bones Unix commandline program for
-        browsing and changing WebDAV shares.  Like the Subversion
-        client, it uses the neon HTTP library—not surprisingly,
-        both neon and cadaver are written by the same author.  Cadaver
-        is free sofware (GPL license) and is available at <ulink
-        url="http://www.webdav.org/cadaver/"/>.</para>
-
-      <para>Using cadaver is similar to using a commandline FTP
-        program, and thus it's extremely useful for basic WebDAV
-        debugging.  It can be used to upload or download files in a
-        pinch, and also to examine properties, copy, move, lock or
-        unlock files:</para>
-
-      <screen>
+      <para>A WebDAV application is a program which contains built-in
+        functionality for speaking WebDAV protocols with a WebDAV
+        server.  We'll cover some of the most popular programs with
+        this kind of WebDAV support.</para>
+
+      <sect3 id="svn.webdav.clients.standalone.windows">
+        <title>Microsoft Office, Dreamweaver, Photoshop</title> 
+  
+        <para>On Windows, there are several well-known applications
+          that contain integrated WebDAV client functionality, such as
+          Microsoft's Office,
+          <footnote>
+            <para>WebDAV support was removed from Microsoft Access for
+              some reason, but exists in the rest of the Office
+              suite.</para>
+          </footnote>
+          Adobe's Photoshop, and Macromedia's Dreamweaver programs.
+          They're able to directly open and save to URLs, and tend to
+          make heavy use of WebDAV locks when editing a file.</para>
+  
+        <para>Note that while many of these programs also exist for
+          the Mac OS X, they do not appear to support WebDAV directly
+          on that platform.  In fact, on Mac OS X, the
+          <guimenu>File->Open</guimenu> dialog box doesn't allow
+          one to type a path or URL at all.  It's likely that the the
+          WebDAV features were deliberately left out of Macintosh
+          versions of these programs, since OS X already provides such
+          excellent low-level filesystem support for WebDAV.</para>
+  
+      </sect3>
+
+      <sect3 id="svn.webdav.clients.standalone.free">
+        <title>Cadaver, DAV Explorer</title>
+  
+        <para>Cadaver is a bare-bones Unix commandline program for
+          browsing and changing WebDAV shares.  Like the Subversion
+          client, it uses the neon HTTP library—not surprisingly,
+          both neon and cadaver are written by the same author.  Cadaver
+          is free software (GPL license) and is available at <ulink
+          url="http://www.webdav.org/cadaver/"/>.</para>
+  
+        <para>Using cadaver is similar to using a commandline FTP
+          program, and thus it's extremely useful for basic WebDAV
+          debugging.  It can be used to upload or download files in a
+          pinch, and also to examine properties, copy, move, lock or
+          unlock files:</para>
+        
+        <screen>
 $ cadaver http://host/repos
 dav:/repos/> ls
 Listing collection `/repos/': succeeded.
@@ -768,43 +565,221 @@
 Progress: [=============================>] 100.0% of 1461 bytes succeeded.
 </screen>
 
-      <para>DAV Explorer is another standalone WebDAV client, written
-        in Java.  It's under a free Apache-like license and is
-        available at <ulink url="http://www.ics.uci.edu/~webdav/"/>.
-        DAV Explorer does everything cadaver does, but has the
-        advantages of being portable and being more user-friendly GUI
-        application.  It's also one of the first clients to support
-        the new WebDAV Access Control Protocol (RFC 3744).</para>
-
-      <para>Of course, DAV Explorer's ACL support is useless in this
-        case, since mod_dav_svn doesn't support it.  The fact that
-        both Cadaver and DAV Explorer support some limited DeltaV
-        commands isn't particularly useful either, since they don't
-        allow <literal>MKACTIVITY</literal> requests.  But it's not
-        relevant anyway; we're assuming all of these clients are
-        operating against an autoversioning repository.</para>
-
+        <para>DAV Explorer is another standalone WebDAV client, written
+          in Java.  It's under a free Apache-like license and is
+          available at <ulink url="http://www.ics.uci.edu/~webdav/"/>.
+          DAV Explorer does everything cadaver does, but has the
+          advantages of being portable and being more user-friendly GUI
+          application.  It's also one of the first clients to support
+          the new WebDAV Access Control Protocol (RFC 3744).</para>
+  
+        <para>Of course, DAV Explorer's ACL support is useless in this
+          case, since mod_dav_svn doesn't support it.  The fact that
+          both Cadaver and DAV Explorer support some limited DeltaV
+          commands isn't particularly useful either, since they don't
+          allow <literal>MKACTIVITY</literal> requests.  But it's not
+          relevant anyway; we're assuming all of these clients are
+          operating against an autoversioning repository.</para>
+  
+      </sect3>
     </sect2>
 
     <!-- =============================================================== -->
-    <sect2 id="svn.webdav.clients.win-apps">
-      <title>Microsoft Office, Dreamweaver, Photoshop</title>
-
-      <para>These are large well-known applications that contain
-        integrated WebDAV client functionality.  They're able to
-        directly open a URL, save to a URL, and tend to make heavy use
-        of WebDAV locks when editing a file.</para>
-
-      <para>It appears that only the Windows versions of these
-        programs support WebDAV.  On Mac OS X, the
-        <quote>File->Open</quote> dialog box doesn't allow one to type
-        a path or URL at all.  It's likely that the the WebDAV
-        features were deliberately left out of Macintosh versions of
-        these programs, since OS X already provides such excellent
-        low-level filesystem support for WebDAV.</para>
+    <sect2 id="svn.webdav.clients.file-explorer-extensions">
+      <title>File-explorer WebDAV extensions</title>
 
+      <para>Some popular file explorer GUI programs support WebDAV
+        extensions which allow a user to browse a DAV share as if it
+        was just another directory on the local computer, and allowing
+        basic tree editing operations on the items in that share.  For
+        example, Windows Explorer is able to browse a WebDAV server as
+        a <quote>network place</quote>.  Users can drag files to and
+        from the desktop, or can rename, copy, or delete files in the
+        usual way.  But because it's only a feature of the
+        file-explorer, the DAV share isn't visible to ordinary
+        applications.  All DAV interaction must happen through the
+        explorer interface.</para>
+
+      <sect3 id="svn.webdav.clients.file-explorer-extensions.windows">
+        <title>Microsoft Webfolders</title> 
+  
+        <para>Microsoft was one of the original backers of the WebDAV
+          specification, and first started shipping a client in Windows
+          98, known as <quote>Webfolders</quote>.  This client was also
+          shipped in Windows NT4 and 2000.</para>
+  
+        <para>The original Webfolders client was an extension to
+          Explorer, the main GUI program used to browse filesystems.  It
+          works well enough.  In Windows 98, the feature might need to
+          be explicitly installed if Webfolders aren't already visible
+          inside <quote>My Computer</quote>.  In Windows 2000, simply
+          add a new <quote>network place</quote>, enter the URL, and the
+          WebDAV share will pop up for browsing.</para>
+  
+        <para>With the release of Windows XP, Microsoft started shipping
+          a new implementation of Webfolders, known as the <quote>WebDAV
+          mini-redirector</quote>.  The new implementation is a
+          filesystem-level client, allowing WebDAV shares to be mounted
+          as drive letters.  Unfortunately, this implementation is
+          incredibly buggy.  The client usually tries to convert http
+          URLs (<literal>http://host/repos</literal>) into UNC share
+          notation (<literal>\\host\repos</literal>); it also often
+          tries to use Windows Domain authentication to respond to
+          basic-auth HTTP challenges, sending usernames as
+          <literal>HOST\username</literal>.  These interoperability
+          problems are severe and documented in numerous places around
+          the web, to the frustration of many users.  Even Greg Stein,
+          the original author of Apache's WebDAV module, recommends
+          against trying to use XP Webfolders against an Apache
+          server.</para>
+  
+        <para>It turns out that the original
+          <quote>Explorer-only</quote> Webfolders implementation isn't
+          dead in XP, it's just buried.  It's still possible to find it
+          by using this technique:</para>
+  
+        <orderedlist>
+  
+          <listitem>
+            <para>Go to 'Network Places'.</para>
+          </listitem>
+  
+          <listitem>
+            <para>Add a new network place.</para>
+          </listitem>
+  
+          <listitem>
+            <para>When prompted, enter the URL of the repository, but
+              <emphasis>include a port number</emphasis> in the URL.
+              For example, <literal>http://host/repos</literal> would be
+              entered as <literal>http://host:80/repos</literal> instead.
+            </para>
+          </listitem>
+  
+          <listitem>
+            <para>Respond to any authentication prompts.</para>
+          </listitem>
+  
+        </orderedlist>
+  
+        <para>There are a number of other rumored workarounds to the
+          problems, but none of them seem to work on all versions and
+          patchlevels of Windows XP.  In our tests, only the previous
+          algorithm seems to work consistently on every system.  The
+          general consensus of the WebDAV community is that you should
+          avoid the new Webfolders implementation and use the old one
+          instead, and that if you need real a real filesystem-level
+          client for Windows XP, then use a third-party program like
+          WebDrive or NetDrive.</para>
+
+      </sect3>
+
+      <sect3 id="svn.webdav.clients.file-explorer-extensions.linux-de">
+        <title>Nautilus, Konqueror</title> 
+  
+        <para>Nautilus is the official file manager/browser for the
+          GNOME desktop (<ulink url="http://www.gnome.org"/>), and
+          Konqueror is the manager/browser for KDE desktop (<ulink
+          url="http://www.kde.org"/>).  Both of these applications have
+          an explorer-level WebDAV client built-in, and operate just
+          fine against an autoversioning repository.</para>
+  
+        <para>In GNOME's Nautilus, from the <guimenu>File
+          menu</guimenu>, select <guimenuitem>Open
+          location</guimenuitem> and enter the URL.  The repository
+          should then be displayed like any other filesystem.</para>
+  
+        <para>In KDE's Konqueror, you need to use the
+          <literal>webdav://</literal> scheme when entering the URL in
+          the location bar.  If you enter an <literal>http://</literal>
+          URL, Konqueror will behave like an ordinary web browser.
+          You'll likely see the generic HTML directory listing produced
+          by mod_dav_svn.  By entering
+          <literal>webdav://host/repos</literal> instead of
+          <literal>http://host/repos</literal>, Konqueror becomes a
+          WebDAV client and displays the repository as a
+          filesystem.</para>
+  
+      </sect3>
     </sect2>
 
+    <sect2 id="svn.webdav.clients.fs-impl">
+      <title>WebDAV filesystem implementation</title>
+
+      <para>The WebDAV filesystem implementation is arguably the best
+        sort of WebDAV client.  It's implemented as a low-level
+        filesystem module, typically within the operating system's
+        kernel.  This means that the DAV share is mounted like any
+        other network filesystem, similar to mounting an NFS share on
+        Unix, or attaching an SMB share as drive-letter in Windows.
+        As a result, this sort of client provides completely
+        transparent read/write WebDAV access to all programs.
+        Applications aren't even aware that WebDAV requests are
+        happening.</para>
+
+      <sect3 id="svn.webdav.clients.fs-impl.windows">
+        <title>WebDrive, NetDrive</title> 
+  
+        <para>Both WebDrive and NetDrive are excellent commercial
+          products which allows a WebDAV share to be attached as drive
+          letters in Windows.  We've had nothing but success with
+          these products.  At the time of writing, WebDrive can be
+          purchased from South River Technologies (<ulink
+          url="http://www.southrivertech.com"/>).  NetDrive ships with
+          Netware, is free of charge, and can be found by searching
+          the web for <quote>netdrive.exe</quote>.  Though it is
+          freely available online, users are required to have a
+          Netware license.  (If any of that sounds odd to you, you're
+          not alone.  See this page on Novell's website: <ulink
+          url="http://www.novell.com/coolsolutions/qna/999.html"/>)</para>
+  
+      </sect3>
+
+      <sect3 id="svn.webdav.clients.fs-impl.macosx">
+        <title>Mac OS X</title> 
+
+        <para>Apple's OS X operating system has an integrated
+          filesystem-level WebDAV client.  From the Finder, select the
+          <guimenuitem>Connect to Server</guimenuitem> item from the
+          <guimenu>Go menu</guimenu>.  Enter a WebDAV URL, and it
+          appears as a disk on the desktop, just like any other mounted
+          volume.<footnote><para>From the Darwin terminal, one can also
+          run <literal>mount -t webdav URL
+          /mountpoint</literal></para></footnote>.</para>
+  
+        <para>Note that if your mod_dav_svn is older than version 1.2,
+          OS X will refuse to mount the share as read-write; it will
+          appear as read-only.  This is because the OS X insists on
+          locking support for read-write shares, and the ability to lock
+          files first appeared in Subversion 1.2.</para>
+  
+        <para>One more word of warning: OS X's WebDAV client can
+          sometimes be overly sensitive to HTTP redirects. If OS X is
+          unable to mount the repository at all, you may need to enable
+          the BrowserMatch directive in the Apache server's
+          <filename>httpd.conf</filename>:</para>
+  
+        <screen>
+BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+</screen>
+  
+      </sect3>
+
+      <sect3 id="svn.webdav.clients.fs-impl.linux">
+        <title>Linux davfs2</title> 
+  
+        <para>Linux davfs2 is a filesystem module for the Linux kernel,
+          whose development is located at <ulink
+          url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
+          network share can be mounted with the usual Linux mount
+          command:</para>
+  
+        <screen>
+$ mount.davfs http://host/repos /mnt/dav
+</screen>
+  
+      </sect3>
+    </sect2>
   </sect1>
 
 </appendix>

Modified: trunk/src/ru/book/ch01.xml
==============================================================================
--- trunk/src/ru/book/ch01.xml	(original)
+++ trunk/src/ru/book/ch01.xml	Sun Dec  4 07:20:53 2005
@@ -6,7 +6,7 @@
   @ENGLISH }}} -->
   <title>Введение</title>
   <chapterinfo>
-    <othername id="svn.intro.architecure.dia-1.prepositional-case"
+    <othername id="svn.intro.architecture.dia-1.prepositional-case"
       role="title-variant">рисунке 1.1, «Архитектура
         Subversion»</othername>
   </chapterinfo>
@@ -194,7 +194,7 @@
       he'd already come up with not only the name
       <quote>Subversion</quote>, but also with the basic design of the
       Subversion repository.  When CollabNet called, Karl immediately
-      agreed to work on the project, and Jim got his employer, RedHat
+      agreed to work on the project, and Jim got his employer, Red Hat
       Software, to essentially donate him to the project for an
       indefinite period of time.  CollabNet hired Karl and Ben
       Collins-Sussman, and detailed design work began in May.  With
@@ -565,15 +565,15 @@
     <title>Архитектура Subversion</title>
 
     <!-- @ENGLISH {{{
-    <para><xref linkend="svn.intro.architecure.dia-1"/> illustrates what one might
+    <para><xref linkend="svn.intro.architecture.dia-1"/> illustrates what one might
       call a <quote>mile-high</quote> view of Subversion's
       design.</para>
     @ENGLISH }}} -->
     <para>Общий взгляд на устройство Subversion показан на <xref
-        linkend="svn.intro.architecure.dia-1"
-        endterm="svn.intro.architecure.dia-1.prepositional-case"/>.</para>
+        linkend="svn.intro.architecture.dia-1"
+        endterm="svn.intro.architecture.dia-1.prepositional-case"/>.</para>
 
-    <figure id="svn.intro.architecure.dia-1">
+    <figure id="svn.intro.architecture.dia-1">
       <!-- @ENGLISH {{{
       <title>Subversion's Architecture</title>
       @ENGLISH }}} -->

Modified: trunk/src/ru/book/ch03.xml
==============================================================================
--- trunk/src/ru/book/ch03.xml	(original)
+++ trunk/src/ru/book/ch03.xml	Sun Dec  4 07:20:53 2005
@@ -316,7 +316,7 @@
 
 $ svn diff --revision HEAD
 <!-- @ENGLISH {{{
-# compares your working file (with local mods) to the latest version
+# compares your working file (with local changes) to the latest version
 # in the repository
 @ENGLISH }}} -->
 # сравнение вашего рабочего файла (с учетом локальных изменений)
@@ -324,7 +324,7 @@
 
 $ svn diff --revision BASE:HEAD foo.c
 <!-- @ENGLISH {{{
-# compares your <quote>pristine</quote> foo.c (no local mods) with the
+# compares your <quote>pristine</quote> foo.c (no local changes) with the 
 # latest version in the repository
 @ENGLISH }}} -->
 # сравнение вашего <quote>исходного</quote> foo.c (без учета локальных
@@ -523,11 +523,11 @@
       (latest revision) of the Subversion repository that you specify
       on the command line:</para>
     @ENGLISH }}} -->
-    <para>Как правило использование хранилища Subversion начинается с
-      <firstterm>создания рабочей копии</firstterm> вашего проекта.
-      При создании рабочей копии на вашей локальной машине создается копия
+    <para>Как правило работа с Subversion-хранилищем начинается с
+      <firstterm>создания рабочей копии</firstterm> проекта.
+      При создании рабочей копии на локальной машине создается копия
       хранилища. Эта копия содержит <literal>HEAD</literal> (последнюю
-      ревизию) указанного вами в командной строке хранилища:</para>
+      правку) хранилища, указанного в командной строке:</para>
 
 
     <screen>
@@ -543,19 +543,110 @@
 
     <sidebar>
       <!-- @ENGLISH {{{
-      <title>Repository Layout</title>
+     <title>What's in a Name?</title>
       @ENGLISH }}} -->
-      <title>Структура хранилища</title>
+      <title></title>
 
       <!-- @ENGLISH {{{
-      <para>If you're wondering what <literal>trunk</literal> is all
-        about in the above URL, it's part of the way we recommend
-        you lay out your Subversion repository which we'll talk a lot
-        more about in <xref linkend="svn.branchmerge"/>.</para>
+      <para>Subversion tries hard not to limit the type of data you
+        can place under version control.  The contents of files and
+        property values are stored and transmitted as binary data, and
+        the <xref linkend="svn.advanced.props.special.mime-type"/>
+        tells you how to give Subversion a hint that
+        <quote>textual</quote> operations don't make sense for a
+        particular file.  There are a few places, however, where
+        Subversion places restrictions on information it
+        stores.</para>
+      @ENGLISH }}} -->
+      <para>Subversion очень старается не ограничивать типы данных,
+        которые можно поместить под контроль системы. Содержимое файлов и
+        значения свойств хранятся и передаются как бинарная информация,
+        как сказать Subversion о том, что для отдельного файла 
+        <quote>текстовые</quote> операции не имеют смысла вы узнаете в разделе
+        <xref linkend="svn.advanced.props.special.mime-type"/>. Однако есть
+        ситуации, когда Subversion налагает некоторые ограничения на хранимую
+        информацию.</para>
+
+      <!-- @ENGLISH {{{
+      <para>Subversion handles text internally as UTF-8 encoded
+        Unicode.  As a result, certain items which are inherently
+        <quote>textual</quote>, such as property names, path names,
+        and log messages, can only contain legal UTF-8 characters.  It
+        also provides a minimum requirement for use of the
+        <literal>svn:mime-type</literal> property—if a file's
+        contents aren't compatible with UTF-8, you should mark it as a
+        binary file.  Otherwise, Subversion will attempt to merge
+        differences using UTF-8, which is likely to leave garbage in
+        the file.</para>
+      @ENGLISH }}} -->
+      <para>Внутри Subversion текст представляется в Unicode-кодировке
+        UTF-8. Как следствие, некоторые элементы, имеющие 
+        <quote>текстовую</quote> сущность, например имена свойств, пути 
+        и лог-сообщения, могут содержать только корректные UTF-8 
+        символы. Это частично объясняет необходимость свойства 
+        <literal>svn:mime-type</literal> — файл, не совместимый с 
+        UTF-8 необходимо пометить как бинарный. В противном случае 
+        Subversion будет пытаться, используя UTF-8,  выполнить 
+        объединение различий, что скорее всего закончиться 
+        замусориванием файла.</para>
+
+      <!-- @ENGLISH {{{
+      <para>In addition, path names are used as XML attribute values
+        in WebDAV exchanges, as well in as some of Subversion's
+        housekeeping files.  This means that path names can only
+        contain legal XML (1.0) characters.  Subversion also prohibits
+        TAB, CR, and LF characters in path names, so they aren't
+        broken up in diffs, or in the output of commands like <xref
+        linkend="svn.ref.svn.c.log"/> or <xref
+        linkend="svn.ref.svn.c.status"/>.</para>
+      @ENGLISH }}} -->
+      <para>Кроме того, пути используются как значения XML атрибутов при 
+        WebDAV тразакциях, а так же в некоторых собственных файлах 
+        Subversion. Это значит, что при указании путей могут 
+        использоваться только корректные для XML (1.0) символы. Так же при 
+        указании путей Subversion запрещает использовать символы TAB, CR 
+        и LF, что бы они не рассыпались при показе различий и в выводе 
+        таких команд как <xref linkend="svn.ref.svn.c.log"/> или <xref
+        linkend="svn.ref.svn.c.status"/>.</para>
+
+      <!-- @ENGLISH {{{
+      <para>While it may seem like a lot to remember, in practice
+        these limitations are rarely a problem.  As long as your
+        locale settings are compatible with UTF-8, and you don't use
+        control characters in path names, you should have no trouble
+        communicating with Subversion.  The command-line client adds
+        an extra bit of help—it will automatically escape legal
+        path characters as needed in URLs you type to create
+        <quote>legally correct</quote> versions for internal
+        use.</para>
+      @ENGLISH }}} -->
+      <para>Возможно вам показалось, что необходимо помнить очень много 
+        всего, однако на практике эти ограничения не вызывают 
+        сложностей. Если ваши локальные установки совместимы с UTF-8 и 
+        вы не используете специальных символов при указании путей, 
+        проблем при работе с Subversion у вас не возникнет. Клиент для 
+        командной строки немного в этом помогает — автоматически 
+        заменяет некорректные символы, встречающиеся в набранных URL,
+        <quote>юридически правильными</quote> версиями для внутреннего 
+        использования.</para>
+
+      <!-- @ENGLISH {{{
+      <para>Experienced users of Subversion have also developed a set
+        of best-practice conventions for laying out paths in the
+        repository.  While these aren't strict requirements like the
+        syntax described above, they help to organize frequently
+        performed tasks.  The <literal>/trunk</literal> part of URLs
+        you'll find throughout this book is one of these conventions;
+        we'll talk a lot more about it and related recommendations in
+        <xref linkend="svn.branchmerge"/>.</para>
       @ENGLISH }}} -->
-      <para>Если вас удивляет почему в приведенном выше URL встречается
-        <literal>trunk</literal> — это часть рекомендуемой нами
-        структуры хранилища Subversion, о ней мы поговорим более подробно в
+      <para>Кроме этого, опытные пользователи Subversion разработали 
+        набор правил хорошего тона для организации структуры хранилища.
+        Хотя эти правила и не являются строгой необходимостью, как 
+        описанный выше синтаксис, они помогают при выполнении типовых 
+        задач. Используемая по тексту книги часть пути
+        <literal>/trunk</literal> является одним из таких правил; 
+        подробнее об этой и других подобных рекомендациях мы поговорим в
         <xref linkend="svn.branchmerge"/>.</para>
 
     </sidebar>
@@ -2095,7 +2186,7 @@
           <command>svn revert</command>) can be used without any
           network access.  This makes it easy to manage your
           changes-in-progress when you are somewhere without a network
-          connection, such as traveling on an airplane, riding a
+          connection, such as travelling on an airplane, riding a
           commuter train or hacking on the beach.</para>
         @ENGLISH }}} -->
         <para>Все эти три команды (<command>svn
@@ -2229,7 +2320,7 @@
 
         <listitem>
           <!-- @ENGLISH {{{
-          <para>If Subversion considers the file to be of a mergable
+          <para>If Subversion considers the file to be of a mergeable
             type, it places <firstterm>conflict
             markers</firstterm>—special strings of text which
             delimit the <quote>sides</quote> of the

Modified: trunk/src/ru/book/ch04.xml
==============================================================================
--- trunk/src/ru/book/ch04.xml	(original)
+++ trunk/src/ru/book/ch04.xml	Sun Dec  4 07:20:53 2005
@@ -1310,7 +1310,7 @@
 </screen>
 
       <!-- @ENGLISH {{{
-      <para>The first syntax lays out all three arguments explictly,
+      <para>The first syntax lays out all three arguments explicitly,
         naming each tree in the form <emphasis>URL at REV</emphasis> and
         naming the working copy target.  The second syntax can be used
         as a shorthand for situations when you're comparing two

Modified: trunk/src/ru/book/ch05.xml
==============================================================================
--- trunk/src/ru/book/ch05.xml	(original)
+++ trunk/src/ru/book/ch05.xml	Sun Dec  4 07:20:53 2005
@@ -182,9 +182,9 @@
         repository is storing data; they only see revision and
         transaction trees through the repository API.</para>
 
-      <para>Here is a table that gives a comparative overview of
-        Berkeley DB and FSFS repositories.  The next sections go into
-        detail.</para>
+      <para><xref linkend="svn.reposadmin.basics.backends.tbl-1"/>
+        gives a comparative overview of Berkeley DB and FSFS
+        repositories.  The next sections go into detail.</para>
 
       <table id="svn.reposadmin.basics.backends.tbl-1">
         <title>Repository Data Store Comparison</title>

Modified: trunk/src/ru/book/ch06.xml
==============================================================================
--- trunk/src/ru/book/ch06.xml	(original)
+++ trunk/src/ru/book/ch06.xml	Sun Dec  4 07:20:53 2005
@@ -57,7 +57,8 @@
       and disadvantages.  In fact, it's possible for different servers
       to run in parallel, each accessing your repositories in its own
       way, and each without hindering the other (see <xref
-      linkend="svn.serverconfig.multimethod"/>).  Here's a brief overview and
+      linkend="svn.serverconfig.multimethod"/>).  <xref
+      linkend="svn.serverconfig.overview.tbl-1"/> gives a brief overview and
       comparison of the two available Subversion servers—as an
       administrator, it's up to you to choose whatever works best for
       you and your users.</para>

Modified: trunk/src/ru/book/ch07.xml
==============================================================================
--- trunk/src/ru/book/ch07.xml	(original)
+++ trunk/src/ru/book/ch07.xml	Sun Dec  4 07:20:53 2005
@@ -1363,8 +1363,8 @@
 
       <para>Команда <command>svn</command> предоставляет несколько
         способов добавления или изменения свойств файлов и директорий.
-        Возможно для свойств с коротким, читаемым значением, проще всего
-        добавить новое свойство, указав его имя и значение в командной строке
+        Свойства с короткими, читаемыми значениями, наверное проще всего
+        добавить указав имя и значение свойства в командной строке
         подкоманды <command>propset</command>.</para>
 
       <screen>
@@ -1386,10 +1386,10 @@
       <para>Однако мы уже знаем о гибкости, предлагаемой Subversion
         для значений свойств. И если вам необходимо иметь многострочное
         текстовое, или даже бинарное значение свойства, передавать
-        такое значение через командную строку вы не захотите. Для
-        таких случаев команда <command>propset</command> принимает
-        параметр <option>--file</option> (<option>-F</option>), с
-        именем файла, содержащего новое значение свойства.</para>
+        такое значение через командную строку не удобно. Для
+        таких случаев команда <command>propset</command> имеет
+        параметр <option>--file</option> (<option>-F</option>), указывающий
+        имя файла, содержащего новое значение свойства.</para>
 
       <screen>
 $ svn propset license -F /path/to/LICENSE calc/button.c
@@ -1398,6 +1398,29 @@
 </screen>
 
       <!-- @ENGLISH {{{
+      <para>There are some restrictions on the names you can use for
+        properties.  A property name must start with a letter, a colon
+        (<literal>:</literal>), or an underscore
+        (<literal>_</literal>); after that, you can also use digits,
+        hyphens (<literal>-</literal>), and periods
+        (<literal>.</literal>).
+          <footnote>
+            <para>If you're familiar with XML, this is pretty much the
+            ASCII subset of the syntax for XML "Name".</para>
+          </footnote>
+      </para>
+      @ENGLISH }}} -->
+      <para>Для имен свойств существует ряд ограничений. Имя свойства должно
+        начинаться с буквы, двоеточия (<literal>:</literal>) или подчеркивания
+        (<literal>_</literal>); дальше можно использовать цифры, тире
+        (<literal>-</literal>) и точки (<literal>.</literal>).
+          <footnote>
+            <para>Если вы знакомы с XML, то синтаксис XML "Name" использует
+            практически тот же ASCII набор.</para>
+          </footnote>
+      </para>
+
+      <!-- @ENGLISH {{{
       <para>In addition to the <command>propset</command> command, the
         <command>svn</command> program supplies the
         <command>propedit</command> command.  This command uses the
@@ -1447,7 +1470,7 @@
         <command>svn</command>, команды, относящиеся к свойствам
         могут применяться к нескольким путям за раз. Это дает возможность
         одной командой изменять свойства целого набора файлов. Например,
-        можно выполнить:</para>
+        можно сделать вот так:</para>
 
       <screen>
 $ svn propset copyright '(c) 2002 Red-Bean Software' calc/*
@@ -2191,7 +2214,7 @@
           order for the keyword to be expanded.  You should consider the
           value of the <literal>svn:keywords</literal> property to be
           case-sensitive too—certain keyword names will be recognized
-          regardless of case, but this behaviour is deprecated.</para>
+          regardless of case, but this behavior is deprecated.</para>
 
         <para>Subversion defines the list of keywords available for
           substitution.  That list contains the following five keywords,
@@ -2905,7 +2928,7 @@
         on the object.</para>
 
       <para>So in this particular example, Sally can see that Harry
-        locked the file on Feburary 16th to <quote>make a quick
+        locked the file on February 16th to <quote>make a quick
         tweak</quote>.  It being June, she suspects that he probably
         forgot all about the lock.  She might phone Harry to complain
         and ask him to release the lock.  If he's unavailable, she
@@ -3089,7 +3112,7 @@
 
       <para>We've seen how <command>svn lock</command>
         and <command>svn unlock</command> can be used to create,
-        release, break, and steal locks.  This satisifies the goal of
+        release, break, and steal locks.  This satisfies the goal of
         serializing commit access to a file.  But what about the
         larger problem of preventing wasted time?</para>
 
@@ -3187,7 +3210,7 @@
       manipulating your unversioned ones.  But that flexibility means
       that across the lifetime of your repository, a given versioned
       resource might have many paths, and a given path might represent
-      serveral entirely different versioned resources.</para>
+      several entirely different versioned resources.</para>
 
     <para>Subversion is pretty smart about noticing when an object's
       version history includes such <quote>changes of address</quote>.
@@ -4038,8 +4061,8 @@
       <screen>
 $ export LC_MESSAGES=de_DE
 $ svn help cat
-cat: Ausgabe des Inhaltes der angegebenen Dateien oder URLs
-Aufruf: cat ZIEL...
+cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.
+Aufruf: cat ZIEL[@REV]...
 …
 </screen>
 

Modified: trunk/src/ru/book/ch09.xml
==============================================================================
--- trunk/src/ru/book/ch09.xml	(original)
+++ trunk/src/ru/book/ch09.xml	Sun Dec  4 07:20:53 2005
@@ -1765,8 +1765,8 @@
 <!-- @ENGLISH {{{
           <para>Well, there's not much to the examples here as
             <command>svn cleanup</command> generates no output.  If
-            you pass no PATH, <quote><filename>.</filename></quote> is
-            used.</para>
+            you pass no <replaceable>PATH</replaceable>,
+            <quote><filename>.</filename></quote> is used.</para>
 @ENGLISH }}} -->
           <para>Собственно, тут не так уж и много примеров можно привести,
             так как <command>svn cleanup</command> не комментирует свою
@@ -2748,7 +2748,8 @@
       <refentry id="svn.ref.svn.c.import">
         <refnamediv>
           <refname>svn import</refname>
-          <refpurpose>Recursively commit a copy of PATH to URL.</refpurpose>
+          <refpurpose>Commit an unversioned file or tree into the 
+            repository.</refpurpose>
         </refnamediv>
         <refsect1>
           <title>Synopsis</title>
@@ -2842,7 +2843,8 @@
       <refentry id="svn.ref.svn.c.info">
         <refnamediv>
           <refname>svn info</refname>
-          <refpurpose>Print information about PATHs.</refpurpose>
+          <refpurpose>Display information about a local or remote 
+            item.</refpurpose>
         </refnamediv>
         <refsect1>
           <title>Synopsis</title>
@@ -4146,15 +4148,15 @@
         <refsect1>
           <title>Description</title>
 
-          <para>Remove <quote>conflicted</quote> state on working
-            copy files or directories. This routine does not
-            semantically resolve conflict markers; it merely removes
-            conflict-related artifact files and allows PATH to be
-            committed again; that is, it tells Subversion that the
-            conflicts have been <quote>resolved</quote>.  See <xref
+          <para>Remove <quote>conflicted</quote> state on working copy
+            files or directories. This routine does not semantically
+            resolve conflict markers; it merely removes
+            conflict-related artifact files and allows
+            <replaceable>PATH</replaceable> to be committed again;
+            that is, it tells Subversion that the conflicts have been
+            <quote>resolved</quote>.  See <xref
             linkend="svn.tour.cycle.resolve"/> for an in-depth look at
-            resolving conflicts.</para>
-        </refsect1>
+            resolving conflicts.</para> </refsect1>
 
         <refsect1>
           <title>Alternate Names</title>
@@ -4865,8 +4867,7 @@
       <refentry id="svn.ref.svn.c.unlock">
         <refnamediv>
           <refname>svn unlock</refname> 
-            <refpurpose>Unlock working copy paths or
-              URLs..</refpurpose>
+            <refpurpose>Unlock working copy paths or URLs.</refpurpose>
         </refnamediv>
         <refsect1>
           <title>Synopsis</title>
@@ -5341,20 +5342,45 @@
             revision tree.  See <xref linkend="svn.reposadmin.maint.migrate"/>
             for a practical use.</para>
 
-          <para>If the size of your Subversion dumpfile is a concern,
-            you can use the <option>--deltas</option> switch to (in
-            some cases drastically) reduce the size of the dumpfile
-            that <command>svnadmin</command> creates.  With this
-            switch, instead of writing the full content of each
-            revision to the dumpfile, <command>svnadmin dump</command>
-            will only emit the differences from one revision to the
-            next.  There are, however, disadvantages to creating
-            deltified dumpfiles—it's more CPU intensive to
-            create them, <command>svndumpfilter</command> can't
-            operate on them, and non-deltified dumpfiles tend to
-            compress better.</para>
+          <para>By default, the Subversion dumpfile stream contains a
+            single revision (the first revision in the requested
+            revision range) in which every file and directory in the
+            repository in that revision is presented as if that whole
+            tree was added at once, followed by other revisions (the
+            remainder of the revisions in the requested range) which
+            contain only the files and directories which were modified
+            in those revisions.  For a modified file, the complete
+            fulltext representation of its contents, as well as all of
+            its properties, are presented in the dumpfile; for a
+            directory, all of its properties are presented.</para>
+
+          <para>There are a pair of useful options which modify the
+            dumpfile generator's behavior.  The first is the
+            <option>--incremental</option> option, which simply causes
+            that first revision in the dumpfile stream to contain only
+            the files and directories modified in that revision,
+            instead of being presented as the addition of a new tree,
+            and in exactly the same way that every other revision in
+            the dumpfile is presented.  This is useful for generating
+            a dumpfile that is to be loaded into another repository
+            which already has the files and directories that exist in
+            the original repository.</para>
+
+          <para>The second useful option is <option>--deltas</option>.
+            This switch causes <command>svnadmin dump</command> to,
+            instead of emitting fulltext representations of file
+            contents and property lists, emit only deltas of those
+            items against their previous versions.  This reduces (in
+            some cases, drastically) the size of the dumpfile that
+            <command>svnadmin dump</command> creates.  There are, however,
+            disadvantages to using this option—deltified
+            dumpfiles are more CPU intensive to create, cannot be
+            operated on by <command>svndumpfilter</command>, and tend
+            not to compress as well as their non-deltified counterparts
+            when using third-party tools like <command>gzip</command>
+            and <command>bzip2</command>.</para>
 
-            </refsect1>
+        </refsect1>
         <refsect1>
           <title>Switches</title>
 
@@ -5474,7 +5500,7 @@
           <para>Berkeley DB creates logs of all changes to the
             repository, which allow it to recover in the face of
             catastrophe.  Unless you enable
-            <literal>DB_LOGS_AUTOREMOVE</literal>, the log files
+            <literal>DB_LOG_AUTOREMOVE</literal>, the log files
             accumulate, although most are no longer used and can be
             deleted to reclaim disk space. See <xref
             linkend="svn.reposadmin.maint.diskspace"/> for more
@@ -5500,7 +5526,7 @@
           <para>Berkeley DB creates logs of all changes to the
             repository, which allow it to recover in the face of
             catastrophe.  Unless you enable
-            <literal>DB_LOGS_AUTOREMOVE</literal>, the log files
+            <literal>DB_LOG_AUTOREMOVE</literal>, the log files
             accumulate, although most are no longer used and can be
             deleted to reclaim disk space. See <xref
             linkend="svn.reposadmin.maint.diskspace"/> for more
@@ -6358,8 +6384,7 @@
         </refnamediv>
         <refsect1>
           <title>Synopsis</title>
-          <programlisting>svnlook history REPOS_PATH
-            [PATH_IN_REPOS]</programlisting>
+          <programlisting>svnlook history REPOS_PATH [PATH_IN_REPOS]</programlisting>
         </refsect1>
         <refsect1>
           <title>Description</title>
@@ -6653,10 +6678,10 @@
         </refsect1>
         <refsect1>
           <title>Description</title>
-
-          <para>Print the tree, starting at <replaceable>PATH_IN_REPOS</replaceable> (if
-            supplied, at the root of the tree otherwise), optionally
-            showing node revision IDs.</para>
+          <para>Print the tree, starting at
+            <replaceable>PATH_IN_REPOS</replaceable> (if supplied, at
+            the root of the tree otherwise), optionally showing node
+            revision IDs.</para>
         </refsect1>
 
         <refsect1>
@@ -6704,8 +6729,8 @@
 
           <para>Print the <literal>UUID</literal> for the repository.
             the UUID is the repository's
-            <emphasis>U</emphasis>niversal <emphasis>U</emphasis>nique
-            <emphasis>ID</emphasis>entifier.  The Subversion client
+            <emphasis>u</emphasis>niversal <emphasis>u</emphasis>nique
+            <emphasis>id</emphasis>entifier.  The Subversion client
             uses this identifier to differentiate between one
             repository and another.</para>
         </refsect1>
@@ -6877,11 +6902,13 @@
         <varlistentry>
           <term><option>--tunnel-user NAME</option></term>
           <listitem>
-            <para>Used in conjuction with <option>--tunnel</option> switch; tells
-              svnserve to assume that NAME is the authenticated user,
-              rather than the UID of the svnserve process. Useful for
-              users wishing to share a single system account over SSH,
-              but maintaining separate commit identities.</para>
+            <para>Used in conjunction with <option>--tunnel</option>
+              switch; tells svnserve to assume that
+              <replaceable>NAME</replaceable> is the authenticated
+              user, rather than the UID of the svnserve
+              process. Useful for users wishing to share a single
+              system account over SSH, but maintaining separate commit
+              identities.</para>
           </listitem>
         </varlistentry>
 
@@ -6938,10 +6965,12 @@
           resultant revision number, or revision range, is written to
           standard output.</para>
 
-        <para>TRAIL_URL, if present, is the trailing portion of the
-          URL used to determine if WC_PATH itself is switched
-          (detection of switches within WC_PATH does not rely on
-          TRAIL_URL).</para>
+        <para><replaceable>TRAIL_URL</replaceable>, if present, is the
+          trailing portion of the URL used to determine if
+          <replaceable>WC_PATH</replaceable> itself is switched
+          (detection of switches within
+          <replaceable>WC_PATH</replaceable> does not rely on
+          <replaceable>TRAIL_URL</replaceable>).</para>
 
       </refsect1>
 




More information about the svnbook-dev mailing list