diff options
| -rw-r--r-- | docs/narr/install.rst | 14 | ||||
| -rw-r--r-- | docs/narr/logging.rst | 2 | ||||
| -rw-r--r-- | docs/quick_tutorial/requirements.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/modwsgi/index.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki/background.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/background.rst | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 7947e6c73..80d5ea3de 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -42,16 +42,16 @@ instead. compiler and the Python header files installed for your operating system. -.. _for-mac-os-x-users: +.. _for-macos-users: -For Mac OS X Users -~~~~~~~~~~~~~~~~~~ +For macOS Users +~~~~~~~~~~~~~~~ -Python comes pre-installed on Mac OS X, but due to Apple's release cycle, it is +Python comes pre-installed on macOS, but due to Apple's release cycle, it is often out of date. Unless you have a need for a specific earlier version, it is recommended to install the latest 3.x version of Python. -You can install the latest version of Python for Mac OS X from the binaries on +You can install the latest version of Python for macOS from the binaries on `python.org <https://www.python.org/downloads/mac-osx/>`_. Alternatively, you can use the `homebrew <https://brew.sh/>`_ package manager. @@ -163,14 +163,14 @@ application, rather than being installed system wide. .. index:: single: installing on Unix - single: installing on Mac OS X + single: installing on macOS .. _installing_unix: Installing :app:`Pyramid` on a Unix System ------------------------------------------ -After installing Python as described previously in :ref:`for-mac-os-x-users` or +After installing Python as described previously in :ref:`for-macos-users` or :ref:`if-you-don-t-yet-have-a-python-interpreter-unix`, and satisfying the :ref:`requirements-for-installing-packages`, you can now install Pyramid. diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst index d5853873a..77eb42ae7 100644 --- a/docs/narr/logging.rst +++ b/docs/narr/logging.rst @@ -298,7 +298,7 @@ output to the console when we request a page: (content-type: text/plain) 00:50:53,695 INFO [wsgi] 192.168.1.111 - - [11/Aug/2011:20:09:33 -0700] "GET /hello HTTP/1.1" 404 - "-" - "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.6) Gecko/20070725 + "Mozilla/5.0 (Macintosh; U; Intel macOS; en-US; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6" To direct TransLogger to an ``access.log`` FileHandler, we need the following diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 746af8207..08ea93cb2 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -62,7 +62,7 @@ Install Python 3 See the detailed recommendation for your operating system described under :ref:`installing_chapter`. -- :ref:`for-mac-os-x-users` +- :ref:`for-macos-users` - :ref:`if-you-don-t-yet-have-a-python-interpreter-unix` - :ref:`if-you-don-t-yet-have-a-python-interpreter-windows` diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst index 66397fddf..bcedcbe3d 100644 --- a/docs/tutorials/modwsgi/index.rst +++ b/docs/tutorials/modwsgi/index.rst @@ -9,7 +9,7 @@ server. This guide will outline broad steps that can be used to get a :app:`Pyramid` application running under Apache via ``mod_wsgi``. This particular tutorial -was developed under Apple's Mac OS X platform (Snow Leopard, on a 32-bit +was developed under Apple's macOS platform (Snow Leopard, on a 32-bit Mac), but the instructions should be largely the same for all systems, delta specific path information for commands and files. diff --git a/docs/tutorials/wiki/background.rst b/docs/tutorials/wiki/background.rst index 61383c2d6..c10ab9e55 100644 --- a/docs/tutorials/wiki/background.rst +++ b/docs/tutorials/wiki/background.rst @@ -12,7 +12,7 @@ URLs to code. It can also be followed by people without any prior Python web framework experience. To code along with this tutorial, the developer will need a Unix -machine with development tools (Mac OS X with XCode, any Linux or BSD +machine with development tools (macOS with XCode, any Linux or BSD variant, and so on) *or* a Windows system of any kind. .. warning:: diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index ded6bc9c3..c14d3cb7d 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -12,7 +12,7 @@ URLs to code. It can also be followed by people without any prior Python web framework experience. To code along with this tutorial, the developer will need a Unix -machine with development tools (Mac OS X with XCode, any Linux or BSD +machine with development tools (macOS with XCode, any Linux or BSD variant, etc.) *or* a Windows system of any kind. .. note:: |