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 a1a26eba9c14a3b374dc8e3751971e637bcdf8d2..09d55fae0a67e01d88faf01abf13a50958a057c7 100644 (file)
--- 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>
        <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 (file)
index aeb3720..0000000
--- 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 2fdbdcdc87f87ebfb8b469c3ba49efa1cdcc23ac..24c5d84e7731043d2bf4eb258f1db61814d1e657 100644 (file)
--- 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="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>
                        <a href="CREDITS.html">Credits</a><br>
                </td>
                <td>

diff --git a/web/header2.html b/web/header2.html
index bfa5576f4583581b819f2f14f69c6da9e202a358..d6c6758e20bb8babd273994f388f1b442d766a91 100644 (file)
--- 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="../../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>
                        <a href="../../CREDITS.html">Credits</a><br>
                </td>
                <td>