# HG changeset patch
# User Alex <alexkrolick@users.noreply.github.com>
# Date 1470844591 25200
# Node ID 79cbd4801fa88498464ef430bd1f9a6a94677d99
# Parent  b6475ae8a2c17a018276c208405131341967af99# Parent  144ccef9272651d08cc6206f57c2edaec5e61bb1
Merge pull request #3 from siko1056/master

Another attempt to work on the website
committer: GitHub <noreply@github.com>

diff -r b6475ae8a2c1 -r 79cbd4801fa8 _config.yml
--- a/_config.yml	Tue Feb 16 09:27:45 2016 -0800
+++ b/_config.yml	Wed Aug 10 08:56:31 2016 -0700
@@ -6,12 +6,12 @@
 # 'jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
-title: Octave
+title: GNU Octave
 email: maintainers@octave.org
 description: > # this means to ignore newlines until "baseurl:"
-  Octave is a programming language for scientific computing.
+  GNU Octave is a programming language for scientific computing.
 baseurl: "/octave-web" # the subpath of your site, e.g. /blog
-url: "//www.octave.org" # the base hostname & protocol for your site
+url: "//www.gnu.org" # the base hostname & protocol for your site
 wiki_url: "//wiki.octave.org"
 faq_url: "//wiki.octave.org/faq"
 docs_url: "//www.gnu.org/software/octave/doc/interpreter/"
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _config_octave.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/_config_octave.yml	Wed Aug 10 08:56:31 2016 -0700
@@ -0,0 +1,6 @@
+# Site settings for deployment under https://www.gnu.org/software/octave
+# build with
+#
+# > jekyll build --config _config.yml,_config_octave.yml
+#
+baseurl: "/software/octave/new" # the subpath of your site, e.g. /blog
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _includes/footer.html
--- a/_includes/footer.html	Tue Feb 16 09:27:45 2016 -0800
+++ b/_includes/footer.html	Wed Aug 10 08:56:31 2016 -0700
@@ -20,10 +20,10 @@
 				<dd><a href="http://webchat.freenode.net/?channels=octave&uio=MT1mYWxzZSYyPXRydWUmMTI9dHJ1ZQda">{{site.irc_channel}}</a></dd>
 			</div>
 			<div class="columns medium-3">
-				<dt><a href="{{ "/bugs/" | prepend: site.baseurl }}">Reporting Bugs</a></dt>        
-				<dt><a href="{{ "/support-expectations/" | prepend: site.baseurl }}">Support Expectations</a></dt> 
-				<dt><a href="{{ "/commercial-support/" | prepend: site.baseurl }}">Commercial Support</a></dt>  
-				<dt><a href="{{ "/donate/" | prepend: site.baseurl }}">Donate</a></dt>      
+				<dt><a href="{{ "/bugs/" | prepend: site.baseurl }}">Reporting Bugs</a></dt>
+				<dt><a href="{{ "/support-expectations/" | prepend: site.baseurl }}">Support Expectations</a></dt>
+				<dt><a href="{{ "/commercial-support/" | prepend: site.baseurl }}">Commercial Support</a></dt>
+				<dt><a href="{{ "/donate/" | prepend: site.baseurl }}">Donate</a></dt>
 			</div>
 			</div>
 		</dl>
@@ -47,7 +47,7 @@
 			<div class="text-center">
 				<p>Octave is free software under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License.</a></p>
 				<small>
-					Copyright © 1998-2015 John W. Eaton. Verbatim copying and distribution is permitted in any medium, provided this notice is preserved. 
+					Copyright © 1998-2016 John W. Eaton. Verbatim copying and distribution is permitted in any medium, provided this notice is preserved. 
 				</small>
 			</div>
 		</div>
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _includes/install.html
--- a/_includes/install.html	Tue Feb 16 09:27:45 2016 -0800
+++ b/_includes/install.html	Wed Aug 10 08:56:31 2016 -0700
@@ -8,7 +8,7 @@
 <div class="tabs-content">
   <div class="content active" id="linux">
     <p>
