Docs: Add profile's comparism table

 - Update introduction with Base config
 - Move options table to Base configuration

Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I6b4d18e162cc65fbc8646e55e08f80cedd9ba6e0
diff --git a/docs/configuration/header_file_system.rst b/docs/configuration/header_file_system.rst
index e87f64e..ff69df3 100644
--- a/docs/configuration/header_file_system.rst
+++ b/docs/configuration/header_file_system.rst
@@ -43,180 +43,7 @@
 
 It is expected that all Component options are included in the header file to explicitly set values
 for each option.
-Refer to `Base Config Options`_ for details the base configurations.
-
-*******************
-Base Config Options
-*******************
-This section lists the config option categorizations of the SPM and Secure Partitions.
-
-Crypto
-======
-+-------------------------------------+-----------+------------+
-| Options                             | Type      | Base Value |
-+=====================================+===========+============+
-|TFM_PARTITION_CRYPTO                 | Build     |   OFF      |
-+-------------------------------------+-----------+------------+
-|CRYPTO_TFM_BUILTIN_KEYS_DRIVER       | Build     |   ON       |
-+-------------------------------------+-----------+------------+
-|CRYPTO_NV_SEED                       | Component |   ON       |
-+-------------------------------------+-----------+------------+
-|CRYPTO_ENGINE_BUF_SIZE               | Component |   0x2080   |
-+-------------------------------------+-----------+------------+
-|CRYPTO_IOVEC_BUFFER_SIZE             | Component |   5120     |
-+-------------------------------------+-----------+------------+
-|CRYPTO_STACK_SIZE                    | Component |   0x1B00   |
-+-------------------------------------+-----------+------------+
-|CRYPTO_CONC_OPER_NUM                 | Component |   8        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_RNG_MODULE_ENABLED            | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_KEY_MODULE_ENABLED            | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_AEAD_MODULE_ENABLED           | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_MAC_MODULE_ENABLED            | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_HASH_MODULE_ENABLED           | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_CIPHER_MODULE_ENABLED         | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_ASYM_SIGN_MODULE_ENABLED      | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED   | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_KEY_DERIVATION_MODULE_ENABLED | Component |   1        |
-+-------------------------------------+-----------+------------+
-|CRYPTO_SINGLE_PART_FUNCS_ENABLED     | Component |   1        |
-+-------------------------------------+-----------+------------+
-
-Initial Attestation
-===================
-+-------------------------------------+-----------+-------------+
-| Options                             | Type      | Base Value  |
-+=====================================+===========+=============+
-|TFM_PARTITION_INITIAL_ATTESTATION    | Build     |   OFF       |
-+-------------------------------------+-----------+-------------+
-|SYMMETRIC_INITIAL_ATTESTATION        | Build     |   OFF       |
-+-------------------------------------+-----------+-------------+
-|ATTEST_INCLUDE_TEST_CODE             | Build     |   OFF       |
-+-------------------------------------+-----------+-------------+
-|ATTEST_KEY_BITS                      | Build     |   256       |
-+-------------------------------------+-----------+-------------+
-|ATTEST_TOKEN_PROFILE                 | Component | "PSA_IOT_1" |
-+-------------------------------------+-----------+-------------+
-|ATTEST_INCLUDE_OPTIONAL_CLAIMS       | Component |   1         |
-+-------------------------------------+-----------+-------------+
-|ATTEST_INCLUDE_COSE_KEY_ID           | Component |   0         |
-+-------------------------------------+-----------+-------------+
-|ATTEST_STACK_SIZE                    | Component |   0x700     |
-+-------------------------------------+-----------+-------------+
-
-Internal Trusted Storage
-========================
-+---------------------------------------+-----------+------------------------+
-| Options                               | Type      | Base Value             |
-+=======================================+===========+========================+
-|TFM_PARTITION_INTERNAL_TRUSTED_STORAGE | Build     |   OFF                  |
-+---------------------------------------+-----------+------------------------+
-|ITS_CREATE_FLASH_LAYOUT                | Component |   1                    |
-+---------------------------------------+-----------+------------------------+
-|ITS_RAM_FS                             | Component |   0                    |
-+---------------------------------------+-----------+------------------------+
-|ITS_VALIDATE_METADATA_FROM_FLASH       | Component |   1                    |
-+---------------------------------------+-----------+------------------------+
-|ITS_MAX_ASSET_SIZE                     | Component |   512                  |
-+---------------------------------------+-----------+------------------------+
-|ITS_NUM_ASSETS                         | Component |   10                   |
-+---------------------------------------+-----------+------------------------+
-|ITS_BUF_SIZE                           | Component |   ITS_MAX_ASSET_SIZE   |
-+---------------------------------------+-----------+------------------------+
-|ITS_STACK_SIZE                         | Component |   0x720                |
-+---------------------------------------+-----------+------------------------+
-
-Protected Storage
-=================
-+---------------------------------------+-----------+-----------------+
-| Options                               | Type      | Base Value      |
-+=======================================+===========+=================+
-|TFM_PARTITION_PROTECTED_STORAGE        | Build     |   OFF           |
-+---------------------------------------+-----------+-----------------+
-|PS_ENCRYPTION                          | Build     |   ON            |
-+---------------------------------------+-----------+-----------------+
-|PS_CRYPTO_AEAD_ALG                     | Build     |   PSA_ALG_GCM   |
-+---------------------------------------+-----------+-----------------+
-|PS_CREATE_FLASH_LAYOUT                 | Component |   1             |
-+---------------------------------------+-----------+-----------------+
-|PS_RAM_FS                              | Component |   0             |
-+---------------------------------------+-----------+-----------------+
-|PS_VALIDATE_METADATA_FROM_FLASH        | Component |   1             |
-+---------------------------------------+-----------+-----------------+
-|PS_MAX_ASSET_SIZE                      | Component |   2048          |
-+---------------------------------------+-----------+-----------------+
-|PS_NUM_ASSETS                          | Component |   10            |
-+---------------------------------------+-----------+-----------------+
-|PS_ROLLBACK_PROTECTION                 | Component |   1             |
-+---------------------------------------+-----------+-----------------+
-|PS_STACK_SIZE                          | Component |   0x700         |
-+---------------------------------------+-----------+-----------------+
-
-Firmware Update
-===============
-+-------------------------------------+-----------+-------------------------------------+
-| Options                             | Type      | Base Value                          |
-+=====================================+===========+=====================================+
-|PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT | Build     |   OFF                               |
-+-------------------------------------+-----------+-------------------------------------+
-|TFM_PARTITION_FIRMWARE_UPDATE        | Build     |   OFF                               |
-+-------------------------------------+-----------+-------------------------------------+
-|TFM_CONFIG_FWU_MAX_WRITE_SIZE        | Build     |   1024                              |
-+-------------------------------------+-----------+-------------------------------------+
-|TFM_CONFIG_FWU_MAX_MANIFEST_SIZE     | Build     |   0                                 |
-+-------------------------------------+-----------+-------------------------------------+
-|FWU_DEVICE_CONFIG_FILE               | Build     |   ""                                |
-+-------------------------------------+-----------+-------------------------------------+
-|FWU_SUPPORT_TRIAL_STATE              | Build     | Depends on MCUBOOT_UPGRADE_STRATEGY |
-+-------------------------------------+-----------+-------------------------------------+
-|TFM_FWU_BOOTLOADER_LIB               | Build     |   "mcuboot"                         |
-+-------------------------------------+-----------+-------------------------------------+
-|TFM_FWU_BUF_SIZE                     | Component |   PSA_FWU_MAX_BLOCK_SIZE            |
-+-------------------------------------+-----------+-------------------------------------+
-|FWU_STACK_SIZE                       | Component |   0x600                             |
-+-------------------------------------+-----------+-------------------------------------+
-
-Platform Secure Partition
-=========================
-+-------------------------------------+-----------+------------+
-| Options                             | Type      | Base Value |
-+=====================================+===========+============+
-|TFM_PARTITION_PLATFORM               | Build     |   OFF      |
-+-------------------------------------+-----------+------------+
-|PLATFORM_SERVICE_INPUT_BUFFER_SIZE   | Component |   64       |
-+-------------------------------------+-----------+------------+
-|PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE  | Component |   64       |
-+-------------------------------------+-----------+------------+
-|PLATFORM_SP_STACK_SIZE               | Component |   0x500    |
-+-------------------------------------+-----------+------------+
-|PLATFORM_NV_COUNTER_MODULE_DISABLED  | Component |   0        |
-+-------------------------------------+-----------+------------+
-
-Secure Partition Manager
-========================
-+-------------------------------------+-----------+-------------+
-| Options                             | Type      | Base Values |
-+=====================================+===========+=============+
-|TFM_ISOLATION_LEVEL                  | Build     |   1         |
-+-------------------------------------+-----------+-------------+
-|PSA_FRAMEWORK_HAS_MM_IOVEC           | Build     |   OFF       |
-+-------------------------------------+-----------+-------------+
-|CONFIG_TFM_SPM_BACKEND               | Build     |   "SFN"     |
-+-------------------------------------+-----------+-------------+
-|TFM_SPM_LOG_LEVEL                    | Build     |   1         |
-+-------------------------------------+-----------+-------------+
-|CONFIG_TFM_CONN_HANDLE_MAX_NUM       | Component |   8         |
-+-------------------------------------+-----------+-------------+
-|CONFIG_TFM_DOORBELL_API              | Component |   0         |
-+-------------------------------------+-----------+-------------+
+Refer to :ref:`Base_configuration` for details the base configurations.
 
 --------------
 
