subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1152769 - in /subversion/branches/1.7.x: ./ STATUS subversion/svn/main.c subversion/svnsync/main.c subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Date Mon, 01 Aug 2011 13:33:30 GMT
Author: hwright
Date: Mon Aug  1 13:33:27 2011
New Revision: 1152769

URL: http://svn.apache.org/viewvc?rev=1152769&view=rev
Log:
Merge r1151610 from trunk:

 * r1151610
   Update help text.
   Justification:
     This is occasionally asked about; clarification will be useful.
   Votes:
     +1: danielsh, hwright, cmpilato

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/svn/main.c
    subversion/branches/1.7.x/subversion/svnsync/main.c
    subversion/branches/1.7.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  1 13:33:27 2011
@@ -54,4 +54,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151911,1152129
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151610,1151911,1152129

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1152769&r1=1152768&r2=1152769&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Aug  1 13:33:27 2011
@@ -202,10 +202,3 @@ Approved changes:
       non-standard TCP port.
     Votes:
       +1: ivan, rhuijben, cmpilato
-
- * r1151610
-   Update help text.
-   Justification:
-     This is occasionally asked about; clarification will be useful.
-   Votes:
-     +1: danielsh, hwright, cmpilato

Modified: subversion/branches/1.7.x/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/main.c?rev=1152769&r1=1152768&r2=1152769&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/main.c (original)
+++ subversion/branches/1.7.x/subversion/svn/main.c Mon Aug  1 13:33:27 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/branches/1.7.x/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svnsync/main.c?rev=1152769&r1=1152768&r2=1152769&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svnsync/main.c (original)
+++ subversion/branches/1.7.x/subversion/svnsync/main.c Mon Aug  1 13:33:27 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/branches/1.7.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1152769&r1=1152768&r2=1152769&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Mon Aug  1 13:33:27 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]



Mime
View raw message