From 8b2a4a70f9069cf4068a8c575f3d2606a88ff93b Mon Sep 17 00:00:00 2001
From: hcy1012 <690765764@qq.com>
Date: Wed, 1 Dec 2021 17:13:34 +0800
Subject: [PATCH] update translation and add TOC
---
docs/en/docs/Administration/faqs.md | 53 ++++++++-
.../docs/Administration/process-management.md | 112 +++++++++---------
.../Container/figures/isula-build_arch.png | Bin 3418 -> 6189 bytes
.../{acknowledgement.md => acknowledgment.md} | 2 +-
docs/en/docs/desktop/DDE-User-Manual.md | 21 +++-
docs/en/docs/desktop/Install_XFCE.md | 11 +-
docs/en/docs/desktop/UKUI-user-guide.md | 51 +++++++-
docs/en/docs/desktop/Xfce_userguide.md | 90 ++++++++------
docs/en/docs/desktop/install-DDE.md | 24 ++--
docs/en/docs/desktop/install-UKUI.md | 12 +-
.../thirdparty_migration/OpenStack-Queens.md | 18 +--
.../thirdparty_migration/OpenStack-Rocky.md | 2 +-
docs/en/menu/index.md | 10 +-
13 files changed, 266 insertions(+), 140 deletions(-)
rename docs/en/docs/Releasenotes/{acknowledgement.md => acknowledgment.md} (80%)
diff --git a/docs/en/docs/Administration/faqs.md b/docs/en/docs/Administration/faqs.md
index 2ec272cd2..d518c7e93 100644
--- a/docs/en/docs/Administration/faqs.md
+++ b/docs/en/docs/Administration/faqs.md
@@ -1,6 +1,29 @@
# FAQs
-[[toc]]
+
+
+
+
+
+- [FAQs](#faqs)
+ - [Why Is the Memory Usage of the libvirtd Service Queried by Running the systemctl and top Commands Different?](#why-is-the-memory-usage-of-the-libvirtd-service-queried-by-running-the-systemctl-and-top-commands-different)
+ - [An Error Occurs When stripsize Is Set to 4 During RAID 0 Volume Configuration](#an-error-occurs-when-stripsize-is-set-to-4-during-raid-0-volume-configuration)
+ - [Failed to Compile MariaDB Using rpmbuild](#failed-to-compile-mariadb-using-rpmbuild)
+ - [Failed to Start the SNTP Service Using the Default Configuration](#failed-to-start-the-sntp-service-using-the-default-configuration)
+ - [Installation Failure Caused by Software Package Conflict, File Conflict, or Missing Software Package](#installation-failure-caused-by-software-package-conflict-file-conflict-or-missing-software-package)
+ - [Why Do OpenSSH-related Packages Fail to Be Installed when the OpenSSH Software Package Is Upgraded in Default DNF Update Mode?](#why-do-openssh-related-packages-fail-to-be-installed-when-the-openssh-software-package-is-upgraded-in-default-dnf-update-mode)
+ - [Failed to Downgrade the libiscsi](#failed-to-downgrade-the-libiscsi)
+ - [Failed to Downgrade the xfsprogs](#failed-to-downgrade-the-xfsprogs)
+ - [ReDoS Caused by Improper Use of glibc Regular Expressions](#redos-caused-by-improper-use-of-glibc-regular-expressions)
+ - [A Cache File Exists when Files Are Edited Using Emacs.](#a-cache-file-exists-when-files-are-edited-using-emacs)
+ - [The Error Message "Failed to make ourselves RT: Operation not permitted" Is Displayed when the rtkit-daemon Service Is Started](#the-error-message-failed-to-make-ourselves-rt-operation-not-permitted-is-displayed-when-the-rtkit-daemon-service-is-started)
+ - [Failed to Reboot the System After It Is Fully Upgraded from 20.03-LTS to 20.03-LTS-SP2 Using the `dnf update` Command](#failed-to-reboot-the-system-after-it-is-fully-upgraded-from-2003-lts-to-2003-lts-sp2-using-the-dnf-update-command)
+ - [The httpd Service Fails to Be Started After the Version Is Upgraded](#the-httpd-service-fails-to-be-started-after-the-version-is-upgraded)
+ - [Upgrade and Downgrade Issues of fuse 2.9.9-4 and fuse3 3.9.2-4](#upgrade-and-downgrade-issues-of-fuse-299-4-and-fuse3-392-4)
+ - [An Error Is Reported When gdbm-devel Is Installed or Uninstalled During the Installation and Uninstallation of httpd-devel and apr-util-devel](#an-error-is-reported-when-gdbm-devel-is-installed-or-uninstalled-during-the-installation-and-uninstallation-of-httpd-devel-and-apr-util-devel)
+
+
+
## Why Is the Memory Usage of the libvirtd Service Queried by Running the systemctl and top Commands Different?
@@ -185,8 +208,8 @@ Open source software developers of openEuler 20.03-LTS-SP2 have identified this
dnf update –y –nobest openssh
```
-### Install conflicting instances.
-* File conflict occurs.
+### Installing Conflicting Instances
+* A file conflict occurs.
The python3-edk2-devel.noarch file conflicts with the build.noarch file due to duplicate file names.
@@ -503,4 +526,26 @@ The preceding log indicates that the SELinux prevents the httpd process from per
1. Execute `dnf upgrade fuse` to upgrade the fuse, and `dnf fuse fuse3 fuse-common` to upgrade the fuse3.
2. No measure needs to be taken.
-3. No measure needs to be taken.
\ No newline at end of file
+3. No measure needs to be taken.
+
+## An Error Is Reported When gdbm-devel Is Installed or Uninstalled During the Installation and Uninstallation of httpd-devel and apr-util-devel
+
+### Symptom
+
+1. An error is reported when gdbm-devel-1.18.1-1 is installed or uninstalled.
+2. After the error is rectified, gdbm and gdbm-devel are upgraded to the 1.18.1-2 version. However, the default version of gdbm-devel is still 1.18.1-1 when httpd-devel and apr-util-devel (dependent on gdbm-devel) are installed. As a result, the error persists.
+
+### Possible Cause
+
+1. The gdbm-devel-1.18.1-1 package does not contain the help package that provides `info`. As a result, the help package cannot be introduced when gdbm-devel is installed independently, and the following alarm information is displayed:
+
+ ```
+ install-info: No such file or directory for /usr/share/info/gdbm.info.gz
+ ```
+
+2. By default, the gdbm-1.18.1-1 main package is installed in the system, but the gdbm-devel package is not installed. The software packages depending on gdbm-devel still match the version of the gdbm main package and install gdbm-devel-1.18.1-1. As a result, the error persists.
+
+### Solution
+
+1. Install gdbm-1.18.1-2 to upgrade gdbm. The error is rectified.
+2. Upgrade gdbm, and then install gdbm-devel to make it depend on the gdbm of the later version. The error is rectified.
\ No newline at end of file
diff --git a/docs/en/docs/Administration/process-management.md b/docs/en/docs/Administration/process-management.md
index 4032595e9..3925fea9d 100644
--- a/docs/en/docs/Administration/process-management.md
+++ b/docs/en/docs/Administration/process-management.md
@@ -1,6 +1,6 @@
# Process Management
-The operating system manages multiple user requests and tasks. In most cases, the operating system comes with only one CPU and one main memory, but it may have multiple tier-2 disks and input/output \(I/O\) devices. Therefore, users have to share resources, but it appears to users that they are exclusively occupying resources. The operating system places user tasks, OS tasks, emailing, print tasks, and other pending tasks in the queue and schedules the tasks according to predefined rules. In this topic, you will know how the operating system manages processes.
+The operating system (OS) manages multiple user requests and tasks. In most cases, the OS comes with only one CPU and one main memory, but multiple tier-2 disks and input/output \(I/O\) devices. Therefore, users have to share resources, but it appears to users that they are exclusively occupying resources. The OS places user tasks, OS tasks, mailing, print tasks, and other pending tasks in a queue and schedules the tasks according to predefined rules. This topic describes how the OS manages processes.
- [Process Management](#process-management)
@@ -18,12 +18,12 @@ The operating system manages multiple user requests and tasks. In most cases, th
## Viewing Processes
-Linux is a multi-task system and needs to get process information during process management. To manage processes, you first need to know the number of processes and their statuses. Multiple commands are available to view processes.
+Linux is a multi-task system and needs to get process information during process management. To manage processes, you need to know the number of processes and their statuses. Multiple commands are available to view processes.
### who Command
-The who command is used to display system user information. For example, before running the talk command to establish instant communication with another user, you need to run the who command to determine whether the target user is online. As another example, the system administrator can run the who command to learn what each login user is doing at the current time. The who command is widely seen in system administration since it is easy to use and can return a comprehensive set of accurate user information.
+The `who` command is used to display system user information. For example, before running the `talk` command to establish instant communication with another user, you need to run the `who` command to determine whether the target user is online. In another example, the system administrator can run the `who` command to learn what each login user is doing at the current time. The `who` command is widely seen in system administration since it is easy to use and can return a comprehensive set of accurate user information.
-The following is an example output of the who command, where system users and their status are displayed: The use of the **who** command is as follows:
+The following is an example output of the `who` command, where system users and their status are displayed: The use of the `who` command is as follows:
```
$ who
@@ -38,9 +38,9 @@ root pts/8 Aug 6 11:34 (192.168.0.234)
```
### ps Command
-The **ps** command is the most basic and powerful command to view process information. The ps command is used to display process information, including which processes are running, terminated, resource-hungry, or stay as zombies.
+The `ps` command is the most basic and powerful command to view process information, including which processes are running, terminated, resource-hungry, or stay as zombies.
-A common scenario is using the ps command to monitor background processes, which do not interact with your screen, keyboard, and other I/O devices. [Table 1](#en-us_topic_0151921029_t34619d964a3d41ad8694189ec383359c) lists the common ps command options.
+A common scenario is to monitor background processes, which do not interact with your screen, keyboard, and other I/O devices. [Table 1](#en-us_topic_0151921029_t34619d964a3d41ad8694189ec383359c) lists the common `ps` command options.
**Table 1** Common ps command options
@@ -63,7 +63,7 @@ A common scenario is using the ps command to monitor background processes, which
-h
|
-Hides column headings in the listing of process information.
+ | Hides column headings in the process information.
|
-l
@@ -88,7 +88,7 @@ A common scenario is using the ps command to monitor background processes, which
|
-x
|
-Lists all processes without controlling terminals.
+ | Lists all processes without control terminals.
|
@@ -106,34 +106,34 @@ $ ps -a
```
### top Command
-Both the top and the ps commands can display a list of currently running processes, but the top command allows you to update the displayed list of processes repeatedly with the press of a button. If the top command is executed in foreground, it exclusively occupies foreground until it is terminated. The top command provides real-time visibility into system processor status. You can sort the list of CPU tasks by CPU usage, memory usage, or task execution time. Extensive customization of the display, such as choice of columns or sorting method, can be achieved using interactive commands or the customization file.
+Both the `top` and `ps` commands can display a list of currently running processes, but the `top` command allows you to update the displayed list of processes by pressing a button repeatedly. If the `top` command is executed in foreground, it exclusively occupies foreground until it is terminated. The `top` command provides real-time visibility into system processor status. You can sort the list of CPU tasks by CPU usage, memory usage, or task execution time. Extensive display customization, such as choosing the columns or sorting method, can be achieved using interactive commands or the customization file.
-[Figure 1](#en-us_topic_0151921029_f289234fcdbac453796200d80e9889cd1) provides an example output of the top command.
+[Figure 1](#en-us_topic_0151921029_f289234fcdbac453796200d80e9889cd1) provides an example output of the `top` command.
**Figure 1** Example command output
### kill Command
-The **kill** command is used to terminate a process regardless of whether the process is running in foreground or background. It differs from the combo key **Ctrl+c**, which can terminate only foreground processes. The kill command is used to terminate a process regardless of whether the process is running in foreground or background. The reason for terminating a background process can be heavy use of CPU resources or deadlock.
+The `kill` command is used to terminate a process regardless of whether the process is running in foreground or background. It differs from the combo key **Ctrl+C**, which can terminate only foreground processes. The reason for terminating a background process can be heavy use of CPU resources or deadlock.
-The kill command sends a signal to terminate running processes. By default, the TERM signal is used. The TERM signal terminates all processes incapable of capturing the TERM signal. To terminate a process capable of capturing the TERM signal, use the KILL signal \(signal ID: 9\) instead.
+The `kill` command sends a signal to terminate running processes. By default, the `TERM` signal is used, terminating all processes incapable of capturing it. To terminate a process capable of capturing the `TERM` signal, use the `KILL` signal \(signal ID: 9\) instead.
-Two types of syntax of the kill command:
+Two types of syntax of the `kill` command:
```
kill [-s signal | -p] [-a] PID…
kill -l [signal]
```
-The process ID is retrieved from the ps command. The **-s** option indicates the signal sent to specified program. The signal details can be viewed by running the **kill -l** command. The **-p** option indicates the specified process IDs.
+The process ID can be retrieved by running the `ps` command. The `-s` option indicates the signal sent to the specified program. The signal details can be viewed by running the `kill -l` command. The `-p` option indicates the specified process ID.
-For example, to terminate the process with ID 1409, run the following command as the **root** user:
+For example, to terminate the process whose ID is 1409, run the following command as the **root** user:
```
# kill -9 1409
```
-Example output of the kill command with the -l option
+Example output of the `kill` command with the `-l` option
```
$ kill -l
@@ -154,15 +154,15 @@ $ kill -l
## Scheduling a Process
-The time-consuming and resource-demanding part of maintenance work is often performed at late night. You can arrange relevant processes to get started at the scheduled time instead of staying up all night. Here, we will explain the process scheduling commands.
+The time-consuming and resource-demanding part of maintenance work is often performed at late night. You can schedule relevant processes to get started at the scheduled time instead of staying up all night. The following describes the process scheduling commands.
### Using the at Command to Run Processes at the Scheduled Time
#### Function
-The at command is used to run a batch of processes \(a series of commands\) at the scheduled time or time+date.
+The `at` command is used to run a batch of processes \(a series of commands\) at the scheduled time or time and date.
-Syntax of the at command:
+Syntax of the `at` command:
```
at [-V] [-q queue] [-f filename] [-mldbv] time
@@ -172,14 +172,14 @@ at -c job [job...]
#### Time Format
The scheduled time can be in any of the following formats:
-- hh:mm today: If hh:mm is earlier than the current time, the selected commands will be run at hh:mm the next day.
+- _hh:mm_ today: If _hh:mm_ is earlier than the current time, the selected commands will be run at _hh:mm_ the next day.
- midnight, noon, teatime \(typically at 16:00\), or the like
- 12-hour format followed by am or pm
-- Time + date \(month day, mm/dd/yy, or dd.mm.yy\) The scheduled date must follow the scheduled time.
+- Time + date \(_month day_, _mm/dd/yy_, or _dd.mm.yy_\). The scheduled date must follow the scheduled time.
-The scheduled time can also be relative time, which is suitable for scheduling commands that are going to be executed soon. For example, now+_N_ minutes, hours, days, or weeks. _N_ is time, which may be a few days or hours. Further, the scheduled time can be words like today, tomorrow, or the like. Here are some examples of the scheduled time.
+The scheduled time can also be relative time, which is suitable for scheduling commands that are going to be executed soon. For example, now+_N_ minutes, hours, days, or weeks. _N_ indicates the specified time, which may be a few days or hours. Further, the scheduled time can be words like today, tomorrow, or the like. Here are some examples of the scheduled time.
-Imagine the current time is 12:30 June 7 2019 and you want to run a command at 4:30 pm. The scheduled time in the at command can be any of the following:
+Assume that the current time is 12:30 June 7 2019 and you want to run a command at 4:30 pm. The time scheduled by the `at` command can be any of the following:
```
at 4:30pm
@@ -192,12 +192,12 @@ Imagine the current time is 12:30 June 7 2019 and you want to run a command at 4
at 16:30 Jun 7
```
-Although you can select any of the preceding examples according to your preference, absolute time in 24-hour format, such as at 16:30 6/7/19, is recommended.
+Although you can select any of the preceding examples according to your preference, absolute time in 24-hour format, such as `at 16:30 6/7/19`, is recommended.
#### Privileges
-Only commands from standard input or from the file specified by the -f option can be scheduled by the at command to be executed. If the su command is executed to switch the operating system from user A to user B and then the at command is executed at the shell prompt of user B, the at command execution result is sent to user B. whereas emails \(if any\) are sent to user A.
+Only commands from standard input or from the file specified by the **-f** option can be scheduled by the `at` command. If the `su` command is executed to switch the OS from user A to user B and then the `at` command is executed at the shell prompt of user B, the `at` command execution result is sent to user B, whereas emails \(if any\) are sent to user A.
-For example, to run the slocate -u command at 10 am on June 8, 2019, perform the following steps as the **root** user:
+For example, to run the `slocate -u` command at 10 am on June 8, 2019, run the following commands as the **root** user:
```
# at 10:00 6/8/19
@@ -206,45 +206,45 @@ at>
[1]+ Stopped at 10:00 6/8/19
```
-When the at\> prompt appears, type **slocate -u** and press Enter. Repeat substep 2 to add other commands that need to be run at 10 am on 8 June 2015. Then, press Ctrl+d to exit the at command.
+When the **at\>** prompt appears, type `slocate -u` and press **Enter**. Repeat the step to add other commands that need to be run at 10 am on 8 June 2019. Then, press **Ctrl+D** to exit the `at` command.
-The administrator is authorized to run the at command unconditionally. For other users, their privilege to run the at command is defined in /etc/at.allow and /etc/at.deny files.
+The administrator is authorized to run the `at` command unconditionally. For other users, their privileges to run the `at` command is defined in the **/etc/at.allow** and **/etc/at.deny** files.
### Using the cron Service to Run Commands Periodically
-The at command can run commands at the scheduled time but only once. It means that after the running command is specified, the system completes the task at the specified time. If you need to run commands repeatedly, the cron service is a good helper.
+The `at` command can run commands at the scheduled time, but only once. It means that after the commands to be run is specified, the system completes the task at the specified time. If you need to run the commands repeatedly, the **cron** service is a good choice.
#### Cron Service
-The **cron** service searches the **/var/spool/cron** directory for **crontab** files named by the user name in the /etc/passwd file and loads the search results into memory to execute the commands in the **crontab** files. Each user has a crontab file, with the file name being the same as the user name. For example, the **crontab** file of the **userexample** user is **/var/spool/cron/userexample**.
+The **cron** service searches the **/var/spool/cron** directory for the **crontab** files named by the user name in the **/etc/passwd** file and loads the search results into memory to execute the commands in the **crontab** files. Each user has a **crontab** file with the same name as the user name. For example, the **crontab** file of the **userexample** user is **/var/spool/cron/userexample**.
-The **cron** service also reads the cron configuration file **/etc/crontab** every minute, which can be edited in various formats. If no crontab files are found, the **cron** service enters sleep mode and releases system resources. One minute later, the **cron** service is awoken to repeat the search work and command execution. Therefore, the background process occupies few resources and is wakened up every minute to check whether there are commands to be executed.
+The **cron** service also reads the cron configuration file **/etc/crontab** every minute, which can be edited in various formats. If no **crontab** files are found, the **cron** service enters sleep mode and releases system resources. One minute later, the **cron** service is waken up to repeat the search work and command execution. Therefore, the background process occupies few resources and is wakened up every minute to check whether there are commands to be executed.
-Command execution results are then mailed to users specified by the environment variable MAILTO in the /etc/crontab file. The **cron** service, once started, does not require manual intervention except when you need to replace periodic commands with new ones.
+Command execution results are then mailed to users specified by the environment variable `MAILTO` in the **/etc/crontab** file. The **cron** service, once started, does not require manual intervention except when you need to replace the scheduled commands with new ones.
#### crontab Command
-The crontab command is used to install, edit, remove, list, and perform other operations on crontab files. Each user has its own crontab files and can add commands to be executed to the files.
+The `crontab` command is used to install, edit, remove, list, and perform other operations on **crontab** files. Each user has its own **crontab** files and can add commands to be executed to the files.
-Here are common crontab command options:
+Here are common `crontab` command options:
-- crontab -u //Set the **cron** service of a user. This option is required only when the **crontab** command is run by the **root** user.
-- crontab -l //List details of the **cron** service of a user.
+- crontab -u //Set the **cron** service of a user. This option is required only when the `crontab` command is run by the **root** user.
+- crontab -l //List details about the **cron** service of a user.
- crontab -r //Remove the **cron** service of a user.
- crontab -e //Edit the **cron** service of a user.
-For example, to list cron service settings of the user **root**, run the following command:
+For example, to list the **cron** service settings of the **root** user, run the following command:
```
# crontab -u root -l
```
#### crontab Files
-Enter the commands to be executed and time in crontab files. Each line in the files contains six fields. The first five fields are the time when the specified command is executed, and the last field is the command to be executed. Fields are separated by spaces or tabs. The format is as follows:
+Enter the commands to be executed and their scheduled time in **crontab** files. Each line in the files contains six fields. The first five fields are the time when the specified command is executed, and the last field is the command to be executed. Fields are separated by spaces or tabs. The format is as follows:
```
minute hour day-of-month month-of-year day-of-week commands
```
-Each field is described as follows:
+The following table describes the fields in each line.
**Table 2** Parameter description
@@ -262,59 +262,59 @@ Each field is described as follows:
hour
|
-The hour of the day at which periodic commands will be executed. Value range: 0–23.
+ | The hour of the day at which scheduled commands will be executed. Value range: 0–23.
|
day-of-month
|
-The day of month at which periodic commands will be executed. Value range: 1–31.
+ | The day of the month on which scheduled commands will be executed. Value range: 1–31.
|
month-of-year
|
-The month of year at which periodic commands will be executed. Value range: 1–12.
+ | The month of the year in which scheduled commands will be executed. Value range: 1–12.
|
day-of-week
|
-The day of week at which periodic commands will be executed. Value range: 0–6.
+ | The day of the week on which scheduled commands will be executed. Value range: 0–6.
|
commands
|
-Periodic commands.
+ | Scheduled commands.
|
-The fields cannot be left unspecified. In addition to numerical values, the following special symbols are allowed: Asterisk \(\*\): a wildcard value. Forward slash \(/\): followed by a numeral N to indicate that commands will be executed at a regular interval of N. Hyphen \(-\): used with a range.Comma \(,\): used to separate discrete numbers. A complete path to the commands shall be provided.
+The fields cannot be left unspecified. In addition to numerical values, the following special characters are allowed: asterisk \(\*\), indicating a wildcard value; forward slash \(/\), followed by a numeral value _N_ to indicate that commands will be executed at a regular interval of _N_; hyphen \(-\), used with a range; and comma \(,\), used to separate discrete values. A complete path to the commands must be provided.
-For example, to allow the operating system to add sleepy to the /tmp/test.txt file every two hours from 18 pm to 22 pm, add the following line in a crontab file:
+For example, to allow the OS to add **sleepy** to the **/tmp/test.txt** file every two hours from 18 pm to 22 pm, add the following line to a **crontab** file:
```
* 18-22/2 * * * echo "sleepy" >> /tmp/test.txt
```
-Each time the cron service settings of a user are edited, the cron service generates in the /var/spool/cron directory a crontab file named after the user. The crontab file can be edited only using the crontab -e command. Alternatively, the user can create a file and run the crontab _filename_ command to import its cron settings into the new file.
+Each time the **cron** service settings of a user are edited, the **cron** service generates a **crontab** file with the same name as the user in the **/var/spool/cron directory**. The **crontab** file can be edited only using the `crontab -e` command. Alternatively, the user can create a file and run the `crontab _filename_` command to import its **cron** settings to the new file.
-For example, to create a crontab file for the userexample user, perform the following steps: The procedure is as follows:
+For example, to create a **crontab** file for the **userexample** user, perform the following steps:
-1. Create a file using any text editor. Add the commands that need to be executed periodically and the command execution interval to the new file. In this example, the new file is **\~/userexample.cron**.
-2. Run the following command as the **root** user to install the new file as the crontab file of the userexample user:
+1. Create a file using any text editor. Add the commands that need to be executed periodically and the command execution interval to the new file. In this example, the new file is **\~/userexample.cron**.
+2. Run the following command as the **root** user to install the new file as the **crontab** file of the **userexample** user:
```
# crontab -u userexample ~/userexample.cron
```
-After the new file is installed, you will find a file named userexample in the **/var/spool/cron** directory. This file is the required crontab file.
+After the new file is installed, you will find a file named **userexample** in the **/var/spool/cron** directory. This file is the required **crontab** file.
> **NOTE:**
->Do not restart the cron service after a crontab file is modified, because the cron service, once started, reads the crontab file every minute to check whether there are commands that need to be executed periodically. You do not need to restart the **cron** service after modifying the **crontab** file.
+>Do not restart the **cron** service after a **crontab** file is modified, because the **cron** service, once started, reads the **crontab** file every minute to check whether there are commands that need to be executed periodically.
#### /etc/crontab File
-The **cron** service reads all files in the **/var/spool/cron** directory and the **crontab** file in the **/etc/crontab** directory every minute. Therefore, you can use the **cron** service by configuring the **crontab** file. A crontab file contains user-specific commands, whereas the **/etc/crontab** file contains system-wide commands. Example /etc/crontab file
+The **cron** service reads all files in the **/var/spool/cron** directory and the **/etc/crontab** file every minute. Therefore, you can use the **cron** service by configuring the **/etc/crontab** file. A **crontab** file contains user-specific commands, whereas the **/etc/crontab** file contains system-wide commands. The following is an example of the **/etc/crontab** file.
```
SHELL=/bin/sh
@@ -329,10 +329,10 @@ HOME=/
```
> **NOTE:**
->If the **run-parts** parameter is deleted, a script name instead of a directory name is executed.
+>If the **run-parts** parameter is deleted, a script name instead of a directory name is used.
## Suspending/Resuming a Process
-A process can be suspended or resumed by job control, and the process will continue to work from the suspended point after being resumed. To suspend a foreground process, press Ctrl+Z. After you press Ctrl+Z, the cat command is suspended together with the foreground process you wish to suspend. You can use the jobs command instead to display a list of shell jobs, including their job names, IDs, and status.
+A process can be suspended or resumed by job control, and the process will continue to work from the suspended point after being resumed. To suspend a foreground process, press **Ctrl+Z**. After you press **Ctrl+Z**, the `cat` command is suspended together with the foreground process you want to suspend. You can use the `jobs` command instead to display a list of shell jobs, including their names, IDs, and status.
-To resume a process in foreground or background, run the fg or bg command, respectively. The process then starts from where it paused previously.
+To resume a process in foreground or background, run the `fg` or `bg` command, respectively. The process then starts from where it was suspended previously.
diff --git a/docs/en/docs/Container/figures/isula-build_arch.png b/docs/en/docs/Container/figures/isula-build_arch.png
index 911a9ae6f46988586ab49f15de282948f5470c37..f92f15085820ce824bc2ca60ff7d6d25e95f1402 100644
GIT binary patch
literal 6189
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
F{vW4ByAS{X
diff --git a/docs/en/docs/Releasenotes/acknowledgement.md b/docs/en/docs/Releasenotes/acknowledgment.md
similarity index 80%
rename from docs/en/docs/Releasenotes/acknowledgement.md
rename to docs/en/docs/Releasenotes/acknowledgment.md
index 47c049cdd..ac610fdf0 100644
--- a/docs/en/docs/Releasenotes/acknowledgement.md
+++ b/docs/en/docs/Releasenotes/acknowledgment.md
@@ -1,4 +1,4 @@
-# Acknowledgement
+# Acknowledgment
We sincerely thank all the members who participated in and assisted in the openEuler project. It is your hard work to make the version released successfully and provide the possibility for the better development of openEuler.
diff --git a/docs/en/docs/desktop/DDE-User-Manual.md b/docs/en/docs/desktop/DDE-User-Manual.md
index 9f2c87632..f1d10a547 100755
--- a/docs/en/docs/desktop/DDE-User-Manual.md
+++ b/docs/en/docs/desktop/DDE-User-Manual.md
@@ -1,7 +1,22 @@
-# DDE Desktop Environment User Manual
-[[toc]]
+# DDE Desktop Environment
+
+
+
+
+
+- [DDE Desktop Environment](#dde-desktop-environment)
+ - [Overview](#overview)
+ - [Desktop](#desktop)
+ - [Dock](#dock)
+ - [Launcher](#launcher)
+ - [Control Center](#control-center)
+ - [Keyboard Interaction](#keyboard-interaction)
+
+
+
+
## 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.
@@ -349,7 +364,7 @@ The account full name is shown in account list and system login interface and yo
The first account has administrator privilege when you install the system. All other accounts you add after that are common users. One account can be grouped in many user groups.
-##### Group setting
+##### Group Setting
When you add or modify accounts, you can:
diff --git a/docs/en/docs/desktop/Install_XFCE.md b/docs/en/docs/desktop/Install_XFCE.md
index a1cc29689..c84b735a5 100644
--- a/docs/en/docs/desktop/Install_XFCE.md
+++ b/docs/en/docs/desktop/Install_XFCE.md
@@ -1,4 +1,4 @@
-# Xfce Installation Guide
+# Xfce Installation
Xfce is a lightweight Linux desktop. In the current version, all components have been updated from GTK2 to GTK3 and from D-Dbus Glib to GDBus. Most components support GObject Introspection (GI), which is used to generate and parse the API meta information of the C program library, so that the dynamic language (or managed language) can be bound to the program library based on C + GObject. In the current version, user experience is optimized, new features are added, and a large number of bugs are fixed. Xfce occupies fewer memory and CPU resources than other UIs (GNOME and KDE), providing smoother and more efficient user experience.
@@ -6,7 +6,7 @@ Xfce supports the x86\_64 and AArch64 architectures.
You are advised to create an administrator during the installation.
-1. [Download ](https://openeuler.org/en/download/)the openEuler ISO image and install the system. Run the following command to update the software source. You are advised to configure the Everything source and the EPOL source. This document describes how to install Xfce in the minimum installation scenario.
+1. [Download](https://openeuler.org/en/download/) the openEuler ISO image and install the system. Run the following command to update the software source. You are advised to configure the Everything source and the EPOL source. This document describes how to install Xfce in the minimum installation scenario.
```
sudo dnf update
@@ -61,4 +61,9 @@ You are advised to create an administrator during the installation.
```
sudo reboot
- ```
\ No newline at end of file
+ ```
+
+9. FAQs
+ **Why Is the Background Color of the LightDM Login Page Black?**
+ The login page is black because `background` is not set in the default configuration file **/etc/lightdm/lightdm-gtk-greeter.conf** of lghtdm-gtk.
+ Set `background=/usr/share/backgrounds/xfce/xfce-blue.jpg` in the `greeter` section at the end of the configuration file, and then run the `systemctl restart lightdm` command.
\ No newline at end of file
diff --git a/docs/en/docs/desktop/UKUI-user-guide.md b/docs/en/docs/desktop/UKUI-user-guide.md
index 26f724f45..eb97c390d 100644
--- a/docs/en/docs/desktop/UKUI-user-guide.md
+++ b/docs/en/docs/desktop/UKUI-user-guide.md
@@ -1,6 +1,55 @@
# UKUI Desktop Environment
-[[toc]]
+
+
+
+
+
+- [UKUI Desktop Environment](#ukui-desktop-environment)
+ - [Overview](#overview)
+ - [Desktop](#desktop)
+ - [Desktop’s Icons](#desktops-icons)
+ - [Right-click Menu](#right-click-menu)
+ - [Taskbar](#taskbar)
+ - [Basic Function](#basic-function)
+ - [Multi View Switch](#multi-view-switch)
+ - [Preview Window](#preview-window)
+ - [Sidebar](#sidebar)
+ - [Notification Center](#notification-center)
+ - [Clipboard](#clipboard)
+ - [Tray Menu](#tray-menu)
+ - [Storage Menu](#storage-menu)
+ - [Input Method](#input-method)
+ - [USB](#usb)
+ - [Power Supply](#power-supply)
+ - [Network](#network)
+ - [Volume](#volume)
+ - [Calendar](#calendar)
+ - [Night Mode](#night-mode)
+ - [Advanced Setting](#advanced-setting)
+ - [Window](#window)
+ - [Window Manager](#window-manager)
+ - [Window Switch](#window-switch)
+ - [Start Menu](#start-menu)
+ - [Basic Function](#basic-function-1)
+ - [Category Menu at right side](#category-menu-at-right-side)
+ - [Function Button at right side](#function-button-at-right-side)
+ - [User Avatar](#user-avatar)
+ - [Computer](#computer)
+ - [Control Center](#control-center)
+ - [Shutdown](#shutdown)
+ - [Lock Screen](#lock-screen)
+ - [Switch Users & Log Out](#switch-users-log-out)
+ - [Shutdown & Reboot](#shutdown-reboot)
+ - [Advanced Setting](#advanced-setting-1)
+ - [Applications](#applications)
+ - [FAQ](#faq)
+ - [Can’t login to the system after locking the screen?](#cant-login-to-the-system-after-locking-the-screen)
+ - [Appendix](#appendix)
+ - [Shortcut Key](#shortcut-key)
+
+
+
## Overview
Desktop Environment is the basis for the user's operation on the graphical interface, and provides multiple functions including taskbar, start menu, etc. The main interface is shown in figure below.
diff --git a/docs/en/docs/desktop/Xfce_userguide.md b/docs/en/docs/desktop/Xfce_userguide.md
index ea6396320..890662536 100644
--- a/docs/en/docs/desktop/Xfce_userguide.md
+++ b/docs/en/docs/desktop/Xfce_userguide.md
@@ -1,40 +1,49 @@
# Table of Contents
-* [Xfce User Guide](#Xfce User Guide)
- * [1. Overview](#1. Overview)
- * [2. Desktop](#2. Desktop)
- * [2.1 Desktop Icons](#2.1 Desktop Icons)
- * [2.2 Shortcut Menu](#2.2 Shortcut Menu)
- * [3. Taskbar](#3. Taskbar)
- * [3.1 Basic Functions](#3.1 Basic Functions)
- * [3.1.1 Applications](#3.1.1 Applications)
- * [3.1.2 Window Display Area](#3.1.2 Window Display Area)
- * [3.1.3 Multi-View Switching](#3.1.3 Multi-View Switching)
- * [3.1.4 Tray](#3.1.4 Tray)
- * [3.1.4.1 Network](#3.1.4.1 Network)
- * [3.1.4.2 Volume](#3.1.4.2 Volume)
- * [3.1.4.3 Power Supply](#3.1.4.3 Power Supply)
- * [3.1.4.4 Notification Center](#3.1.4.4 Notification Center)
- * [3.1.4.5 Calendar](#3.1.4.5 Calendar)
- * [3.1.4.6 Advanced Settings](#3.1.4.6 Advanced Settings)
- * [3.1.4.7 Login User Actions](#3.1.4.7 Login User Actions)
- * [3.1.4.7.1 Lock Screen](#3.1.4.7.1 Lock Screen)
- * [3.1.4.7.2 Switch User](#3.1.4.7.2 Switch User)
- * [3.1.4.7.3 Suspend](#3.1.4.7.3 Suspend)
- * [3.1.4.7.3 Shut Down](#3.1.4.7.3 Shut Down)
- * [3.1.4.7.3 Log Out](#3.1.4.7.3 Log Out)
- * [4. Shortcut Operation Bar](#4. Shortcut Operation Bar)
- * [4.1 Basic Functions](#4.1 [Basic Functions])
- * [4.1.1 Show Desktop](#4.1.1 Show Desktop)
- * [4.1.2 Terminal](#4.1.2 Terminal)
- * [4.1.3 File Manager](#4.1.3 File Manager)
- * [4.1.4 Web Browser](#4.1.4 Web Browser)
- * [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
-
-## 1\. Overview
+
+
+
+
+
+- [Table of Contents](#table-of-contents)
+- [Xfce Desktop Environment](#xfce-desktop-environment)
+ - [1. Overview](#1-overview)
+ - [2. Desktop](#2-desktop)
+ - [2.1 Desktop Icons](#21-desktop-icons)
+ - [2.2 Shortcut Menu](#22-shortcut-menu)
+ - [3. Taskbar](#3-taskbar)
+ - [3.1 Basic Functions](#31-basic-functions)
+ - [3.1.1 Applications](#311-applications)
+ - [3.1.2 Window Display Area](#312-window-display-area)
+ - [3.1.3 Multi-View Switching](#313-multi-view-switching)
+ - [3.1.4 Tray](#314-tray)
+ - [3.1.4.1 Network](#3141-network)
+ - [3.1.4.2 Volume](#3142-volume)
+ - [3.1.4.3 Power supply](#3143-power-supply)
+ - [3.1.4.4 Notification Center](#3144-notification-center)
+ - [3.1.4.5 Calendar](#3145-calendar)
+ - [3.1.4.6 Advanced Settings](#3146-advanced-settings)
+ - [3.1.4.7 Login User Actions](#3147-login-user-actions)
+ - [3.1.4.7.1 Lock Screen](#31471-lock-screen)
+ - [3.1.4.7.2 Switch User](#31472-switch-user)
+ - [3.1.4.7.3 Suspend](#31473-suspend)
+ - [3.1.4.7.3 Shut Down](#31473-shut-down)
+ - [3.1.4.7.3 Log Out](#31473-log-out)
+ - [4. Shortcut Operation Bar](#4-shortcut-operation-bar)
+ - [4.1 Basic Functions](#41-basic-functions)
+ - [4.1.1 Show Desktop](#411-show-desktop)
+ - [4.1.2 Terminal](#412-terminal)
+ - [4.1.3 File Manager](#413-file-manager)
+ - [4.1.4 Web Browser](#414-web-browser)
+ - [4.1.5 Application Finder](#415-application-finder)
+ - [4.1.6 User Home Directory](#416-user-home-directory)
+
+
+
+
+# Xfce Desktop Environment
+
+## 1. Overview
Xfce is a lightweight desktop environment running on Unix-like operating systems. Xfce provides multiple functional components, including all applications. This document describes how to use Xfce.
@@ -43,7 +52,8 @@ The following figure shows the WebUI.
-## 2\. Desktop
+
+## 2. Desktop
### 2.1 Desktop Icons
@@ -73,7 +83,8 @@ The following table describes some options.
| Applications| Applications|
-## 3\. Taskbar
+
+## 3. Taskbar
### 3.1 Basic Functions
@@ -217,7 +228,8 @@ To log out of the GUI, click **Log Out**.
Then, the system closes all running applications. Therefore, before performing this operation, save the current work.
-## 4\. Shortcut Operation Bar
+
+## 4. Shortcut Operation Bar
### 4.1 Basic Functions
@@ -264,7 +276,7 @@ You can click the  icon on the shortcut operation bar
-#### 4.1. 6 User Home Directory
+#### 4.1.6 User Home Directory
Click  on the shortcut operation bar and click **Open File**. The user home directory page is displayed.
diff --git a/docs/en/docs/desktop/install-DDE.md b/docs/en/docs/desktop/install-DDE.md
index 05a05125a..533c6715a 100644
--- a/docs/en/docs/desktop/install-DDE.md
+++ b/docs/en/docs/desktop/install-DDE.md
@@ -1,31 +1,31 @@
-# DDE installation
+# 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.
+DDE is a powerful desktop environment developed by UnionTech. It contains dozens of self-developed desktop applications.
-#### installation method
+#### Procedure
-1. [download](https://openeuler.org/zh/download/) openEuler ISO and install the OS.
-2. update the software source
+1. [Download](https://openeuler.org/zh/download/) the openEuler ISO file and install the OS.
+2. Update the software source.
```bash
sudo dnf update
```
-3. install DDE
+3. Install DDE.
```bash
sudo dnf install dde
```
-4. set to start with a graphical interface
+4. Set the system to start with the graphical interface.
```bash
sudo systemctl set-default graphical.target
```
-5. reboot
+5. Reboot the system.
```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.
+6. After the reboot 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
+ > DDE does not allow login as the root user.
+ > DDE has a built-in openeuler user whose password is openeuler.
-Now you can use dde.
+Now you can use DDE.
diff --git a/docs/en/docs/desktop/install-UKUI.md b/docs/en/docs/desktop/install-UKUI.md
index ccda0d206..0a4466547 100644
--- a/docs/en/docs/desktop/install-UKUI.md
+++ b/docs/en/docs/desktop/install-UKUI.md
@@ -1,21 +1,21 @@
-# UKUI installation
+# 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.
+You are advised to create an administrator user before installing UKUI.
-1.download openEuler 20.03 LTS SP2 and update the software source.
+1.Download openEuler 20.03 LTS SP2 and update the software source.
```
sudo dnf update
```
-2.install UKUI.
+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`).
+3.If you want to set the system to start with the graphical interface after confirming the installation, run the following command and reboot the system (`reboot`).
```
systemctl set-default graphical.target
```
-At present, UKUI version is still constantly updated. Please check the latest installation method :
+UKUI is 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/thirdparty_migration/OpenStack-Queens.md b/docs/en/docs/thirdparty_migration/OpenStack-Queens.md
index 05370f17c..d7ea375e6 100644
--- a/docs/en/docs/thirdparty_migration/OpenStack-Queens.md
+++ b/docs/en/docs/thirdparty_migration/OpenStack-Queens.md
@@ -60,13 +60,13 @@ The services involved in the above conventions are as follows:
### Configuring the Environment
-1. Configure third-party oepkg source that is certified by 20.03 LTS SP2. The following uses aarch64 as an example.
+1. Configure the third-party oepkg source that is certified by 20.03 LTS SP2.
```shell
cat << EOF >> /etc/yum.repos.d/OpenStack_Queens.repo
[openstack_queens]
name=OpenStack_Queens
- baseurl=https://repo.oepkgs.net/openEuler/rpm/openEuler-20.03-LTS-SP2/budding-openeuler/openstack/queens/aarch64/
+ baseurl=https://repo.oepkgs.net/openEuler/rpm/openEuler-20.03-LTS-SP2/budding-openeuler/openstack/queens/$basearch/
gpgcheck=0
enabled=1
EOF
@@ -213,7 +213,7 @@ The services involved in the above conventions are as follows:
2. Install the software package.
```shell
- yum install openstack-keystone httpd mod_wsgi
+ yum install openstack-keystone httpd python2-mod_wsgi
```
3. Configure the Keystone.
@@ -1199,12 +1199,12 @@ The services involved in the above conventions are as follows:
Create API endpoints for the block storage service.
```shell
- openstack endpoint create --region RegionOne volumev2 public http://controller:8776/v2/%s
- openstack endpoint create --region RegionOne volumev2 internal http://controller:8776/v2/%s
- openstack endpoint create --region RegionOne volumev2 admin http://controller:8776/v2/%s
- openstack endpoint create --region RegionOne volumev3 public http://controller:8776/v3/%s
- openstack endpoint create --region RegionOne volumev3 internal http://controller:8776/v3/%s
- openstack endpoint create --region RegionOne volumev3 admin http://controller:8776/v3/%s
+ openstack endpoint create --region RegionOne volumev2 public http://controller:8776/v2/%\(project_id\)s
+ openstack endpoint create --region RegionOne volumev2 internal http://controller:8776/v2/%\(project_id\)s
+ openstack endpoint create --region RegionOne volumev2 admin http://controller:8776/v2/%\(project_id\)s
+ openstack endpoint create --region RegionOne volumev3 public http://controller:8776/v3/%\(project_id\)s
+ openstack endpoint create --region RegionOne volumev3 internal http://controller:8776/v3/%\(project_id\)s
+ openstack endpoint create --region RegionOne volumev3 admin http://controller:8776/v3/%\(project_id\)s
```
2. Install the software package:
diff --git a/docs/en/docs/thirdparty_migration/OpenStack-Rocky.md b/docs/en/docs/thirdparty_migration/OpenStack-Rocky.md
index df8e00d6b..bc79f4192 100644
--- a/docs/en/docs/thirdparty_migration/OpenStack-Rocky.md
+++ b/docs/en/docs/thirdparty_migration/OpenStack-Rocky.md
@@ -175,7 +175,7 @@ Add controller information in `/etc/hosts`. For example, if the node IP address
2. Run the following command to install the software package:
```shell
- $ yum install openstack-keystone httpd mod_wsgi
+ $ yum install openstack-keystone httpd python2-mod_wsgi
```
3. Edit the `/etc/keystone/keystone.conf` file to configure Keystone. In the **\[database]** section, configure the database entry. In the **\[token]** section, configure the token provider.
diff --git a/docs/en/menu/index.md b/docs/en/menu/index.md
index 786e05281..26b6106e4 100644
--- a/docs/en/menu/index.md
+++ b/docs/en/menu/index.md
@@ -14,7 +14,7 @@ headless: true
- [Source Code]({{< relref "./docs/Releasenotes/source-code.md" >}})
- [Contribution]({{< relref "./docs/Releasenotes/contribution.md" >}})
- [appendix]({{< relref "./docs/Releasenotes/appendix.md" >}})
- - [Acknowledgement]({{< relref "./docs/Releasenotes/acknowledgement.md" >}})
+ - [Acknowledgment]({{< relref "./docs/Releasenotes/acknowledgment.md" >}})
- [Quick Start]({{< relref "./docs/Quickstart/quick-start.md" >}})
- [Installation Guide]({{< relref "./docs/Installation/Installation.md" >}})
- [Installation on Servers]({{< relref "./docs/Installation/install-server.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" >}})
+ - [UKUI Installation]({{< relref "./docs/desktop/install-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 Installation]({{< relref "./docs/desktop/install-DDE.md" >}})
- [DDE User Guide]({{< relref "./docs/desktop/DDE-User-Manual.md" >}})
- - [XFCE]({{< relref "./docs/desktop/xfce.md" >}})
- - [Xfce Installation Guide]({{< relref "./docs/desktop/Install_XFCE.md" >}})
+ - [Xfce]({{< relref "./docs/desktop/xfce.md" >}})
+ - [Xfce Installation]({{< relref "./docs/desktop/Install_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" >}})
--
Gitee