Merge pull request #2344 from dafriend/setup.vs.set_up

lonnieezell · web-flow · commit 5fd2b55d4c2a · 2019-10-17T21:43:42.000-05:00
Setup vs Set Up
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
@@ -71,7 +71,7 @@ non-writable as an added security measure.
 
 tests
 -----
-This directory is setup to hold your test files. The ``_support`` directory holds various mock classes and other
+This directory is set up to hold your test files. The ``_support`` directory holds various mock classes and other
 utilities that you can use while writing your tests. This directory does not need to be transferred to your
 production servers.
 
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
@@ -4,7 +4,7 @@ Error Handling
 
 CodeIgniter builds error reporting into your system through Exceptions, both the `SPL collection <http://php.net/manual/en/spl.exceptions.php>`_, as
 well as a few custom exceptions that are provided by the framework. Depending on your environment's setup, the
-default action when an error or exception is thrown is to display a detailed error report, unless the application
+the default action when an error or exception is thrown is to display a detailed error report unless the application
 is running under the ``production`` environment. In this case, a more generic message is displayed to
 keep the best user experience for your users.
 
@@ -82,7 +82,7 @@ To ignore logging on other status codes, you can set the status code to ignore i
     }
 
 .. note:: It is possible that logging still will not happen for exceptions if your current Log settings
-    are not setup to log **critical** errors, which all exceptions are logged as.
+    are not set up to log **critical** errors, which all exceptions are logged as.
 
 Custom Exceptions
 =================
diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
@@ -66,7 +66,7 @@ Loading from Non-standard Locations
 
 Helpers can be loaded from directories outside of **app/Helpers** and
 **system/Helpers**, as long as that path can be found through a namespace that
-has been setup within the PSR-4 section of the :doc:`Autoloader config file <../concepts/autoloader>`.
+has been set up within the PSR-4 section of the :doc:`Autoloader config file <../concepts/autoloader>`.
 You would prefix the name of the Helper with the namespace that it can be located
 in. Within that namespaced directory, the loader expects it to live within a
 sub-directory named ``Helpers``. An example will help understand this.
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
@@ -39,10 +39,9 @@ Open **app/Config/Autoload.php** and add the **Acme** namespace to the ``psr4``
         'Acme'          => ROOTPATH.'acme'
     ];
 
-Now that this is setup we can access any file within the **acme** folder through the ``Acme`` namespace. This alone
-takes care of 80% of what is needed for modules to work, so you should be sure to familiarize yourself within namespaces
-and become comfortable with their use. A number of the file types will be scanned for automatically through all defined
-namespaces here, making this crucial to working with modules at all.
+Now that this is set up, we can access any file within the **acme** folder through the ``Acme`` namespace. This alone
+takes care of 80% of what is needed for modules to work, so you should be sure to familiarize yourself with namespaces
+and become comfortable with their use. Several file types will be scanned for automatically through all defined namespaces - a crucial ingredient for working with modules.
 
 A common directory structure within a module will mimic the main application folder::
 
diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
@@ -27,7 +27,7 @@ the latest released version of the framework.
 This installation technique would suit a developer who wishes to start
 a new CodeIgniter4 based project.
 
-Installation & Setup
+Installation & Set Up
 -------------------------------------------------------
 
 In the folder above your project root::
@@ -75,7 +75,7 @@ You still need to check for ``app/Config`` changes after updating
 Structure
 -------------------------------------------------------
 
-Folders in your project after setup:
+Folders in your project after set up:
 
 - app, public, tests, writable 
 - vendor/codeigniter4/framework/system
@@ -84,7 +84,7 @@ Folders in your project after setup:
 Dev Starter
 ============================================================
 
-Installation & Setup
+Installation & Set Up
 -------------------------------------------------------
 
 The `CodeIgniter 4 dev starter <https://github.com/codeigniter4/devstarter>`_ 
@@ -140,7 +140,7 @@ You still need to check for ``app/Config`` changes after updating.
 Structure
 -------------------------------------------------------
 
-Folders in your project after setup:
+Folders in your project after set up:
 
 - app, public, tests, writable 
 - vendor/codeigniter4/codeigniter4/system
@@ -163,7 +163,7 @@ In your project root::
 As with the earlier two composer install methods, you can omit installing
 phpunit and its dependencies by adding the "--no-dev" argument to the "composer require" command.
 
-Setup
+Set Up
 -------------------------------------------------------
 
 Copy the app, public, tests and writable folders from ``vendor/codeigniter4/framework`` 
@@ -198,7 +198,7 @@ You still need to check for ``app/Config`` changes after updating
 Structure
 -------------------------------------------------------
 
-Folders in your project after setup:
+Folders in your project after set up:
 
 - app, public, tests, writable 
 - vendor/codeigniter4/framework/system
