grammar fix: 'multibyte filename' is ambiguous. They are replaced with 'non-ASCII filename'. refs #703

7 files changed, 13 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index e69455d2..49861679 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,7 +18,7 @@ Bugs fixed
   a named target.
 * A wrong condition broke the search feature on first page that is usually
   index.rst.  This issue was introduced in 1.2b1.
-* #703: When Sphinx can't decode filenames with multibyte characters, Sphinx now
+* #703: When Sphinx can't decode filenames with non-ASCII characters, Sphinx now
   catches UnicodeError and will continue if possible instead of raising the
   exception.
 
@@ -87,7 +87,7 @@ Bugs fixed
 * #1189: "Title underline is too short" WARNING is given when using fullwidth
   characters to "Project name" on quickstart.
 * #1190: Output TeX/texinfo/man filename has no basename (only extension)
-  when using multibyte characters in the "Project name" on quickstart.
+  when using non-ASCII characters in the "Project name" on quickstart.
 * #1192: Fix escaping problem for hyperlinks in the manpage writer.
 * #1193: Fix i18n: multiple link references in the same line return the same
   link.
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index 6ed366d4..87717771 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -81,7 +81,7 @@ def walk(top, topdown=True, followlinks=False):
             fullpath = path.join(top, name)
         except UnicodeError:
             print >>sys.stderr, (
-                '%s:: ERROR: multibyte filename not supported on this '
+                '%s:: ERROR: non-ASCII filename not supported on this '
                 'filesystem encoding %r, skipped.' % (name, fs_encoding))
             continue
         if path.isdir(fullpath):
diff --git a/tests/test_application.py b/tests/test_application.py
index a0a288b9..85c0c44b 100644
--- a/tests/test_application.py
+++ b/tests/test_application.py
@@ -43,7 +43,7 @@ def test_events(app):
 
 
 @with_app()
-def test_emit_with_multibyte_name_node(app):
+def test_emit_with_nonascii_name_node(app):
     node = nodes.section(names=[u'\u65e5\u672c\u8a9e'])
     app.emit('my_event', node)
 
diff --git a/tests/test_build.py b/tests/test_build.py
index 0a17e862..bd55c0a5 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -73,7 +73,7 @@ def test_pseudoxml(app):
     app.builder.build_all()
 
 @with_app(buildername='html', srcdir='(temp)')
-def test_multibyte_path(app):
+def test_nonascii_path(app):
     srcdir = path(app.srcdir)
     mb_name = u'\u65e5\u672c\u8a9e'
     try:
@@ -81,7 +81,7 @@ def test_multibyte_path(app):
     except UnicodeEncodeError:
         from path import FILESYSTEMENCODING
         raise SkipTest(
-            'multibyte filename not supported on this filesystem encoding: '
+            'nonascii filename not supported on this filesystem encoding: '
             '%s', FILESYSTEMENCODING)
 
     (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""
diff --git a/tests/test_build_text.py b/tests/test_build_text.py
index 445e39db..1d560296 100644
--- a/tests/test_build_text.py
+++ b/tests/test_build_text.py
@@ -86,7 +86,7 @@ def test_lineblock(app):
 
 
 @with_text_app()
-def test_multibyte_title_line(app):
+def test_nonascii_title_line(app):
     title = u'\u65e5\u672c\u8a9e'
     underline = u'=' * column_width(title)
     content = u'\n'.join((title, underline, u''))
@@ -101,7 +101,7 @@ def test_multibyte_title_line(app):
 
 
 @with_text_app()
-def test_multibyte_table(app):
+def test_nonascii_table(app):
     text = u'\u65e5\u672c\u8a9e'
     contents = (u"\n.. list-table::"
                  "\n"
@@ -122,7 +122,7 @@ def test_multibyte_table(app):
 
 
 @with_text_app()
-def test_multibyte_maxwidth(app):
+def test_nonascii_maxwidth(app):
     sb_text = u'abc'  #length=3
     mb_text = u'\u65e5\u672c\u8a9e'  #length=3
 
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index d14af696..9daa7401 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -108,7 +108,7 @@ def test_do_prompt():
     raises(AssertionError, qs.do_prompt, d, 'k6', 'Q6', validator=qs.boolean)
 
 
-def test_do_prompt_with_multibyte():
+def test_do_prompt_with_nonascii():
     d = {}
     answers = {
         'Q1': u'\u30c9\u30a4\u30c4',
@@ -118,7 +118,7 @@ def test_do_prompt_with_multibyte():
         qs.do_prompt(d, 'k1', 'Q1', default=u'\u65e5\u672c')
     except UnicodeEncodeError:
         raise SkipTest(
-            'multibyte console input not supported on this encoding: %s',
+            'non-ASCII console input not supported on this encoding: %s',
             qs.TERM_ENCODING)
     assert d['k1'] == u'\u30c9\u30a4\u30c4'
 
diff --git a/tests/test_setup_command.py b/tests/test_setup_command.py
index 51653460..af4b75c0 100644
--- a/tests/test_setup_command.py
+++ b/tests/test_setup_command.py
@@ -59,7 +59,7 @@ def test_build_sphinx(pkgroot, proc):
 
 
 @with_setup_command(root)
-def test_build_sphinx_with_multibyte_path(pkgroot, proc):
+def test_build_sphinx_with_nonascii_path(pkgroot, proc):
     mb_name = u'\u65e5\u672c\u8a9e'
     srcdir = (pkgroot / 'doc')
     try:
@@ -67,7 +67,7 @@ def test_build_sphinx_with_multibyte_path(pkgroot, proc):
     except UnicodeEncodeError:
         from path import FILESYSTEMENCODING
         raise SkipTest(
-            'multibyte filename not supported on this filesystem encoding: '
+            'non-ASCII filename not supported on this filesystem encoding: '
             '%s', FILESYSTEMENCODING)
 
     (srcdir / mb_name / (mb_name + '.txt')).write_text(dedent("""