[master] 379704d merge

[Per Buer]

commit 379704da8ab6b581978a62d6ffb43e63a565fe8b
Merge: 9ed7ae7 ebb6670
Author: Per Buer <per.buer at gmail.com>
Date:   Wed Feb 27 19:55:53 2013 +0100

    merge

diff --cc doc/sphinx/reference/varnishd.rst
index 79ff54a,a51039c..201c99a
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@@ -152,36 -156,6 +156,35 @@@ critbi
    comparison to a more traditional B tree the critbit tree is almost
    completely lockless.
  
 +Storage Types
 +-------------
 +
 +The following storage types are available:
 +
 +malloc
 +~~~~~~
 +
 +syntax: malloc[,size]
 +
 +malloc is a memory based backend.
 +
 +file
 +~~~~
 +
 +syntax: file[,path[,size[,granularity]]]
 +
 +The file backend stores data in a file on disk. The file will be accessed using mmap.
 +
 +persistent (experimental)
 +~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +syntax: persistent,path,size
 +
 +Persistent storage. Varnish will store objects in a file in a manner
 +that will secure the survival of *most* of the objects in the event of
 +a planned or unplanned shutdown of Varnish.
 +
 +
- 
  Management Interface
  --------------------
  
diff --cc doc/sphinx/users-guide/storage-backends.rst
index 60476b7,acad31b..2bf2bd8
--- a/doc/sphinx/users-guide/storage-backends.rst
+++ b/doc/sphinx/users-guide/storage-backends.rst
@@@ -1,3 -1,6 +1,4 @@@
 -
 -
+ .. _guide-storage:
  
  Storage backends
  ----------------