diff --git a/ksgmltools/customization/ca/kde-prologue.entities b/ksgmltools/customization/ca/kde-prologue.entities
index 76aef78623..3ac8368ccc 100644
--- a/ksgmltools/customization/ca/kde-prologue.entities
+++ b/ksgmltools/customization/ca/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "ca">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//CA"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/cs/kde-prologue.entities b/ksgmltools/customization/cs/kde-prologue.entities
index 2479317647..5fac1b4629 100644
--- a/ksgmltools/customization/cs/kde-prologue.entities
+++ b/ksgmltools/customization/cs/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "cs">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//CS"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/da/kde-prologue.entities b/ksgmltools/customization/da/kde-prologue.entities
index 8fed566362..0f21117a5b 100644
--- a/ksgmltools/customization/da/kde-prologue.entities
+++ b/ksgmltools/customization/da/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "da">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//DA"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/de/kde-prologue.entities b/ksgmltools/customization/de/kde-prologue.entities
index 1f0674ddda..62423e69f8 100644
--- a/ksgmltools/customization/de/kde-prologue.entities
+++ b/ksgmltools/customization/de/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "de">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//DE"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/el/kde-prologue.entities b/ksgmltools/customization/el/kde-prologue.entities
index 151469c570..d9b232de8c 100644
--- a/ksgmltools/customization/el/kde-prologue.entities
+++ b/ksgmltools/customization/el/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "el">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//EL"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/en/kde-prologue.entities b/ksgmltools/customization/en/kde-prologue.entities
index 3103a16594..464ba8ccfe 100644
--- a/ksgmltools/customization/en/kde-prologue.entities
+++ b/ksgmltools/customization/en/kde-prologue.entities
@@ -1,47 +1,43 @@
 <!-- Do NOT change this file: it provides important defaults -->
 
 <!ENTITY language "en">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
+
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//EN"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
-<!-- Proposal (do not translate yet!) for string to update documentation -->
-<!ENTITY kde.update.documentation SYSTEM
-  "entities/update-doc.docbook"                     -- level: para -->
-
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/es/kde-prologue.entities b/ksgmltools/customization/es/kde-prologue.entities
index efb6b6c036..a7931dd8c5 100644
--- a/ksgmltools/customization/es/kde-prologue.entities
+++ b/ksgmltools/customization/es/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "es">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//ES"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/et/kde-prologue.entities b/ksgmltools/customization/et/kde-prologue.entities
index c130cc149e..3dcdacabf3 100644
--- a/ksgmltools/customization/et/kde-prologue.entities
+++ b/ksgmltools/customization/et/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "et">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//ET"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/fi/kde-prologue.entities b/ksgmltools/customization/fi/kde-prologue.entities
index 654f0388a1..611058c547 100644
--- a/ksgmltools/customization/fi/kde-prologue.entities
+++ b/ksgmltools/customization/fi/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "fi">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//FI"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/fr/kde-prologue.entities b/ksgmltools/customization/fr/kde-prologue.entities
index cb6819d981..693a229070 100644
--- a/ksgmltools/customization/fr/kde-prologue.entities
+++ b/ksgmltools/customization/fr/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "fr">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//FR"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/hu/kde-prologue.entities b/ksgmltools/customization/hu/kde-prologue.entities
index 3a20d7e4a7..7d8d644ca6 100644
--- a/ksgmltools/customization/hu/kde-prologue.entities
+++ b/ksgmltools/customization/hu/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "hu">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//HU"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/it/kde-prologue.entities b/ksgmltools/customization/it/kde-prologue.entities
index 14dcd25545..c28643105c 100644
--- a/ksgmltools/customization/it/kde-prologue.entities
+++ b/ksgmltools/customization/it/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "it">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//IT"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/ja/kde-prologue.entities b/ksgmltools/customization/ja/kde-prologue.entities
index 80f5b62051..d2e2e7b056 100644
--- a/ksgmltools/customization/ja/kde-prologue.entities
+++ b/ksgmltools/customization/ja/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "ja">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//JA"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/nl/kde-prologue.entities b/ksgmltools/customization/nl/kde-prologue.entities
index 987b1549d4..5838a0f261 100644
--- a/ksgmltools/customization/nl/kde-prologue.entities
+++ b/ksgmltools/customization/nl/kde-prologue.entities
@@ -1,41 +1,41 @@
 <!ENTITY language "nl">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
