summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-08-19 00:40:12 -0700
committerSteve Piercy <web@stevepiercy.com>2018-08-19 00:40:12 -0700
commit254710cb716dccfe536b20d077e3cb79be19c6b3 (patch)
treeeecf8c2d509d5b53a30d8e990c9a152419bbf15a /docs/narr
parent5af30057aa5528eaa277603ee717b7111c147a51 (diff)
downloadpyramid-254710cb716dccfe536b20d077e3cb79be19c6b3.tar.gz
pyramid-254710cb716dccfe536b20d077e3cb79be19c6b3.tar.bz2
pyramid-254710cb716dccfe536b20d077e3cb79be19c6b3.zip
Standardize macOS capitalization
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/install.rst14
-rw-r--r--docs/narr/logging.rst2
2 files changed, 8 insertions, 8 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