Part 1 of restructuring

Author: jim-parry

user_guide_src/source/concepts/http.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/mvc.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
 ======
@@ -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/security.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/database/events.rst

@@ -4,7 +4,7 @@ Database Events
 
 The Database classes contain a few :doc:`Events </general/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/index.rst

@@ -1,6 +1,6 @@
-##################
-Database Reference
-##################
+#############
+Managing Data
+#############
 
 CodeIgniter comes with a full-featured and very fast abstracted database
 class that supports both traditional structures and Query Builder

user_guide_src/source/general/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
 ---------------

user_guide_src/source/general/common_functions.rst

@@ -163,7 +163,7 @@ Service Accessors
 
 		echo view('user_profile', $data);
 
-	For more details, see the :doc:`Views <views>` page.
+	For more details, see the :doc:`Views </outgoing/views>` page.
 
 Miscellaneous Functions
 =======================
@@ -267,7 +267,7 @@ Miscellaneous Functions
 	Generates a relative URI for you based on either a named route alias, or a controller::method
 	combination. Will take parameters into effect, if provided.
 
-	For full details, see the :doc:`routing` page.
+	For full details, see the :doc:`/incoming/routing` page.
 
 .. php:function:: service ( $name [, ...$params] )
 

user_guide_src/source/general/helpers.rst

@@ -20,8 +20,8 @@ functions.
 
 CodeIgniter does not load Helper Files by default, so the first step in
 using a Helper is to load it. Once loaded, it becomes globally available
-in your :doc:`controller <../general/controllers>` and
-:doc:`views <../general/views>`.
+in your :doc:`controller </incoming/controllers>` and
+:doc:`views </outgoing/views>`.
 
 Helpers are typically stored in your **system/Helpers**, or
 **application/Helpers directory**. CodeIgniter will look first in your

user_guide_src/source/general/index.rst

@@ -7,24 +7,15 @@ General Topics
 
     configuration
     urls
-    controllers
-    views
-    view_cells
-    view_renderer
-    view_parser
     helpers
     core_classes
     events
     common_functions
-    routing
-    filters
     logging
     errors
-    debugging
     caching
     cli
     cli_commands
     modules
     managing_apps
     environments
-    alternative_php

user_guide_src/source/general/modules.rst

@@ -71,7 +71,7 @@ file types, including:
 
 - :doc:`Events </general/events>`
 - :doc:`Registrars </general/configuration>`
-- :doc:`Route files </general/routing>`
+- :doc:`Route files </incoming/routing>`
 - :doc:`Services </concepts/services>`
 
 This is configured in the file **application/Config/Modules.php**.
@@ -107,7 +107,7 @@ guide, but is being reproduced here so that it's easier to grasp how all of the
 Routes
 ======
 
-By default, :doc:`routes </general/routing>` are automatically scanned for within modules. If can be turned off in
+By default, :doc:`routes </incoming/routing>` are automatically scanned for within modules. If can be turned off in
 the **Modules** config file, described above.
 
 .. note:: Since the files are being included into the current scope, the ``$routes`` instance is already defined for you.
@@ -184,6 +184,6 @@ Models are always instantiated by their fully-qualified class name, so no specia
 Views
 =====
 
-Views can be loaded using the class namespace as described in the :doc:`views </general/views>` documentation::
+Views can be loaded using the class namespace as described in the :doc:`views </outgoing/views>` documentation::
 
     echo view('Acme\Blog\Views\index');