diff --git a/admin b/admin
index 06098efaf..4af57bf22 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
+Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
diff --git a/cmake b/cmake
index e47cc63e6..d2f658ca4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc
+Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
diff --git a/doc/userguide/base-kde-applications.docbook b/doc/userguide/base-tde-applications.docbook
similarity index 99%
rename from doc/userguide/base-kde-applications.docbook
rename to doc/userguide/base-tde-applications.docbook
index ca4da8fc3..85ed6283a 100644
--- a/doc/userguide/base-kde-applications.docbook
+++ b/doc/userguide/base-tde-applications.docbook
@@ -286,7 +286,7 @@
Office
-This includes all applications in the &koffice; suite. See for a summary of the components.
+This includes all applications in the &koffice; suite. See for a summary of the components.
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index cf1b81690..cc1872d2e 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -24,7 +24,7 @@ The &tde; Team thanks and acknowledges the original &kde; contributors of this g
-Wrote the notes which became .
+Wrote the notes which became .
@@ -91,7 +91,7 @@ The &tde; Team thanks and acknowledges the original &kde; contributors of this g
Wrote .
Wrote .
Wrote .
- Re-wrote .
+ Re-wrote .
Wrote .
@@ -207,7 +207,7 @@ linkend="file-manager"/> and .
Wrote .
-Marked up parts of .
+Marked up parts of .
@@ -271,7 +271,7 @@ linkend="file-manager"/> and .
Wrote .
Marked up parts of .
+linkend="tde-for-administrators"/>.
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index 61dfd2b5d..d09af55f1 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -13,14 +13,14 @@
-
+
-
-
+
+
@@ -32,7 +32,7 @@
-
+
@@ -41,8 +41,8 @@
-
-
+
+
@@ -264,14 +264,14 @@ here, but there's a taster of both of them in this part of the User
Guide. At the end of this part are suggestions for tweaking &tde;
in .
- highlights &tde;'s suite of
+ highlights &tde;'s suite of
Internet applications. &tde; includes a powerful web browser,
&konqueror;, a full-featured email client, &kmail;, a news reader,
&knode;, and many more applications to use the Internet.
This part of the User Guide contains
information about configuring these applications.
- is a reference guide to
+ is a reference guide to
some &tde; features that are useful to administrators configuring
multi-user systems. This part also has information that might be useful
to &tde; users with single-user systems: where configuration files are
@@ -444,7 +444,7 @@ by entering help:/tdm in &konqueror;'s
&control-center;
-&base-kde-applications;
+&base-tde-applications;
&extragear-applications;
@@ -464,9 +464,9 @@ by entering help:/tdm in &konqueror;'s
&tde; the Multiuser Desktop
-&your-kde-account;
+&your-tde-account;
-&kde-as-root;
+&tde-as-root;
&switching-sessions;
@@ -499,14 +499,14 @@ by entering help:/tdm in &konqueror;'s
&konsole-intro;
-&kde-edutainment;
+&tde-edutainment;
&accessibility;
&under-the-hood;
-
+
&tde; and the Internet
&net-connection-setup;
@@ -529,9 +529,9 @@ by entering help:/tdm in &konqueror;'s
-&kde-office;
+&tde-office;
-&kde-for-admins;
+&tde-for-admins;
More Tools
diff --git a/doc/userguide/kde-as-root.docbook b/doc/userguide/tde-as-root.docbook
similarity index 100%
rename from doc/userguide/kde-as-root.docbook
rename to doc/userguide/tde-as-root.docbook
diff --git a/doc/userguide/kde-edutainment.docbook b/doc/userguide/tde-edutainment.docbook
similarity index 99%
rename from doc/userguide/kde-edutainment.docbook
rename to doc/userguide/tde-edutainment.docbook
index e5e7f7a4c..ff865921e 100644
--- a/doc/userguide/kde-edutainment.docbook
+++ b/doc/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-
+
-
+
Features
This list gives a general outline of the &koffice; features.
@@ -103,7 +103,7 @@ The &koffice; office suite is too large to list every detail.
-
+
OASIS OpenDocument file format
It is important for an office suite to use standards where possible,
@@ -126,21 +126,21 @@ actually use the OASIS OpenDocument file format.
-
+
&koffice; Components Overview
Keep in mind that all these components can integrate very well into each other. So basically a spreadsheet can contain anything from charts to presentations, reports and even text documents. Likewise almost any component can contain almost any other.
@@ -281,10 +281,10 @@ actually use the OASIS OpenDocument file format.
-
+
Further Information
-
+
Application Manuals
Each Koffice component comes with its own manual.
These manuals offer all the latest information about the
@@ -293,7 +293,7 @@ read to learn more about &koffice;. The application manuals can be accessed by u
also a good place to find out more; it is at http://www.koffice.org.
-
+
Internet Resources
The primary site on the internet is
http://www.koffice.org
@@ -304,7 +304,7 @@ found at http://www.kexi-project.org
-
+
Plugin development
&koffice; can easily be extended with plugins. Plugin development is
not very difficult and can be used to optimize your everyday workflow. Such
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index e42b06da9..050fae8a0 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -88,7 +88,7 @@ configuration file.
Related Information
- has more
+ has more
information about &tde;'s directory structure, to help you find the
file you need to edit.
diff --git a/doc/userguide/your-kde-account.docbook b/doc/userguide/your-tde-account.docbook
similarity index 97%
rename from doc/userguide/your-kde-account.docbook
rename to doc/userguide/your-tde-account.docbook
index 536e01966..3b189f7bd 100644
--- a/doc/userguide/your-kde-account.docbook
+++ b/doc/userguide/your-tde-account.docbook
@@ -52,7 +52,7 @@ TDEDIR=/usr/local/kde,/home/phil/kde if you use sh.
Related Information
- contains
+ contains
more information about the directories that &tde; uses.