Update content

umn/source/faqs/general_faqs/about_swr.rst

@@ -20,7 +20,7 @@ Is SWR Charged?
 
 The billing items of SWR include storage space and traffic. Currently, it is free of charge.
 
-Does SWR Support Querying the CPU Architecture (x86 or ARM) of an Image?
+Does SWR Support Querying the CPU Architecture (x86 or Arm) of an Image?
 ------------------------------------------------------------------------
 
 -  For a public image, you can log in to the SWR console, go to the image center, search for the target image, and view its details, including the architectures supported by the image.

umn/source/faqs/image_management_faqs/can_i_pull_container_images_on_the_swr_console_to_a_local_pc.rst

@@ -1,24 +0,0 @@
-:original_name: swr_faq_0035.html
-
-.. _swr_faq_0035:
-
-Can I Pull Container Images on the SWR Console to a Local PC?
-=============================================================
-
-Container images stored in SWR cannot be directly downloaded through the console. You can perform the following operations to pull the images:
-
-#. Obtain the image pull command on the image details page.
-
-#. Run the obtained command on the device where the Docker client is installed.
-
-   Example:
-
-   **docker pull swr.eu-de.otc.t-systems.com/group/nginx:v1**
-
-#. Save the image as a TAR or TAR.GZ file.
-
-   Example:
-
-   **docker save** **nginx:v1** **>** **nginx.tar**
-
-#. Download the file to the local host.

umn/source/faqs/image_management_faqs/image_push_and_pull.rst

@@ -5,15 +5,15 @@
 Image Push and Pull
 ===================
 
-How Do I Push an Image to SWR Through APIs?
--------------------------------------------
+How Do I Push an Image to SWR by Calling APIs?
+----------------------------------------------
 
 Currently, SWR does not provide APIs for image push. You can push images using the **docker push** command on a client or using the SWR console.
 
 How Do I Pull an Image from SWR by Calling APIs?
 ------------------------------------------------
 
-Currently, SWR does not provide APIs for image pull. You can pull images using the **docker push** command on a client.
+Currently, SWR does not provide APIs for image pull. You can pull images using the **docker pull** command on a client.
 
 Can I Push Arm-based Container Images to SWR?
 ---------------------------------------------

umn/source/faqs/image_management_faqs/index.rst

@@ -8,8 +8,6 @@ Image Management FAQs
 -  :ref:`Image Push and Pull <swr_faq_1012>`
 -  :ref:`How Many Tenants Can I Share an SWR Private Image with? <swr_faq_1013>`
 -  :ref:`What Are the Differences Between Long-Term Valid Login Commands and Temporary Login Commands? <swr_faq_0015>`
--  :ref:`Why Is an Image Uploaded Through the Client to SWR Different in Size From One Uploaded Through the SWR Console? <swr_faq_0005>`
--  :ref:`Can I Pull Container Images on the SWR Console to a Local PC? <swr_faq_0035>`
 
 .. toctree::
    :maxdepth: 1
@@ -18,5 +16,3 @@ Image Management FAQs
    image_push_and_pull
    how_many_tenants_can_i_share_an_swr_private_image_with
    what_are_the_differences_between_long-term_valid_login_commands_and_temporary_login_commands
-   why_is_an_image_uploaded_through_the_client_to_swr_different_in_size_from_one_uploaded_through_the_swr_console
-   can_i_pull_container_images_on_the_swr_console_to_a_local_pc

umn/source/faqs/image_management_faqs/why_is_an_image_uploaded_through_the_client_to_swr_different_in_size_from_one_uploaded_through_the_swr_console.rst

