diff --git a/contrib/client-side/svnmerge/svnmerge.py b/contrib/client-side/svnmerge/svnmerge.py
index 18b3dda..404c0f1 100755
--- a/contrib/client-side/svnmerge/svnmerge.py
+++ b/contrib/client-side/svnmerge/svnmerge.py
@@ -848,7 +848,7 @@ def get_repo_root(target):
assert False, "svn repos root not found"
def target_to_pathid(target):
- """Convert a target (either a working copy path or an URL) into a
+ """Convert a target (either a working copy path or a URL) into a
path identifier."""
root = get_repo_root(target)
url = target_to_url(target)
diff --git a/contrib/client-side/svnmerge/svnmerge.sh b/contrib/client-side/svnmerge/svnmerge.sh
index 21805e6..e7ee8cf 100755
--- a/contrib/client-side/svnmerge/svnmerge.sh
+++ b/contrib/client-side/svnmerge/svnmerge.sh
@@ -148,7 +148,7 @@ check_branch_dir()
error "\"${BRANCH_DIR}\" has local modifications; it must be clean"
}
-# Subroutine to clean up an URL or path
+# Subroutine to clean up a URL or path
normalize_url()
{
TEMP="$1"
diff --git a/subversion/include/svn_client.h b/subversion/include/svn_client.h
index afe2ce1..4a62d1b 100644
--- a/subversion/include/svn_client.h
+++ b/subversion/include/svn_client.h
@@ -3429,11 +3429,11 @@ svn_client_move(svn_client_commit_info_t **commit_info_p,
* of its immediate children (both files and directories); if
* @c svn_depth_infinity, on @a target and everything beneath it.
*
- * The @a target may only be an URL if @a base_revision_for_url is not
+ * The @a target may only be a URL if @a base_revision_for_url is not
* @c SVN_INVALID_REVNUM; in this case, the property will only be set
* if it has not changed since revision @a base_revision_for_url.
* @a base_revision_for_url must be @c SVN_INVALID_REVNUM if @a target
- * is not an URL. @a depth deeper than @c svn_depth_empty is not
+ * is not a URL. @a depth deeper than @c svn_depth_empty is not
* supported on URLs. The authentication baton in @a ctx and @a
* ctx->log_msg_func3/@a ctx->log_msg_baton3 will be used to
* immediately attempt to commit the property change in the
diff --git a/subversion/include/svn_ra.h b/subversion/include/svn_ra.h
index 4c7eca3..4759813 100644
--- a/subversion/include/svn_ra.h
+++ b/subversion/include/svn_ra.h
@@ -566,7 +566,7 @@ svn_ra_create_callbacks(svn_ra_callbacks2_t **callbacks,
/**
* A repository access session. This object is used to perform requests
- * to a repository, identified by an URL.
+ * to a repository, identified by a URL.
*
* @since New in 1.2.
*/
diff --git a/subversion/libsvn_client/diff.c b/subversion/libsvn_client/diff.c
index fd22e9f..6bcfef5 100644
--- a/subversion/libsvn_client/diff.c
+++ b/subversion/libsvn_client/diff.c
@@ -815,14 +815,14 @@ diff_dir_closed(svn_wc_adm_access_t *adm_access,
this knowledge has been grokked yet.
There are five cases:
- 1. path is not an URL and start_revision != end_revision
- 2. path is not an URL and start_revision == end_revision
- 3. path is an URL and start_revision != end_revision
- 4. path is an URL and start_revision == end_revision
- 5. path is not an URL and no revisions given
+ 1. path is not a URL and start_revision != end_revision
+ 2. path is not a URL and start_revision == end_revision
+ 3. path is a URL and start_revision != end_revision
+ 4. path is a URL and start_revision == end_revision
+ 5. path is not a URL and no revisions given
With only one distinct revision the working copy provides the
- other. When path is an URL there is no working copy. Thus
+ other. When path is a URL there is no working copy. Thus
1: compare repository versions for URL coresponding to working copy
2: compare working copy against repository version
diff --git a/subversion/libsvn_client/log.c b/subversion/libsvn_client/log.c
index ad187f0..6ef2045 100644
--- a/subversion/libsvn_client/log.c
+++ b/subversion/libsvn_client/log.c
@@ -360,7 +360,7 @@ svn_client_log5(const apr_array_header_t *targets,
else if (range->start.kind == svn_opt_revision_unspecified)
{
/* Default to any specified peg revision. Otherwise, if the
- * first target is an URL, then we default to HEAD:0. Lastly,
+ * first target is a URL, then we default to HEAD:0. Lastly,
* the default is BASE:0 since WC@HEAD may not exist. */
if (peg_revision->kind == svn_opt_revision_unspecified)
{
diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c
index 5ce9c3b..b6e46db 100644
--- a/subversion/libsvn_fs_fs/fs.c
+++ b/subversion/libsvn_fs_fs/fs.c
@@ -358,7 +358,7 @@ svn_fs_fs__init(const svn_version_t *loader_version,
VTABLE parameter. The FS loader does a more exhaustive check. */
if (loader_version->major != SVN_VER_MAJOR)
return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
- _("Unsupported FS loader version (%d) for fsfs"),
+ _("Unsupported FS loader version (%d) for FSFS"),
loader_version->major);
SVN_ERR(svn_ver_check_list(fs_version(), checklist));
diff --git a/subversion/libsvn_repos/commit.c b/subversion/libsvn_repos/commit.c
index 0285b2a..d635bc3 100644
--- a/subversion/libsvn_repos/commit.c
+++ b/subversion/libsvn_repos/commit.c
@@ -325,7 +325,7 @@ add_directory(const char *path,
if (strncmp(copy_path, eb->repos_url, repos_url_len) != 0)
return svn_error_createf
(SVN_ERR_FS_GENERAL, NULL,
- _("Source url '%s' is from different repository"), copy_path);
+ _("Source URL '%s' is from different repository"), copy_path);
fs_path = apr_pstrdup(subpool, copy_path + repos_url_len);
@@ -469,7 +469,7 @@ add_file(const char *path,
if (strncmp(copy_path, eb->repos_url, repos_url_len) != 0)
return svn_error_createf
(SVN_ERR_FS_GENERAL, NULL,
- _("Source url '%s' is from different repository"), copy_path);
+ _("Source URL '%s' is from different repository"), copy_path);
fs_path = apr_pstrdup(subpool, copy_path + repos_url_len);
diff --git a/subversion/libsvn_wc/relocate.c b/subversion/libsvn_wc/relocate.c
index a773696..0830d47 100644
--- a/subversion/libsvn_wc/relocate.c
+++ b/subversion/libsvn_wc/relocate.c
@@ -76,7 +76,7 @@ relocate_entry(svn_wc_adm_access_t *adm_access,
fs_path_len) != 0)
return svn_error_create(SVN_ERR_WC_INVALID_RELOCATION, NULL,
_("Relocate can only change the "
- "repository part of an URL"));
+ "repository part of a URL"));
/* Since the fs path part is redundant, we don't need to change
that part anyway, and the below code depends on this. */
from_len = repos_len;
diff --git a/subversion/libsvn_wc/status.c b/subversion/libsvn_wc/status.c
index c90062e..fb82ec5 100644
--- a/subversion/libsvn_wc/status.c
+++ b/subversion/libsvn_wc/status.c
@@ -361,8 +361,8 @@ assemble_status(svn_wc_status2_t **status,
}
/** File externals are switched files, but they are not shown as
- such. To be switched it must have both an URL and a parent with
- an URL, at the very least. If this is the root folder on the
+ such. To be switched it must have both a URL and a parent with
+ a URL, at the very least. If this is the root folder on the
(virtual) disk, entry and parent_entry will be equal. */
if (entry->file_external_path)
{
diff --git a/subversion/svn/main.c b/subversion/svn/main.c
index 7c32437..0e1dbf7 100644
--- a/subversion/svn/main.c
+++ b/subversion/svn/main.c
@@ -754,7 +754,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] =
" treated as text. Anything else is treated as binary.\n"
" svn:externals - A newline separated list of module specifiers,\n"
" each of which consists of a relative directory path, optional\n"
- " revision flags and an URL. The ordering of the three elements\n"
+ " revision flags and a URL. The ordering of the three elements\n"
" implements different behavior. Subversion 1.4 and earlier only\n"
" support the following formats and the URLs cannot have peg\n"
" revisions:\n"
diff --git a/subversion/svn/propedit-cmd.c b/subversion/svn/propedit-cmd.c
index a933a3c..faaa126 100644
--- a/subversion/svn/propedit-cmd.c
+++ b/subversion/svn/propedit-cmd.c
@@ -277,7 +277,7 @@ svn_cl__propedit(apr_getopt_t *os,
return err;
/* Print a message if we successfully committed or if it
- was just a wc propset (but not if the user aborted an URL
+ was just a wc propset (but not if the user aborted a URL
propedit). */
if (commit_info || ! svn_path_is_url(target))
SVN_ERR
diff --git a/subversion/svnadmin/main.c b/subversion/svnadmin/main.c
index 23034b0..dfa07a1 100644
--- a/subversion/svnadmin/main.c
+++ b/subversion/svnadmin/main.c
@@ -128,7 +128,7 @@ parse_local_repos_path(apr_getopt_t *os,
else if (svn_path_is_url(*repos_path))
{
return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("'%s' is an URL when it should be a path"),
+ _("'%s' is a URL when it should be a path"),
*repos_path);
}
diff --git a/subversion/svnversion/main.c b/subversion/svnversion/main.c
index 3766264..fde5e15 100644
--- a/subversion/svnversion/main.c
+++ b/subversion/svnversion/main.c
@@ -60,7 +60,7 @@ help(const apr_getopt_option_t *options, apr_pool_t *pool)
"\n"
" The version number will be a single number if the working\n"
" copy is single revision, unmodified, not switched and with\n"
- " an URL that matches the TRAIL_URL argument. If the working\n"
+ " a URL that matches the TRAIL_URL argument. If the working\n"
" copy is unusual the version number will be more complex:\n"
"\n"
" 4123:4168 mixed revision working copy\n"
diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py
index ab3502e..c76f6e8 100755
--- a/subversion/tests/cmdline/basic_tests.py
+++ b/subversion/tests/cmdline/basic_tests.py
@@ -1133,7 +1133,7 @@ def basic_delete(sbox):
'rm', '--force', foo_path)
verify_file_deleted("Failed to remove unversioned file foo", foo_path)
- # At one stage deleting an URL dumped core
+ # At one stage deleting a URL dumped core
iota_URL = sbox.repo_url + '/iota'
svntest.actions.run_and_verify_svn(None,
@@ -1738,7 +1738,7 @@ def info_nonhead(sbox):
if line.find("URL:") >= 0:
got_url = 1
if not got_url:
- print("Info didn't output an URL.")
+ print("Info didn't output a URL.")
raise svntest.Failure
diff --git a/subversion/tests/cmdline/lock_tests.py b/subversion/tests/cmdline/lock_tests.py
index b61c995..e1de317 100755
--- a/subversion/tests/cmdline/lock_tests.py
+++ b/subversion/tests/cmdline/lock_tests.py
@@ -1276,7 +1276,7 @@ def info_moved_path(sbox):
print(fname2 + " was reported as locked.")
raise svntest.Failure
if not got_url:
- print("Info didn't output an URL.")
+ print("Info didn't output a URL.")
raise svntest.Failure
#----------------------------------------------------------------------
@@ -1336,7 +1336,7 @@ def unlock_wrong_token(sbox):
svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
file_path)
- # Steal the lock as the same author, but using an URL to keep the old token
+ # Steal the lock as the same author, but using a URL to keep the old token
# in the WC.
svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
"--force", file_url)
diff --git a/subversion/tests/cmdline/prop_tests.py b/subversion/tests/cmdline/prop_tests.py
index 6636bff..316d0a7 100755
--- a/subversion/tests/cmdline/prop_tests.py
+++ b/subversion/tests/cmdline/prop_tests.py
@@ -1127,7 +1127,7 @@ def recursive_base_wc_ops(sbox):
#----------------------------------------------------------------------
def url_props_ops(sbox):
- "property operations on an URL"
+ "property operations on a URL"
# Bootstrap
sbox.build()
diff --git a/www/hacking.html b/www/hacking.html
index b2b2e80..b39fb58 100644
--- a/www/hacking.html
+++ b/www/hacking.html
@@ -1526,7 +1526,7 @@ svnserve instance, run the following command:
socat -v TCP4-LISTEN:9630,reuseaddr,fork
TCP4:localhost:svn
-Then run your svn commands using an URL base of
+
Then run your svn commands using a URL base of
svn://127.0.0.1:9630/; socat will forward the
traffic from port 9630 to the normal svnserve port (3690), and will
print all traffic in both directions to standard error, prefixing it