diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb32ae2f5c64f94d86ac2c52a1eed695fbf93a69..68252ba6a74c45adc73dbd4e18b0afb5c81e5a67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ option(WITH_GMP "Build with GMP support" OFF)
 option(WITH_TESTS "Build tests" ON)
 option(WITH_PROFILING "Enable code profiling compiler flags" OFF )
 option(WITH_COVERAGE "Enable code coverage reports from unit tests" OFF)
-option(WITH_EXAMPLES "Compile the 'examples' directory" ON)
+option(WITH_EXAMPLES "Compile the 'src/Examples' directory" ON)
 option(WITH_TOOLS "Compile the 'src/Tools' directory" ON)
 option(WITH_BENCHMARKS "Compile the 'src/Benchmarks' directory" ON)
 option(WITH_PYTHON "Compile the Python bindings" ON)
-option(WITH_DOC "Generate documentation" ON)
+option(WITH_DOC "Build examples included in the documentation" ON)
 
 # install paths relative to the cmake's prefix
 set( TNL_TARGET_INCLUDE_DIRECTORY "include/TNL" )
@@ -307,7 +307,7 @@ add_subdirectory( src )
 add_subdirectory( share )
 
 # Add subdirectories for examples included in the documentation
-if( ${WITH_DOC} OR ${WITH_EXAMPLES} )
+if( ${WITH_DOC} )
    set( TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH "${CMAKE_SOURCE_DIR}/Documentation/output_snippets" )
    file(MAKE_DIRECTORY ${TNL_DOCUMENTATION_OUTPUT_SNIPPETS_PATH})
    add_subdirectory( Documentation/Examples )
diff --git a/build b/build
index 68966f0f423d13fd2cfb69a380fe02ea9bc25e8f..76169a7c4b20cdc8c6750c23abd7aa6fb675c5e6 100755
--- a/build
+++ b/build
@@ -87,10 +87,11 @@ if [[ ${HELP} == "yes" ]]; then
     echo "   --with-profiling=yes/no               Enables code profiling compiler falgs. 'no' by default."
     echo "   --with-coverage=yes/no                Enables code coverage reports for unit tests. 'no' by default (lcov is required)."
     echo "   --with-doc=yes/no                     Build documentation. 'yes' by default."
-    echo "   --with-examples=yes/no                Compile the 'examples' directory. 'yes' by default."
+    echo "   --with-examples=yes/no                Compile the 'src/Examples' directory. 'yes' by default."
     echo "   --with-tools=yes/no                   Compile the 'src/Tools' directory. 'yes' by default."
     echo "   --with-python=yes/no                  Compile the Python bindings. 'yes' by default."
     echo "   --with-benchmarks=yes/no              Compile the 'src/Benchmarks' directory. 'yes' by default."
+    echo "   --with-doc=yes/no                     Generate the documentation. 'yes' by default."
     echo "   --cmake=CMAKE                         Path to cmake. 'cmake' by default."
     echo "   --verbose                             It enables verbose build."
     echo "   --root-dir=PATH                       Path to the TNL source code root dir."