diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 1bd41f57414d19f5a26aa2f79d15b055a84baaae..533867476b97b0ab7b27ae6f10d0b0cb8a24e91f 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -24,41 +24,36 @@ Option file into which session specific information is saved; automatically read
 Default value: @code{".gmshrc"}@*
 Saved in: @code{-}
 
-@item General.TextEditor
-System command to launch a text editor (OS-dependent)@*
-Default value: @code{"emacs %s &"}@*
-Saved in: @code{General.OptionsFileName}
-
 @item General.Scheme
 FLTK graphical user interface scheme (try e.g. plastic)@*
 Default value: @code{""}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.TextEditor
+System command to launch a text editor@*
+Default value: @code{"open -e %s"}@*
+Saved in: @code{General.OptionsFileName}
+
 @item General.TmpFileName
 Temporary file used by the geometry module@*
 Default value: @code{".gmsh-tmp"}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.WebBrowser
+System command to launch a web browser@*
+Default value: @code{"open %s"}@*
+Saved in: @code{General.OptionsFileName}
+
 @item General.AlphaBlending
 Enable alpha blending (transparency) in post-processing views@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
-@item General.SystemMenuBar
-Use the system menu bar on Mac OS X (if possible)?@*
-Default value: @code{1}@*
-Saved in: @code{General.SessionFileName}
-
 @item General.Axes
 Display the axes linked to the model@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
-@item General.CenterWindows
-Center new windows on the menu window@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
 @item General.Clip0
 Enable clip plane 0@*
 Default value: @code{0}@*
@@ -219,6 +214,16 @@ Ask confirmation before overwriting files?@*
 Default value: @code{1}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.ContextPositionX
+Horizontal position (in pixels) of the upper left corner of the contextual windows@*
+Default value: @code{650}@*
+Saved in: @code{General.SessionFileName}
+
+@item General.ContextPositionY
+Vertical position (in pixels) of the upper left corner of the contextual windows@*
+Default value: @code{150}@*
+Saved in: @code{General.SessionFileName}
+
 @item General.DefaultPlugins
 Load default plugins on startup@*
 Default value: @code{1}@*
@@ -534,6 +539,16 @@ Y position of small axes (use negative values for bottom alignment)@*
 Default value: @code{-35}@*
 Saved in: @code{General.OptionsFileName}
 
+@item General.SolverPositionX
+Horizontal position (in pixels) of the upper left corner of the solver windows@*
+Default value: @code{650}@*
+Saved in: @code{General.SessionFileName}
+
+@item General.SolverPositionY
+Vertical position (in pixels) of the upper left corner of the solver windows@*
+Default value: @code{150}@*
+Saved in: @code{General.SessionFileName}
+
 @item General.StatisticsPositionX
 Horizontal position (in pixels) of the upper left corner of the statistic window@*
 Default value: @code{650}@*
@@ -544,6 +559,11 @@ Vertical position (in pixels) of the upper left corner of the statistic window@*
 Default value: @code{150}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.SystemMenuBar
+Use the system menu bar on Mac OS X?@*
+Default value: @code{1}@*
+Saved in: @code{General.SessionFileName}
+
 @item General.Terminal
 Should information be printed on the terminal (if available)?@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 558e265a8d08cac6b150ac682439ab0b855556a1..c03bfd98ae6d4ee103b51f2dad3ae0ed52cbbd64 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -25,7 +25,7 @@ Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.ColorCarousel
-Use a `color by region number' coloring scheme@*
+Use a `color by region' coloring scheme (0=no, 1=by geometrical entity, 2=by partition)@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
@@ -134,6 +134,11 @@ Minimum number of points used to mesh a circle@*
 Default value: @code{7}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.MshFileVersion
+MSH mesh file version to generate@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.NbHexahedra
 Number of hexahedra in the current mesh@*
 Default value: @code{0}@*
@@ -360,7 +365,7 @@ Default value: @code{@{32,145,223@}}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.Color.Ten
-tenth color in color carousel@*
+Tenth color in color carousel@*
 Default value: @code{@{25,193,230@}}@*
 Saved in: @code{General.OptionsFileName}
 
diff --git a/doc/texinfo/opt_print.texi b/doc/texinfo/opt_print.texi
index ff9f549d8d834a8152dc6ebb50e261dc65019ce4..db00a5dfd34c5c335ddc9fbc88a498d9ede1dcab 100644
--- a/doc/texinfo/opt_print.texi
+++ b/doc/texinfo/opt_print.texi
@@ -26,7 +26,7 @@ Saved in: @code{General.OptionsFileName}
 
 @item Print.EpsLineWidthFactor
 Width factor for lines in PostScript/PDF output@*
-Default value: @code{1}@*
+Default value: @code{0.5}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Print.EpsOcclusionCulling
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 769c804faa3ce712448f147a361ffa5c99ea08b5..b40c315f7579fc3b591445bd168f927b5f7d7fa6 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -8,7 +8,7 @@ Saved in: @code{General.OptionsFileName}
 Help string for solver 0@*
 Default value: @code{"A General environment for the treatment of
 Discrete Problems.
-Copyright (C) 1997-2003
+Copyright (C) 1997-2004
 Patrick Dular and Christophe Geuzaine.
 Visit http://www.geuz.org/getdp/ for more info"}@*
 Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_view.texi b/doc/texinfo/opt_view.texi
index ba0a14534e9b16f010969d67846a1db510d6f123..dd11df51d5e63af883bb587954e3a164b0e3e704 100644
--- a/doc/texinfo/opt_view.texi
+++ b/doc/texinfo/opt_view.texi
@@ -240,7 +240,7 @@ Default value: @code{0}@*
 Saved in: @code{-}
 
 @item View.RangeType
-Value scale range type (1=default, 2=custom)@*
+Value scale range type (1=default, 2=custom, 3=per time step)@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
@@ -265,7 +265,7 @@ Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
 @item View.ShowTime
-Show time value (or time step number) in the scale? (1=only if NbTimeStep>1, 2=always)@*
+Show time value in the scale? (1=only if NbTimeStep>1, 2=always)@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}