Skip to content

Commit 3bfe413

Browse files
authored
Merge pull request #8717 from kenjis/docs-CI3-notation
docs: make CI3 notation consistent
2 parents e05781b + a1e5d64 commit 3bfe413

24 files changed

+46
-46
lines changed

user_guide_src/source/incoming/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Auto Routing (Improved)
185185
Since v4.2.0, the new more secure Auto Routing has been introduced.
186186

187187
.. note:: If you are familiar with Auto Routing, which was enabled by default
188-
from CodeIgniter 3 through 4.1.x, you can see the differences in
188+
from CodeIgniter 3.x through 4.1.x, you can see the differences in
189189
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
190190

191191
This section describes the functionality of the new auto-routing.

user_guide_src/source/incoming/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ Auto Routing (Improved)
705705
Since v4.2.0, the new more secure Auto Routing has been introduced.
706706

707707
.. note:: If you are familiar with Auto Routing, which was enabled by default
708-
from CodeIgniter 3 through 4.1.x, you can see the differences in
708+
from CodeIgniter 3.x through 4.1.x, you can see the differences in
709709
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
710710

711711
When no defined route is found that matches the URI, the system will attempt to match that URI against the controllers and methods when Auto Routing is enabled.

user_guide_src/source/installation/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ or using `Composer <https://getcomposer.org>`_.
77
Which is right for you?
88

99
- We recommend the Composer installation because it keeps CodeIgniter up to date easily.
10-
- If you would like the simple "download & go" install that CodeIgniter3
10+
- If you would like the simple "download & go" install that CodeIgniter 3
1111
is known for, choose the manual installation.
1212

1313
However you choose to install and run CodeIgniter4, the latest

user_guide_src/source/installation/upgrade_4xx.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ Helpers
149149
- `String Helper <https://www.codeigniter.com/userguide3/helpers/string_helper.html>`_ functions
150150
in CI3 are included in :doc:`../helpers/text_helper` in CI4.
151151
- In CI4, ``redirect()`` is completely changed from CI3's.
152-
- `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
153-
- `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
152+
- `redirect() Documentation CodeIgniter 3.x <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
153+
- `redirect() Documentation CodeIgniter 4.x <../general/common_functions.html#redirect>`_
154154
- In CI4, :php:func:`redirect()` returns a ``RedirectResponse`` instance instead of
155155
redirecting and terminating script execution. You must return it from Controllers
156156
or Controller Filters.

user_guide_src/source/installation/upgrade_configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Configuration
88
Documentations
99
==============
1010

11-
- `Config Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/config.html>`_
12-
- :doc:`Configuration Documentation CodeIgniter 4.X </general/configuration>`
11+
- `Config Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/config.html>`_
12+
- :doc:`Configuration Documentation CodeIgniter 4.x </general/configuration>`
1313

1414
What has been changed
1515
=====================

user_guide_src/source/installation/upgrade_controllers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Controllers
88
Documentations
99
==============
1010

11-
- `Controller Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/controllers.html>`_
12-
- :doc:`Controller Documentation CodeIgniter 4.X </incoming/controllers>`
11+
- `Controller Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/general/controllers.html>`_
12+
- :doc:`Controller Documentation CodeIgniter 4.x </incoming/controllers>`
1313

1414
What has been changed
1515
=====================

user_guide_src/source/installation/upgrade_database.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Database
88
Documentations
99
==============
1010

11-
- `Database Reference Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
12-
- :doc:`Working with Databases Documentation CodeIgniter 4.X </database/index>`
11+
- `Database Reference Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/database/index.html>`_
12+
- :doc:`Working with Databases Documentation CodeIgniter 4.x </database/index>`
1313

1414
What has been changed
1515
=====================

user_guide_src/source/installation/upgrade_emails.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Emails
88
Documentations
99
==============
1010

11-
- `Email Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
12-
- :doc:`Email Documentation CodeIgniter 4.X </libraries/email>`
11+
- `Email Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/email.html>`_
12+
- :doc:`Email Documentation CodeIgniter 4.x </libraries/email>`
1313

1414
What has been changed
1515
=====================

user_guide_src/source/installation/upgrade_encryption.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Encryption
88
Documentations
99
**************
1010

11-
- `Encryption Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
12-
- :doc:`Encryption Service Documentation CodeIgniter 4.X </libraries/encryption>`
11+
- `Encryption Library Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/encryption.html>`_
12+
- :doc:`Encryption Service Documentation CodeIgniter 4.x </libraries/encryption>`
1313

1414
What has been changed
1515
*********************

user_guide_src/source/installation/upgrade_file_upload.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Upgrade Working with Uploaded Files
77

88
Documentations
99
==============
10-
- `File Uploading Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
11-
- :doc:`Working with Uploaded Files Documentation CodeIgniter 4.X </libraries/uploaded_files>`
10+
- `File Uploading Class Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
11+
- :doc:`Working with Uploaded Files Documentation CodeIgniter 4.x </libraries/uploaded_files>`
1212

1313
What has been changed
1414
=====================

0 commit comments

Comments
 (0)