use master branch instead of develop

Author: FinalAngel

README.rst

@@ -4,19 +4,19 @@ Django Filer
 
 |pypi| |build| |coverage|
 
-**django Filer** is a file management application for django that makes 
+**django Filer** is a file management application for django that makes
 handling of files and images a breeze.
 
 .. We're using absolute image url below, because relative paths won't work on
    pypi. github would render relative paths correctly.
 
-+---------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/filer_2.png        | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/filer_3.png        |
-+---------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/detail_image.png   | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/detail_file.png    |
-+---------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/file_picker_1.png  | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/file_picker_3.png  |
-+---------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------+
++--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/filer_2.png        | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/filer_3.png        |
++--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/detail_image.png   | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/detail_file.png    |
++--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/file_picker_1.png  | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/file_picker_3.png  |
++--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
 
 
 Contributing

docs/development.rst

@@ -87,13 +87,15 @@ It is highly recommended to use the `git flow <http://github.com/nvie/gitflow>`_
 * clone your fork ``git clone [email protected]:username/django-filer.git``
 * ``cd django-filer``
 * initialize git flow: ``git flow init`` (choose all the defaults)
-* ``git flow feature start my_feature_name`` creates a new branch called ``feature/my_feature_name`` based on ``develop``
+* ``git flow feature start my_feature_name`` creates a new branch called ``feature/my_feature_name`` based on ``master``
 * ...code... ...code... ..commit.. ..commit..
 * ``git flow feature publish`` creates a new branch remotely and pushes your changes
-* navigate to the feature branch on github and create a pull request to the ``develop`` branch on ``divio/django-filer``
-* after reviewing the changes may be merged into ``develop`` and then eventually into ``master`` for the release.
+* navigate to the feature branch on github and create a pull request to the ``master`` branch on ``divio/django-filer``
+* after reviewing the changes may be merged into ``master`` for the release.
 
-If the feature branch is long running, it is good practice to merge in the current state of the ``develop`` branch into the feature branch sometimes. This keeps the feature branch up to date and reduces the likeliness of merge conflicts once it is merged back into develop.
+If the feature branch is long running, it is good practice to merge in the current state of the ``master`` branch into
+the feature branch sometimes. This keeps the feature branch up to date and reduces the likeliness of merge conflicts
+once it is merged back into master.
 
 
 .. _`PEP8`: http://www.python.org/dev/peps/pep-0008

docs/index.rst

@@ -16,28 +16,28 @@ Welcome to django-filer's documentation!
 ``django-filer`` is a file management application for django. It handles uploading
 and organizing files and images in contrib.admin.
 
-+--------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/filer_1.png | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/filer_2.png |
-+--------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/filer_1.png | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/filer_2.png |
++-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
 
 Filer detail view:
 
-+-------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/detail_image.png | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/detail_file.png |
-+-------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/detail_image.png | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/detail_file.png |
++------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------+
 
 Filer picker widget:
 
-+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/file_picker_1.png | .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/file_picker_2.png |
-+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/raw/divio/django-filer/develop/docs/_static/file_picker_3.png |                                                                                                        |
-+--------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/file_picker_1.png | .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/file_picker_2.png |
++-------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
+| .. image:: https://github.com/raw/divio/django-filer/master/docs/_static/file_picker_3.png |                                                                                                       |
++-------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
 
-Custom model fields are provided for use in 3rd party apps as a replacement for 
-the default ``FileField`` from django. Behind the scenes a ``ForeignKey`` to the 
+Custom model fields are provided for use in 3rd party apps as a replacement for
+the default ``FileField`` from django. Behind the scenes a ``ForeignKey`` to the
 File model is used.
-       
+
 Getting help
 ------------
 
@@ -49,7 +49,7 @@ Contributing
 ------------
 
 The code is hosted on github at http://github.com/divio/django-filer/
-and is fully open source. We hope you choose to help us on the project! More 
+and is fully open source. We hope you choose to help us on the project! More
 information on how to contribute can be found in `contributing`_.
 
 

docs/running_tests.rst

@@ -22,7 +22,7 @@ done for you. Tox will setup multiple virtual environments with different python
     tox -e py27-dj18 -- test filer.tests.models.FilerApiTests.test_create_folder_structure
 
 Other test runner options are also supported, see
-`djangocms-helper <https://djangocms-helper.readthedocs.io/en/develop/>`_
+`djangocms-helper <https://djangocms-helper.readthedocs.io/en/latest/>`_
 documentation for details.
 
 To speed things up a bit use `detox <http://pypi.python.org/pypi/detox/>`_. ``detox`` runs each testsuite in a