[privoxy-commits] current config,1.101,1.102

[Fabian K. <fab...@us...>]

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16081

Modified Files:
	config 
Log Message:
Regenerate config


Index: config
===================================================================
RCS file: /cvsroot/ijbswa/current/config,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** config	9 Jan 2013 15:19:47 -0000	1.101
--- config	5 Feb 2013 14:08:37 -0000	1.102
***************
*** 69,73 ****
  #
  #
- #
  #  1. LOCAL SET-UP DOCUMENTATION
  #  ==============================
--- 69,72 ----
***************
*** 78,82 ****
  #
  #
- #
  #  1.1. user-manual
  #  =================
--- 77,80 ----
***************
*** 132,136 ****
  #user-manual http://www.privoxy.org/user-manual/
  #
- #
  #  1.2. trust-info-url
  #  ====================
--- 130,133 ----
***************
*** 169,173 ****
  #trust-info-url  http://www.example.com/what_we_allow.html
  #
- #
  #  1.3. admin-address
  #  ===================
--- 166,169 ----
***************
*** 198,202 ****
  #admin-address pri...@ex...
  #
- #
  #  1.4. proxy-info-url
  #  ====================
--- 194,197 ----
***************
*** 230,234 ****
  #proxy-info-url http://www.example.com/proxy-service.html
  #
- #
  #  2. CONFIGURATION AND LOG FILE LOCATIONS
  #  ========================================
--- 225,228 ----
***************
*** 243,247 ****
  #
  #
- #
  #  2.1. confdir
  #  =============
--- 237,240 ----
***************
*** 269,273 ****
  confdir .
  #
- #
  #  2.2. templdir
  #  ==============
--- 262,265 ----
***************
*** 299,303 ****
  #templdir .
  #
- #
  #  2.3. logdir
  #  ============
--- 291,294 ----
***************
*** 326,330 ****
  logdir .
  #
- #
  #  2.4. actionsfile
  #  =================
--- 317,320 ----
***************
*** 373,377 ****
  actionsfile user.action      # User customizations
  #
- #
  #  2.5. filterfile
  #  ================
--- 363,366 ----
***************
*** 419,423 ****
  filterfile user.filter      # User customizations
  #
- #
  #  2.6. logfile
  #  =============
--- 408,411 ----
***************
*** 466,470 ****
  logfile logfile
  #
- #
  #  2.7. trustfile
  #  ===============
--- 454,457 ----
***************
*** 523,527 ****
  #trustfile trust
  #
- #
  #  3. DEBUGGING
  #  =============
--- 510,513 ----
***************
*** 532,536 ****
  #
  #
- #
  #  3.1. debug
  #  ===========
--- 518,521 ----
***************
*** 608,612 ****
  #debug  8192 # Non-fatal errors
  #
- #
  #  3.2. single-threaded
  #  =====================
--- 593,596 ----
***************
*** 636,640 ****
  #single-threaded
  #
- #
  #  3.3. hostname
  #  ==============
--- 620,623 ----
***************
*** 672,676 ****
  #hostname hostname.example.org
  #
- #
  #  4. ACCESS CONTROL AND SECURITY
  #  ===============================
--- 655,658 ----
***************
*** 680,684 ****
  #
  #
- #
  #  4.1. listen-address
  #  ====================
--- 662,665 ----
***************
*** 779,783 ****
  listen-address  127.0.0.1:8118
  #
- #
  #  4.2. toggle
  #  ============
--- 760,763 ----
***************
*** 808,812 ****
  toggle  1
  #
- #
  #  4.3. enable-remote-toggle
  #  ==========================
--- 788,791 ----
***************
*** 851,855 ****
  enable-remote-toggle  0
  #
- #
  #  4.4. enable-remote-http-toggle
  #  ===============================
--- 830,833 ----
***************
*** 890,894 ****
  enable-remote-http-toggle  0
  #
- #
  #  4.5. enable-edit-actions
  #  =========================
--- 868,871 ----
***************
*** 931,935 ****
  enable-edit-actions 0
  #
- #
  #  4.6. enforce-blocks
  #  ====================
