[svnbook commit] r2207 - trunk/src/pt_BR/book

ccidral noreply at red-bean.com
Sat Jun 3 11:48:53 CDT 2006


Author: ccidral
Date: Sat Jun  3 11:48:53 2006
New Revision: 2207

Modified:
   trunk/src/pt_BR/book/appa.xml
   trunk/src/pt_BR/book/appb.xml
   trunk/src/pt_BR/book/ch01.xml
   trunk/src/pt_BR/book/ch02.xml
   trunk/src/pt_BR/book/ch03.xml
   trunk/src/pt_BR/book/ch04.xml
   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/ch09.xml

Log:
Merge changes from en up to r2206.

Modified: trunk/src/pt_BR/book/appa.xml
==============================================================================
--- trunk/src/pt_BR/book/appa.xml	(original)
+++ trunk/src/pt_BR/book/appa.xml	Sat Jun  3 11:48:53 2006
@@ -5,7 +5,7 @@
 
     <para>This appendix is a guide for CVS users new to Subversion.
       It's essentially a list of differences between the two systems
-      as <quote>viewed from 10,000 feet</quote>. For each section, we
+      as <quote>viewed from 10,000 feet</quote>.  For each section, we
       provide backreferences to relevant chapters when
       possible.</para>
 
@@ -40,7 +40,7 @@
     <para>Technically, it's not valid to talk about <quote>revision 5
       of <filename>foo.c</filename></quote>.  Instead, one would say
       <quote><filename>foo.c</filename> as it appears in revision
-      5</quote>. Also, be careful when making assumptions about the
+      5</quote>.  Also, be careful when making assumptions about the
       evolution of a file.  In CVS, revisions 5 and 6 of
       <filename>foo.c</filename> are always different.  In Subversion,
       it's most likely that <filename>foo.c</filename> did
@@ -213,52 +213,55 @@
       only prints information about files that are updated,
       <emphasis>not</emphasis> local modifications.</para>
 
-    <para><command>svn status</command> prints all files that have
-      local modifications.  By default, the repository is not
-      contacted.  While this subcommand accepts a fair number of
-      options, the following are the most commonly used ones:</para>
+    <sect2 id="svn.forcvs.status-vs-update.status">
+      <title>Status</title>
 
-    <variablelist>
-      <varlistentry>
-        <term><option>-u</option></term>
-        <listitem>
-          <para>Contact the repository to determine, and then display,
-            out-of-dateness information.</para>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term><option>-v</option></term>
-        <listitem>
-          <para>Show <emphasis>all</emphasis> entries under
-            version control.</para>
-        </listitem>
-      </varlistentry>
+      <para><command>svn status</command> prints all files that have
+        local modifications.  By default, the repository is not
+        contacted.  While this subcommand accepts a fair number of
+        options, the following are the most commonly used ones:</para>
+
+      <variablelist>
+        <varlistentry>
+          <term><option>-u</option></term>
+          <listitem>
+            <para>Contact the repository to determine, and then display,
+              out-of-dateness information.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>-v</option></term>
+          <listitem>
+            <para>Show <emphasis>all</emphasis> entries under
+              version control.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>-N</option></term>
+          <listitem>
+            <para>Run non-recursively (do not descend into
+              subdirectories).</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <para>The <command>status</command> command has two output
+        formats.  In the default <quote>short</quote> format, local
+        modifications look like this:</para>
 
-      <varlistentry>
-        <term><option>-N</option></term>
-        <listitem>
-          <para>Run non-recursively (do not descend into
-            subdirectories).</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>The <command>status</command> command has two output
-      formats.  In the default <quote>short</quote> format, local
-      modifications look like this:</para>
-
-    <screen>
+      <screen>
 $ svn status
 M      foo.c
 M      bar/baz.c
 </screen>
 
-    <para>If you specify the <option>--show-updates</option>
-      (<option>-u</option>) switch, a longer output format is
-      used:</para>
+      <para>If you specify the <option>--show-updates</option>
+        (<option>-u</option>) switch, a longer output format is
+        used:</para>
 
-    <screen>
+      <screen>
 $ svn status -u
 M            1047   foo.c
        *     1045   faces.html
@@ -267,52 +270,61 @@
 Status against revision:   1066
 </screen>
 
