From 815eb3500655b55705b09a2507f89d7cc53fc44d Mon Sep 17 00:00:00 2001 From: slateny <46876382+slateny@users.noreply.github.com> Date: Sun, 9 Oct 2022 14:09:08 -0700 Subject: [PATCH 1/6] Some formatting changes for general faq --- Doc/faq/general.rst | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 81842fce4303a6..8a07eab31c2923 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -125,9 +125,9 @@ find packages of interest to you. How does the Python version numbering scheme work? -------------------------------------------------- -Python versions are numbered A.B.C or A.B. A is the major version number -- it -is only incremented for really major changes in the language. B is the minor -version number, incremented for less earth-shattering changes. C is the +Python versions are numbered "A.B.C" or "A.B". *A* is the major version number -- it +is only incremented for really major changes in the language. *B* is the minor +version number, incremented for less earth-shattering changes. *C* is the micro-level -- it is incremented for each bugfix release. See :pep:`6` for more information about bugfix releases. @@ -140,11 +140,11 @@ modules, and release candidates are frozen, making no changes except as needed to fix critical bugs. Alpha, beta and release candidate versions have an additional suffix. The -suffix for an alpha version is "aN" for some small number N, the suffix for a -beta version is "bN" for some small number N, and the suffix for a release -candidate version is "rcN" for some small number N. In other words, all versions -labeled 2.0aN precede the versions labeled 2.0bN, which precede versions labeled -2.0rcN, and *those* precede 2.0. +suffix for an alpha version is "aN" for some small number *N*, the suffix for a +beta version is "bN" for some small number *N*, and the suffix for a release +candidate version is "rcN" for some small number *N*. In other words, all versions +labeled *2.0aN* precede the versions labeled *2.0bN*, which precede versions labeled +*2.0rcN*, and *those* precede 2.0. You may also find version numbers with a "+" suffix, e.g. "2.2+". These are unreleased versions, built directly from the CPython development repository. In @@ -429,7 +429,8 @@ With the interpreter, documentation is never far from the student as they are programming. There are also good IDEs for Python. IDLE is a cross-platform IDE for Python -that is written in Python using Tkinter. PythonWin is a Windows-specific IDE. +that is written in Python using Tkinter. +`PythonWin `_ is a Windows-specific IDE. Emacs users will be happy to know that there is a very good Python mode for Emacs. All of these programming environments provide syntax highlighting, auto-indenting, and access to the interactive interpreter while coding. Consult From c84453fef248f36aebcc97116b246c63023828a8 Mon Sep 17 00:00:00 2001 From: Stanley <46876382+slateny@users.noreply.github.com> Date: Sun, 9 Oct 2022 21:42:17 -0700 Subject: [PATCH 2/6] Use list for Python versioning Co-authored-by: Ezio Melotti --- Doc/faq/general.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 8a07eab31c2923..a25619f93c4ec3 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -125,11 +125,14 @@ find packages of interest to you. How does the Python version numbering scheme work? -------------------------------------------------- -Python versions are numbered "A.B.C" or "A.B". *A* is the major version number -- it -is only incremented for really major changes in the language. *B* is the minor -version number, incremented for less earth-shattering changes. *C* is the -micro-level -- it is incremented for each bugfix release. See :pep:`6` for more -information about bugfix releases. +Python versions are numbered "A.B.C" or "A.B": +* *A* is the major version number --- it is only incremented for + really major changes in the language. +* *B* is the minor version number, incremented for less + earth-shattering changes. +* *C* is the micro-level --- it is incremented for each bugfix release. + +See :pep:`6` for more information about bugfix releases. Not all releases are bugfix releases. In the run-up to a new major release, a series of development releases are made, denoted as alpha, beta, or release From b406b67caa838dd116bf9ac71130f10539249d14 Mon Sep 17 00:00:00 2001 From: slateny <46876382+slateny@users.noreply.github.com> Date: Sun, 9 Oct 2022 23:10:40 -0700 Subject: [PATCH 3/6] New line for list, list for a/b/rc --- Doc/faq/general.rst | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index a25619f93c4ec3..b15b0f93acdcd1 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -126,11 +126,10 @@ How does the Python version numbering scheme work? -------------------------------------------------- Python versions are numbered "A.B.C" or "A.B": -* *A* is the major version number --- it is only incremented for - really major changes in the language. -* *B* is the minor version number, incremented for less - earth-shattering changes. -* *C* is the micro-level --- it is incremented for each bugfix release. + +* *A* is the major version number -- it is only incremented for really major changes in the language. +* *B* is the minor version number -- it is incremented for less earth-shattering changes. +* *C* is the micro version number -- it is incremented for each bugfix release. See :pep:`6` for more information about bugfix releases. @@ -142,10 +141,13 @@ Betas are more stable, preserving existing interfaces but possibly adding new modules, and release candidates are frozen, making no changes except as needed to fix critical bugs. -Alpha, beta and release candidate versions have an additional suffix. The -suffix for an alpha version is "aN" for some small number *N*, the suffix for a -beta version is "bN" for some small number *N*, and the suffix for a release -candidate version is "rcN" for some small number *N*. In other words, all versions +Alpha, beta and release candidate versions have an additional suffix: + +* The suffix for an alpha version is "aN" for some small number *N*. +* The suffix for a beta version is "bN" for some small number *N*. +* The suffix for a release candidate version is "rcN" for some small number *N*. + +In other words, all versions labeled *2.0aN* precede the versions labeled *2.0bN*, which precede versions labeled *2.0rcN*, and *those* precede 2.0. From 275895ac62f2a8387d81696e12c125b0c97b630c Mon Sep 17 00:00:00 2001 From: slateny <46876382+slateny@users.noreply.github.com> Date: Sun, 9 Oct 2022 23:12:00 -0700 Subject: [PATCH 4/6] Line wrap for 80 chars --- Doc/faq/general.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index b15b0f93acdcd1..2e91922c9fe814 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -127,8 +127,10 @@ How does the Python version numbering scheme work? Python versions are numbered "A.B.C" or "A.B": -* *A* is the major version number -- it is only incremented for really major changes in the language. -* *B* is the minor version number -- it is incremented for less earth-shattering changes. +* *A* is the major version number -- it is only incremented for really major + changes in the language. +* *B* is the minor version number -- it is incremented for less earth-shattering + changes. * *C* is the micro version number -- it is incremented for each bugfix release. See :pep:`6` for more information about bugfix releases. From 41e2b122b152b7ed6d226be2677d43e2491706be Mon Sep 17 00:00:00 2001 From: slateny <46876382+slateny@users.noreply.github.com> Date: Sun, 9 Oct 2022 23:13:17 -0700 Subject: [PATCH 5/6] More line wrap --- Doc/faq/general.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 2e91922c9fe814..aac570a9cdcf92 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -149,9 +149,8 @@ Alpha, beta and release candidate versions have an additional suffix: * The suffix for a beta version is "bN" for some small number *N*. * The suffix for a release candidate version is "rcN" for some small number *N*. -In other words, all versions -labeled *2.0aN* precede the versions labeled *2.0bN*, which precede versions labeled -*2.0rcN*, and *those* precede 2.0. +In other words, all versions labeled *2.0aN* precede the versions labeled +*2.0bN*, which precede versions labeled *2.0rcN*, and *those* precede 2.0. You may also find version numbers with a "+" suffix, e.g. "2.2+". These are unreleased versions, built directly from the CPython development repository. In From d88cc0ff00db92eb961cef5a0f4a8a4d3816620b Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 12 Oct 2022 17:52:43 +0200 Subject: [PATCH 6/6] Remove PythonWin mention. Co-authored-by: C.A.M. Gerlach --- Doc/faq/general.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index aac570a9cdcf92..489bca76432d85 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -436,7 +436,6 @@ programming. There are also good IDEs for Python. IDLE is a cross-platform IDE for Python that is written in Python using Tkinter. -`PythonWin `_ is a Windows-specific IDE. Emacs users will be happy to know that there is a very good Python mode for Emacs. All of these programming environments provide syntax highlighting, auto-indenting, and access to the interactive interpreter while coding. Consult