Merge r4669: Document that TTL is no longer taken into account for beresp.cacheable

git-svn-id: http://www.varnish-cache.org/svn/branches/2.1@4704 d4fa192b-c00b-0410-8231-f00ffab90ce4

lib/libvcl/vcc_fixed_token.c

@@ -227,8 +227,8 @@ vcl_output_lang_h(struct vsb *sb)
 	vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
 	vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
 	vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
-	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4695 2010-04-19 13:");
-	vsb_cat(sb, "03:14Z tfheen $\n *\n * Runtime support for compiled V");
+	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4703 2010-04-21 09:");
+	vsb_cat(sb, "18:39Z tfheen $\n *\n * Runtime support for compiled V");
 	vsb_cat(sb, "CL programs.\n *\n * XXX: When this file is changed, l");
 	vsb_cat(sb, "ib/libvcl/vcc_gen_fixed_token.tcl\n");
 	vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");

man/vcl.7so

@@ -586,13 +586,8 @@ The HTTP status message returned by the server.
 .It Va obj.cacheable
 True if the request resulted in a cacheable response.
 .\" see cache_center.c and rfc2616.c for details
-A response is considered cacheable if it is valid (see above), the
-HTTP status code is 200, 203, 300, 301, 302, 404 or 410 and it has a
-non-zero time-to-live when
-.Cm Expires
-and
-.Cm Cache-Control
-headers are taken into account.
+A response is considered cacheable if it is valid (see above), and the
+HTTP status code is 200, 203, 300, 301, 302, 404 or 410.
 .It Va obj.ttl
 The object's remaining time to live, in seconds.
 .It Va obj.lastuse