diff --git a/cde/doc/it_IT.UTF-8/Makefile.am b/cde/doc/it_IT.UTF-8/Makefile.am
index 7bc125f53..a2334dbfc 100644
--- a/cde/doc/it_IT.UTF-8/Makefile.am
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/guides/Makefile.am b/cde/doc/it_IT.UTF-8/guides/Makefile.am
new file mode 100644
index 000000000..dcb876ed6
--- /dev/null
+++ b/cde/doc/it_IT.UTF-8/guides/Makefile.am
@@ -0,0 +1,60 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INFOLIBDESC = "Biblioteca delle informazioni CDE e Motif"
+
+# 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/Italian.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/it_IT.UTF-8/guides/infoUGd/Title.am b/cde/doc/it_IT.UTF-8/guides/infoUGd/Title.am
new file mode 100644
index 000000000..c1ef06b41
--- /dev/null
+++ b/cde/doc/it_IT.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 = "Manuale dell'utente della Gestione delle informazioni"
diff --git a/cde/doc/it_IT.UTF-8/guides/infoUGd/book.sgm b/cde/doc/it_IT.UTF-8/guides/infoUGd/book.sgm
index 8ed985cc6..5eec81b06 100644
--- a/cde/doc/it_IT.UTF-8/guides/infoUGd/book.sgm
+++ b/cde/doc/it_IT.UTF-8/guides/infoUGd/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/1 1996/12/17 15:10:20 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/it_IT.UTF-8/guides/sysAdminGuide/Title.am b/cde/doc/it_IT.UTF-8/guides/sysAdminGuide/Title.am
new file mode 100644
index 000000000..5c2a02d17
--- /dev/null
+++ b/cde/doc/it_IT.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 = "Manuale per utenti esperti e amministratori di sistema"
diff --git a/cde/doc/it_IT.UTF-8/guides/sysAdminGuide/book.sgm b/cde/doc/it_IT.UTF-8/guides/sysAdminGuide/book.sgm
index 6988e54d8..f3e5714b7 100644
--- a/cde/doc/it_IT.UTF-8/guides/sysAdminGuide/book.sgm
+++ b/cde/doc/it_IT.UTF-8/guides/sysAdminGuide/book.sgm
@@ -2,31 +2,31 @@
 <!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 % ISOgreekletters PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN">
+<!ENTITY % ISOgreekletters PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN">
 %ISOgreekletters;
 
