diff --git a/docs/CommandGuide/llvm-link.html b/docs/CommandGuide/llvm-link.html
index b067b4b85e7..831fa33fa4e 100644
--- a/docs/CommandGuide/llvm-link.html
+++ b/docs/CommandGuide/llvm-link.html
@@ -25,19 +25,29 @@ llvm-link [options] <filename> [filename ...]
DESCRIPTION
-The llvm-link command takes several LLVM bytecode files and links them together into a single LLVM bytecode file.
+The llvm-link command takes several LLVM bytecode files and links them together
+into a single LLVM bytecode file. It writes the output file to standard
+output, unless the -o option is used to specify a filename.
+
+
+The llvm-link command attempts to load the input files from the current
+directory. If that fails, it attempts to locate each file within the
+directories specified by the -L options on the command line. The library
+search paths are global; each one is search for every input file if necessary.
+The directories are searched in the order they were specified on the command
+line.
OPTIONS
- - -L <pathname>
+
- -L <directory>
- Specify a library search path. When looking for libraries, llvm-link
- will look in pathname for libraries. This option can be specified
- multiple times; llvm-link will search inside these directories in the
- order in which they were specified on the command line.
+ Add the specified directory to the library search path. When looking for
+ libraries, llvm-link will look in pathname for libraries. This option can
+ be specified multiple times; llvm-link will search inside these directories
+ in the order in which they were specified on the command line.
- -f
@@ -48,26 +58,33 @@ OPTIONS
- -o <filename>
- Output filename.
+ Output filename. If filename is -, then llvm-link will write its output to
+ standard output.
-
- -help
+
- -d
+
+ If specified, llvm-link prints a human readable version of the output
+ bytecode file to standard error.
+
+
+
- -help
Print a summary of command line options.
-
- -stats
+
- -stats
Print statistics.
-
- -time-passes
+
- -time-passes
Record the amount of time needed for each pass and print it to standard
error.
-
- -v
+
- -v
Verbose mode. Print information about what llvm-link is doing.
@@ -82,7 +99,7 @@ will exit with a non-zero value.
SEE ALSO
-llvm-dis, lli
+llvm-dis, lli, gccld
LLVM Team
diff --git a/docs/CommandGuide/opt.html b/docs/CommandGuide/opt.html
index cab594618f6..52b168393e8 100644
--- a/docs/CommandGuide/opt.html
+++ b/docs/CommandGuide/opt.html
@@ -20,19 +20,27 @@ opt
SYNOPSIS
-opt [options] < filename>
+opt [options] [filename]
DESCRIPTION
The opt command is the LLVM optimizer. It takes LLVM bytecode as input, runs
-the specified optimizations on it, and then outputs the optimized code in LLVM
+the specified optimizations on it, and then outputs the optimized LLVM
bytecode.
+
-The optimizations available via opt depend upon what libraries it was linked
-with, as well as any additional libraries that have been loaded with the -load
-option. Use the -help option to determine what optimizations you can use.
+The optimizations available via opt depend upon what libraries were linked
+into it as well as any additional libraries that have been loaded with the
+-load option. Use the -help option to determine what optimizations you can use.
+
+If no filename is specified on the command line, opt reads its input from
+standard input.
+
+
+If an output filename is not specified with the -o option, opt writes its
+output to the standard output.
OPTIONS