From: Timo Heister <timo.heister@gmail.com>
Date: Sat, 12 Jul 2014 20:46:44 +0000 (+0000)
Subject: update readme.html to refer to muparser
X-Git-Tag: v8.2.0-rc1~311
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7a5b1bfe53a6a603a970ceef87360c09408d137;p=dealii.git

update readme.html to refer to muparser

git-svn-id: https://svn.dealii.org/trunk@33144 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index 87df951570..405520bed1 100644
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -527,22 +527,17 @@
       </dd>
 
       <dt>
-	<a name="functionparser"></a>
-	<a href="http://warp.povusers.org/FunctionParser/">FunctionParser</a>
+	<a name="muparser"></a>
+	<a href="http://muparser.beltoforion.de/">muparser</a>
       </dt>
       <dd>
 	<p>
-	  <a href="http://warp.povusers.org/FunctionParser/">FunctionParser</a>
+	  <a href="http://muparser.beltoforion.de/">muparser</a>
 	  is a library that allows to enter functions in text form and have them
 	  interpreted at run time. This is particularly useful in input
 	  parameter files. <code>cmake</code> will usually find the version of
-	  this library that comes bundled with <acronym>deal.II</acronym>.
-	  The function parser library has its own license; if you want to use
-	  it with deal.II, please read it and make sure that you agree with it.
-	  You can find it
-	  <a href="http://warp.povusers.org/FunctionParser/">here</a>. We
-	  include FunctionParser in the deal.II distributions courtesy of its author,
-	  <a href="http://iki.fi/warp/">Juha Nieminen</a>.
+	  this library that comes bundled with <acronym>deal.II</acronym>, but you
+	  can specify <code>-DMUPARSER_DIR=/path/to/muparser</code> if desired.
 	</p>
       </dd>
 
@@ -855,8 +850,8 @@
           <a href="http://threadingbuildingblocks.org/"
             target="_top">Threading Building Blocks</a>,
           <a href="http://www.boost.org/" target="_top">BOOST</a> and
-          <a href="http://warp.povusers.org/FunctionParser/"
-            target="_top">FunctionParser</a>, courtesy of their authors.
+          <a href="http://muparser.beltoforion.de/"
+            target="_top">muparser</a>, courtesy of their authors.
           These are also covered by their own licenses; please refer to
           their webpages for more information.
 	</li>