diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in
index 267b71c24..35639edb0 100755
--- a/doc/salome/gui/GEOM/doxyfile.in
+++ b/doc/salome/gui/GEOM/doxyfile.in
@@ -43,7 +43,7 @@ FILE_PATTERNS     = *.doc
 EXCLUDE_PATTERNS  = creating_adv_obj.doc
 EXCLUDE           = 
 IMAGE_PATH        = @srcdir@/images
-EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG @top_srcdir@/doc/salome/examples
+EXAMPLE_PATH      = @top_srcdir@/doc/salome/examples @top_srcdir@/src/GEOM_SWIG
 
 #---------------------------------------------------------------------------
 #HTML related options
@@ -81,3 +81,8 @@ TAGFILES          = geompy_doc.tag=../GEOM/geompy_doc #rnv: 07.04.2011 Workaroun
                                                       #because it wrongly defines location of the html files for search.
 ALLEXTERNALS      = NO
 SEARCHENGINE      = YES
+
+#---------------------------------------------------------------------------
+#Custom commands
+#---------------------------------------------------------------------------
+ALIASES += tui_script{1}="\include \1 <a href=\"../../examples/GEOM/\1\">Download this script</a>"
diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in
index 9617a169d..516f87b16 100755
--- a/doc/salome/gui/GEOM/doxyfile_tui.in
+++ b/doc/salome/gui/GEOM/doxyfile_tui.in
@@ -41,7 +41,7 @@ WARNINGS          = YES
 INPUT             = @srcdir@/input		  
 FILE_PATTERNS     = tui_*.doc
 IMAGE_PATH        = @srcdir@/images
-EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
+EXAMPLE_PATH      = @top_srcdir@/doc/salome/examples @top_srcdir@/src/GEOM_SWIG
 
 #---------------------------------------------------------------------------
 #HTML related options
@@ -71,3 +71,8 @@ GENERATE_RTF      = NO
 #---------------------------------------------------------------------------
 GENERATE_TAGFILE  = tui_examples.tag
 SEARCHENGINE      = YES
