diff --git a/llvm/docs/AliasAnalysis.html b/llvm/docs/AliasAnalysis.html
index 74127124a3db..638823588b32 100644
--- a/llvm/docs/AliasAnalysis.html
+++ b/llvm/docs/AliasAnalysis.html
@@ -4,7 +4,7 @@
LLVM Alias Analysis Infrastructure
-
+
diff --git a/llvm/docs/Atomics.html b/llvm/docs/Atomics.html
index fc15e27c39cd..2358f4d2ef22 100644
--- a/llvm/docs/Atomics.html
+++ b/llvm/docs/Atomics.html
@@ -4,7 +4,7 @@
LLVM Atomic Instructions and Concurrency Guide
-
+
diff --git a/llvm/docs/BitCodeFormat.html b/llvm/docs/BitCodeFormat.html
index d2088487aa76..a8777ee772b7 100644
--- a/llvm/docs/BitCodeFormat.html
+++ b/llvm/docs/BitCodeFormat.html
@@ -4,7 +4,7 @@
LLVM Bitcode File Format
-
+
LLVM Bitcode File Format
diff --git a/llvm/docs/BranchWeightMetadata.html b/llvm/docs/BranchWeightMetadata.html
index 38b87baa3b70..63c63a46a4b2 100644
--- a/llvm/docs/BranchWeightMetadata.html
+++ b/llvm/docs/BranchWeightMetadata.html
@@ -4,7 +4,7 @@
LLVM Branch Weight Metadata
-
+
diff --git a/llvm/docs/Bugpoint.html b/llvm/docs/Bugpoint.html
index 9794f2c766c1..bcd34b844997 100644
--- a/llvm/docs/Bugpoint.html
+++ b/llvm/docs/Bugpoint.html
@@ -4,7 +4,7 @@
LLVM bugpoint tool: design and usage
-
+
diff --git a/llvm/docs/CMake.html b/llvm/docs/CMake.html
index acc7fe9e8083..ff8bf30d323b 100644
--- a/llvm/docs/CMake.html
+++ b/llvm/docs/CMake.html
@@ -4,7 +4,7 @@
Building LLVM with CMake
-
+
diff --git a/llvm/docs/CodeGenerator.html b/llvm/docs/CodeGenerator.html
index c4b15dfe377e..2829a94d4bb8 100644
--- a/llvm/docs/CodeGenerator.html
+++ b/llvm/docs/CodeGenerator.html
@@ -4,7 +4,7 @@
The LLVM Target-Independent Code Generator
-
+
diff --git a/llvm/docs/GCCFEBuildInstrs.html b/llvm/docs/GCCFEBuildInstrs.html
index 6eb409b79c27..0caf9d861861 100644
--- a/llvm/docs/GCCFEBuildInstrs.html
+++ b/llvm/docs/GCCFEBuildInstrs.html
@@ -3,7 +3,7 @@
-
+
Building the LLVM GCC Front-End
diff --git a/llvm/docs/GarbageCollection.html b/llvm/docs/GarbageCollection.html
index 53ea192fc431..778297cff744 100644
--- a/llvm/docs/GarbageCollection.html
+++ b/llvm/docs/GarbageCollection.html
@@ -4,7 +4,7 @@
Accurate Garbage Collection with LLVM
-
+
diff --git a/llvm/docs/GettingStarted.html b/llvm/docs/GettingStarted.html
index 561645f1c874..9c4a314179f1 100644
--- a/llvm/docs/GettingStarted.html
+++ b/llvm/docs/GettingStarted.html
@@ -4,7 +4,7 @@
Getting Started with LLVM System
-
+
diff --git a/llvm/docs/GettingStartedVS.html b/llvm/docs/GettingStartedVS.html
index d7c1efcfea23..b0ed82409da2 100644
--- a/llvm/docs/GettingStartedVS.html
+++ b/llvm/docs/GettingStartedVS.html
@@ -4,7 +4,7 @@
Getting Started with LLVM System for Microsoft Visual Studio
-
+
diff --git a/llvm/docs/GoldPlugin.html b/llvm/docs/GoldPlugin.html
index 2c08bd031b7f..1e99a5a3d6a1 100644
--- a/llvm/docs/GoldPlugin.html
+++ b/llvm/docs/GoldPlugin.html
@@ -4,7 +4,7 @@
LLVM gold plugin
-
+
diff --git a/llvm/docs/HowToAddABuilder.html b/llvm/docs/HowToAddABuilder.html
index 0de2dacebe2b..985b30e4f7ba 100644
--- a/llvm/docs/HowToAddABuilder.html
+++ b/llvm/docs/HowToAddABuilder.html
@@ -6,7 +6,7 @@
How To Add Your Build Configuration To LLVM Buildbot Infrastructure
-
+
diff --git a/llvm/docs/HowToReleaseLLVM.html b/llvm/docs/HowToReleaseLLVM.html
index 396b4fe0ebef..382e18f320ac 100644
--- a/llvm/docs/HowToReleaseLLVM.html
+++ b/llvm/docs/HowToReleaseLLVM.html
@@ -4,7 +4,7 @@
How To Release LLVM To The Public
-
+
diff --git a/llvm/docs/HowToSubmitABug.html b/llvm/docs/HowToSubmitABug.html
index baefce3c8e46..6004beccc191 100644
--- a/llvm/docs/HowToSubmitABug.html
+++ b/llvm/docs/HowToSubmitABug.html
@@ -4,7 +4,7 @@
How to submit an LLVM bug report
-
+
diff --git a/llvm/docs/LLVMBuild.html b/llvm/docs/LLVMBuild.html
index f39a8a6a1c0f..43726a1a0ff5 100644
--- a/llvm/docs/LLVMBuild.html
+++ b/llvm/docs/LLVMBuild.html
@@ -3,7 +3,7 @@
LLVMBuild Documentation
-
+
diff --git a/llvm/docs/LangRef.html b/llvm/docs/LangRef.html
index 9989cc819716..cdf28078cce0 100644
--- a/llvm/docs/LangRef.html
+++ b/llvm/docs/LangRef.html
@@ -7,7 +7,7 @@
-
+
diff --git a/llvm/docs/Lexicon.html b/llvm/docs/Lexicon.html
index c6c3a81ab50f..f43eff5931c1 100644
--- a/llvm/docs/Lexicon.html
+++ b/llvm/docs/Lexicon.html
@@ -3,7 +3,7 @@
The LLVM Lexicon
-
+
diff --git a/llvm/docs/LinkTimeOptimization.html b/llvm/docs/LinkTimeOptimization.html
index c9c78b913c70..8063fa85103f 100644
--- a/llvm/docs/LinkTimeOptimization.html
+++ b/llvm/docs/LinkTimeOptimization.html
@@ -4,7 +4,7 @@
LLVM Link Time Optimization: Design and Implementation
-
+
diff --git a/llvm/docs/MakefileGuide.html b/llvm/docs/MakefileGuide.html
index ee0115d209c1..961b1e52d163 100644
--- a/llvm/docs/MakefileGuide.html
+++ b/llvm/docs/MakefileGuide.html
@@ -3,7 +3,7 @@
LLVM Makefile Guide
-
+
diff --git a/llvm/docs/Packaging.html b/llvm/docs/Packaging.html
index ed7cfbefd75d..51e9375e855d 100644
--- a/llvm/docs/Packaging.html
+++ b/llvm/docs/Packaging.html
@@ -4,7 +4,7 @@
Advice on Packaging LLVM
-
+
diff --git a/llvm/docs/Passes.html b/llvm/docs/Passes.html
index 840b2eff0647..ac72435d9e33 100644
--- a/llvm/docs/Passes.html
+++ b/llvm/docs/Passes.html
@@ -3,7 +3,7 @@
LLVM's Analysis and Transform Passes
-
+
diff --git a/llvm/docs/ProgrammersManual.html b/llvm/docs/ProgrammersManual.html
index 267ff9220066..854f90e28b3d 100644
--- a/llvm/docs/ProgrammersManual.html
+++ b/llvm/docs/ProgrammersManual.html
@@ -4,7 +4,7 @@
LLVM Programmer's Manual
-
+
diff --git a/llvm/docs/Projects.html b/llvm/docs/Projects.html
index da4b06452b59..54f747eea96f 100644
--- a/llvm/docs/Projects.html
+++ b/llvm/docs/Projects.html
@@ -4,7 +4,7 @@
Creating an LLVM Project
-
+
diff --git a/llvm/docs/ReleaseNotes.html b/llvm/docs/ReleaseNotes.html
index e5f3047ba11b..be67b6d025e2 100644
--- a/llvm/docs/ReleaseNotes.html
+++ b/llvm/docs/ReleaseNotes.html
@@ -3,7 +3,7 @@
-
+
LLVM 3.1 Release Notes
diff --git a/llvm/docs/SegmentedStacks.html b/llvm/docs/SegmentedStacks.html
index 16f55074732c..052003bc632b 100644
--- a/llvm/docs/SegmentedStacks.html
+++ b/llvm/docs/SegmentedStacks.html
@@ -2,7 +2,7 @@
Segmented Stacks in LLVM
-
+
diff --git a/llvm/docs/SourceLevelDebugging.html b/llvm/docs/SourceLevelDebugging.html
index 4f6e73a4491d..45f7e2282220 100644
--- a/llvm/docs/SourceLevelDebugging.html
+++ b/llvm/docs/SourceLevelDebugging.html
@@ -4,7 +4,7 @@
Source Level Debugging with LLVM
-
+
diff --git a/llvm/docs/SystemLibrary.html b/llvm/docs/SystemLibrary.html
index a3629d9dcdaf..1ef221fa2747 100644
--- a/llvm/docs/SystemLibrary.html
+++ b/llvm/docs/SystemLibrary.html
@@ -4,7 +4,7 @@
System Library
-
+
diff --git a/llvm/docs/TableGenFundamentals.html b/llvm/docs/TableGenFundamentals.html
index b401c7a49f09..b374cc587f71 100644
--- a/llvm/docs/TableGenFundamentals.html
+++ b/llvm/docs/TableGenFundamentals.html
@@ -4,7 +4,7 @@
TableGen Fundamentals
-
+
diff --git a/llvm/docs/TestSuiteMakefileGuide.html b/llvm/docs/TestSuiteMakefileGuide.html
index 876fe426cf5e..0a644d2813d3 100644
--- a/llvm/docs/TestSuiteMakefileGuide.html
+++ b/llvm/docs/TestSuiteMakefileGuide.html
@@ -4,7 +4,7 @@
LLVM test-suite Makefile Guide
-
+
diff --git a/llvm/docs/TestingGuide.html b/llvm/docs/TestingGuide.html
index acf52df8d310..1f9c9157306c 100644
--- a/llvm/docs/TestingGuide.html
+++ b/llvm/docs/TestingGuide.html
@@ -4,7 +4,7 @@
LLVM Testing Infrastructure Guide
-
+
diff --git a/llvm/docs/WritingAnLLVMBackend.html b/llvm/docs/WritingAnLLVMBackend.html
index 3d0dc3f00134..441d122f539c 100644
--- a/llvm/docs/WritingAnLLVMBackend.html
+++ b/llvm/docs/WritingAnLLVMBackend.html
@@ -4,7 +4,7 @@
Writing an LLVM Compiler Backend
-
+
diff --git a/llvm/docs/WritingAnLLVMPass.html b/llvm/docs/WritingAnLLVMPass.html
index c7cad4bed6de..af1ffa4fb7ad 100644
--- a/llvm/docs/WritingAnLLVMPass.html
+++ b/llvm/docs/WritingAnLLVMPass.html
@@ -4,7 +4,7 @@
Writing an LLVM Pass
-
+
diff --git a/llvm/docs/img/lines.gif b/llvm/docs/_static/lines.gif
similarity index 100%
rename from llvm/docs/img/lines.gif
rename to llvm/docs/_static/lines.gif
diff --git a/llvm/docs/llvm.css b/llvm/docs/_static/llvm.css
similarity index 97%
rename from llvm/docs/llvm.css
rename to llvm/docs/_static/llvm.css
index e3e6351adb38..d7b5dae5a93c 100644
--- a/llvm/docs/llvm.css
+++ b/llvm/docs/_static/llvm.css
@@ -16,7 +16,7 @@ table { text-align: center; border: 2px solid black;
margin-right: 1em; margin-bottom: 1em; }
tr, td { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; }
th { border: 2px solid gray; font-weight: bold; font-size: 105%;
- background: url("img/lines.gif");
+ background: url("lines.gif");
font-family: "Georgia,Palatino,Times,Roman,SanSerif";
text-align: center; vertical-align: middle; }
/*
@@ -24,7 +24,7 @@ th { border: 2px solid gray; font-weight: bold; font-size: 105%;
*/
/* Common for title and header */
.doc_title, .doc_section, .doc_subsection, h1, h2, h3 {
- color: black; background: url("img/lines.gif");
+ color: black; background: url("lines.gif");
font-family: "Georgia,Palatino,Times,Roman,SanSerif"; font-weight: bold;
border-width: 1px;
border-style: solid none solid none;
diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
index 324410ed561e..4d433320c46a 100644
--- a/llvm/docs/conf.py
+++ b/llvm/docs/conf.py
@@ -119,7 +119,7 @@ html_theme_path = ["."]
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/llvm/docs/llvm-theme/static/llvm.css b/llvm/docs/llvm-theme/static/llvm-theme.css
similarity index 100%
rename from llvm/docs/llvm-theme/static/llvm.css
rename to llvm/docs/llvm-theme/static/llvm-theme.css
diff --git a/llvm/docs/llvm-theme/theme.conf b/llvm/docs/llvm-theme/theme.conf
index 330fc92ffa18..573fd78aba99 100644
--- a/llvm/docs/llvm-theme/theme.conf
+++ b/llvm/docs/llvm-theme/theme.conf
@@ -1,4 +1,4 @@
[theme]
inherit = basic
-stylesheet = llvm.css
+stylesheet = llvm-theme.css
pygments_style = friendly