diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 3e8c726f69..ba7e197f79 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -273,23 +273,39 @@ additive-expression = multiplicative-expression
                     / additive-expression "+" multiplicative-expression
                     / additive-expression "-" multiplicative-expression
 
-ordering-expression = additive-expression
-                    / additive-expression "<" additive-expression
-                    / additive-expression ">" additive-expression
-                    / additive-expression "<=" additive-expression
-                    / additive-expression ">=" additive-expression
+shift-expression = additive-expression
+                 / shift-expression "<<" additive-expression
+                 / shift-expression ">>" additive-expression
+
+bitwise-and-expression = shift-expression
+                       / bitwise-and-expression "&" shift-expression
+
+bitwise-inclusive-or-expression =
+      bitwise-and-expression
+    / bitwise-inclusive-or-expression "|" bitwise-and-expression
+
+bitwise-exclusive-or-expression =
+      bitwise-inclusive-or-expression
+    / bitwise-exclusive-or-expression "^" bitwise-inclusive-or-expression
+
+ordering-expression =
+      bitwise-exclusive-or-expression
+    / bitwise-exclusive-or-expression "<" bitwise-exclusive-or-expression
+    / bitwise-exclusive-or-expression ">" bitwise-exclusive-or-expression
+    / bitwise-exclusive-or-expression "<=" bitwise-exclusive-or-expression
+    / bitwise-exclusive-or-expression ">=" bitwise-exclusive-or-expression
 
 equality-expression = ordering-expression
                     / ordering-expression "==" ordering-expression
                     / ordering-expression "!=" ordering-expression
 
-conjunctive-expression = equality-expression
-                       / conjunctive-expression "&&" equality-expression
+boolean-and-expression = equality-expression
+                       / boolean-and-expression "&&" equality-expression
 
-disjunctive-expression = conjunctive-expression
-                       / disjunctive-expression "||" conjunctive-expression
+boolean-or-expression = boolean-and-expression
+                      / boolean-or-expression "||" boolean-and-expression
 
-binary-expression = disjunctive-expression
+binary-expression = boolean-or-expression
 
 conditional-expression = binary-expression
                        / binary-expression "?" expression ":" expression