Merge pull request #1235 from jim-parry/doc/fixes

Doc/fixes

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/services.rst

@@ -2,6 +2,10 @@
 Services
 ########
 
+.. contents::
+    :local:
+    :depth: 2
+
 Introduction
 ============
 

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/database/configuration.rst

@@ -2,6 +2,10 @@
 Database Configuration
 ######################
 
+.. contents::
+    :local:
+    :depth: 2
+
 CodeIgniter has a config file that lets you store your database
 connection values (username, password, database name, etc.). The config
 file is located at application/Config/Database.php. You can also set

user_guide_src/source/database/entities.rst

@@ -6,8 +6,9 @@ CodeIgniter supports Entity classes as a first-class citizen in it's database la
 them completely optional to use. They are commonly used as part of the Repository pattern, but can
 be used directly with the :doc:`Model </database/model>` if that fits your needs better.
 
-.. contents:: Page Contents
-	:local:
+.. contents::
+    :local:
+    :depth: 2
 
 Entity Usage
 ============

user_guide_src/source/database/forge.rst

@@ -5,8 +5,9 @@ Database Forge Class
 The Database Forge Class contains methods that help you manage your
 database.
 
-.. contents:: Table of Contents
-    :depth: 3
+.. contents::
+    :local:
+    :depth: 2
 
 ****************************
 Initializing the Forge Class

user_guide_src/source/database/metadata.rst

@@ -2,6 +2,10 @@
 Database Metadata
 #################
 
+.. contents::
+    :local:
+    :depth: 2
+
 **************
 Table MetaData
 **************

user_guide_src/source/database/queries.rst

@@ -2,7 +2,9 @@
 Queries
 #######
 
-.. contents:: Table of Contents
+.. contents::
+    :local:
+    :depth: 2
 
 ************
 Query Basics

user_guide_src/source/database/query_builder.rst

@@ -17,7 +17,7 @@ system.
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 *************************
 Loading the Query Builder