-<!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/it_IT.UTF-8/guides/usersGuide/Title.am b/cde/doc/it_IT.UTF-8/guides/usersGuide/Title.am
new file mode 100644
index 000000000..f14f7c7c4
--- /dev/null
+++ b/cde/doc/it_IT.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 = "Manuale dell'utente"
diff --git a/cde/doc/it_IT.UTF-8/guides/usersGuide/book.sgm b/cde/doc/it_IT.UTF-8/guides/usersGuide/book.sgm
index d96e4afdb..f8c1a29ad 100644
--- a/cde/doc/it_IT.UTF-8/guides/usersGuide/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Appmanager/book.sgm b/cde/doc/it_IT.UTF-8/help/Appmanager/book.sgm
index ff509d261..53af384ec 100644
--- a/cde/doc/it_IT.UTF-8/help/Appmanager/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Calculator/book.sgm b/cde/doc/it_IT.UTF-8/help/Calculator/book.sgm
index 790e973d3..ae48fceed 100644
--- a/cde/doc/it_IT.UTF-8/help/Calculator/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Calendar/book.sgm b/cde/doc/it_IT.UTF-8/help/Calendar/book.sgm
index 212e8ea93..7d4728d0d 100644
--- a/cde/doc/it_IT.UTF-8/help/Calendar/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/CreatAct/book.sgm b/cde/doc/it_IT.UTF-8/help/CreatAct/book.sgm
index 25d1466fa..24eb8c721 100644
--- a/cde/doc/it_IT.UTF-8/help/CreatAct/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/FPanel/book.sgm b/cde/doc/it_IT.UTF-8/help/FPanel/book.sgm
index 4b537b8fb..2d26b5b73 100644
--- a/cde/doc/it_IT.UTF-8/help/FPanel/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Filemgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Filemgr/book.sgm
index f345bab20..c1f8e4131 100644
--- a/cde/doc/it_IT.UTF-8/help/Filemgr/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Help4Help/book.sgm b/cde/doc/it_IT.UTF-8/help/Help4Help/book.sgm
index 92a5d4036..44d54f422 100644
--- a/cde/doc/it_IT.UTF-8/help/Help4Help/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Iconed/book.sgm b/cde/doc/it_IT.UTF-8/help/Iconed/book.sgm
index eaf5dc5f8..4bc6d7a5b 100644
--- a/cde/doc/it_IT.UTF-8/help/Iconed/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Infomgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Infomgr/book.sgm
index 37a247e7a..ef4e69695 100644
--- a/cde/doc/it_IT.UTF-8/help/Infomgr/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Intromgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Intromgr/book.sgm
index 20e327bcd..529357b31 100644
--- a/cde/doc/it_IT.UTF-8/help/Intromgr/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/LibDtPrint/book.sgm b/cde/doc/it_IT.UTF-8/help/LibDtPrint/book.sgm
index 032e0043f..b2b84fb7e 100644
--- a/cde/doc/it_IT.UTF-8/help/LibDtPrint/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Loginmgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Loginmgr/book.sgm
index 5315f458d..6b7adc873 100644
--- a/cde/doc/it_IT.UTF-8/help/Loginmgr/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Mailer/book.sgm b/cde/doc/it_IT.UTF-8/help/Mailer/book.sgm
index 5919612c5..2a0b1c91d 100644
--- a/cde/doc/it_IT.UTF-8/help/Mailer/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Makefile.am b/cde/doc/it_IT.UTF-8/help/Makefile.am
index 77e1508c2..7d67c8239 100644
--- a/cde/doc/it_IT.UTF-8/help/Makefile.am
+++ b/cde/doc/it_IT.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/Italian.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
diff --git a/cde/doc/it_IT.UTF-8/help/Printmgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Printmgr/book.sgm
index 7961241ca..5e9660076 100644
--- a/cde/doc/it_IT.UTF-8/help/Printmgr/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/PrnSetup/book.sgm b/cde/doc/it_IT.UTF-8/help/PrnSetup/book.sgm
index 08e358308..554ff6069 100644
--- a/cde/doc/it_IT.UTF-8/help/PrnSetup/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Stylemgr/book.sgm b/cde/doc/it_IT.UTF-8/help/Stylemgr/book.sgm
index fce3430a9..c79f44612 100644
--- a/cde/doc/it_IT.UTF-8/help/Stylemgr/book.sgm
+++ b/cde/doc/it_IT.UTF-8/help/Stylemgr/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/6 1996/06/19 17:05:02 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/it_IT.UTF-8/help/Terminal/book.sgm b/cde/doc/it_IT.UTF-8/help/Terminal/book.sgm
index 06c3c2d19..6915edd17 100644
--- a/cde/doc/it_IT.UTF-8/help/Terminal/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/Textedit/book.sgm b/cde/doc/it_IT.UTF-8/help/Textedit/book.sgm
index f711d008d..12a884e68 100644
--- a/cde/doc/it_IT.UTF-8/help/Textedit/book.sgm
+++ b/cde/doc/it_IT.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/it_IT.UTF-8/help/common/Desktop.hf b/cde/doc/it_IT.UTF-8/help/common/Desktop.hf
index 14e01bee8..4fc18bea5 100644
--- a/cde/doc/it_IT.UTF-8/help/common/Desktop.hf
+++ b/cde/doc/it_IT.UTF-8/help/common/Desktop.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Common Desktop Environment
-*.bitmap:       /usr/dt/appconfig/help/it_IT.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/it_IT.UTF-8/graphics/cdelogo.pm
 *.abstract:     Introduzione alle funzioni principali del desktop \
  * Uso dell'aiuto \
  * Gestione di applicazioni \
diff --git a/cde/doc/it_IT.UTF-8/help/common/DesktopIntro.hf b/cde/doc/it_IT.UTF-8/help/common/DesktopIntro.hf
index 1ef364599..1b47f2183 100644
--- a/cde/doc/it_IT.UTF-8/help/common/DesktopIntro.hf
+++ b/cde/doc/it_IT.UTF-8/help/common/DesktopIntro.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Introduzione alle funzioni principali del desktop
-*.bitmap:       /usr/dt/appconfig/help/it_IT.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/it_IT.UTF-8/graphics/cdelogo.pm
 *.abstract:     Introduzione alle funzioni principali del \
                 Common Desktop Environment.