diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
index 409ca38..5d94ea4 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
@@ -38,7 +38,7 @@
 
     SelectClause       ::= <SELECT> ( <ALL> | <DISTINCT> )? ( SelectRegular | SelectValue )
     SelectRegular      ::= Projection ( "," Projection )*
-    SelectValue      ::= ( <VALUE> | <ELEMENT> | <RAW> ) Expression
+    SelectValue        ::= ( <VALUE> | <ELEMENT> | <RAW> ) Expression
     Projection         ::= ( Expression ( <AS> )? Identifier | "*" )
 
     FromClause         ::= <FROM> FromTerm ( "," FromTerm )*
@@ -57,13 +57,16 @@
 
     WhereClause        ::= <WHERE> Expression
 
-    GroupbyClause      ::= <GROUP> <BY> ( Expression ( (<AS>)? Variable )? ( "," Expression ( (<AS>)? Variable )? )*
+    GroupbyClause      ::= <GROUP> <BY> Expression ( ( (<AS>)? Variable )?
+                           ( "," Expression ( (<AS>)? Variable )? )* )
                            ( <GROUP> <AS> Variable
-                             ("(" Variable <AS> VariableReference ("," Variable <AS> VariableReference )* ")")?
+                             ("(" Variable <AS> VariableReference
+                             ("," Variable <AS> VariableReference )* ")")?
                            )?
     HavingClause       ::= <HAVING> Expression
 
-    OrderbyClause      ::= <ORDER> <BY> Expression ( <ASC> | <DESC> )? ( "," Expression ( <ASC> | <DESC> )? )*
+    OrderbyClause      ::= <ORDER> <BY> Expression ( <ASC> | <DESC> )?
+                           ( "," Expression ( <ASC> | <DESC> )? )*
     LimitClause        ::= <LIMIT> Expression ( <OFFSET> Expression )?
 
 In this section, we will make use of two stored collections of objects (datasets), `GleambookUsers` and `GleambookMessages`, in a series of running examples to explain `SELECT` queries. The contents of the example collections are as follows:
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
index 1b392fe..3976937 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
@@ -19,7 +19,7 @@
 
 The SET statement can be used to override some cluster-wide configuration parameters for a specific request:
 
-          SET <IDENTIFIER> <STRING_LITERAL>
+    SET <IDENTIFIER> <STRING_LITERAL>
 
 As parameter identifiers are qualified names (containing a '.') they have to be escaped using backticks (\`\`).
 Note that changing query parameters will not affect query correctness but only impact performance