-    <para>In this case, two new columns appear.  The second column
-      contains an asterisk if the file or directory is out-of-date.
-      The third column shows the working-copy's revision number of the
-      item.  In the example above, the asterisk indicates that
-      <filename>faces.html</filename> would be patched if we updated,
-      and that <filename>bloo.png</filename> is a newly added file in
-      the repository.  (The absence of any revision number next to
-      <filename>bloo.png</filename> means that it doesn't yet exist in
-      the working copy.)</para>
-
-    <!-- ###TODO describe -v here as well as -uv. -u and -v use
-         different <quote>long</quote> formats and need to be
-         documented separately. Moreover, as you can combine -u and
-         -v, it needs to be explained what each of them does. As -u is
-         much more important than -v, and the example following that
-         paragraph *is* about -u, not -v, my patch concentrated on
-         that. -->
+      <para>In this case, two new columns appear.  The second column
+        contains an asterisk if the file or directory is out-of-date.
+        The third column shows the working-copy's revision number of the
+        item.  In the example above, the asterisk indicates that
+        <filename>faces.html</filename> would be patched if we updated,
+        and that <filename>bloo.png</filename> is a newly added file in
+        the repository.  (The absence of any revision number next to
+        <filename>bloo.png</filename> means that it doesn't yet exist in
+        the working copy.)</para>
+
+      <!-- ###TODO describe -v here as well as -uv. -u and -v use
+           different <quote>long</quote> formats and need to be
+           documented separately.  Moreover, as you can combine -u and
+           -v, it needs to be explained what each of them does.  As -u is
+           much more important than -v, and the example following that
+           paragraph *is* about -u, not -v, my patch concentrated on
+           that. -->
 
-    <para>Lastly, here's a quick summary of the most common status codes that
-      you may see:</para>
+      <para>Lastly, here's a quick summary of the most common status codes that
+        you may see:</para>
 
-    <screen>
+      <screen>
 A    Resource is scheduled for Addition
 D    Resource is scheduled for Deletion
