--- a/commercial-support.md	Mon Oct 17 18:36:54 2016 +0200
+++ b/commercial-support.md	Mon Oct 17 18:37:32 2016 +0200
@@ -4,46 +4,41 @@
 menu: false
 ---
 
-The following organizations and individuals provide paid consulting
-services for Octave.  If you have questions about them, please visit
-their web sites or contact them individually.  This list is provided
-as a service to the community and the support providers.  The Octave
-project does not provide endorsements or recommendations.
+The following organizations and individuals provide paid consulting services
+for Octave.  If you have questions about them, please visit their web sites
+or contact them individually.  This list is provided as a service to the
+community and the support providers.  The Octave project does not provide
+endorsements or recommendations.
 
-If you would like to have your company listed here, please contact
-the <a href="mailto:maintainers@octave.org"><tt>maintainers@octave.org</tt></a>
-mailing list.
+If you would like to have your company listed here, please contact us at the
+[`{{ site.maintainers_email }}`][1] mailing list.
+
+[1]: mailto:{{ site.maintainers_email }}
 
 
-## John W. Eaton Consulting, Inc.
+- [**John W. Eaton Consulting, Inc.**][2] provides software consulting and support
+  services, primarily for GNU Octave, a free software system for numerical
+  analysis.  Services include help with installing and using the software,
+  as well as prompt responses to problem reports.
 
-<a href="http://jweaton.org">John W. Eaton Consulting, Inc.</a>
-provides software consulting and support services, primarily for GNU
-Octave, a free software system for numerical analysis. Services
-include help with installing and using the software, as well as prompt
-responses to problem reports.
+  As the original author and current maintainer of GNU Octave, Dr. Eaton is
+  uniquely qualified to deliver the most comprehensive solutions for your
+  Octave needs.
 
-As the original author and current maintainer of GNU Octave, Dr. Eaton
-is uniquely qualified to deliver the most comprehensive solutions for
-your Octave needs.
-
-
-## MOXOFF
+- [**MOXOFF**][3] provides custom programming and custom numerical modeling
+  solutions based on free software tools and in particular on GNU Octave.
 
-<a href="http://www.moxoff.com/octave">MOXOFF</a> provides custom
-programming and custom numerical modeling solutions based on free
-software tools and in particular on GNU Octave.
+  MOXOFF applies mathematics and statistical analysis to complex, multiphysics
+  problems.  Our approach covers a broad spectrum of fields: we run applied
+  research and develop innovative mathematical solutions for engineering,
+  life science and social science problems.  Our skills can be applied to a
+  wide range of subjects: bio-technologies, aerospace design, domestic
+  appliances, conventional and renewable power generation, electronics,
+  financial instruments, analysis and simulation of geological processes,
+  biomedical equipment to cite just a few of our more recent projects.
+  We deliver business-class solutions based on GNU Octave and we also provide
+  evolutive maintenance.  We design GNU Octave based interfaces to free
+  software tools for scientific computing.
 
-MOXOFF applies mathematics and statistical analysis to complex,
-multiphysics problems. Our approach covers a broad spectrum of
-fields: we run applied research and develop innovative
-mathematical solutions for engineering, life science and social
-science problems. Our skills can be applied to a wide range of
-subjects: bio-technologies, aerospace design, domestic appliances,
-conventional and renewable power generation, electronics,
-financial instruments, analysis and simulation of geological
-processes, biomedical equipment to cite just a few of our more
-recent projects. We deliver business-class solutions based on GNU
-Octave and we also provide evolutive maintenance. We design GNU
-Octave based interfaces to free software tools for scientific
-computing.
+[2]: http://jweaton.org
+[3]: http://www.moxoff.com/octave

--- a/download.md	Mon Oct 17 18:36:54 2016 +0200
+++ b/download.md	Mon Oct 17 18:37:32 2016 +0200
@@ -4,66 +4,68 @@
 menu: true
 ---
 
-## Source
+- **GNU/Linux**
 