--- 908,911 ----
***************
*** 980,984 ****
  enforce-blocks 0
  #
- #
  #  4.7. ACLs: permit-access and deny-access
  #  =========================================
--- 956,959 ----
***************
*** 1092,1096 ****
  #
  #
- #
  #  4.8. buffer-limit
  #  ==================
--- 1067,1070 ----
***************
*** 1130,1134 ****
  buffer-limit 4096
  #
- #
  #  5. FORWARDING
  #  ==============
--- 1104,1107 ----
***************
*** 1154,1158 ****
  #
  #
- #
  #  5.1. forward
  #  =============
--- 1127,1130 ----
***************
*** 1222,1226 ****
  #
  #
- #
  #  5.2. forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t
  #  =========================================================================
--- 1194,1197 ----
***************
*** 1323,1327 ****
  #
  #
- #
  #  5.3. forwarded-connect-retries
  #  ===============================
--- 1294,1297 ----
***************
*** 1372,1380 ****
  forwarded-connect-retries  0
  #
- #
  #  6. MISCELLANEOUS
  #  =================
  #
- #
  #  6.1. accept-intercepted-requests
  #  =================================
--- 1342,1348 ----
***************
*** 1415,1419 ****
  accept-intercepted-requests 0
  #
- #
  #  6.2. allow-cgi-request-crunching
  #  =================================
--- 1383,1386 ----
***************
*** 1453,1457 ****
  allow-cgi-request-crunching 0
  #
- #
  #  6.3. split-large-forms
  #  =======================
--- 1420,1423 ----
***************
*** 1496,1500 ****
  split-large-forms 0
  #
- #
  #  6.4. keep-alive-timeout
  #  ========================
--- 1462,1465 ----
***************
*** 1553,1557 ****
  keep-alive-timeout 5
  #
- #
  #  6.5. tolerate-pipelining
  #  =========================
--- 1518,1521 ----
***************
*** 1597,1601 ****
  tolerate-pipelining 1
  #
- #
  #  6.6. default-server-timeout
  #  ============================
--- 1561,1564 ----
***************
*** 1649,1653 ****
  #default-server-timeout 60
  #
- #
  #  6.7. connection-sharing
  #  ========================
--- 1612,1615 ----
***************
*** 1720,1724 ****
  #connection-sharing 1
  #
- #
  #  6.8. socket-timeout
  #  ====================
--- 1682,1685 ----
***************
*** 1753,1757 ****
  socket-timeout 300
  #
- #
  #  6.9. max-client-connections
  #  ============================
--- 1714,1717 ----
***************
*** 1809,1813 ****
  #max-client-connections 256
  #
! #  1.6.10. handle-as-empty-doc-returns-ok
  #
  #  Specifies:
--- 1769,1774 ----
  #max-client-connections 256
  #
! #  6.10. handle-as-empty-doc-returns-ok
! #  =====================================
  #
  #  Specifies:
***************
*** 1846,1850 ****
  #handle-as-empty-doc-returns-ok 1
  #
! #  1.6.11. enable-compression
  #
  #  Specifies:
--- 1807,1812 ----
  #handle-as-empty-doc-returns-ok 1
  #
! #  6.11. enable-compression
! #  =========================
  #
  #  Specifies:
***************
*** 1886,1890 ****
  #enable-compression 1
  #
! #  1.6.12. compression-level
  #
  #  Specifies:
--- 1848,1853 ----
  #enable-compression 1
  #
! #  6.12. compression-level
! #  ========================
  #
  #  Specifies:
***************
*** 1931,1935 ****
  #compression-level 1
  #
! #  1.6.13. client-header-order
  #
  #  Specifies:
--- 1894,1899 ----
  #compression-level 1
  #
! #  6.13. client-header-order
! #  ==========================
  #
  #  Specifies:
***************
*** 1971,1974 ****
--- 1935,1939 ----
  #   Referer \
  #   Cookie \
+ #   DNT \
  #   If-Modified-Since \
  #   Cache-Control \
***************
*** 1977,1981 ****
  #
  #
- #
  #  7. WINDOWS GUI OPTIONS
  #  =======================
--- 1942,1945 ----