1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
|
From: Dmitry Shachnev <mitya57@debian.org>
Date: Thu, 8 Oct 2015 11:57:13 -0700
Subject: make the help message not depend on runtime encoding
This message goes into manpage, and we do not want the manpage to misleadingly
mention build-time locale there.
Bug: https://bugs.debian.org/791587
Forwarded: no
Last-Update: 2023-05-20
---
docutils/frontend.py | 2 +-
test/data/help/docutils.rst | 2 +-
test/data/help/rst2html.rst | 2 +-
test/data/help/rst2latex.rst | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docutils/frontend.py b/docutils/frontend.py
index c8b4b23..f3cb230 100644
--- a/docutils/frontend.py
+++ b/docutils/frontend.py
@@ -823,7 +823,7 @@ class OptionParser(optparse.OptionParser, docutils.SettingsSpec):
['--output-encoding-error-handler'],
{'default': 'strict', 'validator': validate_encoding_error_handler}),
('Specify text encoding and optionally error handler '
- 'for error output. Default: %s.' % default_error_encoding,
+ 'for error output. Default: system encoding.',
['--error-encoding', '-e'],
{'metavar': '<name[:handler]>', 'default': default_error_encoding,
'validator': validate_encoding_and_error_handler}),
diff --git a/test/data/help/docutils.rst b/test/data/help/docutils.rst
index bdaf468..1b35365 100644
--- a/test/data/help/docutils.rst
+++ b/test/data/help/docutils.rst
@@ -73,7 +73,7 @@ General Docutils Options
"xmlcharrefreplace", "backslashreplace".
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally error handler for
- error output. Default: utf-8.
+ error output. Default: system encoding.
--error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
Specify the error handler for unencodable characters
in error output. Default: backslashreplace.
diff --git a/test/data/help/rst2html.rst b/test/data/help/rst2html.rst
index 18479e8..e148d53 100644
--- a/test/data/help/rst2html.rst
+++ b/test/data/help/rst2html.rst
@@ -74,7 +74,7 @@ General Docutils Options
"xmlcharrefreplace", "backslashreplace".
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally error handler for
- error output. Default: utf-8.
+ error output. Default: system encoding.
--error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
Specify the error handler for unencodable characters
in error output. Default: backslashreplace.
diff --git a/test/data/help/rst2latex.rst b/test/data/help/rst2latex.rst
index d0ede4c..383cd09 100644
--- a/test/data/help/rst2latex.rst
+++ b/test/data/help/rst2latex.rst
@@ -74,7 +74,7 @@ General Docutils Options
"xmlcharrefreplace", "backslashreplace".
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally error handler for
- error output. Default: utf-8.
+ error output. Default: system encoding.
--error-encoding-error-handler=ERROR_ENCODING_ERROR_HANDLER
Specify the error handler for unencodable characters
in error output. Default: backslashreplace.
|