From 439aa36e3f2cf5b540a1424b2e341ba593191b97 Mon Sep 17 00:00:00 2001
From: "Emden R. Gansner" <erg@alum.mit.edu>
Date: Tue, 22 Oct 2013 11:17:51 -0400
Subject: [PATCH] Update output format documentation to provide more info on
 xdot formats and versions.

---
 doc/info/output.html | 10 +++++++++-
 doc/infosrc/outputs  |  8 ++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/info/output.html b/doc/info/output.html
index 3f3e81035..21c712780 100644
--- a/doc/info/output.html
+++ b/doc/info/output.html
@@ -37,6 +37,8 @@ formats need to be interpreted in this manner.
  <TR><TD ALIGN=CENTER><A NAME=a:canon HREF=#d:canon>canon</A>
 <BR><A NAME=a:dot HREF=#d:dot>dot</A>
 <BR><A NAME=a:xdot HREF=#d:xdot>xdot</A>
+<BR><A NAME=a:xdot1.2 HREF=#d:xdot1.2>xdot1.2</A>
+<BR><A NAME=a:xdot1.4 HREF=#d:xdot1.4>xdot1.4</A>
 </TD><TD>DOT</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:cmap HREF=#d:cmap>cmap</A>
 </TD><TD>Client-side imagemap (deprecated)</TD> </TR>
@@ -103,6 +105,8 @@ formats need to be interpreted in this manner.
 <DT><A NAME=d:canon HREF=#a:canon><STRONG>canon</STRONG></A>
 ,<DT><A NAME=d:dot HREF=#a:dot><STRONG>dot</STRONG></A>
 ,<DT><A NAME=d:xdot HREF=#a:xdot><STRONG>xdot</STRONG></A>
+,<DT><A NAME=d:xdot1.2 HREF=#a:xdot1.2><STRONG>xdot1.2</STRONG></A>
+,<DT><A NAME=d:xdot1.4 HREF=#a:xdot1.4><STRONG>xdot1.4</STRONG></A>
 <DD>These formats produce output in the
 <A HREF=lang.html>dot language</A>.
 Using <B>canon</B> produces a prettyprinted version of the input,
@@ -135,10 +139,14 @@ The <B>xdot</B> format extends the
 how graph components are drawn. It relies on additional attributes
 for nodes, edges and graphs.
 <P>
-The format is preliminary; comments and
+The format is fluid; comments and
 suggestions for better representations are welcome.
 To allow for changes in the format, Graphviz attaches the attribute
 <TT>xdotversion</TT> to the graph.
+If the <TT>xdotversion</TT> attribute is set in the input graph, the renderer
+will only output features supported by that version. Note that the formats <TT>xdot1.2</TT>
+and <TT>xdot1.4</TT> are equivalent to setting <TT>xdotversion=1.2</TT> and <TT>xdotversion=1.4</TT>,
+respectively.
 <P>
 Additional drawing attributes can appear on nodes, edges, clusters and 
 on the graph itself. There are six new attributes: 
diff --git a/doc/infosrc/outputs b/doc/infosrc/outputs
index 7f2e8a1fc..a96c8b720 100644
--- a/doc/infosrc/outputs
+++ b/doc/infosrc/outputs
@@ -152,7 +152,7 @@ Produce <A HREF="http://www.adobe.com/svg/">SVG</A> output,
 the latter in compressed format.
 <P>
 See <A HREF=#ID>Note</A>.
-:canon/dot/xdot:DOT
+:canon/dot/xdot/xdot1.2/xdot1.4:DOT
 These formats produce output in the
 <A HREF=lang.html>dot language</A>.
 Using <B>canon</B> produces a prettyprinted version of the input,
@@ -185,10 +185,14 @@ The <B>xdot</B> format extends the
 how graph components are drawn. It relies on additional attributes
 for nodes, edges and graphs.
 <P>
-The format is preliminary; comments and
+The format is fluid; comments and
 suggestions for better representations are welcome.
 To allow for changes in the format, Graphviz attaches the attribute
 <TT>xdotversion</TT> to the graph.
+If the <TT>xdotversion</TT> attribute is set in the input graph, the renderer
+will only output features supported by that version. Note that the formats <TT>xdot1.2</TT>
+and <TT>xdot1.4</TT> are equivalent to setting <TT>xdotversion=1.2</TT> and <TT>xdotversion=1.4</TT>,
+respectively.
 <P>
 Additional drawing attributes can appear on nodes, edges, clusters and 
 on the graph itself. There are six new attributes: 
-- 
2.40.0