Reorganise software section

9 files changed, 18 insertions, 16 deletions

diff --git a/index.txt b/index.txt
index 0525c0b..e728e8b 100644
--- a/index.txt
+++ b/index.txt
@@ -1,7 +1,7 @@
 Nick  J. White (njw)
 =======================================================================
 
-[Software](software)
+[Software](software/)
 -----------------------------------------------------------------------
 More information about the free software projects I have been and am
 involved with.
diff --git a/software.txt b/software/index.txt
index 24cd556..f4e6b92 100644
--- a/software.txt
+++ b/software/index.txt
@@ -2,18 +2,23 @@ Software
 =======================================================================
 
 I am very supportive of
-[software freedom](http://www.gnu.org/philosophy/free-sw.html) -
-ensuring everyone has freedom and control of their own computing.
+[software freedom](http://www.gnu.org/philosophy/free-sw.html);
+ensuring everyone has freedom and control of their own computing, by
+protecting the right to freely use, study, modify and share programs.
 One of the ways I support this goal is by working on free software,
 some of which may be found in my
 [public git repositories](http://git.njw.me.uk).
 
+I strongly reject 'open source,' a term which was created to
+undermine the importance of freedom and collective welfare, and
+recast free software as nothing more than an efficient mode of
+production and profit.
+
 [Gentoo](http://www.gentoo.org)
 -----------------------------------------------------------------------
 
-An operating system based on either Linux or FreeBSD that can be
-automatically optimized and customized for just about any application
-or need.
+A unix-like operating system that can be automatically optimized and
+customized for a variety of different applications or needs.
 
 My distribution of choice, within which
 [I am active](http://bugs.gentoo.org/buglist.cgi?email1=gentoo-bugs%40njw.me.uk&emailassigned_to1=1&emailreporter1=1&emailcc1=1&emailtype1=substring)
@@ -25,22 +30,19 @@ I also maintain a
 [personal overlay](http://git.njw.me.uk/cgit/cgit.cgi/njw-gentoo-local/)
 of some ebuilds I've built for it.
 
-[GemRB](http://www.sourceforge.net/projects/gemrb)
------------------------------------------------------------------------
-
-A reimplementation of the Infinity Engine, as used in games such as
-Baldurs Gate and Planescape: Torment.
-
-I contribute the odd patch to this, as well as maintaining the
-[gemrb game installers](http://git.njw.me.uk/cgit/cgit.cgi/gemrb-gameinstallers/)
-and writing the official Gentoo ebuild.
-
 [GetHT](http://www.nongnu.org/getht)
 -----------------------------------------------------------------------
 
 An application for GNU/Linux to download the PDF editions of
 [Hinduism Today](http://www.hinduismtoday.com).
 
+[GemRB game installers](http://git.njw.me.uk/cgit/cgit.cgi/gemrb-gameinstallers/)
+---------------------------------------------------------------------------------
+
+A set of scripts to install the games supported by
+[GemRB](http://www.sourceforge.net/projects/gemrb), a reimplementation
+of the Infinity engine.
+
 [Scripts](scripts/)
 -----------------------------------------------------------------------
 
diff --git a/scripts/encrypt-if-possible.sh b/software/scripts/encrypt-if-possible.sh
index 36e15cb..36e15cb 100644
--- a/scripts/encrypt-if-possible.sh
+++ b/software/scripts/encrypt-if-possible.sh
diff --git a/scripts/fetchdnow.sh b/software/scripts/fetchdnow.sh
index 990a2dc..990a2dc 100644
--- a/scripts/fetchdnow.sh
+++ b/software/scripts/fetchdnow.sh
diff --git a/scripts/filenonpersonalmail.rc b/software/scripts/filenonpersonalmail.rc
index a446177..a446177 100644
--- a/scripts/filenonpersonalmail.rc
+++ b/software/scripts/filenonpersonalmail.rc
diff --git a/scripts/gatherflaggedmail.sh b/software/scripts/gatherflaggedmail.sh
index 4333ee5..4333ee5 100644
--- a/scripts/gatherflaggedmail.sh
+++ b/software/scripts/gatherflaggedmail.sh
diff --git a/scripts/getlwn.py b/software/scripts/getlwn.py
index 0cfde2e..0cfde2e 100644
--- a/scripts/getlwn.py
+++ b/software/scripts/getlwn.py
diff --git a/scripts/index.txt b/software/scripts/index.txt
index 93a53cf..93a53cf 100644
--- a/scripts/index.txt
+++ b/software/scripts/index.txt
diff --git a/scripts/remove-links.js b/software/scripts/remove-links.js
index 1defd2b..1defd2b 100644
--- a/scripts/remove-links.js
+++ b/software/scripts/remove-links.js