Merge pull request #1241 from jim-parry/docs/restructure

Docs/restructure

Author: lonnieezell

user_guide_src/source/general/cli.rst user_guide_src/source/cli/cli.rstuser_guide_src/source/general/cli.rst renamed to user_guide_src/source/cli/cli.rst

@@ -2,7 +2,7 @@
 Running via the Command Line
 ############################
 
-As well as calling an applications :doc:`Controllers <./controllers>`
+As well as calling an applications :doc:`Controllers </incoming/controllers>`
 via the URL in a browser they can also be loaded via the command-line
 interface (CLI).
 
@@ -93,7 +93,7 @@ works exactly like a normal route definition::
 
     $routes->cli('tools/message/(:segment)', 'Tools::message/$1');
 
-For more information, see the :doc:`Routes </general/routing>` page.
+For more information, see the :doc:`Routes </incoming/routing>` page.
 
 The CLI Library
 ---------------
@@ -102,4 +102,4 @@ The CLI library makes working with the CLI interface simple.
 It provides easy ways to output text in multiple colors to the terminal window. It also
 allows you to prompt a user for information, making it easy to build flexible, smart tools.
 
-See the :doc:`CLI Library </libraries/cli>` page for detailed information.
+See the :doc:`CLI Library </cli/cli_library>` page for detailed information.

…uide_src/source/general/cli_commands.rst …er_guide_src/source/cli/cli_commands.rstuser_guide_src/source/general/cli_commands.rst renamed to user_guide_src/source/cli/cli_commands.rst user_guide_src/source/general/cli_commands.rst renamed to user_guide_src/source/cli/cli_commands.rst

@@ -120,7 +120,7 @@ Then **foo** is the command name, and the ``$params`` array would be::
 
     $params = ['bar', 'baz'];
 
-This can also be accessed through the :doc:`CLI </libraries/cli>` library, but this already has your command removed
+This can also be accessed through the :doc:`CLI </cli/cli_library>` library, but this already has your command removed
 from the string. These parameters can be used to customize how your scripts behave.
 
 Our demo command might have a ``run`` method something like::

user_guide_src/source/libraries/cli.rst user_guide_src/source/cli/cli_library.rstuser_guide_src/source/libraries/cli.rst renamed to user_guide_src/source/cli/cli_library.rst

@@ -0,0 +1,12 @@
+##################
+Command Line Usage
+##################
+
+CodeIgniter 4 can also be used with command line programs.
+
+.. toctree::
+    :titlesonly:
+
+    cli
+    cli_commands
+    cli_library

user_guide_src/source/cli/index.rst

@@ -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,
-abstracts 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 </incoming/incomingrequest>`
 is an object-oriented representation of the HTTP request. It provides everything you need::
 
 	use CodeIgniter\HTTP\IncomingRequest;
@@ -97,7 +97,7 @@ is an object-oriented representation of the HTTP request. It provides everything
 The request class does a lot of work in the background for you, that you never need to worry about.
 The ``isAJAX()`` and ``isSecure()`` methods check several different methods to determine the correct answer.
 
-CodeIgniter also provides a :doc:`Response class </libraries/response>` that is an object-oriented representation
+CodeIgniter also provides a :doc:`Response class </incoming/response>` that is an object-oriented representation
 of the HTTP response. This gives you an easy and powerful way to construct your response to the client::
 
   use CodeIgniter\HTTP\Response;

user_guide_src/source/concepts/http.rst

@@ -46,7 +46,7 @@ You might store the view file for this method in **/application/Views/User/Profi
 That type of organization works great as a base habit to get into. At times you might need to organize it differently.
 That's not a problem. As long as CodeIgniter can find the file, it can display it.
 
-:doc:`Find out more about views </general/views>`
+:doc:`Find out more about views </outgoing/views>`
 
 Models
 ======
@@ -63,7 +63,7 @@ miss updating an area.
 
 Models are typically stored in **/application/Models**, though they can use a namespace to be grouped however you need.
 
-:doc:`Find out more about models </database/model>`
+:doc:`Find out more about models </models/model>`
 
 Controllers
 ===========
@@ -80,4 +80,4 @@ 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 </incoming/controllers>`

user_guide_src/source/concepts/mvc.rst

@@ -34,7 +34,7 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../libraries/message.html>`_ provides for input field filtering & content metadata
+- `HTTP library </incoming/message.html>`_ provides for input field filtering & content metadata
 - Form validation library
 
 *********************************************
@@ -57,7 +57,7 @@ CodeIgniter provisions
 ----------------------
 
 - `Session <../libraries/sessions.html>`_ library
-- `HTTP library <../libraries/message.html>`_ provides for CSRF validation
+- `HTTP library </incoming/message.html>`_ provides for CSRF validation
 - Easy to add third party authentication
 
 *****************************
@@ -162,7 +162,7 @@ CodeIgniter provisions
 ----------------------
 
 - Public folder, with application and system outside
-- `HTTP library <../libraries/message.html>`_ provides for CSRF validation
+- `HTTP library </incoming/message.html>`_ provides for CSRF validation
 
 ************************************
 A8 Cross Site Request Forgery (CSRF)
@@ -181,7 +181,7 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../libraries/message.html>`_ provides for CSRF validation
+- `HTTP library </incoming/message.html>`_ provides for CSRF validation
 
 **********************************************
 A9 Using Components with Known Vulnerabilities
@@ -217,6 +217,6 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../libraries/message.html>`_ provides for ...
+- `HTTP library </incoming/message.html>`_ provides for ...
 - `Session <../libraries/sessions.html>`_ library provides flashdata
 

user_guide_src/source/concepts/security.rst

@@ -2,9 +2,9 @@
 Database Events
 ###############
 
-The Database classes contain a few :doc:`Events </general/events>` that you can tap into in
+The Database classes contain a few :doc:`Events </extending/events>` that you can tap into in
 order to learn more about what is happening during the database execution. These events can
-be used to collect data for analysis and reporting. The :doc:`Debug Toolbar </general/debugging>`
+be used to collect data for analysis and reporting. The :doc:`Debug Toolbar </testing/debugging>`
 uses this to collect the queries to display in the Toolbar.
 
 ==========

user_guide_src/source/database/events.rst

@@ -1,6 +1,6 @@
-##################
-Database Reference
-##################
+######################
+Working With Databases
+######################
 
 CodeIgniter comes with a full-featured and very fast abstracted database
 class that supports both traditional structures and Query Builder
@@ -19,9 +19,4 @@ patterns. The database functions offer clear, simple syntax.
     Transactions <transactions>
     Getting MetaData <metadata>
     Custom Function Calls <call_function>
-    Using CodeIgniter's Model <model>
-    Using Entity Classes <entities>
-    Database Manipulation with Database Forge <forge>
-    Database Migrations <migration>
-    Database Seeding <seeds>
     Database Events <events>