Join modifications from branch OCC_debug_for_3_2_0b1

[modules/smesh.git] / doc / salome / gui / SMESH / files / about_hypotheses.htm

diff --git a/doc/salome/gui/SMESH/files/about_hypotheses.htm b/doc/salome/gui/SMESH/files/about_hypotheses.htm
index 1ed1981452bd572bb55caca424a203e3ca7633e5..568ceec0ca689a5dd95964a28c9dbaf489a7e9dd 100755 (executable)
--- a/doc/salome/gui/SMESH/files/about_hypotheses.htm
+++ b/doc/salome/gui/SMESH/files/about_hypotheses.htm
@@ -109,41 +109,46 @@ else
        <ul type="disc" class="whs2">\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3">Arithmetic \r
- 1D</p></li>\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#arithmetic_1D">Arithmetic 1D</a></p></li>\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3">Average \r
- Length</p></li>\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#Average_length">Average Length</a></p></li>\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3">Deflection \r
- 1D </p></li>\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#deflection_1D">Deflection 1D </a></p></li>\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3">Number \r
- of segments</p></li>\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#Number_of_elements">Number of segments</a></p></li>\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3">Start \r
- and end length</p></li>\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#start_and_end_length">Start and end length</a></p></li>\r
+               \r
+               <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
+                       class=kadov-p><p class="whs3"><a href="arithmetic_1d.htm#automatic_length">Automatic Length</a></p></li>\r
        </ul>\r
        \r
        <li style="list-style: circle; /*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
                type=circle\r
-               class=kadov-p><p class="whs3">2D \r
- Hypothesis (for meshing of <span style="font-weight: bold;"><B>faces)</B></span>: \r
- </p></li>\r
+               class=kadov-p><p class="whs3"><a href="max._element_area_hypothesis.htm">2D Hypotheses</a> (for meshing \r
+ of <span style="font-weight: bold;"><B>faces)</B></span>: </p></li>\r
 </ul>\r
 \r
-<ul type="disc" class="whs2">\r
+<ol type="disc" class="whs4">\r
        \r
        <ul type="disc" class="whs2">\r
                \r
                <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
-                       class=kadov-p><p class="whs3"><a href="max._element_area_hypothesis.htm">Max Element Area</a></p></li>\r
+                       class=kadov-p><p class="whs3"><a href="max._element_area_hypothesis.htm#max_element_area">Max Element Area</a></p></li>\r
+               \r
+               <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
+                       class=kadov-p><p class="whs3"><a href="max._element_area_hypothesis.htm#length_from_edges">Length from \r
+ Edges</a></p></li>\r
+               \r
+               <li style="/*begin!kadov{{*/ color: #000000; /*}}end!kadov*/ "\r
+                       class=kadov-p><p class="whs3"><a href="max._element_area_hypothesis.htm#quadrangle preference">Quadrangle \r
+ Preference</a></p></li>\r
        </ul>\r
-</ul>\r
+</ol>\r
 \r
 <ul type="disc" class="whs2">\r
        \r
@@ -165,17 +170,17 @@ else
 <p>There also exist some <a href="non_conform_mesh_allowed_hypothesis.htm">Additional \r
  Hypotheses</a></p>\r
 \r
-<ol type="disc" class="whs4">\r
+<ul type="disc" class="whs2">\r
        \r
        <ul type="disc" class="whs2">\r
                \r
                <li class=kadov-p><p>Propagation of 1D Hypothesis on opposite edges</p></li>\r
                \r
-               <li class=kadov-p><p>Length from edges</p></li>\r
-               \r
                <li class=kadov-p><p>Non conform mesh allowed</p></li>\r
+               \r
+               <li class=kadov-p><p>Quadratic mesh</p></li>\r
        </ul>\r
-</ol>\r
+</ul>\r
 \r
 <p>&nbsp;</p>\r
 \r