Index: www/cvs-changelog.html
===================================================================
--- www/cvs-changelog.html	(revision 9119)
+++ www/cvs-changelog.html	(working copy)
@@ -21460,7 +21460,7 @@
 
 	* configure.in (1.51), subversion/Makefile.am (1.21):
 
-	Build `svnadmin' iff `libsvn_fs' is built too.  
+	Build `svnadmin' if `libsvn_fs' is built too.  
 	
 	* configure.in, Makefile.am (@SVNADMIN@): new build variable defined 
 	  only if @LIBSVN_FS@ is defined.  
@@ -23343,7 +23343,7 @@
 	svn_types.h (1.52), svn_wc.h (1.62), svn_xml.h (1.28,
 	post-edit-baton-removal, pre-edit-baton-removal):
 
-	Wrap everything in extern "C" iff __cplusplus is defined (thanks to 
+	Wrap everything in extern "C" if __cplusplus is defined (thanks to 
 	Greg Stein and Bill Tutt for the suggestion).  
 	
 	Also: load svn-dev.el where it wasn't being loaded, and get rid of 
@@ -25135,7 +25135,7 @@
 	left lying around from the `patch` command.  
 	
 	* log.c (log_do_rm_if_empty):  new variant of log_do_rm() which only 
-	  removes file iff its size is zero.  
+	  removes file if its size is zero.  
 	
 	  (start_handler):  add SVN_WC__LOG_RM_IF_EMPTY to log dispatcher.  
 	
@@ -25803,7 +25803,7 @@
 	non-mutually exclusive.  call do_prop_deltas() if a local mod is 
 	found, or if a file being added has props.  
 	
-	(do_postfix_text_deltas):  rewrite logic.  Send a text delta iff the 
+	(do_postfix_text_deltas):  rewrite logic.  Send a text delta if the 
 	affected target has text_modified_p set.  
 	
 	(do_prop_deltas):  new func.  
Index: subversion/include/svn_fs.h
===================================================================
--- subversion/include/svn_fs.h	(revision 9119)
+++ subversion/include/svn_fs.h	(working copy)
@@ -268,7 +268,7 @@
 
 
 
-/** Return non-zero IFF the nodes associated with @a id1 and @a id2 are
+/** Return non-zero IF the nodes associated with @a id1 and @a id2 are
  * related, else return zero.  
  *
  * NOTE: While this might seem redundant in the presence of
@@ -574,10 +574,10 @@
 svn_fs_t *svn_fs_root_fs (svn_fs_root_t *root);
 
 
-/** Return @c TRUE iff @a root is a transaction root.  */
+/** Return @c TRUE if @a root is a transaction root.  */
 svn_boolean_t svn_fs_is_txn_root (svn_fs_root_t *root);
 
-/** Return @c TRUE iff @a root is a revision root.  */
+/** Return @c TRUE if @a root is a revision root.  */
 svn_boolean_t svn_fs_is_revision_root (svn_fs_root_t *root);
 
 
@@ -744,7 +744,7 @@
                                       apr_pool_t *pool);
                                       
 
-/** Set @a *is_dir to @c TRUE iff @a path in @a root is a directory.
+/** Set @a *is_dir to @c TRUE if @a path in @a root is a directory.
  * Do any necessary temporary allocation in @a pool.
  */
 svn_error_t *svn_fs_is_dir (svn_boolean_t *is_dir,
@@ -753,7 +753,7 @@
                             apr_pool_t *pool);
 
 
-/** Set @a *is_file to @c TRUE iff @a path in @a root is a file.
+/** Set @a *is_file to @c TRUE if @a path in @a root is a file.
  * Do any necessary temporary allocation in @a pool.
  */
 svn_error_t *svn_fs_is_file (svn_boolean_t *is_file,
Index: subversion/include/svn_path.h
===================================================================
--- subversion/include/svn_path.h	(revision 9119)
+++ subversion/include/svn_path.h	(working copy)
@@ -155,7 +155,7 @@
                      apr_pool_t *pool);
 
 