@@ -1,27 +0,0 @@
-:original_name: swr_faq_0005.html
-
-.. _swr_faq_0005:
-
-Why Is an Image Uploaded Through the Client to SWR Different in Size From One Uploaded Through the SWR Console?
-===============================================================================================================
-
-Symptom
--------
-
-Assume that a nginx image of v2.0.0 is created on the local Docker client. The **docker images** command is run to query **SIZE** of the image. The size is **22.8 MB**.
-
-.. code-block::
-
-   $ docker images
-   REPOSITORY                         TAG             IMAGE ID       CREATED         SIZE
-   nginx                              v2.0.0          22f2bf2e2b4f   9 days ago      22.8MB
-
-#. Run the **docker push** command to upload the image to SWR. The size of the image is **9.5 MB**.
-#. On the local Docker client, pack the image into a **.tar** package. Download the **nginx.tar** package to the local host, and upload the package to SWR. The size of the package is **23.2 MB**.
-
-The size of the image uploaded through the client is different from that of the image uploaded through the SWR console.
-
-Cause Analysis
---------------
-
-Image layers are compressed into **.tgz** packages when images are uploaded to SWR through the client, whereas when they are uploaded through the SWR console, they are only packed without being compressed. Therefore, the same image will be of different sizes when it is uploaded in these two different ways.

umn/source/faqs/other_faqs/how_do_i_obtain_the_docker_image_of_the_target_software.rst

@@ -1,45 +0,0 @@
-:original_name: en-us_topic_0000001488635100.html
-
-.. _en-us_topic_0000001488635100:
-
-How Do I Obtain the Docker Image of the Target Software?
-========================================================
-
-Searching Docker Hub for a Target Docker Image
-----------------------------------------------
-
-Docker Hub provides more than 400,000 public Docker images for downloading various software, and the number keeps increasing at a rate of 5,000 per week. Therefore, you can find the corresponding image version except for the software developed by yourself. The Docker Hub address is https://hub.docker.com/.
-
-You are advised to obtain certified images of the following software directly from Docker Hub, rather than building them from scratch.
-
--  **Operating systems**
-
-   For example, Ubuntu, SUSE, and CentOS.
-
-   |image1|
-
--  **Basic programming languages**
-
-   For example, Java, Python, R, and Golang.
-
-   |image2|
-
--  **Popular software**
-
-   For example, Tomcat, MySQL, and Nginx.
-
-   |image3|
-
-Searching for the Docker Image of the Target Software from Google
------------------------------------------------------------------
-
-For software located in third-party image repositories, you can search for related images using Google. During the search, you only need to add Docker keywords next to software names.
-
-Example:
-
-|image4|
-
-.. |image1| image:: /_static/images/en-us_image_0000001539285933.png
-.. |image2| image:: /_static/images/en-us_image_0000001488366046.png
-.. |image3| image:: /_static/images/en-us_image_0000001488685838.png
-.. |image4| image:: /_static/images/en-us_image_0000001488845766.png

umn/source/faqs/other_faqs/how_many_tenants_can_i_share_an_swr_private_image_with.rst

@@ -1,8 +0,0 @@
-:original_name: en-us_topic_0000001539435061.html
-
-.. _en-us_topic_0000001539435061:
-
-How Many Tenants Can I Share an SWR Private Image with?
-=======================================================
-
-500.

umn/source/faqs/other_faqs/index.rst

@@ -6,13 +6,9 @@ Other FAQs
 ==========
 
 -  :ref:`Why Does a CCE Workload Cannot Pull an Image from SWR and the Message Indicating "Not Logged In" Is Displayed? <en-us_topic_0000001539235197>`
--  :ref:`How Many Tenants Can I Share an SWR Private Image with? <en-us_topic_0000001539435061>`
--  :ref:`How Do I Obtain the Docker Image of the Target Software? <en-us_topic_0000001488635100>`
 
 .. toctree::
    :maxdepth: 1
    :hidden: 
 
    why_does_a_cce_workload_cannot_pull_an_image_from_swr_and_the_message_indicating_not_logged_in_is_displayed
-   how_many_tenants_can_i_share_an_swr_private_image_with
-   how_do_i_obtain_the_docker_image_of_the_target_software

umn/source/faqs/troubleshooting/why_does_the_login_command_fail_to_be_executed.rst