diff --git a/docs/configuration/index.rst b/docs/configuration/index.rst
index 391620c..260134c 100644
--- a/docs/configuration/index.rst
+++ b/docs/configuration/index.rst
@@ -4,12 +4,6 @@
 Configuration
 #############
 
-.. Warning::
-
-    This is a temporay design document for review.
-    Once the design is settled down.
-    It will be converted to user/integration guides.
-
 .. toctree::
     :maxdepth: 1
     :glob:
@@ -24,17 +18,20 @@
 a user needs. A user can select the desired set of services and fine-tune
 them to their requirements. There are two types of configuration options
 
-Building configuration
-  Specifies which file or component to include into compilation and build.
-  These are options, usually used by a build system to enable/disable
-  modules, specify location of external dependency or other selection, global to
-  a project. Please check the corresponded section :ref:`tfm_cmake_configuration`
+Build configuration
+   Specifies which file or component to include into compilation and build.
+   These are options, usually used by a build system to enable/disable
+   modules, specify location of external dependency or other selection,
+   global to a project. These option set shall be considered while adopting TF-M
+   to other build systems.
+   In the :ref:`Base_configuration` tabletheses options have *Build* type.
 
-Component tuning
+Component configuration
    To adjust a particular parameter to a desired value. Those options are
    local to a component or externally referenced when components are coupled.
    Options are in C header file. The :ref:`Header_configuration` has more
    details about it.
