aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-05-06 22:32:06 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2010-05-06 22:32:06 -0700
commitfb201a5b46bb49aa57a8462d7ded8ea2ff76be81 (patch)
tree257341bc65bde21c3349746d2a14f8d6b990ea51
parentd6dd5fff7bd42791597a7de75bae631c978ef259 (diff)
downloadpandoc-fb201a5b46bb49aa57a8462d7ded8ea2ff76be81.tar.gz
Updated man page and README.
Pandoc no longer respects locale, even when compiled by GHC 6.12.
-rw-r--r--README4
-rw-r--r--man/man1/pandoc.1.md5
2 files changed, 3 insertions, 6 deletions
diff --git a/README b/README
index 3040e2ddf..e8bac9d5d 100644
--- a/README
+++ b/README
@@ -116,9 +116,7 @@ Character encodings
-------------------
All input is assumed to be in the UTF-8 encoding, and all output
-is in UTF-8 (unless your version of pandoc was compiled using
-GHC 6.12 or higher, in which case the local encoding will be used).
-If your local character encoding is not UTF-8 and you use
+is in UTF-8. If your local character encoding is not UTF-8 and you use
accented or foreign characters, you should pipe the input and output
through [`iconv`]. For example,
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index a5fadb5c4..9bc3caef3 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -53,9 +53,8 @@ markdown: the differences are described in the *README* file in
the user documentation. If standard markdown syntax is desired, the
`--strict` option may be used.
-Pandoc uses the UTF-8 character encoding for both input and output
-(unless compiled with GHC 6.12 or higher, in which case it uses
-the local encoding). If your local character encoding is not UTF-8, you
+Pandoc uses the UTF-8 character encoding for both input and output.
+If your local character encoding is not UTF-8, you
should pipe input and output through `iconv`:
iconv -t utf-8 input.txt | pandoc | iconv -f utf-8