diff --git a/user_guide_src/source/installation/installing_git.rst b/user_guide_src/source/installation/installing_git.rst
@@ -12,13 +12,13 @@ Install the latest version of the codebase by
 - forking the `codebase  <https://github.com/codeigniter4/CodeIgniter4>`_ to your github account
 - cloning **your** forked repository locally
 
-Setup
+Setting Up
 -------------------------------------------------------
 
 The command above will create a "CodeIgniter4" folder.
 Feel free to rename that as you see fit.
 
-You will want to setup a remote repository alias, so you can synchronize
+You will want to set up a remote repository alias, so you can synchronize
 your repository with the main one::
 
     git remote add upstream https://github.com/codeigniter4/CodeIgniter4.git
@@ -59,7 +59,7 @@ You would not use this technique for app development.
 Structure
 -------------------------------------------------------
 
-Folders in your project after setup:
+Folders in your project after set up:
 
 - app, public, system, tests, user_guide_src, writable
 
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
@@ -18,7 +18,7 @@ Installation
 Download the `latest version <https://github.com/CodeIgniter4/framework/releases/latest>`_,
 and extract it to become your project root.
 
-Setup
+Setting Up
 -------------------------------------------------------
 
 None
@@ -45,7 +45,7 @@ You are responsible for merge conflicts when updating
 Structure
 -------------------------------------------------------
 
-Folders in your project after setup:
+Folders in your project after set up:
 app, public, system, writable 
 
 
diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
@@ -12,7 +12,7 @@ This section addresses how to use each technique, and explains some of the pros
 If you’re new to CodeIgniter, please read the :doc:`Getting Started </intro/index>`
 section of the User Guide to begin learning how to build dynamic PHP applications. Enjoy!
 
-Initial Configuration & Setup
+Initial Configuration & Set Up
 =================================================
 
 #. Open the **app/Config/App.php** file with a text editor and
@@ -102,7 +102,7 @@ Virtual Hosting
 -------------------------------------------------------
 
 We recommend using “virtual hosting” to run your apps. 
-You can setup different aliases for each of the apps you work on,
+You can set up different aliases for each of the apps you work on,
 
 Make sure that the virtual hosting module is enabled (uncommented) in the main 
 configuration file, eg. ``apache2/conf/httpd.conf``::
@@ -147,22 +147,22 @@ isolated environment for testing.
 The codebase comes with a ``VagrantFile.dist``, that can be copied to ``VagrantFile``
 and tailored for your system, for instance enabling access to specific database or caching engines.
 
-Setup
+Setting Up
 -------------------------------------------------------
 
 It assumes that you have installed `VirtualBox <https://www.virtualbox.org/wiki/Downloads>`_ and 
 `Vagrant <https://www.vagrantup.com/downloads.html>`_ 
 for your platform.
 
-The Vagrant configuration file assumes you have the `ubuntu/bionic64 Vagrant box 
-<https://app.vagrantup.com/ubuntu/boxes/bionic64>`_ setup on your system::
+The Vagrant configuration file assumes you have set up a `ubuntu/bionic64 Vagrant box 
+<https://app.vagrantup.com/ubuntu/boxes/bionic64>`_ on your system::
 
     vagrant box add ubuntu/bionic64
 
 Testing
 -------------------------------------------------------
 
-Once setup, you can then launch your webapp inside a VM, with the command::
+Once set up, you can then launch your webapp inside a VM, with the command::
 
     vagrant up
 
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
@@ -21,7 +21,7 @@ I have to include index.php in my URL
 
 If a URL like ``/mypage/find/apple`` doesn't work, but the similar
 URL ``/index.php/mypage/find/apple`` does, that sounds like your ``.htaccess`` rules
-(for Apache) are not setup properly, or the ``mod_rewrite`` extension
+(for Apache) are not set up properly, or the ``mod_rewrite`` extension
 in Apache's ``httpd.conf`` is commented out.
 
 Only the default page loads
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
@@ -20,7 +20,7 @@ Paginating Database Results
 
 In most cases, you will be using the Pager library in order to paginate results that you retrieve from the database.
 When using the :doc:`Model </models/model>` class, you can use its built-in ``paginate()`` method to automatically
-retrieve the current batch of results, as well as setup the Pager library so it's ready to use in your controllers.
+retrieve the current batch of results, as well as set up the Pager library so it's ready to use in your controllers.
 It even reads the current page it should display from the current URL via a ``page=X`` query variable.
 
 To provide a paginated list of users in your application, your controller's method would look something like::
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
@@ -34,7 +34,7 @@ Let's say that a third-party script was trying to hit a URL repeatedly. At first
 of those tokens in less than a second. However, after that the Throttler would only allow one action per second,
 potentially slowing down the requests enough that they attack is no longer worth it.
 
