Merge from upstream 20181105

Author: adrianliaw

c-api/conversion.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-26 18:54+0800\n"
+"POT-Creation-Date: 2018-11-05 17:14+0800\n"
 "PO-Revision-Date: 2017-09-22 18:26+0000\n"
 "Last-Translator: Leon H.\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -108,9 +108,9 @@ msgstr ""
 
 #: ../../c-api/conversion.rst:62
 msgid ""
-"If ``endptr`` is ``NULL``, convert the whole string.  Raise ValueError and "
-"return ``-1.0`` if the string is not a valid representation of a floating-"
-"point number."
+"If ``endptr`` is ``NULL``, convert the whole string.  Raise :exc:"
+"`ValueError` and return ``-1.0`` if the string is not a valid representation "
+"of a floating-point number."
 msgstr ""
 
 #: ../../c-api/conversion.rst:66

c-api/veryhigh.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-26 18:54+0800\n"
+"POT-Creation-Date: 2018-11-05 17:14+0800\n"
 "PO-Revision-Date: 2018-05-23 14:08+0000\n"
 "Last-Translator: Adrian Liaw <[email protected]>\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -345,7 +345,7 @@ msgid ""
 "Evaluate a precompiled code object, given a particular environment for its "
 "evaluation.  This environment consists of a dictionary of global variables, "
 "a mapping object of local variables, arrays of arguments, keywords and "
-"defaults, a dictionary of default values for :ref:`keyword-only\\ <keyword-"
+"defaults, a dictionary of default values for :ref:`keyword-only <keyword-"
 "only_parameter>` arguments and a closure tuple of cells."
 msgstr ""