moved doc on fuse,compound and partition usage from: "First steps in geom" to a FAQ...

diff --git a/doc/salome/gui/GEOM/input/faq.doc b/doc/salome/gui/GEOM/input/faq.doc
new file mode 100644 (file)
index 0000000..f6ae6c3
--- /dev/null
+++ b/doc/salome/gui/GEOM/input/faq.doc
@@ -0,0 +1,12 @@
+/*!
+
+\page faq FAQ ("Frequently Asked Questions")
+
+You can find here some the answer to some frequentlyasked questions:
+
+<ul>
+<li>\subpage partition_explanation "What's the difference between partition, compounds and fuse operation ?" </li>
+</ul>
+
+
+*/

diff --git a/doc/salome/gui/GEOM/input/first_steps_guide.doc b/doc/salome/gui/GEOM/input/first_steps_guide.doc
deleted file mode 100644 (file)
index 17ca4e8..0000000
--- a/doc/salome/gui/GEOM/input/first_steps_guide.doc
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
-
-\page first_steps_guide First steps in GEOM
-
-You can find here some useful information to start working with GEOM
-
-<ul>
-<li>\subpage partition_explanation "Partition, compounds and boolean operations" </li>
-</ul>
-
-
-*/
\ No newline at end of file

diff --git a/doc/salome/gui/GEOM/input/fuse_operation.doc b/doc/salome/gui/GEOM/input/fuse_operation.doc
index 4dd3a7bf59b30de78f0575ba1bffb11981d0216d..2f41cd86dcc90bdb01c148127ee55d14cb012525 100644 (file)
--- a/doc/salome/gui/GEOM/input/fuse_operation.doc
+++ b/doc/salome/gui/GEOM/input/fuse_operation.doc
@@ -2,24 +2,11 @@
 
 \page fuse_operation_page Fuse
 
-For detail description of the Boolean operations please refer to
-<a href="SALOME_BOA_PA.pdf">this document</a>. 
-It provides a general review of the Partition and Boolean
-operations algorithms, describes the usage methodology and highlighs
-major limitations of these operations.
-
 To produce a \b Fuse operation in the <b>Main Menu</b> select
-<b>Operations - > Boolean - > Fuse</b>
-
-This operation creates a shape from two shapes.
+<b>Operations - > Boolean - > Fuse</b>. 
 
+This operation creates one shape from two shapes.
 The \b Result will be any \b GEOM_Object.
-<b>TUI Command:</b> <em>geompy.MakeFuse(s1, s2)</em>
-<b>Arguments:</b> Name + 2 shapes.
-<b>Advanced option:</b>
-\ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments".
-
-\image html bool1.png
 
 <b>Example:</b>
 
@@ -27,7 +14,24 @@ The \b Result will be any \b GEOM_Object.
 
 \image html fusesn2.png "The resulting fuse"
 
+<b>TUI Command:</b> <em>geompy.MakeFuse(s1, s2)</em>\n
+<b>Arguments:</b> Name + 2 shapes.\n
+<b>Advanced option:</b>
+\ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments".
+
+\image html bool1.png
+
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_fuse "Boolean Operations".
 
+<b> More details </b>
+<ul>
+  <li>For detail description of the Boolean operations please refer to
+<a href="SALOME_BOA_PA.pdf">this document</a>. 
+It provides a general review of the Partition and Boolean
+operations algorithms, describes the usage methodology and highlighs
+major limitations of these operations.</li>
+  <li>Also perhaps you ask yourself : \ref partition_explanation "What's the difference between partition, compounds and fuse operation ?"</li>
+</ul>
+
 */

diff --git a/doc/salome/gui/GEOM/input/index.doc b/doc/salome/gui/GEOM/input/index.doc
index 26928aaaced97a17e7d14d77aed056e9cb257bcd..55a17a2309f6086e84dbf387d748952ea3eceb76 100644 (file)
--- a/doc/salome/gui/GEOM/input/index.doc
+++ b/doc/salome/gui/GEOM/input/index.doc
@@ -4,9 +4,6 @@
 
 \image html geomscreen.png
 
-If you are a new user some general information about GEOM usage are given here:
-\subpage first_steps_guide
-
 \b Geometry module of SALOME is destined for: 
 - \subpage import_export_geom_obj_page "import and export of geometrical models"
   in IGES, BREP and STEP formats;
@@ -30,6 +27,9 @@ Geometry module preferences are described in the
 Almost all geometry module functionalities are accessible via
 \subpage geompy_page "Geometry module Python Interface"
 
+You can find the answer to some Frequently Asked Questions in this page:
+- \subpage faq "Frequently Asked Questions"
+
 Other functions are available in <a class="el" target="_new" href="../../tui/GEOM/docutils/index.html">salome.geom python package</a>.
 
 \image html image3.png "Example of Geometry module usage for engineering tasks"