Created
February 6, 2013 17:38
-
-
Save msabramo/4724275 to your computer and use it in GitHub Desktop.
Miscellaneous fixes for Tox documentation.patch These are changes for the issue at https://bitbucket.org/hpk42/tox/issue/85/docs-target-failing-on-hg-tip
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 33d2d5195d82 doc/announce/release-1.4.txt | |
--- a/doc/announce/release-1.4.txt Sun Feb 03 15:00:32 2013 +0100 | |
+++ b/doc/announce/release-1.4.txt Wed Feb 06 09:37:36 2013 -0800 | |
@@ -4,7 +4,7 @@ | |
I am happy to announce tox 1.4 which brings: | |
- improvements with configuration file syntax, now allowing re-using | |
- selected settings across config file sections. see http://bit.ly/Ly3K4f | |
+ selected settings across config file sections. see http://testrun.org/tox/latest/config.html#substition-for-values-from-other-sections | |
- terminal reporting was simplified and streamlined. Now with | |
verbosity==0 (the default), less information will be shown | |
diff -r 33d2d5195d82 doc/config-v2.txt | |
--- a/doc/config-v2.txt Sun Feb 03 15:00:32 2013 +0100 | |
+++ b/doc/config-v2.txt Wed Feb 06 09:37:36 2013 -0800 | |
@@ -95,18 +95,14 @@ | |
py27-windows | |
py27-linux | |
-Our ``[testenv]`` uses a new templating style for the ``platform`` definition:: | |
+Our ``[testenv]`` uses a new templating style for the ``platform`` | |
+definition. This definition sets the platform, depending on the | |
+environment name for which the ``[testenv]`` is used:: | |
- platform= | |
+ platform = | |
windows: windows | |
linux: linux | |
-With | |
- | |
-ConcretelyThe next configuration item defines the platform, depending on the | |
-environment name for which the ``[testenv]`` is used:: | |
- | |
- | |
These two conditional settings will lead to either ``windows`` or | |
``linux`` as the platform string. When the test environment is run, | |
its platform string needs to be contained in the string returned | |
diff -r 33d2d5195d82 doc/index.txt | |
--- a/doc/index.txt Sun Feb 03 15:00:32 2013 +0100 | |
+++ b/doc/index.txt Wed Feb 06 09:37:36 2013 -0800 | |
@@ -98,6 +98,7 @@ | |
install | |
examples | |
config | |
+ config-v2 | |
support | |
changelog | |
links | |
diff -r 33d2d5195d82 doc/support.txt | |
--- a/doc/support.txt Sun Feb 03 15:00:32 2013 +0100 | |
+++ b/doc/support.txt Wed Feb 06 09:37:36 2013 -0800 | |
@@ -21,7 +21,7 @@ | |
If you are looking for on-site teaching or consulting support, | |
contact holger at `merlinux.eu`_, an association of | |
-`experienced well-known Python developers`_. | |
+experienced `well-known Python developers`_. | |
.. _`well-known Python developers`: http://merlinux.eu/people.txt | |
.. _`Maciej Fijalkowski`: http://www.ohloh.net/accounts/fijal |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
These are changes for a Tox issue at https://bitbucket.org/hpk42/tox/issue/85/docs-target-failing-on-hg-tip