-/** Return non-zero iff @a path is empty ("") or represents the current
+/** Return non-zero if @a path is empty ("") or represents the current
  * directory -- that is, if prepending it as a component to an existing
  * path would result in no meaningful change.
  */
@@ -335,10 +335,10 @@
  * @{
  */
 
-/** Return @c TRUE iff @a path looks like a valid URL, @c FALSE otherwise. */
+/** Return @c TRUE if @a path looks like a valid URL, @c FALSE otherwise. */
 svn_boolean_t svn_path_is_url (const char *path);
 
-/** Return @c TRUE iff @a path is URI-safe, @c FALSE otherwise. */
+/** Return @c TRUE if @a path is URI-safe, @c FALSE otherwise. */
 svn_boolean_t svn_path_is_uri_safe (const char *path);
 
 /** Return a URI-encoded copy of @a path, allocated in @a pool. */
Index: subversion/include/svn_props.h
===================================================================
--- subversion/include/svn_props.h	(revision 9119)
+++ subversion/include/svn_props.h	(working copy)
@@ -81,7 +81,7 @@
                                    const char *prop_name);
 
 
-/** Return @c TRUE iff @a prop_name represents the name of a Subversion
+/** Return @c TRUE if @a prop_name represents the name of a Subversion
  * property.
  */
 svn_boolean_t svn_prop_is_svn_prop (const char *prop_name);
Index: subversion/include/svn_types.h
===================================================================
--- subversion/include/svn_types.h	(revision 9119)
+++ subversion/include/svn_types.h	(working copy)
@@ -56,10 +56,10 @@
   /** The pool holding this error and any child errors it wraps */
   apr_pool_t *pool;
 
-  /** Source file where the error originated.  Only used iff @c SVN_DEBUG. */
+  /** Source file where the error originated.  Only used if @c SVN_DEBUG. */
   const char *file;
 
-  /** Source line where the error originated.  Only used iff @c SVN_DEBUG. */
+  /** Source line where the error originated.  Only used if @c SVN_DEBUG. */
   long line;
 
 } svn_error_t;
@@ -351,7 +351,7 @@
                                      apr_pool_t *pool);
 
 
-/** Return false iff @a mime_type is a textual type.
+/** Return false if @a mime_type is a textual type.
  *
  * All mime types that start with "text/" are textual, plus some special 
  * cases (for example, "image/x-xbitmap").
Index: subversion/include/svn_string.h
===================================================================
--- subversion/include/svn_string.h	(revision 9119)
+++ subversion/include/svn_string.h	(working copy)
@@ -150,7 +150,7 @@
 svn_string_t *svn_string_dup (const svn_string_t *original_string,
                               apr_pool_t *pool);
 
-/** Return @c TRUE iff @a str1 and @c str2 have identical length and data. */
+/** Return @c TRUE if @a str1 and @c str2 have identical length and data. */
 svn_boolean_t svn_string_compare (const svn_string_t *str1, 
                                   const svn_string_t *str2);
 
@@ -253,7 +253,7 @@
                                     apr_pool_t *pool);
 
 
-/** Return @c TRUE iff @a str1 and @a str2 have identical length and data. */
+/** Return @c TRUE if @a str1 and @a str2 have identical length and data. */
 svn_boolean_t svn_stringbuf_compare (const svn_stringbuf_t *str1, 
                                      const svn_stringbuf_t *str2);
 
@@ -271,7 +271,7 @@
 apr_size_t svn_stringbuf_find_char_backward (const svn_stringbuf_t *str, 
                                              char ch);
 
-/** Return @c TRUE iff @a str1 and @a str2 have identical length and data. */
+/** Return @c TRUE if @a str1 and @a str2 have identical length and data. */
 svn_boolean_t svn_string_compare_stringbuf (const svn_string_t *str1,
                                             const svn_stringbuf_t *str2);
 
