diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am
index 1ca0bb128..e986d154c 100644
--- a/cde/doc/common/guides/guides_env.am
+++ b/cde/doc/common/guides/guides_env.am
@@ -9,8 +9,8 @@ INFOLIBNAME = -n cde
# orig: INFOLIBDESC = -d InfoLibDesc
SSENTS = -m common/catalog
-DGENV = LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.."
-DTINFOGENOPTIONS = $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
+DGENV = SGML_SEARCH_PATH=".:.."
+DTINFOGENOPTIONS = -L $(LANG) $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
# Note the quad-dollar sign - this escapes $$ (pid) for the tmp
# dir. This is required for multi-core builds to work.
diff --git a/cde/doc/common/help/sdl-docs.am b/cde/doc/common/help/sdl-docs.am
index aaf5cd856..f5aa875c5 100644
--- a/cde/doc/common/help/sdl-docs.am
+++ b/cde/doc/common/help/sdl-docs.am
@@ -19,7 +19,7 @@ DTHELP_HTAG2 = $(top_builddir)/programs/dthelp/parser/pass2/parser/dthelp_htag2
# but the $(basename...) seems to add a space for some reason
%.sdl:
- LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.." \
+ SGML_SEARCH_PATH=".:.." \
$(KSH) $(DTDOCBOOK) -H $(DTHELP_HTAG2) -L $(LANG) \
-o $@ `basename $@ .sdl`/book.sgm
diff --git a/cde/doc/en_US.UTF-8/guides/man/man1_dt/docbook2infolib.sgm b/cde/doc/en_US.UTF-8/guides/man/man1_dt/docbook2infolib.sgm
index 621b5badf..34f877ee5 100644
--- a/cde/doc/en_US.UTF-8/guides/man/man1_dt/docbook2infolib.sgm
+++ b/cde/doc/en_US.UTF-8/guides/man/man1_dt/docbook2infolib.sgm
@@ -22,10 +22,12 @@
dtdocbook2infolib admin
-h
+-L Locale
dtdocbook2infolib build
-h
+-L Locale
-T TmpDir
-m CatalogFile
-l Library
@@ -36,6 +38,7 @@
dtdocbook2infolib tocgen
-h
+-L Locale
-T TmpDir
-m CatalogFile
-id TOCid
@@ -46,6 +49,7 @@
dtdocbook2infolib update
-h
+-L Locale
-T TmpDir
-m CatalogFile
-b BookcaseName
@@ -55,6 +59,7 @@
dtdocbook2infolib validate
-h
+-L Locale
-T TmpDir
-m CatalogFile
SGMLdocument
@@ -113,12 +118,16 @@ DocBook.DTD.
Displays a help message for each available option.
+-L Locale
+Specifies the locale of the information library.
+
+
-T TmpDir
Specifies the directory in which temporary files are placed during the
build process. The default is to use the environment variable
TMPDIR. If variable
TMPDIR is not set,
-/usr/tmp is used.
+/tmp is used.
@@ -207,9 +216,9 @@ administration functions to perform on a specified information library:
Example
-Enter the dtdocbook2infolib admin command in a shell window:
+Enter the dtdocbook2infolib admin -L en_US.UTF-8 command in a shell window:
-dtdocbook2infolib admin
+dtdocbook2infolib admin -L en_US.UTF-8
The following menu appears:
@@ -224,8 +233,7 @@ Please enter your choice [1-6]
Enter the number associated with the administrative task you
want to perform.
-dtdocbook2infolib admin prompts for additional input as
-required.
+dtdocbook2infolib admin -L en_US.UTF-8 prompts for additional input as required.
@@ -238,14 +246,14 @@ It also creates a full-text search index.
Example
-Enter the dtdocbook2infolib build command in a shell
-window.
+Enter the dtdocbook2infolib build -L en_US.UTF-8
+command in a shell window.
To build an information library containing multiple bookcases,
an example command might be:
-build -l
+dtdocbook2infolib build -L en_US.UTF-8 -l
UNIXLib -T
/usr/pers
ProgBooks
@@ -269,14 +277,14 @@ source file(s) for a book and generates a hypertext table of contents.
Example
-Enter the dtdocbook2infolib tocgen command in a shell
-window.
+Enter the dtdocbook2infolib tocgen -L en_US.UTF-8
+command in a shell window.
To generate a hypertext table of contents for a book containing six SGML
book source files, each of which contains a separate chapter, an example
command might be:
-dtdocbook2infolib tocgen -T
+dtdocbook2infolib tocgen -L en_US.UTF-8 -T
/usr/pers -f
Perl.TOC -id
Perl0594
@@ -302,18 +310,21 @@ during processing.
update
-The dtdocbook2infolib update command dynamically replaces
-existing style sheets in the DtInfo document database.
+The dtdocbook2infolib update -L en_US.UTF-8
+command dynamically replaces existing style sheets in the DtInfo document
+database.
Example
-Enter the dtdocbook2infolib update command in a shell window.
+Enter the dtdocbook2infolib update -L en_US.UTF-8
+command in a shell window.
-Here is an example of a dtdocbook2infolib update command used
-to reformat the documents and/or document sections that use the
+Here is an example of a dtdocbook2infolib update -L en_US.UTF-8
+
+command used to reformat the documents and/or document sections that use the
specified style sheet:
-dtdocbook2infolib update -T
+dtdocbook2infolib update -L en_US.UTF-8 -T
/usr/pers -b
ICE9 -l
Brunn style
@@ -327,19 +338,21 @@ that is specified in the bookcase named ICE9.
validate
-The dtdocbook2infolib validate command performs SGML
-validation on bookcase specifications, on individual book source files,
-or any SGML document.
+The dtdocbook2infolib validate -L en_US.UTF-8
+command performs SGML validation on bookcase specifications, on individual book
+source files, or any SGML document.
Examples
-Enter the dtdocbook2infolib validate in a shell window.
+Enter the dtdocbook2infolib validate -L en_US.UTF-8
+in a shell window.
-Here is an example of a dtdocbook2infolib validate command
-that performs validation on three SGML book source files:
+Here is an example of a dtdocbook2infolib validate -L en_US.UTF-8
+
+command that performs validation on three SGML book source files:
-dtdocbook2infolib validate
+dtdocbook2infolib validate -L en_US.UTF-8
03.Structure.N
04.Process.N
05.BookArea.N
diff --git a/cde/doc/en_US.UTF-8/man/Makefile.am b/cde/doc/en_US.UTF-8/man/Makefile.am
index 669895597..d9b38a3d3 100644
--- a/cde/doc/en_US.UTF-8/man/Makefile.am
+++ b/cde/doc/en_US.UTF-8/man/Makefile.am
@@ -1,6 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
-DBTOMAN = $(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2man
+# this sets the LANG variables
+include $(top_srcdir)/programs/localized/templates/English.am
+
+DBTOMAN = $(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2man $(LANG)
# first, the man pages broken down by sections
MANSEC1 = man1/tttrace.1 man1/tttar.1 man1/ttsession.1 man1/ttrmdir.1 \