Issue python#28820: Merge typo fixes from 3.6

vadmium · vadmium · commit 9bcaa37e1cf0 · 2016-12-10T05:39:12.000Z
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
@@ -578,7 +578,7 @@ Footnotes
 This document was reviewed and revised by John Lee.
 
 .. [#] Google for example.
-.. [#] Browser sniffing is a very bad practise for website design - building
+.. [#] Browser sniffing is a very bad practice for website design - building
        sites using web standards is much more sensible. Unfortunately a lot of
        sites still send different versions to different browsers.
 .. [#] The user agent for MSIE 6 is
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
@@ -501,7 +501,7 @@ when the ``from...import`` statement is executed.  (This also works when
 ``__all__`` is defined.)
 
 Although certain modules are designed to export only names that follow certain
-patterns when you use ``import *``, it is still considered bad practise in
+patterns when you use ``import *``, it is still considered bad practice in
 production code.
 
 Remember, there is nothing wrong with using ``from Package import
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2331,7 +2331,7 @@ _PyObject_FastCallDict(PyObject *callable, PyObject **args, Py_ssize_t nargs,
     return result;
 }
 
-/* Positional arguments are obj followed args:
+/* Positional arguments are obj followed by args:
    call callable(obj, *args, **kwargs) */
 PyObject *
 _PyObject_Call_Prepend(PyObject *callable,

Original file line number	Diff line number	Diff line change
`@@ -2331,7 +2331,7 @@ _PyObject_FastCallDict(PyObject callable, PyObject *args, Py_ssize_t nargs,`
`2331`	`2331`	`return result;`
`2332`	`2332`	`}`
`2333`	`2333`
`2334`		`-/* Positional arguments are obj followed args:`
	`2334`	`+/* Positional arguments are obj followed by args:`
`2335`	`2335`	`call callable(obj, args, kwargs) /`
`2336`	`2336`	`PyObject *`
`2337`	`2337`	`_PyObject_Call_Prepend(PyObject *callable,`