diff --git a/doc/VERSIONS b/doc/VERSIONS
index c8fb22f258d56c002580e059ff6fb80a5124d472..9b1f3e0588b15e88638b69017de77039556b64ca 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,8 +1,10 @@
-$Id: VERSIONS,v 1.402 2008-03-30 20:45:28 geuzaine Exp $
+$Id: VERSIONS,v 1.403 2008-04-01 13:11:57 geuzaine Exp $
 
 2.1.2 (xx): new Fields interface; new model-based post-processing
 backend; added MED I/O for mesh and post-processing; fixed BDF vertex
-ordering for 2nd order elements; fixed various bugs.
+ordering for 2nd order elements; replaced Mesh.ConstrainedBackgroundMesh
+with Mesh.CharacteristicLength{FromPoints,ExtendFromBoundary}; fixed 
+various bugs.
 
 2.1.1 (Mar 1, 2008): small bug fixes (second order meshes, combine
 views, divide and conquer crash, ...).
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index f804c625fa6a2d3612f3541537ff5a99fe37d2ef..25300aeee5a2ce767c036d4b071047a18c0c72a1 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -704,6 +704,26 @@ Height (in pixels) of the plugin window@*
 Default value: @code{100}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.FieldPositionX
+Horizontal position (in pixels) of the upper left corner of the field window@*
+Default value: @code{650}@*
+Saved in: @code{General.SessionFileName}
+
+@item General.FieldPositionY
+Vertical position (in pixels) of the upper left corner of the field window@*
+Default value: @code{550}@*
+Saved in: @code{General.SessionFileName}
+
+@item General.FieldWidth
+Width (in pixels) of the field window@*
+Default value: @code{100}@*
+Saved in: @code{General.SessionFileName}
+
+@item General.FieldHeight
+Height (in pixels) of the field window@*
+Default value: @code{100}@*
+Saved in: @code{General.SessionFileName}
+
 @item General.PointSize
 Display size of points (in pixels)@*
 Default value: @code{3}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index e7f8bea33e091f2abe9651cb7ab4487e5c298b9e..80d32849fdd25a10696d8e25d277a990b92dceb7 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -29,34 +29,44 @@ Field format for Nastran BDF files (0=free, 1=small, 2=large)@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.C1Continuity
+Impose C1 continuity to high order meshes (only valid in 2D plane and ElemenOrder = 2)@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Mesh.CharacteristicLengthExtendFromBoundary
+Extend characteristic lengths from the boundaries inside the surface/volume@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.CharacteristicLengthFactor
 Factor applied to all characteristic lengths@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.CharacteristicLengthMin
-Minimum mesh size@*
+Minimum characteristic length@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.CharacteristicLengthMax
-Maximum mesh size@*
+Maximum characteristic length@*
 Default value: @code{1e+22}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.CharacteristicLengthFromCurvature
-Compute characteritic lenghts automatically from curvatures@*
+Compute characteristic lengths from curvature@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Mesh.ColorCarousel
-Mesh coloring (0=by element type, 1=by elementary entity, 2=by physical entity, 3=by partition)@*
+@item Mesh.CharacteristicLengthFromPoints
+Compute characteristic lengths from values given at geometry points@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Mesh.ConstrainedBackgroundMesh
-Should the background mesh be constrained by the characteristic lengths associated with the geometry?@*
-Default value: @code{0}@*
+@item Mesh.ColorCarousel
+Mesh coloring (0=by element type, 1=by elementary entity, 2=by physical entity, 3=by partition)@*
+Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Mesh.CpuTime
@@ -114,16 +124,6 @@ Element order (1=linear elements, N (<6) = elements of higher order)@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Mesh.C1Continuity
-Impose C1 continuity to high order meshes, only valid in 2D plane and ElemenOrder = 2 and 3 (todo) (Default : C0 continuity)@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Mesh.SmoothInternalEdges
-Number of smoothing steps of internal edges for high order meshes@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Mesh.Explode
 Element shrinking factor (between 0 and 1)@*
 Default value: @code{1}@*
@@ -364,6 +364,11 @@ Number of smoothing steps applied to the final mesh@*
 Default value: @code{1}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.SmoothInternalEdges
+Number of smoothing steps of internal edges for high order meshes@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.SmoothNormals
 Smooth the mesh normals?@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index 5d2e2bd67666cb78b4f1dc2155161a4086d10970..bdcdcc27b077822bb88d64ee3122be6ebaa6bc4a 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -422,10 +422,42 @@ Numeric options:
 Default value: @code{-1}
 @item iView
 Default value: @code{-1}
-@item Field
+@item iField
 Default value: @code{-1}
 @end table
 
+@item Plugin(GSHHS)
+Plugin(GSHHS) import GSHHS data.
+
+String options:
+@table @code
+@item InFileName
+Default value: @code{"gshhs_c.b"}
+@item OutFileName
+Default value: @code{"earth.geo"}
+@item Format
+Default value: @code{"gshhs"}
+@item Coordinate
+Default value: @code{"cartesian"}
+@end table
+Numeric options:
+@table @code
+@item iField
+Default value: @code{-1}
+@item UTMEquatorialRadius
+Default value: @code{6.37814e+06}
+@item UTMPolarRadius
+Default value: @code{6.35675e+06}
+@item UTMScale
+Default value: @code{1}
+@item UTMShiftX
+Default value: @code{0}
+@item UTMShiftY
+Default value: @code{0}
+@item UTMZone
+Default value: @code{0}
+@end table
+
 @item Plugin(Gradient)
 Plugin(Gradient) computes the gradient of the
 field in the view `iView'. If `iView' < 0, the