Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c	(revision 36502)
+++ subversion/libsvn_subr/config_file.c	(working copy)
@@ -1061,7 +1061,7 @@
         "### Section for configuring automatic properties."                  NL
         "[auto-props]"                                                       NL
         "### The format of the entries is:"                                  NL
-        "###   file-name-pattern = propname[=value][;propname[=value]...]"   NL
+        "###   file-name-pattern = propname[=value][|propname[=value]...]"   NL
         "### The file-name-pattern can contain wildcards (such as '*' and"   NL
         "### '?').  All entries which match (case-insensitively) will be"    NL
         "### applied to the file.  Note that auto-props functionality"       NL
@@ -1072,7 +1072,7 @@
         "# *.h = svn:eol-style=native"                                       NL
         "# *.dsp = svn:eol-style=CRLF"                                       NL
         "# *.dsw = svn:eol-style=CRLF"                                       NL
-        "# *.sh = svn:eol-style=native;svn:executable"                       NL
+        "# *.sh = svn:eol-style=native|svn:executable"                       NL
         "# *.txt = svn:eol-style=native"                                     NL
         "# *.png = svn:mime-type=image/png"                                  NL
         "# *.jpg = svn:mime-type=image/jpeg"                                 NL
Index: subversion/tests/cmdline/autoprop_tests.py
===================================================================
--- subversion/tests/cmdline/autoprop_tests.py	(revision 36502)
+++ subversion/tests/cmdline/autoprop_tests.py	(working copy)
@@ -60,8 +60,8 @@
 *.c = cfile=yes
 *.jpg = jpgfile=ja
 fubar* = tarfile=si
-foobar.lha = lhafile=da;lzhfile=niet
-spacetest = abc = def ; ghi = ; = j
+foobar.lha = lhafile=da|lzhfile=niet
+spacetest = abc = def | ghi = | = j
 * = auto=oui
 ''' % (enable_flag and 'yes' or 'no')
 
Index: subversion/libsvn_client/add.c
===================================================================
--- subversion/libsvn_client/add.c	(revision 36502)
+++ subversion/libsvn_client/add.c	(working copy)
@@ -108,7 +108,7 @@
   /* parse the value (we dup it first to effectively lose the
      'const', and to avoid messing up the original value) */
   property = apr_pstrdup(autoprops->pool, value);
-  property = apr_strtok(property, ";", &last_token);
+  property = apr_strtok(property, "|", &last_token);
   while (property)
     {
       int len;
@@ -139,7 +139,7 @@
           else if (strcmp(property, SVN_PROP_EXECUTABLE) == 0)
             autoprops->have_executable = TRUE;
         }
-      property = apr_strtok(NULL, ";", &last_token);
+      property = apr_strtok(NULL, "|", &last_token);
     }
   return TRUE;
 }