[svnbook commit] r1386 - in trunk/src/en: . book

[cmpilato]

Author: cmpilato
Date: Tue May 31 02:53:29 2005
New Revision: 1386

Modified:
   trunk/src/en/TODO
   trunk/src/en/book/ch07.xml
Log:
* en/book/ch07.xml
  (Subversion's use of locales): Update the character conversion
    sidebar error messages for Subversion 1.2.

* en/TODO
  Mark this take done.


Modified: trunk/src/en/TODO
==============================================================================
--- trunk/src/en/TODO	(original)
+++ trunk/src/en/TODO	Tue May 31 02:53:29 2005
@@ -14,16 +14,6 @@
   * ch05: comparison of bdb and fsfs:  make it clear that fsfs is now
     the default, need --fs-type bdb to get bdb.  [MIKE]
 
-  * ch07: character set conversion errors sidebar:  'Can't recode
-    string' has been changed to more descriptive errors that list the
-    source and target charsets:
-      svn: Can't convert string from native encoding to 'UTF-8':
-      [...]
-      svn: Can't convert string from 'UTF-8' to native encoding:
-      [...]
-      svn: Can't convert string from '%s' to '%s':"
-      [...]
-
   * ch06: client-cred-caching: mention win32 encryption in
     mod_authz_svn: groups can contain other groups [BEN]
 

Modified: trunk/src/en/book/ch07.xml
==============================================================================
--- trunk/src/en/book/ch07.xml	(original)
+++ trunk/src/en/book/ch07.xml	Tue May 31 02:53:29 2005
@@ -2620,16 +2620,19 @@
           related to character set conversions:</para>
 
         <screen>
-svn: Can't recode string.
+svn: Can't convert string from native encoding to 'UTF-8':
+…
+svn: Can't convert string from 'UTF-8' to native encoding:
+…
 </screen>
     
-        <para>The message is cryptic, but generally occurs when the
-          Subversion client has received a UTF-8 string from the
-          repository, but the characters can't be converted to 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
+        <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