diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80363fe56b7f3fc1a048deb754fd7f2c4bd2ade7..529ef879a2b29e56c6aac5c2c663ecfd447c1440 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,14 +29,14 @@ macro(opt OPTION HELP VALUE)
   set(OPT_TEXI "${OPT_TEXI}\n@item ENABLE_${OPTION}\n${HELP} (default: ${VALUE})")
 endmacro(opt)
 
-opt(3M "Enable 3M extension (experimental)" OFF)
+opt(3M "Enable proprietary 3M extension" OFF)
 opt(ACIS "Enable ACIS geometrical models (experimental)" ${DEFAULT})
 opt(ANN "Enable ANN (used for fast point search in mesh/post)" ${DEFAULT})
 opt(BAMG "Enable Bamg 2D anisotropic mesh generator" ${DEFAULT})
 opt(BFGS "Enable BFGS (used by some mesh optimizers)" ${DEFAULT})
 opt(BLAS_LAPACK "Enable BLAS/Lapack for linear algebra (required for meshing)" ON)
 opt(BLOSSOM "Enable Blossom algorithm (needed for full quad meshing)" ${DEFAULT})
-opt(BUILD_LIB "Enable 'lib' target for buildin static Gmsh library" OFF)
+opt(BUILD_LIB "Enable 'lib' target for building static Gmsh library" OFF)
 opt(BUILD_SHARED "Enable 'shared' target for building shared Gmsh library" OFF)
 opt(BUILD_DYNAMIC "Enable dynamic Gmsh executable (linked with shared lib)" OFF)
 opt(BUILD_ANDROID "Enable Android NDK library target (experimental)" OFF)
@@ -72,18 +72,18 @@ opt(PETSC "Enable PETSc linear solvers (required for SLEPc)" ${DEFAULT})
 opt(PLUGINS "Enable post-processing plugins" ${DEFAULT})
 opt(POST "Enable post-processing module" ${DEFAULT})
 opt(POPPLER "Enable Poppler for displaying PDF documents (experimental)" OFF)
-opt(QT "Enable dummy QT graphical interface proof-of-concept" OFF)
+opt(QT "Enable dummy QT graphical interface proof-of-concept (experimental)" OFF)
 opt(RTREE "Enable RTREE (used for quad/hex mesh generation)" ${DEFAULT})
 opt(SALOME "Enable Salome routines for CAD healing" ${DEFAULT})
 opt(SGEOM "Enable SGEOM interface to OCC (experimental)" OFF)
 opt(SLEPC "Enable SLEPc eigensolvers (required for conformal compounds)" ${DEFAULT})
-opt(SOLVER "Enable solver components (required e.g. for compounds)" ${DEFAULT})
+opt(SOLVER "Enable built-in finite element solvers (required for compounds)" ${DEFAULT})
 opt(TAUCS "Enable Taucs linear solver (alternative to PETSc)" ${DEFAULT})
 opt(TETGEN "Enable Tetgen 3D initial mesh generator" ${DEFAULT})
 opt(TETGEN_OLD "Enable older version of Tetgen" OFF)
 opt(VORO3D "Enable Voro3D (experimental)" ${DEFAULT})
-opt(WRAP_JAVA "Enable building of Java wrappers" OFF)
-opt(WRAP_PYTHON "Enable building of Python wrappers" OFF)
+opt(WRAP_JAVA "Enable generation of Java wrappers" OFF)
+opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF)
 
 set(GMSH_MAJOR_VERSION 2)
 set(GMSH_MINOR_VERSION 8)
diff --git a/doc/texinfo/cmake_options.texi b/doc/texinfo/cmake_options.texi
index c95e7bad54a206bf21f911a3732ab278243b5ae1..66696e0ff73a96e5da6e3513a9792b554310764e 100644
--- a/doc/texinfo/cmake_options.texi
+++ b/doc/texinfo/cmake_options.texi
@@ -1,6 +1,6 @@
 
 @item ENABLE_3M
-Enable 3M extension (experimental) (default: OFF)
+Enable proprietary 3M extension (default: OFF)
 @item ENABLE_ACIS
 Enable ACIS geometrical models (experimental) (default: ON)
 @item ENABLE_ANN
@@ -14,7 +14,7 @@ Enable BLAS/Lapack for linear algebra (required for meshing) (default: ON)
 @item ENABLE_BLOSSOM
 Enable Blossom algorithm (needed for full quad meshing) (default: ON)
 @item ENABLE_BUILD_LIB
-Enable 'lib' target for buildin static Gmsh library (default: OFF)
+Enable 'lib' target for building static Gmsh library (default: OFF)
 @item ENABLE_BUILD_SHARED
 Enable 'shared' target for building shared Gmsh library (default: OFF)
 @item ENABLE_BUILD_DYNAMIC
@@ -86,7 +86,7 @@ Enable post-processing module (default: ON)
 @item ENABLE_POPPLER
 Enable Poppler for displaying PDF documents (experimental) (default: OFF)
 @item ENABLE_QT
-Enable dummy QT graphical interface proof-of-concept (default: OFF)
+Enable dummy QT graphical interface proof-of-concept (experimental) (default: OFF)
 @item ENABLE_RTREE
 Enable RTREE (used for quad/hex mesh generation) (default: ON)
 @item ENABLE_SALOME
@@ -96,7 +96,7 @@ Enable SGEOM interface to OCC (experimental) (default: OFF)
 @item ENABLE_SLEPC
 Enable SLEPc eigensolvers (required for conformal compounds) (default: ON)
 @item ENABLE_SOLVER
-Enable solver components (required e.g. for compounds) (default: ON)
+Enable built-in finite element solvers (required for compounds) (default: ON)
 @item ENABLE_TAUCS
 Enable Taucs linear solver (alternative to PETSc) (default: ON)
 @item ENABLE_TETGEN
@@ -106,6 +106,6 @@ Enable older version of Tetgen (default: OFF)
 @item ENABLE_VORO3D
 Enable Voro3D (experimental) (default: ON)
 @item ENABLE_WRAP_JAVA
-Enable building of Java wrappers (default: OFF)
+Enable generation of Java wrappers (default: OFF)
 @item ENABLE_WRAP_PYTHON
-Enable building of Python wrappers (default: OFF)
+Enable generation of Python wrappers (default: OFF)