From 79b69e0bf96c5cfc289025c8bc9c27c2a297294b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Feb 2008 20:32:43 +0200
Subject: [PATCH] encoding: documentation

---
 NEWS                 |  2 +-
 doc/installation.txt |  8 +++++---
 features.conf        | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index bde3aee0..d92a0c29 100644
--- a/NEWS
+++ b/NEWS
@@ -64,7 +64,7 @@ Miscellaneous:
   when downloading
 * tabs opened by -remote now go behind existing dialogs
 * major bug 534, enhancement 517: fix HTTP gzip and bzip2
-  decompression, and add deflate and LZMA
+  decompression, and add deflate and LZMA (requires LZMA Utils)
 * major bug 503: various fixes in parsing and updating of elinks.conf
 * Debian bug 257762: turn terminal transparency off by default
 * bug 724: better parsing of escape sequences and control
diff --git a/doc/installation.txt b/doc/installation.txt
index 8c9d7073..25ef0010 100644
--- a/doc/installation.txt
+++ b/doc/installation.txt
@@ -42,9 +42,11 @@ ifndef::installation-webpage[]
 			See <<lua-scripting,the Elinks - Lua interface>>    \
 endif::installation-webpage[]
 			for more info.
-zlib 1.2.0.2 or later	For handling compressed documents both locally and  \
-			sent from server.
-bzip2			For handling local compressed documents.
+zlib 1.2.0.2 or later	For handling gzip or deflate compressed documents   \
+			both locally and sent from server.
+bzip2			Likewise, for bzip2 compressed documents.
+LZMA Utils		Likewise, for LZMA compressed documents.            \
+			Version 4.32.5 should work.
 OpenSSL or GNU TLS	For handling secure HTTP browsing.
 GPM			'General Purpose Mouse' for mouse support.
 expat			'XML Parser Toolkit' needed for XBEL support.
diff --git a/features.conf b/features.conf
index ad253c54..e859bb1a 100644
--- a/features.conf
+++ b/features.conf
@@ -175,6 +175,49 @@ CONFIG_MAILCAP=yes
 CONFIG_MIMETYPES=yes
 
 
+### Gzip and Deflate Decompression
+#
+# This makes ELinks send "Accept-Encoding: deflate, gzip" in HTTP
+# requests and decompress any documents received in those formats.
+# It works with local *.gz files as well.
+#
+# Default: enabled if zlib is installed and new enough
+
+CONFIG_GZIP=yes
+
+
+### Bzip2 Decompression
+#
+# This makes ELinks decompress local *.bz2 files.
+# Also, ELinks sends "Accept-Encoding: bzip2" in HTTP requests
+# and decompresses any documents received in that format,
+# but this encoding has not been registered at
+# http://www.iana.org/assignments/http-parameters[],
+# so most servers probably won't use it.
+#
+# Default: enabled if the library is installed
+
+CONFIG_BZIP2=yes
+
+
+### LZMA Decompression
+#
+# This makes ELinks decompress local *.lzma files.
+# Also, ELinks sends "Accept-Encoding: lzma" in HTTP requests
+# and decompresses any documents received in that format,
+# but this encoding has not been registered at
+# http://www.iana.org/assignments/http-parameters[],
+# so most servers probably won't use it.
+#
+# To use this, first install http://tukaani.org/lzma/[LZMA Utils].
+# Version 4.32.5 works; 4.42.2alpha also works and understands a
+# newer LZMA file format.  ELinks cannot use LZMA SDK from 7-Zip.
+#
+# Default: enabled if the library is installed
+
+CONFIG_LZMA=yes
+
+
 ### IPv6 Protocol Support
 #
 # You know this thing that was designed to obsolete IPv4 but only pasky,