[Tkabber-dev] r2035 - in trunk/tkabber: . doc

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Dec 30 13:16:59 MSK 2013


Author: sergei
Date: 2013-12-30 13:16:58 +0400 (Mon, 30 Dec 2013)
New Revision: 2035

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
Log:
	* README, doc/tkabber.html, doc/tkabber.xml: Added section which
	  explains how to modify proxy configuration when upgrading from the
	  older Tkabber versions.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2013-12-29 08:06:08 UTC (rev 2034)
+++ trunk/tkabber/ChangeLog	2013-12-30 09:16:58 UTC (rev 2035)
@@ -1,3 +1,9 @@
+2013-12-30  Sergei Golovan  <sgolovan at nes.ru>
+
+	* README, doc/tkabber.html, doc/tkabber.xml: Added section which
+	  explains how to modify proxy configuration when upgrading from the
+	  older Tkabber versions.
+
 2013-12-29  Sergei Golovan  <sgolovan at nes.ru>
 
 	* login.tcl: Added missing global definition.

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2013-12-29 08:06:08 UTC (rev 2034)
+++ trunk/tkabber/README	2013-12-30 09:16:58 UTC (rev 2035)
@@ -65,46 +65,46 @@
    4.  Upgrading from version 0.11.0 or 0.11.1  . . . . . . . . . . . 12
      4.1.  External plugins . . . . . . . . . . . . . . . . . . . . . 12
      4.2.  Configuration options  . . . . . . . . . . . . . . . . . . 12
-   5.  Upgrading from version 0.10.0  . . . . . . . . . . . . . . . . 13
-     5.1.  Configuration options  . . . . . . . . . . . . . . . . . . 13
-       5.1.1.  Proxy servers  . . . . . . . . . . . . . . . . . . . . 13
+   5.  Upgrading from version 0.10.0  . . . . . . . . . . . . . . . . 14
+     5.1.  Configuration options  . . . . . . . . . . . . . . . . . . 14
+       5.1.1.  Proxy servers  . . . . . . . . . . . . . . . . . . . . 14
        5.1.2.  Resources to control fonts . . . . . . . . . . . . . . 14
-       5.1.3.  Keep-alives and dead link detection  . . . . . . . . . 14
-       5.1.4.  Resources to control appearance of balloon windows . . 15
-       5.1.5.  Support for external XML parser  . . . . . . . . . . . 15
-     5.2.  User interface . . . . . . . . . . . . . . . . . . . . . . 15
-       5.2.1.  System tray icon mouse gestures  . . . . . . . . . . . 15
+       5.1.3.  Keep-alives and dead link detection  . . . . . . . . . 15
+       5.1.4.  Resources to control appearance of balloon windows . . 16
+       5.1.5.  Support for external XML parser  . . . . . . . . . . . 16
+     5.2.  User interface . . . . . . . . . . . . . . . . . . . . . . 16
+       5.2.1.  System tray icon mouse gestures  . . . . . . . . . . . 16
        5.2.2.  New tab management widget  . . . . . . . . . . . . . . 16
