diff --git a/docs/CommandGuide/FileCheck.pod b/docs/CommandGuide/FileCheck.pod
index 32516ad..433979a 100644
--- a/docs/CommandGuide/FileCheck.pod
+++ b/docs/CommandGuide/FileCheck.pod
@@ -25,7 +25,7 @@
 
 =over
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/bugpoint.pod b/docs/CommandGuide/bugpoint.pod
index 204ea4d..7afeea1 100644
--- a/docs/CommandGuide/bugpoint.pod
+++ b/docs/CommandGuide/bugpoint.pod
@@ -85,7 +85,7 @@
 Continually randomize the specified passes and run them on the test program
 until a bug is found or the user kills B<bugpoint>. 
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
@@ -99,9 +99,9 @@
 Load the dynamic object F<plugin> into B<bugpoint> itself.  This object should
 register new optimization passes.  Once loaded, the object will add new command
 line options to enable various optimizations.  To see the new complete list of
-optimizations, use the B<--help> and B<--load> options together; for example:
+optimizations, use the B<-help> and B<--load> options together; for example:
 
-    bugpoint --load myNewPass.so --help
+    bugpoint --load myNewPass.so -help
 
 =item B<--mlimit> F<megabytes>
 
diff --git a/docs/CommandGuide/index.html b/docs/CommandGuide/index.html
index 9516d07..72cd2cf 100644
--- a/docs/CommandGuide/index.html
+++ b/docs/CommandGuide/index.html
@@ -17,7 +17,7 @@
 for all of the LLVM tools.  These pages describe how to use the LLVM commands
 and what their options are.  Note that these pages do not describe all of the
 options available for all tools.  To get a complete listing, pass the
