Take over fixes from the main branch (1.4->1.6).

git-svn-id: https://svn.dealii.org/branches/Branch-3-1@4261 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/tutorial/chapter-2.step-by-step/program2html b/deal.II/doc/tutorial/chapter-2.step-by-step/program2html
index 2ab49e6a67381665928b39d91b36086dc22c5128..40feee80e473f1d768c65292a3b9f348bf7babf8 100644 (file)
--- a/deal.II/doc/tutorial/chapter-2.step-by-step/program2html
+++ b/deal.II/doc/tutorial/chapter-2.step-by-step/program2html
@@ -1,11 +1,11 @@
-# Copyright (C) 1999, 2000 by Wolfgang Bangerth, Univerisity of Heidelberg.de
+# Copyright (C) 1999, 2000, 2001 by Wolfgang Bangerth, Univerisity of Heidelberg.de
 
 print "<a name=\"CommProg\"></a>\n";
 print "<h1> The commented program</h1>\n";
 
-# ignore the first few lines
+# ignore cvs tag
 $_ = <>;
-while ( m!^//\*\s*\$Id$!) {
+while ( m!^/[/\*]+\s*.Id:!) {
     $_ = <>;
 }
 
@@ -19,7 +19,7 @@ print "<p>\n";
 
 while (<>) {
     # ignore cvs tag
-    next if m!^//\*\s*\$Id:!;
+    next if m!^/[/\*]+\s*.Id:!;
 
     # substitute special characters
     s/&/&amp;/g;