[svnbook commit] r2100 - trunk/src/pt_BR/book
ccidral
svnbook-dev at red-bean.com
Fri Mar 24 17:41:57 CST 2006
Author: ccidral
Date: Fri Mar 24 17:41:50 2006
New Revision: 2100
Modified:
trunk/src/pt_BR/book/ch05.xml
trunk/src/pt_BR/book/ch06.xml
trunk/src/pt_BR/book/ch07.xml
trunk/src/pt_BR/book/ch08.xml
trunk/src/pt_BR/book/ch09.xml
Log:
Merge changes from en up to 2099
Modified: trunk/src/pt_BR/book/ch05.xml
==============================================================================
--- trunk/src/pt_BR/book/ch05.xml (original)
+++ trunk/src/pt_BR/book/ch05.xml Fri Mar 24 17:41:50 2006
@@ -1572,7 +1572,7 @@
and <filename>branches</filename> directories to live in the
root of your repository, you might wish to edit your
dump files, tweaking the <literal>Node-path</literal> and
- <literal>Copyfrom-path</literal> headers to no longer have
+ <literal>Node-copyfrom-path</literal> headers to no longer have
that first <filename>calc/</filename> path component. Also,
you'll want to remove the section of dump data that creates
the <filename>calc</filename> directory. It will look
@@ -1664,7 +1664,7 @@
to path semantics. Pay attention to whether paths in your
dump file are specified with or without leading slashes.
You'll want to look at the <literal>Node-path</literal> and
- <literal>Copyfrom-path</literal> headers.</para>
+ <literal>Node-copyfrom-path</literal> headers.</para>
<screen>
…
Modified: trunk/src/pt_BR/book/ch06.xml
==============================================================================
--- trunk/src/pt_BR/book/ch06.xml (original)
+++ trunk/src/pt_BR/book/ch06.xml Fri Mar 24 17:41:50 2006
@@ -116,9 +116,9 @@
<entry>Web viewing</entry>
<entry>limited built-in support, or via 3rd-party tools
- such as ViewCVS</entry>
+ such as ViewVC</entry>
- <entry>via 3rd-party tools such as ViewCVS</entry>
+ <entry>via 3rd-party tools such as ViewVC</entry>
</row>
<row>
@@ -2112,9 +2112,13 @@
list</command> and <command>svn cat</command> commands.
To browse old revisions with your web browser, however,
you can use third-party software. A good example of this
- is ViewCVS (<ulink url="http://viewvc.tigris.org/"/>).
- ViewCVS was originally written to display CVS repositories
- through the web, and the latest bleeding-edge versions (at
+ is ViewVC (<ulink url="http://viewvc.tigris.org/"/>).
+ ViewVC was originally written to display CVS repositories
+ through the web,
+ <footnote>
+ <para>Back then, it was called <quote>ViewCVS</quote>.</para>
+ </footnote>
+ and the latest bleeding-edge versions (at
the time of writing) are able to understand Subversion
repositories as well.</para>
</sidebar>
Modified: trunk/src/pt_BR/book/ch07.xml
==============================================================================
--- trunk/src/pt_BR/book/ch07.xml (original)
+++ trunk/src/pt_BR/book/ch07.xml Fri Mar 24 17:41:50 2006
@@ -482,12 +482,35 @@
user wishes to edit, and the edits take place right
in the editor program (see <xref
linkend="svn.advanced.props" />). This option's default
- value is empty. If the option is not set, Subversion
- will fall back to checking the environment variables
- <literal>SVN_EDITOR</literal>,
- <literal>VISUAL</literal>, and
- <literal>EDITOR</literal> (in that order) for an
- editor command.</para>
+ value is empty. The order of priority for determining the
+ editor command is:</para>
+ <orderedlist>
+ <listitem>
+ <para>Command-line option <literal>--editor-cmd</literal></para>
+ </listitem>
+ <listitem>
+ <para>Environment variable <literal>SVN_EDITOR</literal></para>
+ </listitem>
+ <listitem>
+ <para>Configuration option <literal>editor-cmd</literal></para>
+ </listitem>
+ <listitem>
+ <para>Environment variable <literal>VISUAL</literal></para>
+ </listitem>
+ <listitem>
+ <para>Environment variable <literal>EDITOR</literal></para>
+ </listitem>
+ <listitem>
+ <para>Possibly, a default value built in to Subversion
+ (not present in the official builds)</para>
+ </listitem>
+ </orderedlist>
+ <para>The value of any of these options or variables is
+ (unlike <literal>diff-cmd</literal>) the beginning of a
+ command line to be executed by the shell. Subversion
+ appends a space and the pathname of the temporary file to be
+ edited. The editor should modify the temporary file and
+ return a zero exit code to indicate success.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -907,7 +930,7 @@
<screen>
$ svn propdel license calc/button.c
-property 'license' deleted from ''.
+property 'license' deleted from 'calc/button.c'.
$ svn proplist --verbose calc/button.c
Properties on 'calc/button.c':
copyright : (c) 2003 Red-Bean Software
@@ -1527,6 +1550,101 @@
file will be re-substituted with information that
reflects the most recent known commit to that file.</para>
+ <para>Subversion 1.2 introduced a new variant of the keyword
+ syntax which brought additional, useful—though perhaps
+ atypical—functionality. You can now tell Subversion
+ to maintain a fixed length (in terms of the number of bytes
+ consumed) for the substituted keyword. By using a
+ double-colon (<literal>::</literal>) after the keyword name,
+ followed by a number of space characters, you define that
+ fixed width. When Subversion goes to substitute your
+ keyword for the keyword and its value, it will essentially
+ replace only those space characters, leaving the overall
+ width of the keyword field unchanged. If the substituted
+ value is shorter than the defined field width, there will be
+ extra padding characters (spaces) at the end of the
+ substituted field; if it is too long, it is truncated with a
+ special hash (<literal>#</literal>) character just before
+ the final dollar sign terminator.</para>
+
+ <para>For example, say you have a document in which you have
+ some section of tabular data reflecting the document's
+ Subversion keywords. Using the original Subversion keyword
+ substitution syntax, your file might look something
+ like:</para>
+
+ <screen>
+$Rev$: Revision of last commit
+$Author$: Author of last commit
+$Date$: Date of last commit
+</screen>
+
+ <para>Now, that looks nice and tabular at the start of things.
+ But when you then commit that file (with keyword substitution
+ enabled, of course), you see:</para>
+
+ <screen>
+$Rev: 12 $: Revision of last commit
+$Author: harry $: Author of last commit
+$Date: 2006-03-15 02:33:03 -0500 (Wed, 15 Mar 2006) $: Date of last commit
+</screen>
+
+ <para>The result is not so beautiful. And you might be
+ tempted to then adjust the file after the substitution so
+ that it again looks tabular. But that only holds as long as
+ the keyword values are the same width. If the last
+ committed revision rolls into a new place value (say, from
+ 99 to 100), or if another person with a longer username
+ commits the file, stuff gets all crooked again. However, if
+ you are using Subversion 1.2 or better, you can use the new
+ fixed-length keyword syntax, define some field widths that
+ seem sane, and now your file might look like this:</para>
+
+ <screen>
+$Rev:: $: Revision of last commit
+$Author:: $: Author of last commit
+$Date:: $: Date of last commit
+</screen>
+
+ <para>You commit this change to your file. This time,
+ Subversion notices the new fixed-length keyword syntax, and
+ maintains the width of the fields as defined by the padding
+ you placed between the double-colon and the trailing dollar
+ sign. After substitution, the width of the fields is
+ completely unchanged—the short values for
+ <literal>Rev</literal> and <literal>Author</literal> are
+ padded with spaces, and the long <literal>Date</literal>
+ field is truncated by a hash character:</para>
+
+ <screen>
+$Rev:: 13 $: Revision of last commit
+$Author:: harry $: Author of last commit
+$Date:: 2006-03-15 0#$: Date of last commit
+</screen>
+
+ <para>The use of fixed-length keywords is especially handy
+ when performing substitutions into complex file formats that
+ themselves use fixed-length fields for data, or for which
+ the stored size of a given data field is overbearingly
+ difficult to modify from outside the format's native
+ application (such as for Microsoft Office documents).</para>
+
+ <warning>
+ <para>Be aware that because the width of a keyword field is
+ measured in bytes, the potential for corruption of
+ multi-byte values exists. For example, a username which
+ contains some multi-byte UTF-8 characters might suffer
+ truncation in the middle of the string of bytes which make
+ up one of those characters. The result will be a mere
+ truncation when viewed at the byte level, but will likely
+ appear as a string with an incorrect or garbled final
+ character when viewed as UTF-8 text. It is conceivable
+ that certain applications, when asked to load the file,
+ would notice the broken UTF-8 text and deem the entire
+ file corrupt, refusing to operate on the file
+ altogether.</para>
+ </warning>
+
</sect3>
<sect3 id="svn.advanced.props.special.eol-style">
@@ -1542,7 +1660,7 @@
<para>This means that by default, Subversion doesn't pay any
attention to the type of <firstterm>end-of-line (EOL)
markers</firstterm> used in your files. Unfortunately,
- different operating system use different tokens to represent
+ different operating systems use different tokens to represent
the end of a line of text in a file. For example, the usual
line ending token used by software on the Windows platform
is a pair of ASCII control characters—carriage return
@@ -2346,18 +2464,19 @@
<sect1 id="svn.advanced.pegrevs">
<title>Peg and Operative Revisions</title>
- <para>The ability to copy, move, and rename files and directories;
- to be able to create an object, then delete it and then add a
- new one at the same path—those are operations which we
- perform on files and directories on our computers all the time,
- and operations we tend to take for granted. And Subversion
- would like you to think they are granted. Subversion's file
- management support is quite liberating, affording almost as much
+ <para>We make use of the ability to copy, move, rename, and
+ completely replace files and directories on our computers all
+ that time. And your version control system shouldn't get in the
+ way of your doing these things with your version controlled
+ files and directories, either. Subversion's file management
+ support is quite liberating, affording almost as much
flexibility for versioned files that you'd expect when
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
- several entirely different versioned resources.</para>
+ several entirely different versioned resources. And this
+ introduces a certain level of complexity to your interactions
+ with those paths and resources.</para>
<para>Subversion is pretty smart about noticing when an object's
version history includes such <quote>changes of address</quote>.
@@ -2542,7 +2661,7 @@
svn: Unable to find repository location for 'concept/IDEA' in revision 1
</screen>
- <para>And when executed, has the expected results. Peg revisions
+ <para>And when executed, it has the expected results. Peg revisions
generally default to a value of <literal>BASE</literal> (the
revision currently present in the working copy) when applied to
working copy paths, and of <literal>HEAD</literal> when applied
Modified: trunk/src/pt_BR/book/ch08.xml
==============================================================================
--- trunk/src/pt_BR/book/ch08.xml (original)
+++ trunk/src/pt_BR/book/ch08.xml Fri Mar 24 17:41:50 2006
@@ -140,13 +140,13 @@
this.</para>
<para>The client itself also highlights modularity in the
- Subversion design. While Subversion currently comes with only a
- command-line client program, there are already a few other
- programs being developed by third parties to act as GUIs for
- Subversion. Again, these GUIs use the same APIs that the stock
- command-line client does. Subversion's libsvn_client library is
- the one-stop shop for most of the functionality necessary for
- designing a working Subversion client (see <xref
+ Subversion design. While Subversion itself comes with only a
+ command-line client program, there are several third party
+ programs which provide various forms of client GUI. These GUIs
+ use the same APIs that the stock command-line client does.
+ Subversion's libsvn_client library is the one-stop shop for most
+ of the functionality necessary for designing a working
+ Subversion client (see <xref
linkend="svn.developer.layerlib.client"/>).</para>
<!-- =============================================================== -->
@@ -575,12 +575,12 @@
this in the WebDAV section of this chapter, but in short,
WebDAV and DeltaV are extensions to the standard HTTP 1.1
protocol that enable sharing and versioning of files over
- the web. Apache 2.0 comes with mod_dav, an Apache module
- that understands the DAV extensions to HTTP. Subversion
- itself supplies mod_dav_svn, though, which is another Apache
- module that works in conjunction with (really, as a back-end
- to) mod_dav to provide Subversion's specific implementations
- of WebDAV and DeltaV.</para>
+ the web. Apache 2.0 and later versions come with mod_dav,
+ an Apache module that understands the DAV extensions to
+ HTTP. Subversion itself supplies mod_dav_svn, though, which
+ is another Apache module that works in conjunction with
+ (really, as a back-end to) mod_dav to provide Subversion's
+ specific implementations of WebDAV and DeltaV.</para>
<para>When communicating with a repository over HTTP, the RA
loader library chooses libsvn_ra_dav as the proper access
Modified: trunk/src/pt_BR/book/ch09.xml
==============================================================================
--- trunk/src/pt_BR/book/ch09.xml (original)
+++ trunk/src/pt_BR/book/ch09.xml Fri Mar 24 17:41:50 2006
@@ -108,7 +108,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>
More information about the svnbook-dev
mailing list