com php-langspec: Restore Oxford comma: spec/09-lexical-structure.md

[email protected] (Andrea Faulds) Thu, 18 Feb 2016 13:02:22 +0000

Newsgroups	php.standards.cvs
Message-ID	<[email protected]>

Commit:    1935a4b3db0ae797b549870592c60fac6fb74e29
Author:    Andrea Faulds <[email protected]>         Thu, 18 Feb 2016 13:02:22 +0000
Parents:   ad1a8bdba48ed23f118fe743f6930d1d57cd8042
Branches:  master

Link:       http://git.php.net/?p=php-langspec.git;a=commitdiff;h=1935a4b3db0ae797b549870592c60fac6fb74e29

Log:
Restore Oxford comma

Changed paths:
  M  spec/09-lexical-structure.md


Diff:
diff --git a/spec/09-lexical-structure.md b/spec/09-lexical-structure.md
index bb72aa4..c24508d 100644
--- a/spec/09-lexical-structure.md
+++ b/spec/09-lexical-structure.md
@@ -269,7 +269,7 @@ Unless stated otherwise ([functions](13-functions.md#function-definitions),
 
 Names beginning with two underscores (__) are reserved by the PHP language and should not be defined by the user code.
 
-The following names cannot be used as the names of classes, interfaces, or traits: `bool`, `FALSE`, `float`, `int`, `NULL`, `string`, `TRUE` and `void`.
+The following names cannot be used as the names of classes, interfaces, or traits: `bool`, `FALSE`, `float`, `int`, `NULL`, `string`, `TRUE`, and `void`.
 
 The following names are reserved for future use and should not be used as the names of classes, interfaces, or traits: `mixed`, `numeric`, `object`, and `resource`.