doc: Include the contents of ABOUT-NLS in the documentation.

* gettext-runtime/doc/nls.texi (The original ABOUT-NLS): Renamed from
'Translation Intro'. Turn into a section. Mark section as historical.
* gettext-tools/doc/gettext.texi: Include nls.texi.
* gettext-tools/doc/Makefile.am (gettext_TEXINFOS): Add nls.texi and
matrix.texi.

diff --git a/gettext-runtime/doc/nls.texi b/gettext-runtime/doc/nls.texi
index 1e18ee8f9bb1960acd4d47024d985433ed039536..9f95d636b6042994448ee15ea0a4eeb168ccd1a4 100644 (file)
--- a/gettext-runtime/doc/nls.texi
+++ b/gettext-runtime/doc/nls.texi
@@ -1,5 +1,12 @@
-@node Translation Intro
-@chapter Notes on the Free Translation Project
+@node The original ABOUT-NLS
+@section Notes on the Free Translation Project
+
+@cindex @file{ABOUT-NLS} file
+This section contains the text that was, for a long time, distributed
+as a file named @code{ABOUT-NLS}.
+
+@strong{ NOTE: } This documentation section is outdated.  It it included
+here for historical purposes only.
 
 @set STATUS Jun 2014
 
@@ -29,7 +36,7 @@ on translations can contact the appropriate team.
 
 
 @node INSTALL Matters
-@section INSTALL Matters
+@subsection INSTALL Matters
 
 Some packages are @dfn{localizable} when properly installed; the
 programs they contain can be made to speak your own native language.
@@ -67,7 +74,7 @@ then contain a space separated list of two-letter codes, stating
 which languages are allowed.
 
 @node Using This Package
-@section Using This Package
+@subsection Using This Package
 
 @c Note: We don't document the locale aliases, because they are less and less
 @c used - locale.alias contains not a single UTF-8 locale and still lists
@@ -135,7 +142,7 @@ in this context.
 @c FIXME: The user doesn't care about design justifications. --bruno
 
 @node Translating Teams
-@section Translating Teams
+@subsection Translating Teams
 
 For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
@@ -167,7 +174,7 @@ the terminology in use.  Proven linguistic skills are praised
 more than programming skills, here.
 
 @node Available Packages
-@section Available Packages
+@subsection Available Packages
 
 Languages are not equally supported in all packages.  The following
 matrix shows the current state of internationalization, as of
@@ -193,7 +200,7 @@ up-to-date matrix with full percentage details can be found at
 
 
 @node Using gettext in own code
-@section Using @code{gettext} in new packages
+@subsection Using @code{gettext} in new packages
 
 If you are writing a freely available program and want to internationalize
 it you are welcome to use GNU @file{gettext} in your package.  Of course

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index edfaba8847cb43cc004d9b2daa84bcb002205bf8..2d4a916fa23b8a563b1a0f459923a08f450a6490 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the gettext-tools/doc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2007, 2009, 2013-2016 Free Software
-## Foundation, Inc.
+## Copyright (C) 1995-1997, 2001-2007, 2009, 2013-2015, 2018-2019 Free
+## Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -46,7 +46,9 @@ gettext_TEXINFOS = \
   gpl.texi lgpl.texi fdl.texi \
   $(top_srcdir)/../gettext-runtime/doc/rt-gettext.texi \
   $(top_srcdir)/../gettext-runtime/doc/rt-ngettext.texi \
-  $(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi
+  $(top_srcdir)/../gettext-runtime/doc/rt-envsubst.texi \
+  $(top_srcdir)/../gettext-runtime/doc/nls.texi \
+  $(top_srcdir)/../gettext-runtime/doc/matrix.texi
 
 # The FAQ. To be edited with Mozilla.
 # The tutorial. To be edited by hand.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index f5bc68887ecf925c4350910e11d00a8c4e7bb566..3ca4db55ba86391280de641910f2cbbfee6aea37 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -503,6 +503,7 @@ Compiled Message Catalogs
 Concluding Remarks
 
 * History::                     History of GNU @code{gettext}
+* The original ABOUT-NLS::      Historical introduction
 * References::                  Related Readings
 
 Language Codes
@@ -12670,6 +12671,7 @@ about Native Language Support matters.
 
 @menu
 * History::                     History of GNU @code{gettext}
+* The original ABOUT-NLS::      Historical introduction
 * References::                  Related Readings
 @end menu
 
@@ -12752,6 +12754,8 @@ he handed over the GNU @code{gettext} maintenance to Bruno Haible in
 support for UTF-8 and CJK locales, and wrote a few new tools for
 manipulating PO files.
 
+@include nls.texi
+
 @node References
 @section Related Readings
 @cindex related reading