diff --git a/doc/gmsh.html b/doc/gmsh.html
index 05735dd85dbb71d35de6a49e383377222879ac23..de69914e1bdae6054e322294ab17033e7974ff10 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -120,7 +120,7 @@ Public License (GPL)</a>:
         <a href="src/gmsh-svn-source.tgz">source code</a>
       <li>read-only svn access: '<code>svn co 
           <a href="https://geuz.org/svn/gmsh/trunk" data-tooltip=
-	     "Login: gmsh Password: gmsh">https://geuz.org/svn/gmsh/trunk</a>
+	     "Login and password: gmsh">https://geuz.org/svn/gmsh/trunk</a>
           gmsh</code>'
     </ul>
   <li>All versions: <a href="bin/">binaries</a>
@@ -147,11 +147,11 @@ algorithms</a>.
   <li><a href="screencasts/">Screencasts</a> showing how to use
     the graphical user interface
   <li><a href="https://geuz.org/trac/gmsh" data-tooltip=
-	 "Login: gmsh Password: gmsh">Wiki</a> with examples, a
+	 "Login and password: gmsh">Wiki</a> with examples, a
     <a href="https://geuz.org/trac/gmsh/timeline" data-tooltip=
-	     "Login: gmsh Password: gmsh">time line</a> of
+	     "Login and password: gmsh">time line</a> of
     changes and the <a href="https://geuz.org/trac/gmsh/report/3" data-tooltip=
-		       "Login: gmsh Password: gmsh">bug tracking</a> database
+		       "Login and password: gmsh">bug tracking</a> database
   <li><a href="doc/VERSIONS.txt">Version history</a>
   <li>Mailing lists:
     <ul>
@@ -166,7 +166,7 @@ algorithms</a>.
     </ul>
 </ul>
 
-<p>
+
 <form method="get" action="http://www.geuz.org/search/search-geuz.cgi">
 <input size="30" name="q" value="">&nbsp;
 <input type="submit" value="Search!">&nbsp;
@@ -177,7 +177,6 @@ algorithms</a>.
   <option value="/pipermail/gmsh">Gmsh mailing list archives
 </select>
 </form>
-</p>
 
 <h2><a name="Authors"></a>Authors and credits</h2>
 
@@ -192,7 +191,7 @@ Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org<
 to send questions or ask for help. If you think you have found a bug in the
 program, you can file a report directly
 <a href="https://geuz.org/trac/gmsh/newticket" data-tooltip=
-	     "Login: gmsh Password: gmsh">here</a>.
+	     "Login and password: gmsh">here</a>.
 </p>
 
 <h2><a name="Licensing"></a>Licensing</h2>
@@ -359,7 +358,6 @@ information.
 -->
 </div>
 
-<p>
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_xclick">
 <input type="hidden" name="business" value="paypal@geuz.org">
@@ -370,7 +368,6 @@ information.
 <input type="image" src="/images/donation.gif" name="submit" 
        alt="Make a donation with PayPal">
 </form>
-</p>
 
 <p>
 Back to <a href="/">geuz.org</a>