-      Executable versions of Octave for GNU/Linux systems are provided by the individual distributions. Distributions known to package Octave include <a href="//debian.org">Debian</a>, <a href="//ubuntu.org">Ubuntu</a>, <a href="//fedoraproject.org">Fedora</a>, <a href="//gentoo.org">Gentoo</a>, and <a href="//opensuse.org">SuSE</a>. 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.
+      Executable versions of GNU Octave for GNU/Linux systems are provided by the individual distributions. Distributions known to package Octave include <a href="//debian.org">Debian</a>, <a href="//ubuntu.org">Ubuntu</a>, <a href="//fedoraproject.org">Fedora</a>, <a href="//gentoo.org">Gentoo</a>, and <a href="//opensuse.org">SuSE</a>. 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.
     </p>
   </div>
   <div class="content" id="mac">
@@ -28,7 +28,7 @@
   </div>
   <div class="content" id="source">
     <p>
-      The latest released version of Octave is always available from <a href="ftp://ftp.gnu.org/gnu/octave">ftp://ftp.gnu.org/gnu/octave</a>. 
+      The latest released version of Octave is always available from <a href="ftp://ftp.gnu.org/gnu/octave">ftp://ftp.gnu.org/gnu/octave</a>.
     </p>
   </div>
-</div>
\ No newline at end of file
+</div>
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _posts/2015-05-29-octave-4.0.0-released.markdown
--- a/_posts/2015-05-29-octave-4.0.0-released.markdown	Tue Feb 16 09:27:45 2016 -0800
+++ b/_posts/2015-05-29-octave-4.0.0-released.markdown	Wed Aug 10 08:56:31 2016 -0700
@@ -1,17 +1,25 @@
 ---
 layout: post
-title:  "Octave 4.0.0 Released"
+title:  "GNU Octave 4.0.0 Released"
 date:   2015-05-29
 categories: releases
 ---
 
-Version 4.0.0 has been released and is now available for download. Octave 4.0 is a major new release with many new features, including a graphical user interface, support for classdef object-oriented programming, better compatibility with Matlab, and many new and improved functions.
+Version 4.0.0 has been released and is now available for download.
+Octave 4.0 is a major new release with many new features:
 
