Merge pull request #4042 from totoprayogo1916/update/userguide/e.g.,-i.e.,

[UG] a comma after use: i.e., and e.g.,

Author: paulbalandan

user_guide_src/source/cli/cli_generators.rst

@@ -203,7 +203,7 @@ Options:
 
 .. note:: Working on modules? Code generation will set the root namespace to a default of ``APP_NAMESPACE``.
     Should you need to have the generated code elsewhere in your module namespace, make sure to set
-    the ``-n`` option in your command, e.g. ``php spark make:model blog -n Acme\Blog``.
+    the ``-n`` option in your command, e.g., ``php spark make:model blog -n Acme\Blog``.
 
 .. warning:: Make sure when setting the ``-n`` option that the supplied namespace is a valid namespace
     defined in your ``$psr4`` array in ``Config\Autoload`` or defined in your composer autoload file.
@@ -344,12 +344,12 @@ which is public and need not be overridden as it is essentially complete.
     ``getNamespacedClass`` and ``getTemplate``, or else you will get a PHP fatal error.
 
 .. note:: ``GeneratorCommand`` has the default argument of ``['name' => 'Class name']``. You can
-    override the description by supplying the name in your ``$arguments`` property, e.g. ``['name' => 'Module class name']``.
+    override the description by supplying the name in your ``$arguments`` property, e.g., ``['name' => 'Module class name']``.
 
 .. note:: ``GeneratorCommand`` has the default options of ``-n`` and ``--force``. Child classes cannot override
     these two properties as they are crucial in the implementation of the code generation.
 
 .. note:: Generators are default listed under the ``Generators`` namespace because it is the default group
     name in ``GeneratorCommand``. If you want to have your own generator listed elsewhere under a different
     namespace, you will just need to provide the ``$group`` property in your child generator,
-    e.g. ``protected $group = 'CodeIgniter';``.
+    e.g., ``protected $group = 'CodeIgniter';``.

user_guide_src/source/concepts/factories.rst

@@ -16,7 +16,7 @@ anywhere. This is a great way to reuse object states and reduce memory load from
 multiple instances loaded across your app.
 
 Anything can be loaded by Factories, but the best examples are those classes that are used
-to work on or transmit common data. The framework itself uses Factories internally, e.g. to
+to work on or transmit common data. The framework itself uses Factories internally, e.g., to
 make sure the correct configuration is loaded when using the ``Config`` class. 
 
 Take a look at ``Models`` as an example. You can access the Factory specific to ``Models``

user_guide_src/source/concepts/http.rst

@@ -74,7 +74,7 @@ is an object-oriented representation of the HTTP request. It provides everything
 
     $request = service('request');
 
-    // the URI being requested (i.e. /about)
+    // the URI being requested (i.e., /about)
     $request->uri->getPath();
 
     // Retrieve $_GET and $_POST variables
@@ -100,7 +100,7 @@ is an object-oriented representation of the HTTP request. It provides everything
 The request class does a lot of work in the background for you, that you never need to worry about.
 The `isAJAX()` and `isSecure()` methods check several different methods to determine the correct answer.
 
-.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e. fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
+.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 
 CodeIgniter also provides a :doc:`Response class </outgoing/response>` that is an object-oriented representation
 of the HTTP response. This gives you an easy and powerful way to construct your response to the client::

user_guide_src/source/database/configuration.rst

@@ -65,7 +65,7 @@ add the config variables as a query string::
 	// Postgre
 	$default['DSN'] = 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1';
 
