From 31cd9c722a1590efb8a65548fbb28efece4766c4 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 4 Dec 2022 18:22:41 +0200 Subject: [PATCH 1/2] The current OS name is macOS --- advanced-tools/clang.rst | 2 +- core-developers/experts.rst | 2 +- getting-started/pull-request-lifecycle.rst | 2 +- getting-started/setup-building.rst | 8 ++++---- index.rst | 8 ++++---- testing/coverage.rst | 2 +- testing/run-write-tests.rst | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/advanced-tools/clang.rst b/advanced-tools/clang.rst index d626c33ea7..1f693fcae3 100644 --- a/advanced-tools/clang.rst +++ b/advanced-tools/clang.rst @@ -110,7 +110,7 @@ After ``make install`` executes, the compilers will be installed in libclang_rt.lsan-x86_64.a libclang_rt.ubsan_cxx-x86_64.a libclang_rt.msan-x86_64.a libclang_rt.ubsan-x86_64.a -On Mac OS X, the libraries are installed in +On macOS, the libraries are installed in ``/usr/local/lib/clang/3.3/lib/darwin/``: .. code-block:: console diff --git a/core-developers/experts.rst b/core-developers/experts.rst index e7b80febca..ddacdf7f42 100644 --- a/core-developers/experts.rst +++ b/core-developers/experts.rst @@ -299,7 +299,7 @@ Cygwin jlt63^, stutzbach^ FreeBSD HP-UX Linux -Mac OS X ronaldoussoren, ned-deily +macOS ronaldoussoren, ned-deily NetBSD1 OS2/EMX aimacintyre^ Solaris/OpenIndiana jcea diff --git a/getting-started/pull-request-lifecycle.rst b/getting-started/pull-request-lifecycle.rst index fa6077d51d..82953d0aa8 100644 --- a/getting-started/pull-request-lifecycle.rst +++ b/getting-started/pull-request-lifecycle.rst @@ -241,7 +241,7 @@ should do to help ensure that your pull request is accepted. ``patchcheck`` is a simple automated patch checklist that guides a developer through the common patch generation checks. To run ``patchcheck``: - On *UNIX* (including Mac OS X):: + On *UNIX* (including macOS):: make patchcheck diff --git a/getting-started/setup-building.rst b/getting-started/setup-building.rst index cd0f47c220..84d18ccdb7 100644 --- a/getting-started/setup-building.rst +++ b/getting-started/setup-building.rst @@ -209,7 +209,7 @@ If you decide to :ref:`build-dependencies`, you will need to re-run both Once CPython is done building you will then have a working build that can be run in-place; ``./python`` on most machines (and what is used in all examples), ``./python.exe`` wherever a case-insensitive filesystem is used -(e.g. on OS X by default), in order to avoid conflicts with the ``Python`` +(e.g. on macOS by default), in order to avoid conflicts with the ``Python`` directory. There is normally no need to install your built copy of Python! The interpreter will realize where it is being run from and thus use the files found in the working copy. If you are worried @@ -326,7 +326,7 @@ Install dependencies ==================== This section explains how to install additional extensions (e.g. ``zlib``) -on :ref:`Linux ` and :ref:`macOs/OS X `. On Windows, +on :ref:`Linux ` and :ref:`macOS`. On Windows, extensions are already included and built automatically. .. _deps-on-linux: @@ -385,7 +385,7 @@ their dependencies:: lzma lzma-dev tk-dev uuid-dev zlib1g-dev -.. _MacOS: +.. _macOS: macOS and OS X -------------- @@ -610,7 +610,7 @@ every rule. The part of the standard library implemented in pure Python. ``Mac`` - Mac-specific code (e.g., using IDLE as an OS X application). + Mac-specific code (e.g., using IDLE as a macOS application). ``Misc`` Things that do not belong elsewhere. Typically this is varying kinds of diff --git a/index.rst b/index.rst index 1f8a2ce2c6..2a0bcd048b 100644 --- a/index.rst +++ b/index.rst @@ -27,7 +27,7 @@ instructions please see the :ref:`setup guide `. git clone https://github.com//cpython cd cpython -3. Build Python, on UNIX and Mac OS use:: +3. Build Python, on UNIX and macOS use:: ./configure --with-pydebug && make -j @@ -40,13 +40,13 @@ instructions please see the :ref:`setup guide `. See also :ref:`more detailed instructions `, :ref:`how to install and build dependencies `, and the platform-specific pages for :ref:`UNIX `, - :ref:`Mac OS `, and :ref:`Windows `. + :ref:`macOS`, and :ref:`Windows `. 4. :ref:`Run the tests `:: ./python -m test -j3 - On :ref:`most ` Mac OS X systems, replace :file:`./python` + On :ref:`most ` macOS systems, replace :file:`./python` with :file:`./python.exe`. On Windows, use :file:`python.bat`. 5. Create a new branch where your work for the issue will go, e.g.:: @@ -190,7 +190,7 @@ Key Resources * Source code * `Browse online `_ * `Snapshot of the *main* branch `_ - * `Daily OS X installer `_ + * `Daily macOS installer `_ * PEPs_ (Python Enhancement Proposals) * :ref:`help` * :ref:`developers` diff --git a/testing/coverage.rst b/testing/coverage.rst index 48c9289935..df44ef495c 100644 --- a/testing/coverage.rst +++ b/testing/coverage.rst @@ -93,7 +93,7 @@ On Unix run:: source ../cpython-venv/bin/activate pip install coverage -On :ref:`most ` Mac OS X systems run:: +On :ref:`most ` macOS systems run:: ./python.exe -m venv ../cpython-venv source ../cpython-venv/bin/activate diff --git a/testing/run-write-tests.rst b/testing/run-write-tests.rst index b1813be9c2..f9323463a9 100644 --- a/testing/run-write-tests.rst +++ b/testing/run-write-tests.rst @@ -22,7 +22,7 @@ from the root directory of your checkout (after you have ./python -m test You may need to change this command as follows throughout this section. -On :ref:`most ` Mac OS X systems, replace :file:`./python` +On :ref:`most ` macOS systems, replace :file:`./python` with :file:`./python.exe`. On Windows, use :file:`python.bat`. If using Python 2.7, replace ``test`` with ``test.regrtest``. From 20b9f082e379b4956b0ec55950a3019f10127e2c Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 8 Dec 2022 21:33:11 +0200 Subject: [PATCH 2/2] Remove old installer link - no content --- index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/index.rst b/index.rst index 2a0bcd048b..a336f9a078 100644 --- a/index.rst +++ b/index.rst @@ -190,7 +190,6 @@ Key Resources * Source code * `Browse online `_ * `Snapshot of the *main* branch `_ - * `Daily macOS installer `_ * PEPs_ (Python Enhancement Proposals) * :ref:`help` * :ref:`developers`