@@ -314,7 +314,7 @@
                                apr_pool_t *pool);
 
 
-/** Return @c TRUE iff @a str matches any of the elements of @a list, a list 
+/** Return @c TRUE if @a str matches any of the elements of @a list, a list 
  * of zero or more glob patterns.
  *
  * Use @a pool for temporary allocation.
Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h	(revision 9119)
+++ subversion/include/svn_wc.h	(working copy)
@@ -663,7 +663,7 @@
                               apr_pool_t *pool);
 
 
-/** Set @a *has_binary_prop to @c TRUE iff @a path has been marked 
+/** Set @a *has_binary_prop to @c TRUE if @a path has been marked 
  * with a property indicating that it is non-text (in other words, binary).
  * @a adm_access is an access baton set that contains @path.
  */
@@ -1737,7 +1737,7 @@
                               apr_pool_t *pool);
 
 
-/** Return true iff @a name is a 'normal' property name.  'Normal' is
+/** Return true if @a name is a 'normal' property name.  'Normal' is
  * defined as a user-visible and user-tweakable property that shows up
  * when you fetch a proplist.
  *
@@ -1754,10 +1754,10 @@
 
 
 
-/** Return true iff @a name is a 'wc' property name. */
+/** Return true if @a name is a 'wc' property name. */
 svn_boolean_t svn_wc_is_wc_prop (const char *name);
 
-/** Return true iff @a name is a 'entry' property name. */
+/** Return true if @a name is a 'entry' property name. */
 svn_boolean_t svn_wc_is_entry_prop (const char *name);
 
 
Index: subversion/include/svn_error.h
===================================================================
--- subversion/include/svn_error.h	(revision 9119)
+++ subversion/include/svn_error.h	(working copy)
@@ -148,7 +148,7 @@
 
 
 /** Very basic default error handler: print out error stack, and quit
- * iff the @a fatal flag is set.
+ * if the @a fatal flag is set.
  */
 void svn_handle_error (svn_error_t *error,
                        FILE *stream,
Index: subversion/include/svn_time.h
===================================================================
--- subversion/include/svn_time.h	(revision 9119)
+++ subversion/include/svn_time.h	(working copy)
@@ -55,7 +55,7 @@
  * The local time zone will be used to compute the appropriate GMT
  * offset if @a text contains a local time specification.  Set @a
  * matched to indicate whether or not @a text was parsed successfully.
- * Perform any allocation in @a pool.  Return an error iff an internal
+ * Perform any allocation in @a pool.  Return an error if an internal
  * error (rather than a simple parse error) occurs.
  */
 svn_error_t *
Index: subversion/include/svn_opt.h
===================================================================
--- subversion/include/svn_opt.h	(revision 9119)
+++ subversion/include/svn_opt.h	(working copy)
@@ -107,7 +107,7 @@
 
 
 /**
- * Return @c TRUE iff subcommand @a command supports option @a option_code,
+ * Return @c TRUE if subcommand @a command supports option @a option_code,
  * else return @c FALSE.
  */
 svn_boolean_t
Index: subversion/libsvn_fs/tree.c
===================================================================
--- subversion/libsvn_fs/tree.c	(revision 9119)
+++ subversion/libsvn_fs/tree.c	(working copy)
@@ -810,7 +810,7 @@
    If resulting *PARENT_PATH_P will eventually be made mutable and
    modified, or if copy ID inheritance information is otherwise
    needed, TXN_ID should be the ID of the mutability transaction.  If
-   TXN_ID is NULL, no copy ID in heritance information will be
+   TXN_ID is NULL, no copy ID inheritance information will be
    calculated for the *PARENT_PATH_P chain.
 
    If FLAGS & open_path_last_optional is zero, return the error
@@ -1617,7 +1617,7 @@
 }
 
 
