diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 63c5571151172a9b71a1c1fb05931e266943afdf..5556978047a0e799358bea7769472a775d51790f 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -727,8 +727,9 @@ or type
 @end example
 
 @noindent at your shell prompt in a terminal. This will open
-two windows: the graphic window (with a status bar at the bottom) and
-the menu window (with a menu bar and some context-dependent buttons).
+the main Gmsh windows, with a tree-like menu on the left, a graphic area
+on the right, and a status bar at the bottom. (You can detach the tree
+menu using `Window->Attach/Detach Menu'.)
 
 To open the first tutorial file (@pxref{Tutorial}), select the
 `File->Open' menu, and choose @file{t1.geo} in the input field. When
@@ -740,66 +741,65 @@ line, i.e.:
 @end example
 
 To perform the mesh generation, go to the mesh module (by selecting
-`Mesh' in the module menu) and choose the dimension in the
-context-dependent buttons (`1D' will mesh all the lines; `2D' will mesh
-all the surfaces---as well as all the lines if `1D' was not called
-before; `3D' will mesh all the volumes---and all the surfaces if `2D'
-was not called before). To save the resulting mesh in the current mesh
-format click on the `Save' button, or select the appropriate format and
-file name with the `File->Save As' menu. The default mesh file name is
-based on the name of the current active model, with an appended
-extension depending on the mesh format@footnote{Nearly all the
-interactive commands have shortcuts: see @ref{Keyboard shortcuts}, or
-select `Help->Keyboard Shortcuts' in the menu. For example, to quickly
-save a mesh, you can press @kbd{Ctrl+Shift+s}.}.
+`Mesh' in the tree) and choose the dimension (`1D' will mesh all the
+lines; `2D' will mesh all the surfaces---as well as all the lines if
+`1D' was not called before; `3D' will mesh all the volumes---and all the
+surfaces if `2D' was not called before). To save the resulting mesh in
+the current mesh format click on `Save', or select the appropriate
+format and file name with the `File->Save As' menu. The default mesh
+file name is based on the name of the current active model, with an
+appended extension depending on the mesh format@footnote{Nearly all the
+interactive commands have keyboard shortcuts: see @ref{Keyboard
+shortcuts}, or select `Help->Keyboard and Mouse Usage' in the menu. For
+example, to quickly save a mesh, you can press @kbd{Ctrl+Shift+s}.}.
 
 To create a new geometry or to modify an existing geometry, select
-'Geometry' in the module menu, and follow the context-dependent buttons.
-For example, to create a spline, select `Elementary', `Add', `New' and
-`Spline'. You will then be asked to select a list of points, and to type
-@kbd{e} to finish the selection (or @kbd{q} to abort it). Once the
-interactive command is completed, a text string is automatically added
-at the end of the current script file. You can edit the script file by
-hand at any time by pressing the `Edit' button in the `Geometry' menu
-and then reloading the model by pressing `Reload'. For example, it is
-often faster to define variables and points directly in the script file,
-and then use the GUI to define the lines, the surfaces and the volumes
-interactively.
-
-Several files can be loaded simultaneously in Gmsh. The first one
-defines the active model and the others are `merged' into this
-model. You can merge such files with the `File->Merge' menu, or by
-directly specifying the names of the files on the command line. For
-example, to merge the post-processing views contained in the files
-@file{view1.pos} and @file{view5.msh} together with the geometry of the
-first tutorial @file{t1.geo}, you can type the following command:
+'Geometry' in the tree.  For example, to create a spline, select
+`Elementary', `Add', `New' and `Spline'. You will then be asked to
+select a list of points, and to type @kbd{e} to finish the selection (or
+@kbd{q} to abort it). Once the interactive command is completed, a text
+string is automatically added at the end of the current script file. You
+can edit the script file by hand at any time by pressing the `Edit'
+button in the `Geometry' menu and then reloading the model by pressing
+`Reload'. For example, it is often faster to define variables and points
+directly in the script file, and then use the GUI to define the lines,
+the surfaces and the volumes interactively.
+
+Several files can be loaded simultaneously in Gmsh. When specified on
+the command line, the first one defines the active model and the others
+are `merged' into this model. You can merge such files with the
+`File->Merge' menu. For example, to merge the post-processing views
+contained in the files @file{view1.pos} and @file{view5.msh} together
+with the geometry of the first tutorial @file{t1.geo}, you can type the
+following command:
 
 @example
 > gmsh t1.geo view1.pos view5.msh
 @end example
 
-In the Post-Processing module (select `Post-Processing' in the module
-menu), three buttons will appear, respectively labeled `A scalar map',
-`Nodal scalar map' and `Element 1 vector'. In this example the views
-contain several time steps: you can loop through them with the small
-``remote-control'' icons at the bottom of the graphic window. A mouse
-click on the view name will toggle the visibility of the selected view,
-while a click on the arrow button on the right will provide access to
-the view's options.
+In the Post-Processing module (select `Post-Processing' in the tree),
+three items will appear, respectively labeled `A scalar map', `Nodal
+scalar map' and `Element 1 vector'. In this example the views contain
+several time steps: you can loop through them with the small
+``remote-control'' icons in the status bar. A mouse click on the view
+name will toggle the visibility of the selected view, while a click on
+the arrow button on the right will provide access to the view's options.
 
 Note that all the options specified interactively can also be directly
 specified in the script files. You can save the current options of the
-current active model with the `File->Save Options' menu. This will
+current active model with the `File->Save Model Options'. This will
 create a new option file with the same filename as the active model, but
 with an extra @file{.opt} extension added. The next time you open this
 model, the associated options will be automatically loaded, too.  To
 save the current options as your default preferences for all future Gmsh
-sessions, use the `File->Save Default Options' menu instead. Finally,
+sessions, use the `File->Save Options As Default' menu instead. Finally,
 you can also save the current options in an arbitrary file by choosing
 the `Gmsh options' format in `File->Save As'.
 
 For more information about available options (and how to reset them to
-their default values), see @ref{Options}.
+their default values), see @ref{Options}. A full list of options with
+their current values is also available in the `Help->Current Options'
+menu.
 
 
 @c -------------------------------------------------------------------------