-.. note:: If you provide a DSN string and it is missing some valid settings (e.g. the
+.. note:: If you provide a DSN string and it is missing some valid settings (e.g., the
 	database character set), which are present in the rest of the configuration
 	fields, CodeIgniter will append them.
 

user_guide_src/source/database/query_builder.rst

@@ -412,7 +412,7 @@ searches.
 
 .. note:: All ``like*`` method variations can be forced to perform case-insensitive searches by passing
         a fifth parameter of ``true`` to the method. This will use platform-specific features where available
-        otherwise, will force the values to be lowercase, i.e. ``WHERE LOWER(column) LIKE '%search%'``. This
+        otherwise, will force the values to be lowercase, i.e., ``WHERE LOWER(column) LIKE '%search%'``. This
         may require indexes to be made for ``LOWER(column)`` instead of ``column`` to be effective.
 
 #. **Simple key/value method:**
@@ -609,7 +609,7 @@ searches.
 
 .. note:: All ``havingLike*`` method variations can be forced to perform case-insensitive searches by passing
         a fifth parameter of ``true`` to the method. This will use platform-specific features where available
-        otherwise, will force the values to be lowercase, i.e. ``HAVING LOWER(column) LIKE '%search%'``. This
+        otherwise, will force the values to be lowercase, i.e., ``HAVING LOWER(column) LIKE '%search%'``. This
         may require indexes to be made for ``LOWER(column)`` instead of ``column`` to be effective.
 
 #. **Simple key/value method:**

user_guide_src/source/dbmgmt/migration.rst

@@ -27,7 +27,7 @@ Migration file names
 
 Each Migration is run in numeric order forward or backwards depending on the
 method taken. Each migration is numbered using the timestamp when the migration
-was created, in **YYYYMMDDHHIISS** format (e.g. **20121031100537**). This
+was created, in **YYYYMMDDHHIISS** format (e.g., **20121031100537**). This
 helps prevent numbering conflicts when working in a team environment.
 
 Prefix your migration files with the migration number followed by an underscore
@@ -306,7 +306,7 @@ Class Reference
 
 	.. php:method:: regress($batch, $group)
 
-		:param	mixed	$batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g. -3 means "three batches back")
+		:param	mixed	$batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g., -3 means "three batches back")
 		:param	mixed	$group: database group name, if null default database group will be used.
 		:returns:	``true`` on success, ``false`` on failure or no migrations are found
 		:rtype:	bool

user_guide_src/source/extending/contributing.rst

@@ -51,11 +51,11 @@ If you've found a critical vulnerability, we'd be happy to credit you in our
 Tips for a Good Issue Report
 ****************************
 
-Use a descriptive subject line (eg parser library chokes on commas) rather than a vague one (eg. your code broke).
+Use a descriptive subject line (eg parser library chokes on commas) rather than a vague one (e.g., your code broke).
 
 Address a single issue in a report.
 
-Identify the CodeIgniter version (eg 4.0.1) and the component if you know it (eg. parser library)
+Identify the CodeIgniter version (eg 4.0.1) and the component if you know it (e.g., parser library)
 
 Explain what you expected to happen, and what did happen.
 Include error messages and stack trace, if any.

user_guide_src/source/general/ajax.rst

@@ -2,7 +2,7 @@
 AJAX Requests
 ##############
 
-The ``IncomingRequest::isAJAX()`` method uses the ``X-Requested-With`` header to define whether the request is XHR or normal. However, the most recent JavaScript implementations (i.e. fetch) no longer send this header along with the request, thus the use of ``IncomingRequest::isAJAX()`` becomes less reliable, because without this header it is not possible to define whether the request is or not XHR.
+The ``IncomingRequest::isAJAX()`` method uses the ``X-Requested-With`` header to define whether the request is XHR or normal. However, the most recent JavaScript implementations (i.e., fetch) no longer send this header along with the request, thus the use of ``IncomingRequest::isAJAX()`` becomes less reliable, because without this header it is not possible to define whether the request is or not XHR.
 
 To get around this problem, the most efficient solution (so far) is to manually define the request header, forcing the information to be sent to the server, which will then be able to identify that the request is XHR.
 

user_guide_src/source/general/logging.rst

@@ -130,7 +130,7 @@ Several core placeholders exist that will be automatically expanded for you base
 +----------------+---------------------------------------------------+
 | {session_vars} | $_SESSION variables                               |
 +----------------+---------------------------------------------------+
-| {env}          | Current environment name, i.e. development        |
+| {env}          | Current environment name, i.e., development       |
 +----------------+---------------------------------------------------+
 | {file}         | The name of file calling the logger               |
 +----------------+---------------------------------------------------+

user_guide_src/source/helpers/form_helper.rst

@@ -208,7 +208,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-	:param  string  $type: The type of input field. i.e. 'text', 'email', 'number', etc.
+	:param  string  $type: The type of input field. i.e., 'text', 'email', 'number', etc.
 	:returns:	An HTML text input field tag
 	:rtype:	string
 
@@ -382,7 +382,7 @@ The following functions are available:
 
     	The parameter usage is identical to using :php:func:`form_dropdown()` above,
 	except of course that the name of the field will need to use POST array
-	syntax, e.g. foo[].
+	syntax, e.g., foo[].
 
 .. php:function:: form_fieldset([$legend_text = ''[, $attributes = []]])
 
@@ -615,7 +615,7 @@ The following functions are available:
     	second (optional) parameter allows you to set a default value for the
     	form. The third (optional) parameter allows you to turn off HTML escaping
     	of the value, in case you need to use this function in combination with
-    	i.e. :php:func:`form_input()` and avoid double-escaping.
+    	i.e., :php:func:`form_input()` and avoid double-escaping.
 
 	Example::