From 3a23baf484804a6eb6f4be537b4d59126747d1b1 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 10 Jan 2010 22:10:45 +0100
Subject: [PATCH] add to changelog, remove docstring

--HG--
branch : trunk
---
 CHANGELOG | 4 ++++
 setup.py  | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2130f4f86..0e875dccf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,10 @@ Changes between 1.X and 1.1.1
 
 - new "pytestconfig" funcarg allows access to test config object
 
+- (experimental) allow "py.test path::name1::name2::..." for pointing
+  to a test within a test collection directly.  This might eventually
+  evolve as a full substitute to "-k" specifications. 
+
 - streamlined plugin loading: order is now as documented in
   customize.html: setuptools, ENV, commandline, conftest. 
   also setuptools entry point names are turned to canonical namees ("pytest_*")
diff --git a/setup.py b/setup.py
index 24a04ebc3..ecd1e116d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-"""py lib / py.test setup.py file"""
 import os, sys
 if sys.version_info >= (3,0):
     from distribute_setup import use_setuptools
@@ -16,7 +15,7 @@ Platforms: Linux, Win32, OSX
 Interpreters: Python versions 2.4 through to 3.1, Jython 2.5.1. 
 For questions please check out http://pylib.org/contact.html
 
-.. _`py.test`: http://pylib.org/test.html
+.. _`py.test`: http://pytest.org
 .. _`py.path`: http://pylib.org/path.html
 .. _`py.code`: http://pylib.org/code.html