summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py5
-rw-r--r--docs/development/changelog_wrapper.rst1
-rw-r--r--docs/index.rst17
-rw-r--r--docs/navit.pngbin367917 -> 367957 bytes
-rw-r--r--docs/requirements.txt1
5 files changed, 16 insertions, 8 deletions
diff --git a/docs/conf.py b/docs/conf.py
index a8b73e774..99af94fe4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,11 @@
# -*- coding: utf-8 -*-
from datetime import datetime
+extensions = [
+ 'm2r',
+ 'sphinx_rtd_theme',
+]
+
source_suffix = '.rst'
master_doc = 'index'
diff --git a/docs/development/changelog_wrapper.rst b/docs/development/changelog_wrapper.rst
new file mode 100644
index 000000000..071c46823
--- /dev/null
+++ b/docs/development/changelog_wrapper.rst
@@ -0,0 +1 @@
+.. mdinclude :: ../../CHANGELOG.md
diff --git a/docs/index.rst b/docs/index.rst
index 9a5600a46..80d7260a2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,15 +22,15 @@ Navit is highly customizable, from map layouts and on-screen display to the deta
.. image:: navit.png
.. toctree::
- :hidden:
- :glob:
- :numbered:
- :maxdepth: 2
- :caption: Navit's user manual
+ :hidden:
+ :glob:
+ :numbered:
+ :maxdepth: 2
+ :caption: Navit's user manual
- basic_configuration
- maps
- configuration/index
+ basic_configuration
+ maps
+ configuration/index
.. Indices and tables
@@ -47,6 +47,7 @@ Navit is highly customizable, from map layouts and on-screen display to the deta
:glob:
:caption: Navit's developer documentation
+ development/changelog_wrapper
development/programming_guidelines
development/commit_guidelines
development/linux_development
diff --git a/docs/navit.png b/docs/navit.png
index 242aed8e4..81f3239d6 100644
--- a/docs/navit.png
+++ b/docs/navit.png
Binary files differ
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..142a838f8
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+m2r