Author: danielsh
Date: Wed Jul 27 20:04:01 2011
New Revision: 1151610
URL: http://svn.apache.org/viewvc?rev=1151610&view=rev
Log:
Update the help text of '--trust-server-cert'.
* subversion/svn/main.c (svn_cl__options),
* subversion/svnsync/main.c (svnsync_options),
As above.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Update expectations.
Modified:
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/svnsync/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=1151610&r1=1151609&r2=1151610&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Jul 27 20:04:01 2011
@@ -224,9 +224,11 @@ const apr_getopt_option_t svn_cl__option
{"no-auth-cache", opt_no_auth_cache, 0,
N_("do not cache authentication tokens")},
{"trust-server-cert", opt_trust_server_cert, 0,
- N_("accept unknown SSL server certificates without\n"
+ N_("accept SSL server certificates from unknown\n"
" "
- "prompting (but only with '--non-interactive')")},
+ "certificate authorities without prompting (but only\n"
+ " "
+ "with '--non-interactive')") },
{"non-interactive", opt_non_interactive, 0,
N_("do no interactive prompting")},
{"dry-run", opt_dry_run, 0,
Modified: subversion/trunk/subversion/svnsync/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/main.c?rev=1151610&r1=1151609&r2=1151610&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/main.c (original)
+++ subversion/trunk/subversion/svnsync/main.c Wed Jul 27 20:04:01 2011
@@ -185,9 +185,11 @@ static const apr_getopt_option_t svnsync
" "
"see --source-password and --sync-password)") },
{"trust-server-cert", svnsync_opt_trust_server_cert, 0,
- N_("accept unknown SSL server certificates without\n"
+ N_("accept SSL server certificates from unknown\n"
" "
- "prompting (but only with '--non-interactive')") },
+ "certificate authorities without prompting (but
only\n"
+ " "
+ "with '--non-interactive')") },
{"source-username", svnsync_opt_source_username, 1,
N_("connect to source repository with username ARG") },
{"source-password", svnsync_opt_source_password, 1,
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=1151610&r1=1151609&r2=1151610&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 Jul 27 20:04:01 2011
@@ -87,8 +87,9 @@ Global options:
--password ARG : specify a password ARG
--no-auth-cache : do not cache authentication tokens
--non-interactive : do no interactive prompting
- --trust-server-cert : accept unknown SSL server certificates without
- prompting (but only with '--non-interactive')
+ --trust-server-cert : accept SSL server certificates from unknown
+ certificate authorities without prompting (but
only
+ with '--non-interactive')
--config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]
@@ -165,8 +166,9 @@ Global options:
--password ARG : specify a password ARG
--no-auth-cache : do not cache authentication tokens
--non-interactive : do no interactive prompting
- --trust-server-cert : accept unknown SSL server certificates without
- prompting (but only with '--non-interactive')
+ --trust-server-cert : accept SSL server certificates from unknown
+ certificate authorities without prompting (but
only
+ with '--non-interactive')
--config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]
