From: Scott Leggett <scott@sl.id.au>
Date: Sun, 24 Feb 2013 21:50:03 +1100
Subject: Merge old and new man pages.

---
 spout.1 |   34 ----------------------------------
 spout.6 |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 34 deletions(-)
 delete mode 100644 spout.1
 create mode 100644 spout.6

diff --git a/spout.1 b/spout.1
deleted file mode 100644
index 21cfc4f..0000000
--- a/spout.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\" See COPYING file for copyright, license and warranty details.
-.TH SPOUT 1 spout\-1.4
-.SH NAME
-spout \- a simple caveflying game.
-.SH SYNOPSIS
-.B spout
-.RB [-f]
-.RB [-z\ zoom]
-.SH DESCRIPTION
-Spout is a simple caveflying game. The object is to get as high
-as possible, avoiding or destroying obstacles.
-.SH OPTIONS
-.TP
-.B \-f
-Fullscreen
-.TP
-.B \-z zoom
-Zooms the screen by zoom times (default: 4)
-.SH USAGE
-.TP
-.B Left
-Rotate left
-.TP
-.B Right
-Rotate right
-.TP
-.B Space
-Thrust
-.TP
-.B Escape
-Pause
-.TP
-.B Shift\-Escape
-Quit
diff --git a/spout.6 b/spout.6
new file mode 100644
index 0000000..1916e4c
--- /dev/null
+++ b/spout.6
@@ -0,0 +1,42 @@
+.\" See COPYING file for copyright, license and warranty details.
+.TH SPOUT 6 spout\-1.4
+.SH NAME
+spout \- a simple cave-flying game.
+.SH SYNOPSIS
+.B spout
+.RB [-f]
+.RB [-z\ zoom]
+.SH DESCRIPTION
+Spout is a simple cave-flying game. The object is to get as high as possible,
+avoiding or destroying obstacles using the ship's exhaust. Each checkpoint you
+pass gives you a little more time!
+
+This is a new unix version of the game, based on the original Windows code.
+.SH OPTIONS
+.TP
+.B \-f
+Fullscreen
+.TP
+.B \-z zoom
+Zooms the screen by zoom times (default: 4)
+.SH USAGE
+.TP
+.B Left
+Rotate left
+.TP
+.B Right
+Rotate right
+.TP
+.B Space
+Thrust
+.TP
+.B Escape
+Pause
+.TP
+.B Shift\-Escape
+Quit
+.SH SEE ALSO
+The homepage of the current maintainer <http://njw.me.uk/spout/>.
+.SH AUTHOR
+This version of Spout was written for Windows by Kuni <mailto:ku_@din.or.jp>, and ported to unix by
+Nick White <mailto:nick@njw.me.uk>.
