aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan.limberg@icloud.com>2016-05-29 20:54:57 -0400
committerWaylan Limberg <waylan.limberg@icloud.com>2016-05-29 20:54:57 -0400
commitdf340160e8ab1de914b3c97a730fc9a1a6dea158 (patch)
treed4fdbe1d36abfd5d9ade47b0cb95b019868ee78f
parent534b509ea458f096baefb3df3270a9d7d36025ef (diff)
parent9e7733d078d14868172cf31e142d91b5ea92d6b8 (diff)
downloadmarkdown-df340160e8ab1de914b3c97a730fc9a1a6dea158.tar.gz
markdown-df340160e8ab1de914b3c97a730fc9a1a6dea158.tar.bz2
markdown-df340160e8ab1de914b3c97a730fc9a1a6dea158.zip
Merge pull request #478 from adamchainz/readthedocs.io
Convert readthedocs link for their .org -> .io migration for hosted projects
-rw-r--r--docs/release-2.5.txt2
-rw-r--r--docs/release-2.6.txt4
-rw-r--r--markdown/__init__.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/release-2.5.txt b/docs/release-2.5.txt
index 0c399ed..6f38122 100644
--- a/docs/release-2.5.txt
+++ b/docs/release-2.5.txt
@@ -59,7 +59,7 @@ Backwards-incompatible Changes
As the HTML would not be parsed with the above Extension, then the serializer will
escape the raw HTML, which is exactly what happens now when `safe_mode="escape"`.
-[Bleach]: http://bleach.readthedocs.org/
+[Bleach]: https://bleach.readthedocs.io/
* Positional arguments on the `markdown.Markdown()` are pending deprecation as are
all except the `text` argument on the `markdown.markdown()` wrapper function.
diff --git a/docs/release-2.6.txt b/docs/release-2.6.txt
index 747c81c..9a235c8 100644
--- a/docs/release-2.6.txt
+++ b/docs/release-2.6.txt
@@ -49,7 +49,7 @@ raw HTML, then that can be accomplished through an extension which removes HTML
As the HTML would not be parsed with the above Extension, then the serializer will
escape the raw HTML, which is exactly what happens now when `safe_mode="escape"`.
-[Bleach]: http://bleach.readthedocs.org/
+[Bleach]: https://bleach.readthedocs.io/
### Positional Arguments Deprecated
@@ -256,7 +256,7 @@ Test coverage has been improved including running [flake8]. While those changes
will not directly effect end users, the code is being better tested which will
benefit everyone.
-[flake8]: http://flake8.readthedocs.org/en/latest/
+[flake8]: https://flake8.readthedocs.io/en/latest/
Various bug fixes have been made. See the
[commit log](https://github.com/waylan/Python-Markdown/commits/master)
diff --git a/markdown/__init__.py b/markdown/__init__.py
index 1b86553..78ea4cb 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -137,7 +137,7 @@ class Markdown(object):
if 'safe_mode' in kwargs:
warnings.warn('"safe_mode" is deprecated in Python-Markdown. '
'Use an HTML sanitizer (like '
- 'Bleach http://bleach.readthedocs.org/) '
+ 'Bleach https://bleach.readthedocs.io/) '
'if you are parsing untrusted markdown text. '
'See the 2.6 release notes for more info',
DeprecationWarning)