Merge branch 'develop' of github.com:bcit-ci/CodeIgniter4 into develop

.gitignore

@@ -88,6 +88,9 @@ composer.lock
 # Modules Testing
 _modules/*
 
+# phpenv local config
+.php-version
+
 # Jetbrains editors (PHPStorm, etc)
 .idea/
 *.iml
@@ -102,10 +105,14 @@ nbactions.xml
 nb-configuration.xml
 .nb-gradle/
 
-## Sublime Text
+# Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache
 *.sublime-workspace
 *.sublime-project
-/api/
+/api/
+
+# Visual Studio Code
+.vscode/
+

user_guide_src/source/database/query_builder.rst

@@ -523,8 +523,8 @@ The second parameter lets you set a result offset.
 
 **$builder->countAllResults()**
 
-Permits you to determine the number of rows in a particular Active
-Record query. Queries will accept Query Builder restrictors such as
+Permits you to determine the number of rows in a particular Query
+Builder query. Queries will accept Query Builder restrictors such as
 ``where()``, ``orWhere()``, ``like()``, ``orLike()``, etc. Example::
 
 	echo $builder->countAllResults('my_table');  // Produces an integer, like 25
@@ -623,8 +623,7 @@ Here is an example using an object::
 	$builder->insert($object);
 	// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
 
-The first parameter will contain the table name, the second is an
-object.
+The first parameter is an object.
 
 .. note:: All values are escaped automatically producing safer queries.
 
@@ -898,9 +897,9 @@ Generates a delete SQL string and runs the query.
 
 	$builder->delete(array('id' => $id));  // Produces: // DELETE FROM mytable  // WHERE id = $id
 
-The first parameter is the table name, the second is the where clause.
+The first parameter is the where clause.
 You can also use the where() or or_where() functions instead of passing
-the data to the second parameter of the function::
+the data to the first parameter of the function::
 
 	$builder->where('id', $id);
 	$builder->delete();