Merge 6d3cd42 into 0d16233

CHANGES.txt

@@ -55,7 +55,7 @@ make the universe collapse!**
 
 - Add a custom traverser, which gets all nodes in a single DB query.  For deeply
   nested trees this results in drastic perfor,ance improvements.  See
-  http://kotti.readthedocs.org/en/master/api/kotti.traversal.html for details.
+  https://kotti.readthedocs.io/en/master/api/kotti.traversal.html for details.
 
 - Bugfix: copy and paste of file nodes wouldn't create a new depot file, but
   instead lead to multiple references to a single file which would cause
@@ -76,14 +76,14 @@ make the universe collapse!**
 make the universe collapse!**
 
 - Completely revised ``Depot`` integration.  See
-  http://kotti.readthedocs.org/en/latest/developing/advanced/blobs.html
+  https://kotti.readthedocs.io/en/latest/developing/advanced/blobs.html
   for details.
 
 - Make ``kotti.resources.SaveDataMixin`` more versatile in that it now supports
   a ``data_filters`` attribute (or even a completely overridden ``data``
   attribute) on subclasses.  For an example for what this is useful, see the
   new ``kotti_image`` package's readme and the Depot documentation
-  (http://depot.readthedocs.org/en/latest/database.html#custom-behaviour-in-attachments).
+  (https://depot.readthedocs.io/en/latest/database.html#custom-behaviour-in-attachments).
 
   **These changes require a database migration.**
 

README.rst

@@ -80,12 +80,12 @@ Install
 
 See `installation instructions`_.
 
-.. _installation instructions: http://kotti.readthedocs.org/en/latest/first_steps/installation.html
+.. _installation instructions: https://kotti.readthedocs.io/en/latest/first_steps/installation.html
 
 Support and Documentation
 =========================
 
-Read Kotti's extensive `documentation <http://kotti.readthedocs.org/>`_ on `Read the Docs <https://readthedocs.org/>`_.
+Read Kotti's extensive `documentation <https://kotti.readthedocs.io/>`_ on `Read the Docs <https://readthedocs.org/>`_.
 
 If you have questions or need help, you can post on our `mailing list / forum <http://groups.google.com/group/kotti>`_ or join us on IRC: `#kotti on irc.freenode.net <irc://irc.freenode.net/#kotti>`_.
 
@@ -144,5 +144,5 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |landscape| image:: https://landscape.io/github/Kotti/Kotti/master/landscape.svg?style=flat-square
 .. _landscape: https://landscape.io/github/Kotti/Kotti
 
-.. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
+.. _contribution guidelines: https://kotti.readthedocs.io/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti

docs/conf.py

@@ -120,11 +120,11 @@
 
 # -- Options for Intersphinx ---------------------------------------------------
 intersphinx_mapping = {
-    'bleach': ('http://bleach.readthedocs.org/en/latest/', None),
-    'colander': ('http://colander.readthedocs.org/en/latest/', None),
-    'deform': ('http://deform.readthedocs.org/en/latest/', None),
-    'depot': ('http://depot.readthedocs.org/en/latest/', None),
+    'bleach': ('https://bleach.readthedocs.io/en/latest/', None),
+    'colander': ('https://colander.readthedocs.io/en/latest/', None),
+    'deform': ('https://deform.readthedocs.io/en/latest/', None),
+    'depot': ('https://depot.readthedocs.io/en/latest/', None),
     'fanstatic': ('http://www.fanstatic.org/en/latest/', None),
-    'pyramid': ('http://pyramid.readthedocs.org/en/latest/', None),
-    'sqlalchemy': ('http://sqlalchemy.readthedocs.org/en/latest/', None),
+    'pyramid': ('https://pyramid.readthedocs.io/en/latest/', None),
+    'sqlalchemy': ('https://sqlalchemy.readthedocs.io/en/latest/', None),
 }

docs/contributing.rst

@@ -84,9 +84,9 @@ The rendered docs are built and hosted on readthedocs.org.
 .. _blockdiag: http://blockdiag.com
 .. _GitHub fork-a-repo help: https://help.github.com/articles/fork-a-repo
 .. _Kotti User Manual repo: https://github.com/Kotti/kotti_user_manual
-.. _Kotti User Manual: https://kotti-user-manual.readthedocs.org
+.. _Kotti User Manual: https://kotti-user-manual.readthedocs.io
 .. _Kotti: github.com/Kotti/Kotti
 .. _reStructuredText: http://sphinx-doc.org/rest.html
-.. _Selenium: http://selenium-python.readthedocs.org
-.. _Sphinx tool: http://sphinx.readthedocs.org
-.. _virtualenvwrapper system: http://virtualenvwrapper.readthedocs.org
+.. _Selenium: https://selenium-python.readthedocs.io
+.. _Sphinx tool: https://sphinx.readthedocs.io
+.. _virtualenvwrapper system: https://virtualenvwrapper.readthedocs.io

docs/developing/advanced/blobs.rst

@@ -233,4 +233,4 @@ Now you can invoke the migration with:::
 As always when dealing with migrations, make sure you backup your data first!
 
 
-.. _Depot: http://depot.readthedocs.org/en/latest/
+.. _Depot: https://depot.readthedocs.io/en/latest/

docs/developing/advanced/static-resource-management.rst

@@ -133,5 +133,5 @@ fanstatic:
 
 
 .. _Fanstatic: http://www.fanstatic.org/
-.. _as described in the corresponding Fanstatic documentation: http://fanstatic.readthedocs.org/en/latest/library.html
-.. _Fanstatic's documentation: http://fanstatic.readthedocs.org/
+.. _as described in the corresponding Fanstatic documentation: https://fanstatic.readthedocs.io/en/latest/library.html
+.. _Fanstatic's documentation: https://fanstatic.readthedocs.io/

docs/first_steps/tut-2.rst

@@ -312,5 +312,5 @@ Restart the application, take a look at the new ``Poll`` view and play around wi
 In the :ref:`next tutorial <tut-3>`, we will learn how to enable our users to actually vote for one of the ``Poll`` options.
 
 .. _SQLAlchemy: http://www.sqlalchemy.org/
-.. _Colander: http://colander.readthedocs.org/
+.. _Colander: https://colander.readthedocs.io/
 .. _scan: http://docs.pylonsproject.org/docs/pyramid/en/latest/api/config.html#pyramid.config.Configurator.scan

docs/index.rst

@@ -65,5 +65,5 @@ Future and Past
     Roadmap <https://github.com/Kotti/Kotti/milestones>
     Changelog <changes>
 
-.. _Kotti User Manual: http://kotti-user-manual.readthedocs.org/
+.. _Kotti User Manual: https://kotti-user-manual.readthedocs.io/
 .. _Roadmap: https://github.com/Kotti/Kotti/milestones

kotti/locale/Kotti.pot

@@ -48,7 +48,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -75,7 +75,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"

kotti/locale/de/LC_MESSAGES/Kotti.po

@@ -43,7 +43,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -70,7 +70,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -93,7 +93,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -117,7 +117,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Dokumentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -970,7 +970,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -995,7 +995,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1018,7 +1018,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1042,7 +1042,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Dokumentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"

kotti/locale/en/LC_MESSAGES/Kotti.po

@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"

kotti/locale/fr_FR/LC_MESSAGES/Kotti.po

@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -91,7 +91,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manuelle\n"
 "            </a>\n"
 "        </p>\n"
@@ -116,7 +116,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -971,7 +971,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -996,7 +996,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1024,7 +1024,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manuelle\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1049,7 +1049,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"

kotti/locale/it/LC_MESSAGES/Kotti.po

@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -89,7 +89,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
+"href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
@@ -110,7 +110,7 @@ msgstr ""
 "            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentazione\n"
 "            </a>\n"
 "        </p>\n"
@@ -939,7 +939,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -964,7 +964,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -990,7 +990,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
+#~ "href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
 #~ "    </div>\n"
@@ -1011,7 +1011,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentazione\n"
 #~ "            </a>\n"
 #~ "        </p>\n"

kotti/locale/ja/LC_MESSAGES/Kotti.po

@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"