update documentation and config files

Signed-off-by: Simon Gomizelj <simongmzlj@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

3 files changed, 9 insertions, 0 deletions

diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 33a94214..d1c7d203 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -146,6 +146,11 @@ Options
 	and they are tried in the order they are passed to pacman. *NOTE*: this
 	is an absolute path, the root path is not automatically prepended.
 
+*\--color* <when>::
+	Specify when to enable coloring, can be 'always', 'never' or 'auto'.  Always
+	forces colours on, never forces colours off, and auto only automatically enables
+	colours when outputting onto a tty.
+
 *\--config* <file>::
 	Specify an alternate configuration file.
 
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index aa280124..58d68f33 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -167,6 +167,9 @@ Options
 	Log action messages through syslog(). This will insert log entries into
 	+{localstatedir}/log/messages+ or equivalent.
 
+*Color*::
+	Automatically enable colors only when pacman's output is on a tty.
+
 *UseDelta* [= ratio]::
 	Download delta files instead of complete packages if possible. Requires
 	the `xdelta3` program to be installed. If a ratio is specified (e.g.,
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 4c727240..f610fa80 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -30,6 +30,7 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
+#Color
 #TotalDownload
 CheckSpace
 #VerbosePkgLists