diff --git a/doc/gmsh.html b/doc/gmsh.html
index a00168bcee2945e1e190f09d7c7059cba0c2c798..ae2388c2dfd4651f5876d957ea8af59899fe4a85 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -108,9 +108,9 @@ Remacle</a>. The <a href="/gmsh/doc/CREDITS.txt">CREDITS</a> file has
 more information.
 <p>
 Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a> 
-to send questions. Bug reports can be filed 
-<a href="https://geuz.org/trac/gmsh/report">here</a> (username:
-gmsh, password: gmsh).
+to send questions. Bug reports and feature requests can be filed directly 
+<a href="https://geuz.org/trac/gmsh/report">here</a> (username: gmsh,
+password: gmsh).
 
 <h2><a name="Documentation"></a>Documentation</h2>
 
@@ -158,7 +158,7 @@ Gmsh is copyright (C) 1997-2009 by C. Geuzaine and J.-F. Remacle and
 is distributed under the terms of
 the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public
 License (GPL)</a> (with an <a href="/gmsh/doc/LICENSE.txt">exception</a>
-to allow for easier linking with external mesh generators).
+to allow for easier linking with external libraries).
 
 <p>
 In short, this means that everyone is free to use Gmsh and to
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index a4bc86d2c669d6c6b073ceaa693c846260fe8443..2febc94d14f1ff5f272c490e41fb33008e4d53f8 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -4826,18 +4826,18 @@ input and advanced visualization capabilities.
 
 @item What are the terms and conditions of use?
 
-Gmsh is distributed under the terms of the GNU General Public
-License. See the file 'doc/LICENSE' for more information, or go to the
-GNU foundation's web site at http://www.gnu.org.
+Gmsh is distributed under the terms of the GNU General Public License,
+with an exception to allow for easier linking with external mesh
+libraries. See @ref{License} for more information.
 
 @item What does 'Gmsh' mean?
 
-Nothing... The name was derived from a previous version called "msh"
-(a shortcut for "mesh"), with the "g" prefix added to differentiate
-it. The default mesh file format used by Gmsh still uses the ".msh"
-extention. 
+Nothing... The name was derived from a previous version called ``msh''
+(a shortcut for ``mesh''), with the ``g'' prefix added to differentiate
+it. The default mesh file format used by Gmsh still uses the @file{.msh}
+extention.
 
-In English people tend to pronounce 'Gmsh' as "gee-mesh".
+In English people tend to pronounce `Gmsh' as ``gee-mesh''.
 
 @item Where can I find more information?
 
@@ -4857,29 +4857,28 @@ well as a searchable archive of the Gmsh mailing list
 @enumerate
 @item Which OSes does Gmsh run on?
 
-Gmsh is known to run on Windows 2000/XP/Vista, Mac OS X, Linux and
-most Unix variants.
+Gmsh runs on Windows XP/Vista, Mac OS X, Linux and most Unix variants.
 
 @item Are there additional requirements to run Gmsh?
 
 You should have the OpenGL libraries installed on your system, and in
 the path of the library loader. A free replacement for OpenGL can be
-found at http://www.mesa3d.org.
+found at @url{http://www.mesa3d.org}.
 
 @item How do I compile Gmsh from the source code?
 
-You need cmake (http://www.cmake.org) and a C++ compiler. See the
-README.txt file in the top-level source directory for more
+You need cmake (@url{http://www.cmake.org}) and a C++ compiler. See the
+@file{README.txt} file in the top-level source directory for more
 information.
 
 @item Where does Gmsh save its configuration files?
 
 Gmsh will attempt to save temporary files and persistent configuration
-options first in the $GMSH_HOME directory, then in the $HOME, $TMP or
-$TEMP directories (in that order) if the $GMSH_HOME environment
-variable is not defined. If none of these variables are defined, Gmsh
-will try to save/load its configuration files from the current working
-directory.
+options first in the @code{$GMSH_HOME} directory, then in the
+@code{$HOME}, @code{$TMP} or @code{$TEMP} directories (in that order) if
+the @code{$GMSH_HOME} environment variable is not defined. If none of
+these variables are defined, Gmsh will try to save/load its
+configuration files from the current working directory.
 @end enumerate
 
 @c -------------------------------------------------------------------------
@@ -4892,15 +4891,15 @@ directory.
 @enumerate
 @item Gmsh (from a binary distribution) complains about missing libraries.
 
-On Windows, if your system complains about missing OPENGL32.DLL or
-GLU32.DLL libraries, then OpenGL is not properly installed on your
-machine. You can download OpenGL from Microsoft's web site, or
-directly from http://www.opengl.org.
+On Windows, if your system complains about missing @file{OPENGL32.DLL}
+or @file{GLU32.DLL} libraries, then OpenGL is not properly installed on
+your machine. You can download OpenGL from Microsoft's web site, or
+directly from @url{http://www.opengl.org}.
 
-On Unix try 'ldd gmsh' (or 'otool -L gmsh' on Mac OS X) to check if
-all the required shared libraries are installed on your system. If
-not, install them. If it still doesn't work, recompile Gmsh from the
-sources.
+On Unix try `ldd gmsh' (or `otool -L gmsh' on Mac OS X) to check if all
+the required shared libraries are installed on your system. If not,
+install them. If it still doesn't work, recompile Gmsh from the source
+code.
 
 @item Gmsh keeps re-displaying its graphics when other windows partially hide the graphical window.
 
