diff options
| -rwxr-xr-x | configure.py | 5 | ||||
| -rw-r--r-- | doc/relnotes/1_11_5.rst | 2 | ||||
| -rw-r--r-- | src/build-data/sphinx/conf.py (renamed from doc/conf.py) | 21 | ||||
| -rw-r--r-- | src/build-data/sphinx/disqus/page.html (renamed from doc/_sphinx/disqus/page.html) | 0 | ||||
| -rw-r--r-- | src/build-data/sphinx/templates/layout.html (renamed from doc/_sphinx/templates/layout.html) | 0 | ||||
| -rw-r--r-- | src/scripts/indent.el (renamed from doc/indent.el) | 0 |
6 files changed, 6 insertions, 22 deletions
diff --git a/configure.py b/configure.py index 2b1a330ee..50c3f8ffe 100755 --- a/configure.py +++ b/configure.py @@ -158,8 +158,9 @@ class BuildConfigurationInformation(object): def build_doc_commands(): if options.with_sphinx: - yield 'sphinx-build $(SPHINX_OPTS) -b html doc %s' % ( - self.manual_dir) + sphinx_config_dir = os.path.join(options.build_data, 'sphinx') + yield 'sphinx-build -c %s $(SPHINX_OPTS) -b html doc %s' % ( + sphinx_config_dir, self.manual_dir) else: yield '$(COPY) doc/*.rst %s' % (self.manual_dir) diff --git a/doc/relnotes/1_11_5.rst b/doc/relnotes/1_11_5.rst index 0d942200a..b327bfd82 100644 --- a/doc/relnotes/1_11_5.rst +++ b/doc/relnotes/1_11_5.rst @@ -29,7 +29,7 @@ Version 1.11.5, 2013-11-10 * All existing cipher mode implementations (such as CBC and XTS) have been converted from filters to using the interface previously provided by - :ref:`AEAD modes <aead_modes>` which allows for in-place message + AEAD modes which allows for in-place message processing. Code which directly references the filter objects will break, but an adaptor filter allows usage through get_cipher as usual. diff --git a/doc/conf.py b/src/build-data/sphinx/conf.py index 280e23095..0f15afafc 100644 --- a/doc/conf.py +++ b/src/build-data/sphinx/conf.py @@ -23,24 +23,7 @@ def check_for_tag(tag): is_website_build = check_for_tag('website') use_disqus = is_website_build and check_for_tag('disqus') -needs_sphinx = '1.0' - -""" -Assert that we are running under Sphinx 1.0.7 or later. Earlier -versions have bugs in the C++ domain that cause crashes. And -needs_sphinx only allows us to assert needing a particular major/minor -version. -""" -def check_sphinx_version(): - import sphinx - - version = map(int, sphinx.__version__.split('.')) - if version[0] == 1 and version[1] == 0 and version[2] < 7: - # Exit rather than throwing to avoid a confusing backtrace - print "This Sphinx is too old - upgrade to at least 1.0.7" - sys.exit(1) - -check_sphinx_version() +needs_sphinx = '1.1' extensions = ['sphinx.ext.extlinks'] @@ -77,7 +60,7 @@ source_encoding = 'utf-8-sig' master_doc = 'contents' project = u'botan' -copyright = u'2000-2012, Jack Lloyd' +copyright = u'2000-2014, Jack Lloyd' version = '%d.%d' % (botan_version.release_major, botan_version.release_minor) diff --git a/doc/_sphinx/disqus/page.html b/src/build-data/sphinx/disqus/page.html index 56e102044..56e102044 100644 --- a/doc/_sphinx/disqus/page.html +++ b/src/build-data/sphinx/disqus/page.html diff --git a/doc/_sphinx/templates/layout.html b/src/build-data/sphinx/templates/layout.html index c907c7597..c907c7597 100644 --- a/doc/_sphinx/templates/layout.html +++ b/src/build-data/sphinx/templates/layout.html diff --git a/doc/indent.el b/src/scripts/indent.el index 7fa2540b0..7fa2540b0 100644 --- a/doc/indent.el +++ b/src/scripts/indent.el |