diff options
| author | Jack Lloyd <[email protected]> | 2015-07-03 10:43:02 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-07-03 10:43:02 -0400 |
| commit | ae94396329f583d0999d4086936811f68bddd59b (patch) | |
| tree | 3aaaa95dc4bea25564e9c11b7a70a1ebb2f4e7b2 /src/build-data | |
| parent | 56d07f092b170bfdf4972414b0739664c8d6294a (diff) | |
Simplify the website and documentation layout.
Merge the website index, download page, algo page into the readme file
so all the important information is in one place. The readme.rst is now
also used as the website landing page.
Remove the website target on the makefile, replaced by website.sh,
since I'm the only one who ever needs to run this.
Fix various ReST formatting bugs in news.rst and the manual
Remove the old build_log which hasn't been touched in years and
refers entirely to compilers which we don't support anymore.
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/makefile/gmake.in | 19 | ||||
| -rw-r--r-- | src/build-data/sphinx/conf.py | 6 |
2 files changed, 4 insertions, 21 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index 6b22a26f3..c6ef73854 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -47,16 +47,13 @@ $(STATIC_LIB): $(LIBOBJS) $(RANLIB) $(STATIC_LIB) # Fake targets -.PHONY = clean distclean docs website install valgrind lcov +.PHONY = clean distclean docs install valgrind lcov %{gmake_coverage_in} SPHINX_CONFIG = %{sphinx_config_dir} SPHINX_OPTS = -b html -WEBSITE_DIR=%{doc_output_dir}/website -WEBSITE_SRC_DIR=%{doc_output_dir}/website-src - clean: -$(RM) %{libobj_dir}/* -$(RM) %{testobj_dir}/* @@ -77,17 +74,3 @@ docs: install: $(APP) docs $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} - -website: - rm -rf $(WEBSITE_SRC_DIR) $(WEBSITE_DIR) - mkdir -p $(WEBSITE_SRC_DIR) - cp -r %{doc_dir}/*.txt %{doc_dir}/*.rst %{doc_dir}/relnotes %{doc_dir}/website/*.rst $(WEBSITE_SRC_DIR) - ./src/scripts/combine_relnotes.py %{doc_dir}/relnotes > $(WEBSITE_SRC_DIR)/news.rst - sphinx-build -c $(SPHINX_CONFIG) -b html $(WEBSITE_SRC_DIR) $(WEBSITE_DIR) - sphinx-build -c $(SPHINX_CONFIG) -b html %{doc_dir}/manual $(WEBSITE_DIR)/manual - rm -rf $(WEBSITE_DIR)/.doctrees - rm -rf $(WEBSITE_DIR)/manual/.doctrees - rm -f $(WEBSITE_DIR)/.buildinfo - rm -f $(WEBSITE_DIR)/manual/.buildinfo - doxygen %{build_dir}/botan.doxy - mv %{doc_output_dir}/doxygen $(WEBSITE_DIR)/doxygen diff --git a/src/build-data/sphinx/conf.py b/src/build-data/sphinx/conf.py index 378cfbc65..54f42cb2e 100644 --- a/src/build-data/sphinx/conf.py +++ b/src/build-data/sphinx/conf.py @@ -112,8 +112,8 @@ html_theme_options = { 'headercolor1': 'darkblue', 'headercolor2': 'darkblue', 'textalign': 'left', - 'pagewidth': '80em', - 'documentwidth': '60em' + 'pagewidth': '70em', + 'documentwidth': '50em' } # Add any paths that contain custom themes here, relative to this directory. @@ -121,7 +121,7 @@ html_theme_options = { # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". -html_title = 'Botan' +html_title = 'Botan: Crypto and TLS for C++11' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None |