diff --git a/Makefile b/Makefile
index ba862e4803cc094e7416d8f48931f9ecf2d4ede2..dfc96c3c9ffd6ffe140fd608aefce8acf4eb72c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.356 2004-06-26 21:46:38 geuzaine Exp $
+# $Id: Makefile,v 1.357 2004-06-30 18:18:23 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,8 @@
include variables
GMSH_MAJOR_VERSION = 1
-GMSH_MINOR_VERSION = 53
-GMSH_PATCH_VERSION = 3
+GMSH_MINOR_VERSION = 54
+GMSH_PATCH_VERSION = 0
GMSH_EXTRA_VERSION = "-cvs"
GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}
diff --git a/Netgen/README.GMSH b/Netgen/README
similarity index 66%
rename from Netgen/README.GMSH
rename to Netgen/README
index bfc68ef9f0e0fd9be18a26772576a2520256bcc9..75a8ff1ebf4bacbe3e816f869ec7a4f626e3ff41 100644
--- a/Netgen/README.GMSH
+++ b/Netgen/README
@@ -1,17 +1,18 @@
-This directory may contain a modified version of Joachim Schoberl's
-NETGEN mesh generator:
+This directory may contain a slightly modified version of Joachim
+Sch\"oberl's NETGEN mesh generator:
- only the libsrc directory was kept from the original distribution
-- the file meshing/improve2d.cpp was slightly modified
+
+- the file meshing/improve2d.cpp was slightly modified to fix build
+ problems on machines without TCL/TK
**IMPORTANT NOTICE**
-Netgen requires the boundary mesh to be oriented with exterior
+NETGEN requires the boundary mesh to be oriented with exterior
pointing normals. You HAVE TO define your geometry so that this
criterion is fulfilled (i.e., correctly orient the geometry surfaces
-and the surface loops). Failing to do so will result in NETGEN to
-fail (and exit).
+and the surface loops).
**************************************************************
@@ -22,16 +23,15 @@ What is NETGEN
NETGEN is an automatic mesh generation tool for two and three
dimensions. Netgen is open source under the conditions of the LGPL.
-It comes as stand alone programme with graphical user
-interface, or as C++ library to be linked into an other application.
-Netgen is available for Unix/Linux and Windows 98/NT. Netgen
-generates triangular or quadrilateral meshes in 2D, and tetrahedral
-meshes in 3D. The input for 2D is described by spline curves, and the
-input for 3D problems is either defined by constructive solid
-geometries (CSG), see Chapter \ref{chap_csg}, or by the standard STL
-file format. NETGEN contains modules for mesh optimization and
-hierarchical mesh refinement. Curved elements are supported of arbitrary
-order.
+It comes as stand alone programme with graphical user interface, or as
+C++ library to be linked into an other application. Netgen is
+available for Unix/Linux and Windows 98/NT. Netgen generates
+triangular or quadrilateral meshes in 2D, and tetrahedral meshes in
+3D. The input for 2D is described by spline curves, and the input for
+3D problems is either defined by constructive solid geometries (CSG)
+or by the standard STL file format. NETGEN contains modules for mesh
+optimization and hierarchical mesh refinement. Curved elements are
+supported of arbitrary order.
The history of NETGEN
=====================
diff --git a/Netgen/nglib_addon.cpp b/Netgen/nglib_addon.cpp
index f6107330479e412bb0a9365ec78232217105a3a2..3c7d5617f41c7342a8c3659688a40eb66d96748e 100644
--- a/Netgen/nglib_addon.cpp
+++ b/Netgen/nglib_addon.cpp
@@ -1,4 +1,4 @@
-// small addition(s) to the netgen interface library
+// small addition(s) to the netgen interface library for Gmsh
#include "meshing.hpp"
#include "mystdlib.h"
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 489984a0bc9436610f44c6146f88286b48431bc4..be8ebdf2afe44188d7140b2bbadd2a0f0050112e 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,13 +1,16 @@
-$Id: VERSIONS,v 1.228 2004-06-24 07:13:18 geuzaine Exp $
-
-New since 1.53: fixed UNV output; make Layers' region numbering
-consistent between lines/surfaces/volumes; fixed home directory
-problem on Win98; new Plugin(CutParametric); the default project file
-is now created in the home directory if no current directory is
-defined (e.g. when double-clicking on the icon on Windows/MacOS);
-fixed the discrepancy between the orientation of geometrical surfaces
-and the associated surface meshes; generalized Plugin(Triangulate) to
-handle vector and tensor views; small bug fixes and cleanups.
+$Id: VERSIONS,v 1.229 2004-06-30 18:18:23 geuzaine Exp $
+
+New in 1.54: integrated Netgen (3D mesh quality optimization +
+alternative 3D algorithm); fixed UNV output; make Layers' region
+numbering consistent between lines/surfaces/volumes; fixed home
+directory problem on Win98; new Plugin(CutParametric); the default
+project file is now created in the home directory if no current
+directory is defined (e.g. when double-clicking on the icon on
+Windows/MacOS); fixed the discrepancy between the orientation of
+geometrical surfaces and the associated surface meshes; added
+automatic orientation of surfaces in surface loops; generalized
+Plugin(Triangulate) to handle vector and tensor views; small bug fixes
+and cleanups.
New in 1.53: completed support for second order elements in the mesh
module (lines, triangles, quadrangles, tetrahedra, hexahedra, prisms
diff --git a/doc/gmsh.html b/doc/gmsh.html
index e11daca35be9d04203587a840dfae952b7d21de2..8a1b87f8b38e94bc996f7f92ce6575880e3460d7 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -25,7 +25,7 @@ generator with built-in pre- and post-processing facilities</h1>
<p>
<h3 align="center">Christophe Geuzaine and Jean-François Remacle</h3>
<p>
-<h3 align=center>Version <a href="doc/VERSIONS">1.53</a>, 4 June 2004</h3>
+<h3 align=center>Version <a href="doc/VERSIONS">1.54</a>, xx July 2004</h3>
<p>
<center>
<a href="#Description">Description</a> |
@@ -109,11 +109,11 @@ available for Windows, Linux and Mac OS X. The tutorial and demo files
are included in the archives.
<ul>
-<li><a href="/gmsh/bin/Windows/gmsh-1.53.0-Windows.zip">Windows zip archive (95/98/NT/2000/XP)</a>
-<li><a href="/gmsh/bin/Linux/gmsh-1.53.0-1.i386.rpm">Linux RPM (i386, Red Hat >= 7.3)</a>
-<li><a href="/gmsh/bin/Linux/gmsh-1.53.0-Linux.tgz">Linux tarball (i386, glibc >= 2.2)</a>
-<li><a href="/gmsh/bin/MacOSX/gmsh-1.53.0-MacOSX.tgz">Mac OS X tarball (Mac OS X >= 10.2)</a>
-<li><a href="/gmsh/src/gmsh-1.53.0-source.tgz">Source tarball (all platforms)</a>
+<li><a href="/gmsh/bin/Windows/gmsh-1.54.0-Windows.zip">Windows zip archive (95/98/NT/2000/XP)</a>
+<li><a href="/gmsh/bin/Linux/gmsh-1.54.0-1.i386.rpm">Linux RPM (i386, Red Hat >= 7.3)</a>
+<li><a href="/gmsh/bin/Linux/gmsh-1.54.0-Linux.tgz">Linux tarball (i386, glibc >= 2.2)</a>
+<li><a href="/gmsh/bin/MacOSX/gmsh-1.54.0-MacOSX.tgz">Mac OS X tarball (Mac OS X >= 10.2)</a>
+<li><a href="/gmsh/src/gmsh-1.54.0-source.tgz">Source tarball (all platforms)</a>
<a href="#build-footnote" name="build-footmark"><sup>2</sup></a>
</ul>
@@ -255,6 +255,11 @@ The mesh database that will be used by Gmsh in the future has its
own webpage: take a look at <a href="http://www.scorec.rpi.edu/AOMD/">AOMD,
the Algorithm Oriented Mesh Database</a>.
+<p>
+Gmsh integrates Joachim Schöberl's
+<a href="http://www.hpfem.jku.at/netgen">Netgen</a> as an alternative
+3D mesh generator and 3D mesh optimizer.
+
<p>
Gmsh can use Jonathan Shewchuk's <a
href="http://www-2.cs.cmu.edu/~quake/triangle.html">Triangle</a> as an