Merge pull request #5614 from kenjis/fix-docs-upgrade

docs: fix Upgrading from 3.x to 4.x
codeigniter4 · Jan 25, 2022 · 36f6936 · 36f6936
2 parents 7c2192f + 7540051
commit 36f6936
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 21 deletions.
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -36,7 +36,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/config**::

diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -38,7 +38,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/controllers**::

diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
@@ -46,7 +46,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
@@ -27,7 +27,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -25,7 +25,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -25,7 +25,7 @@ You have to change your file uploading code to match the new methods.
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
@@ -31,7 +31,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -48,7 +48,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/migrations**::

diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
@@ -38,7 +38,7 @@ You can find more information to those methods :doc:`here </models/model>`.
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/models**::

diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -34,7 +34,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
@@ -23,7 +23,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
@@ -28,7 +28,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 Path: **application/config/routes.php**::
 

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
@@ -36,7 +36,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -30,7 +30,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
@@ -44,7 +44,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 Path: **application/views**::
 

diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 

diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
@@ -16,21 +16,22 @@ What has been changed
 
 - Your views look much like before, but they are invoked differently … instead of CI3’s
   ``$this->load->view(x);``, you can use ``echo view(x);``.
-- CI4 supports view “cells”, to build your response in pieces.
+- CI4 supports *View Cells* to build your response in pieces, and *View Layouts* for page layout.
 - The template parser is still there, and substantially enhanced.
 
 Upgrade Guide
 =============
 
 1. First, move all views  to the folder **app/Views**
-2. Change the loading syntax of views in every script where you load views from
-   ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
+2. Change the loading syntax of views in every script where you load views:
+    - from ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
+    - from ``$content = $this->load->view('file', $data, TRUE);`` to ``$content = view('file', $data);``
 3. (optional) You can change the echo syntax in views from ``<?php echo $title; ?>`` to ``<?= $title ?>``
 
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/views**::