Merge branch 'master' of git+ssh://github.com/sap-tutorials/Tutorials

Author: Ilyes YAMOUN

tutorials/abap-environment-behavior-definition/abap-environment-behavior-definition.md

@@ -58,7 +58,7 @@ In this tutorial, wherever `XXX` appears, use a number (e.g. `000`).
         delete;
 
         field (mandatory) id;
-        field (read only) lastchangedbyuser, lastchangeddatetime;
+        field (readonly) lastchangedbyuser, lastchangeddatetime;
       }
     ```
    Save and activate.

tutorials/cp-launchpad-federation-connectivity/22-btp-goto-trial.png

@@ -51,24 +51,26 @@ If this is the first time SAP Cloud Connector is started, you will see the **Def
 
 2. To find the right information to enter into SAP Cloud Connector, access your SAP BTP trial in a second browser tab at <https://account.hanatrial.ondemand.com/trial/#/home/trial>.
 
-3. Click **Enter trial**, then click the **trial** tile.
+3. Click **Go To Your Trial Account**, then click the **trial** tile.
 
-    ![Trial subaccount](22-btp-goto-trial.png)
+    ![Trial subaccount](22a-btp-go-to-trial.jpg)
 
 
-4. You can find the required information to enter in the SAP Cloud Connector form on this Overview page. You can identify the region ID from the **API end point** on the Cloud Foundry Environment tab and find the subaccount ID on top of the page next to **ID:**.
+4. You can find the required information to enter in the SAP Cloud Connector form on this Overview page. You can identify the region, the provider and  the subaccount ID in the **General** section.
 
-    Copy the subaccount ID.
+    Copy the region, e.g. US East (VA).
 
-    ![BTP Cockpit Overview](5a-btp-cockpit-overview.png)
+    ![BTP Cockpit Overview](5b-btp-cockpit-overview.png)
 
-5. Go back to the SAP Cloud Connector tab. In the form, click the selector icon and select the region of your trial account. The ID of the selected region should start with `cf`.
+5. Go back to the SAP Cloud Connector tab. In the form, click the Select icon in the **Region** field.
 
-    ![Selector icon](3-scc-selector.png)
-    ![Selection of regions](4-scc-selectregion.png)
+    ![Select icon](4a-scc-selectoricon.png)
 
+6. Paste the region of your trial account and select the right entry in the list. Make sure you select the right provider.
 
-5. Paste the subaccount ID from the SAP BTP cockpit Overview page into the **Subaccount** field.
+    ![Select region](4b-scc-selectregion.png)
+
+5. Go back to the BTP Cockpit Overview page and copy the ``subaccount ID`` into the **Subaccount** field.
 6. Enter an easily identifiable display name, e.g. your SAP BTP trial's subdomain into **Display Name**.
 7. Enter the ``email address`` and ``password`` that you use to login to your SAP BTP trial into **Login E-Mail** and **Password**.
 8. If you have attached another SAP Cloud Connector to your SAP BTP trial account already, enter any unique **Location ID** here to distinguish this SAP Cloud Connector from the existing one. Otherwise, you can leave this field empty.
@@ -174,11 +176,11 @@ The design-time destination is used to fetch the federated content from the cont
 
 2. In the menu, navigate to **Connectivity** > **Destinations**.
 
-    ![Go to Destinations](23-btp-goto-destinations.png)
+    ![Go to Destinations](23a-btp-goto-destinations.png)
 
 3. Click **New Destination**.
 
-    ![Destination screen](24-btp-new-destination.png)
+    ![Destination screen](24a-btp-new-destination.png)
 
 
 4. Fill in the form:
@@ -200,13 +202,13 @@ The design-time destination is used to fetch the federated content from the cont
 
 
 
-    ![Design-time Destination](25b-btp-designtime-destination.png)
+    ![Design-time Destination](25a-btp-designtime-destination.jpg)
 
-6. Enter ``sap-client`` and the client of your SAP S/4HANA system, e.g. 100 for SAP S/4HANA trial systems, as property name and value.
+6. Enter ``sap-client`` and the client of your SAP S/4HANA system, e.g. 100 for SAP S/4HANA trial (CAL) systems, as property name and value.
 
 7. Click **Save**.
 
-![Additional property](25-2-btp-designtime-destination.png)
+![Additional property](25-2b-btp-designtime-destination.jpg)
 
 [DONE]
 [ACCORDION-END]
@@ -223,20 +225,20 @@ The runtime destination is used to launch federated applications at runtime.
 
 3. Remove the part after the port from the **URL**.
 
-4. Enter the password ``Welcome1`` again.
+4. Enter the password again.
 
 5. Click **New Property** to add the following properties to your destination. You can **type in the property name, if it is not available in the dropdown list**.
 
     |  Property Name     | Value
     |  :------------- | :-------------
     |  HTML5.DynamicDestination           | `true`
     |  sap-platform  | `ABAP` (type the property name)
-    |  sap-service    | A string that consists of the first two  characters 32 and the instance number of the ABAP application server, e.g. 3200 (type the property name)
+    |  sap-service    | A string that consists of the first two  characters 32 and the instance number of the ABAP application server, **3200** for your CAL system (type the property name)
     |  sap-sysid            | `<System ID of your SAP S/4HANA system>` - **S4H** for your CAL system (type the property name)
 
 6. Click **Save**.
 
-![Runtime Destination](27a-btp-runtime-destination.png)
+![Runtime Destination](27b-btp-runtime-destination.jpg)
 
 [VALIDATE_7]
 [ACCORDION-END]

tutorials/cp-launchpad-federation-connectivity/22a-btp-go-to-trial.jpg

@@ -48,17 +48,17 @@ In a first step, you will add the SAP S/4HANA system as a content provider.
 
    5. Click **Save**.
 
-       ![Provider creation form](3a-new-content-provider-form.png)
+       ![Provider creation form](3b-new-content-provider.png)
 
     > If you select *Automatic addition of all content items*, all exposed content items will be automatically selected in the Content Explorer and added to the My Content tab, as soon as you create the content provider. In this case, when updating a provider, all the new content items are automatically added. In this exercise, you will add content items manually.
 
-    The content provider is added to the list and the content is loaded. This might take some seconds.
+    > If you select *Include group and catalog assignments to roles*, the relationship of groups and catalogs to roles from the SAP S/4HANA system is taken into account for the display of the groups and catalogs on the Launchpad service. For more details see [the documentation](https://help.sap.com/docs/Launchpad_Service/8c8e1958338140699bd4811b37b82ece/215517e6d4f44c96b790bbcb56d63572.html).
 
-  6. Wait till the status says **Created** and **Partial content was created**. If this takes long, try refreshing the browser page.
+    The content provider is added to the list and the content is loaded. This might take some seconds.
 
-    ![Provider created](4a-provider-created.png)
+  6. Wait till the status says **Created**. If this takes long, try refreshing the browser page.
 
-    > The message *Partial content was created* refers to the fact that currently Smart Business apps are not part of the exposed content. As soon as they are supported for federation, you will be able to update your content provider and this message will disappear.
+    ![Provider created](4b-provider-created.png)
 
 [DONE]
 [ACCORDION-END]
@@ -67,7 +67,7 @@ In a first step, you will add the SAP S/4HANA system as a content provider.
 
 1. Click the **Content Manager** icon to manually assign content from your SAP S/4HANA system to ``My Content``, so you can add it to a site.
 
-    !![Content Manager Icon](5-go-to-content-manager.png)
+    !![Content Manager Icon](5a-go-to-content-manager.png)
 
 2. On top of the page, click **Content Explorer** to access content coming from content providers.
 
@@ -153,35 +153,23 @@ Apps are only displayed to users with the corresponding roles assigned. You assi
 
 1. Open the SAP BTP cockpit of your trial account.
 
-2. Navigate to **Security > Role Collections** to go to a list of role collections on your subaccount. When you added the federated content, one role collection for each federated role was automatically created.
-
-    ![Role Collections](19-role-collections.png)
-
-
-3. Click the name of the first federated role collection  ``~sap_s4hana_SAP_BR_AP_ACCOUNTANT`` to open this role collection and assign your user to it.
-
-    ![Select role collection](20a-select-role-collection.png)
-
-4. Click **Edit** to switch to Editing mode.
-
-    ![Edit role collection](21a-edit-role-collection.png)
+2. Navigate to **Security > Users** to assign the role collections to your user. When you added the federated content, one role collection for each federated role was automatically created.
 
-5. Enter the ``E-Mail Address`` with which you login to the SAP Launchpad to the **ID** field in the **Users** section.
+    ![Users](19a-users.png)
 
-    ![Enter Email addresss](22a-enter-email-address.png)
 
-6. Then click **Save**.
+3. In the list of users available in your subaccount, click on the name of your user.
 
-    ![Save](23a-save-role-collection.png)
+    ![Select your user](20a-select-user.png)
 
-7. To open the next role, click the drop-down icon next to the current role name and select role collection  ``~sap_s4hana_SAP_BR_MASTER_SPECIALIST_FIN``.
+4. In the user details panel on the right, click the three dots in the **Role Collections** section to open the menu. Then select ``Assign Role Collection``.
 
-    ![Open Next Federated Role](24a-switch-role-collection.png)
+    ![Open menu and assign role collection](21e-open-and-assign-role-collection.png)
 
 
-    Then add your user to the second federated role collection in the same way and save the role collection.
+5. In the pop-up window select the checkboxes in front of the two federated roles ``~sap_s4hana_SAP_BR_MASTER_SPECIALIST_FIN`` and ``~sap_s4hana_SAP_BR_AP_ACCOUNTANT``. Then click **Assign Role Collection**.
 
-    ![Assign user to second role collection](25a-second-role.png)
+    ![Select role collections](22c-select-role-collections.png)
 
 Now you are done in SAP BTP cockpit.