-M    Resource has local modifications
-C    Resource has conflicts (changes have not been completely merged
+M    Resource has local Modifications
+C    Resource has Conflicts (changes have not been completely merged
        between the repository and working copy version)
-X    Resource is external to this working copy (comes from another
-       repository.  See <xref linkend="svn.advanced.props.special.externals" />)
+X    Resource is eXternal to this working copy (may come from another
+       repository).  See <xref linkend="svn.advanced.props.special.externals" />
 ?    Resource is not under version control
 !    Resource is missing or incomplete (removed by another tool than
        Subversion)
 </screen>
 
-    <!-- ###TODO:  This paragraph should be moved elsewhere.  We are
-                   talking about status codes here, and not update.
-                   Although CVS uses update as a form of status... -->
-    <para>Subversion has combined the CVS <literal>P</literal> and
-      <literal>U</literal> codes into just <literal>U</literal>.  When
-      a merge or conflict occurs, Subversion simply prints
-      <literal>G</literal> or <literal>C</literal>, rather than a
-      whole sentence about it.</para>
+      <para>For a more detailed discussion of <command>svn
+        status</command>, see <xref linkend="svn.tour.cycle.examine.status" />.</para>
+
+    </sect2>
+
+    <sect2 id="svn.forcvs.status-vs-update.update">
+      <title>Update</title>
+
+      <para><command>svn update</command> updates your working copy,
+        and only prints information about files that it updates.</para>
+
+      <para>Subversion has combined the CVS <literal>P</literal> and
+        <literal>U</literal> codes into just <literal>U</literal>.  When
+        a merge or conflict occurs, Subversion simply prints
+        <literal>G</literal> or <literal>C</literal>, rather than a
+        whole sentence about it.</para>
 
-    <para>For a more detailed discussion of <command>svn
-      status</command>, see <xref linkend="svn.tour.cycle.examine.status" />.</para>
+      <para>For a more detailed discussion of <command>svn
+        update</command>, see <xref linkend="svn.tour.cycle.update" />.</para>
 
+    </sect2>
 
   </sect1>
 

Modified: trunk/src/pt_BR/book/appb.xml
==============================================================================
--- trunk/src/pt_BR/book/appb.xml	(original)
+++ trunk/src/pt_BR/book/appb.xml	Sat Jun  3 11:48:53 2006
@@ -155,7 +155,7 @@
           <listitem>
             <para>Like CVS and other version-control systems,
               DeltaV assumes that each resource has a potentially
-              infinite number of states. A client begins by placing
+              infinite number of states.  A client begins by placing
               a resource under version control using the new
               <literal>VERSION-CONTROL</literal> method.</para>
           </listitem>
@@ -171,7 +171,7 @@
               private area, then indicate they want to change
               specific resources by <quote>checking them out</quote>
               into the workspace, editing them, and <quote>checking
-                them in</quote> again. In HTTP terms, the sequence of
+              them in</quote> again.  In HTTP terms, the sequence of
               methods would be <literal>CHECKOUT</literal>,
               <literal>PUT</literal>,
               <literal>CHECKIN</literal>.</para>
@@ -189,7 +189,7 @@
               <literal>MKACTIVITY</literal> method.  The client then
               performs a <literal>CHECKOUT</literal> on each
               resource it wishes to change and sends
-              <literal>PUT</literal> requests. Finally, the client
+              <literal>PUT</literal> requests.  Finally, the client
               performs a <literal>CHECKIN</literal> resource, or
               sends a <literal>MERGE</literal> request to check in
               all resources at once.</para>
@@ -202,7 +202,7 @@
             <para>DeltaV allows you define flexible collections of
               resources called <quote>configurations</quote>, which
               don't necessarily correspond to particular
-              directories. A configuration can be made to point to
+              directories.  A configuration can be made to point to
               specific versions of files, and then a
               <quote>baseline</quote> snapshot can be made, much
               like a tag.</para>
@@ -327,11 +327,11 @@
       <literal>MKACTIVITY</literal>, <literal>CHECKOUT</literal>,
       <literal>PUT</literal>, <literal>CHECKIN</literal>.  But if the
       DeltaV server supports autoversioning, then write-requests from
-      basic WebDAV clients are accepted.  The server behaves *as if*
-      the client had issued the proper series of versioning requests,
+      basic WebDAV clients are accepted.  The server behaves as if the
+      client had issued the proper series of versioning requests,
       performing a commit under the hood.  In other words, it allows a
       DeltaV server to interoperate with ordinary WebDAV
-      clients.</para>
+      clients that don't understand versioning.</para>
 
     <para>Because so many operating systems already have integrated
       WebDAV clients, the use case for this feature borders on
@@ -373,17 +373,53 @@
       many applications auto-save every few minutes, resulting in even
       more commits.</para>
 
-    <para>If you have a post-commit hook program that sends email, for
-      example, you may want to disable email generation either
-      altogether, or on certain sections of the repository; it depends
-      on whether you think the influx of emails will still prove to be
-      valuable notifications or not.  Also, a smart post-commit hook
-      program can distinguish between a transaction created via
-      autoversioning and one created through a normal <command>svn
-      commit</command>.  The trick is to look for a revision property
+    <para>If you have a post-commit hook program that sends email, you
+      may want to disable email generation either altogether, or on
+      certain sections of the repository; it depends on whether you
+      think the influx of emails will still prove to be valuable
+      notifications or not.  Also, a smart post-commit hook program
+      can distinguish between a transaction created via autoversioning
+      and one created through a normal <command>svn commit</command>.
+      The trick is to look for a revision property
       named <literal>svn:autoversioned</literal>.  If present, the
       commit was made by a generic WebDAV client.</para>
 
+    <para>Another feature that may be a useful complement
+      for <literal>SVNAutoversioning</literal> comes from
+      Apache's <literal>mod_mime</literal> module.  If a generic
+      WebDAV client adds a new file to the repository, there's no
+      opportunity for the user to set the
+      the <literal>svn:mime-type</literal> property.  This might cause
+      the file to appear as <quote>generic</quote> icon when viewed
+      within a WebDAV shared folder, not having an association with
+      any application.  One remedy is to have a sysadmin (or other
+      Subversion-knowledgable person) check out a working copy and
+      manually set the <literal>svn:mime-type</literal> property on
+      necessary files. But there's potentially no end to such cleanup
+      tasks.  Instead, you can use
+      the <literal>ModMimeUsePathInfo</literal> directive in
+      your Subversion <literal><Location></literal>
+      block:</para>
+ 
+    <screen>
+<Location /repos>
+  DAV svn
+  SVNPath /path/to/repository
+  SVNAutoversioning on
+
+  ModMimeUsePathInfo on
+
+</Location>
+</screen>
+
+    <para>This directive allows <literal>mod_mime</literal> to attempt
+      automatic deduction of the mime-type on new files that enter the
+      repository via autoversioning.  The module looks at the file's
+      named extension and possibly the contents as well; if the file
+      matches some common patterns, then the the
+      file's <literal>svn;mime-type</literal> property will be set
+      automatically.</para>
+
   </sect1>
 
   <!-- ================================================================= -->
@@ -667,6 +703,15 @@
           client for Windows XP, then use a third-party program like
           WebDrive or NetDrive.</para>
 
+        <para>A final tip: if you're attempting to use XP Web Folders,
+          make sure you have the absolute latest version from
+          Microsoft.  For example, Microsoft released a bug-fixed
+          version in January 2005, available at
+          <ulink url="http://support.microsoft.com/?kbid=892211"/>.
+          In particular, this release is known to fix a bug whereby
+          browsing a DAV share shows an unexpected infinite
+          recursion.</para>
+
       </sect3>
 
       <sect3 id="svn.webdav.clients.file-explorer-extensions.linux-de">
@@ -749,7 +794,7 @@
           files first appeared in Subversion 1.2.</para>
   
         <para>One more word of warning: OS X's WebDAV client can
-          sometimes be overly sensitive to HTTP redirects. If OS X is
+          sometimes be overly sensitive to HTTP redirects.  If OS X is
           unable to mount the repository at all, you may need to enable
           the BrowserMatch directive in the Apache server's
           <filename>httpd.conf</filename>:</para>
@@ -765,7 +810,7 @@
   
         <para>Linux davfs2 is a filesystem module for the Linux kernel,
           whose development is located at <ulink
-          url="http://dav.sourceforge.net/"/>. Once installed, a WebDAV
+          url="http://dav.sourceforge.net/"/>.  Once installed, a WebDAV
           network share can be mounted with the usual Linux mount
           command:</para>
   

Modified: trunk/src/pt_BR/book/ch01.xml
==============================================================================
--- trunk/src/pt_BR/book/ch01.xml	(original)
+++ trunk/src/pt_BR/book/ch01.xml	Sat Jun  3 11:48:53 2006
@@ -430,10 +430,10 @@
     <title>A Quick Start</title>
     
     <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're one of those folks who prefers to learn 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>

Modified: trunk/src/pt_BR/book/ch02.xml
==============================================================================
--- trunk/src/pt_BR/book/ch02.xml	(original)
+++ trunk/src/pt_BR/book/ch02.xml	Sat Jun  3 11:48:53 2006
@@ -167,7 +167,7 @@
             Sally simultaneously locks and edits file B.  But suppose
             that A and B depend on one another, and the changes made
             to each are semantically incompatible.  Suddenly A and B
-            don't work together anymore. The locking system was
+            don't work together anymore.  The locking system was
             powerless to prevent the problem—yet it somehow
             provided a false sense of security.  It's easy for Harry and
             Sally to imagine that by locking files, each is beginning a

Modified: trunk/src/pt_BR/book/ch03.xml
==============================================================================
--- trunk/src/pt_BR/book/ch03.xml	(original)
+++ trunk/src/pt_BR/book/ch03.xml	Sat Jun  3 11:48:53 2006
@@ -8,7 +8,7 @@
       perform almost all the tasks you need to use Subversion in a
       normal day's work.  You'll start with an initial checkout of
       your code, and walk through making changes and examining those
-      changes. You'll also see how to bring changes made by others
+      changes.  You'll also see how to bring changes made by others
       into your working copy, examine them, and work through any
       conflicts that might arise.</para>
 
@@ -323,23 +323,22 @@
       <para>Subversion tries hard not to limit the type of data you
         can place under version control.  The contents of files and
         property values are stored and transmitted as binary data, and
-        the <xref linkend="svn.advanced.props.special.mime-type"/>
+        <xref linkend="svn.advanced.props.special.mime-type"/>
         tells you how to give Subversion a hint that
         <quote>textual</quote> operations don't make sense for a
         particular file.  There are a few places, however, where
         Subversion places restrictions on information it
         stores.</para>
 
-      <para>Subversion handles text internally as UTF-8 encoded
-        Unicode.  As a result, certain items which are inherently
-        <quote>textual</quote>, such as property names, path names,
-        and log messages, can only contain legal UTF-8 characters.  It
-        also provides a minimum requirement for use of the
-        <literal>svn:mime-type</literal> property—if a file's
-        contents aren't compatible with UTF-8, you should mark it as a
-        binary file.  Otherwise, Subversion will attempt to merge
-        differences using UTF-8, which is likely to leave garbage in
-        the file.</para>
+      <para>Subversion internally handles certain bits of
+        data—for example, property names, path names, and log
+        messages—as UTF-8 encoded Unicode.  This is not to say
+        that all your interactions with Subversion must involve UTF-8,
+        though.  As a general rule, Subversion clients will gracefully
+        and transparently handle conversions between UTF-8 and the
+        encoding system in use on your computer, if such a conversion
+        can meaningfully be done (which is the case for most common
+        encodings in use today).</para>
 
       <para>In addition, path names are used as XML attribute values
         in WebDAV exchanges, as well in as some of Subversion's
@@ -453,10 +452,11 @@
   <sect1 id="svn.tour.cycle">
     <title>Basic Work Cycle</title>
 
-    <para>Subversion has numerous features, options, bells and whistles, but on
-      a day-to-day basis, odds are that you will only use a few of them. In
-      this section we'll run through the most common things that you might
-      find yourself doing with Subversion in the course of a day's work.</para>
+    <para>Subversion has numerous features, options, bells and
+      whistles, but on a day-to-day basis, odds are that you will only
+      use a few of them.  In this section we'll run through the most
+      common things that you might find yourself doing with Subversion
+      in the course of a day's work.</para>
     
     <para>The typical work cycle looks like this:</para>
 
@@ -629,7 +629,7 @@
       <title>Make Changes to Your Working Copy</title>
       
       <para>Now you can get to work and make changes in your
-        working copy. It's usually most convenient to decide on a
+        working copy.  It's usually most convenient to decide on a
         particular change (or set of changes) to make, such as writing
         a new feature, fixing a bug, etc.  The Subversion commands
         that you will use here are <command>svn add</command>,
@@ -769,11 +769,11 @@
         
         <para>Earlier in this chapter, we said that you have to commit
           any changes that you make in order for the repository to
-          reflect these changes. That's not entirely true—there
+          reflect these changes.  That's not entirely true—there
           <emphasis>are</emphasis> some use cases that immediately
           commit tree changes to the repository.  This only happens
           when a subcommand is operating directly on a URL, rather
-          than on a working-copy path. In particular, specific uses
+          than on a working-copy path.  In particular, specific uses
           of <command>svn mkdir</command>, <command>svn
           copy</command>, <command>svn move</command>, and
           <command>svn delete</command> can work with URLs.</para>
@@ -798,7 +798,7 @@
         them to the repository, but before you do so, it's usually a
         good idea to take a look at exactly what you've changed.  By
         examining your changes before you commit, you can make a
-        more accurate log message. You may also discover that
+        more accurate log message.  You may also discover that
         you've inadvertently changed a file, and this gives you a
         chance to revert those changes before committing.
         Additionally, this is a good opportunity to review and
@@ -1066,8 +1066,10 @@
           switch</command>) to a branch.</para>
 
         <para>The sixth column shows information about locks, which is
