diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index fe3be572eb3cd250a92d9de1006e15b7b7d3631e..793e225258d62153b999c8608d8d86e12bccaa60 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -21,7 +21,7 @@
 @c =========================================================================
 @c %**start of header
 @setfilename        gmsh.info
-@set GMSH-VERSION   2.3
+@set GMSH-VERSION   2.4
 @set COPYRIGHT      @copyright{} 1997-2009 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
 @c
 @settitle Gmsh @value{GMSH-VERSION}
diff --git a/doc/texinfo/opt_fields.texi b/doc/texinfo/opt_fields.texi
index a6b8bb3fde0272a1d21fcf55666f06b28bb68016..23ed30f1fe89b0d3d23bdd571452e35f47f1f9cf 100644
--- a/doc/texinfo/opt_fields.texi
+++ b/doc/texinfo/opt_fields.texi
@@ -127,6 +127,52 @@ type: integer@*
 default value: @code{1}
 @end table
 
+@item Cylinder
+The value of this field is VIn inside the cylinder, VOut outside.@*
+The cylinder is given by@*
+@*
+  ||dX||^2 < R^2 &&@*
+  dX = (X - X0) - ((X - X0).A)/(||A||^2) . A@*
+Options:@*
+@table @code
+@item Radius
+Radius@*
+type: float@*
+default value: @code{0}
+@item VIn
+Value inside the cylinder@*
+type: float@*
+default value: @code{0}
+@item VOut
+Value outside the cylinder@*
+type: float@*
+default value: @code{0}
+@item XAxis
+X component of the cylinder axis@*
+type: float@*
+default value: @code{0}
+@item XCenter
+X coordinate of the cylinder center@*
+type: float@*
+default value: @code{0}
+@item YAxis
+Y component of the cylinder axis@*
+type: float@*
+default value: @code{0}
+@item YCenter
+Y coordinate of the cylinder center@*
+type: float@*
+default value: @code{0}
+@item ZAxis
+Z component of the cylinder axis@*
+type: float@*
+default value: @code{1}
+@item ZCenter
+Z coordinate of the cylinder center@*
+type: float@*
+default value: @code{0}
+@end table
+
 @item Gradient
 Compute the finite difference gradient of Field[IField]:@*
 @*
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index bd6fccf803153a0e016f4402583dccbfe6dad331..b5280aea256d33374db9407b9f033282032b68f6 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -74,6 +74,11 @@ Display width of lines (in pixels)@*
 Default value: @code{2}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Geometry.MatchGeomAndMesh
+Matches geometries and meshes.@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Geometry.Normals
 Display size of normal vectors (in pixels)@*
 Default value: @code{0}@*
@@ -99,6 +104,11 @@ Sew faces in STEP, IGES and BRep models@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Geometry.OCCConnectFaces
+Cut and connect faces in STEP, IGES and BRep models@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Geometry.OffsetX
 Model diplay offset along X-axis (in model coordinates)@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 76c06ad68b59facc34ec0dec387644521308de40..a135804bee8de65d026b853b056b13ed88cf553d 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -266,7 +266,7 @@ Saved in: @code{General.OptionsFileName}
 
 @item Mesh.MshFileVersion
 Version of the MSH file format to use@*
-Default value: @code{2}@*
+Default value: @code{2.1}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.NbHexahedra
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index 3767c0799ad0b2a11b3ce9063f0dc1aac17a9e6c..4fa743122cd70658bfed5d4f001f83743649bee0 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -548,6 +548,35 @@ Default value: @code{20}
 Default value: @code{-1}
 @end table
 
+@item Plugin(HomologyComputation)
+Plugin(HomologyComputation) computes generators 
+for (relative) homology groups and their thick cuts. 
+
+Plugin(HomologyComputation) creates new views.
+
+String options:
+@table @code
+@item Filename
+Default value: @code{"homology.msh"}
+@end table
+Numeric options:
+@table @code
+@item 1. Physical group for domain
+Default value: @code{0}
+@item 2. Physical group for domain
+Default value: @code{0}
+@item 1. Physical group for subdomain
+Default value: @code{0}
+@item 2. Physical group for subdomain
+Default value: @code{0}
+@item Compute generators
+Default value: @code{1}
+@item Compute thick cuts
+Default value: @code{0}
+@item Omit dimensions
+Default value: @code{1}
+@end table
+
 @item Plugin(Integrate)
 Plugin(Integrate) integrates scalar fields over
 all the elements in the view `iView', as well