diff --git a/docs/CommandGuide/index.html b/docs/CommandGuide/index.html
index bc181611db4..5cac65cd0b7 100644
--- a/docs/CommandGuide/index.html
+++ b/docs/CommandGuide/index.html
@@ -32,50 +32,50 @@ options) arguments to the tool you are interested in.</p>
 
 <ul>
 
-<li><a href="html/llvm-as.html"><b>llvm-as</b></a> - 
+<li><a href="/cmds/llvm-as.html"><b>llvm-as</b></a> - 
     assemble a human-readable .ll file into bytecode</li>
 
-<li><a href="html/llvm-dis.html"><b>llvm-dis</b></a> -
+<li><a href="/cmds/llvm-dis.html"><b>llvm-dis</b></a> -
     disassemble a bytecode file into a human-readable .ll file</li>
 
-<li><a href="html/llvm-upgrade.html"><b>llvm-upgrade</b></a> -
+<li><a href="/cmds/llvm-upgrade.html"><b>llvm-upgrade</b></a> -
     upgrade LLVM assembly from previous version</li>
 
-<li><a href="html/opt.html"><b>opt</b></a> -
+<li><a href="/cmds/opt.html"><b>opt</b></a> -
     run a series of LLVM-to-LLVM optimizations on a bytecode file</li>
 
-<li><a href="html/llc.html"><b>llc</b></a> - 
+<li><a href="/cmds/llc.html"><b>llc</b></a> - 
     generate native machine code for a bytecode file</li>
 
-<li><a href="html/lli.html"><b>lli</b></a> - 
+<li><a href="/cmds/lli.html"><b>lli</b></a> - 
     directly run a program compiled to bytecode using a JIT compiler or 
     interpreter</li>
 
-<li><a href="html/llvm-link.html"><b>llvm-link</b></a> -
+<li><a href="/cmds/llvm-link.html"><b>llvm-link</b></a> -
     link several bytecode files into one</li>
 
-<li><a href="html/llvm-ar.html"><b>llvm-ar</b></a> - 
+<li><a href="/cmds/llvm-ar.html"><b>llvm-ar</b></a> - 
     archive bytecode files</li>
 
-<li><a href="html/llvm-ranlib.html"><b>llvm-ranlib</b></a> - 
+<li><a href="/cmds/llvm-ranlib.html"><b>llvm-ranlib</b></a> - 
     create an index for archives made with llvm-ar</li>
 
-<li><a href="html/llvm-nm.html"><b>llvm-nm</b></a> -
+<li><a href="/cmds/llvm-nm.html"><b>llvm-nm</b></a> -
     print out the names and types of symbols in a bytecode file</li>
 
