[svnbook commit] r2644 - trunk/src/ru/book
dmitriy
noreply at red-bean.com
Sun Feb 4 05:34:32 CST 2007
Author: dmitriy
Date: Sun Feb 4 05:34:32 2007
New Revision: 2644
Modified:
trunk/src/ru/book/app-svn-for-cvs-users.xml (props changed)
trunk/src/ru/book/app-third-party-tools.xml (props changed)
trunk/src/ru/book/app-webdav.xml (props changed)
trunk/src/ru/book/ch-advanced-topics.xml (props changed)
trunk/src/ru/book/ch-basic-concepts.xml (props changed)
trunk/src/ru/book/ch-branching-and-merging.xml (props changed)
trunk/src/ru/book/ch-developer-info.xml (props changed)
trunk/src/ru/book/ch-guided-tour.xml (props changed)
trunk/src/ru/book/ch-introduction.xml (props changed)
trunk/src/ru/book/ch-preface.xml (props changed)
trunk/src/ru/book/ch-reference.xml (contents, props changed)
trunk/src/ru/book/ch-repository-admin.xml (contents, props changed)
trunk/src/ru/book/ch-server-configuration.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. Sync all parts of the book with the src/en/book up to r2568.
Modified: trunk/src/ru/book/ch-reference.xml
==============================================================================
--- trunk/src/ru/book/ch-reference.xml (original)
+++ trunk/src/ru/book/ch-reference.xml Sun Feb 4 05:34:32 2007
@@ -10,7 +10,7 @@
<!-- @ENGLISH {{{
<simplesect>
<para>This chapter is intended to be a complete reference to using
- Subversion. This includes the command line client
+ Subversion. This includes the command line client
(<command>svn</command>) and all its subcommands, as well as the
repository administration programs (<command>svnadmin</command>
and <command>svnlook</command>) and their respective
@@ -213,7 +213,9 @@
<replaceable>CMD</replaceable></term>
<listitem>
<para>Specifies an external program to use to edit a log message
- or a property value.</para>
+ or a property value. See the <literal>editor-cmd</literal>
+ section in <xref linkend="svn.advanced.confarea.opts.config"/>
+ for ways to specify a default editor.</para>
</listitem>
</varlistentry>
@@ -248,7 +250,10 @@
<replaceable>CMD</replaceable></term>
<listitem>
<para>Определяет внешнюю программу для редактирования
- комментария или свойства.</para>
+ комментария или свойства. Подробнее о том, как указать
+ используемый по умолчанию редактор, смотрите раздел, посвященный
+ <literal>editor-cmd</literal> в
+ <xref linkend="svn.advanced.confarea.opts.config"/>.</para>
</listitem>
</varlistentry>
@@ -297,7 +302,7 @@
you from doing in normal usage, but you can pass the
force switch to tell Subversion <quote>I know what I'm
doing as well as the possible repercussions of doing it,
- so let me at 'em</quote>. This switch is the
+ so let me at 'em</quote>. This switch is the
programmatic equivalent of doing your own electrical
work with the power on—if you don't know what
you're doing, you're likely to get a nasty shock.</para>
@@ -468,7 +473,7 @@
</term>
<listitem>
<para>Indicates that you will specify a commit message
- on the command line, following this switch. For
+ on the command line, following this switch. For
example:</para>
<screen>
@@ -531,7 +536,7 @@
<para>Shows files in the status listing that would
normally be omitted since they match a pattern in the
<literal>global-ignores</literal> configuration option
- or the <literal>svn:ignore</literal> property. See <xref
+ or the <literal>svn:ignore</literal> property. See <xref
linkend="svn.advanced.confarea.opts.config"/> and <xref
linkend="svn.advanced.props.special.ignore"/> for more
information.</para>
@@ -780,7 +785,7 @@
provide revision numbers, revision keywords or dates (in
curly braces), as arguments to the revision switch. If
you wish to provide a range of revisions, you can
- provide two revisions separated by a colon. For
+ provide two revisions separated by a colon. For
example:</para>
<screen>
@@ -803,7 +808,7 @@
Subversion property specific to a file or directory.
This switch requires that you also pass a revision
with the <option>--><!--revision</option>
- (<option>-r</option>) switch. See <xref
+ (<option>-r</option>) switch. See <xref
linkend="svn.reposadmin.basics.revprops"/> for more details on
unversioned properties.</para>
</listitem>
@@ -975,7 +980,9 @@
not only includes the version number of the client,
but also a listing of all repository access modules
that the client can use to access a Subversion
- repository.</para>
+ repository. With <option>--><!--quiet</option>
+ (<option>-q</option>) it prints only the version number
+ in a compact form.</para>
</listitem>
</varlistentry>
@@ -1029,7 +1036,9 @@
<para>Выводит информацию о версии программы клиента.
В дополнение к номеру версии выводится и список всех модулей
доступа к хранилищу, которыми может воспользоваться этот
- клиент.</para>
+ клиент. С параметром <option>--quiet</option>
+ (<option>-q</option>) в компактной форме выводится только
+ информация о версии.</para>
</listitem>
</varlistentry>
@@ -1500,7 +1509,7 @@
<title>Описание</title>
<!-- @ENGLISH {{{
- <para>Check out a working copy from a repository. If
+ <para>Check out a working copy from a repository. If
<replaceable>PATH</replaceable> is omitted, the
basename of the URL will be used as the destination.
If multiple URLs are given each will be checked out into a
@@ -1683,9 +1692,9 @@
<!-- @ENGLISH {{{
<para>Recursively clean up the working copy, removing
- locks resuming unfinished operations. If you ever get a
- <quote>working copy locked</quote> error, run this
- command to remove stale locks and get your working copy
+ working copy locks and resuming unfinished operations.
+ If you ever get a <quote>working copy locked</quote> error,
+ run this command to remove stale locks and get your working copy
into a usable state again.</para>
@ENGLISH }}} -->
<para>Рекурсивно чистит рабочую копию, удаляя блокировки
@@ -1807,7 +1816,7 @@
<!-- @ENGLISH {{{
<para>Send changes from your working copy to the
- repository. If you do not supply a log message with your
+ repository. If you do not supply a log message with your
commit by using either the <option>--><!--file</option> or
<option>--><!--message</option> switch,
<command>svn</command> will launch your editor for you
@@ -2315,7 +2324,7 @@
<para>Using <command>svn</command> to delete a file from
your working copy merely schedules it to be
- deleted. When you commit, the file is deleted in the
+ deleted. When you commit, the file is deleted in the
repository.</para>
<screen>
@@ -2615,7 +2624,7 @@
repository specified by URL, at revision
<replaceable>REV</replaceable> if it is given, otherwise
at <literal>HEAD</literal>, into
- <replaceable>PATH</replaceable>. If
+ <replaceable>PATH</replaceable>. If
<replaceable>PATH</replaceable> is omitted, the last
component of the <replaceable>URL</replaceable> is used
for the local directory name.</para>
@@ -2724,6 +2733,9 @@
<refsect1>
<title>Alternate Names</title>
<para>?, h</para>
+ <para>The options <option>-?</option>, <option>-h</option>
+ and <option>--help</option> have the same effect as using the
+ <command>help</command> subcommand.</para>
</refsect1>
<refsect1>
@@ -2742,6 +2754,7 @@
<screen>
--version
--quiet (-q)
+--config-dir DIR
</screen>
</refsect1>
</refentry>
@@ -2854,26 +2867,41 @@
<refsect1>
<title>Description</title>
- <para>Print information about both working copy paths and
- URLs, including:</para>
+ <para>Print information about the working copy paths or
+ URLs specified. The information shown for both may
+ include:</para>
<itemizedlist>
<listitem><para>Path</para></listitem>
<listitem><para>Name</para></listitem>
<listitem><para>URL</para></listitem>
- <listitem><para>Revision</para></listitem>
<listitem><para>Repository Root</para></listitem>
<listitem><para>Repository UUID</para></listitem>
+ <listitem><para>Revision</para></listitem>
<listitem><para>Node Kind</para></listitem>
<listitem><para>Last Changed Author</para></listitem>
<listitem><para>Last Changed Revision</para></listitem>
<listitem><para>Last Changed Date</para></listitem>
+ <listitem><para>Lock Token</para></listitem>
+ <listitem><para>Lock Owner</para></listitem>
+ <listitem><para>Lock Created (date)</para></listitem>
+ <listitem><para>Lock Expires (date)</para></listitem>
+ </itemizedlist>
+
+ <para>Additional kinds of information available only for
+ working copy paths are:</para>
+
+ <itemizedlist>
+ <listitem><para>Schedule</para></listitem>
+ <listitem><para>Copied From URL</para></listitem>
+ <listitem><para>Copied From Rev</para></listitem>
<listitem><para>Text Last Updated</para></listitem>
<listitem><para>Properties Last Updated</para></listitem>
<listitem><para>Checksum</para></listitem>
- <listitem><para>Lock Token</para></listitem>
- <listitem><para>Lock Owner</para></listitem>
- <listitem><para>Lock Creation Date</para></listitem>
+ <listitem><para>Conflict Previous Base File</para></listitem>
+ <listitem><para>Conflict Previous Working File</para></listitem>
+ <listitem><para>Conflict Current Base File</para></listitem>
+ <listitem><para>Conflict Properties File</para></listitem>
</itemizedlist>
</refsect1>
@@ -2896,9 +2924,15 @@
<title>Switches</title>
<screen>
---targets FILENAME
---recursive (-R)
--revision (-r)
+--recursive (-R)
+--targets FILENAME
+--incremental
+--xml
+--username ARG
+--password ARG
+--no-auth-cache
+--non-interactive
--config-dir DIR
</screen>
</refsect1>
@@ -2925,7 +2959,7 @@
Last Changed Date: 2003-01-13 16:43:13 -0600 (Mon, 13 Jan 2003)
Text Last Updated: 2003-01-16 21:18:16 -0600 (Thu, 16 Jan 2003)
Properties Last Updated: 2003-01-13 21:50:19 -0600 (Mon, 13 Jan 2003)
-Checksum: /3L38YwzhT93BWvgpdF6Zw==
+Checksum: d6aeb60b0662ccceb6bce4bac344cb66
</screen>
<para>It will also show information for directories:</para>
@@ -2942,6 +2976,7 @@
Last Changed Author: harry
Last Changed Rev: 19
Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)
+Properties Last Updated: 2003-01-16 23:39:02 -0600 (Thu, 16 Jan 2003)
</screen>
<para><command>svn info</command> also acts on URLs (also
@@ -2961,11 +2996,11 @@
Last Changed Author: sally
Last Changed Rev: 42
Last Changed Date: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)
-Text Last Updated: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)
-Checksum: d41d8cd98f00b204e9800998ecf8427e
Lock Token: opaquelocktoken:14011d4b-54fb-0310-8541-dbd16bd471b2
Lock Owner: harry
Lock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)
+Lock Comment (1 line):
+My test lock comment
</screen>
@@ -3326,10 +3361,10 @@
<screen>
$ svn log -r 14:15
------------------------------------------------------------------------
-r14 | ...
+r14 | …
------------------------------------------------------------------------
-r15 | ...
+r15 | …
------------------------------------------------------------------------
</screen>
@@ -3344,15 +3379,15 @@
$ svn log -r 27 >> mylog
$ cat mylog
------------------------------------------------------------------------
-r14 | ...
+r14 | …
------------------------------------------------------------------------
------------------------------------------------------------------------
-r19 | ...
+r19 | …
------------------------------------------------------------------------
------------------------------------------------------------------------
-r27 | ...
+r27 | …
------------------------------------------------------------------------
</screen>
@@ -3367,13 +3402,13 @@
$ svn log --incremental -r 27 >> mylog
$ cat mylog
------------------------------------------------------------------------
-r14 | ...
+r14 | …
------------------------------------------------------------------------
-r19 | ...
+r19 | …
------------------------------------------------------------------------
-r27 | ...
+r27 | …
</screen>
<para>The <option>--incremental</option> switch provides
@@ -3440,7 +3475,7 @@
be compared.</para>
<para><replaceable>WCPATH</replaceable> is the working copy
- path that will receive the changes. If
+ path that will receive the changes. If
<replaceable>WCPATH</replaceable> is omitted, a default
value of <quote><filename>.</filename></quote> is assumed,
unless the sources have identical basenames that match a
@@ -3796,7 +3831,7 @@
<title>Description</title>
<para>Edit one or more properties using your favorite
- editor. The first form edits versioned properties in
+ editor. The first form edits versioned properties in
your working copy, while the second edits unversioned
remote properties on a repository revision.</para>
</refsect1>
@@ -4022,7 +4057,7 @@
<para>Set <replaceable>PROPNAME</replaceable> to
<replaceable>PROPVAL</replaceable> on files, directories,
- or revisions. The first example creates a versioned, local
+ or revisions. The first example creates a versioned, local
property change in the working copy, and the second
creates an unversioned, remote property change on a
repository revision.</para>
@@ -4128,7 +4163,7 @@
in a Subversion repository. Your repository
administrator must explicitly enable revision property
modifications by creating a hook named
- <literal>pre-revprop-change</literal>. See <xref
+ <literal>pre-revprop-change</literal>. See <xref
linkend="svn.reposadmin.create.hooks"/> for more information on
hook scripts.</para>
</note>
@@ -4150,7 +4185,7 @@
<title>Description</title>
<para>Remove <quote>conflicted</quote> state on working copy
- files or directories. This routine does not semantically
+ 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;
@@ -4376,7 +4411,10 @@
<varlistentry>
<term>'R'</term>
<listitem>
- <para>Item has been replaced in your working copy.</para>
+ <para>Item has been replaced in your working copy.
+ This means the file was scheduled for deletion, and
+ then a new file with the same name was scheduled for
+ addition in its place.</para>
</listitem>
</varlistentry>
@@ -4464,7 +4502,8 @@
</variablelist>
<para>The third column is populated only if the
- working copy directory is locked.</para>
+ working copy directory is locked. (See
+ <xref linkend="svn.tour.other.cleanup"/>.)</para>
<variablelist>
@@ -4971,7 +5010,9 @@
synchronizes the working copy to the revision given by the
<option>--revision</option> switch. As part of the
synchronization, <command>svn update</command> also
- removes any stale locks found in the working copy.</para>
+ removes any stale locks (see <xref
+ linkend="svn.tour.other.cleanup"/>) found in the
+ working copy.</para>
<para>For each updated item a line will start with a
character reporting the action taken. These characters
@@ -5503,7 +5544,7 @@
catastrophe. Unless you enable
<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
+ deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
@@ -5529,7 +5570,7 @@
catastrophe. Unless you enable
<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
+ deleted to reclaim disk space. See <xref
linkend="svn.reposadmin.maint.diskspace"/> for more
information.</para>
</refsect1>
@@ -5727,9 +5768,10 @@
</screen>
<para>Recovering the database requires an exclusive lock on
- the repository. If another process is accessing the
- repository, then <command>svnadmin recover</command> will
- error:</para>
+ the repository. (This is a <quote>database lock</quote>;
+ see <xref linkend="svn.advanced.locking.meanings"/>.)
+ If another process is accessing the repository,
+ then <command>svnadmin recover</command> will error:</para>
<screen>
$ svnadmin recover /usr/local/svn/repos
svn: Failed to get exclusive repository access; perhaps another process
@@ -5746,7 +5788,7 @@
$ svnadmin recover /usr/local/svn/repos --wait
Waiting on repository lock; perhaps another process has it open?
-### time goes by...
+### time goes by…
Repository lock acquired.
Please wait; recovering the repository may take some time...
@@ -5996,7 +6038,7 @@
Subversion property specific to a file or directory.
This switch requires that you also pass a revision
with the <option>--revision</option>
- (<option>-r</option>) switch. See <xref
+ (<option>-r</option>) switch. See <xref
linkend="svn.reposadmin.basics.revprops"/> for more details on
unversioned properties.</para>
</listitem>
@@ -6907,7 +6949,7 @@
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
+ process. Useful for users wishing to share a single
system account over SSH, but maintaining separate commit
identities.</para>
</listitem>
@@ -7219,6 +7261,203 @@
</refentry>
</sect1>
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <sect1 id="svn.ref.properties">
+
+ <title>Subversion properties</title>
+
+ <refentry id="svn.ref.svnprops">
+ <refnamediv>
+
+ <refname>Subversion-defined properties</refname> <refpurpose>
+ properties defined by Subversion to control behavior.</refpurpose>
+
+ </refnamediv>
+
+ <refsect1 id="svn.ref.svnprops.desc">
+ <title>Description</title>
+
+ <para>Subversion allows users to invent arbitrarily-named
+ versioned properties on files and directories, as well as
+ unversioned properties on revisions. The only restriction
+ is on properties prefixed with <quote>svn:</quote>.
+ Properties in that namespace are reserved for Subversion's
+ own use. While these properties may be set by users to
+ control Subversion's behavior, users may not invent new
+ <quote>svn:</quote> properties.</para>
+
+ </refsect1>
+
+ <refsect1 id="svn.ref.properties.versioned-props">
+ <title>Versioned Properties</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>svn:executable</literal></term>
+ <listitem>
+
+ <para>If present on a file, the client will make the
+ file executable in Unix-hosted working copies. See
+ <xref
+ linkend="svn.advanced.props.special.executable"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:mime-type</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value indicates the
+ file's mime-type. This allows the client to decide
+ whether line-based contextual merging is safe to
+ perform during updates, and can also affect how the
+ file behaves when fetched via web browser. See
+ <xref
+ linkend="svn.advanced.props.special.mime-type"/>. </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:ignore</literal></term>
+ <listitem>
+
+ <para>If present on a directory, the value is a list of
+ unversioned file patterns to be ignored
+ by <command>svn status</command> and other
+ subcommands. See
+ <xref
+ linkend="svn.advanced.props.special.ignore"/></para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:keywords</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value tells the client
+ how to expand particular keywords within the file.
+ See
+ <xref
+ linkend="svn.advanced.props.special.keywords"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:eol-style</literal></term>
+ <listitem>
+
+ <para>If present on a file, the value tells the client
+ how to manipulate the file's line-endings in the
+ working copy. See
+ <xref
+ linkend="svn.advanced.props.special.eol-style"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:externals</literal></term>
+ <listitem>
+
+ <para>If present on a directory, the value is a
+ multi-line list of other paths and URLs the client
+ should check out. See
+ <xref
+ linkend="svn.advanced.props.special.externals"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:special</literal></term>
+ <listitem>
+
+ <para>If present on a file, indicates that the file is
+ not an ordinary file, but a symbolic link or other
+ special object. See
+ <xref
+ linkend="svn.advanced.props.special.special"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:needs-lock</literal></term>
+ <listitem>
+
+ <para>If present on a file, tells the client to make the
+ file read-only in the working copy, as a reminder that
+ the file should be locked before editing begins. See
+ <xref
+ linkend="svn.advanced.locking.lock-communication"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1 id="svn.ref.properties.unversioned-props">
+ <title>Unversioned Properties</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>svn:author</literal></term>
+ <listitem>
+
+ <para>If present, contains the authenticated username of
+ the person who created the revision. (If not present,
+ then the revision was committed anonymously.)</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:date</literal></term>
+ <listitem>
+
+ <para>Contains the UTC time the revision was created, in
+ ISO format. The value comes from the server
+ machine's clock.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:log</literal></term>
+ <listitem>
+
+ <para>Contains the log message describing the
+ revision.</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>svn:autoversioned</literal></term>
+ <listitem>
+
+ <para>If present, the revision was created via the
+ autoversioning feature. See
+ <xref linkend="svn.webdav.autoversioning"/>.</para>
+
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ </refentry>
+ </sect1>
+
</chapter>
Modified: trunk/src/ru/book/ch-repository-admin.xml
==============================================================================
--- trunk/src/ru/book/ch-repository-admin.xml (original)
+++ trunk/src/ru/book/ch-repository-admin.xml Sun Feb 4 05:34:32 2007
@@ -2785,7 +2785,7 @@
$ mkdir projectB/branches
$ mkdir projectB/tags
…
-$ svn import . file:///path/to/repos --message 'Initial repository layout'
+$ svn import . file:///path/to/repos --message "Initial repository layout"
Adding projectA
Adding projectA/trunk
Adding projectA/branches
More information about the svnbook-dev
mailing list