+   In the :ref:`Base_configuration` table theses options have *Component* type.
 
 .. Note::
    Originally, TF-M used CMake variables for both building and component tuning
@@ -48,9 +45,10 @@
 How to configure
 ****************
 
-TF-M Project provides a base build, defined in config_base.cmake. It includes
-SPM and platform code only. Starting from the base, users can enable required
-services and features using several independent methods to configure TF-M.
+TF-M Project provides a base build, defined in ``/config/config_base.cmake``
+and ``/config/profile/config_profile_base.h``. It includes SPM and platform code only.
+Starting from the base, users can enable required services and features using several
+independent methods to configure TF-M.
 
 Use :ref:`tf-m_profiles`.
    There are 4 sets of predefined configurations for a elected
@@ -96,6 +94,187 @@
    providede explicitly via a project configuration file. Default values
    on step 1 will generate warnings which expected to break a build.
 
+.. _Base_configuration:
+
+******************
+Base Configuration
+******************
+
+The base configuraion is the ground for configuring TF-M providing default
+defined in ``/config/config_base.cmake`` and ``/config/profile/config_profile_base.h``.
+The base build includes SPM and platform code only.
+
+This table lists the config option categorizations of the SPM and Secure
+Partitions.
+
+Crypto
+======
++-------------------------------------+-----------+------------+
+| Options                             | Type      | Base Value |
++=====================================+===========+============+
+|TFM_PARTITION_CRYPTO                 | Build     |   OFF      |
++-------------------------------------+-----------+------------+
+|CRYPTO_TFM_BUILTIN_KEYS_DRIVER       | Build     |   ON       |
++-------------------------------------+-----------+------------+
+|CRYPTO_NV_SEED                       | Component |   ON       |
++-------------------------------------+-----------+------------+
+|CRYPTO_ENGINE_BUF_SIZE               | Component |   0x2080   |
++-------------------------------------+-----------+------------+
+|CRYPTO_IOVEC_BUFFER_SIZE             | Component |   5120     |
++-------------------------------------+-----------+------------+
+|CRYPTO_STACK_SIZE                    | Component |   0x1B00   |
++-------------------------------------+-----------+------------+
+|CRYPTO_CONC_OPER_NUM                 | Component |   8        |
++-------------------------------------+-----------+------------+
+|CRYPTO_RNG_MODULE_ENABLED            | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_KEY_MODULE_ENABLED            | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_AEAD_MODULE_ENABLED           | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_MAC_MODULE_ENABLED            | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_HASH_MODULE_ENABLED           | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_CIPHER_MODULE_ENABLED         | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_ASYM_SIGN_MODULE_ENABLED      | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED   | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_KEY_DERIVATION_MODULE_ENABLED | Component |   1        |
++-------------------------------------+-----------+------------+
+|CRYPTO_SINGLE_PART_FUNCS_ENABLED     | Component |   1        |
++-------------------------------------+-----------+------------+
+
+Initial Attestation
+===================
++-------------------------------------+-----------+-------------+
+| Options                             | Type      | Base Value  |
++=====================================+===========+=============+
+|TFM_PARTITION_INITIAL_ATTESTATION    | Build     |   OFF       |
++-------------------------------------+-----------+-------------+
+|SYMMETRIC_INITIAL_ATTESTATION        | Build     |   OFF       |
++-------------------------------------+-----------+-------------+
+|ATTEST_INCLUDE_TEST_CODE             | Build     |   OFF       |
++-------------------------------------+-----------+-------------+
+|ATTEST_KEY_BITS                      | Build     |   256       |
++-------------------------------------+-----------+-------------+
+|ATTEST_TOKEN_PROFILE                 | Component | "PSA_IOT_1" |
++-------------------------------------+-----------+-------------+
+|ATTEST_INCLUDE_OPTIONAL_CLAIMS       | Component |   1         |
++-------------------------------------+-----------+-------------+
+|ATTEST_INCLUDE_COSE_KEY_ID           | Component |   0         |
++-------------------------------------+-----------+-------------+
+|ATTEST_STACK_SIZE                    | Component |   0x700     |
++-------------------------------------+-----------+-------------+
+
+Internal Trusted Storage
+========================
++---------------------------------------+-----------+------------------------+
+| Options                               | Type      | Base Value             |
++=======================================+===========+========================+
+|TFM_PARTITION_INTERNAL_TRUSTED_STORAGE | Build     |   OFF                  |
++---------------------------------------+-----------+------------------------+
+|ITS_CREATE_FLASH_LAYOUT                | Component |   1                    |
++---------------------------------------+-----------+------------------------+
+|ITS_RAM_FS                             | Component |   0                    |
++---------------------------------------+-----------+------------------------+
+|ITS_VALIDATE_METADATA_FROM_FLASH       | Component |   1                    |
++---------------------------------------+-----------+------------------------+
+|ITS_MAX_ASSET_SIZE                     | Component |   512                  |
++---------------------------------------+-----------+------------------------+
+|ITS_NUM_ASSETS                         | Component |   10                   |
++---------------------------------------+-----------+------------------------+
+|ITS_BUF_SIZE                           | Component |   ITS_MAX_ASSET_SIZE   |
++---------------------------------------+-----------+------------------------+
+|ITS_STACK_SIZE                         | Component |   0x720                |
++---------------------------------------+-----------+------------------------+
+
+Protected Storage
+=================
++---------------------------------------+-----------+-----------------+
+| Options                               | Type      | Base Value      |
++=======================================+===========+=================+
+|TFM_PARTITION_PROTECTED_STORAGE        | Build     |   OFF           |
++---------------------------------------+-----------+-----------------+
+|PS_ENCRYPTION                          | Build     |   ON            |
++---------------------------------------+-----------+-----------------+
+|PS_CRYPTO_AEAD_ALG                     | Build     |   PSA_ALG_GCM   |
++---------------------------------------+-----------+-----------------+
+|PS_CREATE_FLASH_LAYOUT                 | Component |   1             |
++---------------------------------------+-----------+-----------------+
+|PS_RAM_FS                              | Component |   0             |
++---------------------------------------+-----------+-----------------+
+|PS_VALIDATE_METADATA_FROM_FLASH        | Component |   1             |
++---------------------------------------+-----------+-----------------+
+|PS_MAX_ASSET_SIZE                      | Component |   2048          |
++---------------------------------------+-----------+-----------------+
+|PS_NUM_ASSETS                          | Component |   10            |
++---------------------------------------+-----------+-----------------+
+|PS_ROLLBACK_PROTECTION                 | Component |   1             |
++---------------------------------------+-----------+-----------------+
+|PS_STACK_SIZE                          | Component |   0x700         |
++---------------------------------------+-----------+-----------------+
+
+Firmware Update
+===============
++-------------------------------------+-----------+-------------------------------------+
+| Options                             | Type      | Base Value                          |
++=====================================+===========+=====================================+
+|PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT | Build     |   OFF                               |
++-------------------------------------+-----------+-------------------------------------+
+|TFM_PARTITION_FIRMWARE_UPDATE        | Build     |   OFF                               |
++-------------------------------------+-----------+-------------------------------------+
+|TFM_CONFIG_FWU_MAX_WRITE_SIZE        | Build     |   1024                              |
++-------------------------------------+-----------+-------------------------------------+
+|TFM_CONFIG_FWU_MAX_MANIFEST_SIZE     | Build     |   0                                 |
++-------------------------------------+-----------+-------------------------------------+
+|FWU_DEVICE_CONFIG_FILE               | Build     |   ""                                |
++-------------------------------------+-----------+-------------------------------------+
+|FWU_SUPPORT_TRIAL_STATE              | Build     | Depends on MCUBOOT_UPGRADE_STRATEGY |
++-------------------------------------+-----------+-------------------------------------+
+|TFM_FWU_BOOTLOADER_LIB               | Build     |   "mcuboot"                         |
++-------------------------------------+-----------+-------------------------------------+
+|TFM_FWU_BUF_SIZE                     | Component |   PSA_FWU_MAX_BLOCK_SIZE            |
++-------------------------------------+-----------+-------------------------------------+
+|FWU_STACK_SIZE                       | Component |   0x600                             |
++-------------------------------------+-----------+-------------------------------------+
+
+Platform Secure Partition
+=========================
++-------------------------------------+-----------+------------+
+| Options                             | Type      | Base Value |
++=====================================+===========+============+
+|TFM_PARTITION_PLATFORM               | Build     |   OFF      |
++-------------------------------------+-----------+------------+
+|PLATFORM_SERVICE_INPUT_BUFFER_SIZE   | Component |   64       |
++-------------------------------------+-----------+------------+
+|PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE  | Component |   64       |
++-------------------------------------+-----------+------------+
+|PLATFORM_SP_STACK_SIZE               | Component |   0x500    |
++-------------------------------------+-----------+------------+
+|PLATFORM_NV_COUNTER_MODULE_DISABLED  | Component |   0        |
++-------------------------------------+-----------+------------+
+
+Secure Partition Manager
+========================
++-------------------------------------+-----------+-------------+
+| Options                             | Type      | Base Values |
++=====================================+===========+=============+
+|TFM_ISOLATION_LEVEL                  | Build     |   1         |
++-------------------------------------+-----------+-------------+
+|PSA_FRAMEWORK_HAS_MM_IOVEC           | Build     |   OFF       |
++-------------------------------------+-----------+-------------+
+|CONFIG_TFM_SPM_BACKEND               | Build     |   "SFN"     |
++-------------------------------------+-----------+-------------+
+|TFM_SPM_LOG_LEVEL                    | Build     |   1         |
++-------------------------------------+-----------+-------------+
+|CONFIG_TFM_CONN_HANDLE_MAX_NUM       | Component |   8         |
++-------------------------------------+-----------+-------------+
+|CONFIG_TFM_DOORBELL_API              | Component |   0         |
++-------------------------------------+-----------+-------------+
+
 --------------
 
 *Copyright (c) 2022, Arm Limited. All rights reserved.*
