summaryrefslogtreecommitdiff
path: root/doc/docs/cmdline.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-11-06 13:18:32 +0100
committerGeorg Brandl <georg@python.org>2014-11-06 13:18:32 +0100
commit8c0814068d229cfbf67f9e3a070bcdaa089c7ffa (patch)
tree3297ab209f67532ff71c9e8b82b6edd1f8b984a6 /doc/docs/cmdline.rst
parent69e83eb0856666d2594c96b1e8fae42dbeb92318 (diff)
downloadpygments-8c0814068d229cfbf67f9e3a070bcdaa089c7ffa.tar.gz
Update docs w.r.t. encodings.
Diffstat (limited to 'doc/docs/cmdline.rst')
-rw-r--r--doc/docs/cmdline.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/docs/cmdline.rst b/doc/docs/cmdline.rst
index bf0177a3..165af969 100644
--- a/doc/docs/cmdline.rst
+++ b/doc/docs/cmdline.rst
@@ -136,9 +136,13 @@ Pygments tries to be smart regarding encodings in the formatting process:
* If you give an ``outencoding`` option, it will override ``encoding``
as the output encoding.
+* If you give an ``inencoding`` option, it will override ``encoding``
+ as the input encoding.
+
* If you don't give an encoding and have given an output file, the default
- encoding for lexer and formatter is ``latin1`` (which will pass through
- all non-ASCII characters).
+ encoding for lexer and formatter is the terminal encoding or the default
+ locale encoding of the system. As a last resort, ``latin1`` is used (which
+ will pass through all non-ASCII characters).
* If you don't give an encoding and haven't given an output file (that means
output is written to the console), the default encoding for lexer and