-       5.2.3.  Window splitters . . . . . . . . . . . . . . . . . . . 16
-   6.  Upgrading from version 0.9.9 . . . . . . . . . . . . . . . . . 17
-   7.  Configuration  . . . . . . . . . . . . . . . . . . . . . . . . 18
-     7.1.  Pre-load . . . . . . . . . . . . . . . . . . . . . . . . . 20
-       7.1.1.  Tabbed Interface . . . . . . . . . . . . . . . . . . . 21
-       7.1.2.  Fonts and colors . . . . . . . . . . . . . . . . . . . 21
-       7.1.3.  Cryptography by default  . . . . . . . . . . . . . . . 23
-       7.1.4.  Debugging Output . . . . . . . . . . . . . . . . . . . 23
-       7.1.5.  Splash window  . . . . . . . . . . . . . . . . . . . . 24
-       7.1.6.  I18n/L10n  . . . . . . . . . . . . . . . . . . . . . . 24
-       7.1.7.  Browse URL . . . . . . . . . . . . . . . . . . . . . . 24
-       7.1.8.  Searching  . . . . . . . . . . . . . . . . . . . . . . 25
-     7.2.  Post-load  . . . . . . . . . . . . . . . . . . . . . . . . 25
-       7.2.1.  Look-and-Feel  . . . . . . . . . . . . . . . . . . . . 30
-       7.2.2.  The system tray icon (for Unix)  . . . . . . . . . . . 30
-       7.2.3.  The Autoaway Module  . . . . . . . . . . . . . . . . . 31
-       7.2.4.  The Avatar Module  . . . . . . . . . . . . . . . . . . 31
-       7.2.5.  The Chat Module  . . . . . . . . . . . . . . . . . . . 31
-       7.2.6.  The Clientinfo Module  . . . . . . . . . . . . . . . . 32
-       7.2.7.  The Conferenceinfo Module  . . . . . . . . . . . . . . 32
-       7.2.8.  The Cryptographic Module . . . . . . . . . . . . . . . 32
-       7.2.9.  The Emoticons Module . . . . . . . . . . . . . . . . . 32
-       7.2.10. The File Transfer Module . . . . . . . . . . . . . . . 33
-       7.2.11. The Groupchat Module . . . . . . . . . . . . . . . . . 33
-       7.2.12. The Ispell Module  . . . . . . . . . . . . . . . . . . 34
-       7.2.13. The Stream Initiation Module . . . . . . . . . . . . . 34
-       7.2.14. The Logger Module  . . . . . . . . . . . . . . . . . . 35
-       7.2.15. The Proxy Module . . . . . . . . . . . . . . . . . . . 35
-       7.2.16. The Login Module . . . . . . . . . . . . . . . . . . . 37
-       7.2.17. The Message Module . . . . . . . . . . . . . . . . . . 38
+       5.2.3.  Window splitters . . . . . . . . . . . . . . . . . . . 17
+   6.  Upgrading from version 0.9.9 . . . . . . . . . . . . . . . . . 18
+   7.  Configuration  . . . . . . . . . . . . . . . . . . . . . . . . 19
+     7.1.  Pre-load . . . . . . . . . . . . . . . . . . . . . . . . . 21
+       7.1.1.  Tabbed Interface . . . . . . . . . . . . . . . . . . . 22
+       7.1.2.  Fonts and colors . . . . . . . . . . . . . . . . . . . 22
+       7.1.3.  Cryptography by default  . . . . . . . . . . . . . . . 24
+       7.1.4.  Debugging Output . . . . . . . . . . . . . . . . . . . 24
+       7.1.5.  Splash window  . . . . . . . . . . . . . . . . . . . . 25
+       7.1.6.  I18n/L10n  . . . . . . . . . . . . . . . . . . . . . . 25
+       7.1.7.  Browse URL . . . . . . . . . . . . . . . . . . . . . . 25
+       7.1.8.  Searching  . . . . . . . . . . . . . . . . . . . . . . 26
+     7.2.  Post-load  . . . . . . . . . . . . . . . . . . . . . . . . 26
+       7.2.1.  Look-and-Feel  . . . . . . . . . . . . . . . . . . . . 31
+       7.2.2.  The system tray icon (for Unix)  . . . . . . . . . . . 31
+       7.2.3.  The Autoaway Module  . . . . . . . . . . . . . . . . . 32
+       7.2.4.  The Avatar Module  . . . . . . . . . . . . . . . . . . 32
+       7.2.5.  The Chat Module  . . . . . . . . . . . . . . . . . . . 32
+       7.2.6.  The Clientinfo Module  . . . . . . . . . . . . . . . . 33
+       7.2.7.  The Conferenceinfo Module  . . . . . . . . . . . . . . 33
+       7.2.8.  The Cryptographic Module . . . . . . . . . . . . . . . 33
+       7.2.9.  The Emoticons Module . . . . . . . . . . . . . . . . . 33
+       7.2.10. The File Transfer Module . . . . . . . . . . . . . . . 34
+       7.2.11. The Groupchat Module . . . . . . . . . . . . . . . . . 34
+       7.2.12. The Ispell Module  . . . . . . . . . . . . . . . . . . 35
+       7.2.13. The Stream Initiation Module . . . . . . . . . . . . . 35
+       7.2.14. The Logger Module  . . . . . . . . . . . . . . . . . . 36
+       7.2.15. The Proxy Module . . . . . . . . . . . . . . . . . . . 36
+       7.2.16. The Login Module . . . . . . . . . . . . . . . . . . . 38
+       7.2.17. The Message Module . . . . . . . . . . . . . . . . . . 39
 
 
 
@@ -113,43 +113,43 @@
                                Tkabber 1.0                  January 2014
 
 
