Cleanup typos

Author: jim-parry

user_guide_src/source/concepts/http.rst

@@ -12,18 +12,18 @@ how to work with the requests and responses within CodeIgniter.
 What is HTTP?
 =============
 
-HTTP is simply a text-based language that allows two machines to talk to each other. When a browser
+HTTP is simply a text-based convention that allows two machines to talk to each other. When a browser
 requests a page, it asks the server if it can get the page. The server then prepares the page and sends
-response back to the browser that asked for it. That's pretty much it. Obviously, there are some complexities
+a response back to the browser that asked for it. That's pretty much it. Obviously, there are some complexities
 that you can use, but the basics are really pretty simple.
 
-HTTP is the term used to describe that language. It stands for HyperText Transfer Protocol. Your goal when
+HTTP is the term used to describe that exchange convention. It stands for HyperText Transfer Protocol. Your goal when
 you develop web applications is to always understand what the browser is requesting, and be able to
 respond appropriately.
 
 The Request
 -----------
-Whenever a client makes a request (a web browser, smartphone app, etc), it is sending a small text message
+Whenever a client (a web browser, smartphone app, etc) makes a request, it sends a small text message
 to the server and waits for a response.
 
 The request would look something like this::
@@ -67,7 +67,7 @@ Working with Requests and Responses
 -----------------------------------
 
 While PHP provides ways to interact with the request and response headers, CodeIgniter, like most frameworks,
-abstract them so that you have a consistent, simple interface to them. The :doc:`IncomingRequest class </libraries/incomingrequest>`
+abstracts them so that you have a consistent, simple interface to them. The :doc:`IncomingRequest class </libraries/incomingrequest>`
 is an object-oriented representation of the HTTP request. It provides everything you need::
 
 	use CodeIgniter\HTTP\IncomingRequest;

user_guide_src/source/concepts/mvc.rst

@@ -73,11 +73,11 @@ then determine what to do with it. This often involves passing the data to a mod
 the model that is then passed on to the view to be displayed. This also includes loading up other utility classes,
 if needed, to handle specialized tasks that is outside of the purview of the model.
 
-The other responsibility of the controller is to handles everything that pertains to HTTP requests - redirects,
+The other responsibility of the controller is to handle everything that pertains to HTTP requests - redirects,
 authentication, web safety, encoding, etc. In short, the controller is where you make sure that people are allowed to
 be there, and they get the data they need in a format they can use.
 
 Controllers are typically stored in **/application/Controllers**, though they can use a namespace to be grouped however
 you need.
 
-:doc:`Find out more about controllers </general/controllers>`
+:doc:`Find out more about controllers </general/controllers>`

user_guide_src/source/concepts/structure.rst

@@ -74,14 +74,11 @@ production servers.
 
 docs
 ----
-This directory holds the CodeIgniter documentation. The ``user_guide`` subfolder contains a local copy of the
-User Guide, and the ``api_docs`` subfolder contains a local copy of the CodeIgniter components API reference.
+This directory holds a local copy of the CodeIgniter4
+User Guide.
 
 Modifying Directory Locations
 -----------------------------
 
-If you've relocated any of the main directories, you can let the application
-know the new location within the main ``index.php`` file.
-
-Starting around line 50, you will find three variables that hold the location to the **application**,
-**system**, and **writable** directories. These paths are relative to **index.php**.
+If you've relocated any of the main directories, you can change the configuration
+settings inside ``application/Config/Paths``.

user_guide_src/source/general/cli.rst

@@ -1,6 +1,6 @@
-###################
-Running via the CLI
-###################
+############################
+Running via the Command Line
+############################
 
 As well as calling an applications :doc:`Controllers <./controllers>`
 via the URL in a browser they can also be loaded via the command-line

user_guide_src/source/general/configuration.rst

@@ -68,7 +68,7 @@ you will have settings that might change depending on the server it's running on
 database settings, API credentials, and other settings that will vary between deploys.
 
 You can store values in a **.env** file in the root directory, alongside the system and application directories.
-It is simply a collection of name/value pairs separated by an equal sign, much like a .ini file::
+It is simply a collection of name/value pairs separated by an equal sign, much like a ".ini" file::
 
 	S3_BUCKET="dotenv"
 	SECRET_KEY="super_secret_key"
@@ -104,7 +104,7 @@ variable name within ``${...}``::
 Namespaced Variables
 ====================
 
-There will be times when you will have several variables of the same name. When this happens, the
+There will be times when you will have several variables with the same name. When this happens, the
 system has no way of knowing what the correct value should be. You can protect against this by
 "namespacing" the variables.
 

user_guide_src/source/general/filters.rst

