De-emphasize the intl/ subdirectory.

diff --git a/gettext-runtime/doc/ChangeLog b/gettext-runtime/doc/ChangeLog
index 459932321eb7531717d6ca5df53a8249de2bf1a0..0eff8bf2374c6d358258eb12534cef87a7c6832b 100644 (file)
--- a/gettext-runtime/doc/ChangeLog
+++ b/gettext-runtime/doc/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       De-emphasize the intl/ subdirectory.
+       * nls.texi (Translation Intro): Remove paragraph about the version.
+       (Configuration advice): Remove section.
+       (INSTALL Matters): Don't explain --with-included-gettext. Don't mention
+       catgets.
+
 2010-06-03  Bruno Haible  <bruno@clisp.org>
 
        * matrix.texi: Update.

diff --git a/gettext-runtime/doc/nls.texi b/gettext-runtime/doc/nls.texi
index 0350fc9802d5807433b10d51522392841c905550..ae4074c8c78a262e7f1494e46c9e7ef927ea0352 100644 (file)
--- a/gettext-runtime/doc/nls.texi
+++ b/gettext-runtime/doc/nls.texi
@@ -19,13 +19,7 @@ how users should proceed for getting the programs to use the available
 translations.  They tell how people wanting to contribute and work
 on translations can contact the appropriate team.
 
-When reporting bugs in the @file{intl/} directory or bugs which may
-be related to internationalization, you should tell about the version
-of @code{gettext} which is used.  The information can be found in
-the @file{intl/VERSION} file, in internationalized packages.
-
 @menu
-* Configuration advice::
 * INSTALL Matters::
 * Using This Package::
 * Translating Teams::
@@ -33,33 +27,6 @@ the @file{intl/VERSION} file, in internationalized packages.
 * Using gettext in own code::
 @end menu
 
-@node Configuration advice
-@section Quick configuration advice
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
-@example
-./configure --with-included-gettext
-@end example
-
-@noindent
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the @code{gettext} implementation in the GNU C library version 2
-provides as many features (such as locale alias, message inheritance,
-automatic charset conversion or plural form handling)
-as the implementation here.  It is also not possible to offer this
-additional functionality on top of a @code{catgets} implementation.
-Future versions of GNU @code{gettext} will very likely convey even more
-functionality.  So it might be a good idea to change to GNU
-@code{gettext} as soon as possible.
-
-So you need @emph{not} provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included @file{libintl}.
-
 
 @node INSTALL Matters
 @section INSTALL Matters
@@ -71,42 +38,23 @@ own ways to internationalization, predating GNU @code{gettext}.
 
 By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU @code{gettext} functions.  If not, the included GNU
-@code{gettext} library will be used.  This library is wholly
-contained within this package, usually in the @file{intl/} subdirectory,
-so prior installation of the GNU @code{gettext} package is @emph{not}
-required.  Installers may use special options at configuration time for
-changing the default behaviour.  The commands:
+provides the GNU @code{gettext} functions.  Installers may use special
+options at configuration time for changing the default behaviour.  The
+command:
 
 @example
-./configure --with-included-gettext
 ./configure --disable-nls
 @end example
 
 @noindent
-will, respectively, bypass any pre-existing @code{gettext} to use the
-internationalizing routines provided within this package, or else,
-@emph{totally} disable translation of messages.
+will @emph{totally} disable translation of messages.
 
 When you already have GNU @code{gettext} installed on your system and
 run configure without an option for your new package, @code{configure}
-will probably detect the previously built and installed @file{libintl.a}
-file and will decide to use this.  This might not be desirable.
-You should use the more recent version of the GNU @code{gettext}
-library.  I.e.@: if the file @file{intl/VERSION} shows that the library
-which comes with this package is more recent, you should use
-
-@example
-./configure --with-included-gettext
-@end example
-
-@noindent
-to prevent auto-detection.
-
-The configuration process will not test for the @code{catgets} function
-and therefore it will not be used.  The reason is that even an
-emulation of @code{gettext} on top of @code{catgets} could not provide
-all the extensions of the GNU @code{gettext} library.
+will probably detect the previously built and installed @file{libintl}
+library and will decide to use it.  If not, you may have to to use the
+@samp{--with-libintl-prefix} option to tell @code{configure} where to
+look for it.
 
 Internationalized packages usually have many @file{po/@var{ll}.po}
 files, where @var{ll} gives an @w{ISO 639} two-letter code