From 7d9297e929289bec4fd48be187d828421b3e0bee Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 8 Dec 2013 20:25:36 +0100
Subject: [PATCH] add changelog entry: PR90: add --color=yes|no|auto option to
 force terminal coloring mode ("auto" is default).  Thanks Marc Abramowitz.

---
 AUTHORS             | 1 +
 CHANGELOG           | 3 +++
 _pytest/terminal.py | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index aa716a34f..0261ec156 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,3 +35,4 @@ Brian Okken
 Katarzyna Jachim
 Christian Theunert
 Anthon van der Neut
+Mark Abramowitz
diff --git a/CHANGELOG b/CHANGELOG
index a684035dc..cf7d71eba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,9 @@ Unreleased
   hook and expecting certain fixture instances are torn down within (very
   unlikely and would have been unreliable anyway).
 
+- PR90: add --color=yes|no|auto option to force terminal coloring 
+  mode ("auto" is default).  Thanks Marc Abramowitz.
+
 - fix issue396 - correctly sort and finalize class-scoped parametrized 
   tests independently from number of methods on the class.  
 
diff --git a/_pytest/terminal.py b/_pytest/terminal.py
index ade037432..faa6e382e 100644
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -32,7 +32,7 @@ def pytest_addoption(parser):
     group._addoption('--color', metavar="color",
                action="store", dest="color", default='auto',
                choices=['yes', 'no', 'auto'],
-               help="color output (yes/no/auto).")
+               help="color terminal output (yes/no/auto).")
 
 def pytest_configure(config):
     config.option.verbose -= config.option.quiet