-<li><a href="html/llvm-prof.html"><b>llvm-prof</b></a> -
+<li><a href="/cmds/llvm-prof.html"><b>llvm-prof</b></a> -
     format raw `<tt>llvmprof.out</tt>' data into a human-readable report</li>
 
-<li><a href="html/llvmc.html"><b>llvmc</b></a> -
+<li><a href="/cmds/llvmc.html"><b>llvmc</b></a> -
   generic and configurable compiler driver</li>
 
-<li><a href="html/llvm-ld.html"><b>llvm-ld</b></a> -
+<li><a href="/cmds/llvm-ld.html"><b>llvm-ld</b></a> -
   general purpose linker with loadable runtime optimization support</li>
 
-<li><a href="html/llvm-config.html"><b>llvm-config</b></a> - 
+<li><a href="/cmds/llvm-config.html"><b>llvm-config</b></a> - 
   print out LLVM compilation options, libraries, etc. as configured.</li>
 
-  <li><a href="html/llvm2cpp.html"><b>llvm2cpp</b></a> - convert LLVM assembly
+  <li><a href="/cmds/llvm2cpp.html"><b>llvm2cpp</b></a> - convert LLVM assembly
   into the corresponding LLVM C++ API calls to produce it</li>
 </ul>
 
@@ -90,13 +90,13 @@ options) arguments to the tool you are interested in.</p>
 <div class="doc_text">
 <ul>
 
-<li><a href="html/llvmgcc.html"><b>llvmgcc</b></a> -
+<li><a href="/cmds/llvmgcc.html"><b>llvmgcc</b></a> -
     GCC-based C front-end for LLVM
 
-<li><a href="html/llvmgxx.html"><b>llvmg++</b></a> -
+<li><a href="/cmds/llvmgxx.html"><b>llvmg++</b></a> -
     GCC-based C++ front-end for LLVM</li>
 
-<li><a href="html/stkrc.html"><b>stkrc</b></a> -
+<li><a href="/cmds/stkrc.html"><b>stkrc</b></a> -
     front-end compiler for the <a href="../Stacker.html">Stacker</a> 
     language</li>
 
@@ -115,13 +115,13 @@ options) arguments to the tool you are interested in.</p>
 
 <ul>
 
-<li><a href="html/bugpoint.html"><b>bugpoint</b></a> -
+<li><a href="/cmds/bugpoint.html"><b>bugpoint</b></a> -
     automatic test-case reducer</li>
 
-<li><a href="html/llvm-extract.html"><b>llvm-extract</b></a> -
+<li><a href="/cmds/llvm-extract.html"><b>llvm-extract</b></a> -
     extract a function from an LLVM bytecode file</li>
 
-<li><a href="html/llvm-bcanalyzer.html"><b>llvm-bcanalyzer</b></a> -
+<li><a href="/cmds/llvm-bcanalyzer.html"><b>llvm-bcanalyzer</b></a> -
     bytecode analyzer (analyzes the binary encoding itself, not the program it
     represents)</li>
 
@@ -137,7 +137,7 @@ options) arguments to the tool you are interested in.</p>
 <div class="doc_text">
 <ul>
 
-<li><a href="html/tblgen.html"><b>tblgen</b></a> -
+<li><a href="/cmds/tblgen.html"><b>tblgen</b></a> -
     target description reader and generator</li>
 
 </ul>
diff --git a/docs/index.html b/docs/index.html
index e3da6ac9b55..99aac4541b1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -67,27 +67,27 @@ those using Visual Studio on Windows.</li>
 <li><a href="DeveloperPolicy.html">Developer Policy</a> - The LLVM project's
 policy towards developers and their contributions.</li>
 
-<li><a href="/cmds/index.html">LLVM Command Guide</a> - A reference
+<li><a href="/docs/CommandGuide/index.html">LLVM Command Guide</a> - A reference
 manual for the LLVM command line utilities ("man" pages for LLVM tools).<br/>
 Current tools:
- <a href="/cmds/html/llvm-ar.html">llvm-ar</a>,
- <a href="/cmds/html/llvm-as.html">llvm-as</a>,
- <a href="/cmds/html/llvm-dis.html">llvm-dis</a>,
- <a href="/cmds/html/llvm-extract.html">llvm-extract</a>,
- <a href="/cmds/html/llvm-ld.html">llvm-ld</a>,
- <a href="/cmds/html/llvm-link.html">llvm-link</a>,
- <a href="/cmds/html/llvm-nm.html">llvm-nm</a>,
- <a href="/cmds/html/llvm-prof.html">llvm-prof</a>,
- <a href="/cmds/html/llvm-ranlib.html">llvm-ranlib</a>,
- <a href="/cmds/html/opt.html">opt</a>,
- <a href="/cmds/html/llc.html">llc</a>,
- <a href="/cmds/html/lli.html">lli</a>,
- <a href="/cmds/html/llvmc.html">llvmc</a>
- <a href="/cmds/html/llvmgcc.html">llvm-gcc</a>,
- <a href="/cmds/html/llvmgxx.html">llvm-g++</a>,
- <a href="/cmds/html/stkrc.html">stkrc</a>,
- <a href="/cmds/html/bugpoint.html">bugpoint</a>,
- <a href="/cmds/html/llvm-bcanalyzer.html">llvm-bcanalyzer</a>,
+ <a href="/cmds/llvm-ar.html">llvm-ar</a>,
+ <a href="/cmds/llvm-as.html">llvm-as</a>,
+ <a href="/cmds/llvm-dis.html">llvm-dis</a>,
+ <a href="/cmds/llvm-extract.html">llvm-extract</a>,
+ <a href="/cmds/llvm-ld.html">llvm-ld</a>,
+ <a href="/cmds/llvm-link.html">llvm-link</a>,
+ <a href="/cmds/llvm-nm.html">llvm-nm</a>,
+ <a href="/cmds/llvm-prof.html">llvm-prof</a>,
+ <a href="/cmds/llvm-ranlib.html">llvm-ranlib</a>,
+ <a href="/cmds/opt.html">opt</a>,
+ <a href="/cmds/llc.html">llc</a>,
+ <a href="/cmds/lli.html">lli</a>,
+ <a href="/cmds/llvmc.html">llvmc</a>
+ <a href="/cmds/llvmgcc.html">llvm-gcc</a>,
+ <a href="/cmds/llvmgxx.html">llvm-g++</a>,
+ <a href="/cmds/stkrc.html">stkrc</a>,
+ <a href="/cmds/bugpoint.html">bugpoint</a>,
+ <a href="/cmds/llvm-bcanalyzer.html">llvm-bcanalyzer</a>,
 </li>
 
 <li><a href="FAQ.html">Frequently Asked Questions</a> - A list of common