Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 39 insertions, 14 deletions

diff --git a/docs/source/conf.py b/docs/source/conf.py
index e1aa3a4..1ad4e57 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -37,7 +37,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest',
               'sphinx.ext.coverage', 'breathe']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['_templates', '_static']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -59,7 +59,7 @@ copyright = u'2010, LeafLabs, LLC'
 # The short X.Y version.
 version = '0.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.0.7'
+release = '0.0.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -69,7 +69,7 @@ release = '0.0.7'
 # non-false value, then it is used:
 #today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -88,7 +88,7 @@ with open('prolog.rst', 'r') as pr:
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
@@ -105,7 +105,7 @@ pygments_style = 'sphinx'
 #modindex_common_prefix = []
 
 # Warn about all references where the target cannot be found.
-#nitpicky = True
+nitpicky = True
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -116,26 +116,46 @@ html_theme = 'default'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+	## Sidebar placement options
+	#'stickysidebar' : 'true',
+	'rightsidebar' : 'true',
+	#'collapsiblesidebar' : 'true',
+	
+	## Color
+	'sidebarbgcolor' : '#C8C8C8',
+	'sidebarlinkcolor' : 'green',
+	'sidebartextcolor' : 'black',
+        #'sidebarbtncolor' : 'black',
+	'footerbgcolor' : 'green',
+	'relbarbgcolor' : 'green',
+	'headlinkcolor' : '#000000',
+	'linkcolor' : 'green',
+	'visitedlinkcolor' : 'green',
+	
+	## Font
+	'headfont' : 'Georgia',
+	'bodyfont' : 'Lucidia'
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+#html_theme_path = ['_static']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+html_title = project + ' v' + release + ' Documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+html_short_title = 'Index'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = '_static/img/round_logo_60x60.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = '_static/img/round_logo_32x32.ico'
 
 # 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,
@@ -144,14 +164,19 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# re-add commented line when custom template for api finished
+html_sidebars = {
+   '**': ['globaltoc.html', 'searchbox.html'],
+   #'lang/api**':['searchbox.html', 'apilist.html'], 
+}
+
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -161,7 +186,7 @@ html_static_path = ['_static']
 #html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False