You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/01/27 16:48:08 UTC
svn commit: r1064163 - in /subversion/trunk/subversion/include: svn_client.h
svn_cmdline.h svn_config.h svn_dav.h svn_delta.h svn_diff.h svn_editor.h
svn_fs.h svn_io.h svn_mergeinfo.h svn_ra.h svn_repos.h svn_subst.h
svn_types.h svn_wc.h
Author: stylesen
Date: Thu Jan 27 15:48:07 2011
New Revision: 1064163
URL: http://svn.apache.org/viewvc?rev=1064163&view=rev
Log:
* subversion/include/svn_fs.h,
* subversion/include/svn_diff.h,
* subversion/include/svn_dav.h,
* subversion/include/svn_mergeinfo.h,
* subversion/include/svn_editor.h,
* subversion/include/svn_repos.h,
* subversion/include/svn_delta.h,
* subversion/include/svn_subst.h,
* subversion/include/svn_types.h,
* subversion/include/svn_config.h,
* subversion/include/svn_io.h,
* subversion/include/svn_wc.h,
* subversion/include/svn_cmdline.h,
* subversion/include/svn_client.h,
* subversion/include/svn_ra.h
Fix typos in comments.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_cmdline.h
subversion/trunk/subversion/include/svn_config.h
subversion/trunk/subversion/include/svn_dav.h
subversion/trunk/subversion/include/svn_delta.h
subversion/trunk/subversion/include/svn_diff.h
subversion/trunk/subversion/include/svn_editor.h
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/include/svn_io.h
subversion/trunk/subversion/include/svn_mergeinfo.h
subversion/trunk/subversion/include/svn_ra.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/include/svn_subst.h
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/include/svn_wc.h
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jan 27 15:48:07 2011
@@ -2813,7 +2813,7 @@ svn_client_diff(const apr_array_header_t
*
* If @a peg_revision is #svn_opt_revision_unspecified, behave
* identically to svn_client_diff5(), using @a path for both of that
- * function's @a path1 and @a path2 argments.
+ * function's @a path1 and @a path2 arguments.
*
* All other options are handled identically to svn_client_diff5().
*
@@ -2996,7 +2996,7 @@ svn_client_diff_summarize(const char *pa
*
* If @a peg_revision is #svn_opt_revision_unspecified, behave
* identically to svn_client_diff_summarize2(), using @a path for both
- * of that function's @a path1 and @a path2 argments.
+ * of that function's @a path1 and @a path2 arguments.
*
* The function may report false positives if @a ignore_ancestry is false,
* as described in the documentation for svn_client_diff_summarize2().
@@ -4378,7 +4378,7 @@ svn_client_revprop_get(const char *propn
apr_pool_t *pool);
/**
- * Invoke @a receiver with @a receiver_baton to return the regular properies
+ * Invoke @a receiver with @a receiver_baton to return the regular properties
* of @a target, a URL or working copy path. @a receiver will be called
* for each path encountered.
*
@@ -4434,7 +4434,7 @@ svn_client_proplist3(const char *target,
*
* @since New in 1.2.
*
- * @deprecated Provided for backward compatiblility with the 1.4 API.
+ * @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -5442,10 +5442,10 @@ svn_client_url_from_path2(const char **u
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Simlar to svn_client_url_from_path2(), but without a context argument.
+/** Similar to svn_client_url_from_path2(), but without a context argument.
*
* @since New in 1.5.
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -5503,7 +5503,7 @@ svn_client_uuid_from_path2(const char **
/** Similar to svn_client_uuid_from_path2(), but with a relative path and
* an access baton.
*
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
Modified: subversion/trunk/subversion/include/svn_cmdline.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_cmdline.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_cmdline.h (original)
+++ subversion/trunk/subversion/include/svn_cmdline.h Thu Jan 27 15:48:07 2011
@@ -289,7 +289,7 @@ svn_cmdline_auth_ssl_client_cert_pw_prom
apr_pool_t *pool);
/** An implementation of @c svn_auth_plaintext_prompt_func_t that
- * prompts the user whether storing unencypted passwords to disk is OK.
+ * prompts the user whether storing unencrypted passwords to disk is OK.
*
* Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
*
@@ -302,7 +302,7 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
apr_pool_t *pool);
/** An implementation of @c svn_auth_plaintext_passphrase_prompt_func_t that
- * prompts the user whether storing unencypted passphrase to disk is OK.
+ * prompts the user whether storing unencrypted passphrase to disk is OK.
*
* Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
*
Modified: subversion/trunk/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_config.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_config.h (original)
+++ subversion/trunk/subversion/include/svn_config.h Thu Jan 27 15:48:07 2011
@@ -309,7 +309,7 @@ typedef svn_boolean_t (*svn_config_secti
void *baton);
/** Similar to svn_config_enumerate_sections2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
*
* @deprecated Provided for backwards compatibility with the 1.2 API.
*/
@@ -356,7 +356,7 @@ typedef svn_boolean_t (*svn_config_enume
void *baton);
/** Similar to svn_config_enumerate2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
*
* @deprecated Provided for backwards compatibility with the 1.2 API.
*/
Modified: subversion/trunk/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_dav.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_dav.h (original)
+++ subversion/trunk/subversion/include/svn_dav.h Thu Jan 27 15:48:07 2011
@@ -92,12 +92,12 @@ extern "C" {
universe of svn_lock_t->owner.) */
#define SVN_DAV_LOCK_OWNER_HEADER "X-SVN-Lock-Owner"
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
* Subversion repository, then this header indicates the youngest
* revision in the repository. */
#define SVN_DAV_YOUNGEST_REV_HEADER "SVN-Youngest-Rev"
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
* Subversion repository, then this header indicates the UUID of the
* repository. */
#define SVN_DAV_REPOS_UUID_HEADER "SVN-Repository-UUID"
Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Thu Jan 27 15:48:07 2011
@@ -1058,7 +1058,7 @@ svn_delta_get_cancellation_editor(svn_ca
* #svn_depth_infinity, #svn_depth_empty, #svn_depth_files,
* #svn_depth_immediates, or #svn_depth_unknown.
*
- * If filtering is deemed unncessary (or if @a requested_depth is
+ * If filtering is deemed unnecessary (or if @a requested_depth is
* #svn_depth_unknown), @a *editor and @a *edit_baton will be set to @a
* wrapped_editor and @a wrapped_baton, respectively; otherwise,
* they'll be set to new objects allocated from @a pool.
@@ -1195,7 +1195,7 @@ typedef svn_error_t *(*svn_file_rev_hand
* reproduced here for dependency reasons.
*
* @deprecated This type is provided for the svn_compat_wrap_file_rev_handler()
- * compatibilty wrapper, and should not be used for new development.
+ * compatibility wrapper, and should not be used for new development.
* @since New in 1.5.
*/
typedef svn_error_t *(*svn_file_rev_handler_old_t)(
Modified: subversion/trunk/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_diff.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_diff.h (original)
+++ subversion/trunk/subversion/include/svn_diff.h Thu Jan 27 15:48:07 2011
@@ -490,7 +490,7 @@ svn_diff_file_diff4_2(svn_diff_t **diff,
const svn_diff_file_options_t *options,
apr_pool_t *pool);
-/** Simliar to svn_file_diff4_2(), but with @a options set to a struct with
+/** Similar to svn_file_diff4_2(), but with @a options set to a struct with
* default options.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
@@ -639,7 +639,7 @@ svn_diff_mem_string_diff(svn_diff_t **di
apr_pool_t *pool);
-/** Generate @a diff output from the @a orginal, @a modified and @a latest
+/** Generate @a diff output from the @a original, @a modified and @a latest
* in-memory strings. @a diff will be allocated in @a pool.
*
* @since New in 1.5.
Modified: subversion/trunk/subversion/include/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_editor.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_editor.h (original)
+++ subversion/trunk/subversion/include/svn_editor.h Thu Jan 27 15:48:07 2011
@@ -89,7 +89,7 @@ extern "C" {
*
* HISTORY
*
- * Classicaly, Subversion had a notion of a "tree delta" which could be
+ * Classically, Subversion had a notion of a "tree delta" which could be
* passed around as an independent entity. Theory implied this delta was an
* entity in its own right, to be used when and where necessary.
* Unfortunately, this theory did not work well in practice. The producer
@@ -105,7 +105,7 @@ extern "C" {
* a set of operations describing the change, and a "receiver" accepts and
* applies them to its tree.
*
- * The classic interace was named "@c svn_delta_editor_t" and was described
+ * The classic interface was named "@c svn_delta_editor_t" and was described
* idiomatically as the "editor interface". This generation of the interface
* retains the "editor" name for that reason. All notions of a "tree delta"
* structure are no longer part of this interface.
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Thu Jan 27 15:48:07 2011
@@ -1524,7 +1524,7 @@ svn_fs_get_mergeinfo(svn_mergeinfo_catal
* mergeinfo hash. If @a mergeinfo is NULL then @a *validated_mergeinfo is
* set to NULL.
*
- * @a *validated_mergeinfo is allocated in @a result_pool. All tempporary
+ * @a *validated_mergeinfo is allocated in @a result_pool. All temporary
* allocations are performed in @a scratch_pool.
*
* @since New in 1.7.
Modified: subversion/trunk/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_io.h (original)
+++ subversion/trunk/subversion/include/svn_io.h Thu Jan 27 15:48:07 2011
@@ -738,7 +738,7 @@ svn_io_dir_file_copy(const char *src_pat
*
* In Subversion 1.7 reset support was added as an optional feature of
* streams. If a stream implements resetting it allows reading the data
- * again after a successfull call to svn_stream_reset().
+ * again after a successful call to svn_stream_reset().
*/
typedef struct svn_stream_t svn_stream_t;
@@ -1304,7 +1304,7 @@ svn_io_remove_file(const char *path,
* doesn't exist. Use @a pool for temporary allocations.
*
* Because recursive delete of a directory tree can be a lengthy operation,
- * provide @a cancel_func and @a cancel_baton for interruptability.
+ * provide @a cancel_func and @a cancel_baton for interruptibility.
*
* @since New in 1.5.
*/
Modified: subversion/trunk/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_mergeinfo.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_mergeinfo.h (original)
+++ subversion/trunk/subversion/include/svn_mergeinfo.h Thu Jan 27 15:48:07 2011
@@ -61,7 +61,7 @@ extern "C" {
*
* If a path has no @c SVN_PROP_MERGEINFO of its own, it inherits mergeinfo
* from its nearest parent that has @c SVN_PROP_MERGEINFO set. The
- * exception to this is @c SVN_PROP_MERGEINFO with non-ineritable revision
+ * exception to this is @c SVN_PROP_MERGEINFO with non-inheritable revision
* ranges. These non-inheritable ranges apply only to the path which they
* are set on.
*
@@ -518,7 +518,7 @@ typedef enum svn_mergeinfo_inheritance_t
svn_mergeinfo_inherited,
/** Mergeinfo on target's nearest (path-wise, not history-wise)
- ancestor, regardless of whether target has explict mergeinfo. */
+ ancestor, regardless of whether target has explicit mergeinfo. */
svn_mergeinfo_nearest_ancestor
} svn_mergeinfo_inheritance_t;
Modified: subversion/trunk/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra.h (original)
+++ subversion/trunk/subversion/include/svn_ra.h Thu Jan 27 15:48:07 2011
@@ -503,7 +503,7 @@ typedef struct svn_ra_callbacks2_t
/** Notification callback baton, used with progress_func. */
void *progress_baton;
- /** Cancelation function
+ /** Cancellation function
*
* As its baton, the general callback baton is used
*
@@ -638,7 +638,7 @@ svn_ra_open3(svn_ra_session_t **session_
apr_pool_t *pool);
/**
- * Similiar to svn_ra_open3(), but with @a uuid set to @c NULL.
+ * Similar to svn_ra_open3(), but with @a uuid set to @c NULL.
*
* @since New in 1.3.
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -1671,7 +1671,7 @@ svn_ra_get_file_revs2(svn_ra_session_t *
apr_pool_t *pool);
/**
- * Similiar to svn_ra_get_file_revs2(), but with @a include_merged_revisions
+ * Similar to svn_ra_get_file_revs2(), but with @a include_merged_revisions
* set to FALSE.
*
* @since New in 1.2.
Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Thu Jan 27 15:48:07 2011
@@ -185,7 +185,7 @@ typedef svn_error_t *(*svn_repos_file_re
/* Notification system. */
-/** The type of action occuring.
+/** The type of action occurring.
*
* @since New in 1.7.
*/
@@ -1067,7 +1067,7 @@ svn_repos_abort_report(void *report_bato
* proportional to the greatest depth of the tree under @a tgt_root, not
* the total size of the delta.
*
- * ### svn_repos_dir_delta2 is mostly superceded by the reporter
+ * ### svn_repos_dir_delta2 is mostly superseded by the reporter
* ### functionality (svn_repos_begin_report2 and friends).
* ### svn_repos_dir_delta2 does allow the roots to be transaction
* ### roots rather than just revision roots, and it has the
Modified: subversion/trunk/subversion/include/svn_subst.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_subst.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_subst.h (original)
+++ subversion/trunk/subversion/include/svn_subst.h Thu Jan 27 15:48:07 2011
@@ -362,7 +362,7 @@ svn_subst_read_specialfile(svn_stream_t
apr_pool_t *scratch_pool);
-/** Set @a *stream to a writeable stream that accepts content in
+/** Set @a *stream to a writable stream that accepts content in
* the "normal form" for a special file, to be located at @a path, and
* will create that file when the stream is closed. The stream will be
* allocated in @a result_pool, and any temporary allocations will be
Modified: subversion/trunk/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Thu Jan 27 15:48:07 2011
@@ -69,7 +69,7 @@ extern "C" {
* is much cheaper than repeated aligned access. Define this macro to 1
* on those machines.
* Unaligned access on other machines (e.g. IA64) will trigger memory
- * acccess faults or simply misbehave.
+ * access faults or simply misbehave.
*
* @since New in 1.7.
*/
@@ -98,7 +98,7 @@ typedef struct svn_error_t
*
* Note that if this error was generated by Subversion's API, you'll
* probably want to use svn_err_best_message() to get a single
- * decriptive string for this error chain (see the @a child member)
+ * descriptive string for this error chain (see the @a child member)
* or svn_handle_error2() to print the error chain in full. This is
* because Subversion's API functions sometimes add many links to
* the error chain that lack details (used only to produce virtual
@@ -795,10 +795,10 @@ svn_log_changed_path_dup(const svn_log_c
typedef struct svn_log_entry_t
{
/** A hash containing as keys every path committed in @a revision; the
- * values are (#svn_log_changed_path_t *) stuctures.
+ * values are (#svn_log_changed_path_t *) structures.
*
* The subversion core libraries will always set this field to the same
- * value as changed_paths2 for compatibity reasons.
+ * value as changed_paths2 for compatibility reasons.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
@@ -830,13 +830,13 @@ typedef struct svn_log_entry_t
svn_boolean_t has_children;
/** A hash containing as keys every path committed in @a revision; the
- * values are (#svn_log_changed_path2_t *) stuctures.
+ * values are (#svn_log_changed_path2_t *) structures.
*
* If this value is not @c NULL, it MUST have the same value as
* changed_paths or svn_log_entry_dup() will not create an identical copy.
*
* The subversion core libraries will always set this field to the same
- * value as changed_paths for compatibity with users assuming an older
+ * value as changed_paths for compatibility with users assuming an older
* version.
*
* @since New in 1.6.
@@ -885,7 +885,7 @@ svn_log_entry_dup(const svn_log_entry_t
* This function is invoked once on each log message, in the order
* determined by the caller (see above-mentioned functions).
*
- * @a baton is what you think it is, and @a log_entry contains relevent
+ * @a baton is what you think it is, and @a log_entry contains relevant
* information for the log message. Any of @a log_entry->author,
* @a log_entry->date, or @a log_entry->message may be @c NULL.
*
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1064163&r1=1064162&r2=1064163&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Jan 27 15:48:07 2011
@@ -265,7 +265,7 @@ typedef struct svn_wc_adm_access_t svn_w
* subdirectory of @a path is already write locked.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* @a pool will be used to allocate memory for the baton and any subsequently
* cached items. If @a adm_access has not been closed when the pool is
@@ -395,7 +395,7 @@ svn_wc_adm_probe_open(svn_wc_adm_access_
* will hold write locks.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* This function is essentially a combination of svn_wc_adm_open3() and
* svn_wc_get_actual_target(), with the emphasis on reducing physical IO.
@@ -469,7 +469,7 @@ svn_wc_adm_probe_retrieve(svn_wc_adm_acc
* @a associated.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Use @a pool only for local processing, not to allocate @a *adm_access.
*
@@ -539,7 +539,7 @@ svn_wc_adm_close2(svn_wc_adm_access_t *a
* Similar to svn_wc_adm_close2(), but with the internal pool of @a adm_access
* used for temporary allocations.
*
- * @deprecated Provided for backward compabibility with the 1.5 API.
+ * @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -583,7 +583,7 @@ svn_wc_adm_locked(const svn_wc_adm_acces
* write_lock on @a local_abspath
*
* @a locked_here and/or @a locked can be NULL when you are not
- * interrested in a specific value
+ * interested in a specific value
*
* @since New in 1.7.
*/
@@ -1228,7 +1228,7 @@ typedef struct svn_wc_notify_t {
/** Path, either absolute or relative to the current working directory
* (i.e., not relative to an anchor). @c path is "." or another valid path
- * value for compatibilty reasons when the real target is an url that
+ * value for compatibility reasons when the real target is an url that
* is available in @c url. */
const char *path;
@@ -1994,7 +1994,7 @@ svn_wc_create_conflict_result(svn_wc_con
* Implementations of this callback are free to present the conflict
* using any user interface. This may include simple contextual
* conflicts in a file's text or properties, or more complex
- * 'tree'-based conflcts related to obstructed additions, deletions,
+ * 'tree'-based conflicts related to obstructed additions, deletions,
* and edits. The callback implementation is free to decide which
* sorts of conflicts to handle; it's also free to decide which types
* of conflicts are automatically resolvable and which require user
@@ -3083,7 +3083,7 @@ typedef struct svn_wc_entry_callbacks_t
* If #svn_depth_infinity, recurse fully starting from @a path.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Like our other entries interfaces, entries that are in a 'excluded',
* 'deleted' or 'absent' state (and not scheduled for re-addition) are not
@@ -3284,7 +3284,7 @@ svn_wc_maybe_set_repos_root(svn_wc_adm_a
* We have three functions for getting working copy status: one function
* for getting the status of exactly one thing, another for
* getting the statuses of (potentially) multiple things and a third for
- * gettting the working copy out-of-dateness with respect to the repository.
+ * getting the working copy out-of-dateness with respect to the repository.
*
* Why do we have two different functions for getting working copy status?
* The concept of depth, as explained in the documentation for
@@ -3380,7 +3380,7 @@ typedef struct svn_wc_status3_t
/** Set to TRUE if the item is the victim of a conflict. */
svn_boolean_t conflicted;
- /** The status of the node itself. In order of precendence: Tree conflicts,
+ /** The status of the node itself. In order of precedence: Tree conflicts,
* structural changes, text changes (including text conflicts). */
enum svn_wc_status_kind node_status;
@@ -3807,7 +3807,7 @@ typedef void (*svn_wc_status_func_t)(voi
* or @c NULL if the default set of ignorable file patterns should be used.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while walking
- * to determine if the client has cancelled the operation.
+ * to determine if the client has canceled the operation.
*
* If @a external_func is non-NULL and an external definition is found
* while walking @a local_abspath, call @a external_func with @a
@@ -3881,7 +3881,7 @@ svn_wc_walk_status(svn_wc_context_t *wc_
* or @c NULL if the default set of ignorable file patterns should be used.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while building
- * the @a statushash to determine if the client has cancelled the operation.
+ * the @a statushash to determine if the client has canceled the operation.
*
* If @a traversal_info is non-NULL, then record pre-update traversal
* state in it. (Caller should obtain @a traversal_info from
@@ -4695,7 +4695,7 @@ typedef struct svn_wc_committed_queue_t
* Create a queue for use with svn_wc_queue_committed() and
* svn_wc_process_committed_queue().
*
- * The returned queue and all further allocations required for queueing
+ * The returned queue and all further allocations required for queuing
* new items will also be done from @a pool.
*
* @since New in 1.5.
@@ -6576,7 +6576,7 @@ svn_wc_cleanup3(svn_wc_context_t *wc_ctx
* swn_wc_context_t.
*
* @since New in 1.2.
- * @deprecated Provided for backward compability with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -6946,7 +6946,7 @@ svn_wc_create_tmp_file(apr_file_t **fp,
* as requested by @a flags.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* When translating to the normal form, inconsistent eol styles will be
* repaired when appropriate for the given setting. When translating
@@ -7167,7 +7167,7 @@ svn_wc_get_default_ignores(apr_array_hea
* @a config hash and the local ignore patterns from the directory
* at @a local_abspath, using @a wc_ctx, and store them in @a *patterns.
* Allocate @a *patterns and its contents in @a result_pool, use @a
- * scrach_pool for temporary allocations.
+ * scratch_pool for temporary allocations.
*
* @since New in 1.7.
*/
@@ -7310,7 +7310,7 @@ typedef struct svn_wc_revision_status_t
* modified.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Allocate *result_p in @a result_pool, use @a scratch_pool for temporary
* allocations.
@@ -7355,7 +7355,7 @@ svn_wc_revision_status(svn_wc_revision_s
* be the empty string.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton to
- * determine if the client has cancelled the operation.
+ * determine if the client has canceled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report the change (using notification types
@@ -7421,7 +7421,7 @@ svn_wc_set_changelist(const char *path,
* which will be used as the root of this operation.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton at
- * various points to determine if the client has cancelled the operation.
+ * various points to determine if the client has canceled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report changes as they are made.
@@ -7473,7 +7473,7 @@ svn_wc_crop_tree(svn_wc_adm_access_t *an
* report changes as they are made.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton at
- * various points to determine if the client has cancelled the operation.
+ * various points to determine if the client has canceled the operation.
*
*
* @since New in 1.7