doc: tweaks for new 0.3 theme

nolta · nolta · commit 317822b44a3f · 2014-03-12T16:49:03.000-05:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -21,6 +21,7 @@
 sys.path.append(juliadoc_dir)
 
 import juliadoc
+import sphinx_rtd_theme
 
 # -- General configuration -----------------------------------------------------
 
@@ -112,7 +113,8 @@
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [juliadoc.get_theme_dir()]
+html_theme_path = [juliadoc.get_theme_dir(),
+                   sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/doc/index.rst b/doc/index.rst
@@ -6,6 +6,43 @@
 .. toctree::
    :maxdepth: 1
 
-   manual/index
-   stdlib/index
-   packages/packagelist
+   manual/introduction
+   manual/getting-started
+   manual/variables
+   manual/integers-and-floating-point-numbers
+   manual/mathematical-operations
+   manual/complex-and-rational-numbers
+   manual/strings
+   manual/functions
+   manual/control-flow
+   manual/variables-and-scoping
+   manual/types
+   manual/methods
+   manual/constructors
+   manual/conversion-and-promotion
+   manual/modules
+   manual/metaprogramming
+   manual/arrays
+   manual/linear-algebra
+   manual/networking-and-streams
+   manual/parallel-computing
+   manual/running-external-programs
+   manual/calling-c-and-fortran-code
+   manual/embedding
+   manual/packages
+   manual/performance-tips
+   manual/style-guide
+   manual/faq
+   manual/noteworthy-differences
+   stdlib/base
+   stdlib/sparse
+   stdlib/linalg
+   stdlib/constants
+   stdlib/file
+   stdlib/punctuation
+   stdlib/sort
+   stdlib/pkg
+   stdlib/collections
+   stdlib/graphics
+   stdlib/test
+   stdlib/profile
diff --git a/doc/juliadoc b/doc/juliadoc
@@ -1 +1 @@
-Subproject commit 300b72cd13fe9b54b938a0b49416e4d860181d0f
+Subproject commit 557ad87b6ed932da70d5de1bdbe0f8d30a869b4b
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -1 +1,2 @@
 -e git+https://github.com/JuliaLang/JuliaDoc.git#egg=JuliaDoc
+-e git+https://github.com/snide/sphinx_rtd_theme.git#egg=sphinx_rtd_theme
diff --git a/doc/stdlib/base.rst b/doc/stdlib/base.rst
@@ -1,5 +1,9 @@
 .. currentmodule:: Base
 
+**********************
+ The Standard Library
+**********************
+
 Introduction
 ------------
 
diff --git a/doc/stdlib/index.rst b/doc/stdlib/index.rst
@@ -5,10 +5,6 @@
  The Julia Standard Library
 ############################
 
-*********
-Built-ins
-*********
-
 .. toctree::
    :maxdepth: 1
 
@@ -19,16 +15,6 @@ Built-ins
    file
    punctuation
    sort
-
-.. _built-in-modules:
-
-****************
-Built-in Modules
-****************
-
-.. toctree::
-   :maxdepth: 1
-
    pkg
    collections
    graphics

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`-e git+https://github.com/JuliaLang/JuliaDoc.git#egg=JuliaDoc`
	`2`	`+-e git+https://github.com/snide/sphinx_rtd_theme.git#egg=sphinx_rtd_theme`