Merge pull request #7167 from kenjis/fix-docs-installing

docs: improve installation

Author: kenjis

user_guide_src/source/installation/installing_composer.rst

@@ -53,7 +53,7 @@ If you omit the "project-root" argument, the command will create an
 
     > composer install --no-dev
 
-    The above command will removes the Composer packages only for development
+    The above command will remove the Composer packages only for development
     that are not needed in the production environment. This will greatly reduce
     the vendor folder size.
 
@@ -83,7 +83,11 @@ Cons
 ----
 
 You still need to check for file changes in the **project space**
-(root, app, public, writable) after updating.
+(root, app, public, writable) and merge them after updating.
+
+.. note:: There are some third-party CodeIgniter modules available to assist
+    with merging changes to the project space:
+    `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
 
 Structure
 ---------
@@ -139,7 +143,7 @@ In your project root::
 
     > composer install --no-dev
 
-    The above command will removes the Composer packages only for development
+    The above command will remove the Composer packages only for development
     that are not needed in the production environment. This will greatly reduce
     the vendor folder size.
 
@@ -178,6 +182,10 @@ Cons
 You still need to check for file changes in the **project space**
 (root, app, public, writable) after updating.
 
+.. note:: There are some third-party CodeIgniter modules available to assist
+    with merging changes to the project space:
+    `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
+
 Structure
 ---------
 

user_guide_src/source/installation/installing_manual.rst

@@ -9,8 +9,8 @@ The `CodeIgniter 4 framework <https://github.com/codeigniter4/framework>`_
 repository holds the released versions of the framework.
 It is intended for developers who do not wish to use Composer.
 
-Develop your app inside the ``app`` folder, and the ``public`` folder
-will be your public-facing document root. Do not change anything inside the ``system``
+Develop your app inside the **app** folder, and the **public** folder
+will be your public-facing document root. Do not change anything inside the **system**
 folder!
 
 .. note:: This is the installation technique closest to that described
@@ -37,7 +37,7 @@ See :ref:`initial-configuration` for the detail.
 Upgrading
 =========
 
-Download a new copy of the framework, and then replace the ``system`` folder.
+Download a new copy of the framework, and then replace the **system** folder.
 
 Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
@@ -49,7 +49,8 @@ Download and run.
 Cons
 ====
 
-You are responsible for merge conflicts when updating.
+You need to check for file changes in the **project space**
+(root, app, public, tests, writable) and merge them by yourself.
 
 Structure
 =========
@@ -65,8 +66,8 @@ If you want to take advantage of the system message translations,
 they can be added to your project in a similar fashion.
 
 Download the `latest version of them <https://github.com/codeigniter4/translations/releases/latest>`_.
-Extract the downloaded zip, and copy the ``Language`` folder contents in it
-to your ``PROJECT_ROOT/app/Languages`` folder.
+Extract the downloaded zip, and copy the **Language** folder contents in it
+to your **app/Languages** folder.
 
 This would need to be repeated to incorporate any updates
 to the translations.