diff --git a/peps/pep-0545.rst b/peps/pep-0545.rst
index 5bdd87e683c..abe8735755c 100644
--- a/peps/pep-0545.rst
+++ b/peps/pep-0545.rst
@@ -20,10 +20,10 @@ to attract and motivate new translators and new translations.
 Translated documentation will be hosted on python.org.  Examples of
 two active translation teams:
 
-* http://docs.python.org/fr/: French
-* http://docs.python.org/ja/: Japanese
+* https://docs.python.org/fr/: French
+* https://docs.python.org/ja/: Japanese
 
-http://docs.python.org/en/ will redirect to http://docs.python.org/.
+https://docs.python.org/en/ will redirect to https://docs.python.org/.
 
 Sources of translated documentation will be hosted in the Python
 organization on GitHub: https://github.com/python/.  Contributors will
@@ -77,22 +77,22 @@ Issue tracker
 
 Considering that issues opened about translations may be written in
 the translation language, which can be considered noise but at least
-is inconsistent, issues should be placed outside `bugs.python.org
-<https://bugs.python.org/>`_ (b.p.o).
+is inconsistent, issues should not be placed in the `CPython issue tracker
+<https://github.com/python/cpython/issues/>`_.
 
 As all translation must have their own GitHub project (see `Repository
 for Po Files`_), they must use the associated GitHub issue tracker.
 
 Considering the noise induced by translation issues redacted in any
-languages which may beyond every warnings land in b.p.o, triage will
+languages which may beyond every warnings land in the issue tracker, triage will
 have to be done.  Considering that translations already exist and are
-not actually a source of noise in b.p.o, an unmanageable amount of
+not actually a source of noise in issue tracker, an unmanageable amount of
 work is not to be expected.  Considering that Xiang Zhang and Victor
 Stinner are already triaging, and Julien Palard is willing to help on
-this task, noise on b.p.o is not to be expected.
+this task, noise on issue tracker is not to be expected.
 
 Also, language team coordinators (see `Language Team`_) should help
-with triaging b.p.o by properly indicating, in the language of the
+with triaging the issue tracker by properly indicating, in the language of the
 issue author if required, the right issue tracker.
 
 
@@ -106,10 +106,10 @@ done in one branch to other branches.
 .. note::
    Translation memories are a kind of database of previously translated
    paragraphs, even removed ones.  See also `Sphinx Internationalization
-   <http://www.sphinx-doc.org/en/stable/intl.html>`_.
+   <https://www.sphinx-doc.org/en/stable/intl.html>`_.
 
-The three currently stable branches that will be translated are [12]_:
-2.7, 3.5, and 3.6.  The scripts to build the documentation of older
+The newest currently stable branch will be translated and translations
+can be propagated to other branches. The scripts to build the documentation of older
 branches needs to be modified to support translation [12]_, whereas
 these branches now only accept security-only fixes.
 
@@ -363,7 +363,7 @@ Each language team should have one coordinator responsible for:
 - Ensure contributors understand and agree with the documentation
   contribution agreement.
 - Ensure quality (grammar, vocabulary, consistency, filtering spam, ads, …).
-- Redirect issues posted on b.p.o to the correct GitHub issue tracker
+- Redirect issues posted on issue tracker to the correct GitHub issue tracker
   for the language.
 
 
@@ -606,10 +606,10 @@ References
    (https://git.afpy.org/AFPy/python-docs-fr)
 
 .. [18] French mailing list
-   (http://lists.afpy.org/mailman/listinfo/traductions)
+   (https://lists.afpy.org/mailman/listinfo/traductions)
 
 .. [19] Japanese translation
-   (http://docs.python.jp/3/)
+   (https://docs.python.jp/3/)
 
 .. [20] Japanese translation on GitHub
    (https://github.com/python-doc-ja/python-doc-ja)
@@ -627,10 +627,10 @@ References
    (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Language)
 
 .. [25] Документация Python 2.7!
-   (http://python-lab.ru/documentation/index.html)
+   (https://python-lab.ru/documentation/index.html)
 
 .. [26] Python-oktató
-   (http://web.archive.org/web/20170526080729/http://harp.pythonanywhere.com/python_doc/tutorial/index.html)
+   (https://web.archive.org/web/20170526080729/http://harp.pythonanywhere.com/python_doc/tutorial/index.html)
 
 .. [27] The Python-hu Archives
    (https://mail.python.org/pipermail/python-hu/)