-An official Windows binary installer is also available from [ftp://ftp.gnu.org/gnu/octave/windows/octave-4.0.0_0-installer.exe][installer]
+- including a graphical user interface,
+- support for classdef object-oriented programming,
+- better compatibility with Matlab, and
+- many new and improved functions.
 
-A list of important user-visible changes is available [here][news], by selecting the Release Notes item in the News menu of the GUI, or by typing news at the Octave command prompt.
+An official [Windows binary installer][] is available.
 
-Thanks to the many people who contributed to this release! 
+A list of important user-visible changes is available [here][news],
+by selecting the Release Notes item in the News menu of the GUI,
+or by typing `news` at the Octave command prompt.
+
+Thanks to the many people who contributed to this release!
 
 [news]: http://octave.org/NEWS-4.0.html
-[installer]: ftp://ftp.gnu.org/gnu/octave/windows/octave-4.0.0_0-installer.exe
\ No newline at end of file
+[Windows binary installer]: ftp://ftp.gnu.org/gnu/octave/windows/octave-4.0.0_0-installer.exe
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _posts/2016-03-23-octave-4.0.1-released.markdown
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/_posts/2016-03-23-octave-4.0.1-released.markdown	Wed Aug 10 08:56:31 2016 -0700
@@ -0,0 +1,19 @@
+---
+layout: post
+title:  "GNU Octave 4.0.1 Released"
+date:   2016-03-23
+categories: releases
+---
+
+Version 4.0.1 has been released and is now available for [download][].
+Octave 4.0.1 is a [bug fixing release][].
+
+Octave 4.0, released in May 2015,
+was a major new version with many new features,
+including a graphical user interface,
+support for classdef object-oriented programming,
+better compatibility with Matlab,
+and many new and improved functions.
+
+[download]: http://www.octave.org/download.html
+[bug fixing release]: http://www.octave.org/fixes-4-0-1.html
diff -r b6475ae8a2c1 -r 79cbd4801fa8 _posts/2016-07-02-octave-4.0.3-released.markdown
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/_posts/2016-07-02-octave-4.0.3-released.markdown	Wed Aug 10 08:56:31 2016 -0700
@@ -0,0 +1,15 @@
+---
+layout: post
+title:  "GNU Octave 4.0.3 Released"
+date:   2016-07-02
+categories: releases
+---
+
+Octave Version 4.0.3 has been released and is now available for [download][].
+This version is another [bug fixing release][].
+
+An official [Windows binary installer][] is also available.
+
+[download]: http://www.octave.org/download.html
+[bug fixing release]: http://www.octave.org/fixes-4-0-3.html
+[Windows binary installer]: ftp://ftp.gnu.org/gnu/octave/windows/octave-4.0.3-installer.exe
diff -r b6475ae8a2c1 -r 79cbd4801fa8 humans.txt
--- a/humans.txt	Tue Feb 16 09:27:45 2016 -0800
+++ b/humans.txt	Wed Aug 10 08:56:31 2016 -0700
@@ -1,13 +1,13 @@
 About GNU Octave
 ----------------
-Octave is a free programming language for scientific computation.
+GNU Octave is a free programming language for scientific computation.
 
 
 Documentation
 -------------
-Copyright (c) 1998-2015 John W. Eaton. Verbatim copying and distribution is permitted in any medium, provided this notice is preserved. 
+Copyright (c) 1998-2016 John W. Eaton. Verbatim copying and distribution is permitted in any medium, provided this notice is preserved.
 
 
 Website Design
 --------------
-Copyright (c) 2015 Alex Krolick. Verbatim copying and distribution is permitted in any medium.
\ No newline at end of file
+Copyright (c) 2015-2016 Alex Krolick. Verbatim copying and distribution is permitted in any medium.
diff -r b6475ae8a2c1 -r 79cbd4801fa8 index.html
--- a/index.html	Tue Feb 16 09:27:45 2016 -0800
+++ b/index.html	Wed Aug 10 08:56:31 2016 -0700
@@ -32,7 +32,7 @@
 
 <section id="syntax">
   <h3>Syntax Examples</h3>
-  
+
   <div class="row">
     <div class="columns medium-12">
       <p>
@@ -40,7 +40,7 @@
       </p>
     </div>
   </div>
-  
+
   <div class="row">
     <div class="columns medium-4" >
       <p>Solve systems of equations with linear algebra operations on <strong>vectors</strong> and <strong>matrices</strong></p>
@@ -51,16 +51,16 @@
 A = [ 3 4 5;
       1 3 1;
       3 5 9 ]
-x = A \ b    % Solve the system by inverting A
+x = A \ b     % Solve the system by inverting A
 {% endhighlight %}
      </div>
   </div>
-  
+
   <div class="row">
      <div class="columns medium-4">
         <p>Visualize data with <strong>high-level plot commands</strong> in 2D and 3D</p>
      </div>
-     <div class="columns medium-8">     
+     <div class="columns medium-8">
 {% highlight matlab %}
 x = -10:0.1:10 % Create an evenly-spaced vector from -10..10
 y = sin(x)     % y is also a vector
@@ -85,7 +85,7 @@
     </div>
     <div class="columns medium-4">
       <a href="#" data-reveal-id="guiModal">
-        <img src="https://upload.wikimedia.org/wikipedia/en/4/48/Octave-4.0.0-rc1-Qt5.4-Linux.png" title="Octave-4.0.0-rc1-Qt5.4-Linux by Qtguy00 - Own work. Licensed under CC BY-SA 3.0 via Wikipedia"/>
+        <img src="https://www.gnu.org/software/octave/images/screenshot-2016-small.png" title="GNU Octave 4.0.3 - Licensed under CC BY-SA 3.0"/>
       </a>
     </div>
   </div>
@@ -150,4 +150,4 @@
 <div id="guiModal" class="reveal-modal" data-reveal aria-hidden="true" role="dialog">
   <img src="https://upload.wikimedia.org/wikipedia/en/4/48/Octave-4.0.0-rc1-Qt5.4-Linux.png" title="Octave-4.0.0-rc1-Qt5.4-Linux by Qtguy00 - Own work. Licensed under CC BY-SA 3.0 via Wikipedia"/>
   <a class="close-reveal-modal" aria-label="Close">&#215;</a>
-</div>
\ No newline at end of file
+</div>