diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
index 7fcb90ccf0..76150e4d4e 100644
--- a/user_guide_src/source/cli/cli_commands/007.php
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -5,7 +5,8 @@ $pad = $this->getPad($this->options, 6);
 foreach ($this->options as $option => $description) {
     CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
 }
-
-// Output will be
-// -n        Set migration namespace
-// -r        override file
+/*
+ * Output will be:
+ * -n        Set migration namespace
+ * -r        override file
+ */
diff --git a/user_guide_src/source/cli/cli_library/007.php b/user_guide_src/source/cli/cli_library/007.php
index 474229ba6e..0c9d257b1e 100644
--- a/user_guide_src/source/cli/cli_library/007.php
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -1,10 +1,11 @@
 <?php
 
 $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
-
-//These are your choices:
-//  [0]  The red apple
-//  [1]  The plump orange
-//  [2]  The ripe banana
-//
-//[0, 1, 2]:
+/*
+ * These are your choices:
+ *   [0]  The red apple
+ *   [1]  The plump orange
+ *   [2]  The ripe banana
+ *
+ * [0, 1, 2]:
+ */
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index 003c9a3624..ab2d1fcd1f 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -5,10 +5,11 @@ $fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'],
     'orange' => 'The plump orange',
     'banana' => 'The ripe banana'
 ]);
-
-//These are your choices:
-//  [apple]   The red apple
-//  [orange]  The plump orange
-//  [banana]  The ripe banana
-//
-//Which would you like? [apple, orange, banana]:
+/*
+ * These are your choices:
+ *   [apple]   The red apple
+ *   [orange]  The plump orange
+ *   [banana]  The ripe banana
+ *
+ * Which would you like? [apple, orange, banana]:
+ */
diff --git a/user_guide_src/source/database/query_builder/003.php b/user_guide_src/source/database/query_builder/003.php
index 26a9470fb6..faad112895 100644
--- a/user_guide_src/source/database/query_builder/003.php
+++ b/user_guide_src/source/database/query_builder/003.php
@@ -1,6 +1,7 @@
 <?php
 
 $query = $builder->get(10, 20);
-
-// Executes: SELECT * FROM mytable LIMIT 20, 10
-// (in MySQL. Other databases have slightly different syntax)
+/*
+ * Executes: SELECT * FROM mytable LIMIT 20, 10
+ * (in MySQL. Other databases have slightly different syntax)
+ */
diff --git a/user_guide_src/source/database/query_builder/006.php b/user_guide_src/source/database/query_builder/006.php
index 2868aaa49f..78a92e7b7b 100644
--- a/user_guide_src/source/database/query_builder/006.php
+++ b/user_guide_src/source/database/query_builder/006.php
@@ -1,10 +1,12 @@
 <?php
 
 echo $builder->limit(10,20)->getCompiledSelect(false);
-
-// Prints string: SELECT * FROM mytable LIMIT 20, 10
-// (in MySQL. Other databases have slightly different syntax)
+/*
+ * Prints string: SELECT * FROM mytable LIMIT 20, 10
+ * (in MySQL. Other databases have slightly different syntax)
+ */
 
 echo $builder->select('title, content, date')->getCompiledSelect();
-
-// Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+/*
+ * Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+ */
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
index 870a45e638..159f88e4a9 100644
--- a/user_guide_src/source/database/query_builder/018.php
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -4,6 +4,7 @@ $builder = $db->table('blogs');
 $builder->select('*');
 $builder->join('comments', 'comments.id = blogs.id');
 $query = $builder->get();
-
-// Produces:
-// SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+/*
+ * Produces:
+ * SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+ */
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index 20025bc32c..d858451993 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -10,6 +10,7 @@ $builder->select('*')->from('my_table')
     ->groupEnd()
     ->where('d', 'd')
 ->get();
