From 0e03ae1ee8098773ce4458a8be5ec5226605a988 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 23 Nov 2009 12:23:40 +0100 Subject: [PATCH] some forgotten doc fixes --HG-- branch : trunk --- doc/announce/release-1.1.0.txt | 2 +- doc/execnet.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/announce/release-1.1.0.txt b/doc/announce/release-1.1.0.txt index 8af901a86..b3b27989c 100644 --- a/doc/announce/release-1.1.0.txt +++ b/doc/announce/release-1.1.0.txt @@ -4,8 +4,8 @@ py.test/pylib 1.1.0: Python3, Jython, advanced skipping, cleanups ... Features: * compatible to Python3 (single py2/py3 source), `easy to install`_ -* generalized marking_: mark tests one a whole-class or whole-module basis * conditional skipping_: skip/xfail based on platform/dependencies +* generalized marking_: mark tests one a whole-class or whole-module basis Fixes: diff --git a/doc/execnet.txt b/doc/execnet.txt index 4ca1a30d3..b284657d0 100644 --- a/doc/execnet.txt +++ b/doc/execnet.txt @@ -2,11 +2,11 @@ py.execnet: *elastic* distributed programming ============================================================================== -Since pylib 1.1 "py.execnet" is separated out of hte lib and now -available through the standalone `execnet standalone package`_. +Since pylib 1.1 "py.execnet" ceased to exist and is now available +as a separately developed `execnet standalone package`_. -If you have usages of the "py.execnet.*" 1.0 API you can likely -rename all occurences of the string ``py.execnet.`` with the -string ``execnet.``. +If you have previosly used "py.execnet.*" and the 1.0 API just +rename all occurences of the string "``py.execnet.``" with the +string "``execnet.``" as execnet-1.0 is API compatible. .. _`execnet standalone package`: http://codespeak.net/execnet