Merge r1674170 from trunk:
* r1674170
doc: Update svn_ra_get_dir2()'s docstring.
Votes:
+1: danielsh
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x@1674205 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS b/STATUS
index 6086594..06c838e 100644
--- a/STATUS
+++ b/STATUS
@@ -130,8 +130,3 @@
Approved changes:
=================
-
- * r1674170
- doc: Update svn_ra_get_dir2()'s docstring.
- Votes:
- +1: danielsh
diff --git a/subversion/include/svn_ra.h b/subversion/include/svn_ra.h
index a265678..a3ab672 100644
--- a/subversion/include/svn_ra.h
+++ b/subversion/include/svn_ra.h
@@ -1094,11 +1094,10 @@
* callers want to know, and some don't.)
*
* If @a props is non @c NULL, set @a *props to contain the properties of
- * the directory. This means @em all properties: not just ones controlled by
- * the user and stored in the repository fs, but non-tweakable ones
- * generated by the SCM system itself (e.g. 'wcprops', 'entryprops',
- * etc.) The keys are <tt>const char *</tt>, values are
- * <tt>@c svn_string_t *</tt>.
+ * the directory, including properties that are non-tweakable and
+ * generated by the SCM system itself (such as #svn_prop_wc_kind and
+ * #svn_prop_entry_kind properties). The keys are <tt>const char *</tt>,
+ * values are <tt>@c svn_string_t *</tt>.
*
* @since New in 1.4.
*/
