Move back to development version and fix documentation to warn regarding HTML labels...

diff --git a/autogen.sh b/autogen.sh
index 1309c7caa9779c6a4fb1ffc334bee008ead542e3..a70835a1db7cbc31045070bb297abca80ce5b957 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,16 +33,16 @@ dnl For the micro number: 0 => in-progress development
 dnl                       timestamp => tar-file snapshot or release
 
 dnl uncomment the next 4 lines for development releases, minor version must be odd
-dnl m4_define([graphviz_version_major],[2])
-dnl m4_define([graphviz_version_minor],[43])
-dnl m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
-dnl m4_define([graphviz_collection],[development])
+m4_define([graphviz_version_major],[2])
+m4_define([graphviz_version_minor],[43])
+m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+m4_define([graphviz_collection],[development])
 
 dnl uncomment the next 4 lines for stable releases, minor version must be even
-m4_define([graphviz_version_major],[2])
-m4_define([graphviz_version_minor],[42])
-m4_define([graphviz_version_micro],[2])
-m4_define([graphviz_collection],[stable])
+dnl m4_define([graphviz_version_major],[2])
+dnl m4_define([graphviz_version_minor],[42])
+dnl m4_define([graphviz_version_micro],[2])
+dnl m4_define([graphviz_collection],[stable])
 
 m4_define([graphviz_version_date],[$GRAPHVIZ_VERSION_DATE])
 m4_define([graphviz_change_date],["$GRAPHVIZ_CHANGE_DATE"])

diff --git a/doc/info/shapes.html b/doc/info/shapes.html
index 1f84cf1271da6666b32c8272f792b7f95dfc7b92..4819099f2e5378071d64418a47cf0446a9921123 100644 (file)
--- a/doc/info/shapes.html
+++ b/doc/info/shapes.html
@@ -499,7 +499,7 @@ In particular, if a node has set its
 attribute to <TT>none</TT> or <TT>plaintext</TT>, the HTML label will be the node's
 shape. On the other hand, if the node has any other shape (except 
 <TT>point</TT>), the HTML label will be embedded within the node the
-same way an ordinary label would be.
+same way an ordinary label would be. Adding HTML labels to record-based shapes (record and Mrecord) is discouraged and may lead to unexpected behavior because of their conflicting label schemas and overlapping functionality.
 <P>
 The following is an abstract grammar for HTML labels.
 Terminals, corresponding to elements, are shown in bold font,

diff --git a/doc/infosrc/html.1 b/doc/infosrc/html.1
index 6a20508c80df3a43b11c0f5db56323519ba2610c..dc2d58a882d2cc3a16b15e5c78d9bbe38af6a124 100644 (file)
--- a/doc/infosrc/html.1
+++ b/doc/infosrc/html.1
@@ -54,7 +54,7 @@ In particular, if a node has set its
 attribute to <TT>none</TT> or <TT>plaintext</TT>, the HTML label will be the node's
 shape. On the other hand, if the node has any other shape (except 
 <TT>point</TT>), the HTML label will be embedded within the node the
-same way an ordinary label would be.
+same way an ordinary label would be. Adding HTML labels to record-based shapes (record and Mrecord) is discouraged and may lead to unexpected behavior because of their conflicting label schemas and overlapping functionality.
 <P>
 The following is an abstract grammar for HTML labels.
 Terminals, corresponding to elements, are shown in bold font,