From f7b4f70a165691c10eed9125f6bb20da30fd037b Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 27 Oct 2010 17:36:27 +0200
Subject: [PATCH] make examples less nested for now

--HG--
branch : trunk
---
 doc/example/{marking.txt => controlskip.txt} | 3 ---
 doc/example/{misc.txt => detectpytest.txt}   | 3 ---
 doc/example/mysetup.txt                      | 2 ++
 doc/example/nonpython.txt                    | 2 ++
 doc/examples.txt                             | 4 ++--
 doc/features.txt                             | 3 ++-
 doc/talks.txt                                | 1 +
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename doc/example/{marking.txt => controlskip.txt} (94%)
 rename doc/example/{misc.txt => detectpytest.txt} (92%)

diff --git a/doc/example/marking.txt b/doc/example/controlskip.txt
similarity index 94%
rename from doc/example/marking.txt
rename to doc/example/controlskip.txt
index c879931b3..7eb358978 100644
--- a/doc/example/marking.txt
+++ b/doc/example/controlskip.txt
@@ -1,7 +1,4 @@
 
-Customizing test function through marks and hooks
-====================================================
-
 .. _`retrieved by hooks as item keywords`:
 
 control skipping of tests according to command line option
diff --git a/doc/example/misc.txt b/doc/example/detectpytest.txt
similarity index 92%
rename from doc/example/misc.txt
rename to doc/example/detectpytest.txt
index 842de7ef4..50490f344 100644
--- a/doc/example/misc.txt
+++ b/doc/example/detectpytest.txt
@@ -1,7 +1,4 @@
 
-Misc examples
-====================================================
-
 Detect if running from within a py.test run
 --------------------------------------------------------------
 
diff --git a/doc/example/mysetup.txt b/doc/example/mysetup.txt
index 60cee65f1..d98f2277e 100644
--- a/doc/example/mysetup.txt
+++ b/doc/example/mysetup.txt
@@ -1,6 +1,8 @@
 
 .. highlightlang:: python
 
+.. _mysetup:
+
 mysetup pattern: application specific test fixtures
 ==========================================================
 
diff --git a/doc/example/nonpython.txt b/doc/example/nonpython.txt
index 6412d13c9..25a40d960 100644
--- a/doc/example/nonpython.txt
+++ b/doc/example/nonpython.txt
@@ -1,4 +1,6 @@
 
+.. _`non-python tests`:
+
 Working with non-python tests
 ====================================================
 
diff --git a/doc/examples.txt b/doc/examples.txt
index 5694de0ea..1fc0ced2c 100644
--- a/doc/examples.txt
+++ b/doc/examples.txt
@@ -7,7 +7,7 @@ Usages and Examples
 .. toctree::
    :maxdepth: 2
 
-   example/marking.txt
+   example/controlskip.txt
    example/mysetup.txt
-   example/misc.txt
+   example/detectpytest.txt
    example/nonpython.txt
diff --git a/doc/features.txt b/doc/features.txt
index 2a6ede0e5..7828044c7 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -45,7 +45,8 @@ supports several testing practises and methods
 
 - supports extended `xUnit style setup`_
 - can integrate nose_, `unittest.py` and `doctest.py`_ style tests
-- supports generating testing coverage
+- supports generating testing coverage reports
+- supports :ref:`non-python tests`
 - `Javasript unit- and functional testing`_
 
 .. _`Javasript unit- and functional testing`: plugin/oejskit.html
diff --git a/doc/talks.txt b/doc/talks.txt
index 428c16d05..6ec6a38b4 100644
--- a/doc/talks.txt
+++ b/doc/talks.txt
@@ -16,6 +16,7 @@ basic usage and funcargs:
 
 function arguments:
 
+- :ref:`mysetup`
 - `application setup in test functions with funcargs`_
 - `making funcargs dependendent on command line options`_
 - `monkey patching done right`_ (blog post, consult `monkeypatch