Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 80 insertions, 0 deletions

diff --git a/doc/kcontrol/Makefile.am b/doc/kcontrol/Makefile.am
new file mode 100644
index 00000000..930c270c
--- /dev/null
+++ b/doc/kcontrol/Makefile.am
@@ -0,0 +1,6 @@
+
+SUBDIRS = $(AUTODIRS)
+
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/kcmktalkd/Makefile.am b/doc/kcontrol/kcmktalkd/Makefile.am
new file mode 100644
index 00000000..0f511040
--- /dev/null
+++ b/doc/kcontrol/kcmktalkd/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kcontrol/kcmtalkd
diff --git a/doc/kcontrol/kcmktalkd/index.docbook b/doc/kcontrol/kcmktalkd/index.docbook
new file mode 100644
index 00000000..3d444f1d
--- /dev/null
+++ b/doc/kcontrol/kcmktalkd/index.docbook
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+"dtd/kdex.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+
+<article lang="&language;">
+<title>Talk</title>
+<articleinfo>
+
+<authorgroup>
+<author>
+<firstname>Lauri</firstname>
+<surname>Watts</surname>
+</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>2002-10-08</date>
+<releaseinfo>3.01.00</releaseinfo>
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>talk</keyword>
+</keywordset>
+</articleinfo>
+
+<sect1 id="talk">
+
+<title>Talk Configuration</title>
+
+<!-- FIXME: This module is installed with kdenetwork.. should it be
+documented in the kcontrol manual, or should this information be added
+to the ktalkd manual -->
+
+<sect2 id="talk-intro"> 
+<title>Introduction</title> 
+
+<para>Please see the &ktalkd; manual for more information (you can
+read it by entering <userinput>help:/ktalkd/</userinput> in a
+&konqueror; window.)</para> </sect2> 
+
+<sect2 id="talk-author"> 
+<title>Section Author</title> 
+<para>This section
+written by: </para> 
+
+<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+
+</sect2>
+</sect1>
+</article>
diff --git a/doc/kcontrol/lanbrowser/Makefile.am b/doc/kcontrol/lanbrowser/Makefile.am
new file mode 100644
index 00000000..09726472
--- /dev/null
+++ b/doc/kcontrol/lanbrowser/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kcontrol/lanbrowser
diff --git a/doc/kcontrol/lanbrowser/index.docbook b/doc/kcontrol/lanbrowser/index.docbook
new file mode 100644
index 00000000..183d6d04
--- /dev/null
+++ b/doc/kcontrol/lanbrowser/index.docbook
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+"dtd/kdex.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+<article>
+<sect1 id="lan-browsing">
+<title><acronym>LAN</acronym> Browsing</title>
+
+<para>Not yet documented</para>
+<!-- Merge the Lisa documentation into here -->
+
+</sect1>
+</article>
\ No newline at end of file