From: hno <>
Date: Sun, 7 Sep 2003 23:55:53 +0000 (+0000)
Subject: Documentation update to document all the accelerator options in https_port.
X-Git-Tag: SQUID_3_0_PRE4~1213
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=116c6cca338b99db13e84cfc7d3bf9ba0e86ea01;p=thirdparty%2Fsquid.git

Documentation update to document all the accelerator options in https_port.

also cleaned up http_port options to follow the same style as https_port
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 8b81eb01ee..92fe3fe235 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.341 2003/08/31 21:20:08 robertc Exp $
+# $Id: cf.data.pre,v 1.342 2003/09/07 17:55:53 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -80,17 +80,25 @@ DOC_START
 
 	You may specify multiple socket addresses on multiple lines.
 
-	options are:
-		accel		Accelerator mode
-		transparent	Support for transparent proxies
-		vhost		Accelerator using Host directive
-		vport		Accelerator with IP virtual host support
-		vport=NN	As above, but uses specified port number
-				rather than the http_port number.
-		defaultsite=xx	Main web site name for accelerators.
-				also implies accel
-		protocol=	Protocol to reconstruct accelerated
-				requests with. Defaults to http.
+	Options:
+
+	   transparent	Support for transparent proxies
+
+	   accel	Accelerator mode. Also set implicit by the other
+			accelerator directives
+
+	   vhost	Accelerator mode using Host header for virtual
+			domain support
+
+	   vport	Accelerator with IP based virtual host support
+
+	   vport=NN	As above, but uses specified port number rather
+			than the http_port number
+
+	   defaultsite= Main web site name for accelerators
+
+	   protocol=	Protocol to reconstruct accelerated requests with.
+			Defaults to http
 
 	If you run Squid on a dual-homed machine with an internal
 	and an external interface then we recommend you to specify the
@@ -123,10 +131,10 @@ DOC_START
 	Options:
 
 	   defaultsite=	The name of the https site presented on
-	   		this port.
+	   		this port
 
 	   protocol=	Protocol to reconstruct accelerated requests
-	   		with. Defaults to https.
+	   		with. Defaults to https
 
 	   cert=	Path to SSL certificate (PEM format)
 		
@@ -151,14 +159,14 @@ DOC_START
 			    SINGLE_DH_USE Always create a new key when using
 				      temporary/ephemeral DH key exchanges
 			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-			documentation for a complete list of options.
+			documentation for a complete list of options
 
 	   clientca=	File containing the list of CAs to use when
 			requesting a client certificate
 
 	   cafile=	File containing additional CA certificates to
 			use when verifying client certificates. If unset
-			clientca will be used.
+			clientca will be used
 
 	   capath=	Directory containing additional CA certificates
 			to use when verifying client certificates
@@ -173,7 +181,18 @@ DOC_START
 				requires a certificate
 			    NO_DEFAULT_CA	
 				Don't use the default CA list built in
-				to OpenSSL.
+				to OpenSSL
+
+	   accel	Accelerator mode. Also set implicit by the other
+			accelerator directives
+
+	   vhost	Accelerator mode using Host header for virtual
+			domain support
+
+	   vport	Accelerator with IP based virtual host support
+
+	   vport=NN	As above, but uses specified port number rather
+			than the https_port number
 
 DOC_END