Author: julianfoad
Date: Fri Mar 9 13:55:00 2018
New Revision: 1826348
URL: http://svn.apache.org/viewvc?rev=1826348&view=rev
Log:
In help strings, use a separate source line for each blank line, for
consistency.
Modified:
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svnfsfs/svnfsfs.c
subversion/trunk/subversion/svnlook/svnlook.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/tools/server-side/svnauthz.c
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1826348&r1=1826347&r2=1826348&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Mar 9 13:55:00 2018
@@ -304,14 +304,16 @@ static const apr_getopt_option_t options
static const svn_opt_subcommand_desc3_t cmd_table[] =
{
{"crashtest", subcommand_crashtest, {0}, {N_(
- "usage: svnadmin crashtest REPOS_PATH\n\n"
+ "usage: svnadmin crashtest REPOS_PATH\n"
+ "\n"
"Open the repository at REPOS_PATH, then abort, thus simulating\n"
"a process that crashes while holding an open repository handle.\n"
)},
{0} },
{"create", subcommand_create, {0}, {N_(
- "usage: svnadmin create REPOS_PATH\n\n"
+ "usage: svnadmin create REPOS_PATH\n"
+ "\n"
"Create a new, empty repository at REPOS_PATH.\n"
)},
{svnadmin__bdb_txn_nosync, svnadmin__bdb_log_keep,
@@ -322,20 +324,25 @@ static const svn_opt_subcommand_desc3_t
{"delrevprop", subcommand_delrevprop, {0}, {N_(
"usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n"
- " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n\n"
- "1. Delete the property NAME on revision REVISION.\n\n"
+ " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n"
+ "\n"
+ "1. Delete the property NAME on revision REVISION.\n"
+ "\n"
"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n"
"trigger the revision property-related hooks (for example, if you want\n"
- "an email notification sent from your post-revprop-change hook).\n\n"
+ "an email notification sent from your post-revprop-change hook).\n"
+ "\n"
"NOTE: Revision properties are not versioned, so this command will\n"
- "irreversibly destroy the previous value of the property.\n\n"
+ "irreversibly destroy the previous value of the property.\n"
+ "\n"
"2. Delete the property NAME on transaction TXN.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
svnadmin__use_post_revprop_change_hook} },
{"deltify", subcommand_deltify, {0}, {N_(
- "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n\n"
+ "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
+ "\n"
"Run over the requested revision range, performing predecessor delti-\n"
"fication on the paths changed in those revisions. Deltification in\n"
"essence compresses the repository by only storing the differences or\n"
@@ -345,7 +352,8 @@ static const svn_opt_subcommand_desc3_t
{'r', 'q', 'M'} },
{"dump", subcommand_dump, {0}, {N_(
- "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n\n"
+ "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
+ "\n"
"Dump the contents of filesystem to stdout in a 'dumpfile'\n"
"portable format, sending feedback to stderr. Dump revisions\n"
"LOWER rev through UPPER rev. If no revisions are given, dump all\n"
@@ -365,7 +373,8 @@ static const svn_opt_subcommand_desc3_t
{{'F', N_("write to file ARG instead of stdout")}} },
{"dump-revprops", subcommand_dump_revprops, {0}, {N_(
- "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n\n"
+ "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n"
+ "\n"
"Dump the revision properties of filesystem to stdout in a 'dumpfile'\n"
"portable format, sending feedback to stderr. Dump revisions\n"
"LOWER rev through UPPER rev. If no revisions are given, dump the\n"
@@ -377,7 +386,8 @@ static const svn_opt_subcommand_desc3_t
{"freeze", subcommand_freeze, {0}, {N_(
"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
- " 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n\n"
+ " 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n"
+ "\n"
"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
" Allows safe use of third-party backup tools on a live repository.\n"
"\n"
@@ -389,13 +399,15 @@ static const svn_opt_subcommand_desc3_t
{{'F', N_("read repository paths from file ARG")}} },
{"help", subcommand_help, {"?", "h"}, {N_(
- "usage: svnadmin help [SUBCOMMAND...]\n\n"
+ "usage: svnadmin help [SUBCOMMAND...]\n"
+ "\n"
"Describe the usage of this program or its subcommands.\n"
)},
{0} },
{"hotcopy", subcommand_hotcopy, {0}, {N_(
- "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n\n"
+ "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
+ "\n"
"Make a hot copy of a repository.\n"
"If --incremental is passed, data which already exists at the
destination\n"
"is not copied again. Incremental mode is implemented for FSFS
repositories.\n"
@@ -403,27 +415,33 @@ static const svn_opt_subcommand_desc3_t
{svnadmin__clean_logs, svnadmin__incremental, 'q'} },
{"info", subcommand_info, {0}, {N_(
- "usage: svnadmin info REPOS_PATH\n\n"
+ "usage: svnadmin info REPOS_PATH\n"
+ "\n"
"Print information about the repository at REPOS_PATH.\n"
)},
{0} },
{"list-dblogs", subcommand_list_dblogs, {0}, {N_(
- "usage: svnadmin list-dblogs REPOS_PATH\n\n"
- "List all Berkeley DB log files.\n\n"
+ "usage: svnadmin list-dblogs REPOS_PATH\n"
+ "\n"
+ "List all Berkeley DB log files.\n"
+ "\n"
"WARNING: Modifying or deleting logfiles which are still in use\n"
"will cause your repository to be corrupted.\n"
)},
{0} },
{"list-unused-dblogs", subcommand_list_unused_dblogs, {0}, {N_(
- "usage: svnadmin list-unused-dblogs REPOS_PATH\n\n"
- "List unused Berkeley DB log files.\n\n"
+ "usage: svnadmin list-unused-dblogs REPOS_PATH\n"
+ "\n"
+ "List unused Berkeley DB log files.\n"
+ "\n"
)},
{0} },
{"load", subcommand_load, {0}, {N_(
- "usage: svnadmin load REPOS_PATH\n\n"
+ "usage: svnadmin load REPOS_PATH\n"
+ "\n"
"Read a 'dumpfile'-formatted stream from stdin, committing\n"
"new revisions into the repository's filesystem. If the repository\n"
"was previously empty, its UUID will, by default, be changed to the\n"
@@ -440,7 +458,8 @@ static const svn_opt_subcommand_desc3_t
{{'F', N_("read from file ARG instead of stdin")}} },
{"load-revprops", subcommand_load_revprops, {0}, {N_(
- "usage: svnadmin load-revprops REPOS_PATH\n\n"
+ "usage: svnadmin load-revprops REPOS_PATH\n"
+ "\n"
"Read a 'dumpfile'-formatted stream from stdin, setting the revision\n"
"properties in the repository's filesystem. Revisions not found in the\n"
"repository will cause an error. Progress feedback is sent to stdout.\n"
@@ -452,7 +471,8 @@ static const svn_opt_subcommand_desc3_t
{{'F', N_("read from file ARG instead of stdin")}} },
{"lock", subcommand_lock, {0}, {N_(
- "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n\n"
+ "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n"
+ "\n"
"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n"
"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n"
"triggering the pre-lock and post-lock hook scripts.\n"
@@ -460,14 +480,16 @@ static const svn_opt_subcommand_desc3_t
{svnadmin__bypass_hooks, 'q'} },
{"lslocks", subcommand_lslocks, {0}, {N_(
- "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n\n"
+ "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
+ "\n"
"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n"
"if not provided, is the root of the repository).\n"
)},
{0} },
{"lstxns", subcommand_lstxns, {0}, {N_(
- "usage: svnadmin lstxns REPOS_PATH\n\n"
+ "usage: svnadmin lstxns REPOS_PATH\n"
+ "\n"
"Print the names of uncommitted transactions. With -rN skip the output\n"
"of those that have a base revision more recent than rN. Transactions\n"
"with base revisions much older than HEAD are likely to have been\n"
@@ -477,14 +499,16 @@ static const svn_opt_subcommand_desc3_t
{ {'r', "transaction base revision ARG"} } },
{"pack", subcommand_pack, {0}, {N_(
- "usage: svnadmin pack REPOS_PATH\n\n"
+ "usage: svnadmin pack REPOS_PATH\n"
+ "\n"
"Possibly compact the repository into a more efficient storage model.\n"
"This may not apply to all repositories, in which case, exit.\n"
)},
{'q', 'M'} },
{"recover", subcommand_recover, {0}, {N_(
- "usage: svnadmin recover REPOS_PATH\n\n"
+ "usage: svnadmin recover REPOS_PATH\n"
+ "\n"
"Run the recovery procedure on a repository. Do this if you've\n"
"been getting errors indicating that recovery ought to be run.\n"
"Berkeley DB recovery requires exclusive access and will\n"
@@ -493,25 +517,29 @@ static const svn_opt_subcommand_desc3_t
{svnadmin__wait} },
{"rmlocks", subcommand_rmlocks, {0}, {N_(
- "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n\n"
+ "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
+ "\n"
"Unconditionally remove lock from each LOCKED_PATH.\n"
)},
{'q'} },
{"rmtxns", subcommand_rmtxns, {0}, {N_(
- "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n\n"
+ "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
+ "\n"
"Delete the named transaction(s).\n"
)},
{'q'} },
{"setlog", subcommand_setlog, {0}, {N_(
- "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n\n"
+ "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
+ "\n"
"Set the log-message on revision REVISION to the contents of FILE. Use\n"
"--bypass-hooks to avoid triggering the revision-property-related hooks\n"
"(for example, if you do not want an email notification sent\n"
"from your post-revprop-change hook, or because the modification of\n"
"revision properties has not been enabled in the pre-revprop-change\n"
- "hook).\n\n"
+ "hook).\n"
+ "\n"
"NOTE: Revision properties are not versioned, so this command will\n"
"overwrite the previous log message.\n"
)},
@@ -519,20 +547,25 @@ static const svn_opt_subcommand_desc3_t
{"setrevprop", subcommand_setrevprop, {0}, {N_(
"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
- " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n\n"
- "1. Set the property NAME on revision REVISION to the contents of
FILE.\n\n"
+ " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n"
+ "\n"
+ "1. Set the property NAME on revision REVISION to the contents of FILE.\n"
+ "\n"
"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n"
"trigger the revision property-related hooks (for example, if you want\n"
- "an email notification sent from your post-revprop-change hook).\n\n"
+ "an email notification sent from your post-revprop-change hook).\n"
+ "\n"
"NOTE: Revision properties are not versioned, so this command will\n"
- "overwrite the previous value of the property.\n\n"
+ "overwrite the previous value of the property.\n"
+ "\n"
"2. Set the property NAME on transaction TXN to the contents of FILE.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
svnadmin__use_post_revprop_change_hook} },
{"setuuid", subcommand_setuuid, {0}, {N_(
- "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n\n"
+ "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
+ "\n"
"Reset the repository UUID for the repository located at REPOS_PATH. If\n"
"NEW_UUID is provided, use that as the new repository UUID; otherwise,\n"
"generate a brand new UUID for the repository.\n"
@@ -540,7 +573,8 @@ static const svn_opt_subcommand_desc3_t
{0} },
{"unlock", subcommand_unlock, {0}, {N_(
- "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n\n"
+ "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n"
+ "\n"
"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n"
"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n"
"triggering the pre-unlock and post-unlock hook scripts.\n"
@@ -548,9 +582,11 @@ static const svn_opt_subcommand_desc3_t
{svnadmin__bypass_hooks, 'q'} },
{"upgrade", subcommand_upgrade, {0}, {N_(
- "usage: svnadmin upgrade REPOS_PATH\n\n"
+ "usage: svnadmin upgrade REPOS_PATH\n"
+ "\n"
"Upgrade the repository located at REPOS_PATH to the latest supported\n"
- "schema version.\n\n"
+ "schema version.\n"
+ "\n"
"This functionality is provided as a convenience for repository\n"
"administrators who wish to make use of new Subversion functionality\n"
"without having to undertake a potentially costly full repository dump\n"
@@ -562,7 +598,8 @@ static const svn_opt_subcommand_desc3_t
{0} },
{"verify", subcommand_verify, {0}, {N_(
- "usage: svnadmin verify REPOS_PATH\n\n"
+ "usage: svnadmin verify REPOS_PATH\n"
+ "\n"
"Verify the data stored in the repository.\n"
)},
{'t', 'r', 'q', svnadmin__keep_going, 'M',
Modified: subversion/trunk/subversion/svnfsfs/svnfsfs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/svnfsfs.c?rev=1826348&r1=1826347&r2=1826348&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/svnfsfs.c (original)
+++ subversion/trunk/subversion/svnfsfs/svnfsfs.c Fri Mar 9 13:55:00 2018
@@ -114,20 +114,24 @@ static const apr_getopt_option_t options
static const svn_opt_subcommand_desc3_t cmd_table[] =
{
{"help", subcommand__help, {"?", "h"}, {N_(
- "usage: svnfsfs help [SUBCOMMAND...]\n\n"
+ "usage: svnfsfs help [SUBCOMMAND...]\n"
+ "\n"
"Describe the usage of this program or its subcommands.\n"
)},
{0} },
{"dump-index", subcommand__dump_index, {0}, {N_(
- "usage: svnfsfs dump-index REPOS_PATH -r REV\n\n"
+ "usage: svnfsfs dump-index REPOS_PATH -r REV\n"
+ "\n"
"Dump the index contents for the revision / pack file containing revision
REV\n"
"to console. This is only available for FSFS format 7 (SVN 1.9+)
repositories.\n"
"The table produced contains a header in the first line followed by one
line\n"
- "per index entry, ordered by location in the revision / pack file.
Columns:\n\n"
+ "per index entry, ordered by location in the revision / pack file.
Columns:\n"
+ "\n"
" * Byte offset (hex) at which the item starts\n"
" * Length (hex) of the item in bytes\n"
- " * Item type (string) is one of the following:\n\n"
+ " * Item type (string) is one of the following:\n"
+ "\n"
" none ... Unused section. File contents shall be NULs.\n"
" frep ... File representation.\n"
" drep ... Directory representation.\n"
@@ -136,10 +140,12 @@ static const svn_opt_subcommand_desc3_t
" node ... Node revision.\n"
" chgs ... Changed paths list.\n"
" rep .... Representation of unknown type. Should not be used.\n"
- " ??? .... Invalid. Index data is corrupt.\n\n"
+ " ??? .... Invalid. Index data is corrupt.\n"
+ "\n"
" The distinction between frep, drep, fprop and dprop is a mere
internal\n"
" classification used for various optimizations and does not affect
the\n"
- " operational correctness.\n\n"
+ " operational correctness.\n"
+ "\n"
" * Revision that the item belongs to (decimal)\n"
" * Item number (decimal) within that revision\n"
" * Modified FNV1a checksum (8 hex digits)\n"
@@ -147,7 +153,8 @@ static const svn_opt_subcommand_desc3_t
{'r', 'M'} },
{"load-index", subcommand__load_index, {0}, {N_(
- "usage: svnfsfs load-index REPOS_PATH\n\n"
+ "usage: svnfsfs load-index REPOS_PATH\n"
+ "\n"
"Read index contents from console. The format is the same as produced by
the\n"
"dump-index command, except that checksum as well as header are optional
and will\n"
"be ignored. The data must cover the full revision / pack file; the
revision\n"
@@ -156,7 +163,8 @@ static const svn_opt_subcommand_desc3_t
{'M'} },
{"stats", subcommand__stats, {0}, {N_(
- "usage: svnfsfs stats REPOS_PATH\n\n"
+ "usage: svnfsfs stats REPOS_PATH\n"
+ "\n"
"Write object size statistics to console.\n"
)},
{'M'} },
Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1826348&r1=1826347&r2=1826348&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Fri Mar 9 13:55:00 2018
@@ -215,31 +215,36 @@ static const apr_getopt_option_t options
static const svn_opt_subcommand_desc3_t cmd_table[] =
{
{"author", subcommand_author, {0}, {N_(
- "usage: svnlook author REPOS_PATH\n\n"
+ "usage: svnlook author REPOS_PATH\n"
+ "\n"
"Print the author.\n"
)},
{'r', 't'} },
{"cat", subcommand_cat, {0}, {N_(
- "usage: svnlook cat REPOS_PATH FILE_PATH\n\n"
+ "usage: svnlook cat REPOS_PATH FILE_PATH\n"
+ "\n"
"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n"
)},
{'r', 't'} },
{"changed", subcommand_changed, {0}, {N_(
- "usage: svnlook changed REPOS_PATH\n\n"
+ "usage: svnlook changed REPOS_PATH\n"
+ "\n"
"Print the paths that were changed.\n"
)},
{'r', 't', svnlook__copy_info} },
{"date", subcommand_date, {0}, {N_(
- "usage: svnlook date REPOS_PATH\n\n"
+ "usage: svnlook date REPOS_PATH\n"
+ "\n"
"Print the datestamp.\n"
)},
{'r', 't'} },
{"diff", subcommand_diff, {0}, {N_(
- "usage: svnlook diff REPOS_PATH\n\n"
+ "usage: svnlook diff REPOS_PATH\n"
+ "\n"
"Print GNU-style diffs of changed files and properties.\n"
)},
{'r', 't', svnlook__no_diff_deleted, svnlook__no_diff_added,
@@ -247,46 +252,53 @@ static const svn_opt_subcommand_desc3_t
svnlook__ignore_properties, svnlook__properties_only} },
{"dirs-changed", subcommand_dirschanged, {0}, {N_(
- "usage: svnlook dirs-changed REPOS_PATH\n\n"
+ "usage: svnlook dirs-changed REPOS_PATH\n"
+ "\n"
"Print the directories that were themselves changed (property edits)\n"
"or whose file children were changed.\n"
)},
{'r', 't'} },
{"filesize", subcommand_filesize, {0}, {N_(
- "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n\n"
+ "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
+ "\n"
"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n"
"it is represented in the repository.\n"
)},
{'r', 't'} },
{"help", subcommand_help, {"?", "h"}, {N_(
- "usage: svnlook help [SUBCOMMAND...]\n\n"
+ "usage: svnlook help [SUBCOMMAND...]\n"
+ "\n"
"Describe the usage of this program or its subcommands.\n"
)},
{0} },
{"history", subcommand_history, {0}, {N_(
- "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n\n"
+ "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
+ "\n"
"Print information about the history of a path in the repository (or\n"
"the root directory if no path is supplied).\n"
)},
{'r', svnlook__show_ids, 'l'} },
{"info", subcommand_info, {0}, {N_(
- "usage: svnlook info REPOS_PATH\n\n"
+ "usage: svnlook info REPOS_PATH\n"
+ "\n"
"Print the author, datestamp, log message size, and log message.\n"
)},
{'r', 't'} },
{"lock", subcommand_lock, {0}, {N_(
- "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n\n"
+ "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
+ "\n"
"If a lock exists on a path in the repository, describe it.\n"
)},
{0} },
{"log", subcommand_log, {0}, {N_(
- "usage: svnlook log REPOS_PATH\n\n"
+ "usage: svnlook log REPOS_PATH\n"
+ "\n"
"Print the log message.\n"
)},
{'r', 't'} },
@@ -295,7 +307,8 @@ static const svn_opt_subcommand_desc3_t
"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
" "
/* The line above is actually needed, so do NOT delete it! */
- " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n\n"
+ " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
+ "\n"
"Print the raw value of a property on a path in the repository.\n"
"With --revprop, print the raw value of a revision property.\n"
)},
@@ -305,7 +318,8 @@ static const svn_opt_subcommand_desc3_t
"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
" "
/* The line above is actually needed, so do NOT delete it! */
- " 2. svnlook proplist --revprop REPOS_PATH\n\n"
+ " 2. svnlook proplist --revprop REPOS_PATH\n"
+ "\n"
"List the properties of a path in the repository, or\n"
"with the --revprop option, revision properties.\n"
"With -v, show the property values too.\n"
@@ -314,20 +328,23 @@ static const svn_opt_subcommand_desc3_t
svnlook__show_inherited_props} },
{"tree", subcommand_tree, {0}, {N_(
- "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n\n"
+ "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
+ "\n"
"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n"
"of the tree otherwise), optionally showing node revision ids.\n"
)},
{'r', 't', 'N', svnlook__show_ids, svnlook__full_paths, 'M'} },
{"uuid", subcommand_uuid, {0}, {N_(
- "usage: svnlook uuid REPOS_PATH\n\n"
+ "usage: svnlook uuid REPOS_PATH\n"
+ "\n"
"Print the repository's UUID.\n"
)},
{0} },
{"youngest", subcommand_youngest, {0}, {N_(
- "usage: svnlook youngest REPOS_PATH\n\n"
+ "usage: svnlook youngest REPOS_PATH\n"
+ "\n"
"Print the youngest revision number.\n"
)},
{svnlook__no_newline} },
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1826348&r1=1826347&r2=1826348&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Mar 9 13:55:00 2018
@@ -84,19 +84,22 @@ enum svn_svnrdump__longopt_t
static const svn_opt_subcommand_desc3_t svnrdump__cmd_table[] =
{
{ "dump", dump_cmd, { 0 }, {N_(
- "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n\n"
+ "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n"
+ "\n"
"Dump revisions LOWER to UPPER of repository at remote URL to stdout\n"
"in a 'dumpfile' portable format. If only LOWER is given, dump that\n"
"one revision.\n"
)},
{ 'r', 'q', opt_incremental, SVN_SVNRDUMP__BASE_OPTIONS } },
{ "load", load_cmd, { 0 }, {N_(
- "usage: svnrdump load URL\n\n"
+ "usage: svnrdump load URL\n"
+ "\n"
"Load a 'dumpfile' given on stdin to a repository at remote URL.\n"
)},
{ 'q', opt_skip_revprop, SVN_SVNRDUMP__BASE_OPTIONS } },
{ "help", 0, { "?", "h" }, {N_(
- "usage: svnrdump help [SUBCOMMAND...]\n\n"
+ "usage: svnrdump help [SUBCOMMAND...]\n"
+ "\n"
"Describe the usage of this program or its subcommands.\n"
)},
{ 0 } },
Modified: subversion/trunk/tools/server-side/svnauthz.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnauthz.c?rev=1826348&r1=1826347&r2=1826348&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnauthz.c (original)
+++ subversion/trunk/tools/server-side/svnauthz.c Fri Mar 9 13:55:00 2018
@@ -113,19 +113,23 @@ static svn_opt_subcommand_t
static const svn_opt_subcommand_desc3_t cmd_table[] =
{
{"help", subcommand_help, {"?", "h"}, {(
- "usage: svnauthz help [SUBCOMMAND...]\n\n"
+ "usage: svnauthz help [SUBCOMMAND...]\n"
+ "\n"
"Describe the usage of this program or its subcommands.\n"
)},
{0} },
{"validate", subcommand_validate, {0} /* no aliases */, {(
"Checks the syntax of an authz file.\n"
"usage: 1. svnauthz validate TARGET\n"
- " 2. svnauthz validate --transaction TXN REPOS_PATH FILE_PATH\n\n"
+ " 2. svnauthz validate --transaction TXN REPOS_PATH FILE_PATH\n"
+ "\n"
" 1. Loads and validates the syntax of the authz file at TARGET.\n"
" TARGET can be a path to a file or an absolute file:// URL to an
authz\n"
- " file in a repository, but cannot be a repository relative URL
(^/).\n\n"
+ " file in a repository, but cannot be a repository relative URL
(^/).\n"
+ "\n"
" 2. Loads and validates the syntax of the authz file at FILE_PATH in
the\n"
- " transaction TXN in the repository at REPOS_PATH.\n\n"
+ " transaction TXN in the repository at REPOS_PATH.\n"
+ "\n"
"Returns:\n"
" 0 when syntax is OK.\n"
" 1 when syntax is invalid.\n"
@@ -172,11 +176,14 @@ subcommand_help(apr_getopt_t *os, void *
struct svnauthz_opt_state *opt_state = baton;
const char *header =
("general usage: svnauthz SUBCOMMAND TARGET [ARGS & OPTIONS ...]\n"
- " " SVNAUTHZ_COMPAT_NAME " TARGET\n\n"
+ " " SVNAUTHZ_COMPAT_NAME " TARGET\n"
+ "\n"
"If the command name starts with '" SVNAUTHZ_COMPAT_NAME "', runs in\n"
- "pre-1.8 compatibility mode: run the 'validate' subcommand on TARGET.\n\n"
+ "pre-1.8 compatibility mode: run the 'validate' subcommand on TARGET.\n"
+ "\n"
"Type 'svnauthz help <subcommand>' for help on a specific subcommand.\n"
- "Type 'svnauthz --version' to see the program version.\n\n"
+ "Type 'svnauthz --version' to see the program version.\n"
+ "\n"
"Available subcommands:\n");
const char *fs_desc_start
