--------------------- PatchSet 6491 Date: 2008/01/11 02:23:50 Author: amosjeffries Branch: ayjwork Tag: (none) Log: Finaise Release Notes for include directive patch Members: doc/release-notes/release-3.1.html:1.1.6.2->1.1.6.3 doc/release-notes/release-3.1.man:1.1.6.2->1.1.6.3 Index: squid3/doc/release-notes/release-3.1.html =================================================================== RCS file: /cvsroot/squid-sf//squid3/doc/release-notes/release-3.1.html,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.html 18 Dec 2007 13:07:23 -0000 1.1.6.2 +++ squid3/doc/release-notes/release-3.1.html 11 Jan 2008 02:23:50 -0000 1.1.6.3 @@ -7,7 +7,7 @@

Squid 3.1.PRE1 release notes

-

Squid Developers

$Id: release-3.1.html,v 1.1.6.2 2007/12/18 13:07:23 amosjeffries Exp $ +

Squid Developers

$Id: release-3.1.html,v 1.1.6.3 2008/01/11 02:23:50 amosjeffries Exp $
This document contains the release notes for version 3.1 of Squid. Squid is a WWW Cache application developed by the National Laboratory @@ -166,6 +166,23 @@

+ +
include
+

New option to import entire secondary configuration files into squid.conf. +

+        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
+        
+
+

+

Index: squid3/doc/release-notes/release-3.1.man =================================================================== RCS file: /cvsroot/squid-sf//squid3/doc/release-notes/release-3.1.man,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.man 18 Dec 2007 13:07:23 -0000 1.1.6.2 +++ squid3/doc/release-notes/release-3.1.man 11 Jan 2008 02:23:50 -0000 1.1.6.3 @@ -1,4 +1,4 @@ -Squid 3.1.PRE1 release notesSquid Developers$Id: release-3.1.man,v 1.1.6.2 2007/12/18 13:07:23 amosjeffries Exp $This document contains the release notes for version 3.1 of Squid. +Squid 3.1.PRE1 release notesSquid Developers$Id: release-3.1.man,v 1.1.6.3 2008/01/11 02:23:50 amosjeffries Exp $This document contains the release notes for version 3.1 of Squid. Squid is a WWW Cache application developed by the National Laboratory for Applied Network Research and members of the Web Caching community.Notice @@ -204,6 +204,31 @@ .ec .ft P .sp +.Pp +.IP "include" +.nr bi 1 +.Pp +New option to import entire secondary configuration files into squid.conf. +.DS +.sp +.ft RR +.nf + 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 + +.DE +.fi +.ec +.ft P +.sp +.Pp .if \n(ll>1 .RE .nr ll -1 .Pp