@@ -4909,26 +4908,28 @@ Disable opaque move in your window manager.
 @item The graphics display very slowly.
 
 Are you are executing Gmsh from a remote host (via the network)
-without GLX?  You should turn double buffering off (with the '-nodb'
+without GLX?  You should turn double buffering off (with the `-nodb'
 command line option).
 
 @item There is an ugly "ghost triangulation" in the vector PostScript/PDF files generated by Gmsh!
 
-No, there isn't. This "ghost triangulation" is due to the fact that most
+No, there isn't. This ``ghost triangulation'' is due to the fact that most
 PostScript previewers nowadays antialias the graphic primitives when
 they display the page on screen. (For example, in gv, you can disable
-antialising with the 'State->Antialias' menu.) You should not see this
+antialising with the `State->Antialias' menu.) You should not see this
 ghost triangulation in the printed output (on paper).
 
 @item How can I save GIF, JPEG, ..., images?
 
-Just choose the appropriate format in 'File->Save As'. By default Gmsh
-guesses the format from the file extension, so you can just choose
-"myfile.jpg" in the dialog.
+Just choose the appropriate format in `File->Save As'. By default Gmsh
+guesses the format from the file extension, so you can just type
+"myfile.jpg" in the dialog and Gmsh will automatically create a JPEG
+image file.
 
 @item How can I save MPEG, AVI, ..., animations?
 
-See ``Is there a way to save animations?''
+Yes, using scripts. Have a look at @file{tutorial/t8.geo} or
+@file{demos/anim.script} for some examples.
 
 @item Can I change values in input fields with the mouse in the GUI?
 
@@ -4953,7 +4954,7 @@ clipboard.
 @enumerate
 @item Does Gmsh support NURBS curves/surfaces?
 
-Yes, but only via STEP, IGES or BREP model import (not in .geo
+Yes, but only via STEP, IGES or BREP model import (not in @file{.geo}
 files). Gmsh has to be compiled with OpenCascade support for this to
 work.
 
@@ -4962,17 +4963,22 @@ work.
 The default behavior of Gmsh is to check and suppress all duplicate
 entities (points, lines and surfaces) each time a transformation command
 is issued. This can slow down things a lot if many transformations are
-performed. There are two solutions to this problem: - you may save the
-unrolled geometry in another file (e.g. with gmsh file.geo -0), and use
-this new file for subsequent computations; - or you may set the
-'Geometry.AutoCoherence' option to 0. This will prevent any automatic
-duplicate check/replacement. If you still need to remove the duplicates
-entities, simply add 'Coherence;' at strategic locations in your geo
-files (e.g. before the creation of line loops, etc.).
+performed. There are two solutions to this problem: 
+@itemize
+@item 
+you may save the unrolled geometry in another file (e.g. with gmsh
+file.geo -0), and use this new file for subsequent computations;
+@item 
+or you may set the @code{Geometry.AutoCoherence} option to 0. This will
+prevent any automatic duplicate check/replacement. If you still need to
+remove the duplicates entities, simply add @code{Coherence;} at strategic
+locations in your geo files (e.g. before the creation of line loops,
+etc.).
+@end itemize
 
 @item How can I display only selected parts of my model?
 
-Use 'Tools->Visibility'. This allows you to select elementary entities
+Use `Tools->Visibility'. This allows you to select elementary entities
 and physical groups, as well as mesh elements, in a variety of ways
 (in a list or tree browser, by identification number, interactively,
 or per window).
@@ -4980,12 +4986,12 @@ or per window).
 @item Can I edit STEP/IGES/BRep models?
 
 Not yet. At the moment you can only change characteristic lengths,
-define volumes and physical groups, or delete entities. The easiest
-way to do this is to merge the model in a .geo file using 'Merge
-"file.step";' and add the relevant scripting command after that. We
-plan to add more advanced editing features in the future (to delete
-entities, to create "mixed" surfaces and volumes, to export in .geo
-format, etc.).
+define volumes and physical groups, or delete entities. The easiest way
+to do this is to merge the model in a @file{.geo} file using @code{Merge
+"file.step";} and add the relevant scripting command after that. We plan
+to add more advanced editing features in the future (to delete entities,
+to create "mixed" surfaces and volumes, to export in @file{.geo} format,
+etc.).
 
 @item How can I build modular geometries?
 
@@ -5008,8 +5014,8 @@ Verify that the curves in the model do not self-intersect. If
 Mesh.RandomFactor * size(triangle)/size(model) approaches machine
 accuracy, increase Mesh.RandomFactor.
 
-If everything fails send us a bug report with the version of your
-operating system and the full geometry.
+If everything fails file a bug report with the version of your operating
+system and the full geometry.
 
 @item What should I do when the 3D unstructured algorithm fails?
 
@@ -5019,11 +5025,12 @@ partially overlap. If they don't, try the other 3D algorithms
 characteristic lengths in your input file so that the surface mesh
 better matches the geometrical details of the model. 
 
-If nothing works, send us a bug report (including your geometry).
+If nothing works, file a bug report with the version of your operating
+system and and the full geometry.
 
 @item The quality of the elements generated by the 3D algorithm is very bad.
 
-Use 'Optimize quality' in the mesh menu. 
+Use `Optimize quality' in the mesh menu. 
 
 @item Non-recombined 3D extruded meshes sometimes fail.
 
@@ -5048,29 +5055,28 @@ algorithm with smoothing (e.g., with "Mesh.Smoothing = 10").
 @item Does Gmsh support curved elements?
 
 Yes, Gmsh can generate both 1st order and 2nd order elements. To
-generate second order elements, click on 'Second order' in the mesh
+generate second order elements, click on `High order' in the mesh
 menu after the mesh is completed. To always generate 2nd order
-elements, select 'Generate second order elements' in the mesh option
-panel. From the command line, you can also use '-order 2'.
+elements, select `Generate second order elements' in the mesh option
+panel. From the command line, you can also use @code{-order 2}.
 
-@item Can I import an existing surface mesh in Gmsh and use it to
-  build a 3D mesh?
+@item Can I import an existing surface mesh in Gmsh and use it to build a 3D mesh?
 
 Yes, you can import a surface mesh in any one of the supported mesh
 file formats, define a volume, and mesh it. For an example see
-'demos/sphere-discrete.geo'.
+@file{demos/sphere-discrete.geo}.
 
 @item How do I define boundary conditions or material properties in Gmsh?
 
-By design, Gmsh does not try to incorporate every possible definition
-of boundary conditions or material properties--this is a job best left
-to the solver. Instead, Gmsh provides a simple mechanism to tag groups
-of elements, and it is up to the solver to interpret these tags as
-boundary conditions, materials, etc. Associating tags with elements in
-Gmsh is done by defining Physical entities (Physical Points, Physical
-Lines, Physical Surfaces and Physical Volumes). See the reference
-manual as well as the tutorials (in particular 'tutorial/t1.geo') for
-a detailed description and some examples.
+By design, Gmsh does not try to incorporate every possible definition of
+boundary conditions or material properties---this is a job best left to
+the solver. Instead, Gmsh provides a simple mechanism to tag groups of
+elements, and it is up to the solver to interpret these tags as boundary
+conditions, materials, etc. Associating tags with elements in Gmsh is
+done by defining Physical entities (Physical Points, Physical Lines,
+Physical Surfaces and Physical Volumes). See the reference manual as
+well as the tutorials (in particular @file{tutorial/t1.geo}) for a detailed
+description and some examples.
 
 @item How can I display only the mesh associated with selected geometrical entities?
 
@@ -5078,7 +5084,7 @@ See ``How can I display only selected parts of my model?''.
 
 @item How can I "explore" a mesh (for example, to see inside a complex structure)?
 
-You can use 'Tools->Clipping Planes' to clip the region of
+You can use `Tools->Clipping Planes' to clip the region of
 interest. You can define up to 6 clipping planes in Gmsh (i.e., enough
 to define a "cube" inside your model) and each plane can clip either
 the geometry, the mesh, the post-processing views, or any combination
@@ -5104,7 +5110,7 @@ Gmsh reindexes the mesh vertices and elements so that they are
 numbered in a continuous sequence in the output files. The numbers
 displayed on screen after mesh generation thus usually differ from the
 ones saved in the mesh files. To check the actual numbers saved in the
-output file just load the mesh file back using File->Open.
+output file just load the mesh file back using `File->Open'.
 @end enumerate
 
 @c -------------------------------------------------------------------------
@@ -5129,23 +5135,23 @@ calls inside your program. You will of course also need to define your
 solver commands in an option file, but this time you should set the
 ClientServer variable to 1 (e.g. Solver.ClientServer = 1). C, C++,
 Perl and Python solver examples are available in the source
-distribution in the 'utils/solvers' directory.
+distribution in the @file{utils/solvers} directory.
 
 @item On Windows, Gmsh does not seem to find the solver executable. What's wrong?
 
-The solver executable (for example, 'getdp.exe') has to be in your
-path. If it is not specify its location in the 'Command' field.
+The solver executable (for example, `getdp.exe') has to be in your
+path. If it is not specify its location in the `Command' field.
 
 @item Can I launch Gmsh from my solver (instead of launching my solver from Gmsh) in order to monitor a solution?
 
 Sure. The simplest (but rather crude) approach if to re-launch Gmsh
 everytime you want to visualize something (a simple C program showing
-how to do this is given in 'utils/misc/callgmsh.c'). A better approach
+how to do this is given in @file{utils/misc/callgmsh.c}). A better approach
 is to modify your program so that it can communicate with Gmsh over a
 socket (see ``How do I integrate my own solver with Gmsh?'' above; you
-can skip the option file creation). Then select 'Always listen to
+can skip the option file creation). Then select `Always listen to
 incoming connection requests' in the solver option panel (or run gmsh
-with the '-listen' command line option) and Gmsh will always listen for
+with the @code{-listen} command line option) and Gmsh will always listen for
 your program on the Solver.SocketName socket.
 @end enumerate
 
