diff --git a/cde/doc/fr_FR.UTF-8/Makefile.am b/cde/doc/fr_FR.UTF-8/Makefile.am
index 7bc125f53..a2334dbfc 100644
--- a/cde/doc/fr_FR.UTF-8/Makefile.am
+++ b/cde/doc/fr_FR.UTF-8/Makefile.am
@@ -1,5 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = help
-# notyet SUBDIRS = help guides
-
+SUBDIRS = help guides
diff --git a/cde/doc/fr_FR.UTF-8/guides/Makefile.am b/cde/doc/fr_FR.UTF-8/guides/Makefile.am
new file mode 100644
index 000000000..71a83b9bd
--- /dev/null
+++ b/cde/doc/fr_FR.UTF-8/guides/Makefile.am
@@ -0,0 +1,60 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INFOLIBDESC = "Bibliothèque d'informations Motif et CDE"
+
+# get some important variables
+include $(top_srcdir)/doc/common/guides/guides_env.am
+
+# prime the pump
+BUILT_SOURCES =
+CLEANFILES =
+
+# this sets the LANG variables
+include $(top_srcdir)/programs/localized/templates/French.am
+
+# build guide TOCs and deps
+include $(top_srcdir)/doc/common/guides/usersGuide.am
+include $(top_srcdir)/doc/common/guides/infoUGuide.am
+include $(top_srcdir)/doc/common/guides/sysAdminGuide.am
+
+# build the infolib + search DB
+INFOLIBDEPS = $(SGMLDEPS) $(top_srcdir)/doc/common/docbook/docbook.stl
+
+$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOLIBDEPS)
+	$(MKDIR_P) $(INFOLIB)
+	$(DGENV) $(DTINFOGEN) build -v -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) $(DGOPTS) $(SSENTS) -l $(INFOLIB) bookcase.bc
+
+BUILT_SOURCES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf
+CLEANFILES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf
+
+# installation - these files *may* change depending on if the docs
+# ever change, but for now we will list them as they are currently
+# installed.
+
+cdedtidir = $(CDE_INSTALLATION_TOP)/infolib/$(LANG)/cde.dti
+dist_cdedti_DATA = ../cde.dti/bookcase.map ../cde.dti/cde.oli
+
+cdedtidocdir = $(cdedtidir)/CDEDOC
+dist_cdedtidoc_DATA = ../cde.dti/CDEDOC/CDEDOC.dbd	\
+		../cde.dti/CDEDOC/CDEDOC.dbi	\
+		../cde.dti/CDEDOC/CDEDOC.sch
+
+cdedtidocsearchdir = $(cdedtidocdir)/dtsearch
+dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00	\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d22			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.dbd			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k21			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.sfx			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d01			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d23			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k00			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k22			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.stp			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d21			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d99			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k01			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k23			\
+	../cde.dti/CDEDOC/dtsearch/dtsearch.ocf
+
+BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
+CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
diff --git a/cde/doc/fr_FR.UTF-8/guides/infoUGd/Title.am b/cde/doc/fr_FR.UTF-8/guides/infoUGd/Title.am
new file mode 100644
index 000000000..96834787d
--- /dev/null
+++ b/cde/doc/fr_FR.UTF-8/guides/infoUGd/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+INFOUGUIDE_TITLE = "Guide de l'utilisateur du Gestionnaire des informations"
diff --git a/cde/doc/fr_FR.UTF-8/guides/infoUGd/book.sgm b/cde/doc/fr_FR.UTF-8/guides/infoUGd/book.sgm
index aeeee422f..13aa841a8 100644
--- a/cde/doc/fr_FR.UTF-8/guides/infoUGd/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/guides/infoUGd/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/1 1996/12/17 15:09:30 rws $ -->
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/Title.am b/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/Title.am
new file mode 100644
index 000000000..e96d64ef9
--- /dev/null
+++ b/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+SYSADMINGUIDE_TITLE = "Guide de l'administrateur"
diff --git a/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/book.sgm b/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/book.sgm
index 7fa33b667..8965dced4 100644
--- a/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/guides/sysAdminGuide/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/guides/usersGuide/Title.am b/cde/doc/fr_FR.UTF-8/guides/usersGuide/Title.am
new file mode 100644
index 000000000..e42396648
--- /dev/null
+++ b/cde/doc/fr_FR.UTF-8/guides/usersGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+USERSGUIDE_TITLE = "Guide de l'utilisateur"
diff --git a/cde/doc/fr_FR.UTF-8/guides/usersGuide/book.sgm b/cde/doc/fr_FR.UTF-8/guides/usersGuide/book.sgm
index 41d656f73..354304709 100644
--- a/cde/doc/fr_FR.UTF-8/guides/usersGuide/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/guides/usersGuide/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Appmanager/book.sgm b/cde/doc/fr_FR.UTF-8/help/Appmanager/book.sgm
index eb1bb93b4..317d33c99 100644
--- a/cde/doc/fr_FR.UTF-8/help/Appmanager/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Appmanager/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Calculator/book.sgm b/cde/doc/fr_FR.UTF-8/help/Calculator/book.sgm
index 8620789e8..16d13d241 100644
--- a/cde/doc/fr_FR.UTF-8/help/Calculator/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Calculator/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Calendar/book.sgm b/cde/doc/fr_FR.UTF-8/help/Calendar/book.sgm
index 2d03b1cb4..f1ff97c0c 100644
--- a/cde/doc/fr_FR.UTF-8/help/Calendar/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Calendar/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/CreatAct/book.sgm b/cde/doc/fr_FR.UTF-8/help/CreatAct/book.sgm
index b1852411b..ca21f1405 100644
--- a/cde/doc/fr_FR.UTF-8/help/CreatAct/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/CreatAct/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/FPanel/book.sgm b/cde/doc/fr_FR.UTF-8/help/FPanel/book.sgm
index e9b6c3a7b..a39347618 100644
--- a/cde/doc/fr_FR.UTF-8/help/FPanel/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/FPanel/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Filemgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Filemgr/book.sgm
index 3bbe2192a..9b18b489f 100644
--- a/cde/doc/fr_FR.UTF-8/help/Filemgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Filemgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Help4Help/book.sgm b/cde/doc/fr_FR.UTF-8/help/Help4Help/book.sgm
index c0b5a59e6..1c1f8bfc3 100644
--- a/cde/doc/fr_FR.UTF-8/help/Help4Help/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Help4Help/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Iconed/book.sgm b/cde/doc/fr_FR.UTF-8/help/Iconed/book.sgm
index 34be4e030..484066689 100644
--- a/cde/doc/fr_FR.UTF-8/help/Iconed/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Iconed/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Infomgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Infomgr/book.sgm
index 92ef308cd..f7a6c97a0 100644
--- a/cde/doc/fr_FR.UTF-8/help/Infomgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Infomgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Intromgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Intromgr/book.sgm
index 16c32b782..4cc9d3bd3 100644
--- a/cde/doc/fr_FR.UTF-8/help/Intromgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Intromgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/LibDtPrint/book.sgm b/cde/doc/fr_FR.UTF-8/help/LibDtPrint/book.sgm
index c7ff81867..885733cd2 100644
--- a/cde/doc/fr_FR.UTF-8/help/LibDtPrint/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/LibDtPrint/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Loginmgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Loginmgr/book.sgm
index b694c8c71..a3eb6a5ff 100644
--- a/cde/doc/fr_FR.UTF-8/help/Loginmgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Loginmgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Mailer/book.sgm b/cde/doc/fr_FR.UTF-8/help/Mailer/book.sgm
index 7a67098d5..21d7320df 100644
--- a/cde/doc/fr_FR.UTF-8/help/Mailer/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Mailer/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Makefile.am b/cde/doc/fr_FR.UTF-8/help/Makefile.am
index 085d69a30..412bfb566 100644
--- a/cde/doc/fr_FR.UTF-8/help/Makefile.am
+++ b/cde/doc/fr_FR.UTF-8/help/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-# this sets the LANG and HELP_LANG variables
+# this sets the LANG variables
 include $(top_srcdir)/programs/localized/templates/French.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