-          further explained in <xref
-          linkend="svn.advanced.locking"/>.</para>
+          further explained in <xref linkend="svn.advanced.locking"/>.
+          (These are not the same locks as the ones indicated by an
+          <computeroutput>L</computeroutput> in the third column;
+          see <xref linkend="svn.advanced.locking.meanings"/>.)</para>
         
         <para>If you pass a specific path to <command>svn
           status</command>, it gives you information about that item
@@ -1878,7 +1880,7 @@
       <para>
         <command>svn log</command> also takes a <option>--quiet</option>
         (<option>-q</option>) switch, which suppresses the body of the
-        log message. When combined with <option>--verbose</option>, it
+        log message.  When combined with <option>--verbose</option>, it
         gives just the names of the changed files.</para>
 
       <sidebar>
@@ -2154,11 +2156,14 @@
       <para>When Subversion modifies your working copy (or any
         information within <filename>.svn</filename>), it tries to do
         so as safely as possible.  Before changing the working copy,
-        Subversion writes its intentions to a log file. Next it executes
-        the commands in the log file to apply the requested change.
-        Finally, Subversion removes the log file. Architecturally, this
-        is similar to a journaled filesystem.  If a Subversion operation is
-        interrupted (if the process is killed, or if the machine
+        Subversion writes its intentions to a log file.  Next it
+        executes the commands in the log file to apply the requested
+        change, holding a lock on the relevant part of the working
+        copy while it works — to prevent other Subversion clients
+        from accessing the working copy in mid-change.  Finally,
+        Subversion removes the log file.  Architecturally, this is
+        similar to a journaled filesystem.  If a Subversion operation
+        is interrupted (if the process is killed, or if the machine
         crashes, for example), the log files remain on disk.  By
         re-executing the log files, Subversion can complete the
         previously started operation, and your working copy can get
@@ -2166,9 +2171,9 @@
 
       <para>And this is exactly what <command>svn cleanup</command>
         does: it searches your working copy and runs any leftover
-        logs, removing locks in the process.  If Subversion ever tells
-        you that some part of your working copy is
-        <quote>locked</quote>, then this is the command that you
+        logs, removing working copy locks in the process.
+        If Subversion ever tells you that some part of your working copy
+        is <quote>locked</quote>, then this is the command that you
         should run.  Also, <command>svn status</command> will display
         an <literal>L</literal> next to locked items:</para>
 
@@ -2182,6 +2187,13 @@
 M      somedir/foo.c
 </screen>
 
+      <para>Don't confuse these working copy locks with the ordinary
+        locks that Subversion users create when using
+        the <quote>lock-modify-unlock</quote> model of concurrent
+        version control; see
+        <xref linkend="svn.advanced.locking.meanings"/> for
+        clarification.</para>
+
     </sect2>
 
 
@@ -2234,7 +2246,7 @@
       <para>Now we've covered most of the Subversion client commands.
         Notable exceptions are those dealing with branching and
         merging (see <xref linkend="svn.branchmerge"/>) and properties (see
-        <xref linkend="svn.advanced.props"/>). However, you may want to
+        <xref linkend="svn.advanced.props"/>).  However, you may want to
         take a moment to skim through <xref linkend="svn.ref"/> to
         get an idea of all the many different commands that Subversion
         has—and how you can use them to make your work

