fix issue85 - failing links/sphinx docs - thanks Marc Abramowitz

6 files changed, 18 insertions, 17 deletions

diff --git a/doc/announce/release-1.4.txt b/doc/announce/release-1.4.txt
index 3863c2a..5565bb3 100644
--- a/doc/announce/release-1.4.txt
+++ b/doc/announce/release-1.4.txt
@@ -4,7 +4,7 @@ tox 1.4: the virtualenv-based test run automatizer
 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 --git a/doc/index.txt b/doc/index.txt
index 2f75f7f..2ea7945 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -98,6 +98,7 @@ Current features
    install
    examples
    config
+   config-v2
    support
    changelog
    links
diff --git a/doc/links.txt b/doc/links.txt
index 6362816..96f85c3 100644
--- a/doc/links.txt
+++ b/doc/links.txt
@@ -1,20 +1,20 @@
 
 .. _Python: http://www.python.org
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
-.. _virtualenv3: http://pypi.python.org/pypi/virtualenv3
-.. _virtualenv5: http://pypi.python.org/pypi/virtualenv5
+.. _virtualenv: https://pypi.python.org/pypi/virtualenv
+.. _virtualenv3: https://pypi.python.org/pypi/virtualenv3
+.. _virtualenv5: https://pypi.python.org/pypi/virtualenv5
 .. _`py.test`: http://pytest.org
 .. _nosetests:
-.. _`nose`: http://pypi.python.org/pypi/nose
-.. _`Holger Krekel`: http://twitter.com/hpk42
-.. _`pytest-xdist`: http://pypi.python.org/pypi/pytest-xdist
+.. _`nose`: https://pypi.python.org/pypi/nose
+.. _`Holger Krekel`: https://twitter.com/hpk42
+.. _`pytest-xdist`: https://pypi.python.org/pypi/pytest-xdist
 
 .. _`easy_install`: http://peak.telecommunity.com/DevCenter/EasyInstall
-.. _pip: http://pypi.python.org/pypi/pip
-.. _setuptools: http://pypi.python.org/pypi/setuptools
-.. _distribute: http://pypi.python.org/pypi/distribute
+.. _pip: https://pypi.python.org/pypi/pip
+.. _setuptools: https://pypi.python.org/pypi/setuptools
+.. _distribute: https://pypi.python.org/pypi/distribute
 .. _`jenkins`: http://jenkins-ci.org/
-.. _sphinx: http://pypi.python.org/pypi/Sphinx
-.. _discover: http://pypi.python.org/pypi/discover
-.. _unittest2: http://pypi.python.org/pypi/unittest2
-.. _mock: http://pypi.python.org/pypi/mock/
+.. _sphinx: https://pypi.python.org/pypi/Sphinx
+.. _discover: https://pypi.python.org/pypi/discover
+.. _unittest2: https://pypi.python.org/pypi/unittest2
+.. _mock: https://pypi.python.org/pypi/mock/
diff --git a/doc/support.txt b/doc/support.txt
index fc18629..fd2c3fa 100644
--- a/doc/support.txt
+++ b/doc/support.txt
@@ -21,7 +21,7 @@ professional support
 
 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
diff --git a/setup.py b/setup.py
index 9c408fd..d682c17 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://tox.testrun.org/',
-        version='1.4.3.dev6',
+        version='1.4.3.dev7',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tox/__init__.py b/tox/__init__.py
index 7c24641..657a40f 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '1.4.3.dev6'
+__version__ = '1.4.3.dev7'
 
 class exception:
     class Error(Exception):