diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 07:37:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 07:37:29 (GMT) |
| commit | cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3 (patch) | |
| tree | 7cf9c5f4bd20f8074adbf7ffd5eafc79685de9b3 /Doc/reference | |
| parent | 347c3f6e346bf861b881d96f35feb5434ab8de92 (diff) | |
| parent | e73778c1ac0e58d3520b37308b970073e818fa00 (diff) | |
| download | cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.zip cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.gz cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/datamodel.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/import.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 608a878..805c73e 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -709,7 +709,7 @@ Custom classes where there are multiple inheritance paths leading back to a common ancestor. Additional details on the C3 MRO used by Python can be found in the documentation accompanying the 2.3 release at - http://www.python.org/download/releases/2.3/mro/. + https://www.python.org/download/releases/2.3/mro/. .. XXX: Could we add that MRO doc as an appendix to the language ref? diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index 645802d..146f29e 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -901,7 +901,7 @@ References The import machinery has evolved considerably since Python's early days. The original `specification for packages -<http://www.python.org/doc/essays/packages.html>`_ is still available to read, +<https://www.python.org/doc/essays/packages.html>`_ is still available to read, although some details have changed since the writing of that document. The original specification for :data:`sys.meta_path` was :pep:`302`, with |