diff --git a/content/en/docs/Administration/configuring-the-repo-server.md b/content/en/docs/Administration/configuring-the-repo-server.md
index 4fa5736abb42749d1898baa2e9a108941e30aeb6..4f5191adc42c7c17aadff46221687e65471fdb90 100644
--- a/content/en/docs/Administration/configuring-the-repo-server.md
+++ b/content/en/docs/Administration/configuring-the-repo-server.md
@@ -283,8 +283,8 @@ You can configure the built repo as the yum source and create the \*\*\*.repo co
```
> **NOTE:**
- > _gpgcheck_ indicates whether to enable the GNU privacy guard \(GPG\) to check the validity and security of sources of RPM packages. **1** indicates GPG check is enabled. **0** indicates the GPG check is disabled. If this option is not specified, the GPG check is enabled by default.
- > _gpgkey_ is the storage path of the signature public key.
+ > **gpgcheck** indicates whether to enable the GNU privacy guard \(GPG\) to check the validity and security of sources of RPM packages. **1** indicates GPG check is enabled. **0** indicates the GPG check is disabled. If this option is not specified, the GPG check is enabled by default.
+ > **gpgkey** is the public key used to verify the signature.
- Configuring the yum source for the HTTP server
diff --git a/content/en/docs/Administration/using-the-dnf-to-manage-software-packages.md b/content/en/docs/Administration/using-the-dnf-to-manage-software-packages.md
index f02692ab435cd7e1fde09325de6db73d1437e797..bf2291c957d0bed70e0c33f9b566a43cab5b9191 100644
--- a/content/en/docs/Administration/using-the-dnf-to-manage-software-packages.md
+++ b/content/en/docs/Administration/using-the-dnf-to-manage-software-packages.md
@@ -9,7 +9,7 @@ DNF is a Linux software package management tool used to manage RPM software pack
- [Using the DNF to Manage Software Packages](#using-the-dnf-to-manage-software-packages)
- [Configuring the DNF](#configuring-the-dnf)
- - [Modifying the Configuration File](#modifying-the-configuration-file)
+ - [The DNF Configuration File](#the-dnf-configuration-file)
- [Creating a Local Software Repository](#creating-a-local-software-repository)
- [Adding, Enabling, and Disabling Software Sources](#adding-enabling-and-disabling-software-sources)
- [Managing Software Package](#managing-software-package)
@@ -35,15 +35,19 @@ DNF is a Linux software package management tool used to manage RPM software pack
-### Modifying the Configuration File
+### The DNF Configuration File
-The main configuration file of the DNF is /etc/dnf/dnf.conf. The **main** part in the file stores the global settings of the DNF. You can add one or more **repository** sections to the file to set the location of the software source to be installed.
+The main configuration file of the DNF is /etc/dnf/dnf.conf which consists of two parts:
-In addition, the /etc/yum.repos.d directory stores one or more repo source files, which define different repositories.
+- The **main** part in the file stores the global settings of the DNF.
-You can configure a software source by either directly configuring the /etc/dnf/dnf.conf file or adding the .repo file to the /etc/yum.repos.d directory.
+- The **repository** part in the file stores the settings of the software source. You can add one or more **repository** sections to the file.
-#### Modify the main Part
+In addition, the /etc/yum.repos.d directory stores one or more repo source files, which define different repositories.
+
+You can configure a software source by either directly configuring the /etc/dnf/dnf.conf file or configuring the .repo file in the /etc/yum.repos.d directory.
+
+#### Configuring the main Part
The /etc/dnf/dnf.conf file contains the **main** part. The following is an example of the configuration file:
```
@@ -99,7 +103,6 @@ Common options are as follows:
The options are 1 and 0, indicating whether to perform GPG verification. The default value is 1, indicating that verification is required.
|
-
plugins
|
The options are 1 and 0, indicating that the DNF plug-in is enabled or disabled. The default value is 1, indicating that the DNF plug-in is enabled.
@@ -113,40 +116,71 @@ Common options are as follows:
-#### Modify the repository Part
-The repository part allows you to customize software source repositories. The name of each repository must be unique. Otherwise, conflicts may occur. The following is a minimum configuration example of the \[repository\] section:
+#### Configuring the repository Part
-```
-[repository]
-name=repository_name
-baseurl=repository_url
-```
+The repository part allows you to customize software source repositories. The name of each repository must be unique. Otherwise, conflicts may occur. You can configure a software source by either directly configuring the /etc/dnf/dnf.conf file or configuring the .repo file in the /etc/yum.repos.d directory.
-Common options are as follows:
+- Configuring the /etc/dnf/dnf.conf file
-> **NOTE:**
->openEuler provides an online image source at [https://repo.openeuler.org/](https://repo.openeuler.org/). For example, if the openEuler 20.03 version is aarch64, the **baseurl** can be set to [https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/](https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/).
+ The following is a minimum configuration example of the \[repository\] section:
+
+ ```
+ [repository]
+ name=repository_name
+ baseurl=repository_url
+ ```
+
+ > **NOTE:**
+ >openEuler provides an online image source at [https://repo.openeuler.org/](https://repo.openeuler.org/). For example, if the openEuler 20.03 version is aarch64, the **baseurl** can be set to [https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/](https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/).
+
+ Common options are as follows:
+
+ **Table 2** repository parameter description
+ Parameter
+ |
+ Description
+ |
+
+
+ name=repository_name
+ |
+ Name string of a software repository.
+ |
+
+ baseurl=repository_url
+ |
+ Address of the software repository.
+ - Network location using the HTTP protocol, for example, http://path/to/repo
- Network location using the FTP protocol, for example, ftp://path/to/repo
- Local path: for example, file:///path/to/local/repo
+ |
+
+
+
+
+
+- Configuring the .repo file in the /etc/yum.repos.d directory
+
+
+ openEuler provides multiple repo source files. This section uses the OS repo source of the AArch64 architecture as an example.
+
+ For example, run the following command as the **root** user to add the openeuler repo source to the openEuler_aarch64.repo file.
+
+ ```
+ # vi /etc/yum.repos.d/openEuler_aarch64.repo
+ ```
+
+ ```
+ [base]
+ name=openEuler base
+ baseurl=https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/
+ enabled=1
+ gpgcheck=1
+ gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/RPM-GPG-KEY-openEuler
+
+ ```
+
+ > **NOTE:**
+ >**gpgkey** is the public key used to verify the signature.
-**Table 2** repository parameter description
-Parameter
- |
-Description
- |
-
-
-name=repository_name
- |
-Name string of a software repository.
- |
-
-baseurl=repository_url
- |
-Address of the software repository.
-- Network location using the HTTP protocol, for example, http://path/to/repo
- Network location using the FTP protocol, for example, ftp://path/to/repo
- Local path: for example, file:///path/to/local/repo
- |
-
-
-
#### Displays the Current Configuration
- To display the current configuration information, run the following command:
@@ -477,7 +511,7 @@ For example, to delete the software package group of Development Tools, run the
You can use the DNF to check whether any software package in your system needs to be updated. You can use the DNF to list the software packages to be updated. You can choose to update all packages at a time or update only specified packages.
-### Checking For Update
+### Checking for Update
To list all currently available updates, run the following command:
```
diff --git a/content/en/docs/ApplicationDev/building-an-rpm-package.md b/content/en/docs/ApplicationDev/building-an-rpm-package.md
index d544280230b6501fe871a704177d373388197358..ff247ecf8f7e7e0ab0d52d6355ab02a75eee4a19 100644
--- a/content/en/docs/ApplicationDev/building-an-rpm-package.md
+++ b/content/en/docs/ApplicationDev/building-an-rpm-package.md
@@ -394,9 +394,10 @@ $ wget http://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz
#### Editing the SPEC File
-Run the following command to create the .spec file:
+Run the following command to create the .spec file in the **~/rpmbuild/SPECS** directory:
```
+$ cd ~/rpmbuild/SPECS
$ vi hello.spec
```
diff --git a/content/en/docs/ApplicationDev/preparation.md b/content/en/docs/ApplicationDev/preparation.md
index 826f07f003a8db9375e20c8098b04e8d0e2de156..43985d5416408c9143e997d2b34a9196f6fcc36b 100644
--- a/content/en/docs/ApplicationDev/preparation.md
+++ b/content/en/docs/ApplicationDev/preparation.md
@@ -151,6 +151,13 @@ You can configure a repo source by directly obtaining the repo source file or by
gpgcheck=1
gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/RPM-GPG-KEY-openEuler
+
+
+ ****
+
+ > **NOTE:**
+ >- **gpgcheck** indicates whether to enable the GNU privacy guard \(GPG\) to check the validity and security of the source of RPM packages. **1** indicates that the GPG check is enabled. **0** indicates that the GPG check is disabled. If this option is not specified, the GPG check is enabled by default.
+ >- **gpgkey** is the public key used to verify the signature.
### Configuring a Repo Source by Mounting an ISO File
@@ -267,12 +274,7 @@ You can configure a repo source by directly obtaining the repo source file or by
gpgcheck=1
gpgkey=file:///mnt/RPM-GPG-KEY-openEuler
```
-
- ****
-
- > **NOTE:**
- >- **gpgcheck** indicates whether to enable the GNU privacy guard \(GPG\) to check the validity and security of the source of RPM packages. **1** indicates that the GPG check is enabled. **0** indicates that the GPG check is disabled. If this option is not specified, the GPG check is enabled by default.
- >- **gpgkey** is the storage path of the signed public key.
+
## Installing the Software Package
diff --git "a/content/zh/docs/Administration/\344\275\277\347\224\250DNF\347\256\241\347\220\206\350\275\257\344\273\266\345\214\205.md" "b/content/zh/docs/Administration/\344\275\277\347\224\250DNF\347\256\241\347\220\206\350\275\257\344\273\266\345\214\205.md"
index dea2cd745e9d8a1b488da678fdaa2cd7609ed569..ea2edf5754f66009c3ab9c4b0c026928c1405fd6 100644
--- "a/content/zh/docs/Administration/\344\275\277\347\224\250DNF\347\256\241\347\220\206\350\275\257\344\273\266\345\214\205.md"
+++ "b/content/zh/docs/Administration/\344\275\277\347\224\250DNF\347\256\241\347\220\206\350\275\257\344\273\266\345\214\205.md"
@@ -9,7 +9,7 @@ DNF是一款Linux软件包管理工具,用于管理RPM软件包。DNF可以查
- [使用DNF管理软件包](#使用dnf管理软件包)
- [配置DNF](#配置dnf)
- - [修改配置文件](#修改配置文件)
+ - [DNF配置文件](#dnf配置文件)
- [创建本地软件源仓库](#创建本地软件源仓库)
- [添加、启用和禁用软件源](#添加启用和禁用软件源)
- [管理软件包](#管理软件包)
@@ -35,17 +35,21 @@ DNF是一款Linux软件包管理工具,用于管理RPM软件包。DNF可以查
-### 修改配置文件
+### DNF配置文件
-DNF 的主要配置文件是 /etc/dnf/dnf.conf,该文件中“main”部分保存着 DNF 的全局设置;用户可以在该文件中通过添加一个或者多个“repository”部分的方式来设置需要安装的软件源位置。
+DNF 的主要配置文件是 /etc/dnf/dnf.conf,该文件包含两部分:
-另外,在/etc/yum.repos.d 目录中保存着一个或多个repo 源相关文件,它们定义了不同的“repository”。
+- “main”部分保存着DNF的全局设置。
-软件源的配置一般有两种方式,一种是直接配置 /etc/dnf/dnf.conf 文件,另外一种是在 /etc/yum.repos.d 目录下增加 .repo 文件。
+- “repository”部分保存着软件源的设置,可以有一个或多个“repository”。
-#### 修改main部分
+另外,在/etc/yum.repos.d 目录中保存着一个或多个repo源相关文件,它们也可以定义不同的“repository”。
-/etc/dnf/dnf.conf 文件包含的“main”部分,配置文件示例如下:
+所以openEuler软件源的配置一般有两种方式,一种是直接配置/etc/dnf/dnf.conf文件中的“repository”部分,另外一种是在/etc/yum.repos.d目录下增加.repo文件。
+
+#### 配置main部分
+
+/etc/dnf/dnf.conf 文件包含的“main”部分,配置示例如下:
```
[main]
@@ -114,42 +118,68 @@ best=True
-#### 修改repository部分
+#### 配置repository部分
-repository部分允许您定义定制化的软件源仓库,各个仓库的名称不能相同,否则会引起冲突。下面是\[repository\]部分的一个最小配置示例:
+repository部分允许您定义定制化的openEuler软件源仓库,各个仓库的名称不能相同,否则会引起冲突。配置repository部分有两种方式,一种是直接配置/etc/dnf/dnf.conf文件中的“repository”部分,另外一种是配置/etc/yum.repos.d目录下的.repo文件。
-```
-[repository]
-name=repository_name
-baseurl=repository_url
-```
+- 直接配置/etc/dnf/dnf.conf文件中的“repository”部分
-选项说明:
+ 下面是\[repository\]部分的一个最小配置示例:
-> **说明:**
->openEuler提供在线的镜像源,地址:[https://repo.openeuler.org/](https://repo.openeuler.org/)。以 openEuler 20.03的aarch64版本为例,baseurl可配置为[https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/](https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/)。
+ ```
+ [repository]
+ name=repository_name
+ baseurl=repository_url
+ ```
+ > **说明:**
+ >openEuler提供在线的镜像源,地址:[https://repo.openeuler.org/](https://repo.openeuler.org/)。以 openEuler 20.03的aarch64版本为例,baseurl可配置为[https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/](https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/)。
+
+ 选项说明:
+
+ **表 2** repository参数说明
+ 参数
+ |
+ 说明
+ |
+
+
+ name=repository_name
+ |
+ 软件仓库(repository )描述的字符串。
+ |
+
+ baseurl=repository_url
+ |
+ 软件仓库(repository )的地址。
+ - 使用http协议的网络位置:例如 http://path/to/repo
- 使用ftp协议的网络位置:例如 ftp://path/to/repo
- 本地位置:例如 file:///path/to/local/repo
+ |
+
+
+
+
+
+- 配置/etc/yum.repos.d目录下的.repo文件
+
+ openEuler提供了多种repo源,以AArch64架构的OS repo源为例。使用root权限在openEuler_aarch64.repo文件中添加openEuler repo源,示例如下:
-**表 2** repository参数说明
-参数
- |
-说明
- |
-
-
-name=repository_name
- |
-软件仓库(repository )描述的字符串。
- |
-
-baseurl=repository_url
- |
-软件仓库(repository )的地址。
-- 使用http协议的网络位置:例如 http://path/to/repo
- 使用ftp协议的网络位置:例如 ftp://path/to/repo
- 本地位置:例如 file:///path/to/local/repo
- |
-
-
-
+ ```
+ # vi /etc/yum.repos.d/openEuler_aarch64.repo
+ ```
+
+ ```
+ [base]
+ name=openEuler base
+ baseurl=https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/
+ enabled=1
+ gpgcheck=1
+ gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/RPM-GPG-KEY-openEuler
+
+ ```
+
+ > **说明:**
+ >gpgkey为验证签名用的公钥。
+
#### 显示当前配置
diff --git "a/content/zh/docs/Administration/\346\220\255\345\273\272repo\346\234\215\345\212\241\345\231\250.md" "b/content/zh/docs/Administration/\346\220\255\345\273\272repo\346\234\215\345\212\241\345\231\250.md"
index ee458e049c6f6cd94768e5dcc03ab6f55971b0e0..a5ef37f72296755122a16d3d0103e4c230f9899c 100644
--- "a/content/zh/docs/Administration/\346\220\255\345\273\272repo\346\234\215\345\212\241\345\231\250.md"
+++ "b/content/zh/docs/Administration/\346\220\255\345\273\272repo\346\234\215\345\212\241\345\231\250.md"
@@ -276,7 +276,7 @@ repo可配置为yum源,yum(全称为 Yellow dog Updater, Modified)是一
> **说明:**
>gpgcheck可设置为1或0,1表示进行gpg(GNU Private Guard)校验,0表示不进行gpg校验,gpgcheck可以确定rpm包的来源是有效和安全的。
- >gpgkey为签名公钥的存放路径。
+ >gpgkey为验证签名用的公钥。
- 配置http服务器yum源
diff --git "a/content/zh/docs/ApplicationDev/\345\274\200\345\217\221\347\216\257\345\242\203\345\207\206\345\244\207.md" "b/content/zh/docs/ApplicationDev/\345\274\200\345\217\221\347\216\257\345\242\203\345\207\206\345\244\207.md"
index c16154d6ebc312eeb7c4c8210904f99037f738b0..5b157833da29b925e048feaa15f7fe8835521ae1 100644
--- "a/content/zh/docs/ApplicationDev/\345\274\200\345\217\221\347\216\257\345\242\203\345\207\206\345\244\207.md"
+++ "b/content/zh/docs/ApplicationDev/\345\274\200\345\217\221\347\216\257\345\242\203\345\207\206\345\244\207.md"
@@ -152,6 +152,12 @@ openEuler操作系统具体安装方法请参考《openEuler 20.03 LTS 安装指
gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/aarch64/RPM-GPG-KEY-openEuler
+ ****
+
+ > **说明:**
+ >- gpgcheck可设置为1或0,1表示进行gpg(GNU Private Guard)校验,0表示不进行gpg校验,gpgcheck可以确定rpm包的来源是有效和安全的。
+ >- gpgkey为验证签名用的公钥。
+
### 通过挂载ISO的方式配置repo源
> **说明:**
@@ -266,12 +272,7 @@ openEuler操作系统具体安装方法请参考《openEuler 20.03 LTS 安装指
gpgcheck=1
gpgkey=file:///mnt/RPM-GPG-KEY-openEuler
```
-
- ****
-
- > **说明:**
- >- gpgcheck可设置为1或0,1表示进行gpg(GNU Private Guard)校验,0表示不进行gpg校验,gpgcheck可以确定rpm包的来源是有效和安全的。
- >- gpgkey为签名公钥的存放路径。
+
## 安装软件包
diff --git "a/content/zh/docs/ApplicationDev/\346\236\204\345\273\272RPM\345\214\205.md" "b/content/zh/docs/ApplicationDev/\346\236\204\345\273\272RPM\345\214\205.md"
index 4fb7fbeacc8b7b928f5d9adc9d94646a489006a7..e8251e05948a8ccce8c978014fc84e26a71ca12c 100644
--- "a/content/zh/docs/ApplicationDev/\346\236\204\345\273\272RPM\345\214\205.md"
+++ "b/content/zh/docs/ApplicationDev/\346\236\204\345\273\272RPM\345\214\205.md"
@@ -392,9 +392,10 @@ $ wget http://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz
#### 编辑SPEC文件
-新建spec文件,参考命令如下:
+在**~/rpmbuild/SPECS**目录下新建spec文件,参考命令如下:
```
+$ cd ~/rpmbuild/SPECS
$ vi hello.spec
```
|