---------------------
PatchSet 6488 
Date: 2008/01/10 14:28:18
Author: amosjeffries
Branch: ayjwork
Tag: (none) 
Log:
Release Notes about include directive

Members: 
	doc/release-notes/release-3.1.sgml:1.1.6.2->1.1.6.3 

Index: squid3/doc/release-notes/release-3.1.sgml
===================================================================
RCS file: /cvsroot/squid-sf//squid3/doc/release-notes/release-3.1.sgml,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -r1.1.6.2 -r1.1.6.3
--- squid3/doc/release-notes/release-3.1.sgml	18 Dec 2007 13:07:23 -0000	1.1.6.2
+++ squid3/doc/release-notes/release-3.1.sgml	10 Jan 2008 14:28:18 -0000	1.1.6.3
@@ -2,7 +2,7 @@
 <article>
 <title>Squid 3.1.PRE1 release notes</title>
 <author>Squid Developers</author>
-<date>$Id: release-3.1.sgml,v 1.1.6.2 2007/12/18 13:07:23 amosjeffries Exp $</date>
+<date>$Id: release-3.1.sgml,v 1.1.6.3 2008/01/10 14:28:18 amosjeffries Exp $</date>
 
 <abstract>
 This document contains the release notes for version 3.1 of Squid.
@@ -151,6 +151,21 @@
                 *) Doubles the load placed by squid on the DNS network.
                 *) May negatively impact connection delay times.
         </verb>
+
+	<tag>include</tag>
+	<p>New option to import entire secondary configuration files into squid.conf.
+	<verb>
+	Squid will follow the files immediately and insert all their content
+	as if it was at that position in squid.conf. As per squid.conf some
+	options are order-specific within the config as a whole.
+	
+	A few layers of include are allowed, but too many are confusing and
+	squid will enforce an include depth of 16 files.
+	
+        Syntax:
+           include /path/to/file1 /path/to/file2
+	</verb>
+
 </descrip>