@@ -5159,12 +5165,12 @@ your program on the Solver.SocketName socket.
 @enumerate
 @item How do I compute a section of a plot?
 
-Use 'Tools->Plugins->Cut Plane'.
+Use `Tools->Plugins->Cut Plane'.
 
 @item Can I save an isosurface to a file?
 
-Yes: first run 'Tools->Plugins->Cut Map' to extract the isosurface,
-then use 'View->Save As' to save the new view.
+Yes: first run `Tools->Plugins->Cut Map' to extract the isosurface,
+then use `View->Save As' to save the new view.
 
 @item Can Gmsh generate isovolumes?
 
@@ -5173,25 +5179,25 @@ to extract the negative or positive levelset).
 
 @item How do I animate my plots?
 
-If the views contain multiple time steps, you can press the 'play'
+If the views contain multiple time steps, you can press the `play'
 button at the bottom of the graphic window, or change the time step by
 hand in the view option panel. You can also use the left and right
 arrow keys on your keyboard to change the time step in all visible
 views in real time.
 
 If you want to loop through different views instead of time steps, you
-can use the 'Loop through views instead of time steps' option in the
+can use the `Loop through views instead of time steps' option in the
 view option panel, or use the up and down arrow keys on your keyboard.
 
 @item How do I visualize a deformed mesh?
 
-Load a vector view containing the displacement field, and set 'Vector
-display' to 'Displacement' in View->Options->Aspect. If the
+Load a vector view containing the displacement field, and set `Vector
+display' to `Displacement' in `View->Options->Aspect'. If the
 displacement is too small (or too large), you can scale it with the
-'Displacement factor' option. (Remember that you can drag the mouse in
+`Displacement factor' option. (Remember that you can drag the mouse in
 all numeric input fields to slide the value!)
 