Modified: trunk/src/pt_BR/book/ch04.xml
==============================================================================
--- trunk/src/pt_BR/book/ch04.xml	(original)
+++ trunk/src/pt_BR/book/ch04.xml	Sat Jun  3 11:48:53 2006
@@ -724,7 +724,7 @@
         <firstterm>left side</firstterm> of the
         comparison),</para></listitem>
 
-        <listitem><para>An final repository tree (often called the
+        <listitem><para>A final repository tree (often called the
         <firstterm>right side</firstterm> of the
         comparison),</para></listitem>
 
@@ -1421,7 +1421,7 @@
 
       <para>The plus sign in the status output indicates that the item
         isn't merely scheduled for addition, but scheduled for
-        addition <quote>with history</quote>. Subversion remembers
+        addition <quote>with history</quote>.  Subversion remembers
         where it was copied from.  In the future, running <command>svn
         log</command> on this file will traverse back through the
         file's resurrection and through all the history it had prior
@@ -1748,7 +1748,7 @@
       <para>When you run <command>svn update</command>, you're asking
         the repository to compare two trees.  The repository does so,
         and then sends a description of the differences back to the
-        client. The only difference between <command>svn
+        client.  The only difference between <command>svn
         switch</command> and <command>svn update</command> is that the
         <literal>update</literal> command always compares two identical
         paths.</para>
@@ -1890,7 +1890,7 @@
         data you need.</para>
 
       <para>Time to make a snapshot.  Copying one URL to another won't
-        work here. In this case, you want to make a snapshot of your
+        work here.  In this case, you want to make a snapshot of your
         exact working copy arrangement and store it in the repository.
         Luckily, <command>svn copy</command> actually has four
         different uses (which you can read about in Chapter 9),

Modified: trunk/src/pt_BR/book/ch05.xml
==============================================================================
--- trunk/src/pt_BR/book/ch05.xml	(original)
+++ trunk/src/pt_BR/book/ch05.xml	Sat Jun  3 11:48:53 2006
@@ -464,10 +464,10 @@
       property, <literal>svn:date</literal>, set to the time at which
       the repository was created.</para>
 
-    <para>In Subversion 1.2, a repository is created with a FSFS
+    <para>In Subversion 1.2, a repository is created with an FSFS
       back-end by default (see <xref
-      linkend="svn.reposadmin.basics.backends"/>). The back-end can be
-      explicitly chosen with the <option>--fs-type</option>
+      linkend="svn.reposadmin.basics.backends"/>).  The back-end can
+      be explicitly chosen with the <option>--fs-type</option>
       argument:</para>
 
     <screen>
