[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/doc/userguide
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2006-11-24 8:35:52
Message-ID: 1164357352.563280.18988.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 607339 by annma:

forward port of 607338
BUG=128591


 M  +23 -15    control-center.docbook  


--- trunk/KDE/kdebase/doc/userguide/control-center.docbook #607338:607339
@@ -298,6 +298,15 @@
 
 <variablelist>
 <varlistentry>
+<term><guilabel>Connection Preferences</guilabel></term>
+<listitem>
+<para>Here you can set advanced networking options such as timeout values
+for server connects. Usually you would leave these options at the defaults
+unless you really knew what you were doing.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term><guilabel>Desktop Sharing</guilabel></term>
 <listitem>
 <para>Desktop Sharing allows you to invite someone to share your session
@@ -352,15 +361,6 @@
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Preferences</guilabel></term>
-<listitem>
-<para>Here you can set advanced networking options such as timeout values
-for server connects. Usually you would leave these options at the defaults
-unless you really knew what you were doing.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term><guilabel>Proxy</guilabel></term>
 <listitem>
 <para>This is where you would configure &kde; to connect to a proxy server
@@ -372,11 +372,11 @@
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Samba Configuration</guilabel></term>
+<term><guilabel>Samba</guilabel></term>
 <listitem>
-<para>The Samba Configuration module requires the <systemitem
-						class="username">root</systemitem> or administrator password. It is an
-advanced configuration tool that allows you to control Samba's security,
+<para>The Samba Configuration module requires the
+<systemitem class="username">root</systemitem> or administrator password. It is
+an advanced configuration tool that allows you to control Samba's security,
 shares, users and printers in an intuitive graphical interface.  This is a
 very powerful tool with support for configuring everything from simple file
 and printer sharing, to using your Samba server as a &Windows; NT Domain
@@ -385,11 +385,19 @@
 </varlistentry>
 
 <varlistentry>
+<term><guilabel>Service Discovery</guilabel></term>
+<listitem>
+<para>You can set up services browsing with ZeroConf. You can for example browse
+your local network using multicast DNS.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term><guilabel>Web Browser</guilabel></term>
 <listitem>
 <para>This module is where you would configure options relating to
-&konqueror; as a web-browser. The usual options you would expect from a
-webbrowser, such as cookie configuration, cache and history can be found
+&konqueror; as a web browser. The usual options you would expect from a
+web browser, such as cookie configuration, cache and history can be found
 here as well as sections to modify keyboard shortcuts, plugins and
 fonts.</para>
 </listitem>
[prev in list] [next in list] [prev in thread] [next in thread]