-.. note:: For the Throttler class to work, the Cache library must be setup to use a handler other than dummy.
+.. note:: For the Throttler class to work, the Cache library must be set up to use a handler other than dummy.
             For best performance, an in-memory cache, like Redis or Memcached, is recommended.
 
 *************
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
@@ -226,7 +226,7 @@ Like, ``setRule()``, but accepts an array of field names and their rules::
         'password' => 'required|min_length[10]'
     ]);
 
-To give a labeled error message you can setup as::
+To give a labeled error message you can set up as::
 
     $validation->setRules([
         'username' => ['label' => 'Username', 'rules' => 'required'],
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
@@ -608,7 +608,7 @@ need it::
 
 	$builder = $userModel->builder();
 
-This builder is already setup with the model's $table.
+This builder is already set up with the model's $table.
 
 You can also use Query Builder methods and the Model's CRUD methods in the same chained call, allowing for
 very elegant use::
diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
@@ -40,7 +40,7 @@ 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 fall back 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**
+cannot be found. If the locale code was set to **en-US** and we only have language files set up for **en**
 then those will be used since nothing exists for the more specific **en-US**. If, however, a language
 directory existed at **app/Language/en-US** then that would be used first.
 
@@ -55,7 +55,7 @@ will be used to set the locale.
 Content Negotiation
 -------------------
 
-You can setup content negotiation to happen automatically by setting two additional settings in Config/App.
+You can set up content negotiation to happen automatically by setting two additional settings in Config/App.
 The first value tells the Request class that we do want to negotiate a locale, so simply set it to true::
 
     public $negotiateLocale = true;
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
@@ -103,7 +103,7 @@ You can store views under a **View** directory that is namespaced, and load that
 PHP does not support loading non-class files from a namespace, CodeIgniter provides this feature to make it possible
 to package your views together in a module-like fashion for easy re-use or distribution.
 
-If you have ``Blog`` directory that has a PSR-4 mapping setup in the :doc:`Autoloader </concepts/autoloader>` living
+If you have ``Blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
 example, you could load the **BlogView** file from **/blog/views** by prepending the namespace to the view name::
 
diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst
@@ -4,7 +4,7 @@ Benchmarking
 
 CodeIgniter provides two separate tools to help you benchmark your code and test different options:
 the Timer and the Iterator. The Timer allows you to easily calculate the time between two points in the
-execution of your script. The Iterator allows you to setup several variations and runs those tests, recording
+execution of your script. The Iterator allows you to set up several variations and runs those tests, recording
 performance and memory statistics to help you decide which version is the best.
 
 The Timer class is always active, being started from the moment the framework is invoked until right before
diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
@@ -46,16 +46,16 @@ of the functionality described here::
         }
     }
 
-Test Database Setup
-===================
+Setting Up a Test Database
+==========================
 
 When running database tests, you need to provide a database that can be used during testing. Instead of
 using the PHPUnit built-in database features, the framework provides tools specific to CodeIgniter. The first
-step is to ensure that you have a ``tests`` database group setup in **app/Config/Database.php**.
+step is to ensure that you have set up a ``tests`` database group in **app/Config/Database.php**.
 This specifies a database connection that is only used while running tests, to keep your other data safe.
 
-If you have multiple developers on your team, you will likely want to keep your credentials store in
-the **.env** file. To do so, edit the file to ensure the following lines are present, and have the
+If you have multiple developers on your team, you will likely want to keep your credentials stored in
+the **.env** file. To do so, edit the file to ensure the following lines are present and have the
 correct information::
 
     database.tests.dbdriver = 'MySQLi';
@@ -66,8 +66,8 @@ correct information::
 Migrations and Seeds
 --------------------
 
-When running tests you need to ensure that your database has the correct schema setup, and that
-it is in a known state for every test. You can use migrations and seeds to setup your database,
+When running tests, you need to ensure that your database has the correct schema set up and that
+it is in a known state for every test. You can use migrations and seeds to set up your database,
 by adding a couple of class properties to your test.
 ::
 
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
@@ -11,7 +11,7 @@ helper methods to make testing every aspect of your application as painless as p
     :depth: 2
 
 ************
-System Setup
+System Set Up
 ************
 
 Installing phpUnit
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
@@ -99,7 +99,7 @@ This could be as simple as:::
 Model Updating
 -------------------------------------------------------
 
-The only thing that remains is ensuring that your model is setup
+The only thing that remains is ensuring that your model is set up
 to allow data to be saved properly. The ``save()`` method that was
 used will determine whether the information should be inserted
 or if the row already exists and should be updated, based on the presence
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
@@ -9,7 +9,7 @@ and start using a database.
 Create a database to work with
 -------------------------------------------------------
 
-The CodeIgniter installation assumes that you have setup an appropriate
+The CodeIgniter installation assumes that you have set up an appropriate
 database, as outlined in the :doc:`requirements </intro/requirements>`.
 In this tutorial, we provide SQL code for a MySQL database, and 
 we also assume that you have a suitable client for issuing database