@@ -864,7 +864,7 @@
 
       <warning>
         <para>Do not attempt to modify the transaction using hook
-          scripts. A common example of this would be to automatically
+          scripts.  A common example of this would be to automatically
           set properties such as <literal>svn:eol-style</literal> or
           <literal>svn:mime-type</literal> during the commit.  While
           this might seem like a good idea, it causes problems.  The
@@ -902,7 +902,7 @@
       <para>A Berkeley DB environment is an encapsulation of one or
         more databases, log files, region files and configuration
         files.  The Berkeley DB environment has its own set of default
-        configuration values for things like the number of locks
+        configuration values for things like the number of database locks
         allowed to be taken out at any given time, or the maximum size
         of the journaling log files, etc.  Subversion's filesystem
         code additionally chooses default values for some of the
@@ -1718,7 +1718,7 @@
           regular Berkeley DB environment directory, and can therefore
           be used in conjunction with any of the Berkeley database
           tools (you can see the documentation for these tools at
-          SleepyCat's website,
+          Sleepycat's website,
           <ulink url="http://www.sleepycat.com/"/>).</para>
 
         <para>For day-to-day Subversion use, these tools are
@@ -1757,7 +1757,7 @@
         However, there are times when some manual assistance from an
         administrator might be in order.  The
         <command>svnadmin</command> utility provides some helpful
