Commit 93d1d037 authored by Jean Jordaan's avatar Jean Jordaan

Tidying, markup literals, fix typos and repeated words

parent 179a1676
...@@ -47,7 +47,7 @@ Make sure the bootstrap script actually works:: ...@@ -47,7 +47,7 @@ Make sure the bootstrap script actually works::
X... X...
d zc.buildout-...egg d zc.buildout-...egg
By default it gets the latest version: By default it gets the latest version::
>>> buildout_script = join(sample_buildout, 'bin', 'buildout') >>> buildout_script = join(sample_buildout, 'bin', 'buildout')
>>> if sys.platform.startswith('win'): >>> if sys.platform.startswith('win'):
...@@ -59,8 +59,8 @@ By default it gets the latest version: ...@@ -59,8 +59,8 @@ By default it gets the latest version:
'/sample/eggs/zc.buildout-22.0.0...egg', '/sample/eggs/zc.buildout-22.0.0...egg',
]... ]...
Now trying the `--buildout-version` option, that let you define a version for Now trying the ``--buildout-version`` option, that let you define a version
`zc.buildout`. for ``zc.buildout``.
Let's try with an unknown version:: Let's try with an unknown version::
...@@ -73,7 +73,7 @@ Let's try with an unknown version:: ...@@ -73,7 +73,7 @@ Let's try with an unknown version::
No local packages or download links found for zc.buildout==UNKNOWN No local packages or download links found for zc.buildout==UNKNOWN
... ...
Now let's try with `2.0.0`, which happens to exist:: Now let's try with ``2.0.0``, which happens to exist::
>>> print_('X'); print_(system( >>> print_('X'); print_(system(
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
...@@ -81,7 +81,7 @@ Now let's try with `2.0.0`, which happens to exist:: ...@@ -81,7 +81,7 @@ Now let's try with `2.0.0`, which happens to exist::
... # doctest: +ELLIPSIS ... # doctest: +ELLIPSIS
X...Generated script '/sample/bin/buildout'...X X...Generated script '/sample/bin/buildout'...X
Let's make sure the generated `buildout` script uses it:: Let's make sure the generated ``buildout`` script uses it::
>>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS >>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS
#... #...
...@@ -90,10 +90,10 @@ Let's make sure the generated `buildout` script uses it:: ...@@ -90,10 +90,10 @@ Let's make sure the generated `buildout` script uses it::
'/sample/eggs/zc.buildout-2.0.0...egg', '/sample/eggs/zc.buildout-2.0.0...egg',
]... ]...
Now trying the `--setuptools-version` option, that let you define a version for Now trying the ``--setuptools-version`` option, that lets you define a version
`setuptools`. for ``setuptools``.
Now let's try with `8.0`, which happens to exist:: Now let's try with ``8.0``, which happens to exist::
>>> print_('X'); print_(system( >>> print_('X'); print_(system(
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
...@@ -101,7 +101,7 @@ Now let's try with `8.0`, which happens to exist:: ...@@ -101,7 +101,7 @@ Now let's try with `8.0`, which happens to exist::
... # doctest: +ELLIPSIS ... # doctest: +ELLIPSIS
X...Generated script '/sample/bin/buildout'...X X...Generated script '/sample/bin/buildout'...X
Let's make sure the generated `buildout` script uses it:: Let's make sure the generated ``buildout`` script uses it::
>>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS >>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS
#... #...
...@@ -110,7 +110,7 @@ Let's make sure the generated `buildout` script uses it:: ...@@ -110,7 +110,7 @@ Let's make sure the generated `buildout` script uses it::
'/sample/eggs/zc.buildout-...egg', '/sample/eggs/zc.buildout-...egg',
]... ]...
Now let's try specifying both `zc.buildout` and `setuptools` to versions Now let's try specifying both ``zc.buildout`` and ``setuptools`` to versions
which happens to exist:: which happens to exist::
>>> print_('X'); print_(system( >>> print_('X'); print_(system(
...@@ -119,7 +119,7 @@ which happens to exist:: ...@@ -119,7 +119,7 @@ which happens to exist::
... # doctest: +ELLIPSIS ... # doctest: +ELLIPSIS
X...Generated script '/sample/bin/buildout'...X X...Generated script '/sample/bin/buildout'...X
Let's make sure the generated `buildout` script uses it:: Let's make sure the generated ``buildout`` script uses it::
>>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS >>> print_(open(buildout_script).read()) # doctest: +ELLIPSIS
#... #...
...@@ -128,8 +128,8 @@ Let's make sure the generated `buildout` script uses it:: ...@@ -128,8 +128,8 @@ Let's make sure the generated `buildout` script uses it::
'/sample/eggs/zc.buildout-2.0.0...egg', '/sample/eggs/zc.buildout-2.0.0...egg',
]... ]...
For a completely offline install we want to avoid downloading ez_setup.py, For a completely offline install we want to avoid downloading ``ez_setup.py``,
specify the setuptools version, and to reuse the setuptools zipfile. specify the setuptools version, and to reuse the setuptools zipfile::
>>> try: >>> try:
... from urllib.request import urlopen ... from urllib.request import urlopen
...@@ -160,12 +160,12 @@ specify the setuptools version, and to reuse the setuptools zipfile. ...@@ -160,12 +160,12 @@ specify the setuptools version, and to reuse the setuptools zipfile.
'/sample/eggs/zc.buildout-2.0.0...egg', '/sample/eggs/zc.buildout-2.0.0...egg',
]... ]...
You can ask bootstrap.py for its version. This is really the day the last You can ask ``bootstrap.py`` for its version. This is really the day the last
change was made. A date leads to less confusion than a version number separate change was made. A date leads to less confusion than a version number separate
from buildout's own version number. Similarly, tracking buildout's version from buildout's own version number. Similarly, tracking buildout's version
number leads to bootstraps with a new version number but without changes or to number leads to bootstraps with a new version number but without changes or to
bootstraps with version number from an already-older buildout. So: a date is bootstraps with version number from an already-older buildout. So: a date is
best. best::
>>> print_('X'); print_(system( >>> print_('X'); print_(system(
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment