Skip to content

Commit 208fa03

Browse files
committed
Merge branch 'master' into enable-nit-picky-mode
2 parents 2dbf10b + 2194d90 commit 208fa03

12 files changed

+149
-263
lines changed

pep-0419.txt

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -506,27 +506,15 @@ References
506506
https://github.com/sampsyo/bluelet
507507

508508
.. [3] Twisted: inlineCallbacks
509-
http://twistedmatrix.com/documents/8.1.0/api/twisted.internet.defer.html
509+
https://twisted.org/documents/8.1.0/api/twisted.internet.defer.html
510510

511-
.. [4] Original discussion
512-
https://mail.python.org/pipermail/python-ideas/2012-April/014705.html
513-
514-
.. [5] Issue #14730: Implementation of the PEP 419
515-
http://bugs.python.org/issue14730
511+
[4] Original discussion
512+
\ https://mail.python.org/pipermail/python-ideas/2012-April/014705.html
516513

514+
[5] Implementation of PEP 419
515+
\ https://github.com/python/cpython/issues/58935
517516

518517
Copyright
519518
=========
520519

521520
This document has been placed in the public domain.
522-
523-
524-
525-
..
526-
Local Variables:
527-
mode: indented-text
528-
indent-tabs-mode: nil
529-
sentence-end-double-space: t
530-
fill-column: 70
531-
coding: utf-8
532-
End:

pep-0545.txt

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PEP: 545
22
Title: Python Documentation Translations
3-
Version: $Revision$
4-
Last-Modified: $Date$
53
Author: Julien Palard <[email protected]>,
64
Inada Naoki <[email protected]>,
75
Victor Stinner <[email protected]>
@@ -330,7 +328,7 @@ involves creativity in the expression of the ideas.
330328
There's multiple solutions, quoting Van Lindberg from the PSF asked
331329
about the subject:
332330

333-
1. Docs should either have the copyright assigned or be under CCO. A
331+
1. Docs should either have the copyright assigned or be under CCO. A
334332
permissive software license (like Apache or MIT) would also get the
335333
job done, although it is not quite fit for task.
336334

@@ -548,19 +546,14 @@ the translation can be added to the language switcher.
548546
Previous Discussions
549547
====================
550548

551-
- `[Python-ideas] Cross link documentation translations (January, 2016)`_
552-
- `[Python-ideas] Cross link documentation translations (January, 2016)`_
553-
- `[Python-ideas] https://docs.python.org/fr/ ? (March 2016)`_
549+
`[Python-ideas] Cross link documentation translations (January, 2016)
550+
<https://mail.python.org/pipermail/python-ideas/2016-January/038010.html>`__
554551

552+
`[Python-Dev] Translated Python documentation (February 2016)
553+
<https://mail.python.org/pipermail/python-dev/2017-February/147416.html>`__
555554

556-
.. _[Python-ideas] Cross link documentation translations (January, 2016):
557-
https://mail.python.org/pipermail/python-ideas/2016-January/038010.html
558-
559-
.. _[Python-Dev] Translated Python documentation (February 2016):
560-
https://mail.python.org/pipermail/python-dev/2017-February/147416.html
561-
562-
.. _[Python-ideas] https://docs.python.org/fr/ ? (March 2016):
563-
https://mail.python.org/pipermail/python-ideas/2016-March/038879.html
555+
`[Python-ideas] https://docs.python.org/fr/ ? (March 2016)
556+
<https://mail.python.org/pipermail/python-ideas/2016-March/038879.html>`__
564557

565558

566559
References
@@ -570,8 +563,8 @@ References
570563
Python documents?
571564
(https://mail.python.org/pipermail/i18n-sig/2013-September/002130.html)
572565

573-
.. [2] [Doc-SIG] Localization of Python docs
574-
(https://mail.python.org/pipermail/doc-sig/2013-September/003948.html)
566+
[2] [Doc-SIG] Localization of Python docs
567+
\ (https://mail.python.org/pipermail/doc-sig/2013-September/003948.html)
575568

576569
.. [4] IETF language tag
577570
(https://en.wikipedia.org/wiki/IETF_language_tag)
@@ -580,7 +573,7 @@ References
580573
(https://www.gnu.org/software/gettext/manual/html_node/Locale-Names.html)
581574

582575
.. [6] Semantic URL: Slug
583-
(https://en.wikipedia.org/wiki/Semantic_URL#Slug)
576+
(https://en.wikipedia.org/wiki/Clean_URL#Slug)
584577

585578
.. [8] Docsbuild-scripts GitHub repository
586579
(https://github.com/python/docsbuild-scripts/)
@@ -609,8 +602,8 @@ References
609602
.. [16] French translation
610603
(https://www.afpy.org/doc/python/)
611604

612-
.. [17] French translation on GitHub
613-
(https://github.com/AFPy/python_doc_fr)
605+
.. [17] French translation on Gitea
606+
(https://git.afpy.org/AFPy/python-docs-fr)
614607

615608
.. [18] French mailing list
616609
(http://lists.afpy.org/mailman/listinfo/traductions)
@@ -622,7 +615,7 @@ References
622615
(https://github.com/python-doc-ja/python-doc-ja)
623616

624617
.. [21] Spanish translation
625-
(http://docs.python.org.ar/tutorial/3/index.html)
618+
(https://docs.python.org/es/3/tutorial/index.html)
626619

627620
.. [22] [Python-Dev] Translated Python documentation: doc vs docs
628621
(https://mail.python.org/pipermail/python-dev/2017-February/147472.html)
@@ -637,7 +630,7 @@ References
637630
(http://python-lab.ru/documentation/index.html)
638631

639632
.. [26] Python-oktató
640-
(http://harp.pythonanywhere.com/python_doc/tutorial/index.html)
633+
(http://web.archive.org/web/20170526080729/http://harp.pythonanywhere.com/python_doc/tutorial/index.html)
641634

642635
.. [27] The Python-hu Archives
643636
(https://mail.python.org/pipermail/python-hu/)
@@ -650,15 +643,3 @@ Copyright
650643
=========
651644

652645
This document has been placed in the public domain.
653-
654-
655-
656-
657-
..
658-
Local Variables:
659-
mode: indented-text
660-
indent-tabs-mode: nil
661-
sentence-end-double-space: t
662-
fill-column: 70
663-
coding: utf-8
664-
End:

pep-0571.rst

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PEP: 571
22
Title: The manylinux2010 Platform Tag
3-
Version: $Revision$
4-
Last-Modified: $Date$
53
Author: Mark Williams <[email protected]>,
64
Geoffrey Thomas <[email protected]>,
75
Thomas Kluyver <[email protected]>
@@ -61,7 +59,7 @@ from CentOS 6 and that the ``manylinux`` toolchain, PyPI, and ``pip``
6159
be updated to support it.
6260

6361
This was originally proposed as ``manylinux2``, but the versioning has
64-
been changed to use calendar years (also known as CalVer [23]_). This
62+
been changed to use calendar years (also known as CalVer [22]_). This
6563
makes it easier to define future *manylinux* tags out of order: for
6664
example, a hypothetical ``manylinux2017`` standard may be defined via
6765
a new PEP before ``manylinux2014``, or a ``manylinux2007`` standard
@@ -238,11 +236,11 @@ distribution's upcoming releases. [17]_ If Travis CI, for example,
238236
begins running jobs under
239237
a kernel that does not provide the ``vsyscall`` interface, Python
240238
packagers will not be able to use our Docker images there to build
241-
``manylinux`` wheels. [19]_
239+
``manylinux`` wheels. [18]_
242240

243241
We have derived a patch from the ``glibc`` git repository that
244242
backports the removal of all dependencies on ``vsyscall`` to the
245-
version of ``glibc`` included with our ``manylinux2010`` image. [20]_
243+
version of ``glibc`` included with our ``manylinux2010`` image. [19]_
246244
Rebuilding ``glibc``, and thus building ``manylinux2010`` image itself,
247245
still requires a host kernel that provides the ``vsyscall`` mechanism,
248246
but the resulting image can be both run on hosts that provide it and
@@ -257,7 +255,7 @@ Auditwheel
257255
----------
258256

259257
The ``auditwheel`` tool has also been updated to produce
260-
``manylinux2010`` wheels. [21]_ Its behavior and purpose are otherwise
258+
``manylinux2010`` wheels. [20]_ Its behavior and purpose are otherwise
261259
unchanged from :pep:`513`.
262260

263261

@@ -305,7 +303,7 @@ this PEP. As a result, ``manylinux1`` wheels are considered
305303
``manylinux2010`` wheels. A ``pip`` that recognizes the ``manylinux2010``
306304
platform tag will thus install ``manylinux1`` wheels for
307305
``manylinux2010`` platforms -- even when explicitly set -- when no
308-
``manylinux2010`` wheels are available. [22]_
306+
``manylinux2010`` wheels are available. [21]_
309307

310308
PyPI Support
311309
============
@@ -358,28 +356,18 @@ References
358356
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852620)
359357
.. [17] [Wheel-builders] Heads-up re: new kernel configurations breaking the manylinux docker image
360358
(https://mail.python.org/pipermail/wheel-builders/2016-December/000239.html)
361-
.. [18] No longer used
362-
.. [19] Travis CI
359+
.. [18] Travis CI
363360
(https://travis-ci.org/)
364-
.. [20] remove-vsyscall.patch
361+
.. [19] remove-vsyscall.patch
365362
https://github.com/markrwilliams/manylinux/commit/e9493d55471d153089df3aafca8cfbcb50fa8093#diff-3eda4130bdba562657f3ec7c1b3f5720
366-
.. [21] auditwheel manylinux2 branch
363+
.. [20] auditwheel manylinux2 branch
367364
(https://github.com/markrwilliams/auditwheel/tree/manylinux2)
368-
.. [22] pip manylinux2 branch
365+
.. [21] pip manylinux2 branch
369366
https://github.com/markrwilliams/pip/commits/manylinux2
370-
.. [23] Calendar Versioning
367+
.. [22] Calendar Versioning
371368
http://calver.org/
372369
373370
Copyright
374371
=========
375372

376373
This document has been placed into the public domain.
377-
378-
..
379-
Local Variables:
380-
mode: indented-text
381-
indent-tabs-mode: nil
382-
sentence-end-double-space: t
383-
fill-column: 70
384-
coding: utf-8
385-
End:

0 commit comments

Comments
 (0)