git.iko.soy/typeable/pandoc
on master help sign in
Updated man page and README.
fb201a5John MacFarlane
README+1−3
compare with master
unifiedsplit
@@ -116,9 +116,7 @@ Character encodings
116-------------------
116-------------------
117
117
118All input is assumed to be in the UTF-8 encoding, and all output
118All input is assumed to be in the UTF-8 encoding, and all output
119−is in UTF-8 (unless your version of pandoc was compiled using
120−GHC 6.12 or higher, in which case the local encoding will be used).
121−If your local character encoding is not UTF-8 and you use
119+is in UTF-8. If your local character encoding is not UTF-8 and you use
122accented or foreign characters, you should pipe the input and output
120accented or foreign characters, you should pipe the input and output
123through [`iconv`]. For example,
121through [`iconv`]. For example,
124
122
man/man1/pandoc.1.md+2−3
@@ -53,9 +53,8 @@ markdown: the differences are described in the *README* file in
53the user documentation. If standard markdown syntax is desired, the
53the user documentation. If standard markdown syntax is desired, the
54`--strict` option may be used.
54`--strict` option may be used.
55
55
56−Pandoc uses the UTF-8 character encoding for both input and output
56+Pandoc uses the UTF-8 character encoding for both input and output.
57−(unless compiled with GHC 6.12 or higher, in which case it uses
58−the local encoding). If your local character encoding is not UTF-8, you
57+If your local character encoding is not UTF-8, you
59should pipe input and output through `iconv`:
58should pipe input and output through `iconv`:
60
59
61 iconv -t utf-8 input.txt | pandoc | iconv -f utf-8
60 iconv -t utf-8 input.txt | pandoc | iconv -f utf-8