\ No newline at end of file
diff --git a/docs/configuration/profiles/index.rst b/docs/configuration/profiles/index.rst
index 1000aa5..0b729fd 100644
--- a/docs/configuration/profiles/index.rst
+++ b/docs/configuration/profiles/index.rst
@@ -62,11 +62,11 @@
 +----------------------------------------+--------+--------+---------+--------+--------+
 | CRYPTO_ENGINE_BUF_SIZE                 | 0x2080 | 0x400  | 0x2080  | 0x2080 | 0x2080 |
 +----------------------------------------+--------+--------+---------+--------+--------+
-| CRYPTO_ASYM_SIGN_MODULE_DISABLED       | OFF    | ON     | OFF     | OFF    | OFF    |
+| CRYPTO_ASYM_SIGN_MODULE_ENABLED        | ON     | OFF    | ON      | ON     | ON     |
 +----------------------------------------+--------+--------+---------+--------+--------+
 | PS_CRYPTO_AEAD_ALG                     | GCM    | GCM    | CCM     | CCM    | GCM    |
 +----------------------------------------+--------+--------+---------+--------+--------+
-| CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED    | OFF    | ON     | ON      | ON     | OFF    |
+| CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED     | ON     | OFF    | OFF     | OFF    | ON     |
 +----------------------------------------+--------+--------+---------+--------+--------+
 | CRYPTO_SINGLE_PART_FUNCS_DISABLED      | OFF    | ON     | OFF     | OFF    | OFF    |
 +----------------------------------------+--------+--------+---------+--------+--------+
