diff --git a/doc/gmsh.1 b/doc/gmsh.1
index f939f8ed235b929ebf99a1f8426dd6b18bcf69c3..4431d6f885559e5487c547a4c80f8a5c476ac1aa 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,4 +1,4 @@
-.TH Gmsh 1 "17 July 2015" "2.10" "Gmsh Manual Pages"
+.TH Gmsh 1 "1 April 2017" "3.0" "Gmsh Manual Pages"
 .UC 4
 .\" ********************************************************************
 .SH NAME
@@ -22,49 +22,40 @@ ASCII text files using \fIGmsh\fR's own scripting language.
 .SH GEOMETRY OPTIONS
 .TP 4
 .B \-0
-parse all input files, output unrolled geometry, and exit. 
+Output model, then exit. 
 .TP 4
 .B \-tol float
 set geometrical tolerance. 
 .\" ********************************************************************
 .SH MESH OPTIONS
 .TP 4
-.B \-1
-perform the one-dimensional mesh, i.e., discretize all the curves in
-the geometry.
-.TP 4
-.B \-2
-perform the two-dimensional mesh, i.e., discretize all the surfaces in
-the geometry.
-.TP 4
-.B \-3
-perform the three-dimensional mesh, i.e., discretize all the volumes in
-the geometry.
-.TP 4
-.B \-part int
-partition the mesh after batch mesh generation.
-.TP 4
-.B \-saveall
-save all elements (and discard all physical group definitions).
+.B \-1, \-2, \-3
+perform 1D, 2D or 3D mesh generation, then exit.
 .TP 4
 .B \-o file
-specify mesh output file name.
+specify output file name.
 .TP 4
 .B \-format string
-set output mesh format (msh, msh1, msh2, unv, vrml, stl, mesh, bdf, p3d, cgns, med, fea).
+set output mesh format (auto, msh, msh1, msh2, unv, vrml, stl, mesh, bdf, med, ...).
 .TP 4
 .B \-bin
 use binary format when available.
 .TP 4
+.B \-saveall
+save all elements (discard physical group definitions)
+.TP 4
 .B \-algo string
-select mesh algorithm (meshadapt, del2d, front2d, del3d, front3d).
+select mesh algorithm (meshadapt, del2d, front2d, del3d, front3d, ...).
+.TP 4
+.B \-parametric
+save vertices with their parametric coordinates.
+.TP 4
+.B \-part int
+partition the mesh after batch mesh generation.
 .TP 4
 .B \-smooth int
 set number of mesh smoothing steps.
 .TP 4
-.B \-optimize[_netgen]
-optimize quality of tetrahedral elements.
-.TP 4
 .B \-order int
 set mesh order.
 .TP 4
@@ -78,9 +69,6 @@ Set minimum characteristic length.
 .B \-clmax float
 Set maximum characteristic length.
 .TP 4
-.B \-clcurv
-Compute characteristic lengths from curvatures.
-.TP 4
 .B \-rand float
 set random perturbation factor.
 .TP 4
@@ -92,27 +80,17 @@ perform various consistency checks on mesh.
 .\" ********************************************************************
 .SH POST-PROCESSING OPTIONS
 .TP 4
-.B \-noview
-hide all views at startup.
-.TP 4
-.B \-link int
-choose link mode between post-processing views (0, 1, 2, 3, 4).
-.TP 4
 .B \-combine
 combine input views into multi-time-step ones.
 .\" ********************************************************************
 .SH DISPLAY OPTIONS
 .TP 4
-.B \-nodb
-suppress the double buffer. Use this options if you use \fIGmsh\fR on
-a remote host without GLX.
+.B \-n
+hide all meshes and post-processing views on startup.
 .TP 4
 .B \-fontsize int
 specify the font size for the GUI.
 .TP 4
-.B \-theme string
-specify the FLTK GUI scheme.
-.TP 4
 .B \-display string
 specify display.
 .\" ********************************************************************
@@ -121,6 +99,15 @@ specify display.
 .B \-
 parse input files, then exit.
 .TP 4
+.B \-new
+create new model before merge next file.
+.TP 4
+.B \-merge
+merge next files.
+.TP 4
+.B \-open
+ppen next files.
+.TP 4
 .B \-a, \-g, \-m, \-s, \-p
 start in automatic, geometry, mesh, solver or post-processing mode.
 .TP 4
@@ -136,6 +123,12 @@ set verbosity level.
 .B \-nopopup
 don't popup dialog windows in scripts.
 .TP 4
+.B \-setnumber "name" value
+set constant number name=value
+.TP 4
+.B \-setstring "name" "value"
+set constant string name=value
+.TP 4
 .B \-string "string"
 parse option string at startup.
 .TP 4
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 1d348c3431249fb897e57625dbb75d233dd662e7..dcac6f8d2c8f0aef1882da18b6a7daedaad41715 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.16
+@set GMSH-VERSION 3.0
 @set COPYRIGHT @copyright{} 1997-2017 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
 @settitle Gmsh @value{GMSH-VERSION}
 @footnotestyle separate
@@ -2049,17 +2049,26 @@ the built-in geometry kernel this constructs a Catmull-Rom spline. With
 the OpenCASCADE kernel, this constructs a BSpline passing through the
 points with a given tolerance.
 
-@item Circle ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression} @};
+@item Circle ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression} <, ...> @};
 Creates a circle arc. The three @var{expression}s on the right-hand-side
 define the start point, the center and the end point of the arc. With
 the built-in geometry kernel the arc should be strictly smaller than Pi.
+With the OpenCASCADE kernel additional @var{expression}s can be provided
+to define a full circle (4th expression is the radius) or a circle arc
+between two angles (next 2 expressions).
 @c todo: document < Plane @{ @var{expression}, @var{expression}, @var{expression} @}; >
 
-@item Ellipse ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression}, @var{expression} @};
+@item Circle ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression} @};
+Creates a circle. 
+
+@item Ellipse ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression}, @var{expression} <, ...> @};
 Creates an ellipse arc. The four @var{expression}s on the
 right-hand-side define the start point, the center point, a major axis
 point and the end point of the ellipse. The third point can be omitted
-with the OpenCASCADE kernel.
+with the OpenCASCADE kernel. With the OpenCASCADE kernel additional
+@var{expression}s can be provided to define a full ellipse (4th and 5th
+expressions define the radii along X and Y) or en ellipse arc (next 2
+expressions).
 
 @item Line Loop ( @var{expression} ) = @{ @var{expression-list} @};
 Creates an oriented line loop. The @var{expression} inside the parentheses