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/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 111 insertions, 0 deletions

diff --git a/doc/kcontrol/netpref/Makefile.am b/doc/kcontrol/netpref/Makefile.am
new file mode 100644
index 000000000..8dacf4438
--- /dev/null
+++ b/doc/kcontrol/netpref/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kcontrol/netpref
diff --git a/doc/kcontrol/netpref/index.docbook b/doc/kcontrol/netpref/index.docbook
new file mode 100644
index 000000000..f97b30b36
--- /dev/null
+++ b/doc/kcontrol/netpref/index.docbook
@@ -0,0 +1,109 @@
+<?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;">
+<articleinfo>
+
+<authorgroup>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>2002-10-16</date>
+<releaseinfo>3.1</releaseinfo>
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>kdebase</keyword>
+<keyword>kcontrol</keyword>
+<keyword>network</keyword>
+<keyword>timeouts</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="timeouts">
+
+<title>Preferences</title>
+
+<para>Here you can set timeout values.  You might want to tweak them
+if your connection is very slow, but the default settings are
+appropriate for most users.</para>
+
+<para>Here <guilabel>Timeout Values</guilabel> are the length of time
+an application should wait for an answer from a network operation.</para>
+
+<para>You can configure the following timeouts:</para>
+
+<variablelist>
+<varlistentry>
+<term><guilabel>Socket read:</guilabel></term>
+<listitem>
+<para> Some applications use <firstterm>sockets</firstterm> to
+communicate.  You can think of a socket as a water tap; while it is
+open, water (or in our case, data) comes out, without any interaction.
+If something stops this flow of data, the application will wait for
+more to come.  This could be a very long time, but you can configure a
+maximum time for an application to wait with this option.</para>
+<para>This setting will only apply to &kde; applications, of course.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Proxy connect:</guilabel></term>
+<listitem>
+<para>
+Sets how long to wait for a connection to a proxy server, if one is configured.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Server connect:</guilabel></term>
+<listitem>
+<para>
+Sets how long to wait for a connection to a remote server.  
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Server response:</guilabel></term>
+<listitem>
+<para>
+Sets how long to wait for a reply from a remote server.
+</para>
+</listitem>
+</varlistentry>
+
+</variablelist>
+
+<para>You can configure <guilabel>FTP Options</guilabel> here.  At
+present there is just two options:</para>
+<variablelist>
+<varlistentry>
+<term><guilabel>Enable passive mode (PASV)</guilabel></term>
+<listitem><para>Passive &FTP; is often required when you are behind a firewall.
+Many firewalls only permit connections that were initiated from
+<quote>the inside</quote>.  Passive &FTP; is controlled by the client,
+which makes it usable through firewalls.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Mark partially uploaded files</guilabel></term>
+<listitem><para>When a mark is placed in this box, partially uploaded files will 
+have a <literal role="extension">.part</literal> extension added to the end 
+of the file. This extension is removed once the file download is complete. </para></listitem>
+</varlistentry>
+
+</variablelist>
+
+
+
+</sect1>
+</article>
\ No newline at end of file