diff options
| -rw-r--r-- | click/types.py | 2 | ||||
| -rw-r--r-- | docs/options.rst | 2 | ||||
| -rw-r--r-- | docs/setuptools.rst | 4 | ||||
| -rw-r--r-- | docs/why.rst | 2 | ||||
| -rw-r--r-- | examples/inout/inout.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/click/types.py b/click/types.py index 4ae0cda..abbe199 100644 --- a/click/types.py +++ b/click/types.py @@ -28,7 +28,7 @@ class ParamType(object): #: string environment variable, this is what splits it up. `None` #: means any whitespace. For all parameters the general rule is that #: whitespace splits them up. The exception are paths and files which - #: are split by ``os.path.pathsep`` by default (":" on unix and ";" on + #: are split by ``os.path.pathsep`` by default (":" on Unix and ";" on #: Windows). envvar_list_splitter = None diff --git a/docs/options.rst b/docs/options.rst index 59484f0..c6b3e01 100644 --- a/docs/options.rst +++ b/docs/options.rst @@ -464,7 +464,7 @@ perform the splitting. The default implementation for all types is to split on whitespace. The exceptions to this rule are the :class:`File` and :class:`Path` types which both split according to the operating system's path splitting rules. -On UNIX systems like Linux and OS X, the splitting happens for those on +On Unix systems like Linux and OS X, the splitting happens for those on every colon (``:``), and for Windows, on every semicolon (``;``). Example usage: diff --git a/docs/setuptools.rst b/docs/setuptools.rst index 11cfff4..079238c 100644 --- a/docs/setuptools.rst +++ b/docs/setuptools.rst @@ -4,13 +4,13 @@ Usage with Setuptools ===================== When writing command line utilities, it's recommended to write them as -modules that are distributed with setuptools instead of using UNIX +modules that are distributed with setuptools instead of using Unix shebangs. There are many reasons for this. The first one is that setuptools automatically generates executable wrappers for Windows so your command line utilities work on Windows too. -The second reason is that setuptools scripts work with virtualenv on UNIX +The second reason is that setuptools scripts work with virtualenv on Unix without the virtualenv having to be activated. This is a very useful concept which allows you to bundle your scripts with all requirements into a virtualenv. diff --git a/docs/why.rst b/docs/why.rst index 2156346..9dee7b1 100644 --- a/docs/why.rst +++ b/docs/why.rst @@ -8,7 +8,7 @@ This question is easy to answer: because there is not a single command line utility for Python out there which ticks the following boxes: * is lazily composable without restrictions -* fully follows the UNIX command line conventions +* fully follows the Unix command line conventions * supports loading values from environment variables out of the box * supports for prompting of custom values * is fully nestable and composable diff --git a/examples/inout/inout.py b/examples/inout/inout.py index 30ffce0..b93f306 100644 --- a/examples/inout/inout.py +++ b/examples/inout/inout.py @@ -5,7 +5,7 @@ import click @click.argument('input', type=click.File('rb'), nargs=-1) @click.argument('output', type=click.File('wb')) def cli(input, output): - """This script works similar to the unix `cat` command but it writes + """This script works similar to the Unix `cat` command but it writes into a specific file (which could be the standard output as denoted by the ``-`` sign). |