From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 1 Mar 2013 05:20:53 +0000 (+0000)
Subject: take over r28674 r28675
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e22d106e4abaf576c01883adb2e75927b8672d2f;p=dealii-svn.git

take over r28674 r28675

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

diff --git a/deal.II/common/scripts/validate-xrefs.pl b/deal.II/common/scripts/validate-xrefs.pl
index 2913819be6..f7408e2a26 100644
--- a/deal.II/common/scripts/validate-xrefs.pl
+++ b/deal.II/common/scripts/validate-xrefs.pl
@@ -126,6 +126,12 @@ foreach $filename (@ARGV)
 	    # check whether the file for the image is present
 	    $link = $1;
 
+	    # ignore online links
+	    if ($link =~ /^http/)
+	    {
+		next;
+	    }
+
 	    die "---Local image `$link' not found in file `$filename'\n This line is: $this_line.\n"
 		unless ((-r $link) && (-f $link));
 	}
diff --git a/deal.II/doc/doxygen/tutorial/program2doxygen b/deal.II/doc/doxygen/tutorial/program2doxygen
index dfb6452f71..662bc8c749 100644
--- a/deal.II/doc/doxygen/tutorial/program2doxygen
+++ b/deal.II/doc/doxygen/tutorial/program2doxygen
@@ -2,7 +2,7 @@
 #    $Id$
 #    Version: $Name$
 #
-#    Copyright (C) 2006, 2007, 2010 by the deal.II authors
+#    Copyright (C) 2006, 2007, 2010, 2013 by the deal.II authors
 #
 #    This file is subject to QPL and may not be  distributed
 #    without copyright and license information. Please refer
@@ -19,7 +19,7 @@ print " * <h1> The commented program</h1>\n";
 # ignore comments at the start of the program. this includes subversion
 # tags and copyright notices.
 $_ = <>;
-while ( m!^/[/\*]!  ||  m!\s*\*! || m/^$/ ) {
+while ( m!^/\*!  ||  m!\s*\*! || m/^$/ ) {
     $_ = <>;
 }
 
@@ -95,4 +95,3 @@ do {
 if ($state == $program_mode) {
    print " * \@endcode\n";
 }
-