-/* Deltify ID's predecessor iff ID is mutable under TXN_ID in FS.  If
+/* Deltify ID's predecessor if ID is mutable under TXN_ID in FS.  If
    ID is a mutable directory, recurse.  Do this as part of TRAIL. */
 static svn_error_t *
 deltify_mutable (svn_fs_t *fs,
@@ -1785,7 +1785,7 @@
 }
 
 
-/* Set *IS_ANCESTOR to non-zero iff ID1 is an ancestor of ID2 in FS,
+/* Set *IS_ANCESTOR to non-zero if ID1 is an ancestor of ID2 in FS,
    as part of TRAIL. */
 static svn_error_t *
 id_check_ancestor (svn_boolean_t *is_ancestor,
Index: subversion/libsvn_fs/reps-strings.c
===================================================================
--- subversion/libsvn_fs/reps-strings.c	(revision 9119)
+++ subversion/libsvn_fs/reps-strings.c	(working copy)
@@ -40,7 +40,7 @@
 /*** Helper Functions ***/
 
 
-/* Return non-zero iff REP is mutable under transaction TXN_ID. */
+/* Return non-zero if REP is mutable under transaction TXN_ID. */
 static svn_boolean_t rep_is_mutable (svn_fs__representation_t *rep, 
                                      const char *txn_id)
 {
@@ -615,7 +615,7 @@
      is digestified. */
   svn_boolean_t checksum_finalized;
 
-  /* Used for temporary allocations, iff `trail' (above) is null.  */
+  /* Used for temporary allocations, if `trail' (above) is null.  */
   apr_pool_t *pool;
 
 };
@@ -920,7 +920,7 @@
   unsigned char md5_digest[APR_MD5_DIGESTSIZE];
   svn_boolean_t finalized;
 
-  /* Used for temporary allocations, iff `trail' (above) is null.  */
+  /* Used for temporary allocations, if `trail' (above) is null.  */
   apr_pool_t *pool;
 
 };
Index: subversion/libsvn_fs/dag.h
===================================================================
--- subversion/libsvn_fs/dag.h	(revision 9119)
+++ subversion/libsvn_fs/dag.h	(working copy)
@@ -141,7 +141,7 @@
                                             void *baton,
                                             trail_t *trail);
 
-/* Return non-zero IFF NODE is currently mutable under Subversion
+/* Return non-zero IF NODE is currently mutable under Subversion
    transaction TXN_ID.  */
 svn_boolean_t svn_fs__dag_check_mutable (dag_node_t *node,
                                          const char *txn_id);
@@ -504,7 +504,7 @@
                                        trail_t *trail);
 
 
-/* Set *IS_ANCESTOR to non-zero IFF NODE1 is an ancestor of NODE2.
+/* Set *IS_ANCESTOR to non-zero IF NODE1 is an ancestor of NODE2.
    Perform this test under TRAIL.  */
 svn_error_t *svn_fs__dag_is_ancestor (svn_boolean_t *is_ancestor,
                                       dag_node_t *node1,
@@ -512,7 +512,7 @@
                                       trail_t *trail);
 
 
