From 6586f45780cc2d973791ab62d331ae3fd5f31e2e Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 9 Dec 2013 11:15:38 +0000
Subject: [PATCH] fix #66164 make operator precedence table more readable
 (commas and "and")

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@332319 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/operators.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/language/operators.xml b/language/operators.xml
index e854e347ed..75da567c3e 100644
--- a/language/operators.xml
+++ b/language/operators.xml
@@ -89,7 +89,7 @@
        </row>
        <row>
         <entry>right</entry>
-        <entry>++ -- ~ (int) (float) (string) (array) (object) (bool) @</entry>
+        <entry>++, --, ~, (int), (float), (string), (array), (object), (bool), and @</entry>
         <entry>
          <link linkend="language.types">types</link> and <link linkend="language.operators.increment">increment/decrement</link>
         </entry>
@@ -110,35 +110,35 @@
        </row>
        <row>
         <entry>left</entry>
-        <entry>* / %</entry>
+        <entry>*, /, and %</entry>
         <entry>
          <link linkend="language.operators.arithmetic">arithmetic</link>
         </entry>
        </row>
        <row>
         <entry>left</entry>
-        <entry>+ - .</entry>
+        <entry>+, -, and .</entry>
         <entry>
          <link linkend="language.operators.arithmetic">arithmetic</link>&listendand;
          <link linkend="language.operators.string">string</link></entry>
        </row>
        <row>
         <entry>left</entry>
-        <entry>&lt;&lt; &gt;&gt;</entry>
+        <entry>&lt;&lt; and &gt;&gt;</entry>
         <entry>
          <link linkend="language.operators.bitwise">bitwise</link>
         </entry>
        </row>
        <row>
         <entry>non-associative</entry>
-        <entry>&lt; &lt;= &gt; &gt;=</entry>
+        <entry>&lt;, &lt;=, &gt;, and &gt;=</entry>
         <entry>
          <link linkend="language.operators.comparison">comparison</link>
         </entry>
        </row>
        <row>
         <entry>non-associative</entry>
-        <entry>== != === !== &lt;&gt;</entry>
+        <entry>==, !=, ===, !==, and &lt;&gt;</entry>
         <entry>
          <link linkend="language.operators.comparison">comparison</link>
         </entry>
@@ -188,7 +188,7 @@
        <row>
         <entry>right</entry>
         <entry>
-         = += -= *= /= .= %= &amp;= |= ^= &lt;&lt;= &gt;&gt;= =&gt;
+         =, +=, -=, *=, /=, .=, %=, &amp;=, |=, ^=, &lt;&lt;=, &gt;&gt;=, and =&gt;
         </entry>
         <entry>
          <link linkend="language.operators.assignment">assignment</link>