]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19504: Used American spelling for 'customize'.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 15 Nov 2013 20:58:47 +0000 (20:58 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 15 Nov 2013 20:58:47 +0000 (20:58 +0000)
1  2 
Doc/howto/logging-cookbook.rst
Doc/library/logging.handlers.rst
Lib/venv/__init__.py
PC/launcher.c

Simple merge
Simple merge
Simple merge
diff --cc PC/launcher.c
index c8af1972068aeb8995d1ede3f1af7919bfe4a384,216a5626039a23933e495877eab87c4e0ee0ca9b..ee3cd44ddc4ce6b4002101bba74057a515880194
@@@ -876,12 -805,12 +876,12 @@@ parse_shebang(wchar_t * shebang_line, i
                      break;
                  }
              }
 -            if (*vpp == NULL) {
 +            if (vpp->shebang == NULL) {
                  /*
-                  * Not found in builtins - look in customised commands.
+                  * Not found in builtins - look in customized commands.
                   *
                   * We can't permanently modify the shebang line in case
-                  * it's not a customised command, but we can temporarily
+                  * it's not a customized command, but we can temporarily
                   * stick a NUL after the command while searching for it,
                   * then put back the char we zapped.
                   */