summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-08-19 00:36:46 -0700
committerSteve Piercy <web@stevepiercy.com>2018-08-19 00:36:46 -0700
commit5af30057aa5528eaa277603ee717b7111c147a51 (patch)
tree72af1e5a928cd8c99f86d109e6e51eff58253e79 /docs/narr
parent72eb0abbdb6b2c56c7b731edb7006416316b9790 (diff)
downloadpyramid-5af30057aa5528eaa277603ee717b7111c147a51.tar.gz
pyramid-5af30057aa5528eaa277603ee717b7111c147a51.tar.bz2
pyramid-5af30057aa5528eaa277603ee717b7111c147a51.zip
Standardize Unix capitalization
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/firstapp.rst2
-rw-r--r--docs/narr/i18n.rst4
-rw-r--r--docs/narr/install.rst14
-rw-r--r--docs/narr/project.rst18
-rw-r--r--docs/narr/templates.rst4
-rw-r--r--docs/narr/upgrading.rst2
-rw-r--r--docs/narr/viewconfig.rst2
7 files changed, 23 insertions, 23 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 7019d4126..5eb067fe2 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -25,7 +25,7 @@ When this code is inserted into a Python script named ``helloworld.py`` and
executed by a Python interpreter which has the :app:`Pyramid` software
installed, an HTTP server is started on TCP port 8080.
-On UNIX:
+On Unix:
.. code-block:: bash
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 329193239..da0f714f5 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -256,10 +256,10 @@ In order for the commands related to working with ``gettext`` translation files
to work properly, you will need to have :term:`Lingua` and :term:`Gettext`
installed into the same environment in which :app:`Pyramid` is installed.
-Installation on UNIX
+Installation on Unix
++++++++++++++++++++
-Gettext is often already installed on UNIX systems. You can check if it is
+Gettext is often already installed on Unix systems. You can check if it is
installed by testing if the ``msgfmt`` command is available. If it is not
available you can install it through the packaging system from your OS; the
package name is almost always ``gettext``. For example on a Debian or Ubuntu
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c36f4f391..7947e6c73 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -24,8 +24,8 @@ the following sections.
As of this writing, :app:`Pyramid` is tested against Python 2.7,
Python 3.4, Python 3.5, Python 3.6, and PyPy.
-:app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux,
-Mac OS X, and FreeBSD, as well as on Windows platforms. It is also known to
+:app:`Pyramid` is known to run on all popular Unix-like systems such as Linux,
+macOS, and FreeBSD, as well as on Windows platforms. It is also known to
run on :term:`PyPy` (1.9+).
:app:`Pyramid` installation does not require the compilation of any C code.
@@ -67,12 +67,12 @@ If you use an installer for your Python, then you can skip to the section
.. _if-you-don-t-yet-have-a-python-interpreter-unix:
-If You Don't Yet Have a Python Interpreter (UNIX)
+If You Don't Yet Have a Python Interpreter (Unix)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If your system doesn't have a Python interpreter, and you're on UNIX, you can
+If your system doesn't have a Python interpreter, and you're on Unix, you can
either install Python using your operating system's package manager *or* you
-can install Python from source fairly easily on any UNIX system that has
+can install Python from source fairly easily on any Unix system that has
development tools.
.. seealso:: See the official Python documentation :ref:`Using Python on Unix
@@ -162,12 +162,12 @@ application, rather than being installed system wide.
.. index::
- single: installing on UNIX
+ single: installing on Unix
single: installing on Mac OS X
.. _installing_unix:
-Installing :app:`Pyramid` on a UNIX System
+Installing :app:`Pyramid` on a Unix System
------------------------------------------
After installing Python as described previously in :ref:`for-mac-os-x-users` or
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 4940543f6..ee40f212e 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -103,7 +103,7 @@ If prompted for the first item, accept the default ``yes`` by hitting return.
We then run through the following commands.
-On UNIX:
+On Unix:
.. code-block:: bash
@@ -188,7 +188,7 @@ in the ``bin`` (or ``Scripts`` on Windows) directory of your virtual Python
environment. Your terminal's current working directory *must* be the newly
created project directory.
-On UNIX:
+On Unix:
.. code-block:: bash
@@ -200,7 +200,7 @@ Or on Windows:
%VENV%\Scripts\pip install -e .
-Elided output from a run of this command on UNIX is shown below:
+Elided output from a run of this command on Unix is shown below:
.. code-block:: bash
@@ -226,7 +226,7 @@ Running the Tests for Your Application
To run unit tests for your application, you must first install the testing
dependencies.
-On UNIX:
+On Unix:
.. code-block:: bash
@@ -242,7 +242,7 @@ Once the testing requirements are installed, then you can run the tests using
the ``py.test`` command that was just installed in the ``bin`` directory of
your virtual environment.
-On UNIX:
+On Unix:
.. code-block:: bash
@@ -254,7 +254,7 @@ On Windows:
%VENV%\Scripts\py.test -q
-Here's sample output from a test run on UNIX:
+Here's sample output from a test run on Unix:
.. code-block:: bash
@@ -307,7 +307,7 @@ Once a project is installed for development, you can run the application it
represents using the ``pserve`` command against the generated configuration
file. In our case, this file is named ``development.ini``.
-On UNIX:
+On Unix:
.. code-block:: bash
@@ -319,7 +319,7 @@ On Windows:
%VENV%\Scripts\pserve development.ini
-Here's sample output from a run of ``pserve`` on UNIX:
+Here's sample output from a run of ``pserve`` on Unix:
.. code-block:: bash
@@ -394,7 +394,7 @@ module your project uses will cause the server to restart. This typically
makes development easier, as changes to Python code made within a
:app:`Pyramid` application is not put into effect until the server restarts.
-For example, on UNIX:
+For example, on Unix:
.. code-block:: text
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index bc3e913ff..1ccab9d3c 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -52,7 +52,7 @@ directory containing the file which defines the view configuration. In this
case, this is the directory containing the file that defines the
``sample_view`` function. Although a renderer path is usually just a simple
relative pathname, a path named as a renderer can be absolute, starting with a
-slash on UNIX or a drive letter prefix on Windows. The path can alternatively
+slash on Unix or a drive letter prefix on Windows. The path can alternatively
be an :term:`asset specification` in the form
``some.dotted.package_name:relative/path``. This makes it possible to address
template assets which live in another package. For example:
@@ -317,7 +317,7 @@ Similar renderer configuration can be done imperatively. See
See also :ref:`built_in_renderers`.
Although a renderer path is usually just a simple relative pathname, a path
-named as a renderer can be absolute, starting with a slash on UNIX or a drive
+named as a renderer can be absolute, starting with a slash on Unix or a drive
letter prefix on Windows. The path can alternatively be an :term:`asset
specification` in the form ``some.dotted.package_name:relative/path``, making
it possible to address template assets which live in another package.
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 9568a6203..ba9a4d041 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -197,7 +197,7 @@ deprecation warnings won't be executed.
In this circumstance, you can start your application interactively under a
server run with the ``PYTHONWARNINGS`` environment variable set to ``default``.
-On UNIX, you can do that via:
+On Unix, you can do that via:
.. code-block:: bash
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 06b4d99eb..c463d297e 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -134,7 +134,7 @@ Non-Predicate Arguments
When the renderer is a path—although a path is usually just a simple relative
pathname (e.g., ``templates/foo.pt``, implying that a template named "foo.pt"
is in the "templates" directory relative to the directory of the current
- :term:`package`)—the path can be absolute, starting with a slash on UNIX or a
+ :term:`package`)—the path can be absolute, starting with a slash on Unix or a
drive letter prefix on Windows. The path can alternatively be a :term:`asset
specification` in the form ``some.dotted.package_name:relative/path``, making
it possible to address template assets which live in a separate package.