-        functionality to assist you in performing such tasks as</para>
+        functionality to assist you in performing such tasks as:</para>
 
       <itemizedlist>
         <listitem>
@@ -1929,7 +1929,7 @@
 $
 </screen>
 
-      <para>An long-abandoned transaction usually represents some sort
+      <para>A long-abandoned transaction usually represents some sort
         of failed or interrupted commit.  A transaction's datestamp
         can provide interesting information—for example, how
         likely is it that an operation begun nine months ago is still
@@ -2025,7 +2025,7 @@
           equal to the size of the original data, it only takes up
           enough space to say, <quote>I look just like this other
           piece of data over here, except for the following couple of
-          changes</quote>. Specifically, each time a new version of a
+          changes</quote>.  Specifically, each time a new version of a
           file is committed to the repository, Subversion encodes the
           previous version (actually, several previous versions) as a
           delta against the new version.  The result is that most of
@@ -2070,7 +2070,11 @@
         data, makes the change it wants to make, and then unlocks the
         data.  Other processes are forced to wait until that lock is
         removed before they are permitted to continue accessing that
-        section of the database.</para>
+        section of the database. (This has nothing to do with the
+        locks that you, as a user, can apply to versioned files within
+        the repository; see
+        <xref linkend="svn.advanced.locking.meanings"/> for more
+        information.)</para>
 
       <para>In the course of using your Subversion repository, fatal
         errors (such as running out of disk space or available memory)

Modified: trunk/src/pt_BR/book/ch06.xml
==============================================================================
--- trunk/src/pt_BR/book/ch06.xml	(original)
+++ trunk/src/pt_BR/book/ch06.xml	Sat Jun  3 11:48:53 2006
@@ -215,8 +215,9 @@
       <para>Happily, the Subversion client has a remedy for this: a
         built-in system for caching authentication credentials on
         disk.  By default, whenever the command-line client
-        successfully authenticates itself to a server, it saves the
-        credentials in the user's private runtime configuration
+        successfully responds to a server's authentication challenge,
+        it saves the credentials in the user's private runtime
+        configuration
         area—in <filename>~/.subversion/auth/</filename> on
         Unix-like systems or
         <filename>%APPDATA%/Subversion/auth/</filename> on Windows.
@@ -226,8 +227,8 @@
         authentication realm.</para>  
 
       <para>When the client receives an authentication challenge, it
-        first looks for the appropriate credentials in the disk cache;
-        if not present, or if the cached credentials fail to
+        first looks for the appropriate credentials in the user's disk
+        cache; if not present, or if the cached credentials fail to
         authenticate, then the client simply prompts the user for the
         information.</para>
 
@@ -252,10 +253,10 @@
             password on disk.  Because the encryption key is managed
             by Windows and is tied to the user's own login
             credentials, only the user can decrypt the cached
-            password.  (Note: if the user's Windows account
-            password is changed, all of the cached passwords become
-            undecipherable.  The Subversion client will behave as if
-            they don't exist, prompting for passwords when
+            password.  (Note: if the user's Windows account password
+            is reset by an administrator, all of the cached passwords
+            become undecipherable.  The Subversion client will behave
+            as if they don't exist, prompting for passwords when
             required.)</para>
         </listitem>
 
@@ -1015,7 +1016,7 @@
       module, <command>httpd</command> makes Subversion repositories
       available to clients via the WebDAV/DeltaV protocol, which is an
       extension to HTTP 1.1 (see <ulink url="http://www.webdav.org/"/>
-      for more information). This protocol takes the ubiquitous HTTP
+      for more information).  This protocol takes the ubiquitous HTTP
       protocol that is the core of the World Wide Web, and adds
       writing—specifically, versioned
       writing—capabilities.  The result is a standardized,
@@ -1380,7 +1381,7 @@
           yet complete, and will not do anything useful.  It's merely
           telling Apache that whenever authorization is required,
           Apache should harvest a username and password from the
-          Subversion client. What's missing here, however, are
+          Subversion client.  What's missing here, however, are
           directives that tell Apache <emphasis>which</emphasis> sorts
           of client requests require authorization.  Wherever
           authorization is required, Apache will demand

Modified: trunk/src/pt_BR/book/ch07.xml
==============================================================================
--- trunk/src/pt_BR/book/ch07.xml	(original)
+++ trunk/src/pt_BR/book/ch07.xml	Sat Jun  3 11:48:53 2006
@@ -587,11 +587,13 @@
 
               <para>As well as <command>svn status</command>, the
                 <command>svn add</command> and <command>svn import</command>
