Author: stsp Date: Wed Sep 12 13:42:16 2012 New Revision: 1383936 URL: http://svn.apache.org/viewvc?rev=1383936&view=rev Log: * subversion/svn/main.c (svn_cl__cmd_table): Clarify that any of author, date, log message text, or searched path can match, rather than all of them. Also put quotes around 'glob syntax' to make clear that this is a noun and not some geeky abbreviation.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Adjust accordingly. Modified: subversion/trunk/subversion/svn/main.c subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Modified: subversion/trunk/subversion/svn/main.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1383936&r1=1383935&r2=1383936&view=diff ============================================================================== --- subversion/trunk/subversion/svn/main.c (original) +++ subversion/trunk/subversion/svn/main.c Wed Sep 12 13:42:16 2012 @@ -690,9 +690,9 @@ const svn_opt_subcommand_desc2_t svn_cl_ " and limits the scope of the displayed diff to the specified depth.\n" "\n" " If the --search option is used, log messages are displayed only if the\n" - " provided search pattern matches the author, date, log message text,\n" - " or, if the --verbose option is also provided, a changed path.\n" - " The search pattern may include glob syntax wildcards:\n" + " provided search pattern matches any of the author, date, log message\n" + " text, or, if the --verbose option is also provided, a changed path.\n" + " The search pattern may include \"glob syntax\" wildcards:\n" " ? matches any single character\n" " * matches a sequence of arbitrary characters\n" " [abc] matches any of the characters listed inside the brackets\n" Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1383936&r1=1383935&r2=1383936&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original) +++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Wed Sep 12 13:42:16 2012 @@ -31,9 +31,9 @@ usage: 1. log [PATH][@REV] and limits the scope of the displayed diff to the specified depth. If the --search option is used, log messages are displayed only if the - provided search pattern matches the author, date, log message text, - or, if the --verbose option is also provided, a changed path. - The search pattern may include glob syntax wildcards: + provided search pattern matches any of the author, date, log message + text, or, if the --verbose option is also provided, a changed path. + The search pattern may include "glob syntax" wildcards: ? matches any single character * matches a sequence of arbitrary characters [abc] matches any of the characters listed inside the brackets