web: Simplify main page.

This combines and streamlines the "Download", "License" and "Contact"
sections of the home page and moves them to the README file.

This reduces the tabs of the main page navigation from 8 to 5 and
makes the various URLs more prominent, and part of README.

diff --git a/README b/README
index 75f60c49b353f1c5045e69f521957985dc1789c6..c9606ae1618b942671384b6157461e4dc8e05156 100644 (file)
--- a/README
+++ b/README
@@ -34,9 +34,22 @@ work on other Unix systems as well.
 
 Libosl is open source:
 
-- Licensed under the GPL, version 2.
+- Licensed under the [GNU General Public License, Version
+2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
 Apart from the library itself, the package also contains simple
 examples and an fsck program, oslfsck, which can be used to recover
 from corrupted tables due to system crashes or bugs in the application
 or the library.
+
+Resources:
+
+- Git clone URL: git://git.tuebingen.mpg.de/osl.git
+- [Gitweb](http://git.tuebingen.mpg.de/osl.git)
+- [Author Home Page](http://people.tuebingen.mpg.de/maan)
+- [Project Page](http://people.tuebingen.mpg.de/maan/osl)
+- Email: [Andre Noll](mailto:maan@tuebingen.mpg.de)
+
+Comments and bug reports are welcome. Please provide enough info
+such as the version of osl you are using and relevant parts of
+the logs.

diff --git a/web/header.html b/web/header.html
index 2b5e798a2537423d5272c7c170b4360954e11eab..0dfffa69e12dd1bfc6cc9b53ab95f7dee21d4e45 100644 (file)
--- a/web/header.html
+++ b/web/header.html
@@ -30,12 +30,9 @@
        <hr>
 
        [<a href="index.html#readme">README</a>]
-       [<a href="index.html#download">Download</a>]
        [<a href="index.html#install">INSTALL</a>]
        [<a href="index.html#quick_start">Quick Start</a>]
        [<a href="api.html">API</a>]
-       [<a href="index.html#license">License</a>]
-       [<a href="index.html#contact">Contact</a>]
        [<a href="index.html#manpage">man page</a>]
 
        <hr>

diff --git a/web/index.html.in b/web/index.html.in
index edd7745463a5c3784feaf4cfbafc1dcaf4653b2e..f83ec8cc04b866a0b6650e8731b14e3d8ef64324 100644 (file)
--- a/web/index.html.in
+++ b/web/index.html.in
@@ -9,38 +9,6 @@
        <hr>
 
 
-       <center>
-               <h2>
-                       <a name="download">Download</a>
-               </h2>
-       </center>
-
-       <p>Only the source code is available for download. Use
-
-               <a href="http://www.kernel.org/pub/software/scm/git/docs/">git</a>
-
-       to clone the osl repository by executing</p>
-
-       <center>
-
-               <tt>git clone git://git.tuebingen.mpg.de/osl.git</tt>
-
-       </center>
-
-       <p> or grab the
-
-       <a href="http://git.tuebingen.mpg.de/cgi-bin/gitweb.cgi?p=osl.git;a=snapshot;h=HEAD;sf=tgz">tarball</a>
-
-       of the current tree. If you prefer to download the tarball of
-       the latest release, select the corresponding <em>snapshot</em>
-       link on the
-
-               <a href="http://git.tuebingen.mpg.de/osl.git">osl gitweb page</a>
-
-       </p>
-
-       <hr>
-
        <center>
                <h2>
                        <a name="install">INSTALL</a>
@@ -61,40 +29,6 @@
 
        <hr>
 
-       <center>
-               <h2>
-                       <a name="license">License</a>
-               </h2>
-       </center>
-
-       <p>osl is open source software, licensed under the
-
-       <a
-       href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
-       General Public License, Version 2</a>.</p>
-
-       <hr>
-
-       <center>
-               <h2>
-                       <a name="contact">Contact</a>
-               </h2>
-       </center>
-
-       <p> Email: Andr&eacute; Noll, <a
-       href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>,
-       Homepage: <a
-       href="http://people.tuebingen.mpg.de/maan/">http://people.tuebingen.mpg.de/maan/</a>
-       </p>
-
-
-       Comments and bug reports are welcome. Please provide
-       enough info such as the version of osl you are using and
-       relevant parts of the logs. Including the string [osl] in
-       the subject line is also a good idea.
-
-       <hr>
-
        <center>
                <h2>
                        <a name="manpage">Man page</a>