import later fedora-branch tweaks

4 files changed, 4 insertions, 7 deletions

diff --git a/manual/.cvsignore b/manual/.cvsignore
index 54abbbb5a4..f1254e92d3 100644
--- a/manual/.cvsignore
+++ b/manual/.cvsignore
@@ -9,6 +9,6 @@ glibc-*
 *.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs
 
 texis top-menu.texi chapters.texi summary.texi stamp-*
-distinfo dir-add.texinfo dir-add.texi
+distinfo dir-add.texinfo
 
 libm-err.texi
diff --git a/manual/memory.texi b/manual/memory.texi
index ee2cd75c44..91abb7f5d4 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -2384,7 +2384,7 @@ exceed the process' data storage limit.
 
 @comment unistd.h
 @comment BSD
-@deftypefun void *sbrk (ptrdiff_t @var{delta})
+@deftypefun int sbrk (ptrdiff_t @var{delta})
 This function is the same as @code{brk} except that you specify the new
 end of the data segment as an offset @var{delta} from the current end
 and on success the return value is the address of the resulting end of
diff --git a/manual/string.texi b/manual/string.texi
index d9de12996e..21ab71461a 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1781,9 +1781,9 @@ uppercase and lowercase characters are related.
 
 For example,
 @smallexample
-strcasestr ("hello, world", "L")
+strstr ("hello, world", "L")
     @result{} "llo, world"
-strcasestr ("hello, World", "wo")
+strstr ("hello, World", "wo")
     @result{} "World"
 @end smallexample
 @end deftypefun
diff --git a/manual/users.texi b/manual/users.texi
index b52ee44439..20deeabdd2 100644
--- a/manual/users.texi
+++ b/manual/users.texi
@@ -1690,9 +1690,6 @@ extended information about users, adding an entry using this function
 would inevitably leave out much of the important information.
 @c Then how are programmers to modify the password file? -zw
 
-The group and user ID fields are left empty if the group or user name
-starts with a - or +.
-
 The function @code{putpwent} is declared in @file{pwd.h}.
 @end deftypefun