diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95b9205ae3..344d793980 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ with deployments, webservers, cloud providers, etc. Code ---- -1. Complete and mail, or scan and email the corresponding Contributor Assignment Agreement: [Mayan EDMS Individual Contributor Assignment Agreement](http://mayan.readthedocs.io/en/latest/topics/caa_individual.rst) or [Mayan EDMS Entity Contributor Assignment Agreement](http://mayan.readthedocs.io/en/latest/topics/caa_entity.rst). +1. Complete and mail, or scan and email the corresponding Contributor Assignment Agreement: [Mayan EDMS Individual Contributor Assignment Agreement](https://docs.mayan-edms.com/topics/caa_individual.rst) or [Mayan EDMS Entity Contributor Assignment Agreement](https://docs.mayan-edms.com/topics/topics/caa_entity.rst). 1. Fork [the repository](http://gitlab.com/mayan-edms/mayan-edms). 1. Choose the version for which you want to develop. The code is divided in the following branches: @@ -75,5 +75,5 @@ translation. Language teams that don't see activity for a while are deleted. Code style ---------- -- Refer to the [Development](http://mayan.readthedocs.io/en/latest/topics/development.html) +- Refer to the [Development](https://docs.mayan-edms.com/topics/development.html) chapter for information and examples of the code style. diff --git a/HISTORY.rst b/HISTORY.rst index de73e72753..e526d5ffeb 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,3 +1,8 @@ +3.1.4 (2018-10-XX) +================== +* Fix the link to the documenation. Closes GitLab issue #516. + Thanks to Matthias Urlichs @smurfix for the report. + 3.1.3 (2018-09-27) ================== * Make sure template API renders in non US languages. diff --git a/README.md b/README.md index 1dbea47ea4..6f4bd412f5 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ The easiest way to use Mayan EDMS is by using the official and working before attempting to install Mayan EDMS. For the complete set of installation instructions visit the Mayan EDMS documentation -at: http://mayan.readthedocs.io/en/latest/topics/installation.html +at: https://docs.mayan-edms.com/topics/installation.html

Hardware requirements

@@ -62,7 +62,7 @@ at: http://mayan.readthedocs.io/en/latest/topics/installation.html - [Homepage](http://www.mayan-edms.com) - [Videos](https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw) -- [Documentation](http://mayan.readthedocs.io/en/stable/) +- [Documentation](https://docs.mayan-edms.com) - [Paid support](http://www.mayan-edms.com/providers/) - [Roadmap](https://gitlab.com/mayan-edms/mayan-edms/wikis/roadmap) - [Contributing](https://gitlab.com/mayan-edms/mayan-edms/blob/master/CONTRIBUTING.md) diff --git a/README.rst b/README.rst index 7bd5d447fa..6ebf7c250e 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Make sure Docker is properly installed and working before attempting to install Mayan EDMS. For the complete set of installation instructions visit the Mayan EDMS documentation -at: http://mayan.readthedocs.io/en/latest/topics/installation.html +at: https://docs.mayan-edms.com/topics/installation.html .. _Docker: https://www.docker.com/ @@ -35,7 +35,7 @@ Important links - `Homepage `__ - `Videos `__ -- `Documentation `__ +- `Documentation `__ - `Paid support `__ - `Roadmap `__ - `Contributing `__ diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py index 46244c48b3..a436040345 100644 --- a/mayan/apps/common/links.py +++ b/mayan/apps/common/links.py @@ -63,7 +63,7 @@ link_current_user_locale_profile_edit = Link( ) link_documentation = Link( icon_class=icon_documentation, tags='new_window', - text=_('Documentation'), url='https://mayan.readthedocs.io/en/stable/' + text=_('Documentation'), url='https://docs.mayan-edms.com' ) link_object_error_list = Link( kwargs=get_kwargs_factory('resolved_object'),