+
+#---------------------------------------------------------------------------
+#Custom commands
+#---------------------------------------------------------------------------
+ALIASES += tui_script{1}="\include \1 <a href=\"../../examples/GEOM/\1\">Download this script</a>"
diff --git a/doc/salome/gui/GEOM/input/tui_3dsketcher.doc b/doc/salome/gui/GEOM/input/tui_3dsketcher.doc
index 9afadc9ca..db3504a1f 100755
--- a/doc/salome/gui/GEOM/input/tui_3dsketcher.doc
+++ b/doc/salome/gui/GEOM/input/tui_3dsketcher.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_3dsketcher_page 3D Sketcher
-\include 3dsketcher.py
-<a href="../../examples/GEOM/3dsketcher.py">Download this script</a>
+\tui_script{3dsketcher.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
index 1f513a496..d963c28ea 100644
--- a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
@@ -4,18 +4,15 @@
 
 \anchor tui_creation_pipetshape
 <br><h2>Creation of PipeTShape</h2>
-\include advanced_geom_objs_ex01.py
-<a href="../../examples/GEOM/advanced_geom_objs_ex01.py">Download this script</a>
+\tui_script{advanced_geom_objs_ex01.py}
 
 \anchor tui_creation_divideddisk
 <br><h2>Creation of DividedDisk</h2>
-\include advanced_geom_objs_ex02.py
-<a href="../../examples/GEOM/advanced_geom_objs_ex02.py">Download this script</a>
+\tui_script{advanced_geom_objs_ex02.py}
 
 \anchor tui_creation_dividedcylinder
 <br><h2>Creation of DividedCylinder</h2>
-\include advanced_geom_objs_ex03.py
-<a href="../../examples/GEOM/advanced_geom_objs_ex03.py">Download this script</a>
+\tui_script{advanced_geom_objs_ex03.py}
 
 <!--@@ insert new functions before this line @@ do not remove this line @@-->
 */
diff --git a/doc/salome/gui/GEOM/input/tui_angle.doc b/doc/salome/gui/GEOM/input/tui_angle.doc
index e1618fb30..7cca534f4 100644
--- a/doc/salome/gui/GEOM/input/tui_angle.doc
+++ b/doc/salome/gui/GEOM/input/tui_angle.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_angle_page Angle
-\include angle.py
-<a href="../../examples/GEOM/angle.py">Download this script</a>
+\tui_script{angle.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc
index fcb21c268..89be6f64b 100644
--- a/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc
@@ -4,47 +4,38 @@
 
 \anchor tui_creation_point
 <br><h2>Creation of a Point</h2>
-\include basic_geom_objs_ex01.py
-<a href="../../examples/GEOM/basic_geom_objs_ex01.py">Download this script</a>
+\tui_script{basic_geom_objs_ex01.py}
 
 \anchor tui_creation_line
 <br><h2>Creation of a Line</h2>
-\include basic_geom_objs_ex02.py
-<a href="../../examples/GEOM/basic_geom_objs_ex02.py">Download this script</a>
+\tui_script{basic_geom_objs_ex02.py}
 
 \anchor tui_creation_circle
 <br><h2>Creation of a Circle</h2>
-\include basic_geom_objs_ex03.py
-<a href="../../examples/GEOM/basic_geom_objs_ex03.py">Download this script</a>
+\tui_script{basic_geom_objs_ex03.py}
 
 \anchor tui_creation_ellipse
 <br><h2>Creation of an Ellipse</h2>
-\include basic_geom_objs_ex04.py
-<a href="../../examples/GEOM/basic_geom_objs_ex04.py">Download this script</a>
+\tui_script{basic_geom_objs_ex04.py}
 
 \anchor tui_creation_arc
 <br><h2>Creation of an Arc</h2>
-\include basic_geom_objs_ex05.py
-<a href="../../examples/GEOM/basic_geom_objs_ex05.py">Download this script</a>
+\tui_script{basic_geom_objs_ex05.py}
 
 \anchor tui_creation_curve
 <br><h2>Creation of a Curve</h2>
-\include basic_geom_objs_ex06.py
-<a href="../../examples/GEOM/basic_geom_objs_ex06.py">Download this script</a>
+\tui_script{basic_geom_objs_ex06.py}
 
 \anchor tui_creation_vector
 <br><h2>Creation of a Vector</h2>
-\include basic_geom_objs_ex07.py
-<a href="../../examples/GEOM/basic_geom_objs_ex07.py">Download this script</a>
+\tui_script{basic_geom_objs_ex07.py}
 
 \anchor tui_creation_plane
 <br><h2>Creation of a Plane</h2>
-\include basic_geom_objs_ex08.py
-<a href="../../examples/GEOM/basic_geom_objs_ex08.py">Download this script</a>
+\tui_script{basic_geom_objs_ex08.py}
 
 \anchor tui_creation_lcs
 <br><h2>Creation of a Local Coordinate System</h2>
-\include basic_geom_objs_ex09.py
-<a href="../../examples/GEOM/basic_geom_objs_ex09.py">Download this script</a>
+\tui_script{basic_geom_objs_ex09.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_basic_operations.doc b/doc/salome/gui/GEOM/input/tui_basic_operations.doc
index 3899255b1..743b75dc2 100644
--- a/doc/salome/gui/GEOM/input/tui_basic_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_basic_operations.doc
@@ -4,17 +4,14 @@
 
 \anchor tui_partition
 <br><h2>Partition</h2>
-\include basic_operations_ex01.py
-<a href="../../examples/GEOM/basic_operations_ex01.py">Download this script</a>
+\tui_script{basic_operations_ex01.py}
 
 \anchor tui_archimede
 <br><h2>Archimede</h2>
-\include basic_operations_ex02.py
-<a href="../../examples/GEOM/basic_operations_ex02.py">Download this script</a>
+\tui_script{basic_operations_ex02.py}
 
 \anchor tui_restore_prs_params
 <br><h2>Restore presentation parameters and sub-shapes</h2>
-\include basic_operations_ex03.py
-<a href="../../examples/GEOM/basic_operations_ex03.py">Download this script</a>
+\tui_script{basic_operations_ex03.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_basic_properties.doc b/doc/salome/gui/GEOM/input/tui_basic_properties.doc
index dad8e828b..ed03ccfd4 100644
--- a/doc/salome/gui/GEOM/input/tui_basic_properties.doc
+++ b/doc/salome/gui/GEOM/input/tui_basic_properties.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_basic_properties_page Basic Properties
-\include basic_properties.py
-<a href="../../examples/GEOM/basic_properties.py">Download this script</a>
+\tui_script{basic_properties.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_blocks_operations.doc b/doc/salome/gui/GEOM/input/tui_blocks_operations.doc
index 4acb44f80..58a761a42 100644
--- a/doc/salome/gui/GEOM/input/tui_blocks_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_blocks_operations.doc
@@ -4,17 +4,14 @@
 
 \anchor tui_multi_transformation
 <br><h2>Multi Transformation</h2>
-\include blocks_operations_ex01.py
-<a href="../../examples/GEOM/blocks_operations_ex01.py">Download this script</a>
+\tui_script{blocks_operations_ex01.py}
 
 \anchor tui_explode_on_blocks
 <br><h2>Explode on Blocks</h2>
-\include blocks_operations_ex02.py
-<a href="../../examples/GEOM/blocks_operations_ex02.py">Download this script</a>
+\tui_script{blocks_operations_ex02.py}
 
 \anchor tui_propagate
 <br><h2>Propagate</h2>
-\include blocks_operations_ex03.py
-<a href="../../examples/GEOM/blocks_operations_ex03.py">Download this script</a>
+\tui_script{blocks_operations_ex03.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_boolean_operations.doc b/doc/salome/gui/GEOM/input/tui_boolean_operations.doc
index 0ab8db001..784003c3c 100644
--- a/doc/salome/gui/GEOM/input/tui_boolean_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_boolean_operations.doc
@@ -4,22 +4,18 @@
 
 \anchor tui_fuse
 <br><h2>Fuse</h2>
-\include boolean_operations_ex01.py
-<a href="../../examples/GEOM/boolean_operations_ex01.py">Download this script</a>
+\tui_script{boolean_operations_ex01.py}
 
 \anchor tui_common
 <br><h2>Common</h2>
-\include boolean_operations_ex02.py
-<a href="../../examples/GEOM/boolean_operations_ex02.py">Download this script</a>
+\tui_script{boolean_operations_ex02.py}
 
 \anchor tui_cut
 <br><h2>Cut</h2>
-\include boolean_operations_ex03.py
-<a href="../../examples/GEOM/boolean_operations_ex03.py">Download this script</a>
+\tui_script{boolean_operations_ex03.py}
 
 \anchor tui_section
 <br><h2>Section</h2>
-\include boolean_operations_ex04.py
-<a href="../../examples/GEOM/boolean_operations_ex04.py">Download this script</a>
+\tui_script{boolean_operations_ex04.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_bounding_box.doc b/doc/salome/gui/GEOM/input/tui_bounding_box.doc
index 76d4b4347..5dd436773 100644
--- a/doc/salome/gui/GEOM/input/tui_bounding_box.doc
+++ b/doc/salome/gui/GEOM/input/tui_bounding_box.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_bounding_box_page Bounding Box
-\include bounding_box.py
-<a href="../../examples/GEOM/bounding_box.py">Download this script</a>
+\tui_script{bounding_box.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_building_by_blocks.doc b/doc/salome/gui/GEOM/input/tui_building_by_blocks.doc
index 77f8e363b..ab66d27a4 100644
--- a/doc/salome/gui/GEOM/input/tui_building_by_blocks.doc
+++ b/doc/salome/gui/GEOM/input/tui_building_by_blocks.doc
@@ -3,11 +3,9 @@
 \page tui_building_by_blocks_page Building by Blocks
 
 <br><h2>Quadrangle Face</h2>
-\include building_by_blocks_ex01.py
-<a href="../../examples/GEOM/building_by_blocks_ex01.py">Download this script</a>
+\tui_script{building_by_blocks_ex01.py}
 
 <br><h2>Hexagonal Solid</h2>
-\include building_by_blocks_ex02.py
-<a href="../../examples/GEOM/building_by_blocks_ex02.py">Download this script</a>
+\tui_script{building_by_blocks_ex02.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_center_of_mass.doc b/doc/salome/gui/GEOM/input/tui_center_of_mass.doc
index 49eb49538..604d67b61 100644
--- a/doc/salome/gui/GEOM/input/tui_center_of_mass.doc
+++ b/doc/salome/gui/GEOM/input/tui_center_of_mass.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_center_of_mass_page Center of masses
-\include center_of_mass.py
-<a href="../../examples/GEOM/center_of_mass.py">Download this script</a>
+\tui_script{center_of_mass.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_check_compound_of_blocks.doc b/doc/salome/gui/GEOM/input/tui_check_compound_of_blocks.doc
index eeb9d92a1..ff448334b 100644
--- a/doc/salome/gui/GEOM/input/tui_check_compound_of_blocks.doc
+++ b/doc/salome/gui/GEOM/input/tui_check_compound_of_blocks.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_check_compound_of_blocks_page Check Compound of Blocks
-\include check_compound_of_blocks.py
-<a href="../../examples/GEOM/check_compound_of_blocks.py">Download this script</a>
+\tui_script{check_compound_of_blocks.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_check_self_intersections.doc b/doc/salome/gui/GEOM/input/tui_check_self_intersections.doc
index 346de0c2b..d3d6c06af 100644
--- a/doc/salome/gui/GEOM/input/tui_check_self_intersections.doc
+++ b/doc/salome/gui/GEOM/input/tui_check_self_intersections.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_check_self_intersections_page Detect Self-intersections
-\include check_self_intersections.py
-<a href="../../examples/GEOM/check_self_intersections.py">Download this script</a>
+\tui_script{check_self_intersections.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_check_shape.doc b/doc/salome/gui/GEOM/input/tui_check_shape.doc
index 5e11279ef..59ebd7d47 100644
--- a/doc/salome/gui/GEOM/input/tui_check_shape.doc
+++ b/doc/salome/gui/GEOM/input/tui_check_shape.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_check_shape_page Check Shape
-\include check_shape.py
-<a href="../../examples/GEOM/check_shape.py">Download this script</a>
+\tui_script{check_shape.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_complex_objs.doc b/doc/salome/gui/GEOM/input/tui_complex_objs.doc
index 030943956..61ce18b5a 100644
--- a/doc/salome/gui/GEOM/input/tui_complex_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_complex_objs.doc
@@ -4,51 +4,42 @@
 
 \anchor tui_creation_prism
 <br><h2>Creation of a Prism</h2>
-\include complex_objs_ex01.py
-<a href="../../examples/GEOM/complex_objs_ex01.py">Download this script</a>
+\tui_script{complex_objs_ex01.py}
 
 \anchor tui_creation_revolution
 <br><h2>Creation of a Revolution</h2>
-\include complex_objs_ex02.py
-<a href="../../examples/GEOM/complex_objs_ex02.py">Download this script</a>
+\tui_script{complex_objs_ex02.py}
 
 \anchor tui_creation_filling
 <br><h2>Creation of a Filling</h2>
-\include complex_objs_ex03.py
-<a href="../../examples/GEOM/complex_objs_ex03.py">Download this script</a>
+\tui_script{complex_objs_ex03.py}
 
 \anchor tui_creation_pipe
 <br><h2>Creation of a Pipe</h2>
-\include complex_objs_ex04.py
-<a href="../../examples/GEOM/complex_objs_ex04.py">Download this script</a>
+\tui_script{complex_objs_ex04.py}
 
 \anchor tui_creation_pipe_with_diff_sec
 <br><h2>Creation of a PipeWithDifferentSections</h2>
-\include complex_objs_ex05.py
-<a href="../../examples/GEOM/complex_objs_ex05.py">Download this script</a>
+\tui_script{complex_objs_ex05.py}
 
 \anchor tui_creation_pipe_with_shell_sec
 <br><h2>Creation of a PipeWithShellSections</h2>
-\include complex_objs_ex06.py
-<a href="../../examples/GEOM/complex_objs_ex06.py">Download this script</a>
+\tui_script{complex_objs_ex06.py}
 
 \anchor tui_creation_pipe_without_path
 <br><h2>Creation of a PipeShellsWithoutPath</h2>
-\include complex_objs_ex07.py
-<a href="../../examples/GEOM/complex_objs_ex07.py">Download this script</a>
+\tui_script{complex_objs_ex07.py}
 
 \anchor tui_creation_pipe_binormal_along_vector
 <br><h2>Creation of a PipeBiNormalAlongVector</h2>
-\include complex_objs_ex08.py
-<a href="../../examples/GEOM/complex_objs_ex08.py">Download this script</a>
+\tui_script{complex_objs_ex08.py}
 
 \anchor tui_creation_pipe_path
 <br><h2>Creation of a Middle Path</h2>
-\include complex_objs_ex09.py
-<a href="../../examples/GEOM/complex_objs_ex09.py">Download this script</a>
+\tui_script{complex_objs_ex09.py}
 
+\anchor tui_creation_tangent_plane_on_face
 <br><h2>Creation of Tangent Plane On Face</h2>
-\include complex_objs_ex10.py
-<a href="../../examples/GEOM/complex_objs_ex10.py">Download this script</a>
+\tui_script{complex_objs_ex10.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_free_boundaries.doc b/doc/salome/gui/GEOM/input/tui_free_boundaries.doc
index fb0420c6d..41a2a5dd8 100644
--- a/doc/salome/gui/GEOM/input/tui_free_boundaries.doc
+++ b/doc/salome/gui/GEOM/input/tui_free_boundaries.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_free_boundaries_page Check Free Boundaries
-\include free_boundaries.py
-<a href="../../examples/GEOM/free_boundaries.py">Download this script</a>
+\tui_script{free_boundaries.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_free_faces.doc b/doc/salome/gui/GEOM/input/tui_free_faces.doc
index 00ae5bd23..c0a9286fd 100644
--- a/doc/salome/gui/GEOM/input/tui_free_faces.doc
+++ b/doc/salome/gui/GEOM/input/tui_free_faces.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_free_faces_page Check Free Faces
-\include free_faces.py
-<a href="../../examples/GEOM/free_faces.py">Download this script</a>
+\tui_script{free_faces.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc
index ca7a98d8f..df1ffe054 100644
--- a/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc
+++ b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_get_non_blocks_page Get Non Blocks
-\include get_non_blocks.py
-<a href="../../examples/GEOM/get_non_blocks.py">Download this script</a>
+\tui_script{get_non_blocks.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_import_export.doc b/doc/salome/gui/GEOM/input/tui_import_export.doc
index 52adf987e..7b3efdde4 100644
--- a/doc/salome/gui/GEOM/input/tui_import_export.doc
+++ b/doc/salome/gui/GEOM/input/tui_import_export.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_import_export_page Import/Export
-\include import_export.py
-<a href="../../examples/GEOM/import_export.py">Download this script</a>
+\tui_script{import_export.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_inertia.doc b/doc/salome/gui/GEOM/input/tui_inertia.doc
index a62b20784..2f7923d8b 100644
--- a/doc/salome/gui/GEOM/input/tui_inertia.doc
+++ b/doc/salome/gui/GEOM/input/tui_inertia.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_inertia_page Inertia
-\include inertia.py
-<a href="../../examples/GEOM/inertia.py">Download this script</a>
+\tui_script{inertia.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_min_distance.doc b/doc/salome/gui/GEOM/input/tui_min_distance.doc
index db024ca4b..a53e90104 100644
--- a/doc/salome/gui/GEOM/input/tui_min_distance.doc
+++ b/doc/salome/gui/GEOM/input/tui_min_distance.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_min_distance_page Minimal Distance
-\include min_distance.py
-<a href="../../examples/GEOM/min_distance.py">Download this script</a>
+\tui_script{min_distance.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_normal_face.doc b/doc/salome/gui/GEOM/input/tui_normal_face.doc
index 7d31fcc26..13d900003 100644
--- a/doc/salome/gui/GEOM/input/tui_normal_face.doc
+++ b/doc/salome/gui/GEOM/input/tui_normal_face.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_normal_face_page Normal to a Face
-\include normal_face.py
-<a href="../../examples/GEOM/normal_face.py">Download this script</a>
+\tui_script{normal_face.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_notebook_geom.doc b/doc/salome/gui/GEOM/input/tui_notebook_geom.doc
index 8db9c59d2..38dac8255 100644
--- a/doc/salome/gui/GEOM/input/tui_notebook_geom.doc
+++ b/doc/salome/gui/GEOM/input/tui_notebook_geom.doc
@@ -3,7 +3,6 @@
 \page tui_notebook_geom_page Using SALOME NoteBook
 
 \anchor tui_notebook_geom
-\include notebook_geom.py
-<a href="../../examples/GEOM/notebook_geom.py">Download this script</a>
+\tui_script{notebook_geom.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_point_coordinates.doc b/doc/salome/gui/GEOM/input/tui_point_coordinates.doc
index 6fbb9c9a6..3dcba1b21 100644
--- a/doc/salome/gui/GEOM/input/tui_point_coordinates.doc
+++ b/doc/salome/gui/GEOM/input/tui_point_coordinates.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_point_coordinates_page Point Coordinates
-\include point_coordinates.py
-<a href="../../examples/GEOM/point_coordinates.py">Download this script</a>
+\tui_script{point_coordinates.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_primitives.doc b/doc/salome/gui/GEOM/input/tui_primitives.doc
index 9c4f49d55..f70bead3c 100644
--- a/doc/salome/gui/GEOM/input/tui_primitives.doc
+++ b/doc/salome/gui/GEOM/input/tui_primitives.doc
@@ -4,37 +4,30 @@
 
 \anchor tui_creation_box
 <br><h2>Creation of a Box</h2>
-\include primitives_ex01.py
-<a href="../../examples/GEOM/primitives_ex01.py">Download this script</a>
+\tui_script{primitives_ex01.py}
 
 \anchor tui_creation_cylinder
 <br><h2>Creation of a Cylinder</h2>
-\include primitives_ex02.py
-<a href="../../examples/GEOM/primitives_ex02.py">Download this script</a>
+\tui_script{primitives_ex02.py}
 
 \anchor tui_creation_sphere
 <br><h2>Creation of a Sphere</h2>
-\include primitives_ex03.py
-<a href="../../examples/GEOM/primitives_ex03.py">Download this script</a>
+\tui_script{primitives_ex03.py}
 
 \anchor tui_creation_torus
 <br><h2>Creation of a Torus</h2>
-\include primitives_ex04.py
-<a href="../../examples/GEOM/primitives_ex04.py">Download this script</a>
+\tui_script{primitives_ex04.py}
 
 \anchor tui_creation_cone
 <br><h2>Creation of a Cone</h2>
-\include primitives_ex05.py
-<a href="../../examples/GEOM/primitives_ex05.py">Download this script</a>
+\tui_script{primitives_ex05.py}
 
 \anchor tui_creation_disk
 <br><h2>Creation of a Disk</h2>
-\include primitives_ex06.py
-<a href="../../examples/GEOM/primitives_ex06.py">Download this script</a>
+\tui_script{primitives_ex06.py}
 
 \anchor tui_creation_squareface
 <br><h2>Creation of a Rectangle</h2>
-\include primitives_ex07.py
-<a href="../../examples/GEOM/primitives_ex07.py">Download this script</a>
+\tui_script{primitives_ex07.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_repairing_operations.doc b/doc/salome/gui/GEOM/input/tui_repairing_operations.doc
index 286731970..711800caa 100644
--- a/doc/salome/gui/GEOM/input/tui_repairing_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_repairing_operations.doc
@@ -4,57 +4,46 @@
 
 \anchor tui_shape_processing
 <br><h2>Shape Processing</h2>
-\include repairing_operations_ex01.py
-<a href="../../examples/GEOM/repairing_operations_ex01.py">Download this script</a>
+\tui_script{repairing_operations_ex01.py}
 
 \anchor tui_suppress_faces
 <br><h2>Suppress Faces</h2>
-\include repairing_operations_ex02.py
-<a href="../../examples/GEOM/repairing_operations_ex02.py">Download this script</a>
+\tui_script{repairing_operations_ex02.py}
 
 \anchor tui_close_contour
 <br><h2>Close Contour</h2>
-\include repairing_operations_ex03.py
-<a href="../../examples/GEOM/repairing_operations_ex03.py">Download this script</a>
+\tui_script{repairing_operations_ex03.py}
 
 \anchor tui_suppress_internal_wires 
 <br><h2>Suppress Internal Wires</h2>
-\include repairing_operations_ex04.py
-<a href="../../examples/GEOM/repairing_operations_ex04.py">Download this script</a>
+\tui_script{repairing_operations_ex04.py}
 
 \anchor tui_suppress_holes
 <br><h2>Suppress Holes</h2>
-\include repairing_operations_ex05.py
-<a href="../../examples/GEOM/repairing_operations_ex05.py">Download this script</a>
+\tui_script{repairing_operations_ex05.py}
 
 \anchor tui_sewing
 <br><h2>Sewing</h2>
-\include repairing_operations_ex06.py
-<a href="../../examples/GEOM/repairing_operations_ex06.py">Download this script</a>
+\tui_script{repairing_operations_ex06.py}
 
 \anchor tui_glue_faces
 <br><h2>Glue Faces</h2>
-\include repairing_operations_ex07.py
-<a href="../../examples/GEOM/repairing_operations_ex07.py">Download this script</a>
+\tui_script{repairing_operations_ex07.py}
 
 \anchor tui_glue_edges
 <br><h2>Glue Edges</h2>
-\include repairing_operations_ex08.py
-<a href="../../examples/GEOM/repairing_operations_ex08.py">Download this script</a>
+\tui_script{repairing_operations_ex08.py}
 
 \anchor tui_limit_tolerance
 <br><h2>Limit Tolerance</h2>
-\include repairing_operations_ex09.py
-<a href="../../examples/GEOM/repairing_operations_ex09.py">Download this script</a>
+\tui_script{repairing_operations_ex09.py}
 
 \anchor tui_add_point_on_edge
 <br><h2>Add Point on Edge</h2>
-\include repairing_operations_ex10.py
-<a href="../../examples/GEOM/repairing_operations_ex10.py">Download this script</a>
+\tui_script{repairing_operations_ex10.py}
 
 \anchor tui_fuse_collinear_edges
 <br><h2>Fuse Collinear Edges within a Wire</h2>
-\include repairing_operations_ex11.py
-<a href="../../examples/GEOM/repairing_operations_ex11.py">Download this script</a>
+\tui_script{repairing_operations_ex11.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_sketcher.doc b/doc/salome/gui/GEOM/input/tui_sketcher.doc
index be24fd763..2c0f2d885 100644
--- a/doc/salome/gui/GEOM/input/tui_sketcher.doc
+++ b/doc/salome/gui/GEOM/input/tui_sketcher.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_sketcher_page 2D Sketcher
-\include sketcher.py
-<a href="../../examples/GEOM/sketcher.py">Download this script</a>
+\tui_script{sketcher.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_tolerance.doc b/doc/salome/gui/GEOM/input/tui_tolerance.doc
index 4da20b249..552454cf8 100644
--- a/doc/salome/gui/GEOM/input/tui_tolerance.doc
+++ b/doc/salome/gui/GEOM/input/tui_tolerance.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_tolerance_page Tolerance
-\include tolerance.py
-<a href="../../examples/GEOM/tolerance.py">Download this script</a>
+\tui_script{tolerance.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_topological_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_topological_geom_objs.doc
index 2b9f5d1c2..9576e47a8 100644
--- a/doc/salome/gui/GEOM/input/tui_topological_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_topological_geom_objs.doc
@@ -4,32 +4,26 @@
 
 \anchor tui_creation_edge
 <br><h2>Creation of an Edge</h2>
-\include topological_geom_objs_ex01.py
-<a href="../../examples/GEOM/topological_geom_objs_ex01.py">Download this script</a>
+\tui_script{topological_geom_objs_ex01.py}
 
 \anchor tui_creation_wire
 <br><h2>Creation of a Wire</h2>
-\include topological_geom_objs_ex02.py
-<a href="../../examples/GEOM/topological_geom_objs_ex02.py">Download this script</a>
+\tui_script{topological_geom_objs_ex02.py}
 
 \anchor tui_creation_face
 <br><h2>Creation of a Face</h2>
-\include topological_geom_objs_ex03.py
-<a href="../../examples/GEOM/topological_geom_objs_ex03.py">Download this script</a>
+\tui_script{topological_geom_objs_ex03.py}
 
 \anchor tui_creation_shell
 <br><h2>Creation of a Shell</h2>
-\include topological_geom_objs_ex04.py
-<a href="../../examples/GEOM/topological_geom_objs_ex04.py">Download this script</a>
+\tui_script{topological_geom_objs_ex04.py}
 
 \anchor tui_creation_solid
 <br><h2>Creation of a Solid</h2>
-\include topological_geom_objs_ex05.py
-<a href="../../examples/GEOM/topological_geom_objs_ex05.py">Download this script</a>
+\tui_script{topological_geom_objs_ex05.py}
 
 \anchor tui_creation_compound
 <br><h2>Creation of a Compound</h2>
-\include topological_geom_objs_ex06.py
-<a href="../../examples/GEOM/topological_geom_objs_ex06.py">Download this script</a>
+\tui_script{topological_geom_objs_ex06.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_transformation_operations.doc b/doc/salome/gui/GEOM/input/tui_transformation_operations.doc
index 10e392ec0..f25eb9c76 100644
--- a/doc/salome/gui/GEOM/input/tui_transformation_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_transformation_operations.doc
@@ -4,67 +4,54 @@
 
 \anchor tui_translation
 <br><h2>Translation</h2>
-\include transformation_operations_ex01.py
-<a href="../../examples/GEOM/transformation_operations_ex01.py">Download this script</a>
+\tui_script{transformation_operations_ex01.py}
 
 \anchor tui_rotation
 <br><h2>Rotation</h2>
-\include transformation_operations_ex02.py
-<a href="../../examples/GEOM/transformation_operations_ex02.py">Download this script</a>
+\tui_script{transformation_operations_ex02.py}
 
 \anchor tui_modify_location 
 <br><h2>Modify Location</h2>
-\include transformation_operations_ex03.py
-<a href="../../examples/GEOM/transformation_operations_ex03.py">Download this script</a>
+\tui_script{transformation_operations_ex03.py}
 
 \anchor tui_mirror
 <br><h2>Mirror Image</h2>
-\include transformation_operations_ex04.py
-<a href="../../examples/GEOM/transformation_operations_ex04.py">Download this script</a>
+\tui_script{transformation_operations_ex04.py}
 
 \anchor tui_scale
 <br><h2>Scale Transform</h2>
-\include transformation_operations_ex05.py
-<a href="../../examples/GEOM/transformation_operations_ex05.py">Download this script</a>
+\tui_script{transformation_operations_ex05.py}
 
 \anchor tui_offset 
 <br><h2>Offset Surface</h2>
-\include transformation_operations_ex06.py
-<a href="../../examples/GEOM/transformation_operations_ex06.py">Download this script</a>
+\tui_script{transformation_operations_ex06.py}
 
 \anchor tui_projection
 <br><h2>Projection</h2>
-\include transformation_operations_ex07.py
-<a href="../../examples/GEOM/transformation_operations_ex07.py">Download this script</a>
+\tui_script{transformation_operations_ex07.py}
 
 \anchor tui_multi_translation 
 <br><h2>Multi Translation</h2>
-\include transformation_operations_ex08.py
-<a href="../../examples/GEOM/transformation_operations_ex08.py">Download this script</a>
+\tui_script{transformation_operations_ex08.py}
 
 \anchor tui_multi_rotation
 <br><h2>Multi Rotation</h2>
-\include transformation_operations_ex09.py
-<a href="../../examples/GEOM/transformation_operations_ex09.py">Download this script</a>
+\tui_script{transformation_operations_ex09.py}
 
 \anchor tui_fillet2d
 <br><h2>Fillet 2D</h2>
-\include transformation_operations_ex10.py
-<a href="../../examples/GEOM/transformation_operations_ex10.py">Download this script</a>
+\tui_script{transformation_operations_ex10.py}
 
 \anchor tui_fillet1d
 <br><h2>Fillet 1D</h2>
-\include transformation_operations_ex11.py
-<a href="../../examples/GEOM/transformation_operations_ex11.py">Download this script</a>
+\tui_script{transformation_operations_ex11.py}
 
 \anchor tui_fillet
 <br><h2>Fillet</h2>
-\include transformation_operations_ex12.py
-<a href="../../examples/GEOM/transformation_operations_ex12.py">Download this script</a>
+\tui_script{transformation_operations_ex12.py}
 
 \anchor tui_chamfer
 <br><h2>Chamfer</h2>
-\include transformation_operations_ex13.py
-<a href="../../examples/GEOM/transformation_operations_ex13.py">Download this script</a>
+\tui_script{transformation_operations_ex13.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc
index 8505548d3..205ac6183 100644
--- a/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_viewing_geom_objs.doc
@@ -4,22 +4,18 @@
 
 \anchor tui_change_disp_mode
 <br><h2>Changing Display Mode</h2>
-\include viewing_geom_objs_ex01.py
-<a href="../../examples/GEOM/viewing_geom_objs_ex01.py">Download this script</a>
+\tui_script{viewing_geom_objs_ex01.py}
 
 \anchor tui_change_color 
 <br><h2> Changing Color</h2>
-\include viewing_geom_objs_ex02.py
-<a href="../../examples/GEOM/viewing_geom_objs_ex02.py">Download this script</a>
+\tui_script{viewing_geom_objs_ex02.py}
 
 \anchor tui_change_transparency
 <br><h2>Changing Transparency</h2>
-\include viewing_geom_objs_ex03.py
-<a href="../../examples/GEOM/viewing_geom_objs_ex03.py">Download this script</a>
+\tui_script{viewing_geom_objs_ex03.py}
 
 \anchor tui_point_marker
 <br><h2>Set Point Marker</h2>
-\include viewing_geom_objs_ex04.py
-<a href="../../examples/GEOM/viewing_geom_objs_ex04.py">Download this script</a>
+\tui_script{viewing_geom_objs_ex04.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_whatis.doc b/doc/salome/gui/GEOM/input/tui_whatis.doc
index d1c8fc911..603f34147 100644
--- a/doc/salome/gui/GEOM/input/tui_whatis.doc
+++ b/doc/salome/gui/GEOM/input/tui_whatis.doc
@@ -1,7 +1,6 @@
 /*!
 
 \page tui_whatis_page What Is
-\include whatis.py
-<a href="../../examples/GEOM/whatis.py">Download this script</a>
+\tui_script{whatis.py}
 
 */
diff --git a/doc/salome/gui/GEOM/input/tui_working_with_groups.doc b/doc/salome/gui/GEOM/input/tui_working_with_groups.doc
index 4f252c2e9..e21cb5588 100644
--- a/doc/salome/gui/GEOM/input/tui_working_with_groups.doc
+++ b/doc/salome/gui/GEOM/input/tui_working_with_groups.doc
@@ -5,35 +5,29 @@
 <br>
 \anchor tui_create_groups_anchor
 <h2>Creation of a group</h2>
-\include working_with_groups_ex01.py
-<a href="../../examples/GEOM/working_with_groups_ex01.py">Download this script</a>
+\tui_script{working_with_groups_ex01.py}
 
 \anchor tui_edit_groups_anchor
 
 <br><h2>Adding an object to the group</h2>
-\include working_with_groups_ex02.py
-<a href="../../examples/GEOM/working_with_groups_ex02.py">Download this script</a>
+\tui_script{working_with_groups_ex02.py}
 
 <br><h2>Removing an object from the group</h2>
-\include working_with_groups_ex03.py
-<a href="../../examples/GEOM/working_with_groups_ex03.py">Download this script</a>
+\tui_script{working_with_groups_ex03.py}
 
 <br>
 \anchor tui_union_groups_anchor
 <h2>Union Groups</h2>
-\include working_with_groups_ex04.py
-<a href="../../examples/GEOM/working_with_groups_ex04.py">Download this script</a>
+\tui_script{working_with_groups_ex04.py}
 
 <br>
 \anchor tui_intersect_groups_anchor
 <h2>Intersect Groups</h2>
-\include working_with_groups_ex05.py
-<a href="../../examples/GEOM/working_with_groups_ex05.py">Download this script</a>
+\tui_script{working_with_groups_ex05.py}
 
 <br>
 \anchor tui_cut_groups_anchor
 <h2>Cut Groups</h2>
-\include working_with_groups_ex06.py
-<a href="../../examples/GEOM/working_with_groups_ex06.py">Download this script</a>
+\tui_script{working_with_groups_ex06.py}
 
 */