-       7.2.18. The Raw XML Input Module . . . . . . . . . . . . . . . 38
-       7.2.19. The Roster Module  . . . . . . . . . . . . . . . . . . 38
-       7.2.20. The Sound Module . . . . . . . . . . . . . . . . . . . 39
-     7.3.  Menu-load  . . . . . . . . . . . . . . . . . . . . . . . . 40
-       7.3.1.  The Avatar Module  . . . . . . . . . . . . . . . . . . 41
-       7.3.2.  The Browser Module . . . . . . . . . . . . . . . . . . 41
-       7.3.3.  The Groupchat Module . . . . . . . . . . . . . . . . . 41
-       7.3.4.  The Login Module . . . . . . . . . . . . . . . . . . . 41
-       7.3.5.  The Message Module . . . . . . . . . . . . . . . . . . 42
-       7.3.6.  The Presence Module  . . . . . . . . . . . . . . . . . 42
-       7.3.7.  Miscellany . . . . . . . . . . . . . . . . . . . . . . 43
-     7.4.  Final-Load . . . . . . . . . . . . . . . . . . . . . . . . 43
-   8.  Extensibility  . . . . . . . . . . . . . . . . . . . . . . . . 44
-     8.1.  Message Hooks  . . . . . . . . . . . . . . . . . . . . . . 45
-     8.2.  Chat Hooks . . . . . . . . . . . . . . . . . . . . . . . . 46
-     8.3.  Login Hooks  . . . . . . . . . . . . . . . . . . . . . . . 47
-     8.4.  Presence Hooks . . . . . . . . . . . . . . . . . . . . . . 48
-     8.5.  Info/Query Hook  . . . . . . . . . . . . . . . . . . . . . 48
-     8.6.  Roster Hooks . . . . . . . . . . . . . . . . . . . . . . . 49
-     8.7.  Miscellaneous Hooks  . . . . . . . . . . . . . . . . . . . 49
-   9.  User Interface basics  . . . . . . . . . . . . . . . . . . . . 51
-     9.1.  Searching  . . . . . . . . . . . . . . . . . . . . . . . . 51
-   Appendix A.  Releases History  . . . . . . . . . . . . . . . . . . 55
-     A.1.  Main changes in 1.0  . . . . . . . . . . . . . . . . . . . 55
-     A.2.  Main changes in 0.11.1 . . . . . . . . . . . . . . . . . . 55
-     A.3.  Main changes in 0.11.0 . . . . . . . . . . . . . . . . . . 56
-     A.4.  Main changes in 0.10.0 . . . . . . . . . . . . . . . . . . 56
-     A.5.  Main changes in 0.9.9  . . . . . . . . . . . . . . . . . . 57
-     A.6.  Main changes in 0.9.8  . . . . . . . . . . . . . . . . . . 58
-     A.7.  Main changes in 0.9.7beta  . . . . . . . . . . . . . . . . 58
-     A.8.  Main changes in 0.9.6beta  . . . . . . . . . . . . . . . . 59
-     A.9.  Main changes in 0.9.5beta  . . . . . . . . . . . . . . . . 59
-   Appendix B.  Tk option database resources  . . . . . . . . . . . . 60
-   Appendix C.  Documentation TODO  . . . . . . . . . . . . . . . . . 64
-   Appendix D.  Acknowledgements  . . . . . . . . . . . . . . . . . . 65
-   Appendix E.  Copyrights  . . . . . . . . . . . . . . . . . . . . . 66
-   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 67
+       7.2.18. The Raw XML Input Module . . . . . . . . . . . . . . . 39
+       7.2.19. The Roster Module  . . . . . . . . . . . . . . . . . . 39
+       7.2.20. The Sound Module . . . . . . . . . . . . . . . . . . . 40
+     7.3.  Menu-load  . . . . . . . . . . . . . . . . . . . . . . . . 41
+       7.3.1.  The Avatar Module  . . . . . . . . . . . . . . . . . . 42
+       7.3.2.  The Browser Module . . . . . . . . . . . . . . . . . . 42
+       7.3.3.  The Groupchat Module . . . . . . . . . . . . . . . . . 42
+       7.3.4.  The Login Module . . . . . . . . . . . . . . . . . . . 42
+       7.3.5.  The Message Module . . . . . . . . . . . . . . . . . . 43
+       7.3.6.  The Presence Module  . . . . . . . . . . . . . . . . . 43
+       7.3.7.  Miscellany . . . . . . . . . . . . . . . . . . . . . . 44
+     7.4.  Final-Load . . . . . . . . . . . . . . . . . . . . . . . . 44
+   8.  Extensibility  . . . . . . . . . . . . . . . . . . . . . . . . 45
+     8.1.  Message Hooks  . . . . . . . . . . . . . . . . . . . . . . 46
+     8.2.  Chat Hooks . . . . . . . . . . . . . . . . . . . . . . . . 47
+     8.3.  Login Hooks  . . . . . . . . . . . . . . . . . . . . . . . 48
+     8.4.  Presence Hooks . . . . . . . . . . . . . . . . . . . . . . 49
+     8.5.  Info/Query Hook  . . . . . . . . . . . . . . . . . . . . . 49
+     8.6.  Roster Hooks . . . . . . . . . . . . . . . . . . . . . . . 50
+     8.7.  Miscellaneous Hooks  . . . . . . . . . . . . . . . . . . . 50
+   9.  User Interface basics  . . . . . . . . . . . . . . . . . . . . 52
+     9.1.  Searching  . . . . . . . . . . . . . . . . . . . . . . . . 52
+   Appendix A.  Releases History  . . . . . . . . . . . . . . . . . . 56
+     A.1.  Main changes in 1.0  . . . . . . . . . . . . . . . . . . . 56
+     A.2.  Main changes in 0.11.1 . . . . . . . . . . . . . . . . . . 56
+     A.3.  Main changes in 0.11.0 . . . . . . . . . . . . . . . . . . 57
+     A.4.  Main changes in 0.10.0 . . . . . . . . . . . . . . . . . . 57
+     A.5.  Main changes in 0.9.9  . . . . . . . . . . . . . . . . . . 58
+     A.6.  Main changes in 0.9.8  . . . . . . . . . . . . . . . . . . 59
+     A.7.  Main changes in 0.9.7beta  . . . . . . . . . . . . . . . . 59
+     A.8.  Main changes in 0.9.6beta  . . . . . . . . . . . . . . . . 60
+     A.9.  Main changes in 0.9.5beta  . . . . . . . . . . . . . . . . 60
+   Appendix B.  Tk option database resources  . . . . . . . . . . . . 61
+   Appendix C.  Documentation TODO  . . . . . . . . . . . . . . . . . 65
+   Appendix D.  Acknowledgements  . . . . . . . . . . . . . . . . . . 66
+   Appendix E.  Copyrights  . . . . . . . . . . . . . . . . . . . . . 67
+   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 68
 
 
 
@@ -631,8 +631,22 @@
 
 4.2.  Configuration options
 
-   There are notable changes in specifying a set of proxy servers.
+   There are notable changes in specifying a set of proxy servers.  If
+   you define proxy server in the global "loginconf" array then you'll
+   have to do the following: In case if you use the _Customize_
+   interface, you may open the _Manage proxy servers_ dialog window and
+   add your proxy server there.  Note that if you're using the HTTPS
+   proxy then you'll have to add it twice (one in the _Tunnels_ tab and
+   the other in the _HTTP_ tab, see section 'The proxy module'
+   (Section 7.2.15) below).  If you define proxy server in the _Tkabber_
+   config file then you have lines similar to the following in the
+   config:
 
