Skip to content

Commit

Permalink
[docs] Fixed Basic Concepts summary
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Apr 18, 2017
1 parent d481781 commit beb435b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docs/source/general/basics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Before starting, let's quickly introduce the main concepts used in netjsonconfig
being processed by the backend
* :ref:`template`: common configuration options shared among routers (eg: VPNs, SSID)
which can be passed to backends
* :ref:`multiple_templates`: possibility inherit common configuration options from more than
one template
* :ref:`multiple_templates`: possibility to inherit common configuration options
from more than one template
* :ref:`context`: variables that can be referenced from the *configuration dictionary*

.. _configuration_dictionary:
Expand Down Expand Up @@ -331,6 +331,8 @@ Will generater the following output::
option phy 'phy0'
option type 'mac80211'

.. _multiple_templates:

Multiple template inheritance
-----------------------------

Expand Down Expand Up @@ -408,8 +410,6 @@ Will generater the following output::
option phy 'phy0'
option type 'mac80211'

.. _context:

Implementation details
~~~~~~~~~~~~~~~~~~~~~~

Expand All @@ -420,7 +420,7 @@ are ``netjsonconfig.utils.merge_config`` and ``netjsonconfig.utils.merge_list``:

.. autofunction:: netjsonconfig.utils.merge_list

.. _multiple_templates:
.. _context:

Context (configuration variables)
---------------------------------
Expand Down

0 comments on commit beb435b

Please sign in to comment.