Skip to content

Commit

Permalink
Fix documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
bikeshedder committed Feb 1, 2024
1 parent e866e1c commit 1eb7eba
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
3 changes: 2 additions & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Changelog
=========

.. include:: ../../CHANGELOG
.. include:: ../../CHANGELOG.md
:parser: myst_parser.sphinx_
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc']
extensions = ['sphinx.ext.autodoc', 'myst_parser']

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand Down
7 changes: 5 additions & 2 deletions docs/source/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ FAQ
Which Python versions are supported?
------------------------------------

It supports Python 3.4, 3.5, 3.6, 3.7 and 3.8.
It supports Python 3.8 and upwards.

The last version to support Python 2.7 is ``django-composite-field ==0.9.1``.
The last version to support Python 3.4-3.7 is ``django-composite-field ==1.1.0``.

Which Django versions are supported?
------------------------------------

It supports Django 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2 and 3.0.
It supports Django 3.2 and upwards.

The last version to support Django 1.8-3.1 is ``django-composite-field==1.1.0``.

Can I get commercial support?
-----------------------------
Expand Down
19 changes: 18 additions & 1 deletion docs/source/license.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
License
=======

.. literalinclude:: ../../LICENSE
This project is released under the following three licenses:

BSD
---

.. literalinclude:: ../../LICENSE-BSD
:language: none

MIT
---

.. literalinclude:: ../../LICENSE-MIT
:language: none

Apache 2.0
----------

.. literalinclude:: ../../LICENSE-APACHE
:language: none

0 comments on commit 1eb7eba

Please sign in to comment.