rearrange things on front page, add "menu bar" at top

2 files changed, 9 insertions, 6 deletions

diff --git a/index.mdwn b/index.mdwn
index 869997e..dd55bf4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,10 @@
 [[!meta title="Obnam - backup software"]]
 
+[[Download]] —
+[[Documentation|https://doc.obnam.org/]] —
+[[Contact]] —
+[[License]]
+
 [[!img kitten.jpg class="float_right"
    link="https://commons.wikimedia.org/wiki/File:A_focused_kitten_(Pixabay).jpg"
    alt="Kitten being adorable. By Ty Swartz, CC0, via Wikimedia Commons"]]
@@ -12,9 +17,6 @@ It is currently not ready to be used, but do check in later. See
 This web site used to be about Obnam1, the original version that was
 retired in 2017. All that content has been dropped now. 
 
-Obnam2 acceptance criteria are documented using [Subplot][], and are
-on [docs.obnam.org](https://doc.obnam.org/).
-
 **25-word summary of the new architecture:** client splits live data
 into chunks, then compresses and encrypts them, and uploads new ones
 to smart server via HTTP; server never sees cleartext.
@@ -26,6 +28,8 @@ Links
 
 * [Source code (gitlab.com)](https://gitlab.com/larswirzenius/obnam) ([mirror](http://git.liw.fi/obnam2))
 * [[Road map|roadmap]] for developing Obnam.
+* Acceptance criteria are documented using [Subplot][], and are on
+  [docs.obnam.org](https://doc.obnam.org/).
 * [Obnam blog posts](https://blog.liw.fi/tag/obnam/)
 * Other backup software:
   * [Borg](https://www.borgbackup.org/)
diff --git a/license.mdwn b/license.mdwn
index 60ca308..0e1e353 100644
--- a/license.mdwn
+++ b/license.mdwn
@@ -1,6 +1,5 @@
 [[!meta title="Licenses"]]
 
-[GNU General Public Licence, version 3 or later]: https://www.gnu.org/licenses/gpl-3.0.html
+[GNU General Public License, version 3 or later]: https://www.gnu.org/licenses/gpl-3.0.html
 
-Obnam is licensed under the [GNU General Public License, version
-3 or later][].
+Obnam is licensed under the [GNU General Public License, version 3 or later][].