@@ -76,9 +76,9 @@
 +----------------------------------------+--------+--------+---------+--------+--------+
 | CONFIG_TFM_CONN_HANDLE_MAX_NUM         | 8      | 3      | 8       | 8      | 8      |
 +----------------------------------------+--------+--------+---------+--------+--------+
-| ITS_BUF_SIZE                           |        | 32     | 32      |        |        |
+| ITS_BUF_SIZE                           | -      | 32     | 32      | -      | -      |
 +----------------------------------------+--------+--------+---------+--------+--------+
-| MCUBOOT_IMAGE_NUMBER                   |        | 1      |         |        |        |
+| MCUBOOT_IMAGE_NUMBER                   | -      | 1      | -       | -      | -      |
 +----------------------------------------+--------+--------+---------+--------+--------+
 
 Each profile has predefined configuration for cryptographic library, located in
diff --git a/docs/configuration/profiles/tfm_profile_medium_arot-less.rst b/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
index cfb5744..f9065cb 100755
--- a/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
+++ b/docs/configuration/profiles/tfm_profile_medium_arot-less.rst
@@ -2,10 +2,6 @@
 Trusted Firmware-M Profile Medium-ARoT-less
 ###########################################
 
-:Author: David Hu
-:Organization: Arm Limited
-:Contact: david.hu@arm.com
-
 ************
 Introduction
 ************
