aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-10-13 09:49:28 -0700
committerRoland McGrath <roland@hack.frob.com>2011-10-13 09:49:28 -0700
commitf2282d42b49dcae001c269aeed4d9dbf74c5ca63 (patch)
tree2d9625dd00818f63bf93c1c406585cc8d80e0863
parent714fad23c6f546c16a3f975cac984384a592537b (diff)
downloadglibc-f2282d42b49dcae001c269aeed4d9dbf74c5ca63.tar
glibc-f2282d42b49dcae001c269aeed4d9dbf74c5ca63.tar.gz
glibc-f2282d42b49dcae001c269aeed4d9dbf74c5ca63.tar.bz2
glibc-f2282d42b49dcae001c269aeed4d9dbf74c5ca63.zip
BZ#13291: Manual typo fix for strverscmp.
-rw-r--r--ChangeLog5
-rw-r--r--manual/string.texi8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e61f353ea..89611bd821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13 Roland McGrath <roland@hack.frob.com>
+
+ [BZ #13291]
+ * manual/string.texi (String/Array Comparison): Typo fix in strverscmp.
+
2011-10-13 Andreas Schwab <schwab@redhat.com>
* sysdeps/x86_64/fpu/fraiseexcpt.c: Add __feraiseexcept alias.
diff --git a/manual/string.texi b/manual/string.texi
index 2fe60395eb..f7d4ebea1d 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1249,10 +1249,10 @@ strncmp ("hello, world", "hello, stupid world!!!", 5)
@comment GNU
@deftypefun int strverscmp (const char *@var{s1}, const char *@var{s2})
The @code{strverscmp} function compares the string @var{s1} against
-@var{s2}, considering them as holding indices/version numbers. Return
-value follows the same conventions as found in the @code{strverscmp}
-function. In fact, if @var{s1} and @var{s2} contain no digits,
-@code{strverscmp} behaves like @code{strcmp}.
+@var{s2}, considering them as holding indices/version numbers. The
+return value follows the same conventions as found in the
+@code{strcmp} function. In fact, if @var{s1} and @var{s2} contain no
+digits, @code{strverscmp} behaves like @code{strcmp}.
Basically, we compare strings normally (character by character), until
we find a digit in each string - then we enter a special comparison