@@ -49,12 +49,6 @@ Possible causes are as follows:
 
    The container engine client communicates with SWR through HTTPS. The client verifies the server certificate. If the server certificate is not issued by an authoritative organization, the following error message is displayed: "x509: certificate signed by unknown authority"
 
-
-   .. figure:: /_static/images/en-us_image_0000001137013964.png
-      :alt: **Figure 1** Error x509
-
-      **Figure 1** Error x509
-
    **Solutions**:
 
    If you trust the server and skip certificate authentication, manually configure Docker startup parameters as follows:

umn/source/image_management/obtaining_a_long-term_valid_login_command.rst

@@ -28,12 +28,22 @@ You can obtain a long-term valid login command as the following process:
 Procedure
 ---------
 
+#. **Obtain the programmatic access permission. (If the current user has the permission, skip this step.)**
+
+   a. Log in to the management console as an administrator.
+   b. Click |image1| in the upper left corner and select a region and a project.
+   c. Click |image2| in the navigation pane on the left and choose **Management & Governance** > **Identity and Access Management**.
+   d. Enter the name of the user to whom you want to grant the programmatic access permission in the search box on the **Users** page.
+   e. Click the user to go to its details page.
+   f. Click |image3| next to **Access Type**.
+   g. Select **Programmatic access**. (You can select only programmatic access or both access types.)
+
 #. .. _swr_01_1000__li5768123671815:
 
-   Obtain the region project name and image repository address.
+   Obtain the region, project name, and image repository address.
 
    a. Log in to the management console, click your username in the upper right corner, and click **My Credentials**.
-   b. On the **Project List** tab page, search for the project corresponding to the current region.
+   b. On the **Projects** tab page, search for the project corresponding to the current region.
    c. Obtain the image repository address by referring to :ref:`1.b <swr_01_0011__en-us_topic_0112596104_li182568055016>`. The domain name at the end of the login command is the image repository address.
 
 #. .. _swr_01_1000__li1863783911295:
@@ -59,7 +69,7 @@ Procedure
 
    **printf "$AK" \| openssl dgst -binary -sha256 -hmac "$SK" \| od -An -vtx1 \| sed 's/[ \\n]//g' \| sed 'N;s/\\n//'**
 
-   In the command, **$AK** and **$SK** indicate the AK and SK obtained in :ref:`2 <swr_01_1000__li1863783911295>` respectively.
+   In the command, **$AK** and **$SK** indicate the AK and SK obtained in :ref:`3 <swr_01_1000__li1863783911295>` respectively.
 
 
    .. figure:: /_static/images/en-us_image_0165729699.png
@@ -71,7 +81,7 @@ Procedure
 
    **docker login -u** [*Regional project name*]\ **@**\ [*AK*] **-p** [*Login key*] [*Image repository address*]
 
-   In the command, the regional project name and image repository address are obtained in :ref:`1 <swr_01_1000__li5768123671815>`, the AK in :ref:`2 <swr_01_1000__li1863783911295>`, and the login key in :ref:`3 <swr_01_1000__li132430753010>`.
+   In the command, the regional project name and image repository address are obtained in :ref:`2 <swr_01_1000__li5768123671815>`, the AK in :ref:`3 <swr_01_1000__li1863783911295>`, and the login key in :ref:`4 <swr_01_1000__li132430753010>`.
 
    .. note::
 
@@ -80,3 +90,7 @@ Procedure
       The login command can be used on other devices.
 
 #. Run the **history -c** command to clear the operation records.
+
+.. |image1| image:: /_static/images/en-us_image_0000001507688112.png
+.. |image2| image:: /_static/images/en-us_image_0000001558527697.png
+.. |image3| image:: /_static/images/en-us_image_0000001507528236.png

umn/source/image_management/uploading_an_image_through_the_client.rst

@@ -10,10 +10,6 @@ Scenario
 
 This section walks you through the steps of uploading an image to SWR through the client by taking the **nginx:v1** image built in :ref:`Basics of the Container Engine <swr_01_0006>` as an example. Uploading an image through the client is to run Docker commands on the client where Docker is installed to push the image to an image repository of SWR.
 