diff --git a/cde/doc/fr_FR.UTF-8/help/Printmgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Printmgr/book.sgm
index 8fefd8c99..2cb4df963 100644
--- a/cde/doc/fr_FR.UTF-8/help/Printmgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Printmgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/PrnSetup/book.sgm b/cde/doc/fr_FR.UTF-8/help/PrnSetup/book.sgm
index d6475639c..eff63b592 100644
--- a/cde/doc/fr_FR.UTF-8/help/PrnSetup/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/PrnSetup/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Stylemgr/book.sgm b/cde/doc/fr_FR.UTF-8/help/Stylemgr/book.sgm
index 89e75e989..6df36dac3 100644
--- a/cde/doc/fr_FR.UTF-8/help/Stylemgr/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Stylemgr/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/6 1996/06/19 16:52:36 drk $ -->
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Terminal/book.sgm b/cde/doc/fr_FR.UTF-8/help/Terminal/book.sgm
index efc68378a..f4fd83d14 100644
--- a/cde/doc/fr_FR.UTF-8/help/Terminal/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Terminal/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/Textedit/book.sgm b/cde/doc/fr_FR.UTF-8/help/Textedit/book.sgm
index 91c25ddf1..81f087a50 100644
--- a/cde/doc/fr_FR.UTF-8/help/Textedit/book.sgm
+++ b/cde/doc/fr_FR.UTF-8/help/Textedit/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/fr_FR.UTF-8/help/common/Desktop.hf b/cde/doc/fr_FR.UTF-8/help/common/Desktop.hf
index 4c063527d..2e6b056ea 100644
--- a/cde/doc/fr_FR.UTF-8/help/common/Desktop.hf
+++ b/cde/doc/fr_FR.UTF-8/help/common/Desktop.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Bureau CDE
-*.bitmap:       /usr/dt/appconfig/help/fr_FR.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/fr_FR.UTF-8/graphics/cdelogo.pm
 *.abstract:     Généralités et Connaissances de base du Bureau \
  * Aide sur l'aide \
  * Gestionnaire d'applications \
diff --git a/cde/doc/fr_FR.UTF-8/help/common/DesktopIntro.hf b/cde/doc/fr_FR.UTF-8/help/common/DesktopIntro.hf
index ef673a188..a778d6ef4 100644
--- a/cde/doc/fr_FR.UTF-8/help/common/DesktopIntro.hf
+++ b/cde/doc/fr_FR.UTF-8/help/common/DesktopIntro.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Généralités et Connaissances de base du Bureau
-*.bitmap:       /usr/dt/appconfig/help/fr_FR.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/fr_FR.UTF-8/graphics/cdelogo.pm
 *.abstract:     Généralités et Connaissances de base du Bureau CDE
 
 *.volumes:  \