[svnbook commit] r2646 - trunk/src/ru/book
dmitriy
noreply at red-bean.com
Sun Feb 4 07:36:47 CST 2007
Author: dmitriy
Date: Sun Feb 4 07:36:46 2007
New Revision: 2646
Added:
trunk/src/ru/book/app-quickstart.xml (contents, props changed)
- copied, changed from r2645, /trunk/src/ru/book/ch-introduction.xml
trunk/src/ru/book/ch-customizing-svn.xml (contents, props changed)
- copied, changed from r2644, /trunk/src/ru/book/ch-advanced-topics.xml
Removed:
trunk/src/ru/book/ch-introduction.xml
Modified:
trunk/src/ru/book/book.xml (contents, props changed)
trunk/src/ru/book/ch-advanced-topics.xml (contents, props changed)
trunk/src/ru/book/ch-basic-concepts.xml (contents, props changed)
Log:
Book Russian. Merge with changes from r2571 of the src/en/book. More detail in log for r2571.
Copied: trunk/src/ru/book/app-quickstart.xml (from r2645, /trunk/src/ru/book/ch-introduction.xml)
==============================================================================
--- /trunk/src/ru/book/ch-introduction.xml (original)
+++ trunk/src/ru/book/app-quickstart.xml Sun Feb 4 07:36:46 2007
@@ -1,44 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="svn.intro">
+<appendix id="svn.intro">
<!-- @ENGLISH {{{
- <title>Introduction</title>
+ <title>Subversion Quick-Start Guide</title>
@ENGLISH }}} -->
- <title>Введение</title>
- <chapterinfo>
+ <title>Быстрый старт в Subversion</title>
+ <appendixinfo>
<othername id="svn.intro.architecture.dia-1.prepositional-case"
role="title-variant">рисунке 1.1, «Архитектура
Subversion»</othername>
- </chapterinfo>
+ </appendixinfo>
<!-- See also svn.preface.organization -->
<simplesect>
+
<!-- @ENGLISH {{{
- <para>Version control is the art of managing changes to
- information. It has long been a critical tool for programmers,
- who typically spend their time making small changes to software
- and then undoing those changes the next day. But the usefulness
- of version control software extends far beyond the bounds of the
- software development world. Anywhere you can find people using
- computers to manage information that changes often, there is
- room for version control. And that's where Subversion comes
- into play.</para>
- @ENGLISH }}} -->
- <para>Управление версиями — это искусство управления изменяющейся
- информацией. Это искусство долгое время было жизненно важным
- инструментом для программистов, которые большую часть своего времени
- пишут программу небольшими кусками, но иногда им нужно отменить все
- сегодняшние изменения. Но сфера применения систем управления версиями
- выходит далеко за пределы мира разработчиков программного обеспечения.
- Управление версиями требуется повсюду, где люди работают с постоянно
- изменяющейся информацией. Именно тогда на сцену выходит Subversion.</para>
+ <para>Some people have trouble absorbing a new technology by
+ reading the sort of <quote>top down</quote> approach provided by
+ this book. This section is a very short introduction to
+ Subversion, and is designed to give <quote>bottom up</quote>
+ learners a fighting chance. If you prefer to learn by
+ experimentation, the following demonstration will get you up and
+ running. Along the way, we give links to the relevant chapters
+ of this book.</para>
+ @ENGLISH }}} -->
+ <para>Некоторые испытывают трудности поглощения новой технологии
+ читая приближение <quote>с верху вниз</quote>, предлагаемое этой
+ книгой. Этот раздел представляет собой очень короткое введение в
+ Subversion и предназначен для того, что бы помочь изучающим
+ <quote>снизу вверх</quote>. Если вы из тех, кто предпочитает
+ учиться на экспериментах то последующая демонстрация поможет
+ вам начать. По ходу дела мы давали ссылки на соответствующие
+ главы книги.
+ </para>
<!-- @ENGLISH {{{
- <para>This chapter contains a high-level introduction to
- Subversion—what it is; what it does; how to get it.</para>
+ <para>If you're new to the entire concept of version control or to
+ the <quote>copy-modify-merge</quote> model used by both CVS and
+ Subversion, then you should read <xref linkend="svn.basic"/>
+ before going any further.</para>
@ENGLISH }}} -->
- <para>В этой главе даются общие знания о Subversion —
- что это такое, что она делает и как её получить.</para>
+ <para>Если вы не совсем знакомы с концепциями контроля версий или
+ моделью <quote>копирование-изменение-слияние</quote>, используемой
+ как CVS так и Subversion, перед тем как идти дальше, вам нужно
+ прочитать <xref linkend="svn.basic"/>.</para>
</simplesect>
@@ -142,55 +147,35 @@
<sect1 id="svn.intro.quickstart">
<!-- @ENGLISH {{{
- <title>A Quick Start</title>
- @ENGLISH }}} -->
- <title>Быстрый старт</title>
-
- <!-- @ENGLISH {{{
- <para>Some people have trouble absorbing a new technology by
- reading the sort of <quote>top down</quote> approach provided by
- this book. This section is a very short introduction to
- Subversion, and is designed to give <quote>bottom up</quote>
- learners a fighting chance. If you prefer to learn by
- experimentation, the following demonstration will get you up and
- running. Along the way, we give links to the relevant chapters
- of this book.</para>
+ <title>High-speed Tutorial</title>
@ENGLISH }}} -->
- <para>Некоторые испытывают трудности поглощения новой технологии
- читая приближение <quote>с верху вниз</quote>, предлагаемое этой
- книгой. Этот раздел представляет собой очень короткое введение в
- Subversion и предназначен для того, что бы помочь изучающим
- <quote>снизу вверх</quote>. Если вы из тех, кто предпочитает
- учиться на экспериментах то последующая демонстрация поможет
- вам начать. По ходу дела мы давали ссылки на соответствующие
- главы книги.
- </para>
+ <title>High-speed Tutorial</title>
- <!-- @ENGLISH {{{
- <para>If you're new to the entire concept of version control or to
- the <quote>copy-modify-merge</quote> model used by both CVS and
- Subversion, then you should read <xref linkend="svn.basic"/>
- before going any further.</para>
- @ENGLISH }}} -->
- <para>Если вы не совсем знакомы с концепциями контроля версий или
- моделью <quote>копирование-изменение-слияние</quote>, используемой
- как CVS так и Subversion, перед тем как идти дальше, вам нужно
- прочитать <xref linkend="svn.basic"/>.</para>
+ <blockquote>
+ <para><quote>Please make sure your seat backs are in their full,
+ upgright position, and that your tray tables are stored.
+ Flight attendants, prepare for take-off….</quote></para>
+ </blockquote>
+
+ <para>The following is a very high-level tutorial which will walk
+ you through some basic Subversion configuration and operation.
+ By the time you complete the tutorial, you should have a basic
+ understanding of Subversion's typical usage.</para>
<note>
<!-- @ENGLISH {{{
- <para>The following example assumes that you have
+ <para>The examples used in this appendix assume that you have
<command>svn</command>, the Subversion command-line client,
and <command>svnadmin</command>, the administrative tool,
ready to go. It also assumes you are using Subversion 1.2 or
later (run <command>svn -ﳢ-version</command> to check.)</para>
@ENGLISH }}} -->
- <para>Последующий пример предполагает наличие у вас работающих
- Subversion клиента для командной строки <command>svn</command> и
- инструмента администрирования <command>svnadmin</command>.
- Кроме этого он рассчитан на то, что вы используете Subversion
- версии 1.2 или более поздней (для того, чтобы это проверить,
- выполните <command>svn --version</command>).</para>
+ <para>Примеры, используемые в этом приложении предполагают наличие у
+ вас работающих Subversion клиента для командной строки
+ <command>svn</command> и инструмента администрирования
+ <command>svnadmin</command>. Кроме этого он рассчитан на то, что вы
+ используете Subversion версии 1.2 или более поздней (для того, чтобы
+ это проверить, выполните <command>svn --version</command>).</para>
</note>
<!-- @ENGLISH {{{
@@ -434,14 +419,17 @@
знакомства с различными типами доступных серверных процессов
и методами их настройки.</para>
+ <para>### TODO: Let's make this into a full tutorial, rather than
+ simply referring off to other sections. ###</para>
+
</sect1>
-</chapter>
+</appendix>
<!--
local variables:
-sgml-parent-document: ("book.xml" "chapter")
+sgml-parent-document: ("book.xml" "appendix")
end:
vim: tw=78:ft=svnbook
-->
Modified: trunk/src/ru/book/book.xml
==============================================================================
--- trunk/src/ru/book/book.xml (original)
+++ trunk/src/ru/book/book.xml Sun Feb 4 07:36:46 2007
@@ -5,18 +5,19 @@
%vers;
<!ENTITY foreword SYSTEM "foreword.xml">
<!ENTITY ch00 SYSTEM "ch-preface.xml">
-<!ENTITY ch01 SYSTEM "ch-introduction.xml">
-<!ENTITY ch02 SYSTEM "ch-basic-concepts.xml">
-<!ENTITY ch03 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch01 SYSTEM "ch-basic-concepts.xml">
+<!ENTITY ch02 SYSTEM "ch-guided-tour.xml">
+<!ENTITY ch03 SYSTEM "ch-advanced-topics.xml">
<!ENTITY ch04 SYSTEM "ch-branching-and-merging.xml">
<!ENTITY ch05 SYSTEM "ch-repository-admin.xml">
<!ENTITY ch06 SYSTEM "ch-server-configuration.xml">
-<!ENTITY ch07 SYSTEM "ch-advanced-topics.xml">
+<!ENTITY ch07 SYSTEM "ch-customizing-svn.xml">
<!ENTITY ch08 SYSTEM "ch-developer-info.xml">
<!ENTITY ch09 SYSTEM "ch-reference.xml">
-<!ENTITY appa SYSTEM "app-svn-for-cvs-users.xml">
-<!ENTITY appb SYSTEM "app-webdav.xml">
-<!ENTITY appc SYSTEM "app-third-party-tools.xml">
+<!ENTITY appa SYSTEM "app-quickstart.xml">
+<!ENTITY appb SYSTEM "app-svn-for-cvs-users.xml">
+<!ENTITY appc SYSTEM "app-webdav.xml">
+<!ENTITY appd SYSTEM "app-third-party-tools.xml">
<!ENTITY license SYSTEM "copyright.xml">
]>
@@ -112,6 +113,7 @@
&appa;
&appb;
&appc;
+ &appd;
&license;
</book>
Modified: trunk/src/ru/book/ch-advanced-topics.xml
==============================================================================
--- trunk/src/ru/book/ch-advanced-topics.xml (original)
+++ trunk/src/ru/book/ch-advanced-topics.xml Sun Feb 4 07:36:46 2007
@@ -4163,492 +4163,6 @@
</sect2>
</sect1>
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.l10n">
- <title>Localization</title>
-
- <para><firstterm>Localization</firstterm> is the act of making
- programs behave in a region-specific way. When a program
- formats numbers or dates in a way specific to your part of the
- world, or prints messages (or accepts input) in your native
- language, the program is said to
- be <firstterm>localized</firstterm>. This section describes
- steps Subversion has made towards localization.</para>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.l10n.understanding">
- <title>Understanding locales</title>
-
- <para>Most modern operating systems have a notion of the
- <quote>current locale</quote>—that is, the region or
- country whose localization conventions are honored. These
- conventions—typically chosen by some runtime
- configuration mechanism on the computer—affect the way
- in which programs present data to the user, as well as the way
- in which they accept user input.</para>
-
- <para>On Unix-like systems, you can check the values of the
- locale-related runtime configuration options by running the
- <command>locale</command> command:</para>
-
- <screen>
-$ locale
-LANG=
-LC_COLLATE="C"
-LC_CTYPE="C"
-LC_MESSAGES="C"
-LC_MONETARY="C"
-LC_NUMERIC="C"
-LC_TIME="C"
-LC_ALL="C"
-</screen>
-
- <para>The output is a list of locale-related environment
- variables and their current values. In this example, the
- variables are all set to the default <literal>C</literal>
- locale, but users can set these variables to specific
- country/language code combinations. For example, if one were
- to set the <literal>LC_TIME</literal> variable to
- <literal>fr_CA</literal>, then programs would know to present
- time and date information formatted according a
- French-speaking Canadian's expectations. And if one were to
- set the <literal>LC_MESSAGES</literal> variable to
- <literal>zh_TW</literal>, then programs would know to present
- human-readable messages in Traditional Chinese. Setting the
- <literal>LC_ALL</literal> variable has the effect of changing
- every locale variable to the same value. The value of
- <literal>LANG</literal> is used as a default value for any
- locale variable that is unset. To see the list of available
- locales on a Unix system, run the command <command>locale
- -a</command>.</para>
-
- <para>On Windows, locale configuration is done via the
- <quote>Regional and Language Options</quote> control panel
- item. There you can view and select the values of individual
- settings from the available locales, and even customize (at a
- sickening level of detail) several of the display formatting
- conventions.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.l10n.svnuse">
- <title>Subversion's use of locales</title>
-
- <para>The Subversion client, <command>svn</command>, honors the
- current locale configuration in two ways. First, it notices
- the value of the <literal>LC_MESSAGES</literal> variable and
- attempts to print all messages in the specified language. For
- example:</para>
-
- <screen>
-$ export LC_MESSAGES=de_DE
-$ svn help cat
-cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.
-Aufruf: cat ZIEL[@REV]...
-…
-</screen>
-
- <para>This behavior works identically on both Unix and Windows
- systems. Note, though, that while your operating system might
- have support for a certain locale, the Subversion client still
- may not be able to speak the particular language. In order to
- produce localized messages, human volunteers must provide
- translations for each language. The translations are written
- using the GNU gettext package, which results in translation
- modules that end with the <filename>.mo</filename> filename
- extension. For example, the German translation file is named
- <filename>de.mo</filename>. These translation files are
- installed somewhere on your system. On Unix, they typically
- live in <filename>/usr/share/locale/</filename>, while
- on Windows they're often found in the
- <filename>\share\locale\</filename> folder in Subversion's
- installation area. Once installed, a module is named after
- the program it provides translations for. For example, the
- <filename>de.mo</filename> file may ultimately end up
- installed as
- <filename>/usr/share/locale/de/LC_MESSAGES/subversion.mo</filename>.
- By browsing the installed <filename>.mo</filename> files, you
- can see which languages the Subversion client is able to
- speak.</para>
-
- <para>The second way in which the locale is honored involves how
- <command>svn</command> interprets your input. The repository
- stores all paths, filenames, and log messages in Unicode,
- encoded as UTF-8. In that sense, the repository is
- <firstterm>internationalized</firstterm>—that is, the
- repository is ready to accept input in any human language.
- This means, however, that the Subversion client is responsible
- for sending only UTF-8 filenames and log messages into the
- repository. In order to do this, it must convert the data
- from the native locale into UTF-8.</para>
-
- <para>For example, suppose you create a file
- named<filename>caffè.txt</filename>, and then when committing
- the file, you write the log message as <quote>Adesso il caffè
- è più forte</quote>. Both the filename and log message
- contain non-ASCII characters, but because your locale is set
- to <literal>it_IT</literal>, the Subversion client knows to
- interpret them as Italian. It uses an Italian character set
- to convert the data to UTF-8 before sending them off to the
- repository.</para>
-
- <para>Note that while the repository demands UTF-8 filenames and
- log messages, it <emphasis>does not</emphasis> pay attention
- to file contents. Subversion treats file contents as opaque
- strings of bytes, and neither client nor server makes an
- attempt to understand the character set or encoding of the
- contents.</para>
-
- <sidebar>
- <title>Character set conversion errors</title>
-
- <para>While using Subversion, you might get hit with an error
- related to character set conversions:</para>
-
- <screen>
-svn: Can't convert string from native encoding to 'UTF-8':
-…
-svn: Can't convert string from 'UTF-8' to native encoding:
-…
-</screen>
-
- <para>Errors like this typically occur when the Subversion
- client has received a UTF-8 string from the repository, but
- not all of the characters in that string can be represented
- using the encoding of the current locale. For example, if
- your locale is <literal>en_US</literal> but a collaborator
- has committed a Japanese filename, you're likely to see this
- error when you receive the file during an <command>svn
- update</command>.</para>
-
- <para>The solution is either to set your locale to something
- which <emphasis>can</emphasis> represent the incoming UTF-8
- data, or to change the filename or log message in the
- repository. (And don't forget to slap your collaborator's
- hand—projects should decide on common languages ahead of
- time, so that all participants are using the same
- locale.)</para>
- </sidebar>
-
- </sect2>
-
- </sect1>
-
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.externaldifftools">
- <title>Using External Differencing Tools</title>
-
- <para>The presence of <option>--diff-cmd</option> and
- <option>--diff3-cmd</option> options, and similarly named
- runtime configuration parameters (see <xref
- linkend="svn.advanced.confarea.opts.config"/>), can lead to a
- false notion of how easy it is to use external differencing (or
- <quote>diff</quote>) and merge tools with Subversion. While
- Subversion can use most of popular such tools available, the
- effort invested in setting this up often turns out to be
- non-trivial.</para>
-
- <para>The interface between Subversion and external diff and merge
- tools harkens back to a time when Subversion's only contextual
- differencing capabilities were built around invocations of the
- GNU diffutils toolchain, specifically the
- <command>diff</command> and <command>diff3</command> utilities.
- To get the kind of behavior Subversion needed, it called these
- utilities with more than a handful of options and parameters,
- most of which were quite specific to the utilities. Some time
- later, Subversion grew its own internal differencing library,
- and as a failover mechanism,
- <footnote>
- <para>Subversion developers are good, but even the best make
- mistakes.</para>
- </footnote>
- the <option>--diff-cmd</option> and <option>--diff3-cmd</option>
- options were added to the Subversion command-line client so
- users could more easily indicate that they preferred to use the
- GNU diff and diff3 utilities instead of the newfangled internal
- diff library. If those options were used, Subversion would
- simply ignore the internal diff library, and fall back to
- running those external programs, lengthy argument lists and all.
- And that's where things remain today.</para>
-
- <para>It didn't take long for folks to realize that having such
- easy configuration mechanisms for specifying that Subversion
- should use the external GNU diff and diff3 utilities located at
- a particular place on the system could be applied toward the use
- of other diff and merge tools, too. After all, Subversion
- didn't actually verify that the things it was being told to run
- were members of the GNU diffutils toolchain. But the only
- configurable aspect of using those external tools is their
- location on the system—not the option set, parameter
- order, etc. Subversion continues throwing all those GNU utility
- options at your external diff tool regardless of whether or not
- that program can understand those options. And that's where
- things get unintuitive for most users.</para>
-
- <para>The key to using external diff and merge tools (other than
- GNU diff and diff3, of course) with Subversion is to use wrapper
- scripts which convert the input from Subversion into something
- that your differencing tool can understand, and then to convert
- the output of your tool back into a format which Subversion
- expects—the format that the GNU tools would have used.
- The following sections cover the specifics of those
- expectations.</para>
-
- <note>
- <para>The decision on when to fire off a contextual diff or
- merge as part of a larger Subversion operation is made
- entirely by Subversion, and is affected by, among other
- things, whether or not the files being operated on are
- human-readable as determined by their
- <literal>svn:mime-type</literal> property. This means, for
- example, that even if you had the niftiest Microsoft
- Word-aware differencing or merging tool in the Universe, it
- would never be invoked by Subversion so long as your versioned
- Word documents had a configured MIME type that denoted that
- they were not human-readable (such as
- <literal>application/msword</literal>). For more about MIME
- type settings, see <xref
- linkend="svn.advanced.props.special.mime-type"/></para>
- </note>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.externaldifftools.diff">
- <title>External diff</title>
-
- <para>Subversion calls external diff programs with parameters
- suitable for the GNU diff utility, and expects only that the
- external program return with a successful error code. For
- most alternative diff program, only the sixth and seventh
- arguments, the paths of the files which represent the left and
- right sides of the diff, respectively, are of interest. Note
- that Subversion runs the diff program once per modified file
- covered by the Subversion operation, so if your program runs
- in an asynchronous fashion (or <quote>backgrounded</quote>),
- you might have several instances of it all running
- simultaneously. Finally, Subversion expects that your program
- return an errorcode of 1 if your program detected differences,
- or 0 if it did not—any other errorcode is considered a
- fatal error.
- <footnote>
- <para>The GNU diff manual page puts it this way: <quote>An
- exit status of 0 means no differences were found, 1 means some
- differences were found, and 2 means trouble.</quote></para>
- </footnote>
- </para>
-
- <para><xref linkend="svn.advanced.externaldifftools.diff.ex-1"/>
- and <xref linkend="svn.advanced.externaldifftools.diff.ex-2"/>
- are templates for external diff tool wrappers in the Bourne
- shell and Windows batch scripting languages,
- respectively.</para>
-
- <example id="svn.advanced.externaldifftools.diff.ex-1">
- <title>diffwrap.sh</title>
- <programlisting>
-#!/bin/sh
-
-# Configure your favorite diff program here.
-DIFF="/usr/local/bin/my-diff-tool"
-
-# Subversion provides the paths we need as the sixth and seventh
-# parameters.
-LEFT=${6}
-RIGHT=${7}
-
-# Call the diff command (change the following line to make sense for
-# your merge program).
-$DIFF --left $LEFT --right $RIGHT
-
-# Return an errorcode of 0 if no differences were detected, 1 if some were.
-# Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- <example id="svn.advanced.externaldifftools.diff.ex-2">
- <title>diffwrap.bat</title>
- <programlisting>
- at ECHO OFF
-
-REM Configure your favorite diff program here.
-SET DIFF="C:\Program Files\Funky Stuff\My Diff Tool.exe"
-
-REM Subversion provides the paths we need as the sixth and seventh
-REM parameters.
-SET LEFT=%6
-SET RIGHT=%7
-
-REM Call the diff command (change the following line to make sense for
-REM your merge program).
-%DIFF% --left %LEFT% --right %RIGHT%
-
-REM Return an errorcode of 0 if no differences were detected, 1 if some were.
-REM Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.externaldifftools.diff3">
- <title>External diff3</title>
-
- <para>Subversion calls external merge programs with parameters
- suitable for the GNU diff3 utility, expecting that the
- external program return with a successful error code and that
- the full file contents which result from the completed merge
- operation are printed on the standard output stream (so that
- Subversion can redirect them into the appropriate version
- controlled file). For most alternative merge programs, only
- the ninth, tenth, and eleventh arguments, the paths of the
- files which represent the <quote>mine</quote>,
- <quote>older</quote>, and <quote>yours</quote> inputs,
- respectively, are of interest. Note that because Subversion
- depends on the output of your merge program, you wrapper
- script must not exit before that output has been delivered to
- Subversion. When it finally does exit, it should return an
- errorcode of 0 if the merge was successful, or 1 if unresolved
- conflicts remain in the output—any other errorcode is
- considered a fatal error.</para>
-
- <para><xref linkend="svn.advanced.externaldifftools.diff3.ex-1"/>
- and <xref linkend="svn.advanced.externaldifftools.diff3.ex-2"/> are
- templates for external merge tool wrappers in the Bourne shell
- and Windows batch scripting languages, respectively.</para>
-
- <example id="svn.advanced.externaldifftools.diff3.ex-1">
- <title>diff3wrap.sh</title>
- <programlisting>
-#!/bin/sh
-
-# Configure your favorite diff3/merge program here.
-DIFF3="/usr/local/bin/my-merge-tool"
-
-# Subversion provides the paths we need as the ninth, tenth, and eleventh
-# parameters.
-MINE=${9}
-OLDER=${10}
-YOURS=${11}
-
-# Call the merge command (change the following line to make sense for
-# your merge program).
-$DIFF3 --older $OLDER --mine $MINE --yours $YOURS
-
-# After performing the merge, this script needs to print the contents
-# of the merged file to stdout. Do that in whatever way you see fit.
-# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
-# remain in the result. Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- <example id="svn.advanced.externaldifftools.diff3.ex-2">
- <title>diff3wrap.bat</title>
- <programlisting>
- at ECHO OFF
-
-REM Configure your favorite diff3/merge program here.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
-
-REM Subversion provides the paths we need as the ninth, tenth, and eleventh
-REM parameters. But we only have access to nine parameters at a time, so we
-REM shift our nine-parameter window twice to let us get to what we need.
-SHIFT
-SHIFT
-SET MINE=%7
-SET OLDER=%8
-SET YOURS=%9
-
-REM Call the merge command (change the following line to make sense for
-REM your merge program).
-%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%
-
-REM After performing the merge, this script needs to print the contents
-REM of the merged file to stdout. Do that in whatever way you see fit.
-REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
-REM remain in the result. Any other errorcode will be treated as fatal.
-</programlisting>
- </example>
-
- </sect2>
- </sect1>
-
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <!-- ================================================================= -->
- <sect1 id="svn.advanced.reposurls">
- <title>Subversion Repository URLs</title>
-
- <para>As illustrated throughout this book, Subversion uses URLs to
- identify versioned resources in Subversion repositories. For
- the most part, these URLs use the standard syntax, allowing for
- server names and port numbers to be specified as part of the
- URL:</para>
-
- <screen>
-$ svn checkout http://svn.example.com:9834/repos
-…
-</screen>
-
- <para>But there are some nuances in Subversion's handling of URLs
- that are notable. For example, URLs containing the
- <literal>file:</literal> access method (used for local
- repositories) must, in accordance with convention, have either a
- server name of <literal>localhost</literal> or no server name at
- all:</para>
-
- <screen>
-$ svn checkout file:///path/to/repos
-…
-$ svn checkout file://localhost/path/to/repos
-…
-</screen>
-
- <para>Also, users of the <literal>file:</literal> scheme on
- Windows platforms will need to use an unofficially
- <quote>standard</quote> syntax for accessing repositories
- that are on the same machine, but on a different drive than
- the client's current working drive. Either of the two
- following URL path syntaxes will work where
- <literal>X</literal> is the drive on which the repository
- resides:</para>
-
- <screen>
-C:\> svn checkout file:///X:/path/to/repos
-…
-C:\> svn checkout "file:///X|/path/to/repos"
-…
-</screen>
-
- <para>In the second syntax, you need to quote the URL so that the
- vertical bar character is not interpreted as a pipe. Also, note
- that a URL uses ordinary slashes even though the native
- (non-URL) form of a path on Windows uses backslashes.</para>
-
- <para>Finally, it should be noted that the Subversion client will
- automatically encode URLs as necessary, just like a web browser
- does. For example, if a URL contains a space or upper-ASCII
- character:</para>
-
- <screen>
-$ svn checkout "http://host/path with space/project/españa"
-</screen>
-
- <para>…then Subversion will escape the unsafe characters
- and behave as if you had typed:</para>
-
- <screen>
-$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a
-</screen>
-
- <para>If the URL contains spaces, be sure to place it within quote
- marks, so that your shell treats the whole thing as a single
- argument to the <command>svn</command> program.</para>
-
- </sect1>
-
</chapter>
<!--
Modified: trunk/src/ru/book/ch-basic-concepts.xml
==============================================================================
--- trunk/src/ru/book/ch-basic-concepts.xml (original)
+++ trunk/src/ru/book/ch-basic-concepts.xml Sun Feb 4 07:36:46 2007
@@ -568,6 +568,78 @@
<para>Настало время перейти от абстракций к конкретике. В этом разделе мы покажем
реальные примеры использования Subversion.</para>
+ <!-- ================================================================= -->
+ <sect2 id="svn.advanced.reposurls">
+ <title>Subversion Repository URLs</title>
+
+ <para>As illustrated throughout this book, Subversion uses URLs to
+ identify versioned resources in Subversion repositories. For
+ the most part, these URLs use the standard syntax, allowing for
+ server names and port numbers to be specified as part of the
+ URL:</para>
+
+ <screen>
+$ svn checkout http://svn.example.com:9834/repos
+…
+</screen>
+
+ <para>But there are some nuances in Subversion's handling of URLs
+ that are notable. For example, URLs containing the
+ <literal>file:</literal> access method (used for local
+ repositories) must, in accordance with convention, have either a
+ server name of <literal>localhost</literal> or no server name at
+ all:</para>
+
+ <screen>
+$ svn checkout file:///path/to/repos
+…
+$ svn checkout file://localhost/path/to/repos
+…
+</screen>
+
+ <para>Also, users of the <literal>file:</literal> scheme on
+ Windows platforms will need to use an unofficially
+ <quote>standard</quote> syntax for accessing repositories
+ that are on the same machine, but on a different drive than
+ the client's current working drive. Either of the two
+ following URL path syntaxes will work where
+ <literal>X</literal> is the drive on which the repository
+ resides:</para>
+
+ <screen>
+C:\> svn checkout file:///X:/path/to/repos
+…
+C:\> svn checkout "file:///X|/path/to/repos"
+…
+</screen>
+
+ <para>In the second syntax, you need to quote the URL so that the
+ vertical bar character is not interpreted as a pipe. Also, note
+ that a URL uses ordinary slashes even though the native
+ (non-URL) form of a path on Windows uses backslashes.</para>
+
+ <para>Finally, it should be noted that the Subversion client will
+ automatically encode URLs as necessary, just like a web browser
+ does. For example, if a URL contains a space or upper-ASCII
+ character:</para>
+
+ <screen>
+$ svn checkout "http://host/path with space/project/españa"
+</screen>
+
+ <para>…then Subversion will escape the unsafe characters
+ and behave as if you had typed:</para>
+
+ <screen>
+$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a
+</screen>
+
+ <para>If the URL contains spaces, be sure to place it within quote
+ marks, so that your shell treats the whole thing as a single
+ argument to the <command>svn</command> program.</para>
+
+ </sect2>
+
<!-- =============================================================== -->
<sect2 id="svn.basic.in-action.wc">
<!-- @ENGLISH {{{
Copied: trunk/src/ru/book/ch-customizing-svn.xml (from r2644, /trunk/src/ru/book/ch-advanced-topics.xml)
==============================================================================
--- /trunk/src/ru/book/ch-advanced-topics.xml (original)
+++ trunk/src/ru/book/ch-customizing-svn.xml Sun Feb 4 07:36:46 2007
@@ -1,4168 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="svn.advanced">
+<chapter id="svn.customization">
<!-- @ENGLISH {{{
- <title>Advanced Topics</title>
+ <title>Customizing Your Subversion Experience</title>
@ENGLISH }}} -->
<title>Профессиональное использование Subversion</title>
<!-- See also svn.preface.organization -->
<simplesect>
- <!-- @ENGLISH {{{
- <para>If you've been reading this book chapter by chapter, from
- start to finish, you should by now have acquired enough
- knowledge to use the Subversion client to perform the most
- common version control operations. You understand how to
- checkout a working copy from a Subversion repository. You are
- comfortable with submitting and receiving changes using the
- <command>svn commit</command> and <command>svn update</command>
- functions. You've probably even developed a reflex which causes
- you to run the <command>svn status</command> command almost
- unconsciously. For all intents and purposes, you are ready to
- use Subversion in a typical environment.</para>
-
- <para>But the Subversion feature set doesn't stop at <quote>common
- version control operations</quote>.</para>
- @ENGLISH }}} -->
- <para>Если эту книгу вы читали главу за главой, от начала до
- конца, то к настоящему моменту должны иметь достаточно знаний
- для использования Subversion клиента при выполнении типичных
- управлению версиями операций. Вы понимаете, как создавать
- рабочую копию. Знаете как используя команды <command>svn
- commit</command> и <command>svn update</command> отправлять и
- получать изменения. Возможно у вас уже даже выработался рефлекс
- бессознательного запуска <command>svn status</command>. Вы готовы
- применять Subversion в большинстве возможных типовых
- ситуаций.</para>
-
- <para>Однако предоставляемая Subversion функциональность не
- ограничивается <quote>типовыми операциями управления
- версиями</quote>.</para>
-
- <!-- @ENGLISH {{{
- <para>This chapter highlights some of Subversion's features that
- aren't quite so regularly used. In it, we will discuss
- Subversion's property (or <quote>metadata</quote>) support, and
- how to modify Subversion's default behaviors by tweaking its
- run-time configuration area. We will describe how you can use
- externals definitions to instruct Subversion to pull data from
- multiple repositories. We'll cover in detail some of the
- additional client- and server-side tools that are part of the
- Subversion distribution.</para>
-
- <para>Before reading this chapter, you should be familiar with the
- basic file and directory versioning capabilities of Subversion.
- If you haven't already read about those, or if you need a
- refresher, we recommend that you check out <xref
- linkend="svn.basic" /> and <xref linkend="svn.tour" />. Once
- you've mastered the basics and consumed this chapter, you'll be
- a Subversion power-user!
- </para>
- @ENGLISH }}} -->
- <para>Эта глава рассказывает о не часто используемых возможностях
- Subversion. В ней мы рассмотрим поддержку свойств (или
- <quote>метаданных</quote>) и способы изменения стандартного поведения
- Subversion изменяя ее параметры времени выполнения. Мы расскажем
- как используя внешние зависимости заставить Subversion получать
- информацию из нескольких хранилищ. Подробно рассмотрим клиентские и
- серверные инструменты, входящие в поставку Subversion.</para>
-
- <para>Перед чтением этой главы, необходимо хорошо представлять
- механизмы версионированния файлов и директорий в Subversion.
- Если вы еще этого не прочитали или просто хотите освежить в памяти
- эту информацию, рекомендуем просмотреть <xref linkend="svn.basic" />
- и <xref linkend="svn.tour" />. После того как вы овладеете
- основами и примами, рассмотренными в этой главе, вы станете продвинутым
- пользователем Subversion!</para>
+ <para>### TODO ###</para>
</simplesect>
- <sect1 id="svn.advanced.confarea">
- <!-- @ENGLISH {{{
- <title>Runtime Configuration Area</title>
-
- <para>Subversion provides many optional behaviors that can be
- controlled by the user. Many of these options are of the kind
- that a user would wish to apply to all Subversion operations.
- So, rather than forcing users to remember command-line arguments
- for specifying these options, and to use them for each and every
- operation they perform, Subversion uses configuration files,
- segregated into a Subversion configuration area.</para>
-
- <para>The Subversion <firstterm>configuration area</firstterm> is
- a two-tiered hierarchy of option names and their values.
- Usually, this boils down to a special directory that contains
- <firstterm>configuration files</firstterm> (the first tier),
- which are just text files in standard INI format (with
- <quote>sections</quote> providing the second tier). These files
- can be easily edited using your favorite text editor (such as
- Emacs or vi), and contain directives read by the client to
- determine which of several optional behaviors the user
- prefers.</para>
- @ENGLISH }}} -->
- <title>Параметры времени выполнения</title>
-
- <para>Subversion имеет множество контролируемых пользователем
- опциональных параметров поведения. Возможно пользователь
- хотел бы применять некоторые из этих параметров во всех
- операциях Subversion. Поэтому для того, что бы не заставлять
- пользователей помнить ключи командной строки используемые для
- указания этих параметров и не указывать их при всех выполняемых
- операциях, Subversion использует конфигурационные файлы, выделенные
- в область конфигурации Subversion.</para>
-
- <para><firstterm>Область конфигурации</firstterm> Subversion
- имеет двухуровневую иерархию имен параметров и их значений.
- Как правило, она сводится к отдельной директории, содержащей
- <firstterm>конфигурационные файлы</firstterm> (первый уровень)
- являющиеся простыми текстовыми файлами в стандартном INI формате
- (с <quote>разделами</quote>, обеспечивающими второй уровень).
- Эти файлы содержат директивы используемые клиентом для определения
- поведения клиента предпочитаемого пользователем, и могут быть легко
- отредактированы используя ваш любимый редактор (например, Emacs
- или vi).</para>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.layout">
- <!-- @ENGLISH {{{
- <title>Configuration Area Layout</title>
-
- <para>The first time that the <command>svn</command>
- command-line client is executed, it creates a per-user
- configuration area. On Unix-like systems, this area appears
- as a directory named <filename>.subversion</filename> in the
- user's home directory. On Win32 systems, Subversion creates a
- folder named <filename>Subversion</filename>, typically inside
- the <filename>Application Data</filename> area of the user's
- profile directory (which, by the way, is usually a hidden
- directory). However, on this platform the exact location
- differs from system to system, and is dictated by the Windows
- registry.
- <footnote>
- <para>The <literal>APPDATA</literal> environment variable
- points to the <filename>Application Data</filename> area,
- so you can always refer to this folder as
- <filename>%APPDATA%\Subversion</filename>.</para>
- </footnote>
- We will refer to the per-user configuration area using its Unix
- name, <filename>.subversion</filename>.</para>
- @ENGLISH }}} -->
- <title>Структура области конфигурации</title>
-
- <para>Во время первого запуска клиент для командной строки
- <command>svn</command> создает отдельную для каждого пользователя
- область конфигурации. На Unix-подобных системах эта директория
- называется <filename>.subversion</filename> и находиться в домашней
- директории пользователя. На Win32 системах Subversion создает
- папку с именем <filename>Subversion</filename> в области
- <filename>Application Data</filename> директории с профилем
- пользователя (которая, кстати говоря, обычно является скрытой
- директорией). Однако на этой платформе точное местоположение
- отличается от системы к системе и указывается в реестре
- Windows. <footnote><para>Переменная среды окружения
- <literal>APPDATA</literal> указывает на папку <filename>Application
- Data</filename> поэтому к этой директории можно всегда обращаться
- как к <filename>%APPDATA%\Subversion</filename>.</para></footnote>
- При обращении к пользовательской области конфигурации мы будем
- использовать ее Unix-название.</para>
-
- <!-- @ENGLISH {{{
- <para>In addition to the per-user configuration area, Subversion
- also recognizes the existence of a system-wide configuration
- area. This gives system administrators the ability to
- establish defaults for all users on a given machine. Note
- that the system-wide configuration area does not alone dictate
- mandatory policy—the settings in the per-user
- configuration area override those in the system-wide one, and
- command-line arguments supplied to the <command>svn</command>
- program have the final word on behavior. On Unix-like
- platforms, the system-wide configuration area is
- expected to be the <filename>/etc/subversion</filename>
- directory; on Windows machines, it looks for a
- <filename>Subversion</filename> directory inside the common
- <filename>Application Data</filename> location (again, as
- specified by the Windows Registry). Unlike the per-user
- case, the <command>svn</command> program does not attempt
- to create the system-wide configuration area.</para>
- @ENGLISH }}} -->
- <para>В дополнение к пользовательской области конфигурации,
- Subversion использует общесистемную область конфигурации. Это
- дает возможность системным администраторам устанавливать
- параметры по умолчанию для всех пользователей отдельно взятой
- машины. Помните, что системная область конфигурации не
- устанавливает безоговорочные правила — параметры, заданные
- пользовательской конфигурацией переопределяют системные параметры,
- а аргументы командной строки, передаваемые программе
- <command>svn</command>, имеют последнее слово. На Unix-подобных
- платформах ожидаемым местоположением системной области конфигурации
- является директория <filename>/etc/subversion</filename>; на
- Windows машинах ищется директория <filename>Subversion</filename>
- внутри общесистемной области <filename>Application Data</filename>
- (также определяемой реестром). В отличие от пользовательской,
- системную область конфигурации <command>svn</command> не
- создает.</para>
-
- <!-- @ENGLISH {{{
- <para>The configuration area currently contains three
- files—two configuration files (<filename>config</filename> and
- <filename>servers</filename>), and a <filename>README.txt</filename>
- file which describes the INI format. At the time of their
- creation, the files contain default values for each of the
- supported Subversion options, mostly commented out and grouped
- with textual descriptions about how the values for the key
- affect Subversion's behavior. To change a certain behavior,
- you need only to load the appropriate configuration file into
- a text editor, and modify the desired option's value. If at
- any time you wish to have the default configuration settings
- restored, you can simply remove (or rename) your configuration
- directory and then run some innocuous <command>svn</command>
- command, such as <command>svn -ﳢ-version</command>. A new
- configuration directory with the default contents will be
- created.</para>
-
- <para>The per-user configuration area also contains a cache of
- authentication data. The <filename>auth</filename> directory
- holds a set of subdirectories that contain pieces of cached
- information used by Subversion's various supported
- authentication methods. This directory is created in such a
- way that only the user herself has permission to read its
- contents.</para>
- @ENGLISH }}} -->
- <para>На сегодняшний момент область конфигурации содержит три
- файла — два файла конфигурации (<filename>config</filename>
- и <filename>servers</filename>) и <filename>README.txt</filename>,
- который содержит описание INI формата. После их создания, эти файлы
- содержат значения по умолчанию для всех, поддерживаемых Subversion
- параметров, обычно закомментированных и объединенных с текстовым
- описанием значений ключей, влияющих на поведение Subversion.
- Для того, что бы изменить отдельный параметр все, что нужно, просто
- загрузить соответствующий файл в текстовый редактор и изменить
- значение нужного параметра. Если в какой-то момент вы захотите
- восстановить параметры по умолчанию, необходимо просто удалить
- (или переименовать) директорию с конфигурацией, после чего
- выполнить какую-то безобидную команду <command>svn</command>,
- например, <command>svn --version</command>. В результате будет
- создана новая директория с конфигурацией и содержимым по
- умолчанию.</para>
-
- <para>Кроме того, пользовательская область конфигурации содержит
- кеш идентификационной информации. Директория <filename>auth</filename>
- объединяет набор поддиректорий, содержащих кешированну информацию,
- используемую в различных, поддерживаемых Subversion методах
- авторизации. Эта директория создается так, что бы только сам
- пользователь имел право просматривать ее содержимое.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.windows-registry">
- <!-- @ENGLISH {{{
- <title>Configuration and the Windows Registry</title>
-
- <para>In addition to the usual INI-based configuration area,
- Subversion clients running on Windows platforms may also use
- the Windows registry to hold the configuration data. The
- option names and their values are the same as in the INI
- files. The <quote>file/section</quote> hierarchy is
- preserved as well, though addressed in a slightly different
- fashion—in this schema, files and sections are just
- levels in the registry key tree.</para>
-
- <para>Subversion looks for system-wide configuration values
- under the
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>
- key. For example, the <literal>global-ignores</literal> option,
- which is in the <literal>miscellany</literal> section of the
- <filename>config</filename> file, would be found at
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>.
- Per-user configuration values should be stored under
- <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.
- </para>
- @ENGLISH }}} -->
- <title>Конфигурация и реестр Windows</title>
-
- <para>В дополнение к обычным INI-настройкам, Subversion-клиент,
- работающий на платформе Windows, может использовать для
- хранения настроек Windows-реестр. Имена параметров и их значения
- точно такие же, как и в INI-файлах. Иерархия <quote>файлов</quote>
- сохраняется, только немного меняется способ адресации —
- файлы и разделы просто заменяются уровнями в дереве ключей
- реестра.</para>
-
- <para>За общесистемными настройками Subversion обращается к ключу
- <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>
- Например, параметр <literal>global-ignores</literal>, находящийся в
- разделе <literal>miscellany</literal> файла
- <filename>config</filename> будет находиться в <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>. Пользовательские настройки хранятся в ключе
- <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.
- </para>
-
- <!-- @ENGLISH {{{
- <para>Registry-based configuration options are parsed
- <emphasis>before</emphasis> their file-based counterparts,
- so are overridden by values found in the configuration
- files. In other words, configuration priority is granted in
- the following order on a Windows system:</para>
-
- <orderedlist>
- <listitem>
- <para>Command-line options</para>
- </listitem>
- <listitem>
- <para>The per-user INI files</para>
- </listitem>
- <listitem>
- <para>The per-user Registry values</para>
- </listitem>
- <listitem>
- <para>The system-wide INI files</para>
- </listitem>
- <listitem>
- <para>The system-wide Registry values</para>
- </listitem>
- </orderedlist>
- @ENGLISH }}} -->
- <para>Параметры конфигурации, указанные в реестре обрабатываются
- <emphasis>до</emphasis> эквивалентных параметров в файлах
- конфигурации, поэтому они заменяются значениями, найденными,
- в файлах конфигурации. Другими словами, на Windows-системе
- приоритеты расположены в следующем порядке:</para>
-
- <orderedlist>
- <listitem>
- <para>Параметры командной строки</para>
- </listitem>
- <listitem>
- <para>Пользовательские INI-файлы</para>
- </listitem>
- <listitem>
- <para>Параметры в реестре</para>
- </listitem>
- <listitem>
- <para>Системные INI-файлы</para>
- </listitem>
- <listitem>
- <para>Общесистемные параметры в реестре</para>
- </listitem>
- </orderedlist>
-
- <!-- @ENGLISH {{{
- <para>Also, the Windows Registry doesn't really support the
- notion of something being <quote>commented out</quote>.
- However, Subversion will ignore any option key whose name
- begins with a hash (<literal>#</literal>) character. This
- allows you to effectively comment out a Subversion option
- without deleting the entire key from the Registry, obviously
- simplifying the process of restoring that option.</para>
-
- <para>The <command>svn</command> command-line client never
- attempts to write to the Windows Registry, and will not
- attempt to create a default configuration area there. You can
- create the keys you need using the <command>REGEDIT</command>
- program. Alternatively, you can create a
- <filename>.reg</filename> file, and then double-click on that
- file from the Explorer shell, which will cause the data to be
- merged into your registry.</para>
-
- <example id="svn.advanced.confarea.windows-registry.ex-1">
- <title>Sample Registration Entries (.reg) File.</title>
- @ENGLISH }}} -->
- <para>Кроме того, реестр Windows не поддерживает механизма
- <quote>комментирования</quote>. Тем не менее, Subversion
- игнорирует параметры, у которых имена начинаются с
- символа <quote>решетка</quote> (<literal>#</literal>).
- Это позволяет закомментировать параметр, не удаляя ключ из
- реестра, что значительно упрощает процесс восстановления этого
- параметра.</para>
-
- <para>Клиент для командной строки <command>svn</command>
- никогда ничего не записывает и не создает первоначальные
- <quote>умолчательные</quote> параметры в реестре Windows.
- Нужные вам ключи вы можете создать используя программу
- <command>REGEDIT</command>. Либо, можно создать
- <filename>.reg</filename>-файл и двойным щелчком на этом файле
- в Explorer добавить информацию в реестр.</para>
-
- <example id="svn.advanced.confarea.windows-registry.ex-1">
- <title>Пример указания параметров в (.reg) файле реестра.</title>
-
- <programlisting>
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Servers\groups]
-
-[HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Servers\global]
-"#http-proxy-host"=""
-"#http-proxy-port"=""
-"#http-proxy-username"=""
-"#http-proxy-password"=""
-"#http-proxy-exceptions"=""
-"#http-timeout"="0"
-"#http-compression"="yes"
-"#neon-debug-mask"=""
-"#ssl-authority-files"=""
-"#ssl-trust-default-ca"=""
-"#ssl-client-cert-file"=""
-"#ssl-client-cert-password"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auth]
-"#store-auth-creds"="no"
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\helpers]
-"#editor-cmd"="notepad"
-"#diff-cmd"=""
-"#diff3-cmd"=""
-"#diff3-has-program-arg"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\miscellany]
-"#global-ignores"="*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store"
-"#log-encoding"=""
-"#use-commit-times"=""
-"#template-root"=""
-"#enable-auto-props"=""
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\tunnels]
-
-[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props]
-</programlisting>
- </example>
-
- <!-- @ENGLISH {{{
- <para>The previous example shows the contents of a
- <filename>.reg</filename> file which contains some of the most
- commonly used configuration options and their default values.
- Note the presence of both system-wide (for network
- proxy-related options) and per-user settings (editor programs
- and password storage, among others). Also note that all the
- options are effectively commented out. You need only to
- remove the hash (<literal>#</literal>) character from the
- beginning of the option names, and set the values as you
- desire.</para>
- @ENGLISH }}} -->
- <para>В предыдущем примере показано содержимое
- <filename>.reg</filename>-файла, содержащего часто используемые
- параметры и их значения по умолчанию. Обратите внимание, что
- приведены как общесистемные (сетевые настройки, относящиеся к
- прокси-серверу) и пользовательские параметры (программы-редакторы
- и сохранение паролей, среди прочего). Так же обратите внимание,
- что все параметры закомментированы. Необходимо будет просто удалить
- символ <quote>решетка</quote> (<literal>#</literal>) и установить
- нужное значение.</para>
-
- </sect2>
-
- <!-- =============================================================== -->
- <sect2 id="svn.advanced.confarea.opts">
- <!-- @ENGLISH {{{
- <title>Configuration Options</title>
-
- <para>In this section, we will discuss the specific
- run-time configuration options that are currently supported
- by Subversion.</para>
- @ENGLISH }}} -->
- <title>Параметры конфигурации</title>
-
- <para>В этом разделе рассматриваются поддерживаемые
- Subversion параметры времени выполнения.</para>
-
- <sect3 id="svn.advanced.confarea.opts.servers">
- <title>Servers</title>
-
- <!-- @ENGLISH {{{
- <para>The <filename>servers</filename> file contains
- Subversion configuration options related to the network
- layers. There are two special section names in this
- file—<literal>groups</literal> and
- <literal>global</literal>. The <literal>groups</literal>
- section is essentially a cross-reference table. The keys in
- this section are the names of other sections in the file;
- their values are <firstterm>globs</firstterm>—textual
- tokens which possibly contain wildcard
- characters—that are compared against the hostnames of
- the machine to which Subversion requests are sent.</para>
- @ENGLISH }}} -->
- <para>В файле <filename>servers</filename> находятся настройки,
- относящиеся к работе Subversion через сеть. Он содержит
- два специальных раздела — <literal>groups</literal> и
- <literal>global</literal>. Раздел <literal>groups</literal>
- представляет собой просто перекрестную таблицу. Ключи этого
- раздела являются именами последующих разделов файла; значения
- ключей представляют собой <firstterm>обобщения</firstterm> —
- текстовые блоки, которые могут содержать подстановочные символы
- — сравниваемые с именами машин, к которым Subversion
- направляет запросы.</para>
-
- <programlisting>
-[groups]
-beanie-babies = *.red-bean.com
-collabnet = svn.collab.net
-
-[beanie-babies]
-…
-
-[collabnet]
-…
-</programlisting>
-
- <!-- @ENGLISH {{{
- <para>When Subversion is used over a network, it attempts to
- match the name of the server it is trying to reach with a
- group name under the <literal>groups</literal> section. If
- a match is made, Subversion then looks for a section in the
- <filename>servers</filename> file whose name is the matched
- group's name. From that section it reads the actual network
- configuration settings.</para>
-
- <para>The <literal>global</literal> section contains the
- settings that are meant for all of the servers not matched
- by one of the globs under the <literal>groups</literal>
- section. The options available in this section are
- exactly the same as those valid for the other server
- sections in the file (except, of course, the special
- <literal>groups</literal> section), and are as
- follows:</para>
- @ENGLISH }}} -->
- <para>При работе через сеть, Subversion ищет совпадения между
- именем сервера, с которым устанавливается связь и именем группы
- в разделе <literal>groups</literal>. Если найдено совпадение,
- Subversion обращается к файлу <filename>servers</filename>,
- к разделу с именем, совпадающим с именем группы. Из этого раздела
- берутся необходимые сетевые настройки.</para>
-
- <para>Раздел <literal>global</literal> содержит настройки,
- используемые для всех серверов, не подпадающих ни под одно
- обобщение раздела <literal>groups</literal>. Здесь указываются
- те-же, что и для остальных серверных разделов файла параметры
- (конечно, за исключением специального раздела
- <literal>groups</literal>), используемые параметры приведены
- ниже:</para>
-
- <variablelist>
- <varlistentry>
- <term><literal>http-proxy-host</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the hostname of the proxy computer
- through which your HTTP-based Subversion requests must
- pass. It defaults to an empty value, which means that
- Subversion will not attempt to route HTTP requests
- through a proxy computer, and will instead attempt to
- contact the destination machine directly.</para>
- @ENGLISH }}} -->
- <para>Указывает имя компьютера-посредника, через который
- Subversion должна отправлять HTTP-запросы. По умолчанию,
- этот параметр имеет пустое значение, которое говорит
- Subversion о том, что она должна направлять HTTP-запросы
- не через компьютер-посредник, а связываться с целевой машиной
- напрямую.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-port</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the port number on the proxy host
- to use. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Указывает номер используемого порта на промежуточном
- компьютере. По умолчанию имеет пустое значение.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-username</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the username to supply to the proxy
- machine. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Указывает имя пользователя, передаваемого
- компьютеру-посреднику. По умолчанию имеет пустое
- значение.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>http-proxy-password</literal></term>
- <listitem>
- <!-- @ENGLISH {{{
- <para>This specifies the password to supply to the proxy
- machine. It defaults to an empty value.</para>
- @ENGLISH }}} -->
- <para>Указывает пароль, передаваемый
- компьютеру-посреднику. По умолчанию имеет пустое
- з&#