diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-02-24 22:53:44 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-02-24 23:26:11 -0600 |
| commit | fc2650816b4b95f21750c53c0d45daeff31510d6 (patch) | |
| tree | 7227267d1ba5acef3b86db06979667a13bebc7c5 /doc/kcontrol/proxy | |
| parent | ca1a4375014b6f78a06c74169a1285abbcbcd819 (diff) | |
| download | tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.tar.gz tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.zip | |
Update tdebase cmake files with STARTKDE->STARTTDE.
Fix tdebase entities, text strings for future maintenance of handbook files. This partially resolves bug report 694.
Update konqueror user agent strings. This partially resolves bug report 774.
Update TDM help options. This resolves bug report 618.
Fix KTips branding issues and obsolete web addresses. This resolves bug report 842.
Diffstat (limited to 'doc/kcontrol/proxy')
| -rw-r--r-- | doc/kcontrol/proxy/socks.docbook | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/kcontrol/proxy/socks.docbook b/doc/kcontrol/proxy/socks.docbook index 73c5e2ec6..48a03253c 100644 --- a/doc/kcontrol/proxy/socks.docbook +++ b/doc/kcontrol/proxy/socks.docbook @@ -14,7 +14,7 @@ found in corporate settings, as opposed to home users. For more information about SOCKS, see the <ulink url="http://www.socks.nec.com">NEC</ulink> website</para> -<para>With this module you can enable most of the network aware &kde; +<para>With this module you can enable most of the network aware &tde; applications to transparently use SOCKS.</para> <para>Setting up of a SOCKS client is outside the scope of this @@ -28,7 +28,7 @@ the <guilabel>Enable SOCKS support</guilabel> checkbox.</para> to you.</para> <para>First, you should select which of the various SOCKS clients you -have installed on your computer. &kde; will attempt to find this out by +have installed on your computer. &tde; will attempt to find this out by itself, if you choose <guilabel>Auto detect</guilabel>. If you know the client you have, you could choose either <guilabel>NEC Socks</guilabel> or <guilabel>Dante</guilabel>. If you have a @@ -36,14 +36,14 @@ custom built SOCKS library to use, you can select <guilabel>Use custom library</guilabel> and then enter the path to it in the <guilabel>Path</guilabel> field.</para> -<para>If you want &kde; to auto detect the SOCKS library in use, but you +<para>If you want &tde; to auto detect the SOCKS library in use, but you suspect it isn't looking in the right places or you have installed it in a non-standard location, then you can add further paths to be searched in the bottom of this panel. Use the <guibutton>Add</guibutton> and <guibutton>Remove</guibutton> to add or remove paths.</para> <para>At any time while filling in this module, you can press the -<guibutton>Test</guibutton> button, and &kde; will report immediately +<guibutton>Test</guibutton> button, and &tde; will report immediately with a message box to tell you if it could find and initialize SOCKS or not.</para> |