Update.

1999-03-05  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/llio.texi (Open-time Flags): Clarify that O_SHLOCK and
	O_EXLOCK are BSD extensions.
	Reported by Jochen Voss <voss@mathematik.uni-kl.de> [PR libc/985].

5 files changed, 24 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d2f03a2a68..0dd0a10c9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-05  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* manual/llio.texi (Open-time Flags): Clarify that O_SHLOCK and
+	O_EXLOCK are BSD extensions.
+	Reported by Jochen Voss <voss@mathematik.uni-kl.de> [PR libc/985].
+
 1999-03-08  Ulrich Drepper  <drepper@cygnus.com>
 
 	* manual/signal.texi (Termination in Handler): Correct example.
diff --git a/FAQ b/FAQ
index df3261170d..936d41b68a 100644
--- a/FAQ
+++ b/FAQ
@@ -566,10 +566,11 @@ prefix to something like /usr/local/glibc2 which is not used for anything.)
 The dangers when installing glibc in /usr are twofold:
 
 * glibc will overwrite the headers in /usr/include.  Other C libraries
-  install a different but overlapping set of headers there, so the
-  effect will probably be that you can't compile anything.  You need to
-  rename /usr/include out of the way first.  (Do not throw it away; you
-  will then lose the ability to compile programs against your old libc.)
+  install a different but overlapping set of headers there, so the effect
+  will probably be that you can't compile anything.  You need to rename
+  /usr/include out of the way before running `make install'.  (Do not throw
+  it away; you will then lose the ability to compile programs against your
+  old libc.)
 
 * None of your old libraries, static or shared, can be used with a
   different C library major version.  For shared libraries this is not a
diff --git a/FAQ.in b/FAQ.in
index 63c9de4058..3a769d8692 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -395,10 +395,11 @@ prefix to something like /usr/local/glibc2 which is not used for anything.)
 The dangers when installing glibc in /usr are twofold:
 
 * glibc will overwrite the headers in /usr/include.  Other C libraries
-  install a different but overlapping set of headers there, so the
-  effect will probably be that you can't compile anything.  You need to
-  rename /usr/include out of the way first.  (Do not throw it away; you
-  will then lose the ability to compile programs against your old libc.)
+  install a different but overlapping set of headers there, so the effect
+  will probably be that you can't compile anything.  You need to rename
+  /usr/include out of the way before running `make install'.  (Do not throw
+  it away; you will then lose the ability to compile programs against your
+  old libc.)
 
 * None of your old libraries, static or shared, can be used with a
   different C library major version.  For shared libraries this is not a
diff --git a/manual/install.texi b/manual/install.texi
index cf3023b3f0..5ac0e785c3 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -222,11 +222,11 @@ from underneath.
 If you are upgrading from a previous installation of glibc 2.0 or 2.1,
 @samp{make install} will do the entire job.  If you're upgrading from
 Linux libc5 or some other C library, you need to rename the old
-@file{/usr/include} directory out of the way first, or you will end up
-with a mixture of header files from both libraries, and you won't be
-able to compile anything.  You may also need to reconfigure GCC to work
-with the new library.  The easiest way to do that is to figure out the
-compiler switches to make it work again
+@file{/usr/include} directory out of the way before running @samp{make
+install}, or you will end up with a mixture of header files from both
+libraries, and you won't be able to compile anything.  You may also need
+to reconfigure GCC to work with the new library.  The easiest way to do
+that is to figure out the compiler switches to make it work again
 (@samp{-Wl,-dynamic-linker=/lib/ld-linux.so.2} should work on Linux
 systems) and use them to recompile gcc.  You can also edit the specs
 file (@file{/usr/lib/gcc-lib/@var{TARGET}/@var{VERSION}/specs}), but
diff --git a/manual/llio.texi b/manual/llio.texi
index b7dbdefeb7..2e497bf512 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -3070,6 +3070,9 @@ Unix before @code{ftruncate} was invented, and is retained for backward
 compatibility.
 @end deftypevr
 
+The remaining operating modes are BSD extensions.  They exist only
+on some systems.  On other systems, these macros are not defined.
+
 @comment fcntl.h
 @comment BSD
 @deftypevr Macro int O_SHLOCK