Author: svn-role
Date: Mon Mar 30 04:00:10 2015
New Revision: 1669985
URL: http://svn.apache.org/r1669985
Log:
Merge r1668602 from trunk:
* r1668602
Fixes to the public svn_string API documentation.
Justification:
Have a complete, correct and easily accessible API description.
None of these changes should affect generated code nor the ABI.
Votes:
+1: stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/include/svn_string.h
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 04:00:10 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667106-1667107,1667941,1667976,1668598,1668600
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667106-1667107,1667941,1667976,1668598,1668600,1668602
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1669985&r1=1669984&r2=1669985&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Mon Mar 30 04:00:10 2015
@@ -255,14 +255,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1668602
- Fixes to the public svn_string API documentation.
- Justification:
- Have a complete, correct and easily accessible API description.
- None of these changes should affect generated code nor the ABI.
- Votes:
- +1: stefan2
-
* r1668603
Fixes to the public svn_wc API documentation.
Justification:
Modified: subversion/branches/1.9.x/subversion/include/svn_string.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_string.h?rev=1669985&r1=1669984&r2=1669985&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_string.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_string.h Mon Mar 30
04:00:10 2015
@@ -305,7 +305,7 @@ svn_stringbuf_fillchar(svn_stringbuf_t *
* The advantages extend beyond the actual call because the reduced
* register pressure allows for more optimization within the caller.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
* @since New in 1.7.
*/
void
@@ -314,7 +314,7 @@ svn_stringbuf_appendbyte(svn_stringbuf_t
/** Append the array of bytes @a bytes of length @a count onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*
* @since 1.9 @a bytes can be NULL if @a count is zero.
*/
@@ -325,7 +325,7 @@ svn_stringbuf_appendbytes(svn_stringbuf_
/** Append @a byte @a count times onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
* @since New in 1.9.
*/
void
@@ -335,7 +335,7 @@ svn_stringbuf_appendfill(svn_stringbuf_t
/** Append the stringbuf @c appendstr onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*/
void
svn_stringbuf_appendstr(svn_stringbuf_t *targetstr,
@@ -343,7 +343,7 @@ svn_stringbuf_appendstr(svn_stringbuf_t
/** Append the C string @a cstr onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*/
void
svn_stringbuf_appendcstr(svn_stringbuf_t *targetstr,
