diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 1d550e9e03d411ea1ae8744438cf51a9c44e7189..1b5fd40bcdf474b5a8b3cb01f1df7981599fcca4 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -39,11 +39,6 @@ Write mesh files in binary format (if possible)@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Mesh.Bunin
-Apply Bunin optimization on quad meshes (the parameter is the maximal size of a cavity that may be remeshed)@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Mesh.Lloyd
 Apply lloyd optimization on surface meshes@*
 Default value: @code{0}@*
@@ -519,6 +514,11 @@ Ignore partitions boundaries (0=no, 1=yes)@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.PreserveNumberingMsh2
+Preserve element numbering in MSH2 format (will break meshes with multiple physical groups for a single elementary entity)@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.RecombinationAlgorithm
 Mesh recombination algorithm (0=standard, 1=blossom)@*
 Default value: @code{1}@*
@@ -540,7 +540,7 @@ Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.Recombine3DConformity
-3d recombination conformity type (0: nonconforming, 1: conformity using trihedra, 2: conformity using pyramids)@*
+3d recombination conformity type (0: nonconforming, 1: trihedra, 2: pyramids+trihedra, 3:pyramids+hexSplit+trihedra, 4:hexSplit+trihedra)@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
@@ -559,11 +559,6 @@ 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}@*
@@ -579,11 +574,6 @@ Number of refinement steps in the MeshAdapt-based 2D algorithms@*
 Default value: @code{10}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Mesh.Remove4Triangles
-Try to remove nodes surrounded by 4 triangles in 2D triangular meshes@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Mesh.ReverseAllNormals
 Reverse all the mesh normals (for display)@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 92caa50278fec91f720d07d38040fb08206831d1..7dc3f6972127a8e344b36a2b1d66cf2f97e8351b 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -234,11 +234,16 @@ Automatically check model every time a parameter is changed@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Solver.AutoSaveDatabase
-Automatically save database after each computation@*
+@item Solver.AutoLoadDatabase
+Automatically load the ONELAB database when launching a solver@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Solver.AutoSaveDatabase
+Automatically save the ONELAB database after each computation@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Solver.AutoMesh
 Automatically mesh if necesssary (0: never remesh; 1: on startup, use existing mesh on disk if available; 2: always remesh)@*
 Default value: @code{1}@*
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 2eb6b88c10b9c0b245e23fa17f98163ef8d4bfe4..d7fa5aaf152f89469b7763489c6269427ee7eb35 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -134,6 +134,8 @@ Set Z view
 Hide/show small axes
 @item Alt+Shift+b
 Hide/show mesh volume faces
+@item Alt+Shift+c
+Loop through predefined colormaps
 @item Alt+Shift+d
 Hide/show mesh surface faces
 @item Alt+Shift+l