-Another option is to use the 'General transformation expressions' (in
+Another option is to use the `General transformation expressions' (in
 View->Options->Offset) on a scalar view, with the displacement map
 selected as the data source.
 
@@ -5203,38 +5209,37 @@ The easiest is to load two views: the first one containing a
 displacement field (a vector view that will be used to deform the
 mesh), and the second one containing the field you want to display
 (this view has to contain the same number of elements as the
-displacement view). You should then set 'Vector display' to
-'Displacement' in the first view, as well as set 'Data source' to
+displacement view). You should then set `Vector display' to
+`Displacement' in the first view, as well as set `Data source' to
 point to the second view. (You might want to make the second view
 invisible, too. If you want to amplify or decrease the amount of
-deformation, just modify the 'Displacement factor' option.)
+deformation, just modify the `Displacement factor' option.)
 
-Another solution is to use the 'General transformation expressions'
-(in 'View->Options->Offset') on the field you want to display, with
+Another solution is to use the `General transformation expressions'
+(in `View->Options->Offset') on the field you want to display, with
 the displacement map selected as the data source.
 
 And yet another solution is to use the Warp plugin.
 
-@item Can I color the arrows representing a vector field with data
-  from a scalar field?
+@item Can I color the arrows representing a vector field with data from a scalar field?
 
 Yes: load both the vector and the scalar fields (the two views must
 have the same number of elements) and, in the vector field options,
-select the scalar view in 'Data source'.
+select the scalar view in `Data source'.
 
 @item Can I color isovalue surfaces with data from another scalar view?
 
-Yes, using either the CutMap plugin (with the 'dView' option) or the
+Yes, using either the CutMap plugin (with the `dView' option) or the
 Evaluate plugin.
 
 @item Is there a way to save animations?
 
-Yes, using scripts. Have a look at 'tutorial/t8.geo' or
-'demos/anim.script' for some examples.
+Yes, using scripts. Have a look at @file{tutorial/t8.geo} or
+@file{demos/anim.script} for some examples.
 
 @item Is there a way to visualize only certain components of vector/tensor fields?
 
-Yes, using 'Tools->Plugins->Extract'.
+Yes, using `Tools->Plugins->Extract'.
 
 @item Can I do arithmetic operations on a view? Can I perform operations involving different views?
 
@@ -5243,44 +5248,43 @@ Yes, with the Evaluate plugin.
 @item Some plugins seem to create empty views. What's wrong?
 
 There can be several reasons:
-
 @itemize
-@item the plugin might be written for specific element types only (for
-  example, only for scalar triangles or tetrahedra). In that case, you
-  should transform your view before running the plugin (you can use
-  Plugin(DecomposeinSimplex) to transform all quads, hexas, prisms and
-  pyramids into triangles and tetrahedra).
-
-@item the plugin might expect a mesh while all you provide is a point
-  cloud. In 2D, you can use Plugin(Triangulate) to transform a point
-  cloud into a triangulated surface. A 3D version of this plugin is
-  not available yet but it is on our TODO list.
-
-@item the input parameters are out of range.
+@item 
+the plugin might be written for specific element types only (for
+example, only for scalar triangles or tetrahedra). In that case, you
+should transform your view before running the plugin (you can use
+Plugin(DecomposeinSimplex) to transform all quads, hexas, prisms and
+pyramids into triangles and tetrahedra).
+@item 
+the plugin might expect a mesh while all you provide is a point
+cloud. In 2D, you can use Plugin(Triangulate) to transform a point cloud
+into a triangulated surface. A 3D version of this plugin is not
+available yet but it is on our TODO list.
+@item 
+the input parameters are out of range.
 @end itemize
 
 In any case, you can automatically remove all empty views with
-'View->Remove->Empty Views' in the GUI, or with "Delete Empty Views;"
-in a script.
+`View->Remove->Empty Views' in the GUI, or with @code{Delete Empty
+Views;} in a script.
 
 @item How can I see "inside" a complicated post-processing view?
 
 See ``How can I "explore" a mesh?''. 
 
 When viewing 3D scalar fields, you can also modify the colormap
-('Tools->Options->View->Map') to make the iso-surfaces "transparent":
-either by holding 'Ctrl' while dragging the mouse to draw the alpha
-channel by hand, or by using the 'a', 'Ctrl+a', 'p' and 'Ctrl+p'
+(`Tools->Options->View->Map') to make the iso-surfaces "transparent":
+either by holding `Ctrl' while dragging the mouse to draw the alpha
+channel by hand, or by using the `a', `Ctrl+a', `p' and `Ctrl+p'
 keyboard shortcuts.
 
 Yet another (destructive) option is to use the ExtractVolume option in
 the CutSphere or CutPlane plugins.
 
-@item I am loading a valid 3D scalar view but Gmsh does not display
-  anything!
+@item I am loading a valid 3D scalar view but Gmsh does not display anything!
 
 If your dataset is constant per element make sure you don't use the
-'Iso-values' interval type in 'Tools->Options->View->Range'.
+`Iso-values' interval type in `Tools->Options->View->Range'.
 @end enumerate