Merge branch 'master' into issue4894

Author: andreasabel

doc/conf.py

@@ -15,7 +15,11 @@
 
 version = "3.6.0.0"
 
-extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
+extensions = [
+    'sphinx.ext.extlinks',
+    'sphinx.ext.todo',
+    'sphinx-jsonschema'
+]
 
 templates_path = ['_templates']
 source_suffix = '.rst'

doc/developing-packages.rst

@@ -257,7 +257,7 @@ your libraries and executable sections. For example:
         Proglet
 
 Note that the ``import`` **must** be the first thing in the stanza. For more
-information see the `Common stanzas`_ section.
+information see the :ref:`common-stanzas` section.
 
 
 Building the package
@@ -356,7 +356,7 @@ of digits such as "1.0.1" or "2.0". There are a range of common
 conventions for "versioning" packages, that is giving some meaning to
 the version number in terms of changes in the package, such as
 e.g. `SemVer <http://semver.org>`__; however, for packages intended to be
-distributed via Hackage Haskell's `Package Versioning Policy`_ applies
+distributed via Hackage Haskell's `Package Versioning Policy <https://pvp.haskell.org/>`_ applies
 (see also the `PVP/SemVer FAQ section <https://pvp.haskell.org/faq/#semver>`__).
 
 The combination of package name and version is called the *package ID*

doc/setup-commands.rst

@@ -1050,7 +1050,8 @@ Miscellaneous options
         experimental. In the future we might add or remove fields, depending
         on the needs of other tooling.
 
-    :: example
+    .. code-block:: json
+
         {
             "cabal-lib-version": "<cabal lib version>",
             "compiler": {