Merge tag 'upstream/1.2.1'

Upstream version 1.2.1

3 files changed, 18 insertions, 15 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a046b0f..8e56131 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+1.2.1 (marked on 2013-07-03)
+    * Fixes for manpage
+
 1.2 (marked on 2013-05-20)
     * Remove toaruos legacy support
     * May possibly have fixed misidentification on GitHub
diff --git a/Makefile b/Makefile
index 06bd4fe..3b031fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 package = nyancat
-version = 1.2
+version = 1.2.1
 tarname = $(package)
 distdir = $(tarname)-$(version)
 
diff --git a/nyancat.1 b/nyancat.1
index af289f9..267966d 100644
--- a/nyancat.1
+++ b/nyancat.1
@@ -2,7 +2,7 @@
 .SH NAME
 nyancat \- terminal-based Pop Tart Cat animation
 .SH SYNOPSIS
-.B nyancat [ -hitn ] [-f frames]
+.B nyancat [ \-hitn ] [\-f frames]
 .SH DESCRIPTION
 .B nyancat
 is an animated, color, ANSI-text program that renders a loop of the
@@ -12,43 +12,43 @@ nyancat makes use of various ANSI escape sequences to render color, or in the ca
 of a VT220, simply dumps text to the screen.
 .SH OPTIONS
 .TP
-.B \-i, --intro
+.B \-i, \-\-intro
 Show introduction / about information on startup.
 .TP
-.B \-t, --telnet
+.B \-t, \-\-telnet
 Enable telnet mode.
 .TP
-.B \-n, --no-counter
+.B \-n, \-\-no\-counter
 Do not display the timer.
 .TP
-.B \-s, --no-title
+.B \-s, \-\-no\-title
 Do not set the titlebar text.
 .TP
-.B \-e, --no-clear
+.B \-e, \-\-no\-clear
 Do not clear the display between frames.
 .TP
-.B \-f, --frames
+.B \-f, \-\-frames
 Display the requested number of frames, then quit.
 .TP
-.B \-r, --min-rows
+.B \-r, \-\-min\-rows
 Crop the animation from the top.
 .TP
-.B \-R, --max-rows
+.B \-R, \-\-max\-rows
 Crop the animation from the bottom.
 .TP
-.B \-c, --min-cols
+.B \-c, \-\-min\-cols
 Crop the animation from the left.
 .TP
-.B \-C, --max-cols
+.B \-C, \-\-max\-cols
 Crop the animation from the right.
 .TP
-.B \-W, --width
+.B \-W, \-\-width
 Crop the animation to the given width.
 .TP
-.B \-H, --height
+.B \-H, \-\-height
 Crop the animation to the given height.
 .TP
-.B \-h, --help
+.B \-h, \-\-help
 Show help message and exit.
 .SH HOMEPAGE
 .PP