Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase

3 files changed, 28 insertions, 14 deletions

diff --git a/doc/kcontrol/crypto/index.docbook b/doc/kcontrol/crypto/index.docbook
index 5063a723f..a2dc83e58 100644
--- a/doc/kcontrol/crypto/index.docbook
+++ b/doc/kcontrol/crypto/index.docbook
@@ -197,7 +197,11 @@ You can easily manage them from here.</para>
 
 <para>The list box shows which site and personal certificates &tde;
 knows about.  You can easily manage them from here.</para>
+</sect2>
 
+<sect2 id="ssl-signers">
+<title>The <guilabel>SSL Signers</guilabel> Tab</title>
+<para>We apologize. This section has not been written yet.</para>
 </sect2>
 
 </sect1>
diff --git a/doc/kcontrol/kcmaccess/index.docbook b/doc/kcontrol/kcmaccess/index.docbook
index bb5d93cab..1a24daf17 100644
--- a/doc/kcontrol/kcmaccess/index.docbook
+++ b/doc/kcontrol/kcmaccess/index.docbook
@@ -33,9 +33,11 @@
 audible cues, or who have difficulty using a keyboard.</para>
 
 <para>
-The module is divided into two tabs: <link
-linkend="access-bell"><guilabel>Bell</guilabel></link> and <link
-linkend="access-kb"><guilabel>Keyboard</guilabel></link>.
+The module is divided into four tabs tabs: 
+<link linkend="access-bell"><guilabel>Bell</guilabel></link>,
+<link linkend="modifier-keys"><guilabel>Modifier Keys</guilabel></link>,
+<link linkend="keyboard-filters"><guilabel>Keyboard Filters</guilabel></link>
+and <link linkend="action-gestures"><guilabel>Action Gestures</guilabel></link>.
 </para>
 
 <sect3 id="access-bell">
@@ -89,16 +91,12 @@ bell.  The default value is 500ms, or half a second.
 </para>
 
 </sect3>
+</sect2>
 
-<sect3 id="access-kb">
-<title><guilabel>Keyboard</guilabel></title>
-
-<para>There are three sections to this panel.</para>
+<sect2 id="modifier-keys">
+<title>Modifier Keys</title>
 
-<variablelist>
-<varlistentry>
-<term><guilabel>Use Sticky Keys</guilabel></term>
-<listitem>
+<para><guilabel>Use Sticky Keys</guilabel></para>
 <para>
 If this option is enabled, you can press and release the &Shift;,
 &Alt; or &Ctrl; keys, and then press another key to get a key combo
@@ -144,9 +142,13 @@ de-select the &Shift; key, press it again.
 </listitem>
 </varlistentry>
 </variablelist>
-</listitem>
-</varlistentry>
 
+</sect2>
+
+<sect2 id="keyboard-filters">
+<title>Keyboard Filters</title>
+
+<variablelist>
 <varlistentry>
 <term><guilabel>Slow keys</guilabel></term>
 <listitem>
@@ -170,8 +172,11 @@ accepted. This prevents accidental multiple key strokes.
 </varlistentry>
 </variablelist>
 
-</sect3>
+</sect2>
 
+<sect2 id="action-gestures">
+<title>Action Gestures</title>
+<para>We apologize. This section has not been written yet.</para>
 </sect2>
 
 </sect1>
diff --git a/doc/kcontrol/keys/index.docbook b/doc/kcontrol/keys/index.docbook
index 3aa32d659..4548adbf5 100644
--- a/doc/kcontrol/keys/index.docbook
+++ b/doc/kcontrol/keys/index.docbook
@@ -160,6 +160,11 @@ scheme, discarding your changes.</para></important> </sect3>
 
 </sect2>
 
+<sect2 id="key-bindings-shortcuts">
+<title>Command shortcuts</title>
+<para>We apologize. This section has not been written yet.</para>
+</sect2>
+
 <sect2 id="key-bindings-modifiers">
 <title>Modifier Keys</title>