-
-// Generates:
-// SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+/*
+ * Generates:
+ * SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+ */
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
index 1b99a61967..7869b4b4d9 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -8,8 +8,9 @@ $data = [
 
 $builder->where('id', $id);
 $builder->update($data);
-// Produces:
-//
-// UPDATE mytable
-// SET title = '{$title}', name = '{$name}', date = '{$date}'
-// WHERE id = $id
+/*
+ * Produces:
+ * UPDATE mytable
+ * SET title = '{$title}', name = '{$name}', date = '{$date}'
+ * WHERE id = $id
+ */
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
index c789d85e02..ce38024e55 100644
--- a/user_guide_src/source/database/query_builder/088.php
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -10,8 +10,9 @@ class Myclass
 $object = new Myclass;
 $builder->where('id', $id);
 $builder->update($object);
-// Produces:
-//
-// UPDATE `mytable`
-// SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
-// WHERE id = `$id`
+/*
+ * Produces:
+ * UPDATE `mytable`
+ * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+ * WHERE id = `$id`
+ */
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
index 545641a98f..56f04036cd 100644
--- a/user_guide_src/source/database/query_builder/091.php
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -14,14 +14,15 @@ $data = [
 ];
 
 $builder->updateBatch($data, 'title');
-
-// Produces:
-// UPDATE `mytable` SET `name` = CASE
-// WHEN `title` = 'My title' THEN 'My Name 2'
-// WHEN `title` = 'Another title' THEN 'Another Name 2'
-// ELSE `name` END,
-// `date` = CASE
-// WHEN `title` = 'My title' THEN 'My date 2'
-// WHEN `title` = 'Another title' THEN 'Another date 2'
-// ELSE `date` END
-// WHERE `title` IN ('My title','Another title')
+/*
+ * Produces:
+ * UPDATE `mytable` SET `name` = CASE
+ * WHEN `title` = 'My title' THEN 'My Name 2'
+ * WHEN `title` = 'Another title' THEN 'Another Name 2'
+ * ELSE `name` END,
+ * `date` = CASE
+ * WHEN `title` = 'My title' THEN 'My date 2'
+ * WHEN `title` = 'Another title' THEN 'Another date 2'
+ * ELSE `date` END
+ * WHERE `title` IN ('My title','Another title')
+ */
diff --git a/user_guide_src/source/database/query_builder/092.php b/user_guide_src/source/database/query_builder/092.php
index 605d533162..ed680a441d 100644
--- a/user_guide_src/source/database/query_builder/092.php
+++ b/user_guide_src/source/database/query_builder/092.php
@@ -1,4 +1,4 @@
 <?php
 
 $builder->delete(['id' => $id]);
-// Produces: // DELETE FROM mytable  // WHERE id = $id
+// Produces: DELETE FROM mytable WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/093.php b/user_guide_src/source/database/query_builder/093.php
index 6628a09b50..f1ba27e29e 100644
--- a/user_guide_src/source/database/query_builder/093.php
+++ b/user_guide_src/source/database/query_builder/093.php
@@ -2,7 +2,8 @@
 
 $builder->where('id', $id);
 $builder->delete();
-
-// Produces:
-// DELETE FROM mytable
-// WHERE id = $id
+/*
+ * Produces:
+ * DELETE FROM mytable
+ * WHERE id = $id
+ */
diff --git a/user_guide_src/source/database/query_builder/095.php b/user_guide_src/source/database/query_builder/095.php
index 0cdf6ef52b..a6c0ab4fc0 100644
--- a/user_guide_src/source/database/query_builder/095.php
+++ b/user_guide_src/source/database/query_builder/095.php
@@ -1,6 +1,7 @@
 <?php
 
 $builder->truncate();
-
-// Produce:
-// TRUNCATE mytable
+/*
+ * Produce:
+ * TRUNCATE mytable
+ */
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
index f484292a9d..30c4d0c452 100644
--- a/user_guide_src/source/database/query_builder/097.php
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -11,6 +11,7 @@ $sql = $builder->select(['field1','field2'])
 // ...
 
 $data = $builder->get()->getResultArray();
-
-// Would execute and return an array of results of the following query:
-// SELECT field1, field1 from mytable where field3 = 5;
+/*
+ * Would execute and return an array of results of the following query:
+ * SELECT field1, field1 from mytable where field3 = 5;
+ */
diff --git a/user_guide_src/source/dbmgmt/forge/004.php b/user_guide_src/source/dbmgmt/forge/004.php
index c514b3c0e4..6c44a8e553 100644
--- a/user_guide_src/source/dbmgmt/forge/004.php
+++ b/user_guide_src/source/dbmgmt/forge/004.php
@@ -1,5 +1,7 @@
 <?php
 
 $forge->createDatabase('my_db', true);
-// gives CREATE DATABASE IF NOT EXISTS `my_db`
-// or will check if a database exists
+/*
+ * gives CREATE DATABASE IF NOT EXISTS `my_db`
+ * or will check if a database exists
+ */
diff --git a/user_guide_src/source/helpers/array_helper/011.php b/user_guide_src/source/helpers/array_helper/011.php
index 754588747d..c80dc01e0c 100644
--- a/user_guide_src/source/helpers/array_helper/011.php
+++ b/user_guide_src/source/helpers/array_helper/011.php
@@ -2,12 +2,13 @@
 
 // using the same data from above
 $flattened = array_flatten_with_dots($arrayToFlatten, 'foo_');
-
-// $flattened is now:
-[
-    'foo_personal.first_name' => 'john',
-    'foo_personal.last_name'  => 'smith',
-    'foo_personal.age'        => '26',
-    'foo_personal.address'    => 'US',
-    'foo_other_details'       => 'marines officer',
-];
+/*
+ * $flattened is now:
+ * [
+ *     'foo_personal.first_name' => 'john',
+ *     'foo_personal.last_name'  => 'smith',
+ *     'foo_personal.age'        => '26',
+ *     'foo_personal.address'    => 'US',
+ *     'foo_other_details'       => 'marines officer',
+ * ]
+ */
diff --git a/user_guide_src/source/helpers/form_helper/010.php b/user_guide_src/source/helpers/form_helper/010.php
index 8efbdfdedd..4edb9a0922 100644
--- a/user_guide_src/source/helpers/form_helper/010.php
+++ b/user_guide_src/source/helpers/form_helper/010.php
@@ -7,11 +7,9 @@ $data = [
 ];
 
 echo form_hidden($data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="name" value="John Doe" />
-    <input type="hidden" name="email" value="john@example.com" />
-    <input type="hidden" name="url" value="http://example.com" />
-*/
+ * Would produce:
+ * <input type="hidden" name="name" value="John Doe" />
+ * <input type="hidden" name="email" value="john@example.com" />
+ * <input type="hidden" name="url" value="http://example.com" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/011.php b/user_guide_src/source/helpers/form_helper/011.php
index 26641f5774..4727931626 100644
--- a/user_guide_src/source/helpers/form_helper/011.php
+++ b/user_guide_src/source/helpers/form_helper/011.php
@@ -7,11 +7,9 @@ $data = [
 ];
 
 echo form_hidden('my_array', $data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="my_array[name]" value="John Doe" />
-    <input type="hidden" name="my_array[email]" value="john@example.com" />
-    <input type="hidden" name="my_array[url]" value="http://example.com" />
-*/
+ * Would produce:
+ * <input type="hidden" name="my_array[name]" value="John Doe" />
+ * <input type="hidden" name="my_array[email]" value="john@example.com" />
+ * <input type="hidden" name="my_array[url]" value="http://example.com" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/012.php b/user_guide_src/source/helpers/form_helper/012.php
index 1059821da6..2d781ad3ef 100644
--- a/user_guide_src/source/helpers/form_helper/012.php
+++ b/user_guide_src/source/helpers/form_helper/012.php
@@ -9,9 +9,7 @@ $data = [
 ];
 
 echo form_input($data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
-*/
+ * Would produce:
+ * <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/014.php b/user_guide_src/source/helpers/form_helper/014.php
index 6143aed6ea..d194b318d2 100644
--- a/user_guide_src/source/helpers/form_helper/014.php
+++ b/user_guide_src/source/helpers/form_helper/014.php
@@ -10,9 +10,7 @@ $data = [
 ];
 
 echo form_input($data);
-
 /*
-    Would produce:
-
-    <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
-*/
+ * Would produce:
+ * <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/017.php b/user_guide_src/source/helpers/form_helper/017.php
index 0ec6a19ca9..fb73d427ba 100644
--- a/user_guide_src/source/helpers/form_helper/017.php
+++ b/user_guide_src/source/helpers/form_helper/017.php
@@ -1,9 +1,7 @@
 <?php
 
 echo form_input('email', 'joe@example.com', ['placeholder' => 'Email Address...'], 'email');
-
 /*
-     Would produce:
-
-    <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
-*/
+ * Would produce:
+ * <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/018.php b/user_guide_src/source/helpers/form_helper/018.php
index fc6521be6e..9177e4d343 100644
--- a/user_guide_src/source/helpers/form_helper/018.php
+++ b/user_guide_src/source/helpers/form_helper/018.php
@@ -9,27 +9,23 @@ $options = [
 
 $shirts_on_sale = ['small', 'large'];
 echo form_dropdown('shirts', $options, 'large');
-
 /*
-    Would produce:
-
-    <select name="shirts">
-        <option value="small">Small Shirt</option>
-        <option value="med">Medium Shirt</option>
-        <option value="large" selected="selected">Large Shirt</option>
-        <option value="xlarge">Extra Large Shirt</option>
-    </select>
-*/
+ * Would produce:
+ * <select name="shirts">
+ *     <option value="small">Small Shirt</option>
+ *     <option value="med">Medium Shirt</option>
+ *     <option value="large" selected="selected">Large Shirt</option>
+ *     <option value="xlarge">Extra Large Shirt</option>
+ * </select>
+ */
 
 echo form_dropdown('shirts', $options, $shirts_on_sale);
-
 /*
-    Would produce:
-
-    <select name="shirts" multiple="multiple">
-        <option value="small" selected="selected">Small Shirt</option>
-        <option value="med">Medium Shirt</option>
-        <option value="large" selected="selected">Large Shirt</option>
-        <option value="xlarge">Extra Large Shirt</option>
-    </select>
-*/
+ * Would produce:
+ * <select name="shirts" multiple="multiple">
+ *     <option value="small" selected="selected">Small Shirt</option>
+ *     <option value="med">Medium Shirt</option>
+ *     <option value="large" selected="selected">Large Shirt</option>
+ *     <option value="xlarge">Extra Large Shirt</option>
+ * </select>
+ */
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index 1b235b7749..2a4f595f36 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -2,14 +2,12 @@
 
 $string = "Here is a simple string of text that will help us demonstrate this function.";
 echo word_wrap($string, 25);
-
 /*
-  Would produce:
-
-    Here is a simple string
-    of text that will help us
-    demonstrate this
-    function.
-
-  Excessively long words will be split, but URLs will not be.
-*/
+ * Would produce:
+ * Here is a simple string
+ * of text that will help us
+ * demonstrate this
+ * function.
+ *
+ * Excessively long words will be split, but URLs will not be.
+ */
diff --git a/user_guide_src/source/incoming/controllers/005.php b/user_guide_src/source/incoming/controllers/005.php
index 84b910be25..efaecbb8f4 100644
--- a/user_guide_src/source/incoming/controllers/005.php
+++ b/user_guide_src/source/incoming/controllers/005.php
@@ -1,9 +1,8 @@
 <?php
 
 /*
-  Folder and file structure:
-
-  \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+ * Folder and file structure:
+ * \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
  */
 
 $routes->get('helloworld', '\App\Controllers\HelloWorld::index');
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/010.php
index e223b7772d..a199c91bff 100644
--- a/user_guide_src/source/incoming/incomingrequest/010.php
+++ b/user_guide_src/source/incoming/incomingrequest/010.php
@@ -1,14 +1,14 @@
 <?php
 
 /*
-    With a request body of:
-    {
-        "foo": "bar",
-        "fizz": {
-            "buzz": "baz"
-        }
-    }
-*/
+ * With a request body of:
+ * {
+ *     "foo": "bar",
+ *     "fizz": {
+ *         "buzz": "baz"
+ *     }
+ * }
+ */
 
 $data = $request->getVar('foo');
 // $data = "bar"
diff --git a/user_guide_src/source/incoming/incomingrequest/013.php b/user_guide_src/source/incoming/incomingrequest/013.php
index bdb8b43b52..483662cbfa 100644
--- a/user_guide_src/source/incoming/incomingrequest/013.php
+++ b/user_guide_src/source/incoming/incomingrequest/013.php
@@ -3,10 +3,9 @@
 var_dump($request->getRawInput());
 
 /*
-    Outputs:
-
-    [
-        'Param1' => 'Value1',
-        'Param2' => 'Value2',
-    ]
-*/
+ * Outputs:
+ * [
+ *     'Param1' => 'Value1',
+ *     'Param2' => 'Value2',
+ * ]
+ */
diff --git a/user_guide_src/source/incoming/incomingrequest/015.php b/user_guide_src/source/incoming/incomingrequest/015.php
index 95d4832062..81043ae805 100644
--- a/user_guide_src/source/incoming/incomingrequest/015.php
+++ b/user_guide_src/source/incoming/incomingrequest/015.php
@@ -3,11 +3,10 @@
 var_dump($request->headers());
 
 /*
-    Outputs:
-
-    [
-        'Host'          => CodeIgniter\HTTP\Header,
-        'Cache-Control' => CodeIgniter\HTTP\Header,
-        'Accept'        => CodeIgniter\HTTP\Header,
-    ]
-*/
+ * Outputs:
+ * [
+ *     'Host'          => CodeIgniter\HTTP\Header,
+ *     'Cache-Control' => CodeIgniter\HTTP\Header,
+ *     'Accept'        => CodeIgniter\HTTP\Header,
+ * ]
+ */
diff --git a/user_guide_src/source/incoming/message/003.php b/user_guide_src/source/incoming/message/003.php
index 41aa837fb4..9d51f9a183 100644
--- a/user_guide_src/source/incoming/message/003.php
+++ b/user_guide_src/source/incoming/message/003.php
@@ -1,25 +1,22 @@
 <?php
 
 echo $message->header('Accept-Language');
-
 /*
-    Outputs something like:
-    'Accept-Language: en,en-US'
-*/
+ * Outputs something like:
+ * 'Accept-Language: en,en-US'
+ */
 
 echo $message->header('Accept-Language')->getValue();
-
 /*
-    Outputs something like:
-    [
-        'en',
-        'en-US'
-    ]
-*/
+ * Outputs something like:
+ * [
+ *     'en',
+ *     'en-US',
+ * ]
+ */
 
 echo $message->header('Accept-Language')->getValueLine();
-
 /*
-    Outputs something like:
-   'en,en-US'
-*/
+ * Outputs something like:
+ * en,en-US'
+ */
diff --git a/user_guide_src/source/incoming/message/005.php b/user_guide_src/source/incoming/message/005.php
index b67851a925..5c450073a3 100644
--- a/user_guide_src/source/incoming/message/005.php
+++ b/user_guide_src/source/incoming/message/005.php
@@ -1,8 +1,7 @@
 <?php
 
 echo $message->getHeaderLine('Accept-Language');
-
 /*
-    Outputs:
-    'en,en-US'
-*/
+ * Outputs:
+ * 'en,en-US'
+ */
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
index 9147c88614..410ed9980e 100644
--- a/user_guide_src/source/libraries/curlrequest/014.php
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -1,11 +1,9 @@
 <?php
 
 $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
-
 /*
-    Sets the following defaults:
-
-    'max'       => 5, // Maximum number of redirects to follow before stopping
-    'strict'    => true, // Ensure POST requests stay POST requests through redirects
-    'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
-*/
+ * Sets the following defaults:
+ * 'max'       => 5, // Maximum number of redirects to follow before stopping
+ * 'strict'    => true, // Ensure POST requests stay POST requests through redirects
+ * 'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+ */
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
index 60c076bc13..f2d8bb7255 100644
--- a/user_guide_src/source/libraries/uri/026.php
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -3,11 +3,10 @@
 $segments = $uri->getSegments();
 
 /*
-    Produces:
-
-    [
-        0 => 'users',
-        1 => '15',
-        2 => 'profile',
-    ]
-*/
+ * Produces:
+ * [
+ *     0 => 'users',
+ *     1 => '15',
+ *     2 => 'profile',
+ * ]
+ */
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index 8792a8a8f7..58f0749a0c 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -1,22 +1,21 @@
 <?php
 
 /*
-    The data to test:
-
-    [
-        'contacts' => [
-           'name' => 'Joe Smith',
-            'friends' => [
-                [
-                    'name' => 'Fred Flinstone',
-                ],
-                [
-                    'name' => 'Wilma',
-                ],
-            ]
-        ]
-    ]
-*/
+ * The data to test:
+ * [
+ *     'contacts' => [
+ *        'name' => 'Joe Smith',
+ *         'friends' => [
+ *             [
+ *                 'name' => 'Fred Flinstone',
+ *             ],
+ *             [
+ *                 'name' => 'Wilma',
+ *             ],
+ *         ]
+ *     ]
+ * ]
+ */
 
 // Joe Smith
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
index ec6b9c9adb..2754c41ac9 100644
--- a/user_guide_src/source/libraries/validation/011.php
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -1,16 +1,15 @@
 <?php
 
 /*
-    The data to test:
-
-    [
-        'user_ids' => [
-            1,
-            2,
-            3,
-        ]
-    ]
-*/
+ * The data to test:
+ * [
+ *     'user_ids' => [
+ *         1,
+ *         2,
+ *         3,
+ *     ]
+ * ]
+ */
 
 // Rule
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/026.php b/user_guide_src/source/libraries/validation/026.php
index e633f5cdd1..4488f2a6be 100644
--- a/user_guide_src/source/libraries/validation/026.php
+++ b/user_guide_src/source/libraries/validation/026.php
@@ -1,12 +1,10 @@
 <?php
 
 $errors = $validation->getErrors();
-
 /*
-   Produces:
-
-    [
-        'field1' => 'error message',
-        'field2' => 'error message',
-    ]
-*/
+ * Produces:
+ * [
+ *     'field1' => 'error message',
+ *     'field2' => 'error message',
+ * ]
+ */
diff --git a/user_guide_src/source/libraries/validation/028.2.php b/user_guide_src/source/libraries/validation/028.2.php
index 6ad70098c7..5470a1eece 100644
--- a/user_guide_src/source/libraries/validation/028.2.php
+++ b/user_guide_src/source/libraries/validation/028.2.php
@@ -1,13 +1,12 @@
 <?php
 
 /*
-    For errors:
-
-    [
-        'foo.0.bar'   => 'Error',
-        'foo.baz.bar' => 'Error',
-    ]
-*/
+ * For errors:
+ * [
+ *     'foo.0.bar'   => 'Error',
+ *     'foo.baz.bar' => 'Error',
+ * ]
+ */
 
 // returns true
 $validation->hasError('foo.*.bar');
diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
index 219c437b37..1ea3a26de6 100644
--- a/user_guide_src/source/models/entities/021.php
+++ b/user_guide_src/source/models/entities/021.php
@@ -10,16 +10,15 @@ class SomeHandler extends BaseCast
     {
         var_dump($params);
         /*
-            Output:
-
-            array(3) {
-              [0]=>
-              string(13) "App\SomeClass"
-              [1]=>
-              string(6) "param2"
-              [2]=>
-              string(6) "param3"
-            }
-        */
+         * Output:
+         * array(3) {
+         *   [0]=>
+         *   string(13) "App\SomeClass"
+         *   [1]=>
+         *   string(6) "param2"
+         *   [2]=>
+         *   string(6) "param3"
+         * }
+         */
     }
 }
diff --git a/user_guide_src/source/outgoing/response/021.php b/user_guide_src/source/outgoing/response/021.php
index 092a758b18..d5275cfb73 100644
--- a/user_guide_src/source/outgoing/response/021.php
+++ b/user_guide_src/source/outgoing/response/021.php
@@ -1,6 +1,7 @@
 <?php
 
 $response->noCache();
-
-// Sets the following header:
-// Cache-Control: no-store, max-age=0, no-cache
+/*
+ * Sets the following header:
+ * Cache-Control: no-store, max-age=0, no-cache
+ */
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 0350043cf4..5120c1eebf 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -9,8 +9,11 @@ class View extends BaseView
     public $plugins = [
         'foo' => '\Some\Class::methodName',
     ];
+
     // ...
 }
 
-// Tag is replaced by the return value of Some\Class::methodName static function.
-// {+ foo +}
+/*
+ * Tag is replaced by the return value of Some\Class::methodName() static function.
+ * {+ foo +}
+ */
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
index 3048a2851f..8a5c4d2488 100644
--- a/user_guide_src/source/testing/benchmark/004.php
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -1,15 +1,13 @@
 <?php
 
 $timers = $benchmark->getTimers();
-
 /*
-    Produces:
-
-    [
-        'render view'  => [
-            'start'    => 1234567890,
-            'end'      => 1345678920,
-            'duration' => 15.4315, // number of seconds
-        ]
-    ]
-*/
+ * Produces:
+ * [
+ *     'render view'  => [
+ *         'start'    => 1234567890,
+ *         'end'      => 1345678920,
+ *         'duration' => 15.4315, // number of seconds
+ *     ]
+ * ]
+ */
diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
index 060f5c551a..47e480c608 100644
--- a/user_guide_src/source/testing/response/030.php
+++ b/user_guide_src/source/testing/response/030.php
@@ -1,17 +1,14 @@
 <?php
 
 /*
-    Response body is this:
-
-    ['foo' => 'bar']
-*/
+ * Response body is this:
+ * ['foo' => 'bar']
+ */
 
 $json = $result->getJSON();
-
 /*
-    $json is this:
-
-    {
-        "foo": "bar"
-    }
+ * $json is this:
+ * {
+ *     "foo": "bar"
+ * }
 `*/
diff --git a/user_guide_src/source/testing/response/032.php b/user_guide_src/source/testing/response/032.php
index 6de63a9cfc..14f13f1942 100644
--- a/user_guide_src/source/testing/response/032.php
+++ b/user_guide_src/source/testing/response/032.php
@@ -1,12 +1,11 @@
 <?php
 
 /*
-    Response body is this:
-
-    [
-        'config' => ['key-a', 'key-b'],
-    ]
-*/
+ * Response body is this:
+ * [
+ *     'config' => ['key-a', 'key-b'],
+ * ]
+ */
 
 // Is true
 $result->assertJSONFragment(['config' => ['key-a']]);