From 2bd79e707697773cdbaf059d0f2316bfe2670e00 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Fri, 23 Sep 2011 23:55:14 -0400 Subject: [PATCH 1/4] DOC: Fix order of parameters passed to cp Specifying an optional parameter after required parameters raises error (at least in OS X). --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 2abac1ce..a041f834 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -44,7 +44,7 @@ coveragetable: html: api coveragetable $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DEST)/html - cp source/plots $(DEST)/html -r + cp -r source/plots $(DEST)/html @echo @echo "Build finished. The HTML pages are in build/html." From cf9c8e77654788868bdfd671cfd797dbb793bea7 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Fri, 23 Sep 2011 23:59:04 -0400 Subject: [PATCH 2/4] DOC: adjust default table styling for a cleaner look --- doc/source/themes/agogo/static/agogo.css_t | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 99d44d62..0a9e12ef 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -595,8 +595,23 @@ tt { font-size: 0.95em; } +table { + border-collapse: collapse; + margin-bottom: 1em; + margin-top: 1em; +} + +table, th, td { + border: 1px solid #ccc; +} + +th, td { + padding: 5px; +} + th { - background-color: #ede; + color: #333; + background-color: #eee; } #api-reference ul:first-child { From 70b39b80907c7d096cad6bc75b37ce3add78f649 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 24 Sep 2011 00:15:15 -0400 Subject: [PATCH 3/4] DOC: make index.html the master doc The scikits.image logo links to the master doc, which was previously set to contents.html (essentially blank). Use index.html instead. --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index c9959dd4..aa176165 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -39,7 +39,7 @@ source_suffix = '.txt' #source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'contents' +master_doc = 'index' # General information about the project. project = u'scikits.image' From 92eec1242bf6a9dd4d888ea839aca50866bc2fe0 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 24 Sep 2011 00:23:43 -0400 Subject: [PATCH 4/4] DOC: fix copyright --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index aa176165..ac788f4f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -43,7 +43,7 @@ master_doc = 'index' # General information about the project. project = u'scikits.image' -copyright = u'2009, SciPy Developers' +copyright = u'2011, scikits-image team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the