From 1c9ef2443f0f077659ed79ff8edc03437d9e712e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 20 Nov 2012 14:20:39 +0100
Subject: [PATCH] bump version, fix -k option help

---
 CHANGELOG           |  5 +++++
 _pytest/__init__.py |  2 +-
 _pytest/mark.py     | 11 ++++++-----
 setup.py            |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 83e8250a1..14a924519 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Changes between 2.3.4 and 2.3.5dev
+-----------------------------------
+
+- fix option help for "-k"
+
 Changes between 2.3.3 and 2.3.4
 -----------------------------------
 
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index ffef0beda..90400bc5d 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.3.4'
+__version__ = '2.4.5dev1'
diff --git a/_pytest/mark.py b/_pytest/mark.py
index c2ab3e18b..34c640ffe 100644
--- a/_pytest/mark.py
+++ b/_pytest/mark.py
@@ -8,11 +8,12 @@ def pytest_addoption(parser):
     group = parser.getgroup("general")
     group._addoption('-k',
         action="store", dest="keyword", default='', metavar="KEYWORDEXPR",
-        help="only run tests which match given keyword expression.  "
-             "An expression consists of space-separated terms. "
-             "Each term must match. Precede a term with '-' to negate. "
-             "Terminate expression with ':' to make the first match match "
-             "all subsequent tests (usually file-order). ")
+        help="only run tests which match the given expression. "
+             "An expression is a python evaluatable expression "
+             "where all names are substring-matched against test names "
+             "and keywords.  Example: -k 'test_method or test_other' "
+             "matches all test functions whose name contains "
+             "'test_method' or 'test_other'.")
 
     group._addoption("-m",
         action="store", dest="markexpr", default="", metavar="MARKEXPR",
diff --git a/setup.py b/setup.py
index 223c9bf84..0faaf5720 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.4',
+        version='2.4.5dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],