-.. note::
-
-   Each image layer uploaded through the client cannot exceed 10 GB.
-
 Notes and Constraints
 ---------------------
 

umn/source/organization_management.rst

@@ -32,9 +32,9 @@ You can create organizations based on the organizational structure of your enter
 
 
    .. figure:: /_static/images/en-us_image_0000001361665969.png
-      :alt: **Figure 2** Creating an Organization
+      :alt: **Figure 2** Creating an organization
 
-      **Figure 2** Creating an Organization
+      **Figure 2** Creating an organization
 
    .. note::
 
@@ -50,13 +50,13 @@ After you create an organization and push images to it, you can view the image l
 
 #. In the navigation pane, choose **Organization Management**. On the page displayed, click the desired organization name in the list.
 
-#. To view the images of this organization, click the **Image** tab.
+#. To view the images of this organization, click the **Images** tab.
 
 
    .. figure:: /_static/images/en-us_image_0000001154966988.png
-      :alt: **Figure 3** Viewing the Images of an Organization
+      :alt: **Figure 3** Viewing the images of an organization
 
-      **Figure 3** Viewing the Images of an Organization
+      **Figure 3** Viewing the images of an organization
 
 Deleting an Organization
 ------------------------
@@ -66,6 +66,7 @@ Before deleting an organization, delete all the images in the organization.
 #. Log in to the SWR console.
 #. In the navigation pane, choose **Organization Management**. On the page displayed, click the desired organization name in the list.
 #. Click **Delete** in the upper right corner. In the displayed dialog box, enter **DELETE** as prompted and click **Yes**.
+#.
 
 .. important::
 

umn/source/permissions_management/creating_a_user_and_granting_swr_permissions.rst

@@ -5,7 +5,7 @@
 Creating a User and Granting SWR Permissions
 ============================================
 
-This section describes how to use `IAM <https://docs.otc.t-systems.com/identity-access-management/umn/service_overview/what_is_iam.html#iam-01-0026>`__ to implement fine-grained permission management for your SWR resources. With IAM, you can:
+This section describes how to use `IAM <https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0026.html>`__ for fine-grained permission management on your SWR resources. With IAM, you can:
 
 -  Create IAM users for employees based on your enterprise's organizational structure. Each IAM user will have their own security credentials for accessing SWR resources.
 -  Grant only the permissions required for users to perform a specific task.
