Skip to content

Commit

Permalink
Merge pull request #28 from behave/readthedocs
Browse files Browse the repository at this point in the history
Configure Read The Docs
  • Loading branch information
mixxorz authored Feb 7, 2017
2 parents e5918a6 + 59c3c77 commit 3aac60f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Release History
**Features and Improvements**

- Integration with :code:`behave` is now done via monkey patching. Including the :code:`environment.before_scenario()` and :code:`environment.after_scenario()` function calls in your :code:`environment.py` file is no longer needed.
- A new CLI option, :code:`--use-existing-database`, has been added. See the `usage docs <https://pythonhosted.org/behave-django/usage.html#behave-command-line-options>`__.
- A new CLI option, :code:`--use-existing-database`, has been added. See the `usage docs <https://behave-django.readthedocs.io/en/latest/usage.html#command-line-options>`__.

**Bugfixes**

Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ that release for Django 1.7.x and below. There is no technical disadvantage.
Documentation
-------------

- Documentation is available from `pythonhosted.org/behave-django`_
- Documentation is available from `behave-django.readthedocs.io`_
- Read more about ``behave`` at `behave.readthedocs.io`_

.. contribute-marker
Expand All @@ -53,9 +53,9 @@ Please, read the `contributing guide`_ in the docs.
.. _version 0.3.0: https://pypi.python.org/pypi/behave-django/0.3.0
.. _behave: https://pypi.python.org/pypi/behave
.. _pythonhosted.org/behave-django: https://pythonhosted.org/behave-django/
.. _behave-django.readthedocs.io: https://behave-django.readthedocs.io/en/latest/
.. _behave.readthedocs.io: https://behave.readthedocs.io/en/latest/django.html
.. _contributing guide: https://pythonhosted.org/behave-django/contribute.html
.. _contributing guide: https://behave-django.readthedocs.io/en/latest/contribute.html
.. |latest-version| image:: https://img.shields.io/pypi/v/behave-django.svg
:target: https://pypi.python.org/pypi/behave-django/
:alt: Latest version
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

# General information about the project.
project = u'behave-django'
copyright = u'2016, Mitchel Cabuloy'
copyright = u'2017, Mitchel Cabuloy'
author = u'Mitchel Cabuloy'

# The version info for the project you're documenting, acts as replacement for
Expand Down

0 comments on commit 3aac60f

Please sign in to comment.