-<tt>--help</tt> (general options) or <tt>--help-hidden</tt> (general+debugging
+<tt>-help</tt> (general options) or <tt>-help-hidden</tt> (general+debugging
 options) arguments to the tool you are interested in.</p>
 
 </div>
diff --git a/docs/CommandGuide/llc.pod b/docs/CommandGuide/llc.pod
index 8adfb68..ac24aab 100644
--- a/docs/CommandGuide/llc.pod
+++ b/docs/CommandGuide/llc.pod
@@ -38,7 +38,7 @@
 
 =over
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
@@ -56,7 +56,7 @@
 =item B<-march>=I<arch>
 
 Specify the architecture for which to generate assembly, overriding the target
-encoded in the input file.  See the output of B<llc --help> for a list of
+encoded in the input file.  See the output of B<llc -help> for a list of
 valid architectures.  By default this is inferred from the target triple or
 autodetected to the current architecture.
 
diff --git a/docs/CommandGuide/lli.pod b/docs/CommandGuide/lli.pod
index e9fdf74..3d5da3d 100644
--- a/docs/CommandGuide/lli.pod
+++ b/docs/CommandGuide/lli.pod
@@ -73,7 +73,7 @@
 =item B<-march>=I<arch>
 
 Specify the architecture for which to generate assembly, overriding the target
-encoded in the bitcode file.  See the output of B<llc --help> for a list of
+encoded in the bitcode file.  See the output of B<llc -help> for a list of
 valid architectures.  By default this is inferred from the target triple or
 autodetected to the current architecture.
 
diff --git a/docs/CommandGuide/llvm-as.pod b/docs/CommandGuide/llvm-as.pod
index 045a924..185c009 100644
--- a/docs/CommandGuide/llvm-as.pod
+++ b/docs/CommandGuide/llvm-as.pod
@@ -50,7 +50,7 @@
 write raw bitcode output if the output stream is a terminal. With this option,
 B<llvm-as> will write raw bitcode regardless of the output device.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/llvm-bcanalyzer.pod b/docs/CommandGuide/llvm-bcanalyzer.pod
index f60b513..b0bc0cd 100644
--- a/docs/CommandGuide/llvm-bcanalyzer.pod
+++ b/docs/CommandGuide/llvm-bcanalyzer.pod
@@ -43,7 +43,7 @@
 bitcode. This ensures that the statistics generated are based on a consistent
 module.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/llvm-config.pod b/docs/CommandGuide/llvm-config.pod
index 06f10de..4e38dae 100644
--- a/docs/CommandGuide/llvm-config.pod
+++ b/docs/CommandGuide/llvm-config.pod
@@ -30,7 +30,7 @@
 
 Print the version number of LLVM.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of B<llvm-config> arguments.
 
diff --git a/docs/CommandGuide/llvm-dis.pod b/docs/CommandGuide/llvm-dis.pod
index 2b83290..5b2f4ef 100644
--- a/docs/CommandGuide/llvm-dis.pod
+++ b/docs/CommandGuide/llvm-dis.pod
@@ -33,7 +33,7 @@
 write raw bitcode output if the output stream is a terminal. With this option,
 B<llvm-dis> will write raw bitcode regardless of the output device.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/llvm-extract.pod b/docs/CommandGuide/llvm-extract.pod
index 02f38ad..d4baab7 100644
--- a/docs/CommandGuide/llvm-extract.pod
+++ b/docs/CommandGuide/llvm-extract.pod
@@ -42,7 +42,7 @@
 Extract the global variable named I<global-name> from the LLVM bitcode. May be
 specified multiple times to extract multiple global variables at once.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/llvm-link.pod b/docs/CommandGuide/llvm-link.pod
index e1a1267..8d06cc9 100644
--- a/docs/CommandGuide/llvm-link.pod
+++ b/docs/CommandGuide/llvm-link.pod
@@ -51,7 +51,7 @@
 If specified, B<llvm-link> prints a human-readable version of the output
 bitcode file to standard error.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.
 
diff --git a/docs/CommandGuide/llvm-nm.pod b/docs/CommandGuide/llvm-nm.pod
index 995ac08..a580d3f 100644
--- a/docs/CommandGuide/llvm-nm.pod
+++ b/docs/CommandGuide/llvm-nm.pod
@@ -77,7 +77,7 @@
 
 Use BSD output format. Alias for B<--format=bsd>.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command-line options and their meanings.
 
diff --git a/docs/CommandGuide/llvm-prof.pod b/docs/CommandGuide/llvm-prof.pod
index 381387d..9541b05 100644
--- a/docs/CommandGuide/llvm-prof.pod
+++ b/docs/CommandGuide/llvm-prof.pod
@@ -18,7 +18,7 @@
 This program is often used in conjunction with the F<utils/profile.pl>
 script.  This script automatically instruments a program, runs it with the JIT,
 then runs B<llvm-prof> to format a report.  To get more information about
-F<utils/profile.pl>, execute it with the B<--help> option.
+F<utils/profile.pl>, execute it with the B<-help> option.
 
 =head1 OPTIONS
 
diff --git a/docs/CommandGuide/llvm-ranlib.pod b/docs/CommandGuide/llvm-ranlib.pod
index 130edb0..53cd34b 100644
--- a/docs/CommandGuide/llvm-ranlib.pod
+++ b/docs/CommandGuide/llvm-ranlib.pod
@@ -6,7 +6,7 @@
 
 =head1 SYNOPSIS
 
-B<llvm-ranlib> [--version] [--help] <archive-file>
+B<llvm-ranlib> [--version] [-help] <archive-file>
 
 =head1 DESCRIPTION
 
@@ -30,7 +30,7 @@
 
 Print the version of B<llvm-ranlib> and exit without building a symbol table.
 
-=item F<--help>
+=item F<-help>
 
 Print usage help for B<llvm-ranlib> and exit without building a symbol table.
 
diff --git a/docs/CommandGuide/llvmc.pod b/docs/CommandGuide/llvmc.pod
index e5e0651..d237ca4 100644
--- a/docs/CommandGuide/llvmc.pod
+++ b/docs/CommandGuide/llvmc.pod
@@ -77,11 +77,11 @@
 unless I<--save-temps> is specified. If I<--save-temps=obj> is also specified,
 I<--temp-dir> is given the precedence.
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command-line options and exit.
 
-=item B<--help-hidden>
+=item B<-help-hidden>
 
 Print a summary of command-line options and exit. Print help even for
 options intended for developers.
diff --git a/docs/CommandGuide/tblgen.pod b/docs/CommandGuide/tblgen.pod
index c8244af..d127492 100644
--- a/docs/CommandGuide/tblgen.pod
+++ b/docs/CommandGuide/tblgen.pod
@@ -26,7 +26,7 @@
 
 =over
 
-=item B<--help>
+=item B<-help>
 
 Print a summary of command line options.