@@ -18,7 +18,7 @@ This section describes the procedure for granting permissions (see :ref:`Figure
 Prerequisite
 ------------
 
-Learn about the permissions (see :ref:`Permissions Management <en-us_topic_0000001488156484>`) supported by SWR and choose policies or roles according to your requirements.
+Learn about the permissions supported by SWR and choose policies or roles according to your requirements.
 
 Process Flow
 ------------
@@ -32,18 +32,12 @@ Process Flow
 
 #. .. _swr_01_0072__li8135822590:
 
-   `Create a user group and assign permissions <https://docs.otc.t-systems.com/identity-access-management/umn/getting_started/creating_a_user_group_and_assigning_permissions.html>`__.
+   `Create a user group and assign permissions <https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0030.html>`__.
 
-   Create a user group on the IAM console, and assign the **SWR Admin** policy to the group.
+   Create a user group on the IAM console, and assign the **SWR Administrator** policy to the group.
 
-#. `Create an IAM user and add the user to a user group <https://docs.otc.t-systems.com/identity-access-management/umn/getting_started/creating_a_user_and_adding_the_user_to_a_user_group.html>`__.
+#. `Create an IAM user and add the user to a user group <https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0031.html>`__.
 
    Create a user on the IAM console and add the user to the group created in :ref:`1 <swr_01_0072__li8135822590>`.
 
-#. `Log in <https://docs.otc.t-systems.com/identity-access-management/umn/getting_started/logging_in_as_a_user.html>`__ as the IAM user and verify the permissions.
-
-   Log in to the management console as the created user. Switch to the authorized region. Perform the following operations. If they can be successfully performed, the permissions are successfully granted.
-
-   a. Choose **Service List** > **Software Repository for Container**. The SWR console is displayed.
-   b. In the navigation pane on the left, choose **Organization Management**, click **Create Organization** in the upper right corner, and enter an organization name to create an organization.
-   c. In the navigation pane on the left, choose **My Images**, click **Upload Through SWR** in the upper right corner. Select the organization created in the previous step and a local image file. The image is successfully uploaded.
+#. `Log in <https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0552.html>`__ as the IAM user and verify permissions.

umn/source/service_overview/permissions/index.rst

@@ -11,7 +11,7 @@ With IAM, you can use your account to create IAM users, and assign permissions t
 
 If your account does not require individual IAM users for permissions management, skip this section.
 
-IAM can be used free of charge. You pay only for the resources in your account. For more information about IAM, see `IAM Service Overview <https://docs.otc.t-systems.com/identity-access-management/umn/service_overview/what_is_iam.html>`__.
+IAM can be used free of charge. You pay only for the resources in your account. For more information about IAM, see `IAM Service Overview <https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0026.html>`__.
 
 -  :ref:`SWR Permissions <en-us_topic_0000001488156664>`
 

umn/source/service_overview/permissions/swr_permissions.rst

@@ -14,7 +14,7 @@ SWR is a project-level service deployed and accessed in specific physical region
    +------------------------+----------------------------------------------------------------------------------------------+---------------------+
    | Name                   | Description                                                                                  | Type                |
    +========================+==============================================================================================+=====================+
-   | SWR Admin              | SWR administrator permissions, including all SWR permissions.                                | System-defined role |
+   | SWR Administrator      | SWR administrator permissions, including all SWR permissions.                                | System-defined role |
    +------------------------+----------------------------------------------------------------------------------------------+---------------------+
    | Tenant Administrator   | Administrator permissions for all services except IAM, including all SWR permissions.        | System-defined role |
    +------------------------+----------------------------------------------------------------------------------------------+---------------------+
@@ -25,5 +25,4 @@ SWR is a project-level service deployed and accessed in specific physical region
 
 .. note::
 
-   -  `Granting user permissions <https://docs.otc.t-systems.com/software-repository-container/umn/user_permissions.html>`__ enables you to grant different permissions, namely, read, write, and manage, to different users for them to access either a specific image or images of a specific organization.
-   -  In addition, SWR has the **SWR FullAccess**, **SWR OperateAccess**, and **SWR ReadOnlyAccess** permissions. However, the three are available only for SWR Enterprise Edition, which OBT has been suspended .
+   -  `Granting user permissions <https://docs.otc.t-systems.com/en-us/usermanual/swr/swr_01_0015.html>`__ enables you to grant read, write, and management permissions to different users for them to access either a specific image or images of a specific organization.

umn/source/user_permissions.rst

@@ -5,10 +5,10 @@
 User Permissions
 ================
 
-Scenarios
----------
+Scenario
+--------
 
-To manage SWR permissions, you can use Identity and Access Management (IAM). If you have the SWR Admin or Tenant Administrator permission, you become an admin user of SWR accounts. You can grant permissions to other IAM users in SWR.
+To manage SWR permissions, you can use Identity and Access Management (IAM). If you have the SWR Administrator or Tenant Administrator permission, you become an admin user of SWR accounts. You can grant permissions to other IAM users in SWR.
 
 If you are not an SWR account admin user, you can request an SWR account admin user to grant you permissions to read, write, or manage a specific image or images in a specific organization.
 
@@ -55,9 +55,9 @@ To allow users to read, write, and manage a specific image, grant corresponding
 
 
    .. figure:: /_static/images/en-us_image_0000001154645118.png
-      :alt: **Figure 2** Granting Permissions for a Specific Image
+      :alt: **Figure 2** Granting permissions for a specific image
 
-      **Figure 2** Granting Permissions for a Specific Image
+      **Figure 2** Granting permissions for a specific image
 
 Modifying or Deleting Permissions for a Specific Image
 ------------------------------------------------------