Changeset: 65d8152b1f8d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65d8152b1f8d Removed Files: documentation/monetdbe/index.rst documentation/source/index.rst Modified Files: documentation/conf.py.in documentation/monetdbe/introduction.rst Branch: default Log Message:
solved some more sphinx errors diffs (99 lines): diff --git a/documentation/conf.py.in b/documentation/conf.py.in --- a/documentation/conf.py.in +++ b/documentation/conf.py.in @@ -48,12 +48,13 @@ master_doc = 'index' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'alabaster' -#html_theme = '@SPHINX_THEME@' +#html_theme = 'alabaster' +html_theme = '@SPHINX_THEME@' +html_theme_path = ['@SPHINX_THEME_DIR@'] # 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, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] -#html_theme_path = ['@SPHINX_THEME_DIR@'] -#htmlhelp_basename = 'YOUR_PROJECT_NAMEdoc' +#html_static_path = ['_static'] + +htmlhelp_basename = 'MonetDB' diff --git a/documentation/monetdbe/index.rst b/documentation/monetdbe/index.rst deleted file mode 100644 --- a/documentation/monetdbe/index.rst +++ /dev/null @@ -1,25 +0,0 @@ -.. monetdbe documentation master file, created by - sphinx-quickstart on Wed May 13 12:42:53 2020. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to MonetDBe's documentation! -========================================= - -.. toctree:: - :maxdepth: 2 - :caption: Contents: - - introduction - installation - monetdbe_api - examples - dev_notes - authors - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff --git a/documentation/monetdbe/introduction.rst b/documentation/monetdbe/introduction.rst --- a/documentation/monetdbe/introduction.rst +++ b/documentation/monetdbe/introduction.rst @@ -7,10 +7,10 @@ this available as a single ``libmonetdbe can be directly linked with a C application to benefit from the functionality. -``An embedded database system is a database management system (DBMS) which -is tightly integrated with an application software that requires access to stored data, -such that the database system is "hidden" from the application’s end-user -and requires little or no ongoing maintenance. `` `wikipedia <https://en.wikipedia.org/wiki/Embedded_database>` +``An embedded database system is a database management system (DBMS) which `` +``is tightly integrated with an application software that requires access to stored data, `` +``such that the database system is "hidden" from the application’s end-user `` +``and requires little or no ongoing maintenance.`` `wikipedia <https://en.wikipedia.org/wiki/Embedded_database>` The embedded database market has for a long time been dominated by traditional row-stores, often with limited SQL functionality, scalability or performance. diff --git a/documentation/source/index.rst b/documentation/source/index.rst deleted file mode 100644 --- a/documentation/source/index.rst +++ /dev/null @@ -1,24 +0,0 @@ -.. MonetDB documentation master file, created by - sphinx-quickstart on Fri Jan 17 16:06:39 2020. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to MonetDB's documentation! -=================================== - -.. toctree:: - :maxdepth: 2 - :caption: Contents: - - input - json - clients - manual_pages - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
