From 8a12e01122c275660a91a80a80660e1736ab46e0 2012-07-21 15:05:28
From: MinRK <benjaminrk@gmail.com>
Date: 2012-07-21 15:05:28
Subject: [PATCH] Backport PR #2060: change minus to \- or \(hy in manpages

fixes #2058

---

diff --git a/docs/man/ipcluster.1 b/docs/man/ipcluster.1
index 74e1c02..e70a3f2 100644
--- a/docs/man/ipcluster.1
+++ b/docs/man/ipcluster.1
@@ -9,8 +9,8 @@
 .SH DESCRIPTION
 Start an IPython cluster for parallel computing.
 
-For more information on how to use ipcluster, see 'ipcluster --help',
-or 'ipcluster --help-all' for all available command-line options.
+For more information on how to use ipcluster, see 'ipcluster \-\-help',
+or 'ipcluster \-\-help\-all' for all available command\(hyline options.
 
 .SH "SEE ALSO"
 .BR ipython(1),
diff --git a/docs/man/ipcontroller.1 b/docs/man/ipcontroller.1
index 04d36ef..440d9a1 100644
--- a/docs/man/ipcontroller.1
+++ b/docs/man/ipcontroller.1
@@ -9,8 +9,8 @@
 .SH DESCRIPTION
 ipcontroller starts a controller for the IPython cluster
 
-For more information on how to use ipcontroller, see 'ipcontroller --help',
-or 'ipcontroller --help-all' for all available command-line options.
+For more information on how to use ipcontroller, see 'ipcontroller \-\-help',
+or 'ipcontroller \-\-help\-all' for all available command\(hyline options.
 
 .SH "SEE ALSO"
 .BR ipython(1),
diff --git a/docs/man/ipengine.1 b/docs/man/ipengine.1
index 09b1271..6a5d48e 100644
--- a/docs/man/ipengine.1
+++ b/docs/man/ipengine.1
@@ -8,8 +8,8 @@
 .SH DESCRIPTION
 ipengine starts an engine for the IPython cluster
 
-For more information on how to use ipengine, see 'ipengine --help',
-or 'ipengine --help-all' for all available command-line options.
+For more information on how to use ipengine, see 'ipengine \-\-help',
+or 'ipengine \-\-help\-all' for all available command\(hyline options.
 
 .SH "SEE ALSO"
 .BR ipython(1),
diff --git a/docs/man/iplogger.1 b/docs/man/iplogger.1
index 8a3a6a0..9293bdc 100644
--- a/docs/man/iplogger.1
+++ b/docs/man/iplogger.1
@@ -11,8 +11,8 @@ Start an IPython log aggregator.
 IPython controllers and engines (and your own processes) can broadcast log
 messages over zeromq to a single logger instance.
 
-For more information on how to use iplogger, see 'iplogger --help',
-or 'iplogger --help-all' for all available command-line options.
+For more information on how to use iplogger, see 'iplogger \-\-help',
+or 'iplogger \-\-help\-all' for all available command\(hyline options.
 
 .SH "SEE ALSO"
 .BR ipython(1),
diff --git a/docs/man/ipython.1 b/docs/man/ipython.1
index 3a2378f..a017fb0 100644
--- a/docs/man/ipython.1
+++ b/docs/man/ipython.1
@@ -36,8 +36,8 @@ object introspection, easier configuration, command completion, access to the
 system shell, integration with numerical and scientific computing tools,
 web notebook, Qt console, and more.
 
-For more information on how to use IPython, see 'ipython --help',
-or 'ipython --help-all' for all available command-line options.
+For more information on how to use IPython, see 'ipython \-\-help',
+or 'ipython \-\-help\-all' for all available command\(hyline options.
 
 .SH "ENVIRONMENT VARIABLES"
 .sp
diff --git a/docs/man/pycolor.1 b/docs/man/pycolor.1
index e0d3421..b73723a 100644
--- a/docs/man/pycolor.1
+++ b/docs/man/pycolor.1
@@ -23,7 +23,7 @@ pycolor \- Colorize a python file or stdin using ANSI and print to stdout.
 .RI [ file ]
 .SH DESCRIPTION
 Prints a colorized version of the input file (or standard input if no file is
-given, or the file name - is given) to standard out.
+given, or the file name \- is given) to standard out.
 .SH OPTIONS
 .TP
 .B \-h, \-\-help