[master] d61d82e Restructure and sync with reality

[Federico G. Schwindt]

commit d61d82eeb2cd9506d1288cd5137d551bee45f787
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sat Jun 4 16:41:10 2016 +0100

    Restructure and sync with reality

diff --git a/doc/sphinx/reference/varnishstat.rst b/doc/sphinx/reference/varnishstat.rst
index 5901a06..09bab41 100644
--- a/doc/sphinx/reference/varnishstat.rst
+++ b/doc/sphinx/reference/varnishstat.rst
@@ -109,10 +109,10 @@ The following keys control the interactive display:
 <CTRL+T>
 	Sample now.
 
-XML Output
-==========
+OUTPUTS
+=======
 
-When using the -x option, the output is::
+The XML output format is::
 
   <varnishstat timestamp="YYYY-MM-DDTHH:mm:SS">
     <stat>
@@ -127,10 +127,7 @@ When using the -x option, the output is::
     [..]
   </varnishstat>
 
-JSON OUTPUT
-===========
-
-With -j the output format is::
+The JSON output format is::
 
   {
     "timestamp": "YYYY-MM-DDTHH:mm:SS",
@@ -139,10 +136,10 @@ With -j the output format is::
       "type": "FIELD TYPE", "ident": "FIELD IDENT", "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
       "value": FIELD VALUE
     },
-    "FIELD2 NAME": {
-      "description": "FIELD2 DESCRIPTION",
-      "type": "FIELD2 TYPE", "ident": "FIELD2 IDENT", "flag": "FIELD2 SEMANTICS", "format": "FIELD2 DISPLAY FORMAT",
-      "value": FIELD2 VALUE
+    "FIELD NAME": {
+      "description": "FIELD DESCRIPTION",
+      "type": "FIELD TYPE", "ident": "FIELD IDENT", "flag": "FIELD SEMANTICS", "format": "FIELD DISPLAY FORMAT",
+      "value": FIELD VALUE
     },
     [..]
   }
@@ -151,9 +148,6 @@ With -j the output format is::
 Type and ident are optional.  Timestamp is the time when the report was
 generated by varnishstat.
 
-Repeated output with -1, -x or -j will have a single empty line (\\n)
-between each block of output.
-
 
 SEE ALSO
 ========