diff --git a/documentation/18.07/eiffel/Coding_Standards/Eiffel-Coding-Standard.wiki b/documentation/18.07/eiffel/Coding_Standards/Eiffel-Coding-Standard.wiki
index 00b178c7..57287ca6 100644
--- a/documentation/18.07/eiffel/Coding_Standards/Eiffel-Coding-Standard.wiki
+++ b/documentation/18.07/eiffel/Coding_Standards/Eiffel-Coding-Standard.wiki
@@ -1,4 +1,4 @@
-[[Property:modification_date|Tue, 30 Oct 2018 14:56:21 GMT]]
+[[Property:modification_date|Mon, 03 Dec 2018 10:00:43 GMT]]
 [[Property:publication_date|Tue, 30 Oct 2018 14:56:21 GMT]]
 [[Property:uuid|0CD0A1B2-42F8-48E0-B419-61B4DC076C1B]]
 [[Property:weight|2]]
@@ -29,7 +29,7 @@ create
 feature {NONE} -- Initialization
 
     make (a: INTEGER)
-            -- Initialize Current with `a'.
+            -- Initialize Current with `a`.
         do
         end
 
@@ -50,7 +50,7 @@ end</e>
 
 If expressions are very long, break them on conjunctions as in:
 <e>if
-    expr1 or else
+    expr1 and then
     expr2
 then
     ...
@@ -82,7 +82,10 @@ else
     ...
 end</e>
 
-* For punctuation, we always have no space before '''(''' and a space after ''')''', ''',''', ''':''', or ''';''':
+* For punctuation, we always have 
+** a space before, and no after `(` 
+** no space before, and space after `)` `,` `:` or `;` 
+
 <e>require
    a_tag: query (a, b, c) or other_query (c, d)
 local