diff --git a/doc/texinfo/commandline.texi b/doc/texinfo/commandline.texi
index 188cd3fff0d5bd9ee815101f0e942d00721f891e..a39f2892468030962b13dd0d19b423b6925fcdca 100644
--- a/doc/texinfo/commandline.texi
+++ b/doc/texinfo/commandline.texi
@@ -110,10 +110,12 @@ Specify display
 Use camera mode view;
 @item -stereo
 OpenGL quad-buffered stereo rendering (requires special graphic card)
+@item -gamepad
+Use gamepad controller if available
 @end ftable
  Other options:
 @ftable @code
-@item -
+@item -, -parse_and_exit
 Parse input files, then exit
 @item -new
 Create new model before merge next file
diff --git a/doc/texinfo/opt_fields.texi b/doc/texinfo/opt_fields.texi
index 9dc5e000d195bea5f769f6ba324168b68e2c18c9..364ff628fea7ccb7b877fdea88f3d0c82c38ad23 100644
--- a/doc/texinfo/opt_fields.texi
+++ b/doc/texinfo/opt_fields.texi
@@ -648,22 +648,4 @@ type: boolean@*
 default value: @code{0}
 @end table
 
-@item UTM
-Evaluate Field[IField] in Universal Transverse Mercator coordinates.@*
-@*
-The formulas for the coordinates transformation are taken from:@*
-@*
-  http://www.uwgb.edu/dutchs/UsefulData/UTMFormulas.HTM@*
-Options:@*
-@table @code
-@item IField
-Index of the field to evaluate@*
-type: integer@*
-default value: @code{1}
-@item Zone
-Zone of the UTM projection@*
-type: integer@*
-default value: @code{0}
-@end table
-
 @end ftable
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index eb7814d7db69198e5a7c3d03ea9acc8e07aa690f..199508f4df741e62ea416f24bd88ce6b6a6b71db 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -69,6 +69,11 @@ Font used in the graphic window@*
 Default value: @code{"Helvetica"}@*
 Saved in: @code{General.OptionsFileName}
 
+@item General.GraphicsFontEngine
+Set graphics font engine (Native, Cairo)@*
+Default value: @code{"Native"}@*
+Saved in: @code{General.OptionsFileName}
+
 @item General.GraphicsFontTitle
 Font used in the graphic window for titles@*
 Default value: @code{"Helvetica"}@*
@@ -1071,7 +1076,7 @@ Saved in: @code{General.OptionsFileName}
 
 @item General.Color.BackgroundGradient
 Background gradient color@*
-Default value: @code{@{128,147,255@}}@*
+Default value: @code{@{208,215,255@}}@*
 Saved in: @code{General.OptionsFileName}
 
 @item General.Color.Foreground
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index f84623787df56ae7558406dda22504c026855a75..af58d735fc65dcf0360a8ef2165ff7743e2e06c8 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -184,11 +184,6 @@ CPU time (in seconds) for the generation of the current mesh (read-only)@*
 Default value: @code{0}@*
 Saved in: @code{-}
 
-@item Mesh.DelaunayQ
-Quality factor for initial Delaunay tetrahedralization@*
-Default value: @code{3.5}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Mesh.DrawSkinOnly
 Draw only the skin of 3D meshes?@*
 Default value: @code{0}@*
@@ -509,6 +504,26 @@ Apply recombination3D algorithm to all volumes, ignoring per-volume spec@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.DoRecombinationTest
+Apply recombination algorithm for test@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Mesh.RecombinationTestHorizStart
+Depth start@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Mesh.RecombinationTestNoGreedyStrat
+No greedy (global) strategies@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Mesh.RecombinationTestNewStrat
+New strategies@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.RemeshAlgorithm
 Remeshing algorithm (0=no split, 1=automatic, 2=automatic only with metis)@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index b360694e1f2574de9ebd01bd4b71461ee7384478..60706546712ff24eb2ae5b27ab15923ca3180781 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -821,6 +821,8 @@ Default value: @code{1}
 Default value: @code{1}
 @item NegativeTime
 Default value: @code{0}
