Merge branch 'codeigniter4:develop' into patch-10

Author: obozdag

user_guide_src/source/database/index.rst

@@ -17,7 +17,7 @@ patterns. The database functions offer clear, simple syntax.
     Query Helper Methods <helpers>
     Query Builder Class <query_builder>
     Transactions <transactions>
-    Getting MetaData <metadata>
+    Getting Metadata <metadata>
     Custom Function Calls <call_function>
     Database Events <events>
     Database Utilities <utilities>

user_guide_src/source/database/metadata.rst

@@ -1,13 +1,13 @@
-#################
-Database Metadata
-#################
+################
+Getting Metadata
+################
 
 .. contents::
     :local:
     :depth: 2
 
 **************
-Table MetaData
+Table Metadata
 **************
 
 These functions let you fetch table information.
@@ -39,7 +39,7 @@ running an operation on it. Returns a boolean true/false. Usage example:
 .. note:: Replace *table_name* with the name of the table you are looking for.
 
 **************
-Field MetaData
+Field Metadata
 **************
 
 List the Fields in a Table
@@ -71,9 +71,7 @@ performing an action. Returns a boolean true/false. Usage example:
 
 .. literalinclude:: metadata/005.php
 
-.. note:: Replace *field_name* with the name of the column you are looking
-    for, and replace *table_name* with the name of the table you are
-    looking for.
+.. note:: Replace *field_name* and *table_name* with the column name and the table name you are looking for.
 
 Retrieve Field Metadata
 =======================
@@ -88,7 +86,7 @@ Returns an array of objects containing field information.
 Sometimes it's helpful to gather the field names or other metadata, like
 the column type, max length, etc.
 
-.. note:: Not all databases provide meta-data.
+.. note:: Not all databases provide metadata.
 
 Usage example:
 

user_guide_src/source/libraries/curlrequest/009.php

@@ -1,4 +1,4 @@
 <?php
 
-$code   = $response->getStatusCode(); // 200
-$reason = $response->getReason(); // OK
+$code   = $response->getStatusCode();   // 200
+$reason = $response->getReasonPhrase(); // OK

user_guide_src/source/models/model.rst

@@ -34,7 +34,7 @@ See :ref:`factories-loading-class` for details on the first parameter.
 CodeIgniter's Model
 *******************
 
-CodeIgniter does provide a model class that provides a few nice features, including:
+CodeIgniter does provide a model class that has a few nice features, including:
 
 - automatic database connection
 - basic CRUD methods
@@ -580,7 +580,7 @@ automatically, based on whether it finds an array key matching the **primary key
 The save method also can make working with custom class result objects much simpler by recognizing a non-simple
 object and grabbing its public and protected values into an array, which is then passed to the appropriate
 insert or update method. This allows you to work with Entity classes in a very clean way. Entity classes are
-simple classes that represent a single instance of an object type, like a user, a blog post, job, etc. This
+simple classes that represent a single instance of an object type, like a user, a blog post, a job, etc. This
 class is responsible for maintaining the business logic surrounding the object itself, like formatting
 elements in a certain way, etc. They shouldn't have any idea about how they are saved to the database. At their
 simplest, they might look like this: