# HG changeset patch
# User Kai T. Ohlhus <k.ohlhus@gmail.com>
# Date 1476722214 -7200
# Node ID 5caa2af279566af031a55fd057aa48f61c77b719
# Parent  ed7a53f683168c9502b82a496e35a3ac8089f972
Make more use of Jekyll Makros.  Website tabs reconsidering.

diff -r ed7a53f68316 -r 5caa2af27956 _includes/header.html
--- a/_includes/header.html	Mon Oct 17 18:34:45 2016 +0200
+++ b/_includes/header.html	Mon Oct 17 18:36:54 2016 +0200
@@ -1,23 +1,24 @@
 <div id="logo">
-  <p>
-    <img src="{{ "/img/logo.png" | relative_url }}" alt="GNU Octave Logo">
-    <span>GNU Octave</span>
-  </p>
+  <img src="{{ "/img/octave-logo.svg" | relative_url }}" alt="GNU Octave Logo">
+  <span>GNU Octave</span>
 </div>
 
 
 <ul class="topnav" id="myTopnav">
-  <li><a href="{{ "/index.html" | relative_url }}">Home</a></li>
+  <li>
+    <a href="{{ "/index.html" | relative_url }}" {% if page.url == "/" %}class="active"{% endif %}>
+      Home
+    </a>
+  </li>
   {% for p in site.pages %}
     {% if p.menu %}
     <li>
-      <a href="{{ p.url | relative_url }}"
-        {% if page.url == p.url %} class="active"{% endif %}>
-      {{ p.title }}</a>
+      <a href="{{ p.url | relative_url }}" {% if page.url == p.url %}class="active"{% endif %}>
+        {{ p.title }}
+      </a>
     </li>
     {% endif %}
   {% endfor %}
-  <li><a href="{{site.docs_url}}">Docs</a></li>
   <li class="icon">
     <a href="javascript:void(0);" onclick="topnav()">
       {% octicon list-unordered class:"octicon-topnav" %}
diff -r ed7a53f68316 -r 5caa2af27956 about.md
--- a/about.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/about.md	Mon Oct 17 18:36:54 2016 +0200
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: About
-menu: true
+menu: false
 ---
 
 GNU Octave is a high-level language, primarily intended
diff -r ed7a53f68316 -r 5caa2af27956 bugs.md
--- a/bugs.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/bugs.md	Mon Oct 17 18:36:54 2016 +0200
@@ -8,15 +8,15 @@
 There you can [report a new bug][2], [browse recent bugs][1],
 or [search for bugs][3].
 
-[1]: https://savannah.gnu.org/bugs/?group=octave
-[2]: https://savannah.gnu.org/bugs/?func=additem&group=octave
-[3]: https://savannah.gnu.org/bugs/?func=search&group=octave
+[1]: {{ site.bugs_url }}
+[2]: {{ site.bugs_url }}&func=additem
+[3]: {{ site.bugs_url }}&func=search
 
 <p>
 <div class="alert">
 {% octicon stop class:"octicon-stop-octave" %}
 Please do <strong>not</strong> send any bug reports to the
-<samp>help@octave.org</samp> mailing list.
+<samp>{{ site.help_email }}</samp> mailing list.
 Most Octave users do not want to receive bug reports.
 </div>
 </p>
@@ -38,8 +38,7 @@
 
 - [search for already reported bugs at the bug tracker][3],
 
-- look at the list of known causes of trouble in the
-  [Octave reference manual][4].
+- look at the [list of known causes of trouble][4] in the Octave manual.
 
 If you your problem does not appear to be known,
 then you should report the problem.
@@ -151,4 +150,4 @@
 guidelines in the Octave manual about to [generate a changeset][5]
 and submit patches for Octave.
 
-[5]: {{site.docs_url}}/Basics-of-Generating-a-Changeset.html#Basics-of-Generating-a-Changeset
+[5]: {{ site.docs_url }}/Basics-of-Generating-a-Changeset.html#Basics-of-Generating-a-Changeset
diff -r ed7a53f68316 -r 5caa2af27956 donate.md
--- a/donate.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/donate.md	Mon Oct 17 18:36:54 2016 +0200
@@ -13,7 +13,7 @@
 If you are already an Octave user and would like to see it improve more rapidly,
 then please donate so that we can spend more of our time working on Octave.
 If we could raise as little as $300,000/year,
-we could pay several key developers to work full time on Octave. 
+we could pay several key developers to work full time on Octave.
 Given even the most conservative estimate of the number of users of Octave,
 this amount could easily be reached if every user contributed the cost of
 a few lattes.
@@ -26,4 +26,4 @@
 Consider [hiring someone][2] to implement the specific features you need.
 
 [1]: https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=10
-[2]: commercial-support.html
+[2]: {{ "commercial-support.html" | relative_url }}
diff -r ed7a53f68316 -r 5caa2af27956 get-involved.md
--- a/get-involved.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/get-involved.md	Mon Oct 17 18:36:54 2016 +0200
@@ -18,15 +18,16 @@
 on the Wiki.
 
 If you have an idea on what to contribute, then join the
-[`maintainers@octave.org`][2] mailing list or the IRC [`#octave` channel][3]
-in Freenode and discuss your ideas there.  That way others can provide input
-early on, which makes your contribution more likely to get accepted.
+[`{{ site.maintainers_email }}`][2] mailing list or the IRC
+[`{{ site.irc_channel }}` channel][3] in Freenode and discuss your ideas there.
+That way others can provide input early on, which makes your contribution more
+likely to get accepted.
 
 <p>
 <div class="alert">
 {% octicon stop class:"octicon-stop-octave" %}
 Please do <strong>not</strong> send help requests or bug reports to the
-<samp>maintainers@octave.org</samp> mailing list.  Refer to the
+<samp>{{ site.maintainers_email }}</samp> mailing list.  Refer to the
 <a href="{{ "bugs.html" | relative_url }}">bug tracker</a> or other
 <a href="{{ "support.html" | relative_url }}">support options</a> instead.
 </div>
diff -r ed7a53f68316 -r 5caa2af27956 missing.md
--- a/missing.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/missing.md	Mon Oct 17 18:36:54 2016 +0200
@@ -32,5 +32,5 @@
 
 [1]: http://octave.sourceforge.net
 [2]: http://octave.sourceforge.net/functions_by_alpha.php
-[3]: http://savannah.gnu.org/bugs/?group=octave
+[3]: {{ site.bugs_url }}
 [4]: {{ "get-involved.html" | relative_url }}
diff -r ed7a53f68316 -r 5caa2af27956 news.md
--- a/news.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/news.md	Mon Oct 17 18:36:54 2016 +0200
@@ -4,13 +4,13 @@
 menu: false
 ---
 
-[{% octicon rss class:"octicon-rss-octave" %} News feed][Feed]
+[**{% octicon rss class:"octicon-rss-octave" %} News feed**][Feed]
 
 {% for post in site.posts %}
 {% if post.title == "News Archive" %}
-- [{{ post.title }}]({{ post.url | relative_url }})
+- [**{{ post.title }}**]({{ post.url | relative_url }})
 {% else %}
-- [{{ post.title }}]({{ post.url | relative_url }})
+- [**{{ post.title }}**]({{ post.url | relative_url }})
   ({{ post.date | date: "%b %-d, %Y" }})
 
 
diff -r ed7a53f68316 -r 5caa2af27956 support.md
--- a/support.md	Mon Oct 17 18:34:45 2016 +0200
+++ b/support.md	Mon Oct 17 18:36:54 2016 +0200
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Support
+title: Help/Support
 menu: true
 ---
 
@@ -17,20 +17,23 @@
 [2]: {{ "support-expectations.html" | relative_url }}
 
 
-# Reference Manual
+# Documentation
+
+
 
-There is an [online HTML][3] and [PDF][4] version of the comprehensive
-~800 page manual.  This full documentation of Octave is generated directly
-from the Texinfo source files that are distributed along with every copy of
-the Octave source code.  The complete text of the manual is also available
-at the Octave prompt using the `doc` command.
+There is an [{% octicon book class:"octicon-book-manual" %} Online Manual][3]
+and a [{% octicon file-pdf class:"octicon-pdf-manual" %} PDF Version][4] of
+the comprehensive ~800 page manual.  This full documentation of Octave is
+generated directly from the Texinfo source files that are distributed along
+with every copy of the Octave source code.  The complete text of the manual
+is also available at the Octave prompt using the `doc` command.
 
 A printed version of the Octave manual may be ordered from
 [Network Theory, Ltd.][5].  Any money raised from the sale of this book
 will support the development of free software.  For each copy sold $1
 will be donated to the GNU Octave Development Fund.
 
-[3]: {{site.docs_url}}
+[3]: {{ site.docs_url }}
 [4]: http://www.octave.org/octave.pdf
 [5]: http://www.network-theory.co.uk/octave/manual
 
@@ -44,17 +47,17 @@
 Additionally, the wiki contains a list of
 [frequently asked questions (FAQ)][7]
 
-[6]: http://wiki.octave.org
-[7]: http://wiki.octave.org/FAQ
+[6]: {{ site.wiki_url }}
+[7]: {{ site.faq_url }}
 
 
 # Contacting the user community
 
 - **Mailing List**:
   If your question isn't answered in the FAQ, the manual, or the Wiki,
-  the [`help@octave.org`][8] mailing list is a good resource.
+  the [**`{{ site.help_email }}`**][8] mailing list is a good resource.
 
-  You can also [subscribe][9] to `help@octave.org` or try to search in the
+  You can also [subscribe][9] to `{{ site.help_email }}` or try to search in the
   mailing list archive for an answer:
   <form action="http://octave.1599824.n4.nabble.com/template/NamlServlet.jtp">
   <input type="hidden" name="macro" value="search_page" />
@@ -77,18 +80,18 @@
   <div class="alert">
   {% octicon stop class:"octicon-stop-octave" %}
   Please do <strong>not</strong> send any bug reports to the
-  <samp>help@octave.org</samp> mailing list.
+  <samp>{{ site.help_email }}</samp> mailing list.
   Most Octave users do not want to receive bug reports.
   </div>
   </p>
 
 - **IRC Chat**:
   Too impatient for email? You can find Octave developers and users on the
-  [`#octave` channel][10] at [`irc.freenode.net`][11].
+  [`{{ site.irc_channel }}` channel][10] at [`{{ site.irc_network }}`][11].
   The atmosphere is relaxed and chat isn't restricted to matters strictly
   pertaining to Octave.
 
-[8]: mailto:help@octave.org
+[8]: mailto:{{ site.help_email }}
 [9]: https://lists.gnu.org/mailman/listinfo/help-octave
 [10]: http://webchat.freenode.net/?channels=octave&amp;uio=MT1mYWxzZSYyPXRydWUmMTI9dHJ1ZQda
 [11]: http://freenode.net