+@item RFar
+Default value: @code{0}
 @end table
 
 @item Plugin(NearestNeighbor)
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 7a6aab54e9964c17e339dd759738ba811a68fcdc..c1f771c777b32b25de03a5ed71fe1d9c325c512c 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -29,6 +29,31 @@ System command to launch solver 4@*
 Default value: @code{""}@*
 Saved in: @code{General.SessionFileName}
 
+@item Solver.Executable5
+System command to launch solver 5@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Executable6
+System command to launch solver 6@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Executable7
+System command to launch solver 7@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Executable8
+System command to launch solver 8@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Executable9
+System command to launch solver 9@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
 @item Solver.Name0
 Name of solver 0@*
 Default value: @code{"GetDP"}@*
@@ -54,6 +79,31 @@ Name of solver 4@*
 Default value: @code{""}@*
 Saved in: @code{General.SessionFileName}
 
+@item Solver.Name5
+Name of solver 5@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Name6
+Name of solver 6@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Name7
+Name of solver 7@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Name8
+Name of solver 8@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.Name9
+Name of solver 9@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
 @item Solver.RemoteLogin0
 Command to login to a remote host to launch solver 0@*
 Default value: @code{""}@*
@@ -79,6 +129,31 @@ Command to login to a remote host to launch solver 4@*
 Default value: @code{""}@*
 Saved in: @code{General.SessionFileName}
 
+@item Solver.RemoteLogin5
+Command to login to a remote host to launch solver 5@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.RemoteLogin6
+Command to login to a remote host to launch solver 6@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.RemoteLogin7
+Command to login to a remote host to launch solver 7@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.RemoteLogin8
+Command to login to a remote host to launch solver 8@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
+@item Solver.RemoteLogin9
+Command to login to a remote host to launch solver 9@*
+Default value: @code{""}@*
+Saved in: @code{General.SessionFileName}
+
 @item Solver.SocketName
 Base name of socket (TCP/IP if it contains the `:' character, UNIX otherwise)@*
 Default value: @code{".gmshsock"}@*
diff --git a/doc/texinfo/opt_view.texi b/doc/texinfo/opt_view.texi
index 36f3dd009d99a61a457ed153b3692c47e67520df..81a5db1afd90ede7b90766e2b22795d4f17930ff 100644
--- a/doc/texinfo/opt_view.texi
+++ b/doc/texinfo/opt_view.texi
@@ -50,17 +50,17 @@ Default value: @code{"%.3g"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item View.GeneralizedRaiseX
-Generalized elevation of the view along X-axis (in model coordinates)@*
+Generalized elevation of the view along X-axis (in model coordinates, using formula possibly containing x, y, z, s[tep], t[ime], v0, ... v8)@*
 Default value: @code{"v0"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item View.GeneralizedRaiseY
-Generalized elevation of the view along Y-axis (in model coordinates)@*
+Generalized elevation of the view along Y-axis (in model coordinates, using formula possibly containing x, y, z, s[tep], t[ime], v0, ... v8)@*
 Default value: @code{"v1"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item View.GeneralizedRaiseZ
-Generalized elevation of the view along Z-axis (in model coordinates)@*
+Generalized elevation of the view along Z-axis (in model coordinates, using formula possibly containing x, y, z, s[tep], t[ime], v0, ... v8)@*
 Default value: @code{"v2"}@*
 Saved in: @code{General.OptionsFileName}
 
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 83fc4ea7036d92247cb6e51bf1bccf54a48cde8c..c765b63f0f0f0b5be6d91cac5bd0843b605c8398 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -48,12 +48,14 @@ Show post-processing view plugins
 Show post-processing view options
 @item Shift+Escape
 Enable full mouse selection
-@item Ctrl+i
-Show statistics window
 @item Ctrl+d
 Attach/detach menu
 @item Ctrl+f
 Enter full screen
+@item Ctrl+i
+Show statistics window
+@item Ctrl+j
+Save model options
 @item Ctrl+l
 Show message console
 @item Ctrl+m
@@ -70,6 +72,8 @@ Rename project file
 Save file as
 @item Shift+Ctrl+c
 Show clipping plane window
+@item Shift+Ctrl+j
+Save options as default
 @item Shift+Ctrl+m
 Show manipulator window
 @item Shift+Ctrl+n