Merge branch 'develop'

Akaflieg-Freiburg · Jan 8, 2024 · 51e92c7 · 51e92c7
2 parents 747935a + 832f627
commit 51e92c7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/01-gettingStarted/03-firstFlight.rst b/01-gettingStarted/03-firstFlight.rst
@@ -126,4 +126,4 @@ Go Flying!
 **Enroute Flight Navigation** is designed to be simple.  We think that you are
 now ready to take the app on its first flight.  There are of course many more
 things that you can do.  Play with the app and have a look at the next section
-:ref:`sec-steps`.
+:ref:`sec-tutorialBasic`.
diff --git a/02-tutorialBasic.rst b/02-tutorialBasic.rst
@@ -1,3 +1,5 @@
+.. _sec-tutorialBasic:
+
 Basic Use
 #########
 

diff --git a/03-tutorialAdvanced/03-airspace.rst b/03-tutorialAdvanced/03-airspace.rst
@@ -12,12 +12,9 @@ agreement.
 Airspaces defined in imported data will be shown in addition to the standard
 aviation maps included with **Enroute Flight Navigation**.
 
-
-Import Airspace Data
---------------------
-
-Transfer the OpenAir file to your device and open the file on your device.  The
-Section :ref:`importData` explains the process in detail.
+To import airspace data, transfer the OpenAir file to your device and open the
+file on your device.  The Section :ref:`importData` explains the process in
+detail.
 
 To view and manage your maps, open the main menu and go to "Library/Maps and
 Data".
diff --git a/05-referenceWorkflow.rst b/05-referenceWorkflow.rst
@@ -1,8 +1,7 @@
 User Interface: Workflows
 #########################
 
-The following tutorials walk you through more advanced functionality of
-**Enroute Flight Navigation**.  
+This part of the manual describes procedures that are used throughout the app.
 
 .. toctree::
    :maxdepth: 1

diff --git a/06-referenceTechnology.rst b/06-referenceTechnology.rst
@@ -1,6 +1,8 @@
 Technology
 ##########
 
+This part of the manual describes technical aspects of **Enroute Flight
+Navigation**.
 
 .. toctree::
    :maxdepth: 1

diff --git a/07-appendix/01-dataSources.rst b/07-appendix/01-dataSources.rst
@@ -120,7 +120,7 @@ Base Maps
 .........
 
 Our base maps are generated from `Open Streetmap
-<https://www.openstreetmap.org>`_ data.
+<https://www.openstreetmap.org>`_ data. 
 
 
 Terrain maps

diff --git a/07-appendix/02-license.rst b/07-appendix/02-license.rst
@@ -1,5 +1,5 @@
-Software Licenses
-=================
+Software and Data Licenses
+==========================
 
 
 Enroute Flight Navigation
@@ -610,27 +610,28 @@ at your choice, any later version of this license.
     return for a fee.
 
 
-Geographic maps
+Geographic Maps
 ---------------
 
 As a flight navigation program, **Enroute Flight Navigation** heavily relies on
 geographic map data.  The geographic maps are not included in the program, but
 are downloaded at runtime.  They are compiled from the following sources.
 
-- The base maps are modified data from `OpenMapTiles
-  <https://github.com/openmaptiles/openmaptiles>`_, published under a `CC-BY 4.0
-  design license
-  <https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md>`_.
+- The base maps are generated from OpenStreetMap open data, licensed under the
+  `Open Data Commons Open Database License
+  <https://www.openstreetmap.org/copyright/en>`_. 
+
 - The aviation maps contain data from `openAIP <http://www.openaip.net>`_,
   licensed under a `CC BY-NC-SA license
   <https://creativecommons.org/licenses/by-nc-sa/3.0/>`_.
+
 - The aviation maps contain data from `open flightmaps
   <https://www.openflightmaps.org/>`_, licensed under the `OFMA General Users´
   License <https://www.openflightmaps.org/live/downloads/20150306-LCN.pdf>`_.
 
 
 
-Software and data included in the program
+Software and Data Included in the Program
 -----------------------------------------
 
 Depending on platform and configuration, the following components might be

diff --git a/index.rst b/index.rst
@@ -31,7 +31,7 @@ Consult the `homepage <https://akaflieg-freiburg.github.io/enroute>`_ of
 
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    01-gettingStarted
 
@@ -43,7 +43,7 @@ Consult the `homepage <https://akaflieg-freiburg.github.io/enroute>`_ of
 
 .. toctree::
    :caption: Tutorials
-   :maxdepth: 2
+   :maxdepth: 1
 
    02-tutorialBasic
    03-tutorialAdvanced
@@ -55,7 +55,7 @@ Consult the `homepage <https://akaflieg-freiburg.github.io/enroute>`_ of
 
 .. toctree::
    :caption: Reference Manual
-   :maxdepth: 2
+   :maxdepth: 1
 
    04-referencePages
    05-referenceWorkflow
@@ -68,6 +68,6 @@ Consult the `homepage <https://akaflieg-freiburg.github.io/enroute>`_ of
 
 .. toctree::
    :caption: Appendix
-   :maxdepth: 2
+   :maxdepth: 1
 
    07-appendix