Merge pull request #1492 from jts-arm/docs

Reword LOAD_IMAGE_V2 in user guide & fix a typo

docs/porting-guide.rst

@@ -952,9 +952,9 @@ Function : plat\_disable\_acp()
     Argument : void
     Return   : void
 
-This api allows a platform to disable the Accelerator Coherency Port (if
+This API allows a platform to disable the Accelerator Coherency Port (if
 present) during a cluster power down sequence. The default weak implementation
-doesn't do anything. Since this api is called during the power down sequence,
+doesn't do anything. Since this API is called during the power down sequence,
 it has restrictions for stack usage and it can use the registers x0 - x17 as
 scratch registers. It should preserve the value in x18 register as it is used
 by the caller to store the return address.

docs/user-guide.rst

@@ -485,8 +485,8 @@ Common build options
 -  ``LOAD_IMAGE_V2``: Boolean option to enable support for new version (v2) of
    image loading, which provides more flexibility and scalability around what
    images are loaded and executed during boot. Default is 0.
-   Note: ``TRUSTED_BOARD_BOOT`` is currently only supported for AArch64 when
-   ``LOAD_IMAGE_V2`` is enabled.
+
+   Note: this flag must be enabled for AArch32 builds.
 
 -  ``LOG_LEVEL``: Chooses the log level, which controls the amount of console log
    output compiled into the build. This should be one of the following: