Better explain optional wrapping around images and figures

in the test document.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@5949 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

3 files changed, 30 insertions, 33 deletions

diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index 9518ac2de..5f1acb9ec 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -554,11 +554,13 @@ document (a document-wide <a class="reference internal" href="#table-of-contents
 <p>A left-aligned image:</p>
 <img align="left" alt="../../../docs/user/rst/images/biohazard.png" class="align-left" src="../../../docs/user/rst/images/biohazard.png" />
 <p>This paragraph might flow around the image.
-If it does or not, depends on the output format and the viewer.</p>
+The specific behavior depends upon the style sheet and
+the browser or rendering software used.</p>
 <p>A right-aligned image:</p>
 <img align="right" alt="../../../docs/user/rst/images/biohazard.png" class="align-right" src="../../../docs/user/rst/images/biohazard.png" />
 <p>This paragraph might flow around the image.
-If it does or not, depends on the output format and the viewer.</p>
+The specific behavior depends upon the style sheet and
+the browser or rendering software used.</p>
 <p>For inline images see <a class="reference internal" href="#substitution-definitions">Substitution Definitions</a>.</p>
 <p>Image size:</p>
 <p>An image 2 em wide:</p>
@@ -605,8 +607,8 @@ layout.</p>
 <p>The legend may consist of several paragraphs.</p>
 </div>
 </div>
-<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt>
-argument is set and smaller than the text width.</p>
+<p>This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.</p>
 <p>A centered figure:</p>
 <div align="center" class="figure">
 <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="width: 50px;" />
@@ -616,8 +618,8 @@ argument is set and smaller than the text width.</p>
 <p>The legend may consist of several paragraphs.</p>
 </div>
 </div>
-<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt>
-argument is set and smaller than the text width.</p>
+<p>This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.</p>
 <p>A right-aligned figure:</p>
 <div align="right" class="figure">
 <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="width: 50px;" />
@@ -627,8 +629,8 @@ argument is set and smaller than the text width.</p>
 <p>The legend may consist of several paragraphs.</p>
 </div>
 </div>
-<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt>
-argument is set and smaller than the text width.</p>
+<p>This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.</p>
 </div>
 <div class="section" id="admonitions">
 <h3><a class="toc-backref" href="#id75">2.14.3&nbsp;&nbsp;&nbsp;Admonitions</a></h3>
diff --git a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
index 84820e46e..1f95a38cd 100644
--- a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
+++ b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
@@ -1168,13 +1168,15 @@
                 <image align="left" uri="../../../docs/user/rst/images/biohazard.png">
                 <paragraph>
                     This paragraph might flow around the image.
-                    If it does or not, depends on the output format and the viewer.
+                    The specific behavior depends upon the style sheet and
+                    the browser or rendering software used.
                 <paragraph>
                     A right-aligned image:
                 <image align="right" uri="../../../docs/user/rst/images/biohazard.png">
                 <paragraph>
                     This paragraph might flow around the image.
-                    If it does or not, depends on the output format and the viewer.
+                    The specific behavior depends upon the style sheet and
+                    the browser or rendering software used.
                 <paragraph>
                     For inline images see 
                     <reference name="Substitution Definitions" refid="substitution-definitions">
@@ -1246,11 +1248,8 @@
                         <paragraph>
                             The legend may consist of several paragraphs.
                 <paragraph>
-                    This paragraph might flow around the figure if the 
-                    <literal>
-                        figwidth
-                    
-                    argument is set and smaller than the text width.
+                    This paragraph might flow around the figure. The specific behavior depends
+                    upon the style sheet and the browser or rendering software used.
                 <paragraph>
                     A centered figure:
                 <figure align="center">
@@ -1263,11 +1262,8 @@
                         <paragraph>
                             The legend may consist of several paragraphs.
                 <paragraph>
-                    This paragraph might flow around the figure if the 
-                    <literal>
-                        figwidth
-                    
-                    argument is set and smaller than the text width.
+                    This paragraph might flow around the figure. The specific behavior depends
+                    upon the style sheet and the browser or rendering software used.
                 <paragraph>
                     A right-aligned figure:
                 <figure align="right">
@@ -1280,11 +1276,8 @@
                         <paragraph>
                             The legend may consist of several paragraphs.
                 <paragraph>
-                    This paragraph might flow around the figure if the 
-                    <literal>
-                        figwidth
-                    
-                    argument is set and smaller than the text width.
+                    This paragraph might flow around the figure. The specific behavior depends
+                    upon the style sheet and the browser or rendering software used.
             <section ids="admonitions" names="admonitions">
                 <title auto="1" refid="id74">
                     <generated classes="sectnum">
diff --git a/docutils/test/functional/input/data/standard.txt b/docutils/test/functional/input/data/standard.txt
index 1f71e0473..7e8e626d5 100644
--- a/docutils/test/functional/input/data/standard.txt
+++ b/docutils/test/functional/input/data/standard.txt
@@ -450,7 +450,8 @@ A left-aligned image:
    :align: left
 
 This paragraph might flow around the image.
-If it does or not, depends on the output format and the viewer.
+The specific behavior depends upon the style sheet and
+the browser or rendering software used.
 
 A right-aligned image:
 
@@ -458,7 +459,8 @@ A right-aligned image:
    :align: right
 
 This paragraph might flow around the image.
-If it does or not, depends on the output format and the viewer.
+The specific behavior depends upon the style sheet and
+the browser or rendering software used.
 
 For inline images see `Substitution Definitions`_.
 
@@ -522,8 +524,8 @@ A left-aligned figure:
 
    The legend may consist of several paragraphs.
 
-This paragraph might flow around the figure if the ``figwidth``
-argument is set and smaller than the text width.
+This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.
 
 A centered figure:
 
@@ -537,8 +539,8 @@ A centered figure:
 
    The legend may consist of several paragraphs.
 
-This paragraph might flow around the figure if the ``figwidth``
-argument is set and smaller than the text width.
+This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.
 
 A right-aligned figure:
 
@@ -552,8 +554,8 @@ A right-aligned figure:
 
    The legend may consist of several paragraphs.
 
-This paragraph might flow around the figure if the ``figwidth``
-argument is set and smaller than the text width.
+This paragraph might flow around the figure. The specific behavior depends
+upon the style sheet and the browser or rendering software used.
 
 
 Admonitions