diff --git a/docs/introduction/readme.rst b/docs/introduction/readme.rst
index 56e77bc..1f807b8 100644
--- a/docs/introduction/readme.rst
+++ b/docs/introduction/readme.rst
@@ -22,10 +22,10 @@
 - Crypto, Internal Trusted Storage (ITS), Protected Storage (PS),
   Firmware Update and Attestation secure services
 
-TF-M implements PSA-FF-M defined IPC and SFN mechanisms to allow communication
+TF-M implements `PSA-FF-M`_ defined IPC and SFN mechanisms to allow communication
 between isolated firmware partitions. TF-M is highly configurable allowing users
 to only include the required secure services and features. Project provides
-‘TF-M base’ build with just TF-M core and platform drivers and 4 predefined
+:ref:`Base_configuration` build with just TF-M core and platform drivers and 4 predefined
 configurations known as :ref:`tf-m_profiles`. TF-M Profiles or TF-M base can
 be configured to include required services and features as described in the
 :ref:`tf-m_configuration` section.
@@ -96,6 +96,7 @@
 .. _Cortex-M85: https://developer.arm.com/Processors/Cortex-M85
 .. _PSA Certified: https://www.psacertified.org/about/developing-psa-certified/
 .. _Arm TrustZone technology: https://developer.arm.com/ip-products/security-ip/trustzone/trustzone-for-cortex-m
+.. _PSA-FF-M: https://www.arm.com/architecture/security-features/platform-security
 
 --------------