diff --git a/docs/en/docs/Container/container-tools.md b/docs/en/docs/Container/container-tools.md index f1d20e5f8e1cb0db2cb7bace8edd54be1780f5ab..5c4e83c56e68c023410f9ff1c9580a02b5f19274 100644 --- a/docs/en/docs/Container/container-tools.md +++ b/docs/en/docs/Container/container-tools.md @@ -1,3 +1,3 @@ # Container Tools -To better manage and use containers, iSula provides some container-related tools, including isula-build and isula-transform, which are used for container image building and container migration, respectively. This chapter describes how to install and use container tools. \ No newline at end of file +To improve the management and use of containers, iSulad provides some container tools, including the container image building tool iSula-build and the container migration tool iSula-transform. This chapter describes how to install and use the container tools. \ No newline at end of file diff --git a/docs/en/docs/Container/image-management-2.md b/docs/en/docs/Container/image-management-4.md similarity index 58% rename from docs/en/docs/Container/image-management-2.md rename to docs/en/docs/Container/image-management-4.md index 2d7fa0077fa033caef470e3291f83ad279d39091..a6c4c9263903a97f89765dd68d1a2abe4cf16426 100644 --- a/docs/en/docs/Container/image-management-2.md +++ b/docs/en/docs/Container/image-management-4.md @@ -1,6 +1,6 @@ # Image Management -- [Image Management](#image-management-2) +- [Image Management](#image-management) - [build](#build) - [history](#history) - [images](#images) @@ -22,13 +22,13 @@ ## build -Syntax: **docker build \[**_options_**\]** _path_ **|** _URL_ **| -** +Syntax: **docker build** \[OPTIONS\] PATH | URL | - Function: Builds an image using the Dockerfile in the specified path. -Parameter description: Common parameters are as follows. For details about more parameters, see the **docker help build** command section. +Parameters: Common parameters are as follows. For details about more parameters, run the **docker help build** command. -**Table 1** Parameter description +**Table 4** Parameter description - - - - -

Parameter

@@ -44,12 +44,12 @@ Parameter description: Common parameters are as follows. For details about more

--no-cache=false

Builds cache without using cache.

+

Builds the image without using cache.

-q, --quiet=false

Prevents the redundant information generation during the build.

+

Suppresses the redundant information generated during the the build process.

--rm=true

@@ -59,7 +59,7 @@ Parameter description: Common parameters are as follows. For details about more

-t, --tag=""

Tag name of the image generated during the build.

+

Specifies the tag name of the image generated during the build.

--build-arg=[]

@@ -74,42 +74,42 @@ Parameter description: Common parameters are as follows. For details about more

--isolation

Container isolation method.

+

Specifies the container isolation method.

--pull

Obtains the latest image during the build.

+