-/* Set *IS_PARENT to non-zero IFF NODE1 is the parent of NODE2.
+/* Set *IS_PARENT to non-zero IF NODE1 is the parent of NODE2.
    Perform this test under TRAIL.  */
 svn_error_t *svn_fs__dag_is_parent (svn_boolean_t *is_ancestor,
                                     dag_node_t *node1,
Index: subversion/libsvn_fs/id.h
===================================================================
--- subversion/libsvn_fs/id.h	(revision 9119)
+++ subversion/libsvn_fs/id.h	(working copy)
@@ -82,7 +82,7 @@
 /* Access the "txn id" portion of ID. */
 const char *svn_fs__id_txn_id (const svn_fs_id_t *id);
 
-/* Return non-zero iff the node or node revision ID's A and B are equal.  */
+/* Return non-zero if the node or node revision ID's A and B are equal.  */
 int svn_fs__id_eq (const svn_fs_id_t *a, 
                    const svn_fs_id_t *b);
 
Index: subversion/libsvn_fs/key-gen.h
===================================================================
--- subversion/libsvn_fs/key-gen.h	(revision 9119)
+++ subversion/libsvn_fs/key-gen.h	(working copy)
@@ -102,7 +102,7 @@
 
 /* Compare two strings A and B as base-36 alphanumber keys.
  *
- * Return TRUE iff both keys are NULL or both keys have the same
+ * Return TRUE if both keys are NULL or both keys have the same
  * contents.
  */
 svn_boolean_t svn_fs__same_keys (const char *a, const char *b);
Index: subversion/libsvn_fs/notes/structure
===================================================================
--- subversion/libsvn_fs/notes/structure	(revision 9119)
+++ subversion/libsvn_fs/notes/structure	(working copy)
@@ -585,7 +585,7 @@
 
 Merging rules:
 
-   The general principle: a series of changes can be merged iff the
+   The general principle: a series of changes can be merged if the
    final outcome is independent of the order you apply them in.
 
 Merging two nodes, A and B, with respect to a common ancestor
Index: subversion/libsvn_fs/util/skel.c
===================================================================
--- subversion/libsvn_fs/util/skel.c	(revision 9119)
+++ subversion/libsvn_fs/util/skel.c	(working copy)
@@ -312,7 +312,7 @@
 }
 
 
-/* Return non-zero iff we should use the implicit-length form for SKEL.  
+/* Return non-zero if we should use the implicit-length form for SKEL.  
    Assume that SKEL is an atom.  */
 static svn_boolean_t
 use_implicit (skel_t *skel)
Index: subversion/libsvn_fs/util/skel.h
===================================================================
--- subversion/libsvn_fs/util/skel.h	(revision 9119)
+++ subversion/libsvn_fs/util/skel.h	(working copy)
@@ -143,11 +143,11 @@
 svn_stringbuf_t *svn_fs__unparse_skel (skel_t *skel, apr_pool_t *pool);
 
 
-/* Return true iff SKEL is an atom whose data is the same as STR.  */
+/* Return true if SKEL is an atom whose data is the same as STR.  */
 svn_boolean_t svn_fs__matches_atom (skel_t *skel, const char *str);
 
 
-/* Return true iff SKEL is an atom whose data is the same as STR.  */
+/* Return true if SKEL is an atom whose data is the same as STR.  */
 svn_boolean_t svn_fs__atom_matches_string (skel_t *skel, 
                                            const svn_string_t *str);
 
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c	(revision 9121)
+++ subversion/libsvn_wc/props.c	(working copy)
@@ -61,7 +61,7 @@
 /*** Detecting a property conflict ***/
 
 
-/* Given two propchange objects, return TRUE iff they conflict.  If
+/* Given two propchange objects, return TRUE if they conflict.  If
    there's a conflict, DESCRIPTION will contain an english description
    of the problem. */
 
@@ -69,7 +69,7 @@
 
               |  update set     |    update delete   |
   ------------|-----------------|--------------------|
-  user set    | conflict iff    |      conflict      |
+  user set    | conflict if     |      conflict      |
               |  vals differ    |                    |
   ------------|-----------------|--------------------|
   user delete |   conflict      |      merge         |
@@ -117,7 +117,7 @@
   if ((local->value == NULL) && (update->value == NULL))
     return FALSE;  /* no conflict */
 
