From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 3 Jan 2015 02:39:57 +0000 (+0000)
Subject: web: Integrate Contact page into about.
X-Git-Tag: v0.5.5~34^2~1
X-Git-Url: https://git.tue.mpg.de/?a=commitdiff_plain;h=845ddcef4422d044719251b293e9284aca904ace;p=paraslash.git

web: Integrate Contact page into about.

This page contains only an email address and one sentence. The main
page is a better place for this information.
---

diff --git a/web/about.in.html b/web/about.in.html
index a1a26eba..09d55fae 100644
--- a/web/about.in.html
+++ b/web/about.in.html
@@ -15,3 +15,9 @@ systems. It is written in C and released under the GPLv2.
 	<li> Command line interface with tab-completion </li>
 	<li> Open source and well documented </li>
 </ul>
+
+<b> Author: </b> Andr&eacute; Noll,
+<a href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>
+<br>
+Comments and bug reports are welcome. Please provide the version of
+paraslash you are using and relevant parts of the logs.
diff --git a/web/contact.in.html b/web/contact.in.html
deleted file mode 100644
index aeb37207..00000000
--- a/web/contact.in.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>Contact</h1>
-<hr>
-
-<p> Andr&eacute; Noll, <a
-href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a> </p>
-
-Comments and bug reports are welcome (english, german, or spanish
-language). Please provide enough info such as the version of paraslash
-you are using and relevant parts of the logs. Including the string
-[paraslash] in the subject line is also a good idea.
diff --git a/web/header.html b/web/header.html
index 2fdbdcdc..24c5d84e 100644
--- a/web/header.html
+++ b/web/header.html
@@ -29,7 +29,6 @@
 			<a href="documentation.html">Documentation</a><br>
 			<a href="devel.html">Development</a><br>
 			<a href="license.html">License</a><br>
-			<a href="contact.html">Contact</a><br>
 			<a href="CREDITS.html">Credits</a><br>
 		</td>
 		<td>
diff --git a/web/header2.html b/web/header2.html
index bfa5576f..d6c6758e 100644
--- a/web/header2.html
+++ b/web/header2.html
@@ -29,7 +29,6 @@
 			<a href="../../documentation.html">Documentation</a><br>
 			<a href="../../devel.html">Development</a><br>
 			<a href="../../license.html">License</a><br>
-			<a href="../../contact.html">Contact</a><br>
 			<a href="../../CREDITS.html">Credits</a><br>
 		</td>
 		<td>