Always attempts to obtain the latest version of the image during the build process.
-**Dockerfile Command** +**Dockerfile Description** -Dockerfile is used to describe how to build an image and automatically build a container. The format of all **Dockerfile** commands is _instruction_ _arguments_. +Dockerfile is used to automatically build a container by describing how to build an image. All Dockerfile instructions are in the **INSTRUCTION arguments** format.    -**FROM Command** +**FROM Instruction** -Syntax: **FROM** _image_ or **FROM** _image_:_tag_ +Syntax: **FROM** or **FROM** : -Function: Specifies a basic image, which is the first command for all Dockerfile files. If the tag of a basic image is not specified, the default tag name **latest** is used. +Function: Specifies a base image, which is the first instruction in all Dockerfiles. If the tag of the base image is not specified, the default tag name **latest** is used.    -**RUN Command** +**RUN Instruction** -Syntax: **RUN** _command_ \(for example, **run in a shell - \`/bin/sh -c\`**\) or +Syntax: **RUN** \(The **shell** form. The command is run in a shell which by default is `/bin/sh -c`) or -**RUN \[**_executable_, _param1_, _param2_ ... **\]** \(in the **exec** command format\) +**RUN** \["", "", "" ... \] \(The **exec** form\) -Function: Runs any command in the image specified by the **FROM** command and then commits the result. The committed image can be used in later commands. The **RUN** command is equivalent to: +Function: Executes any commands in the image specified by the **FROM** instruction and then commits the result. The committed image will be used in the next step in the Dockerfile. The **RUN** instruction is equivalent to: -**docker run** _image_ _command_ +**docker run** -**docker commit** _container\_id_ +**docker commit**    @@ -119,89 +119,89 @@ The number sign \(\#\) is used to comment out.    -**MAINTAINER Command** +**MAINTAINER Instruction** -Syntax: **MAINTAINER **_name_ +Syntax: **MAINTAINER** -Function: Specifies the name and contact information of the maintenance personnel. +Function: Specifies the name and contact information of the maintainer.    -**ENTRYPOINT Command** +**ENTRYPOINT Instruction** -Syntax: **ENTRYPOINT cmd **_param1 param2..._ or **ENTRYPOINT \[**_"cmd", "param1", "param2"..._**\]** +Syntax: **ENTRYPOINT** ... or **ENTRYPOINT** \["", "", ""...\] -Function: Configures the command to be executed during container startup. +Function: Configures the commands to be executed during container startup.    -**USER Command** +**USER Instruction** -Syntax: **USER **_name_ +Syntax: **USER** -Function: Specifies the running user of memcached. +Function: Specifies the user to run **memcached**.    -**EXPOSE Command** +**EXPOSE Instruction** -Syntax: **EXPOSE **_port_** \[**_port_**...\]** +Syntax: **EXPOSE** \[...\] -Function: Enables one or more ports for images. +Function: Exposes one or more ports of the image.    -**ENV Command** +**ENV Instruction** -Syntax: **ENV**_ key value_ +Syntax: **ENV** -Function: Configures environment variables. After the environment variables are configured, the **RUN** commands can be subsequently used. +Function: Configures environment variables. The configured environment variables can be used by the subsequent **RUN** instructions.    -**ADD Command** +**ADD Instruction** -Syntax: **ADD**_ src dst_ +Syntax: **ADD** -Function: Copies a file from the _src_ directory to the _dest_ directory of a container. _src_ indicates the relative path of the source directory to be built. It can be the path of a file or directory, or a remote file URL. _dest_ indicates the absolute path of the container. +Function: Copies a file from directory to directory of the container. is a relative path of the source directory to be built. It can be the path of a file or directory, or a remote file URL. is an absolute path of the container.    -**VOLUME Command** +**VOLUME Instruction** -Syntax: **VOLUME \["**_mountpoint_**"\]** +Syntax: **VOLUME** \[""\] -Function: Creates a mount point for sharing a directory. +Function: Creates a mount point for the shared directory.    -**WORKDIR Command** +**WORKDIR Instruction** -Syntax: **workdir **_path_ +Syntax: **WORKDIR** -Function: Runs the **RUN**, **CMD**, and **ENTRYPOINT** commands to set the current working path. The current working path can be set multiple times. If the current working path is a relative path, it is relative to the previous **WORKDIR** command. +Function: Sets the working path for the **RUN**, **CMD**, and **ENTRYPOINT** instructions. The working path can be set multiple times. If the working path is a relative path, it is relative to the previous **WORKDIR** instruction.    -**CMD command** +**CMD Instruction** -Syntax: **CMD \[**_"executable","param1","param2"_**\]** \(This command is similar to the **exec** command and is preferred.\) +Syntax: **CMD** \["","",""\] \(The **exec** form. This is the preferred form.\) -**CMD \["**_param1_**","**_param2_**"\]** \(The parameters are the default parameters for ENTRYPOINT.\) +**CMD** \["",""\] \(The arguments are the default arguments for **ENTRYPOINT**.\) -**CMD** _command_ _param1_ _param2_ \(This command is similar to the **shell** command.\) +**CMD** "" "" "" \(The **shell** form.\) -Function: A Dockerfile can contain only one CMD command. If there are multiple CMD commands, only the last one takes effect. +Function: A Dockerfile can contain only one CMD instruction. If there are multiple CMD instructions, only the last one takes effect.    -**ONBUILD Commands** +**ONBUILD Instruction** -Syntax: **ONBUILD \[**_other commands_**\]** +Syntax: **ONBUILD** \[other instructions\] -Function: This command is followed by other commands, such as the **RUN** and **COPY** commands. This command is not executed during image build and is executed only when the current image is used as the basic image to build the next-level image. +Function: This instruction is followed by other instructions, such as the **RUN** and **COPY** instructions. This instruction is not executed during image build and is executed only when the current image is used as the base image for another build. -The following is a complete example of the Dockerfile command that builds an image with the sshd service installed. +The following is a complete example of a Dockerfile that builds an image with the sshd service installed. 
FROM busybox
@@ -216,7 +216,7 @@ ENTRYPOINT /usr/sbin/sshd -D
-Example: +Example commands: 1. Run the following command to build an image using the preceding Dockerfile: @@ -233,17 +233,17 @@ Example: ## history -Syntax: **docker history \[**_options_**\]** _image_ +Syntax: **docker history** \[OPTIONS\] Function: Displays the change history of an image. -Parameter description: +Parameters: --H, --human=true +**-H**, **--human=true** -**--no-trunc=false**: Does not delete any output. +**--no-trunc=false**: Indicates that the output is not truncated. -**-q** and **--quiet=false**: Display only IDs. +**-q** and **--quiet=false**: Displays IDs only. Example: @@ -258,19 +258,19 @@ be4672959e8b 15 minutes ago bash 23B ## images -Syntax: **docker images \[**_options_**\] \[**_name_**\]** +Syntax: **docker images** \[OPTIONS\] \[NAME\] -Function: Lists existing images. The intermediate image is not displayed if no parameter is configured. +Function: Lists existing images. The intermediate images are not displayed if no parameter is added. -Parameter description: +Parameters: -**-a** and **--all=false**: Display all images. +**-a** and **--all=false**: Displays all images. -**-f** and **--filter=\[\]**: Specify a filtering value, for example, **dangling=true**. +**-f** and **--filter=\[\]**: Specifies a filter, for example, **dangling=true**. -**--no-trunc=false**: Does not delete any output. +**--no-trunc=false**: Indicates that the output is not truncated. -**-q** and **--quiet=false**: Display only IDs. +**-q** and **--quiet=false**: Displays IDs only. Example: @@ -284,15 +284,15 @@ busybox latest e02e811dd08f 2 years ago ## import -Syntax: **docker import URL|- \[**_repository_**\[**_:tag_**\]\]** +Syntax: **docker import URL|- \[REPOSITORY\[:TAG\]\]** -Function: Imports a .tar package that contains rootfs as an image. This parameter corresponds to the **docker export** command. +Function: Imports a `.tar` package that contains a rootfs as an image. This parameter corresponds to the **docker export** command. -Parameter description: none. +Parameters: none. Example: -Run the following command to generate a new image for **busybox.tar** exported using the **docker export** command: +Run the following command to generate a new image from the **busybox.tar** file exported using the **docker export** command: ``` $ sudo docker import busybox.tar busybox:test @@ -306,13 +306,13 @@ busybox test a79d8ae12403 2 seconds ago ## load -Syntax: **docker load \[**_options_**\]** +Syntax: **docker load** \[OPTIONS\] -Function: Reloads an image from .tar package obtained by running the **docker save** command. This parameter corresponds to the **docker save** command. +Function: Loads an image from `.tar` package obtained using the **docker save** command. This command corresponds to the **docker save** command. -Parameter description: +Parameters: -**-i** and **--input=""** can be used. +**-i** and **--input=""**. Example: @@ -326,17 +326,17 @@ busybox latest e02e811dd08f 2 years ago ## login -Syntax: **docker login \[**_options_**\] \[**_server_**\]** +Syntax: **docker login** \[OPTIONS\] \[SERVER\] -Function: Logs in to an image server. If no server is specified, the system logs in to **https://index.docker.io/v1/** by default. +Function: Logs in to an image registry. If no server is specified, the system logs in to https://index.docker.io/v1/ by default. -Parameter description: +Parameters: -**-e** and **--email=""**: Email address. +**-e** and **--email=""**: Email address. -**-p** and **--password=""**: Password. +**-p** and **--password=""**: Password. -**-u** and **--username=""**: User name. +**-u** and **--username=""**: User name. Example: @@ -346,11 +346,11 @@ $ sudo docker login ## logout -Syntax: **docker logout \[**_server_**\]** +Syntax: **docker logout** \[SERVER\] -Function: Logs out of an image server. If no server is specified, the system logs out of **https://index.docker.io/v1/** by default. +Function: Logs out from an image registry. If no server is specified, the system logs out from https://index.docker.io/v1/ by default. -Parameter description: none. +Parameters: none. Example: @@ -360,17 +360,17 @@ $ sudo docker logout ## pull -Syntax: **docker pull \[**_options_**\]** _name_**\[**_:tag_**\]** +Syntax: **docker pull** \[OPTIONS\] NAME\[:TAG\] -Function: Pulls an image from an official or private registry. +Function: Pulls an image from the official or private registry. -Parameter description: +Parameters: -**-a** and **--all-tags=false**: Download all images in a registry. \(A registry can be tagged with multiple tags. For example, a busybox registry may have multiple tags, such as **busybox:14.04**, **busybox:13.10**, **busybox:latest**. If **-a** is used, all busybox images with tags are pulled.\) +**-a** and **--all-tags=false**: Downloads all images in the registry. \(A registry can be tagged with multiple tags. For example, a BusyBox registry may have multiple tags, such as **busybox:14.04**, **busybox:13.10**, **busybox:latest**. If **-a** is used, all BusyBox images with tags are pulled.\) Example: -1. Run the following command to obtain the Nginx image from the official registry: +1. Run the following command to pull an Nginx image from the official registry: ``` $ sudo docker pull nginx @@ -383,11 +383,11 @@ Example: Status: Downloaded newer image for nginx:latest ``` - When an image is pulled, the system checks whether the dependent layer exists. If yes, the local layer is used. + When pulling the image, the system checks whether the dependent layer exists. If yes, the local layer is used. 2. Pull an image from a private registry. - Run the following command to pull the Fedora image from the private registry, for example, the address of the private registry is **192.168.1.110:5000**: + Run the following command to pull a Fedora image from the private registry, assuming the address of the private registry is **192.168.1.110:5000**: ``` $ sudo docker pull 192.168.1.110:5000/fedora @@ -396,16 +396,16 @@ Example: ## push -Syntax: **docker push** _name_**\[**_:tag_**\]** +Syntax: **docker push** NAME\[:TAG\] Function: Pushes an image to the image registry. -Parameter description: none. +Parameters: none. Example: -1. Run the following command to push an image to the private image registry at 192.168.1.110:5000. -2. Label the image to be pushed. \(The **docker tag** command is described in the following section.\) In this example, the image to be pushed is busybox:sshd. +1. Assume an image is to be push to the private image registry at 192.168.1.110:5000. +2. Label the image to be pushed. \(The **docker tag** command is described in the following section.\) In this example, the image to be pushed is **busybox:sshd**. ``` $ sudo docker tag ubuntu:sshd 192.168.1.110:5000/busybox:sshd @@ -422,13 +422,13 @@ Example: ## rmi -Syntax: **docker rmi \[**_options_**\] **_image _**\[**_image..._**\]** +Syntax: **docker rmi** \[OPTIONS\] IMAGE \[IMAGE...\] -Function: Deletes one or more images. If an image has multiple tags in the image library, only the untag operation is performed when the image is deleted. If the image has only one tag, the dependent layers are deleted in sequence. +Function: Deletes one or more images. If an image has multiple tags in the image library, the image is not deleted but only untagged. When an image with one tag is deleted, the dependent layers are deleted in sequence. -Parameter description: +Parameters: -**-f** and **--force=false**: Forcibly delete an image. +**-f** and **--force=false**: Forcibly deletes the images. **--no-prune=false**: Does not delete parent images without tags. @@ -440,13 +440,13 @@ $ sudo docker rmi 192.168.1.110:5000/busybox:sshd ## save -Syntax: **docker save \[**_options_**\] **_image _**\[**_image..._**\]** +Syntax: **docker save** \[OPTIONS\] IMAGE \[IMAGE...\] -Function: Saves an image to a TAR package. The output is **STDOUT** by default. +Function: Saves an image to a `.tar` package. The results are output to **STDOUT** by default. -Parameter description: +Parameters: -**-o** and **--output=""**: Save an image to a file rather than STDOUT. +**-o** and **--output=""**: Outputs the results to a file rather than **STDOUT**. Example: @@ -458,21 +458,21 @@ nginx.tar ## search -Syntax: **docker search **_options_ _TERM_ +Syntax: **docker search** \[OPTIONS\] TERM -Function: Searches for a specific image in the image registry. +Function: Searches for specific images in the image registry. -Parameter description: +Parameters: **--automated=false**: Displays the automatically built image. -**--no-trunc=false**: Does not delete any output. +**--no-trunc=false**: Indicates that output is not truncated. -**-s** and **--stars=0**: Display only images of a specified star level or higher. +**-s** and **--stars=0**: Displays only images that have a specific number of stars or more. Example: -1. Run the following command to search for Nginx in the official image library: +1. Run the following command to search for Nginx images in the official image library: ``` $ sudo docker search nginx @@ -487,7 +487,7 @@ Example:    -2. Run the following command to search for busybox in the private image library. The address of the private image library must be added during the search. +2. Run the following command to search for BusyBox images in the private image library. Add the address to search the private image library. ``` $ sudo docker search 192.168.1.110:5000/busybox @@ -496,13 +496,13 @@ Example: ## tag -Syntax: **docker tag \[**_options_**\] **_image_**\[**_:tag_**\] \[**_registry host/_**\]\[**_username/_**\]**_name_**\[**_:tag_**\]** +Syntax: **docker tag** \[OPTIONS\] IMAGE\[:TAG\] \[REGISTRY HOST/\]\[USERNAME/\]NAME\[:TAG\] -Function: Tags an image to a registry. +Function: Tags an image into a registry. -Parameter description: +Parameters: -**-f** or **--force=false**: Forcibly replaces the original image when the same tag name exists. +**-f** or **--force=false**: Forcibly replaces the original image when the tag names are the same. Example: diff --git a/docs/en/docs/Container/installation-and-deployment-1.md b/docs/en/docs/Container/installation-and-deployment-1.md index fc7f9f9add7f8efce8ea207abc9b81a383bd427b..73542755435915b4e80869e66e52dd19b76463ea 100644 --- a/docs/en/docs/Container/installation-and-deployment-1.md +++ b/docs/en/docs/Container/installation-and-deployment-1.md @@ -1,19 +1,18 @@ # Installation and Deployment -- [Installation and Deployment](#installation-and-deployment-1) - - [Installation Methods](#installation-methods-26) - - [Deployment Configuration](#deployment-configuration-27) - - [Configuring the Docker Engine](#configuring-the-docker-engine) - - [iSulad Configuration](#isulad-configuration) - - [Configuration.toml](#configuration-toml) +- [Installation and Deployment](#installation-and-deployment) + - [Installation Methods](#installation-methods) + - [Deployment Configuration](#deployment-configuration) ## Installation Methods ### Prerequisites -- For better performance experience, a secure container needs to run on the bare metal server and must not run on VMs. -- A secure container depends on the following components \(openEuler 1.0 version\). Ensure that the required components have been installed in the environment. To install iSulad, refer to [Installation Methods](#installation-methods.md). + +- **root** permissions are required for installing a secure container. +- For better performance, a secure container needs to run on the bare metal server and **must not run on VMs**. +- A secure container depends on the following components from the corresponding openEuler version. Ensure that the required components have been installed in the environment. To install iSulad, refer to [Installation Methods](#installation-methods.md). - docker-engine - qemu diff --git a/docs/en/docs/Container/managing-the-lifecycle-of-a-secure-container.md b/docs/en/docs/Container/managing-the-lifecycle-of-a-secure-container.md index c16a2ee9a8a087af3d2b3643aba0a162d85f8b2a..7db446e38f162a73e4e520991c44390c7f01fccf 100644 --- a/docs/en/docs/Container/managing-the-lifecycle-of-a-secure-container.md +++ b/docs/en/docs/Container/managing-the-lifecycle-of-a-secure-container.md @@ -16,7 +16,7 @@ You can use the Docker engine or iSulad as the container engine of the secure co To start a secure container, perform the following steps: 1. Ensure that the secure container component has been correctly installed and deployed. -2. Prepare the container image. If the container image is busybox, run the following commands to download the container image using the Docker engine or iSulad: +2. Prepare the container image. Assume that the container image is **busybox**. Run the following commands to download the container image using the Docker engine or iSulad: ``` docker pull busybox @@ -26,7 +26,7 @@ To start a secure container, perform the following steps: isula pull busybox ``` -3. Start a secure container. Run the following commands to start a secure container using the Docker engine and iSulad: +3. Start a secure container. Run the following commands to start a secure container using the Docker engine or iSulad: ``` docker run -tid --runtime kata-runtime --network none busybox @@ -37,10 +37,10 @@ To start a secure container, perform the following steps: ``` >![](./public_sys-resources/icon-note.gif) **NOTE:** - >The secure container supports the CNI network only and does not support the CNM network. The **-p** and **--expose** options cannot be used to expose container ports. When using a secure container, you need to specify the **--net=none** option. + >The secure container supports the CNI network only and does not support the CNM network. The **-p** and **--expose** options cannot be used to expose container ports. When using a secure container, you need to specify the **--net=none** option. 4. Start a pod. - 1. Start the pause container and obtain the sandbox ID of the pod based on the command output. Run the following commands to start a pause container using the Docker engine and iSulad: + 1. Start the pause container and obtain the sandbox ID of the pod based on the command output. Run the following commands to start a pause container using the Docker engine or iSulad: ``` docker run -tid --runtime kata-runtime --network none --annotation io.kubernetes.docker.type=podsandbox @@ -52,7 +52,7 @@ To start a secure container, perform the following steps:    - 1. Create a service container and add it to the pod. Run the following commands to create a service container using the Docker engine and iSulad: + 1. Create a service container and add it to the pod. Run the following commands to create a service container using the Docker engine or iSulad: ``` docker run -tid --runtime kata-runtime --network none --annotation io.kubernetes.docker.type=container --annotation io.kubernetes.sandbox.id= busybox @@ -62,7 +62,7 @@ To start a secure container, perform the following steps: isula run -tid --runtime kata-runtime --network none --annotation io.kubernetes.cri.container-type=container --annotation io.kubernetes.cri.sandbox-id= busybox ``` - **--annotation** is used to mark the container type, which is provided by the Docker engine and iSulad, but not provided by the open-source Docker engine in the upstream community. + **--annotation** is used to mark the container type, which is provided by the Docker engine and iSulad, but is not provided by the open-source Docker engine in the upstream community. @@ -81,27 +81,24 @@ To start a secure container, perform the following steps: ## Deleting a Secure Container -Ensure that the container has been stopped. - +Ensure that the container has been stopped. Run the following command to delete the container: ``` docker rm ``` -To forcibly delete a running container, run the **-f** command. - +To forcibly delete a running container, use the **-f** option: ``` docker rm -f ``` ## Running a New Command in the Container -The pause container functions only as a placeholder container. Therefore, if you start a pod, run a new command in the service container. The pause container does not execute the corresponding command. If only one container is started, run the following command directly: - +The pause container functions only as a placeholder container. Therefore, after a pod is started, run the new command in the service container. The pause container does not execute the corresponding command. If you need to start only one container, you can run the following command: ``` docker exec -ti ``` >![](./public_sys-resources/icon-note.gif) **NOTE:** ->1. If the preceding command has no response because another host runs the **docker restart** or **docker stop** command to access the same container, you can press **Ctrl**+**P**+**Q** to exit the operation. ->2. If the **-d** option is used, the command is executed in the background and no error information is displayed. The exit code cannot be used to determine whether the command is executed correctly. +>1. If the preceding command has no response because another host is running the **docker restart** or **docker stop** command to access the same container, you can press **Ctrl**+**P**+**Q** to exit the operation. +>2. If the **-d** option is used, the command is executed in the background and no error information is displayed. The exit code cannot be used to determine whether the command is executed correctly. diff --git a/docs/en/docs/desktop/DDE-User-Manual.md b/docs/en/docs/desktop/DDE-user-guide.md old mode 100755 new mode 100644 similarity index 99% rename from docs/en/docs/desktop/DDE-User-Manual.md rename to docs/en/docs/desktop/DDE-user-guide.md index 9f2c87632b6c7ca15e79ef39e5d8295272053e56..7406b3896136c6b2a3bc2b5b0410fe1e92cc2e8a --- a/docs/en/docs/desktop/DDE-User-Manual.md +++ b/docs/en/docs/desktop/DDE-user-guide.md @@ -1,6 +1,6 @@ -# DDE Desktop Environment User Manual +# DDE Desktop Environment [[toc]] ## Overview DDE desktop environment is an elegant, secure, reliable and easy to use GUI comprised of the desktop, dock, launcher and control center. Acting as the key basis for our operating system, its main interface is shown as below. @@ -17,7 +17,7 @@ When you enter DDE for the very first time, a welcome program will automatically ## Desktop -Desktop is the main screen you see after logging in. On the desktop, you can create a new file/folder, sort files, open in terminal, set wallpaper and screensaver and etc. You can also add shortcuts for applications on desktop by using [Send to desktop](#Set App Shortcut). +Desktop is the main screen you see after logging in. On the desktop, you can create a new file/folder, sort files, open in terminal, set wallpaper and screensaver and etc. You can also add shortcuts for applications on desktop by using [Send to desktop](#set-app-shortcut). ![0|contextmenu](./figures/41.png) diff --git a/docs/en/docs/desktop/Xfce_userguide.md b/docs/en/docs/desktop/Xfce_userguide.md index ea6396320d845f3c7f44ac8d2bdfb95a7ff6d4a0..fb567c913cf3425f407864989936a3a28851fada 100644 --- a/docs/en/docs/desktop/Xfce_userguide.md +++ b/docs/en/docs/desktop/Xfce_userguide.md @@ -32,7 +32,7 @@ * [4.1.5 Application Finder](#4.1.5 Application Finder) * [4.1.6 User Home Directory](#4.1. 6 User Home Directory) -# Xfce User Guide +# Xfce Desktop Environment ## 1\. Overview diff --git a/docs/en/docs/desktop/install-DDE.md b/docs/en/docs/desktop/installing-DDE.md similarity index 96% rename from docs/en/docs/desktop/install-DDE.md rename to docs/en/docs/desktop/installing-DDE.md index 05a05125a3867f2b12897901f08bcddad9a24274..82388f86224263a18981c07fbae2d3fa290a4c8f 100644 --- a/docs/en/docs/desktop/install-DDE.md +++ b/docs/en/docs/desktop/installing-DDE.md @@ -1,31 +1,31 @@ -# DDE installation -#### Introduction - -DDE is a powerful desktop environment developed by UnionTech Team. Contains dozens of powerful desktop applications, which are truly self-developed desktop products. - -#### installation method - -1. [download](https://openeuler.org/zh/download/) openEuler ISO and install the OS. -2. update the software source -```bash -sudo dnf update -``` -3. install DDE -```bash -sudo dnf install dde -``` -4. set to start with a graphical interface -```bash -sudo systemctl set-default graphical.target -``` -5. reboot -```bash -sudo reboot -``` -6. After the restart is complete, use the user created during the installation process or the openeuler user to log in to the desktop. - - > dde cannot log in with root account - > dde has built-in openeuler user, the password of this user is openeuler - -Now you can use dde. - +# DDE installation +#### Introduction + +DDE is a powerful desktop environment developed by UnionTech Team. Contains dozens of powerful desktop applications, which are truly self-developed desktop products. + +#### installation method + +1. [download](https://openeuler.org/zh/download/) openEuler ISO and install the OS. +2. update the software source +```bash +sudo dnf update +``` +3. install DDE +```bash +sudo dnf install dde +``` +4. set to start with a graphical interface +```bash +sudo systemctl set-default graphical.target +``` +5. reboot +```bash +sudo reboot +``` +6. After the restart is complete, use the user created during the installation process or the openeuler user to log in to the desktop. + + > dde cannot log in with root account + > dde has built-in openeuler user, the password of this user is openeuler + +Now you can use dde. + diff --git a/docs/en/docs/desktop/install-UKUI.md b/docs/en/docs/desktop/installing-UKUI.md similarity index 97% rename from docs/en/docs/desktop/install-UKUI.md rename to docs/en/docs/desktop/installing-UKUI.md index ccda0d206fe006fa5e1da6f4296532e598eeb1e6..26b1e308207a5c8ecc4dfb9bfd6dd64d1b01175e 100644 --- a/docs/en/docs/desktop/install-UKUI.md +++ b/docs/en/docs/desktop/installing-UKUI.md @@ -1,21 +1,21 @@ -# UKUI installation -UKUI is a Linux desktop built by the KylinSoft software team over the years, primarily based on GTK and QT. Compared to other UI interfaces, UKUI is easy to use. The components of UKUI are small and low coupling, can run alone without relying on other suites. It can provide user a friendly and efficient experience. - -UKUI supports both x86_64 and aarch64 architectures. - -We recommend you create a new administrator user before install UKUI. - -1.download openEuler 20.03 LTS SP2 and update the software source. -``` -sudo dnf update -``` -2.install UKUI. -``` -sudo dnf install ukui -``` -3.If you want to start with graphical interface after confirming the installation, please run this code and reboot(`reboot`). -``` -systemctl set-default graphical.target -``` -At present, UKUI version is still constantly updated. Please check the latest installation method : -[https://gitee.com/openkylin/ukui-issues](https://gitee.com/openkylin/ukui-issues) +# UKUI installation +UKUI is a Linux desktop built by the KylinSoft software team over the years, primarily based on GTK and QT. Compared to other UI interfaces, UKUI is easy to use. The components of UKUI are small and low coupling, can run alone without relying on other suites. It can provide user a friendly and efficient experience. + +UKUI supports both x86_64 and aarch64 architectures. + +We recommend you create a new administrator user before install UKUI. + +1.download openEuler 20.03 LTS SP2 and update the software source. +``` +sudo dnf update +``` +2.install UKUI. +``` +sudo dnf install ukui +``` +3.If you want to start with graphical interface after confirming the installation, please run this code and reboot(`reboot`). +``` +systemctl set-default graphical.target +``` +At present, UKUI version is still constantly updated. Please check the latest installation method : +[https://gitee.com/openkylin/ukui-issues](https://gitee.com/openkylin/ukui-issues) diff --git a/docs/en/docs/desktop/Install_XFCE.md b/docs/en/docs/desktop/installing-Xfce.md similarity index 100% rename from docs/en/docs/desktop/Install_XFCE.md rename to docs/en/docs/desktop/installing-Xfce.md diff --git a/docs/en/docs/desktop/xfce.md b/docs/en/docs/desktop/xfce.md index f7563d6532f9c442c2a62b0e71cf8d0d22076d01..1c8485f2d64a9553483bfb6bb5b9e2bd60147e7b 100644 --- a/docs/en/docs/desktop/xfce.md +++ b/docs/en/docs/desktop/xfce.md @@ -1,3 +1,3 @@ # Xfce User Guide -This section describes how to install and use theXfce. \ No newline at end of file +This section describes how to install and use the Xfce. \ No newline at end of file diff --git a/docs/en/menu/index.md b/docs/en/menu/index.md index 786e05281a4cb3b877d0cec65d689ceac2419351..3f05b10b67797fb52ebaf61b5a2d6b0b1f5b3b22 100644 --- a/docs/en/menu/index.md +++ b/docs/en/menu/index.md @@ -114,13 +114,13 @@ headless: true - [Monitoring Secure Containers]({{< relref "./docs/Container/monitoring-secure-containers.md" >}}) - [Appendix]({{< relref "./docs/Container/appendix-2.md" >}}) - [Docker Container]({{< relref "./docs/Container/docker-container.md" >}}) - - [Installation and Deployment]({{< relref "./docs/Container/installation-and-deployment-2.md" >}}) + - [Installation and Deployment]({{< relref "./docs/Container/installation-and-deployment-1.md" >}}) - [Container Management]({{< relref "./docs/Container/container-management-1.md" >}}) - [Image Management]({{< relref "./docs/Container/image-management-1.md" >}}) - [Command Reference]({{< relref "./docs/Container/command-reference.md" >}}) - [Container Engine]({{< relref "./docs/Container/container-engine.md" >}}) - [Container Management]({{< relref "./docs/Container/container-management-2.md" >}}) - - [Image Management]({{< relref "./docs/Container/image-management-2.md" >}}) + - [Image Management]({{< relref "./docs/Container/image-management-4.md" >}}) - [Statistics]({{< relref "./docs/Container/statistics.md" >}}) - [Container Tools]({{< relref "./docs/Container/container-tools.md" >}}) - [Image Building]({{< relref "./docs/Container/isula-build.md" >}}) @@ -154,13 +154,13 @@ headless: true - [Guide to Porting OpenStack-Queens to openEuler]({{< relref "./docs/thirdparty_migration/OpenStack-Queens.md" >}}) - [Desktop Environment User Guide]({{< relref "./docs/desktop/desktop.md" >}}) - [UKUI]({{< relref "./docs/desktop/ukui.md" >}}) - - [Installation UKUI]({{< relref "./docs/desktop/install-UKUI.md" >}}) + - [Installation UKUI]({{< relref "./docs/desktop/installing-UKUI.md" >}}) - [UKUI User Guide]({{< relref "./docs/desktop/UKUI-user-guide.md" >}}) - [DDE]({{< relref "./docs/desktop/dde.md" >}}) - - [install-DDE]({{< relref "./docs/desktop/install-DDE.md" >}}) - - [DDE User Guide]({{< relref "./docs/desktop/DDE-User-Manual.md" >}}) + - [install-DDE]({{< relref "./docs/desktop/installing-DDE.md" >}}) + - [DDE User Guide]({{< relref "./docs/desktop/DDE-user-guide.md" >}}) - [XFCE]({{< relref "./docs/desktop/xfce.md" >}}) - - [Xfce Installation Guide]({{< relref "./docs/desktop/Install_XFCE.md" >}}) + - [Xfce Installation Guide]({{< relref "./docs/desktop/installing-Xfce.md" >}}) - [Xfce User Guide]({{< relref "./docs/desktop/Xfce_userguide.md" >}}) - [HA User Guide]({{< relref "./docs/desktop/HAuserguide.md" >}}) - [secGear Development Guide]({{< relref "./docs/secGear/secGear.md" >}})