+   set loginconf(proxy) https
+   set loginconf(proxyhost) proxy.example.com
+   set loginconf(proxyport) 3128
+   set loginconf(proxyusername) ""
+   set loginconf(proxypassword) ""
 
 
 
@@ -654,12 +668,36 @@
 
 
 
+Shchepin, et al.                                               [Page 12]
+

+                               Tkabber 1.0                  January 2014
 
 
+   Replace them by the following:
 
+   set proxy1(type) https
+   set proxy1(host) proxy.example.com
+   set proxy1(port) 3128
+   set proxy1(username) ""
+   set proxy1(password) ""
+   set proxy1(match) *
+   set proxy1(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
 
+   set proxy2(type) http
+   set proxy2(host) proxy.example.com
+   set proxy2(port) 3128
+   set proxy2(username) ""
+   set proxy2(password) ""
+   set proxy2(match) *
+   set proxy2(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
 
+   set proxyconf(profile) Proxies
+   set proxyconf(tunnel) {proxy1}
+   set proxyconf(http) {proxy2}
 
+   which will instruct _Tkabber_ to use these proxies for all
+   connections.  If you need more complicated setup with several proxy
+   profiles, read section 'The proxy module' (Section 7.2.15) below.
 
 
 
@@ -668,7 +706,25 @@
 
 
 
-Shchepin, et al.                                               [Page 12]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Shchepin, et al.                                               [Page 13]
 

                                Tkabber 1.0                  January 2014
 
@@ -693,46 +749,20 @@
    values stored using the Customize mechanism will be lost and the same
    values in "loginconf" arrays will not be recognized any longer.
 
-   If you do not use HTTP proxy, you can skip this section because these
-   changes will not affect you.
+   To learn how to adapt your current proxy settins to the current
+   _Tkabber_ version, read section above (Section 4.2), but remember
+   that variables in the "loginconf" array mentioned there have been
+   changed between 0.10.0 and 0.11.0.  Use the map below as a reference
+   which variable should actually be used:
 
-   If your options are set using the _Customize_ interface, write down
-   values for options relevant to proxy server from the "Login" group of
-   _Customize_ settings, then after upgrade visit this group of
-   settings, select "HTTPS" for the option "::loginconf(proxy)" and then
-   fill in the rest of relevant settings with recorded values.  As
-   usual, save each setting after you change them.  Do not be surprised
-   with the word "HTTPS" (which stands for "HTTP over SSL").  It just
-   means that _Tkabber_ will use CONNECT method to tunnel TCP connection
-   through a proxy.
+   o  Variable "httpproxy"in 0.10.0 became "proxyhost" in 0.11.0.
 
-   If you maintain "loginconf" arrays in config.tcl, you have to modify
-   each array using this scheme:
+   o  Variable "httpport" became "proxyport".
 
-   o  Rename variable "useproxy", if present, to just "proxy" and change
-      its value to either "https" if "useproxy" was set to true or to
-      "none" (yes, the word "none", do not leave it empty) if it was set
-      to false.
+   o  Variable "httplogin" became "proxyusername".
 
-   o  Modify existing variables in these arrays using this map:
+   o  Variable "httppassword" became "proxypassword".
 
-      *  Rename "httpproxy" to "proxyhost".
-
-      *  Rename "httpport" to "proxyport".
-
-
-
-
-
-Shchepin, et al.                                               [Page 13]
-

-                               Tkabber 1.0                  January 2014
-
-
-      *  Rename "httplogin" to "proxyusername".
-
-      *  Rename "httppassword" to "proxypassword".
-
 5.1.2.  Resources to control fonts
 
    Fonts handling has been partially reworked: the global variable
@@ -747,6 +777,14 @@
    need to touch anything (until the update you had to tweak the "font"
    variable because it was set to font "fixed" by default).  The
    variable "font" does not have any special meaning starting from
+
+
+
+Shchepin, et al.                                               [Page 14]
+

+                               Tkabber 1.0                  January 2014
+
+
    0.11.0 release.
 
    The second consequence is that you are now able to set fonts for chat
@@ -776,15 +814,6 @@
    In version 0.11.0, the old keep-alive mechanism has been dropped, so
    the following two global options have no effect now:
 
-
-
-
-
-Shchepin, et al.                                               [Page 14]
-

-                               Tkabber 1.0                  January 2014
-
-
    o  "keep_alive"
 
    o  "keep_alive_interval"
@@ -801,6 +830,17 @@
       server during this timeout, the socket for this connection will be
       forcibly disconnected.
 
+
+
+
+
+
+
+Shchepin, et al.                                               [Page 15]
+

+                               Tkabber 1.0                  January 2014
+
+
 5.1.4.  Resources to control appearance of balloon windows
 
    Resources controlling the appearance of balloon windows have been
@@ -834,13 +874,6 @@
    Mouse gestures bound to system tray (system notification area) icon
    have been reworked:
 
-
-
-Shchepin, et al.                                               [Page 15]
-

-                               Tkabber 1.0                  January 2014
-
-
    o  Single click on it with the left mouse button now unconditionally
       brings the main _Tkabber_ window to front, possibly deiconifying
       it first.
@@ -856,6 +889,14 @@
 
    The _notebook_ widget which was used to render tabs in tabbed
    interface mode has been replaced with a new custom widget providing
+
+
+
+Shchepin, et al.                                               [Page 16]
+

+                               Tkabber 1.0                  January 2014
+
+
    the ability for multi-row placement of tabs and docking them to the
    left or right sides of the chat window (in addition to top or bottom
    docking available in 0.10.0 version and earlier).
@@ -892,7 +933,22 @@
 
 
 
-Shchepin, et al.                                               [Page 16]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Shchepin, et al.                                               [Page 17]
 

                                Tkabber 1.0                  January 2014
 
@@ -948,7 +1004,7 @@
 
 
 
-Shchepin, et al.                                               [Page 17]
+Shchepin, et al.                                               [Page 18]
 

                                Tkabber 1.0                  January 2014
 
@@ -1004,7 +1060,7 @@
 
 
 
-Shchepin, et al.                                               [Page 18]
+Shchepin, et al.                                               [Page 19]
 

                                Tkabber 1.0                  January 2014
 
@@ -1060,7 +1116,7 @@
 
 
 
-Shchepin, et al.                                               [Page 19]
+Shchepin, et al.                                               [Page 20]
 

                                Tkabber 1.0                  January 2014
 
@@ -1116,7 +1172,7 @@
 
 
 
-Shchepin, et al.                                               [Page 20]
+Shchepin, et al.                                               [Page 21]
 

                                Tkabber 1.0                  January 2014
 
@@ -1172,7 +1228,7 @@
 
 
 
-Shchepin, et al.                                               [Page 21]
+Shchepin, et al.                                               [Page 22]
 

                                Tkabber 1.0                  January 2014
 
@@ -1228,7 +1284,7 @@
 
 
 
-Shchepin, et al.                                               [Page 22]
+Shchepin, et al.                                               [Page 23]
 

                                Tkabber 1.0                  January 2014
 
@@ -1284,7 +1340,7 @@
 
 
 
-Shchepin, et al.                                               [Page 23]
+Shchepin, et al.                                               [Page 24]
 

                                Tkabber 1.0                  January 2014
 
@@ -1340,7 +1396,7 @@
 
 
 
-Shchepin, et al.                                               [Page 24]
+Shchepin, et al.                                               [Page 25]
 

                                Tkabber 1.0                  January 2014
 
@@ -1396,7 +1452,7 @@
 
 
 
-Shchepin, et al.                                               [Page 25]
+Shchepin, et al.                                               [Page 26]
 

                                Tkabber 1.0                  January 2014
 
@@ -1452,7 +1508,7 @@
 
 
 
-Shchepin, et al.                                               [Page 26]
+Shchepin, et al.                                               [Page 27]
 

                                Tkabber 1.0                  January 2014
 
@@ -1508,7 +1564,7 @@
 
 
 
-Shchepin, et al.                                               [Page 27]
+Shchepin, et al.                                               [Page 28]
 

                                Tkabber 1.0                  January 2014
 
@@ -1564,7 +1620,7 @@
 
 
 
-Shchepin, et al.                                               [Page 28]
+Shchepin, et al.                                               [Page 29]
 

                                Tkabber 1.0                  January 2014
 
@@ -1620,7 +1676,7 @@
 
 
 
-Shchepin, et al.                                               [Page 29]
+Shchepin, et al.                                               [Page 30]
 

                                Tkabber 1.0                  January 2014
 
@@ -1676,7 +1732,7 @@
 
 
 
-Shchepin, et al.                                               [Page 30]
+Shchepin, et al.                                               [Page 31]
 

                                Tkabber 1.0                  January 2014
 
@@ -1732,7 +1788,7 @@
 
 
 
-Shchepin, et al.                                               [Page 31]
+Shchepin, et al.                                               [Page 32]
 

                                Tkabber 1.0                  January 2014
 
@@ -1788,7 +1844,7 @@
 
 
 
-Shchepin, et al.                                               [Page 32]
+Shchepin, et al.                                               [Page 33]
 

                                Tkabber 1.0                  January 2014
 
@@ -1844,7 +1900,7 @@
 
 
 
-Shchepin, et al.                                               [Page 33]
+Shchepin, et al.                                               [Page 34]
 

                                Tkabber 1.0                  January 2014
 
@@ -1900,7 +1956,7 @@
 
 
 
-Shchepin, et al.                                               [Page 34]
+Shchepin, et al.                                               [Page 35]
 

                                Tkabber 1.0                  January 2014
 
@@ -1956,7 +2012,7 @@
 
 
 
-Shchepin, et al.                                               [Page 35]
+Shchepin, et al.                                               [Page 36]
 

                                Tkabber 1.0                  January 2014
 
@@ -2012,7 +2068,7 @@
 
 
 
-Shchepin, et al.                                               [Page 36]
+Shchepin, et al.                                               [Page 37]
 

                                Tkabber 1.0                  January 2014
 
@@ -2068,7 +2124,7 @@
 
 
 
-Shchepin, et al.                                               [Page 37]
+Shchepin, et al.                                               [Page 38]
 

                                Tkabber 1.0                  January 2014
 
@@ -2124,7 +2180,7 @@
 
 
 
-Shchepin, et al.                                               [Page 38]
+Shchepin, et al.                                               [Page 39]
 

                                Tkabber 1.0                  January 2014
 
@@ -2180,7 +2236,7 @@
 
 
 
-Shchepin, et al.                                               [Page 39]
+Shchepin, et al.                                               [Page 40]
 

                                Tkabber 1.0                  January 2014
 
@@ -2236,7 +2292,7 @@
 
 
 
-Shchepin, et al.                                               [Page 40]
+Shchepin, et al.                                               [Page 41]
 

                                Tkabber 1.0                  January 2014
 
@@ -2292,7 +2348,7 @@
 
 
 
-Shchepin, et al.                                               [Page 41]
+Shchepin, et al.                                               [Page 42]
 

                                Tkabber 1.0                  January 2014
 
@@ -2348,7 +2404,7 @@
 
 
 
-Shchepin, et al.                                               [Page 42]
+Shchepin, et al.                                               [Page 43]
 

                                Tkabber 1.0                  January 2014
 
@@ -2404,7 +2460,7 @@
 
 
 
-Shchepin, et al.                                               [Page 43]
+Shchepin, et al.                                               [Page 44]
 

                                Tkabber 1.0                  January 2014
 
@@ -2460,7 +2516,7 @@
 
 
 
-Shchepin, et al.                                               [Page 44]
+Shchepin, et al.                                               [Page 45]
 

                                Tkabber 1.0                  January 2014
 
@@ -2516,7 +2572,7 @@
 
 
 
-Shchepin, et al.                                               [Page 45]
+Shchepin, et al.                                               [Page 46]
 

                                Tkabber 1.0                  January 2014
 
@@ -2572,7 +2628,7 @@
 
 
 
-Shchepin, et al.                                               [Page 46]
+Shchepin, et al.                                               [Page 47]
 

                                Tkabber 1.0                  January 2014
 
@@ -2628,7 +2684,7 @@
 
 
 
-Shchepin, et al.                                               [Page 47]
+Shchepin, et al.                                               [Page 48]
 

                                Tkabber 1.0                  January 2014
 
@@ -2684,7 +2740,7 @@
 
 
 
-Shchepin, et al.                                               [Page 48]
+Shchepin, et al.                                               [Page 49]
 

                                Tkabber 1.0                  January 2014
 
@@ -2740,7 +2796,7 @@
 
 
 
-Shchepin, et al.                                               [Page 49]
+Shchepin, et al.                                               [Page 50]
 

                                Tkabber 1.0                  January 2014
 
@@ -2796,7 +2852,7 @@
 
 
 
-Shchepin, et al.                                               [Page 50]
+Shchepin, et al.                                               [Page 51]
 

                                Tkabber 1.0                  January 2014
 
@@ -2852,7 +2908,7 @@
 
 
 
-Shchepin, et al.                                               [Page 51]
+Shchepin, et al.                                               [Page 52]
 

                                Tkabber 1.0                  January 2014
 
@@ -2908,7 +2964,7 @@
 
 
 
-Shchepin, et al.                                               [Page 52]
+Shchepin, et al.                                               [Page 53]
 

                                Tkabber 1.0                  January 2014
 
@@ -2964,7 +3020,7 @@
 
 
 
-Shchepin, et al.                                               [Page 53]
+Shchepin, et al.                                               [Page 54]
 

                                Tkabber 1.0                  January 2014
 
@@ -3020,7 +3076,7 @@
 
 
 
-Shchepin, et al.                                               [Page 54]
+Shchepin, et al.                                               [Page 55]
 

                                Tkabber 1.0                  January 2014
 
@@ -3076,7 +3132,7 @@
 
 
 
-Shchepin, et al.                                               [Page 55]
+Shchepin, et al.                                               [Page 56]
 

                                Tkabber 1.0                  January 2014
 
@@ -3132,7 +3188,7 @@
 
 
 
-Shchepin, et al.                                               [Page 56]
+Shchepin, et al.                                               [Page 57]
 

                                Tkabber 1.0                  January 2014
 
@@ -3188,7 +3244,7 @@
 
 
 
-Shchepin, et al.                                               [Page 57]
+Shchepin, et al.                                               [Page 58]
 

                                Tkabber 1.0                  January 2014
 
@@ -3244,7 +3300,7 @@
 
 
 
-Shchepin, et al.                                               [Page 58]
+Shchepin, et al.                                               [Page 59]
 

                                Tkabber 1.0                  January 2014
 
@@ -3300,7 +3356,7 @@
 
 
 
-Shchepin, et al.                                               [Page 59]
+Shchepin, et al.                                               [Page 60]
 

                                Tkabber 1.0                  January 2014
 
@@ -3356,7 +3412,7 @@
 
 
 
-Shchepin, et al.                                               [Page 60]
+Shchepin, et al.                                               [Page 61]
 

                                Tkabber 1.0                  January 2014
 
@@ -3412,7 +3468,7 @@
 
 
 
-Shchepin, et al.                                               [Page 61]
+Shchepin, et al.                                               [Page 62]
 

                                Tkabber 1.0                  January 2014
 
@@ -3468,7 +3524,7 @@
 
 
 
-Shchepin, et al.                                               [Page 62]
+Shchepin, et al.                                               [Page 63]
 

                                Tkabber 1.0                  January 2014
 
@@ -3524,7 +3580,7 @@
 
 
 
-Shchepin, et al.                                               [Page 63]
+Shchepin, et al.                                               [Page 64]
 

                                Tkabber 1.0                  January 2014
 
@@ -3580,7 +3636,7 @@
 
 
 
-Shchepin, et al.                                               [Page 64]
+Shchepin, et al.                                               [Page 65]
 

                                Tkabber 1.0                  January 2014
 
@@ -3636,7 +3692,7 @@
 
 
 
-Shchepin, et al.                                               [Page 65]
+Shchepin, et al.                                               [Page 66]
 

                                Tkabber 1.0                  January 2014
 
@@ -3692,7 +3748,7 @@
 
 
 
-Shchepin, et al.                                               [Page 66]
+Shchepin, et al.                                               [Page 67]
 

                                Tkabber 1.0                  January 2014
 
@@ -3748,5 +3804,5 @@
 
 
 
-Shchepin, et al.                                               [Page 67]
+Shchepin, et al.                                               [Page 68]
 


Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2013-12-29 08:06:08 UTC (rev 2034)
+++ trunk/tkabber/doc/tkabber.html	2013-12-30 09:16:58 UTC (rev 2035)
@@ -809,6 +809,48 @@
 Configuration options</h3>
 
 <p>There are notable changes in specifying a set of proxy servers.
+If you define proxy server in the global <tt>loginconf</tt>
+array then you'll have to do the following: In case if you use the
+<em>Customize</em> interface, you may open the <em>Manage proxy servers</em>
+dialog window and add your proxy server there. Note that if you're using
+the HTTPS proxy then you'll have to add it twice (one in the <em>Tunnels</em>
+tab and the other in the <em>HTTP</em> tab, see <a class='info' href='#s.postload-proxy'>section 'The proxy module'<span> (</span><span class='info'>The Proxy Module</span><span>)</span></a>
+below). If you define proxy server in the <em>Tkabber</em> config file then
+you have lines similar to the following in the config:
+</p><div style='display: table; width: 0; margin-left: 3em; margin-right: auto'><pre>
+set loginconf(proxy) https
+set loginconf(proxyhost) proxy.example.com
+set loginconf(proxyport) 3128
+set loginconf(proxyusername) ""
+set loginconf(proxypassword) ""
+</pre></div>
+<p>Replace them by the following:
+
+</p><div style='display: table; width: 0; margin-left: 3em; margin-right: auto'><pre>
+set proxy1(type) https
+set proxy1(host) proxy.example.com
+set proxy1(port) 3128
+set proxy1(username) ""
+set proxy1(password) ""
+set proxy1(match) *
+set proxy1(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
+
+set proxy2(type) http
+set proxy2(host) proxy.example.com
+set proxy2(port) 3128
+set proxy2(username) ""
+set proxy2(password) ""
+set proxy2(match) *
+set proxy2(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
+
+set proxyconf(profile) Proxies
+set proxyconf(tunnel) {proxy1}
+set proxyconf(http) {proxy2}
+</pre></div>
+<p>which will instruct <em>Tkabber</em> to use these proxies for all connections.
+If you need more complicated setup with several proxy profiles, read <a class='info' href='#s.postload-proxy'>section
+'The proxy module'<span> (</span><span class='info'>The Proxy Module</span><span>)</span></a> below.
+
 </p>
 <a name="s.upgrading0.10.0"></a><br /><hr />
 <table summary="layout" cellpadding="0" cellspacing="2" class="TOCbug" align="right"><tr><td class="TOCbug"><a href="#toc"> TOC </a></td></tr></table>
@@ -840,41 +882,22 @@
 Customize mechanism will be lost and the same values in
 <tt>loginconf</tt> arrays will not be recognized any longer.
 </p>
-<p>If you do not use HTTP proxy, you can skip this section because these
-changes will not affect you.
+<p>To learn how to adapt your current proxy settins to the current <em>Tkabber</em>
+version, read <a class='info' href='#ss.upgrading0.11.1.conf'>section above<span> (</span><span class='info'>Configuration options</span><span>)</span></a>, but remember
+that variables in the
+<tt>loginconf</tt> array mentioned there have been changed
+between 0.10.0 and 0.11.0. Use the map below as a reference which variable should actually be
+used:
 </p>
-<p>If your options are set using the <em>Customize</em> interface,
-write down values for options relevant to proxy server from the "Login"
-group of <em>Customize</em> settings, then after upgrade visit
-this group of settings, select "HTTPS" for the option
-<tt>::loginconf(proxy)</tt> and then fill in the rest
-of relevant settings with recorded values. As usual, save each setting after
-you change them. Do not be surprised with the word "HTTPS" (which stands for
-"HTTP over SSL"). It just means that <em>Tkabber</em> will use CONNECT
-method to tunnel TCP connection through a proxy.
-</p>
-<p>If you maintain <tt>loginconf</tt> arrays in config.tcl,
-you have to modify each array using this scheme:
-</p>
 <ul class="text">
-<li>Rename variable "useproxy", if present, to just "proxy" and change
-its value to either "https" if "useproxy" was set to true or to "none"
-(yes, the word "none", do not leave it empty) if it was set to false.
+<li>Variable "httpproxy"in 0.10.0  became "proxyhost" in 0.11.0.
 </li>
-<li>Modify existing variables in these arrays using this map:
-
-<ul class="text">
-<li>Rename "httpproxy" to "proxyhost".
+<li>Variable "httpport" became "proxyport".
 </li>
-<li>Rename "httpport" to "proxyport".
+<li>Variable "httplogin" became "proxyusername".
 </li>
-<li>Rename "httplogin" to "proxyusername".
+<li>Variable "httppassword" became "proxypassword".
 </li>
-<li>Rename "httppassword" to "proxypassword".
-</li>
-</ul>
-
-</li>
 </ul><p>
 
 </p>

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2013-12-29 08:06:08 UTC (rev 2034)
+++ trunk/tkabber/doc/tkabber.xml	2013-12-30 09:16:58 UTC (rev 2035)
@@ -451,7 +451,54 @@
 </section>
 
 <section anchor='ss.upgrading0.11.1.conf' title='Configuration options'>
-<t>There are notable changes in specifying a set of proxy servers.</t>
+<t>There are notable changes in specifying a set of proxy servers.
+If you define proxy server in the global <spanx style='verb'>loginconf</spanx>
+array then you'll have to do the following: In case if you use the
+<spanx>Customize</spanx> interface, you may open the <spanx>Manage proxy servers</spanx>
+dialog window and add your proxy server there. Note that if you're using
+the HTTPS proxy then you'll have to add it twice (one in the <spanx>Tunnels</spanx>
+tab and the other in the <spanx>HTTP</spanx> tab, see <xref target='s.postload-proxy'>section 'The proxy module'</xref>
+below). If you define proxy server in the <spanx>Tkabber</spanx> config file then
+you have lines similar to the following in the config:</t>
+<figure>
+<artwork><![CDATA[
+set loginconf(proxy) https
+set loginconf(proxyhost) proxy.example.com
+set loginconf(proxyport) 3128
+set loginconf(proxyusername) ""
+set loginconf(proxypassword) ""
+]]></artwork>
+</figure>
+
+<figure>
+<preamble>Replace them by the following:
+</preamble>
+<artwork><![CDATA[
+set proxy1(type) https
+set proxy1(host) proxy.example.com
+set proxy1(port) 3128
+set proxy1(username) ""
+set proxy1(password) ""
+set proxy1(match) *
+set proxy1(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
+
+set proxy2(type) http
+set proxy2(host) proxy.example.com
+set proxy2(port) 3128
+set proxy2(username) ""
+set proxy2(password) ""
+set proxy2(match) *
+set proxy2(exclude) "localhost* 127.0.0.* 172.* 192.168.* 10.*"
+
+set proxyconf(profile) Proxies
+set proxyconf(tunnel) {proxy1}
+set proxyconf(http) {proxy2}
+]]></artwork>
+<postamble>which will instruct <spanx>Tkabber</spanx> to use these proxies for all connections.
+If you need more complicated setup with several proxy profiles, read <xref target='s.postload-proxy'>section
+'The proxy module'</xref> below.
+</postamble>
+</figure>
 </section>
 </section>
 
@@ -473,35 +520,19 @@
 Customize mechanism will be lost and the same values in
 <spanx style='verb'>loginconf</spanx> arrays will not be recognized any longer.</t> 
 
-<t>If you do not use HTTP proxy, you can skip this section because these
-changes will not affect you.</t> 
-
-<t>If your options are set using the <spanx>Customize</spanx> interface,
-write down values for options relevant to proxy server from the "Login"
-group of <spanx>Customize</spanx> settings, then after upgrade visit
-this group of settings, select "HTTPS" for the option
-<spanx style='verb'>::loginconf(proxy)</spanx> and then fill in the rest
-of relevant settings with recorded values. As usual, save each setting after
-you change them. Do not be surprised with the word "HTTPS" (which stands for
-"HTTP over SSL"). It just means that <spanx>Tkabber</spanx> will use CONNECT
-method to tunnel TCP connection through a proxy.</t> 
-
-<t>If you maintain <spanx style='verb'>loginconf</spanx> arrays in config.tcl,
-you have to modify each array using this scheme:
+<t>To learn how to adapt your current proxy settins to the current <spanx>Tkabber</spanx>
+version, read <xref target='ss.upgrading0.11.1.conf'>section above</xref>, but remember
+that variables in the
+<spanx style='verb'>loginconf</spanx> array mentioned there have been changed
+between 0.10.0 and 0.11.0. Use the map below as a reference which variable should actually be
+used:
 <list style='symbols'>
-<t>Rename variable "useproxy", if present, to just "proxy" and change
-its value to either "https" if "useproxy" was set to true or to "none"
-(yes, the word "none", do not leave it empty) if it was set to false.</t>
-<t>Modify existing variables in these arrays using this map:
-<list style='symbols'>
-<t>Rename "httpproxy" to "proxyhost".</t>
-<t>Rename "httpport" to "proxyport".</t>
-<t>Rename "httplogin" to "proxyusername".</t>
-<t>Rename "httppassword" to "proxypassword".</t>
+<t>Variable "httpproxy"in 0.10.0  became "proxyhost" in 0.11.0.</t>
+<t>Variable "httpport" became "proxyport".</t>
+<t>Variable "httplogin" became "proxyusername".</t>
+<t>Variable "httppassword" became "proxypassword".</t>
 </list>
 </t>
-</list>
-</t>
 </section>
 
 <section anchor='ss.upgrading0.10.0.conf.fonts' title='Resources to control fonts'>



More information about the Tkabber-dev mailing list