-                commands also ignore files that match the list.
-                You can override this option for a single instance
-                of any of these commands by using
-                the <option>--no-ignore</option> command-line flag.
-                For information on more fine-grained control of
+                commands also ignore files that match the list
+                when they are scanning a directory.  You can override this
+                behaviour for a single instance of any of these commands
+                by explicitly specifying the file name, or by using
+                the <option>--no-ignore</option> command-line flag.</para>
+
+              <para>For information on more fine-grained control of
                 ignored items, see <xref linkend="svn.advanced.props.special.ignore"
                 />.</para>
             </listitem>
@@ -1929,6 +1931,46 @@
       only—it's not yet possible to reserve access to a whole
       directory tree.</para>
 
+    <sidebar id="svn.advanced.locking.meanings">
+      <title>Three meanings of <quote>lock</quote></title>
+
+      <para>In this section, and almost everywhere in this book, the
+        words <quote>lock</quote> and <quote>locking</quote> describe
+        a mechanism for mutual exclusion between users to avoid
+        clashing commits. Unfortunately, there are two other sorts
+        of <quote>lock</quote> with which Subversion, and therefore
+        this book, sometimes needs to be concerned.</para>
+
+      <itemizedlist>
+
+        <listitem><para><firstterm>Working copy locks</firstterm>,
+          used internally by Subversion to prevent clashes between
+          multiple Subversion clients operating on the same working
+          copy. This is the sort of lock indicated by
+          an <computeroutput>L</computeroutput> in the third column
+          of <command>svn status</command> output, and removed by
+          the <command>svn cleanup</command> command, as described in
+          <xref linkend="svn.tour.other.cleanup"/>.</para>
+        </listitem>
+
+        <listitem><para><firstterm>Database locks</firstterm>, used
+          internally by the Berkeley DB backend to prevent clashes
+          between multiple programs trying to access the
+          database. This is the sort of lock whose unwanted
+          persistence after an error can cause a repository to
+          be <quote>wedged</quote>, as described in
+          <xref linkend="svn.reposadmin.maint.recovery"/>.</para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>You can generally forget about these other sorts of lock,
+        until something goes wrong that requires you to care about
+        them. In this book, <quote>lock</quote> means the first sort
+        unless the contrary is either clear from context or explicitly
+        stated.</para>
+    </sidebar>
+
     <!-- =============================================================== -->
     <sect2 id="svn.advanced.locking.creation">
       <title>Creating locks</title>

Modified: trunk/src/pt_BR/book/ch09.xml
==============================================================================
--- trunk/src/pt_BR/book/ch09.xml	(original)
+++ trunk/src/pt_BR/book/ch09.xml	Sat Jun  3 11:48:53 2006
@@ -3,7 +3,7 @@
   
   <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
@@ -108,7 +108,7 @@
             <replaceable>CMD</replaceable></term>
           <listitem>
             <para>Specifies an external program to use to edit a log message
-              or a property value. See the <literal>editor-cmd</literal>
+              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>
@@ -158,7 +158,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>
@@ -236,7 +236,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>
@@ -299,7 +299,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>
@@ -406,7 +406,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>
@@ -429,7 +429,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>
@@ -779,7 +779,7 @@
         <refsect1>
           <title>Description</title>
           
-          <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
@@ -910,9 +910,9 @@
           <title>Description</title>
 
           <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>
 
           <para>If, for some reason, an <command>svn update</command>
@@ -981,7 +981,7 @@
           <title>Description</title>
 
           <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
@@ -1336,7 +1336,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>
@@ -1636,7 +1636,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>
@@ -1875,26 +1875,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>
 
@@ -1917,9 +1932,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>
@@ -1946,7 +1967,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>
@@ -1963,6 +1984,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
@@ -1982,11 +2004,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>
 
 
@@ -2461,7 +2483,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
@@ -2817,7 +2839,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>
@@ -3043,7 +3065,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>
@@ -3149,7 +3171,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>
@@ -3171,7 +3193,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;
@@ -3397,7 +3419,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>
 
@@ -3485,7 +3510,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>
             
@@ -3992,7 +4018,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
@@ -4524,7 +4552,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>
@@ -4550,7 +4578,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>
@@ -4748,9 +4776,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
@@ -5017,7 +5046,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>
@@ -5928,7 +5957,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>
@@ -6240,6 +6269,204 @@
     </refentry>
   </sect1>
 
+  <!-- ================================================================= -->
+  <!-- ================================================================= -->
+  <!-- ================================================================= -->
+  <sect1 id="svn.ref.properties">
+
+    <title><command>Subversion properties</command></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>




More information about the svnbook-dev mailing list