diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/faq/webbrowse.docbook | 2 | ||||
-rw-r--r-- | doc/glossary/index.docbook | 6 | ||||
-rw-r--r-- | doc/glossary/tdeprintingglossary.docbook | 2 | ||||
-rw-r--r-- | doc/kcontrol/filemanager/index.docbook | 2 | ||||
-rw-r--r-- | doc/kcontrol/kcmcss/index.docbook | 2 | ||||
-rw-r--r-- | doc/kcontrol/khtml/Makefile.am | 2 | ||||
-rw-r--r-- | doc/kcontrol/spellchecking/index.docbook | 4 | ||||
-rw-r--r-- | doc/kcontrol/tdehtml/CMakeLists.txt (renamed from doc/kcontrol/khtml/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | doc/kcontrol/tdehtml/Makefile.am | 2 | ||||
-rw-r--r-- | doc/kcontrol/tdehtml/index.docbook (renamed from doc/kcontrol/khtml/index.docbook) | 2 | ||||
-rw-r--r-- | doc/kcontrol/tdehtml/nsplugin.docbook (renamed from doc/kcontrol/khtml/nsplugin.docbook) | 0 | ||||
-rw-r--r-- | doc/konqueror/config.docbook | 2 | ||||
-rw-r--r-- | doc/userguide/groupware-kontact.docbook | 4 | ||||
-rw-r--r-- | doc/userguide/tde-for-admins.docbook | 12 | ||||
-rw-r--r-- | doc/userguide/tde-office.docbook | 2 |
15 files changed, 23 insertions, 23 deletions
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook index d1ee69240..bfa9b59cd 100644 --- a/doc/faq/webbrowse.docbook +++ b/doc/faq/webbrowse.docbook @@ -206,7 +206,7 @@ text->html in the tree view.</para> <listitem><para>Click on the <guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click Action</guilabel> is set to <guilabel>Show file in embedded -viewer</guilabel>, and that <guilabel>KHTML (khtml)</guilabel> is at the top +viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top of <guilabel>Services Preference Order</guilabel>.</para></listitem> </orderedlist> </para> diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook index 7032e511d..f8b7d46c2 100644 --- a/doc/glossary/index.docbook +++ b/doc/glossary/index.docbook @@ -33,7 +33,7 @@ Slave</glossseealso> <glossseealso otherterm="gloss-kde">&tde;</glossseealso> </glossdef> </glossentry> - <glossentry id="gloss-kparts"> + <glossentry id="gloss-tdeparts"> <glossterm>KParts</glossterm> <glossdef><para>KParts is an embedding technology which allows &tde; applications to embed other &tde; applications. For example, the text @@ -41,7 +41,7 @@ Slave</glossseealso> <glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso> </glossdef> </glossentry> - <glossentry id="gloss-ksycoca"> + <glossentry id="gloss-tdesycoca"> <glossterm><acronym>KSycoca</acronym></glossterm> <glossdef><para><acronym>KSycoca</acronym> (&tde; <emphasis>Sy</emphasis>stem <emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a @@ -88,7 +88,7 @@ program and regenerates the or all modules in &kcontrol; are missing.</para> <glossseealso -otherterm="gloss-ksycoca"><acronym>KSycoca</acronym></glossseealso> +otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso> <glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso> </glossdef> </glossentry> diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook index ac33e1943..2cc77e57f 100644 --- a/doc/glossary/tdeprintingglossary.docbook +++ b/doc/glossary/tdeprintingglossary.docbook @@ -1134,7 +1134,7 @@ now. address gives administrative access to TDEPrint. Konqueror uses &tde;'s famous "KParts" technology to achieve that.</para> <glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso> - <glossseealso otherterm="gloss-kparts">KParts</glossseealso> + <glossseealso otherterm="gloss-tdeparts">KParts</glossseealso> </glossdef> </glossentry> diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index a9aa9ab5a..26cc11ac5 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -29,7 +29,7 @@ &konqueror;'s file manager functionality.</para> <note><para>&konqueror;'s web browser functionality has its <ulink -url="help:/kcontrol/khtml/index.html">own configuration +url="help:/kcontrol/tdehtml/index.html">own configuration modules</ulink>.</para></note> <sect2 id="fileman-use"> diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index 113c2fe19..8560fa8a7 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced vision.</para> <para>Your choices here affect every &tde; application that renders HTML -with &tde;'s own renderer, which is called khtml. These include +with &tde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;.</para> diff --git a/doc/kcontrol/khtml/Makefile.am b/doc/kcontrol/khtml/Makefile.am deleted file mode 100644 index c54c99e96..000000000 --- a/doc/kcontrol/khtml/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -KDE_LANG = en -KDE_DOCS = kcontrol/khtml diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook index 813aba96a..2893d750b 100644 --- a/doc/kcontrol/spellchecking/index.docbook +++ b/doc/kcontrol/spellchecking/index.docbook @@ -30,7 +30,7 @@ <title>Spell Checker</title> <para>The configuration options available here are used by all &tde; -applications that use &kspell;, which is a front end to +applications that use &tdespell;, which is a front end to <command>ispell</command> or <command>aspell</command>.</para> <variablelist> @@ -57,7 +57,7 @@ error.</para></listitem> <term><guilabel>Dictionary:</guilabel></term> <listitem> <para>Choose from the available dictionaries, which one to use for -&kspell;.</para> +&tdespell;.</para> </listitem> </varlistentry> diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/doc/kcontrol/tdehtml/CMakeLists.txt index dda61f78d..b7e6bb6b7 100644 --- a/doc/kcontrol/khtml/CMakeLists.txt +++ b/doc/kcontrol/tdehtml/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kcontrol/khtml ) +tde_create_handbook( DESTINATION kcontrol/tdehtml ) diff --git a/doc/kcontrol/tdehtml/Makefile.am b/doc/kcontrol/tdehtml/Makefile.am new file mode 100644 index 000000000..07d632f49 --- /dev/null +++ b/doc/kcontrol/tdehtml/Makefile.am @@ -0,0 +1,2 @@ +KDE_LANG = en +KDE_DOCS = kcontrol/tdehtml diff --git a/doc/kcontrol/khtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook index 386df55fd..b8df24598 100644 --- a/doc/kcontrol/khtml/index.docbook +++ b/doc/kcontrol/tdehtml/index.docbook @@ -305,7 +305,7 @@ creates one.</para> </sect2> -<sect2 id="khtml-adblock"> +<sect2 id="tdehtml-adblock"> <title>AdBlocK</title> <para>&konqueror; AdBlocK can be configured to replace or remove diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook index 958a8f1a1..958a8f1a1 100644 --- a/doc/kcontrol/khtml/nsplugin.docbook +++ b/doc/kcontrol/tdehtml/nsplugin.docbook diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook index a8958166d..90a1a5212 100644 --- a/doc/konqueror/config.docbook +++ b/doc/konqueror/config.docbook @@ -48,7 +48,7 @@ position and icon size</para> Toolbars...</guimenuitem></menuchoice> option, which brings up the <guilabel>Configure Toolbars</guilabel> dialog box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar <&konqueror;>, Main -Toolbar <khtmlpart> and Extra Toolbar <khtmlsettingsplugin>. The +Toolbar <tdehtmlpart> and Extra Toolbar <tdehtmlsettingsplugin>. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed.</para> diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook index 445a26da5..8a1b81c00 100644 --- a/doc/userguide/groupware-kontact.docbook +++ b/doc/userguide/groupware-kontact.docbook @@ -242,7 +242,7 @@ class="username">groupware</systemitem> user (already previously done!)</para></step> <step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail; -for login as that user</para></step> <step><para>Use kresources to make +for login as that user</para></step> <step><para>Use tderesources to make &kontact; components work with data taken from <acronym>IMAP</acronym> source</para></step> @@ -336,7 +336,7 @@ slow data updates.</para> <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the data source for it's various components. From the &kmenu;, choose <guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell -kresources</command></userinput>. In the combo box select +tderesources</command></userinput>. In the combo box select <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton> button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and press <guibutton>Use as Standard</guibutton> button. Do the same for diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 6a49a129a..872191714 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -858,7 +858,7 @@ also unique per X-server display. The processes are:</para> <varlistentry> <term><command>kded</command></term> <listitem><para>Generic service daemon.</para> -<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when +<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when needed</para> </listitem> </varlistentry> @@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename> (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para> </sect2> -<sect2 id="ksycoca"> +<sect2 id="tdesycoca"> <title><application>KSycoca</application></title> <para><application>KSycoca</application> caches menu structure and information about all available applications. You can rebuild the database with <userinput><command>kbuildsycoca</command></userinput>. The database which is built lives in <filename -class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>. +class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>. It is automatically updated by <application>KDED</application>, checked during &tde; login, and <application>KDED</application> watches for changes while logged in.</para> @@ -1839,7 +1839,7 @@ CheckSycoca=false </programlisting> </para> -<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para> +<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para> </sect2> @@ -2031,7 +2031,7 @@ shell_access=false</screen> <para>Since this affects the &tde; menu and the available applications, we must force an update of the sycoca database:</para> -<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen> +<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen> <para>Now re-login to &tde; and check the following points:</para> @@ -2488,7 +2488,7 @@ KDebug MainApplication-Interface konsole (default) konsole-mainwindow#1 -ksycoca +tdesycoca session-1 session-2 session-3 diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook index 73e4cc313..28e089b3d 100644 --- a/doc/userguide/tde-office.docbook +++ b/doc/userguide/tde-office.docbook @@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format. <!-- comment out for final commit before freeze <chapter id="tde-office-embedding"> <title>Component Embedding</title> -<sect1 id="tde-office-kparts"> +<sect1 id="tde-office-tdeparts"> <title>KParts and &koffice;</title> <para>To be written</para> </sect1> |