Commit 68d7a71a authored by Gary Poster's avatar Gary Poster

eliminate trailing spaces and normalize initial spacing of examples (some had...

eliminate trailing spaces and normalize initial spacing of examples (some had five spaces, and the usual is four).
parent 3df2322d
...@@ -710,10 +710,10 @@ characters, hyphens, and periods. ...@@ -710,10 +710,10 @@ characters, hyphens, and periods.
Annotated sections Annotated sections
------------------ ------------------
When used with the `annotate` command, buildout displays annotated sections. When used with the `annotate` command, buildout displays annotated sections.
All sections are displayed, sorted alphabetically. For each section, All sections are displayed, sorted alphabetically. For each section,
all key-value pairs are displayed, sorted alphabetically, along with all key-value pairs are displayed, sorted alphabetically, along with
the origin of the value (file name or COMPUTED_VALUE, DEFAULT_VALUE, the origin of the value (file name or COMPUTED_VALUE, DEFAULT_VALUE,
COMMAND_LINE_VALUE). COMMAND_LINE_VALUE).
>>> print system(buildout+ ' annotate'), # doctest: +ELLIPSIS >>> print system(buildout+ ' annotate'), # doctest: +ELLIPSIS
...@@ -736,7 +736,7 @@ COMMAND_LINE_VALUE). ...@@ -736,7 +736,7 @@ COMMAND_LINE_VALUE).
DEFAULT_VALUE DEFAULT_VALUE
installed= .installed.cfg installed= .installed.cfg
DEFAULT_VALUE DEFAULT_VALUE
log-format= log-format=
DEFAULT_VALUE DEFAULT_VALUE
log-level= INFO log-level= INFO
DEFAULT_VALUE DEFAULT_VALUE
...@@ -1169,7 +1169,7 @@ operations. ...@@ -1169,7 +1169,7 @@ operations.
/sample-buildout/base.cfg /sample-buildout/base.cfg
+= /sample-buildout/extension1.cfg += /sample-buildout/extension1.cfg
+= /sample-buildout/extension2.cfg += /sample-buildout/extension2.cfg
recipe= recipe=
/sample-buildout/base.cfg /sample-buildout/base.cfg
<BLANKLINE> <BLANKLINE>
[part2] [part2]
...@@ -1177,7 +1177,7 @@ operations. ...@@ -1177,7 +1177,7 @@ operations.
/sample-buildout/base.cfg /sample-buildout/base.cfg
-= /sample-buildout/extension1.cfg -= /sample-buildout/extension1.cfg
-= /sample-buildout/extension2.cfg -= /sample-buildout/extension2.cfg
recipe= recipe=
/sample-buildout/base.cfg /sample-buildout/base.cfg
<BLANKLINE> <BLANKLINE>
[part3] [part3]
...@@ -1185,7 +1185,7 @@ operations. ...@@ -1185,7 +1185,7 @@ operations.
c3 c4 c5 c3 c4 c5
/sample-buildout/base.cfg /sample-buildout/base.cfg
+= /sample-buildout/extension1.cfg += /sample-buildout/extension1.cfg
recipe= recipe=
/sample-buildout/base.cfg /sample-buildout/base.cfg
<BLANKLINE> <BLANKLINE>
[part4] [part4]
...@@ -1907,7 +1907,7 @@ the buildout in the usual way: ...@@ -1907,7 +1907,7 @@ the buildout in the usual way:
parts = debug d1 d2 d3 parts = debug d1 d2 d3
<BLANKLINE> <BLANKLINE>
[debug] [debug]
__buildout_installed__ = __buildout_installed__ =
__buildout_signature__ = recipes-PiIFiO8ny5yNZ1S3JfT0xg== __buildout_signature__ = recipes-PiIFiO8ny5yNZ1S3JfT0xg==
recipe = recipes:debug recipe = recipes:debug
<BLANKLINE> <BLANKLINE>
...@@ -1992,7 +1992,7 @@ The .installed.cfg is only updated for the recipes that ran: ...@@ -1992,7 +1992,7 @@ The .installed.cfg is only updated for the recipes that ran:
parts = debug d1 d2 d3 d4 parts = debug d1 d2 d3 d4
<BLANKLINE> <BLANKLINE>
[debug] [debug]
__buildout_installed__ = __buildout_installed__ =
__buildout_signature__ = recipes-PiIFiO8ny5yNZ1S3JfT0xg== __buildout_signature__ = recipes-PiIFiO8ny5yNZ1S3JfT0xg==
recipe = recipes:debug recipe = recipes:debug
<BLANKLINE> <BLANKLINE>
...@@ -2189,7 +2189,7 @@ database is shown. ...@@ -2189,7 +2189,7 @@ database is shown.
... parts = ... parts =
... """) ... """)
>>> print system(buildout+' -vv'), >>> print system(buildout+' -vv'), # doctest: +NORMALIZE_WHITESPACE
Installing 'zc.buildout', 'setuptools'. Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout 1.0.0. We have a develop egg: zc.buildout 1.0.0.
We have the best distribution that satisfies 'setuptools'. We have the best distribution that satisfies 'setuptools'.
...@@ -2203,11 +2203,11 @@ database is shown. ...@@ -2203,11 +2203,11 @@ database is shown.
eggs-directory = /sample-buildout/eggs eggs-directory = /sample-buildout/eggs
executable = /usr/local/bin/python2.3 executable = /usr/local/bin/python2.3
installed = /sample-buildout/.installed.cfg installed = /sample-buildout/.installed.cfg
log-format = log-format =
log-level = INFO log-level = INFO
newest = true newest = true
offline = false offline = false
parts = parts =
parts-directory = /sample-buildout/parts parts-directory = /sample-buildout/parts
python = buildout python = buildout
verbosity = 20 verbosity = 20
...@@ -2323,20 +2323,20 @@ If we have an existing buildout that already has a buildout.cfg, we'll ...@@ -2323,20 +2323,20 @@ If we have an existing buildout that already has a buildout.cfg, we'll
normally use the bootstrap command instead of init. It will complain normally use the bootstrap command instead of init. It will complain
if there isn't a configuration file: if there isn't a configuration file:
>>> sample_bootstrapped2 = tmpdir('sample-bootstrapped2') >>> sample_bootstrapped2 = tmpdir('sample-bootstrapped2')
>>> print system(buildout >>> print system(buildout
... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg') ... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg')
... +' bootstrap'), ... +' bootstrap'),
While: While:
Initializing. Initializing.
Error: Couldn't open /sample-bootstrapped2/setup.cfg Error: Couldn't open /sample-bootstrapped2/setup.cfg
>>> write(sample_bootstrapped2, 'setup.cfg', >>> write(sample_bootstrapped2, 'setup.cfg',
... """ ... """
... [buildout] ... [buildout]
... parts = ... parts =
... """) ... """)
>>> print system(buildout >>> print system(buildout
... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg') ... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg')
......
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