-The latest released version of Octave is always available from
-[ftp://ftp.gnu.org/gnu/octave](ftp://ftp.gnu.org/gnu/octave).
-
-If you are interested in working with the latest version of the
-Octave sources, just clone the [Mercurial][1] development repository
+  Executable versions of Octave for GNU/Linux systems are provided by the
+  individual distributions.  Distributions known to package Octave include:
+  [Debian][1], [Ubuntu][2], [Fedora][3], [Gentoo][4], and [openSUSE][5].
+  These packages are created by volunteers.  The delay between an Octave
+  source release and the availability of a package for a particular GNU/Linux
+  distribution varies.  The Octave project has no control over that process.
 
-{% highlight text %}
-hg clone http://www.octave.org/hg/octave
-{% endhighlight %}
+[1]: https://packages.debian.org/octave
+[2]: http://packages.ubuntu.com/octave
+[3]: https://apps.fedoraproject.org/packages/octave
+[4]: https://packages.gentoo.org/packages/sci-mathematics/octave
+[5]: https://en.opensuse.org/Octave
+
 
-[More information]({{ "get-involved.html" | relative_url }}).
+
+- **Mac**
 
-[1]: https://www.mercurial-scm.org
+  The Wiki has some instructions for [installing Octave on OS X systems][6].
+
+[6]: {{ site.wiki_url }}/Octave_for_MacOS_X
 
 
 
-## GNU/Linux
+- **Windows**
 
-Executable versions of Octave for GNU/Linux systems are provided
-by the individual distributions.
-Distributions known to package Octave include:
-[Debian][2], [Ubuntu][3], [Fedora][4], [Gentoo][5], and [openSUSE][6].
-These packages are created by volunteers.
-The delay between an Octave source release and the availability
-of a package for a particular GNU/Linux distribution varies.
-The Octave project has no control over that process.
+  Windows binaries with corresponding source code can be downloaded from
+  [https://ftp.gnu.org/gnu/octave/windows/][7].
 
-[2]: https://packages.debian.org/octave
-[3]: http://packages.ubuntu.com/octave
-[4]: https://apps.fedoraproject.org/packages/octave
-[5]: https://packages.gentoo.org/packages/sci-mathematics/octave
-[6]: https://en.opensuse.org/Octave
+[7]: https://ftp.gnu.org/gnu/octave/windows/
 
 
 
-## Mac
+- **BSD**
 
-The Wiki has some instructions for
-[installing Octave on OS X systems][7].
+  Executable versions of Octave for BSD systems are provided by the individual
+  distributions.  Both [FreeBSD][8] and [OpenBSD][9] have Octave packages.
+  These packages are created by volunteers.  The delay between an Octave source
+  release and the availability of a package for a particular GNU/Linux
+  distribution varies.  The Octave project has no control over that process.
 
-[7]: http://wiki.octave.org/Octave_for_MacOS_X
+[8]: https://www.freebsd.org/
+[9]: https://www.openbsd.org/
 
 
 
-# Windows
+- **Source**
+
+  The source code of the latest released version of GNU Octave is always
+  available from [https://ftp.gnu.org/gnu/octave/][10].
 
-Windows binaries with corresponding source code can be downloaded from
-[https://ftp.gnu.org/gnu/octave/windows/](https://ftp.gnu.org/gnu/octave/windows/).
+  If you are interested in working with the latest version of the
+  [Octave development sources][11], just clone the [Mercurial][12] (hg)
+  repository
+
+  {% highlight bash %}
+  hg clone http://www.octave.org/hg/octave
+  {% endhighlight %}
 
 
 
-## BSD
-
-Executable versions of Octave for BSD systems are provided
-by the individual distributions.
-Both <a href="http://freebsd.org">FreeBSD</a>
-and <a href="http://openbsd.org">OpenBSD</a> have Octave
-packages.  These packages are created by volunteers.  The delay
-between an Octave source release and the availability of a package
-for a particular GNU/Linux distribution varies.  The Octave
-project has no control over that process.
+[10]: https://ftp.gnu.org/gnu/octave/
+[11]: {{ "get-involved.html" | relative_url }}
+[12]: https://www.mercurial-scm.org