+
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//NL"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/no/kde-prologue.entities b/ksgmltools/customization/no/kde-prologue.entities
index 19d8205972..6bd6a778d1 100644
--- a/ksgmltools/customization/no/kde-prologue.entities
+++ b/ksgmltools/customization/no/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "no">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//NO"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/pl/kde-prologue.entities b/ksgmltools/customization/pl/kde-prologue.entities
index c7f036cef0..4749e72c0b 100644
--- a/ksgmltools/customization/pl/kde-prologue.entities
+++ b/ksgmltools/customization/pl/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "pl">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//PL"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/pt-BR/kde-prologue.entities b/ksgmltools/customization/pt-BR/kde-prologue.entities
index 5f359c74cb..c82e5153c1 100644
--- a/ksgmltools/customization/pt-BR/kde-prologue.entities
+++ b/ksgmltools/customization/pt-BR/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "pt-BR">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//PTBR"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/pt/kde-prologue.entities b/ksgmltools/customization/pt/kde-prologue.entities
index 4a9b048a70..9507a09e5f 100644
--- a/ksgmltools/customization/pt/kde-prologue.entities
+++ b/ksgmltools/customization/pt/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "pt">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//PT"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/ro/kde-prologue.entities b/ksgmltools/customization/ro/kde-prologue.entities
index 71c2dddc02..10a2bf4a0d 100644
--- a/ksgmltools/customization/ro/kde-prologue.entities
+++ b/ksgmltools/customization/ro/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "ro">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//RO"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/ru/kde-prologue.entities b/ksgmltools/customization/ru/kde-prologue.entities
index 8d2919ee1a..9557dbce13 100644
--- a/ksgmltools/customization/ru/kde-prologue.entities
+++ b/ksgmltools/customization/ru/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "ru">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//RU"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/sk/kde-prologue.entities b/ksgmltools/customization/sk/kde-prologue.entities
index 9097072541..471e2987fa 100644
--- a/ksgmltools/customization/sk/kde-prologue.entities
+++ b/ksgmltools/customization/sk/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "sk">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//SK"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/sl/kde-prologue.entities b/ksgmltools/customization/sl/kde-prologue.entities
index a4aa46cb68..b4f5b9f158 100644
--- a/ksgmltools/customization/sl/kde-prologue.entities
+++ b/ksgmltools/customization/sl/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "sl">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//SL"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/sr/kde-prologue.entities b/ksgmltools/customization/sr/kde-prologue.entities
index 1a3b0092b5..235d85583a 100644
--- a/ksgmltools/customization/sr/kde-prologue.entities
+++ b/ksgmltools/customization/sr/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "sr">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//SR"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/sv/kde-prologue.entities b/ksgmltools/customization/sv/kde-prologue.entities
index b6c7a99e2f..77645a892f 100644
--- a/ksgmltools/customization/sv/kde-prologue.entities
+++ b/ksgmltools/customization/sv/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "sv">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//SV"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;
diff --git a/ksgmltools/customization/zh-CN/kde-prologue.entities b/ksgmltools/customization/zh-CN/kde-prologue.entities
index 89dd2a0d54..ba60a52653 100644
--- a/ksgmltools/customization/zh-CN/kde-prologue.entities
+++ b/ksgmltools/customization/zh-CN/kde-prologue.entities
@@ -1,42 +1,41 @@
 <!ENTITY language "zh-CN">
 
 <!-- These entities should be translated, should therefore be stored
      separately. -->
 <!ENTITY % kde.translated.entities
                             SYSTEM "strings.entities"                >
 %kde.translated.entities;
 
 <!-- The following entities should only use &kappname; in their 
      text                                                          -->
 
 <!-- Licence links; see ksgmltools/TODO -->
 <!ENTITY underGPL           SYSTEM
   "entities/underGPL.docbook"                       -- level: para -->
 <!ENTITY underFDL           SYSTEM
   "entities/underFDL.docbook"                       -- level: para -->
 <!ENTITY underBSDLicense    SYSTEM
   "entities/underBSDLicense.docbook"                -- level: para -->
 <!ENTITY underArtisticLicense SYSTEM
   "entities/underArtisticLicense.docbook"           -- level: para -->
 <!ENTITY underX11License    SYSTEM
   "entities/underX11License.docbook"                -- level: para -->
 
-<!-- ONLY FOR BACKWARDS COMPATIBILITY: USE underGPL -->
-<!ENTITY license-links SYSTEM "entities/underGPL.docbook">
-
-<!ENTITY help-menu          SYSTEM
+<!ENTITY help.menu          SYSTEM
   "entities/help-menu.docbook"                         -- level: ? -->
-<!ENTITY report-bugs        SYSTEM
+<!ENTITY reporting.bugs     SYSTEM
   "entities/report-bugs.docbook"                       -- level: ? -->
+<!ENTITY updating.documentation SYSTEM
+  "entities/update-doc.docbook"                     -- level: para -->
 
 
 <!-- FDL notice -->
 <!ENTITY FDLNotice PUBLIC "-//KDE//DOCUMENT GNU Free Documentation Notice//ZHCN"
  -- meant to be included, so no NDATA or CDATA (why?) -->
 
 <!-- These entities may be extended by the authors and translators.
      They should therefore be stored separately.  Moreover, they MUST
      come last, to avoid overriding problems. -->
 <!ENTITY % kde.language.specific
                             SYSTEM "user.entities"                   >
 %kde.language.specific;