@@ -177,4 +177,4 @@ a list of URI patterns that filter should apply to::
 Provided Filters
 ================
 
-To be determined.
+Three filters are bundled with CodeIgniter4: Honeypot, Security, and Throttler.

user_guide_src/source/general/managing_apps.rst

@@ -3,7 +3,7 @@ Managing your Applications
 ##########################
 
 By default it is assumed that you only intend to use CodeIgniter to
-manage one application, which you will build in your **application/**
+manage one application, which you will build in your **application**
 directory. It is possible, however, to have multiple sets of
 applications that share a single CodeIgniter installation, or even to
 rename or relocate your application directory.
@@ -12,7 +12,7 @@ Renaming the Application Directory
 ==================================
 
 If you would like to rename your application directory you may do so
-as long as you open your main **index.php** file and set its name using
+as long as you open **application/Config/Paths.php** file and set its name using
 the ``$application_directory`` variable::
 
 	$application_directory = 'application';

user_guide_src/source/libraries/localization.rst

@@ -39,9 +39,9 @@ language codes like en-US for American English, or fr-FR, for French/France. A m
 to this can be found on the `W3C's site <https://www.w3.org/International/articles/language-tags/>`_.
 
 The system is smart enough to fallback to more generic language codes if an exact match
-cannot be found. If the locale code was set to **en_US** and we only have language files setup for **en**
-then those will be used since nothing exists for the more specific **en_US**. If, however, a language
-directory existed at **application/Language/en_US** then that we be used first.
+cannot be found. If the locale code was set to **en-US** and we only have language files setup for **en**
+then those will be used since nothing exists for the more specific **en-US**. If, however, a language
+directory existed at **application/Language/en-US** then that would be used first.
 
 Locale Detection
 ================
@@ -64,7 +64,7 @@ of locales that you have defined in ``$supportLocales``. If no match is found be
 that you support, and the requested language, the first item in $supportedLocales will be used. In
 the following example, the **en** locale would be used if no match is found::
 
-    public $supportedLocales = ['en', 'es', 'fr_FR'];
+    public $supportedLocales = ['en', 'es', 'fr-FR'];
 
 In Routes
 ---------
@@ -108,7 +108,7 @@ Language Localization
 Creating Language Files
 =======================
 
-Language do not have any specific naming convention that are required. The file should be named logically to
+Languages do not have any specific naming convention that are required. The file should be named logically to
 describe the type of content it holds. For example, let's say you want to create a file containing error messages.
 You might name it simply: **Errors.php**.
 
@@ -234,12 +234,12 @@ third parameter to the ``lang()`` method.
 ::
 
     // Displays "The time is now 23:21:28 GMT-5"
-    echo lang('Test.longTime', [time()], 'ru_RU');
+    echo lang('Test.longTime', [time()], 'ru-RU');
 
     // Displays "£7.41"
-    echo lang('{price, number, currency}', ['price' => 7.41], 'en_GB');
+    echo lang('{price, number, currency}', ['price' => 7.41], 'en-GB');
     // Displays "$7.41"
-    echo lang('{price, number, currency}', ['price' => 7.41], 'en_US');
+    echo lang('{price, number, currency}', ['price' => 7.41], 'en-US');
 
 Nested Arrays
 -------------

user_guide_src/source/libraries/typography.rst

@@ -2,7 +2,7 @@
 Typography
 ##########
 
-The Typography libary contains methods that help your format text
+The Typography libary contains methods that help you format text
 in semantically relevant ways.
 
 *******************

user_guide_src/source/testing/overview.rst

@@ -44,14 +44,6 @@ The other option is to download the .phar file from the `phpUnit <https://phpuni
 This is standalone file that should be placed within your project root.
 
 
-phpunit.xml
-===========
-
-A basic configuration for phpUnit has already been defined in ``phpunit.xml.dist``. Any project-specific changes to
-this file should be done in a separate file so that it doesn't get overwritten by any framework updates. Copying the file
-to ``phpunit.xml`` will create a file that phpUnit will use instead of the original file.
-
-
 ************************
 Testing Your Application
 ************************
@@ -205,10 +197,7 @@ Removes all mocked classes from the Services class, bringing it back to its orig
 Stream Filters
 ==============
 
-Some stream filters have been provided as an alternate to these helper methods.
-
-CITestStreamFilter
-------------------
+**CITestStreamFilter** provides an alternate to these helper methods.
 
 You may need to test things that are difficult to test. Sometimes, capturing a stream, like PHP's own STDOUT, or STDERR,
 might be helpful. The ``CITestStreamFilter`` helps you capture the output from the stream of your choice.