r2522 - in branches/1.1: . bin/varnishd man

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-02-20 14:56:36 +0100 (Wed, 20 Feb 2008)
New Revision: 2522

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/varnishd.1
   branches/1.1/man/vcl.7
Log:
Merged revisions 2421-2422,2426,2432-2434,2447 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2421 | ssm | 2008-02-04 10:32:23 +0100 (Mon, 04 Feb 2008) | 1 line
  
  Add documentation for req.hash
........
  r2422 | ssm | 2008-02-04 10:35:53 +0100 (Mon, 04 Feb 2008) | 1 line
  
  Typo patrol
........
  r2447 | ssm | 2008-02-12 07:52:33 +0100 (Tue, 12 Feb 2008) | 1 line
  
  Add information to \"-a\" about how to listen on multiple hosts or ports
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2357-2359,2361-2364,2366,2374-2381,2383-2386,2414-2415,2426,2432-2434,2444-2445,2457,2492-2494,2500-2502
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2357-2359,2361-2364,2366,2374-2381,2383-2386,2414-2415,2421-2422,2426,2432-2434,2444-2445,2447,2457,2492-2494,2500-2502

Modified: branches/1.1/bin/varnishd/varnishd.1
===================================================================
--- branches/1.1/bin/varnishd/varnishd.1	2008-02-20 13:39:59 UTC (rev 2521)
+++ branches/1.1/bin/varnishd/varnishd.1	2008-02-20 13:56:36 UTC (rev 2522)
@@ -83,7 +83,11 @@
 .Ar port
 is not specified, the default HTTP port as listed in
 .Pa /etc/services
-is used.
+is used.  To listen on multiple hosts or ports, the argument to 
+.Fl a
+can be a (quoted) whitespace separated list of
+.Ar address Ns Op : Ns Ar port
+tokens.
 .It Fl b Ar host Ns Op : Ns Ar port
 Use the specified
 .Ar host

Modified: branches/1.1/man/vcl.7
===================================================================
--- branches/1.1/man/vcl.7	2008-02-20 13:39:59 UTC (rev 2521)
+++ branches/1.1/man/vcl.7	2008-02-20 13:56:36 UTC (rev 2522)
@@ -442,6 +442,14 @@
 seconds.
 .El
 .Pp
+The following variables are available while determining the hash key
+of an object:
+.Bl -tag -width 4n
+.It Va req.hash
+The hash key used to refer to an object in the cache.  Used when both
+reading from and writing to the cache.
+.El
+.Pp
 The following variables are available while preparing a response to
 the client:
 .Bl -tag -width 4n