diff --git a/cde/doc/ja_JP.UTF-8/Imakefile b/cde/doc/ja_JP.UTF-8/Imakefile
deleted file mode 100644
index 0d6257f21..000000000
--- a/cde/doc/ja_JP.UTF-8/Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = guides help
-
-MakeSubdirs($(SUBDIRS))
-
-clean::
- $(RM) -r help-sdl cde.dti
diff --git a/cde/doc/ja_JP.UTF-8/Makefile.am b/cde/doc/ja_JP.UTF-8/Makefile.am
new file mode 100644
index 000000000..a2334dbfc
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = help guides
diff --git a/cde/doc/ja_JP.UTF-8/guides/Imakefile b/cde/doc/ja_JP.UTF-8/guides/Imakefile
deleted file mode 100644
index b8da3f26a..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/8 1996/12/17 05:24:20 cde-hit $
-
-#define InfoLibDesc "CDE and Motif Information Library"
-#define HasusersGuide
-#define HasinfoUGuide
-#define HasinfoAPGuide
-#define HassysAdminGuide
-#define HasprogGuide
-#define HasbuilderGuide
-#define HasdtkshGuide
-#define Hasglossary
-#define Hasi18nGuide
-#define HasprogOview
-#define HasttGuide
-#define HashelpGuide
-#define HasdocbookGuide
-
-#include "../../../programs/localized/templates/Japanese.tmpl"
-#include "../../common/guides/Imakefile.tmpl"
diff --git a/cde/doc/ja_JP.UTF-8/guides/Makefile.am b/cde/doc/ja_JP.UTF-8/guides/Makefile.am
new file mode 100644
index 000000000..cdd949b65
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/Makefile.am
@@ -0,0 +1,70 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INFOLIBDESC = "CDE and Motif Information Library"
+
+# 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/Japanese.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/infoAPGuide.am
+include $(top_srcdir)/doc/common/guides/sysAdminGuide.am
+include $(top_srcdir)/doc/common/guides/progGuide.am
+include $(top_srcdir)/doc/common/guides/builderGuide.am
+include $(top_srcdir)/doc/common/guides/dtkshGuide.am
+include $(top_srcdir)/doc/common/guides/glossary.am
+include $(top_srcdir)/doc/common/guides/i18nGuide.am
+include $(top_srcdir)/doc/common/guides/progOview.am
+include $(top_srcdir)/doc/common/guides/ttGuide.am
+include $(top_srcdir)/doc/common/guides/helpGuide.am
+include $(top_srcdir)/doc/common/guides/docbookGuide.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.d01 \
+ ../cde.dti/CDEDOC/dtsearch/CDEDOC.d23 \
+ ../cde.dti/CDEDOC/dtsearch/CDEDOC.k00 \
+ ../cde.dti/CDEDOC/dtsearch/CDEDOC.k22 \
+ ../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/CDEDOC.knj \
+ ../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/ja_JP.UTF-8/guides/builderGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/builderGuide/Title.am
new file mode 100644
index 000000000..38b3ae1ed
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/builderGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:02:53 drk $
+# TOC title, only what's between quotes should be modified.
+BUILDERGUIDE_TITLE = "共通デスクトップ環境 アプリケーション・ビルダ ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/builderGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/builderGuide/Title.tmpl
deleted file mode 100644
index 70464261b..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/builderGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:02:53 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 アプリケーション・ビルダ ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/builderGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/builderGuide/book.sgm
index 73d7b3658..53c741444 100644
--- a/cde/doc/ja_JP.UTF-8/guides/builderGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/builderGuide/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.am
new file mode 100644
index 000000000..05e2c2ca2
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:03 drk $
+# TOC title, only what's between quotes should be modified.
+DOCBOOKGUIDE_TITLE = "共通デスクトップ環境 DocBook 文書型定義ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.tmpl
deleted file mode 100644
index ddc522063..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/docbookGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:03 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 DocBook 文書型定義ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/docbookGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/docbookGuide/book.sgm
index 43d47db69..c265e6850 100644
--- a/cde/doc/ja_JP.UTF-8/guides/docbookGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/docbookGuide/book.sgm
@@ -1,13 +1,13 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOalatin1;
diff --git a/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.am
new file mode 100644
index 000000000..260153860
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:17 drk $
+# TOC title, only what's between quotes should be modified.
+DTKSHGUIDE_TITLE = "共通デスクトップ環境 デスクトップ KornShell ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.tmpl
deleted file mode 100644
index f040662b8..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:17 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 デスクトップ KornShell ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/book.sgm
index 5d670274c..300581418 100644
--- a/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/dtkshGuide/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/glossary/Title.am b/cde/doc/ja_JP.UTF-8/guides/glossary/Title.am
new file mode 100644
index 000000000..70b8f1e74
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/glossary/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:29 drk $
+# TOC title, only what's between quotes should be modified.
+GLOSSARY_TITLE = "共通デスクトップ環境 用語集"
diff --git a/cde/doc/ja_JP.UTF-8/guides/glossary/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/glossary/Title.tmpl
deleted file mode 100644
index 8afdc7386..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/glossary/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:29 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 用語集"
diff --git a/cde/doc/ja_JP.UTF-8/guides/glossary/book.sgm b/cde/doc/ja_JP.UTF-8/guides/glossary/book.sgm
index db98925fb..90a47ffa6 100644
--- a/cde/doc/ja_JP.UTF-8/guides/glossary/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/glossary/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.am
new file mode 100644
index 000000000..1f529b10a
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:46 drk $
+# TOC title, only what's between quotes should be modified.
+HELPGUIDE_TITLE = "共通デスクトップ環境 ヘルプ・システム設計者およびプログラマのためのガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.tmpl
deleted file mode 100644
index 37b08a4a9..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/helpGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:46 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 ヘルプ・システム設計者およびプログラマのためのガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/helpGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/helpGuide/book.sgm
index ee469aa9e..634cf7e14 100644
--- a/cde/doc/ja_JP.UTF-8/guides/helpGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/helpGuide/book.sgm
@@ -1,43 +1,43 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOAMSAR;
-
+
%ISOAMSBO;
-
+
%ISOAMSO;
-
+
%ISOAMSR;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOgreekletters;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/helpGuide/ch03.sgm b/cde/doc/ja_JP.UTF-8/guides/helpGuide/ch03.sgm
index e5f0e8b8e..cf02c5f8b 100644
--- a/cde/doc/ja_JP.UTF-8/guides/helpGuide/ch03.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/helpGuide/ch03.sgm
@@ -539,14 +539,14 @@ Do not place your fingers near the parrot cage!
例
著作権の記号 (©) のエンティティは、ISO numeric set に含まれるので、まず ISO numeric set を（他のエンティティ宣言とともにヘルプ・ボリュームのトップに）、次に示すように取り込まなければなりません。
-<!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;
このようにすれば、著作権の記号が現われる場所で、次に示すエンティティ参照を指定することができます。
©
大文字のギリシャ文字のシグマ (∑) を表示するには、まず ISO Greek エンティティを（他のエンティティ宣言とともにヘルプ・ボリュームのトップに）、次に示すように取り込まなければなりません。
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
%ISOgreek;
このようにすれば、シグマ文字が現われる場所で、次に示すエンティティ参照を指定することができます。
diff --git a/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.am
new file mode 100644
index 000000000..686019c0b
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:55 drk $
+# TOC title, only what's between quotes should be modified.
+I18NGUIDE_TITLE = "共通デスクトップ環境 国際化対応プログラマーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.tmpl
deleted file mode 100644
index cd6aa0d39..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/i18nGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:55 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 国際化対応プログラマーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/i18nGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/i18nGuide/book.sgm
index a2b973b38..caeb669e3 100644
--- a/cde/doc/ja_JP.UTF-8/guides/i18nGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/i18nGuide/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.am b/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.am
new file mode 100644
index 000000000..75c774af8
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/1 1996/09/22 13:54:15 rws $
+# TOC title, only what's between quotes should be modified.
+INFOAPGUIDE_TITLE = "共通デスクトップ環境 インフォメーション・システム設計者およびプログラマのためのガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.tmpl
deleted file mode 100644
index 1521fd523..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/infoAPg/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/1 1996/09/22 13:54:15 rws $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 インフォメーション・システム設計者およびプログラマのためのガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoAPg/book.sgm b/cde/doc/ja_JP.UTF-8/guides/infoAPg/book.sgm
index 0559c77f6..fec4bcfb4 100644
--- a/cde/doc/ja_JP.UTF-8/guides/infoAPg/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/infoAPg/book.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.am b/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.am
new file mode 100644
index 000000000..b8393b3d6
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/1 1996/08/03 11:34:45 rws $
+# TOC title, only what's between quotes should be modified.
+INFOUGUIDE_TITLE = "共通デスクトップ環境 インフォメーション・マネージャ ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.tmpl
deleted file mode 100644
index 574cf6fe9..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/infoUGd/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/1 1996/08/03 11:34:45 rws $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 インフォメーション・マネージャ ユーザーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/infoUGd/book.sgm b/cde/doc/ja_JP.UTF-8/guides/infoUGd/book.sgm
index ffe7ecf44..614549059 100644
--- a/cde/doc/ja_JP.UTF-8/guides/infoUGd/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/infoUGd/book.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.am
new file mode 100644
index 000000000..301d51c1a
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:02 drk $
+# TOC title, only what's between quotes should be modified.
+PROGGUIDE_TITLE = "共通デスクトップ環境 プログラマーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.tmpl
deleted file mode 100644
index aa9cd653d..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/progGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:02 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 プログラマーズ・ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/progGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/progGuide/book.sgm
index b02e502bb..f725f3293 100644
--- a/cde/doc/ja_JP.UTF-8/guides/progGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/progGuide/book.sgm
@@ -2,31 +2,31 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOaddedMath;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/progOview/Title.am b/cde/doc/ja_JP.UTF-8/guides/progOview/Title.am
new file mode 100644
index 000000000..ff1e45210
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/progOview/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:23 drk $
+# TOC title, only what's between quotes should be modified.
+PROGOVIEW_TITLE = "共通デスクトップ環境 プログラマ概要"
diff --git a/cde/doc/ja_JP.UTF-8/guides/progOview/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/progOview/Title.tmpl
deleted file mode 100644
index 5de998d9d..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/progOview/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:23 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 プログラマ概要"
diff --git a/cde/doc/ja_JP.UTF-8/guides/progOview/book.sgm b/cde/doc/ja_JP.UTF-8/guides/progOview/book.sgm
index a7fe21ec4..e1d28183b 100644
--- a/cde/doc/ja_JP.UTF-8/guides/progOview/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/progOview/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.am
new file mode 100644
index 000000000..9b26815bb
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:46 drk $
+# TOC title, only what's between quotes should be modified.
+SYSADMINGUIDE_TITLE = "共通デスクトップ環境 上級ユーザおよびシステム管理者ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.tmpl
deleted file mode 100644
index d280be861..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/3 1996/12/17 06:26:03 cde-hit $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 上級ユーザおよびシステム管理者ガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/book.sgm
index d57c37217..e0c8f92d9 100644
--- a/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/sysAdminGuide/book.sgm
@@ -2,31 +2,31 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOgreekletters;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.am
new file mode 100644
index 000000000..d8f5c1abe
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:00 drk $
+# TOC title, only what's between quotes should be modified.
+TTGUIDE_TITLE = "共通デスクトップ環境 ToolTalk メッセージの概要"
diff --git a/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.tmpl
deleted file mode 100644
index e17668562..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/ttGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:00 drk $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 ToolTalk メッセージの概要"
diff --git a/cde/doc/ja_JP.UTF-8/guides/ttGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/ttGuide/book.sgm
index 86e74758a..035a82eaa 100644
--- a/cde/doc/ja_JP.UTF-8/guides/ttGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/ttGuide/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/guides/usersGuide/Title.am b/cde/doc/ja_JP.UTF-8/guides/usersGuide/Title.am
new file mode 100644
index 000000000..3e344ce00
--- /dev/null
+++ b/cde/doc/ja_JP.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 = "共通デスクトップ環境 ユーザーズガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/usersGuide/Title.tmpl b/cde/doc/ja_JP.UTF-8/guides/usersGuide/Title.tmpl
deleted file mode 100644
index 4bb36d70a..000000000
--- a/cde/doc/ja_JP.UTF-8/guides/usersGuide/Title.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XConsortium: Title.tmpl /main/3 1996/12/17 06:39:29 cde-hit $ */
-/* TOC title, only what's between quotes should be modified. */
-title = "共通デスクトップ環境 ユーザーズガイド"
diff --git a/cde/doc/ja_JP.UTF-8/guides/usersGuide/book.sgm b/cde/doc/ja_JP.UTF-8/guides/usersGuide/book.sgm
index ce43d61fb..e29166311 100644
--- a/cde/doc/ja_JP.UTF-8/guides/usersGuide/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/guides/usersGuide/book.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/AppBuilder/book.sgm b/cde/doc/ja_JP.UTF-8/help/AppBuilder/book.sgm
index a97b08996..7d99462a8 100644
--- a/cde/doc/ja_JP.UTF-8/help/AppBuilder/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/AppBuilder/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Appmanager/book.sgm b/cde/doc/ja_JP.UTF-8/help/Appmanager/book.sgm
index 6b009b16a..916c921f2 100644
--- a/cde/doc/ja_JP.UTF-8/help/Appmanager/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Appmanager/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Calculator/book.sgm b/cde/doc/ja_JP.UTF-8/help/Calculator/book.sgm
index 13a64680e..3d334e997 100644
--- a/cde/doc/ja_JP.UTF-8/help/Calculator/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Calculator/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Calendar/book.sgm b/cde/doc/ja_JP.UTF-8/help/Calendar/book.sgm
index e2054b82d..7adf67791 100644
--- a/cde/doc/ja_JP.UTF-8/help/Calendar/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Calendar/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/CreatAct/book.sgm b/cde/doc/ja_JP.UTF-8/help/CreatAct/book.sgm
index 0d0dac3b9..35cb371ff 100644
--- a/cde/doc/ja_JP.UTF-8/help/CreatAct/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/CreatAct/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/FPanel/book.sgm b/cde/doc/ja_JP.UTF-8/help/FPanel/book.sgm
index 67dafaa77..1440ce9c4 100644
--- a/cde/doc/ja_JP.UTF-8/help/FPanel/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/FPanel/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Filemgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Filemgr/book.sgm
index bf94de7c2..674114235 100644
--- a/cde/doc/ja_JP.UTF-8/help/Filemgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Filemgr/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Help4Help/Help4Help.sgm b/cde/doc/ja_JP.UTF-8/help/Help4Help/Help4Help.sgm
index 1322c1e82..475157cb7 100644
--- a/cde/doc/ja_JP.UTF-8/help/Help4Help/Help4Help.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Help4Help/Help4Help.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Help4Help/book.sgm b/cde/doc/ja_JP.UTF-8/help/Help4Help/book.sgm
index ff8e51327..a8b89f1ef 100644
--- a/cde/doc/ja_JP.UTF-8/help/Help4Help/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Help4Help/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Iconed/book.sgm b/cde/doc/ja_JP.UTF-8/help/Iconed/book.sgm
index 0520fc49a..2cca1c680 100644
--- a/cde/doc/ja_JP.UTF-8/help/Iconed/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Iconed/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Imakefile b/cde/doc/ja_JP.UTF-8/help/Imakefile
deleted file mode 100644
index fbf4cb5ef..000000000
--- a/cde/doc/ja_JP.UTF-8/help/Imakefile
+++ /dev/null
@@ -1,29 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/12/18 01:57:15 cde-hit $
-
-#define HasAppmanager
-#define HasAppBuilder
-#define HasCalculator
-#define HasCalendar
-#define HasCreatAct
-#define HasFPanel
-#define HasFilemgr
-#define HasHelp4Help
-#define HasIconed
-#define HasInfomgr
-#define HasIntromgr
-#define HasLibDtPrint
-#define HasLoginmgr
-#define HasMailer
-#define HasPrintmgr
-#define HasPrnSetup
-#define HasStylemgr
-#define HasTerminal
-#define HasTextedit
-
-#include "../../../programs/localized/templates/Japanese.tmpl"
-#include "../../common/help/Imakefile.tmpl"
-
-HF_INSTALLATION_TOP = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)
-
-CppSourceFile(common/Desktop.hf,common/Desktop.src,$(HF_INSTALLATION_TOP),)
-CppSourceFile(common/DesktopIntro.hf,common/DesktopIntro.src,$(HF_INSTALLATION_TOP),)
diff --git a/cde/doc/ja_JP.UTF-8/help/Infomgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Infomgr/book.sgm
index e84949ce1..7c5941c3d 100644
--- a/cde/doc/ja_JP.UTF-8/help/Infomgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Infomgr/book.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Intromgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Intromgr/book.sgm
index 0bd214e00..1a8cdf679 100644
--- a/cde/doc/ja_JP.UTF-8/help/Intromgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Intromgr/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/LibDtPrint/book.sgm b/cde/doc/ja_JP.UTF-8/help/LibDtPrint/book.sgm
index 0aa079389..a7f2c2b54 100644
--- a/cde/doc/ja_JP.UTF-8/help/LibDtPrint/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/LibDtPrint/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Loginmgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Loginmgr/book.sgm
index 93d7b4ea2..e550b24d2 100644
--- a/cde/doc/ja_JP.UTF-8/help/Loginmgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Loginmgr/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Mailer/book.sgm b/cde/doc/ja_JP.UTF-8/help/Mailer/book.sgm
index 80b38d22a..6725a9773 100644
--- a/cde/doc/ja_JP.UTF-8/help/Mailer/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Mailer/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Makefile.am b/cde/doc/ja_JP.UTF-8/help/Makefile.am
new file mode 100644
index 000000000..07efd0547
--- /dev/null
+++ b/cde/doc/ja_JP.UTF-8/help/Makefile.am
@@ -0,0 +1,10 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+APPBUILDER = AppBuilder.sdl
+
+# this sets the LANG variables
+include $(top_srcdir)/programs/localized/templates/Japanese.am
+# this does all the work
+include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am
diff --git a/cde/doc/ja_JP.UTF-8/help/Printmgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Printmgr/book.sgm
index dfea6e2e0..6a4d72d3e 100644
--- a/cde/doc/ja_JP.UTF-8/help/Printmgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Printmgr/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/PrnSetup/book.sgm b/cde/doc/ja_JP.UTF-8/help/PrnSetup/book.sgm
index 64df90a54..13186fe1d 100644
--- a/cde/doc/ja_JP.UTF-8/help/PrnSetup/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/PrnSetup/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Stylemgr/book.sgm b/cde/doc/ja_JP.UTF-8/help/Stylemgr/book.sgm
index bc23d6d36..ea90568dc 100644
--- a/cde/doc/ja_JP.UTF-8/help/Stylemgr/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Stylemgr/book.sgm
@@ -1,28 +1,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Terminal/book.sgm b/cde/doc/ja_JP.UTF-8/help/Terminal/book.sgm
index 2cf9c0273..ad4c5982e 100644
--- a/cde/doc/ja_JP.UTF-8/help/Terminal/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Terminal/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/Textedit/book.sgm b/cde/doc/ja_JP.UTF-8/help/Textedit/book.sgm
index 8eb780d95..7bbd25640 100644
--- a/cde/doc/ja_JP.UTF-8/help/Textedit/book.sgm
+++ b/cde/doc/ja_JP.UTF-8/help/Textedit/book.sgm
@@ -2,28 +2,28 @@
+
%ISOpublishing;
-
+
%ISOnumeric;
-
+
%ISOdiacritical;
-
+
%ISOgeneraltech;
-
+
%ISOalatin1;
-
+
%ISOalatin2;
-
+
%ISOgreek;
-
+
%ISOboxandline;
diff --git a/cde/doc/ja_JP.UTF-8/help/common/Desktop.src b/cde/doc/ja_JP.UTF-8/help/common/Desktop.hf.in
similarity index 94%
rename from cde/doc/ja_JP.UTF-8/help/common/Desktop.src
rename to cde/doc/ja_JP.UTF-8/help/common/Desktop.hf.in
index fc11033bf..dcfc80e50 100644
--- a/cde/doc/ja_JP.UTF-8/help/common/Desktop.src
+++ b/cde/doc/ja_JP.UTF-8/help/common/Desktop.hf.in
@@ -16,7 +16,7 @@
*.charSet: ja_JP.UTF-8
*.title: 共通デスクトップ環境
-*.bitmap: CDE_INSTALLATION_TOP/appconfig/help/ja_JP.UTF-8/graphics/cdelogo.pm
+*.bitmap: @prefix@/appconfig/help/ja_JP.UTF-8/graphics/cdelogo.pm
*.abstract: 概要と基本的なデスクトップのスキル \
* ヘルプの使い方 \
* アプリケーション・ビルダ \
diff --git a/cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.src b/cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.hf.in
similarity index 90%
rename from cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.src
rename to cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.hf.in
index 4a0a0c9d2..141085f79 100644
--- a/cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.src
+++ b/cde/doc/ja_JP.UTF-8/help/common/DesktopIntro.hf.in
@@ -16,7 +16,7 @@
*.charSet: ja_JP.UTF-8
*.title: 概要と基本的なデスクトップのスキル
-*.bitmap: CDE_INSTALLATION_TOP/appconfig/help/ja_JP.UTF-8/graphics/cdelogo.pm
+*.bitmap: @prefix@/appconfig/help/ja_JP.UTF-8/graphics/cdelogo.pm
*.abstract: 共通デスクトップ環境の \
概要と基本的なデスクトップのスキル