-  /* If both changes set the property, it's a conflict iff the values
+  /* If both changes set the property, it's a conflict if the values
      are different */
   else if (! svn_string_compare (local->value, update->value))
     {
Index: subversion/libsvn_wc/props.h
===================================================================
--- subversion/libsvn_wc/props.h	(revision 9119)
+++ subversion/libsvn_wc/props.h	(working copy)
@@ -40,7 +40,7 @@
 
 
 
-/* Given two propchange objects, return TRUE iff they conflict.  If
+/* Given two propchange objects, return TRUE if they conflict.  If
    there's a conflict, DESCRIPTION will contain an english description
    of the problem. */
 
@@ -48,7 +48,7 @@
 
               |  update set     |    update delete   |
   ------------|-----------------|--------------------|
-  user set    | conflict iff    |      conflict      |
+  user set    | conflict if     |      conflict      |
               |  vals differ    |                    |
   ------------|-----------------|--------------------|
   user delete |   conflict      |      merge         |
Index: subversion/libsvn_wc/README
===================================================================
--- subversion/libsvn_wc/README	(revision 9119)
+++ subversion/libsvn_wc/README	(working copy)
@@ -216,7 +216,7 @@
 
 `lock'
 
-   Present iff some client is using this .svn/ subdir for anything.
+   Present if some client is using this .svn/ subdir for anything.
    kff todo: I think we don't need read vs write types, nor
    race-condition protection, due to the way locking is called.  We'll
    see, though.
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c	(revision 9119)
+++ subversion/libsvn_wc/status.c	(working copy)
@@ -114,7 +114,7 @@
      the next two will be ignored.  :-)  */
   svn_boolean_t added;
 
-  /* Gets set iff there's a change to this directory's properties, to
+  /* Gets set if there's a change to this directory's properties, to
      guide us when syncing adm files later. */
   svn_boolean_t prop_changed;
 
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c	(revision 9119)
+++ subversion/libsvn_wc/adm_files.c	(working copy)
@@ -48,7 +48,7 @@
 /* Return the path to something in PATH's administrative area.
  * 
  * First, the adm subdir is appended to PATH as a component, then the
- * "tmp" directory is added iff USE_TMP is set, then each of the
+ * "tmp" directory is added if USE_TMP is set, then each of the
  * varargs in AP (char *'s) is appended as a path component.  The list
  * must be terminated with a NULL argument.
  *
@@ -807,7 +807,7 @@
 
 /*** Checking for and creating administrative subdirs. ***/
 
-/* Set *EXISTS to iff there's an adm area for PATH, and it matches URL
+/* Set *EXISTS to if there's an adm area for PATH, and it matches URL
  * and REVISION.  If there's no adm area, set *EXISTS to false; if
  * there's an adm area but it doesn't match URL and REVISION, then
  * return error and don't touch *EXISTS.
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c	(revision 9119)
+++ subversion/libsvn_wc/update_editor.c	(working copy)
@@ -130,7 +130,7 @@
      directory. */
   struct dir_baton *parent_baton;
 
-  /* Gets set iff this is a new directory that is not yet versioned and not
+  /* Gets set if this is a new directory that is not yet versioned and not
      yet in the parent's list of entries */
   svn_boolean_t added;
 
Index: subversion/libsvn_subr/xml.c
===================================================================
--- subversion/libsvn_subr/xml.c	(revision 9119)
+++ subversion/libsvn_subr/xml.c	(working copy)
@@ -436,7 +436,7 @@
 /*** Creating attribute hashes. ***/
 
 /* Combine an existing attribute list ATTS with a HASH that itself
-   represents an attribute list.  Iff PRESERVE is true, then no value
+   represents an attribute list.  If PRESERVE is true, then no value
    already in HASH will be changed, else values from ATTS will
    override previous values in HASH. */
 static void
Index: subversion/libsvn_client/prop_commands.c
===================================================================
--- subversion/libsvn_client/prop_commands.c	(revision 9119)
+++ subversion/libsvn_client/prop_commands.c	(working copy)
@@ -501,7 +501,7 @@
 
   SVN_ERR (maybe_convert_to_url (&utarget, target, revision, pool));
 
-  /* Iff utarget is a url, that means we must use it, that is, the
+  /* If utarget is a url, that means we must use it, that is, the
      requested property information is not available locally. */
   if (svn_path_is_url (utarget))
     {
@@ -858,7 +858,7 @@
 
   SVN_ERR (maybe_convert_to_url (&utarget, target, revision, pool));
 
-  /* Iff utarget is a url, that means we must use it, that is, the
+  /* If utarget is a url, that means we must use it, that is, the
      requested property information is not available locally. */
   if (svn_path_is_url (utarget))
     {
Index: subversion/bindings/java/org/tigris/subversion/SubversionException.java
===================================================================
--- subversion/bindings/java/org/tigris/subversion/SubversionException.java	(revision 9119)
+++ subversion/bindings/java/org/tigris/subversion/SubversionException.java	(working copy)
@@ -1,6 +1,6 @@
 package org.tigris.subversion;
 
-/**
+/*
  * ====================================================================
  * Copyright (c) 2000-2003 CollabNet.  All rights reserved.
  *
@@ -27,10 +27,10 @@
     /* APR error value, possibly SVN_ custom err */
     private long status;
 
-    /* Source file where the error originated. Only used iff SVN_DEBUG */
+    /* Source file where the error originated. Only used if SVN_DEBUG */
     private String file;
 
-    /* Source line where the error originated. Only used iff SVN_DEBUG */
+    /* Source line where the error originated. Only used if SVN_DEBUG */
     private long line;
 
     /**
Index: subversion/mod_dav_svn/update.c
===================================================================
--- subversion/mod_dav_svn/update.c	(revision 9119)
+++ subversion/mod_dav_svn/update.c	(working copy)
@@ -66,10 +66,10 @@
   /* are we doing a resource walk? */
   svn_boolean_t resource_walk;
 
-  /* True iff we've already sent the open tag for the update. */
+  /* True if we've already sent the open tag for the update. */
   svn_boolean_t started_update;
 
-  /* True iff client requested all data inline in the report. */
+  /* True if client requested all data inline in the report. */
   svn_boolean_t send_all;
 
 } update_ctx_t;
Index: subversion/tests/libsvn_fs/skel-test.c
===================================================================
--- subversion/tests/libsvn_fs/skel-test.c	(revision 9119)
+++ subversion/tests/libsvn_fs/skel-test.c	(working copy)
@@ -112,7 +112,7 @@
   skel_char_map_initialized = 1;
 }
 
-/* Return true iff BYTE is a whitespace byte.  */
+/* Return true if BYTE is a whitespace byte.  */
 static int
 skel_is_space (char byte)
 {
@@ -122,7 +122,7 @@
 }
 
 #if 0
-/* Return true iff BYTE is a digit byte.  */
+/* Return true if BYTE is a digit byte.  */
 static int
 skel_is_digit (char byte)
 {
@@ -132,7 +132,7 @@
 }
 #endif
 
-/* Return true iff BYTE is a paren byte.  */
+/* Return true if BYTE is a paren byte.  */
 static int
 skel_is_paren (char byte)
 {
@@ -141,7 +141,7 @@
   return skel_char_map[(unsigned char) byte] == type_paren;
 }
 
-/* Return true iff BYTE is a name byte.  */
+/* Return true if BYTE is a name byte.  */
 static int
 skel_is_name (char byte)
 {
@@ -184,7 +184,7 @@
 }
 
 
-/* Return true iff SKEL is the parsed form of the atom produced by
+/* Return true if SKEL is the parsed form of the atom produced by
    calling put_implicit_length with BYTE.  */
 static int
 check_implicit_length_byte (skel_t *skel, char byte)
@@ -237,7 +237,7 @@
 }
 
 
-/* Return true iff SKEL is the parsed form of the atom produced by
+/* Return true if SKEL is the parsed form of the atom produced by
    calling put_implicit_length_all_chars.  */
 static int
 check_implicit_length_all_chars (skel_t *skel)
@@ -323,7 +323,7 @@
 }
 
 
-/* Return true iff SKEL is the parsed form of an atom generated by
+/* Return true if SKEL is the parsed form of an atom generated by
    put_explicit_length.  */
 static int
 check_explicit_length (skel_t *skel, const char *data, apr_size_t len)
@@ -491,7 +491,7 @@
 }
 
 
-/* Return true iff SKEL is a list of length DESIRED_LEN.  */
+/* Return true if SKEL is a list of length DESIRED_LEN.  */
 static int
 check_list (skel_t *skel, int desired_len)
 {
Index: subversion/tests/libsvn_subr/config-test.c
===================================================================
--- subversion/tests/libsvn_subr/config-test.c	(revision 9119)
+++ subversion/tests/libsvn_subr/config-test.c	(working copy)
@@ -125,7 +125,7 @@
       printf("Testing expected value '%s' against '%s' for "
              "option '%s'\n", py_val, c_val, key);
 #endif
-      /* Fail iff one value is null, or the strings don't match. */
+      /* Fail if one value is null, or the strings don't match. */
       if ((c_val == NULL) != (py_val == NULL)
           || (c_val != NULL && py_val != NULL
               && apr_strnatcmp(c_val, py_val) != 0))
Index: subversion/tests/clients/cmdline/svntest/tree.py
===================================================================
--- subversion/tests/clients/cmdline/svntest/tree.py	(revision 9119)
+++ subversion/tests/clients/cmdline/svntest/tree.py	(working copy)
@@ -591,7 +591,7 @@
 #   Tree nodes will contain no contents, and these atts:
 #
 #          'status', 'wc_rev', 'repos_rev'
-#             ... and possibly 'locked', 'copied', IFF columns non-empty.
+#             ... and possibly 'locked', 'copied', IF columns non-empty.
 # 
 
 def build_tree_from_status(lines):
Index: subversion/libsvn_ra_dav/merge.c
===================================================================
--- subversion/libsvn_ra_dav/merge.c	(revision 9119)
+++ subversion/libsvn_ra_dav/merge.c	(working copy)
@@ -134,7 +134,7 @@
   if (apr_hash_get (valid_targets, path, APR_HASH_KEY_STRING))
     return TRUE;
 
-  /* Otherwise, this path is bumpable IFF one of its parents is in the
+  /* Otherwise, this path is bumpable IF one of its parents is in the
      hash and marked with a 'recursion' flag. */
   parent_path = svn_stringbuf_create (path, pool);
   
Index: subversion/libsvn_ra_dav/util.c
===================================================================
--- subversion/libsvn_ra_dav/util.c	(revision 9119)
+++ subversion/libsvn_ra_dav/util.c	(working copy)
@@ -466,11 +466,11 @@
                                 void *baton),
                const svn_ra_dav__xml_elm_t *elements,
                svn_boolean_t use_neon_shim,
-               /* These three are defined iff use_neon_shim is defined. */
+               /* These three are defined if use_neon_shim is defined. */
                svn_ra_dav__xml_validate_cb validate_compat_cb,
                svn_ra_dav__xml_startelm_cb startelm_compat_cb, 
                svn_ra_dav__xml_endelm_cb endelm_compat_cb,
-               /* These three are defined iff use_neon_shim is NOT defined. */
+               /* These three are defined if use_neon_shim is NOT defined. */
                ne_xml_startelm_cb *startelm_cb,
                ne_xml_cdata_cb *cdata_cb,
                ne_xml_endelm_cb *endelm_cb,
Index: HACKING
===================================================================
--- HACKING	(revision 9119)
+++ HACKING	(working copy)
@@ -626,8 +626,8 @@
   const char *message;       /* details from producer of error */
   struct svn_error *child;   /* ptr to the error we "wrap" */
   ap_pool_t *pool;           /* place to generate message strings from */
-  const char *file;          /* Only used iff SVN_DEBUG */
-  long line;                 /* Only used iff SVN_DEBUG */
+  const char *file;          /* Only used if SVN_DEBUG */
+  long line;                 /* Only used if SVN_DEBUG */
 } svn_error_t;
 
 2.  If you are the *original* creator of an error, you would do