From c93152fb5b439cfe6f67c28e186eecb61207b5a1 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sat, 9 Aug 2014 07:38:01 -0700
Subject: [PATCH] Added abount and simplified footer

---
 _data/docs.yml                |  6 +++++-
 _includes/footer.html         |  8 +++++---
 docs/CommandLineParameters.md |  4 ++--
 docs/Installation.md          |  2 +-
 docs/about.md                 | 24 ++++++++++++++++++++++++
 docs/contact.md               |  4 ++--
 6 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 docs/about.md

diff --git a/_data/docs.yml b/_data/docs.yml
index 18e8e8c8fa..c27abbf60f 100644
--- a/_data/docs.yml
+++ b/_data/docs.yml
@@ -3,7 +3,6 @@
   - home
   - gettingstarted
   - installation
-  - contact
 
 - title: Application
   docs:
@@ -21,3 +20,8 @@
   - regressiontestsystem
   - commandlineparameters
 
+- title: Other
+  docs:
+  - contact
+  - about
+
diff --git a/_includes/footer.html b/_includes/footer.html
index 4bd48bf714..eff6675a6b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,12 +1,14 @@
 <footer>
   <div class="grid">
     <div class="unit one-third center-on-mobiles">
-      <p>The design and programming of this website are based on work by  <a href="http://tom.preston-werner.com/">Tom Preston-Werner</a></p>
+        <p>
+	        <a href="{{ site.baseurl }}/docs/about">About</a><br>
+            <a href="{{ site.baseurl }}/docs/contact">Contact</a>
+        </p>
     </div>
     <div class="unit two-thirds align-right center-on-mobiles">
       <p>
-        Proudly hosted by
-        <a href="https://github.com">GitHub</a>
+        <a href="http://resinsight.org">resinsight.org</a>
       </p>
     </div>
   </div>
diff --git a/docs/CommandLineParameters.md b/docs/CommandLineParameters.md
index ace3e647cf..a4ada2ff8d 100644
--- a/docs/CommandLineParameters.md
+++ b/docs/CommandLineParameters.md
@@ -1,7 +1,7 @@
 ---
 layout: docs
 prev_section: regressiontestsystem
-next_section: home
+next_section: contact
 title: Command Line Parameters
 permalink: /docs/commandlineparameters/
 published: true
@@ -29,4 +29,4 @@ Examples on how command line options are used are given in
 | &#45;&#45;regressiontest &lt;folder&gt; | Run a regression test on all sub-folders starting with `TestCase*` of the given folder. **RegressionTest.rip** files in the sub-folders will be opened and snapshots of all the views is written to the sub-sub-folder **RegTestGeneratedImages**. Then difference images is generated in the sub-sub-folder **RegTestDiffImages** based on the images in sub-sub-folder **RegTestBaseImages**. The results are presented in **ResInsightRegressionTestReport.html** that is written in the given folder. |
 | &#45;&#45;updateregressiontestbase &lt;folder&gt; | For all sub-folders starting with `TestCase*`, copy the images in the sub-sub-folder **RegTestGeneratedImages** to the sub-sub-folder **RegTestBaseImages** after deleting **RegTestBaseImages** completely. |
 
-See also the [Regression Test System ]({{site.baseurl }}/docs/regressiontestsystem) for a more in-depth explanation.
\ No newline at end of file
+See also the [Regression Test System ]({{site.baseurl }}/docs/regressiontestsystem) for a more in-depth explanation.
diff --git a/docs/Installation.md b/docs/Installation.md
index df802990be..ac71db5dd1 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -1,7 +1,7 @@
 ---
 layout: docs
 prev_section: gettingstarted
-next_section: contact
+next_section: reservoirviews
 title: Installation and configuration
 permalink: /docs/installation/
 published: true
diff --git a/docs/about.md b/docs/about.md
new file mode 100644
index 0000000000..6d00d179e5
--- /dev/null
+++ b/docs/about.md
@@ -0,0 +1,24 @@
+---
+layout: docs
+prev_section: contact
+#next_section: home
+title: About
+permalink: /docs/about/
+published: true
+---
+
+
+<p/>
+
+### Project organization
+The project was initiated by Statoil ASA in 2009. Ceetron AS developed the initial solution, and the development responsibility was handed over to Ceetron Solutions AS in 2013.
+
+### Web site programming and design
+The programming and design of this site is based on work by [Tom Preston-Werner](http://tom.preston-werner.com/). This is also the current theme of [Jekyll](http://jekyllrb.com/).
+
+### Licensing
+The software is copyrighted by Statoil ASA, Ceetron Solutions AS and Ceetron AS. The software is licensed under GPL 3+, see [Licensing details](https://github.com/OPM/ResInsight/blob/master/COPYING) for more.
+
+### Project hosting
+The software is hosted at [GitHub](https://github.com/OPM/ResInsight)
+
diff --git a/docs/contact.md b/docs/contact.md
index 7c86e08b13..729c02e8b0 100644
--- a/docs/contact.md
+++ b/docs/contact.md
@@ -1,7 +1,7 @@
 ---
 layout: docs
-prev_section: installation
-next_section: reservoirviews
+prev_section: commandlineparameters
+next_section: about
 title: Contact
 permalink: /docs/contact/
 published: true