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/glossary.rst | |
| 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/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 09507f4..92877bd 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -76,7 +76,7 @@ Glossary BDFL Benevolent Dictator For Life, a.k.a. `Guido van Rossum - <http://www.python.org/~guido/>`_, Python's creator. + <https://www.python.org/~guido/>`_, Python's creator. binary file A :term:`file object` able to read and write @@ -141,7 +141,7 @@ Glossary CPython The canonical implementation of the Python programming language, as - distributed on `python.org <http://python.org>`_. The term "CPython" + distributed on `python.org <https://www.python.org>`_. The term "CPython" is used when necessary to distinguish this implementation from others such as Jython or IronPython. @@ -531,7 +531,7 @@ Glossary method resolution order Method Resolution Order is the order in which base classes are searched for a member during lookup. See `The Python 2.3 Method Resolution Order - <http://www.python.org/download/releases/2.3/mro/>`_. + <https://www.python.org/download/releases/2.3/mro/>`_. module An object that serves as an organizational unit of Python code. Modules |