svn commit: r1811189 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

[da...@apache.org]

Author: danielsh
Date: Thu Oct  5 11:48:54 2017
New Revision: 1811189

URL: http://svn.apache.org/viewvc?rev=1811189&view=rev
Log:
* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_dir_config): Reword warning message to avoid confusion: the word
    "nested" was interpreted as nested <Location/> blocks in httpd.conf syntax.

Thread: https://mail-archives.apache.org/mod_mbox/subversion-users/201710.mbox/%3C34a3a22e-cff1-1958-a109-35c6f925ae84%40cardiov.ox.ac.uk%3E

Modified:
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1811189&r1=1811188&r2=1811189&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Thu Oct  5 11:48:54 2017
@@ -288,8 +288,8 @@ merge_dir_config(apr_pool_t *p, void *ba
 
   if (parent->fs_path)
     ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                 "mod_dav_svn: nested Location '%s' hinders access to '%s' "
-                 "in SVNPath Location '%s'",
+                 "mod_dav_svn: Location '%s' hinders access to '%s' "
+                 "in parent SVNPath Location '%s'",
                  child->root_dir,
                  svn_urlpath__skip_ancestor(parent->root_dir, child->root_dir),
                  parent->root_dir);