From f8a6e1a34ec3e4a091659b227da53220c83ec496 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 6 Apr 2023 17:06:32 +0800 Subject: [PATCH] Adjust some documentations titles (#23941) As title. --- .../backup-and-restore.en-us.md | 2 +- doc/administration/command-line.en-us.md | 2 +- doc/administration/email-setup.en-us.md | 2 +- doc/administration/fail2ban-setup.en-us.md | 2 +- doc/administration/fail2ban-setup.zh-cn.md | 2 +- doc/administration/git-lfs-support.en-us.md | 2 +- doc/administration/https-support.en-us.md | 2 +- .../logging-documentation.en-us.md | 2 +- doc/administration/reverse-proxies.en-us.md | 2 +- .../search-engines-indexation.en-us.md | 2 +- doc/installation/comparison.en-us.md | 2 +- .../database-preparation.en-us.md | 2 +- doc/installation/from-package.en-us.md | 30 ++++++++++--------- doc/installation/from-package.zh-cn.md | 24 ++++++++------- doc/usage/agit-support.en-us.md | 2 +- .../issue-pull-request-templates.en-us.md | 2 +- doc/usage/labels.en-us.md | 2 +- doc/usage/linked-references.en-us.md | 2 +- doc/usage/merge-message-templates.en-us.md | 2 +- doc/usage/pull-request.en-us.md | 2 +- doc/usage/pull-request.zh-tw.md | 2 +- doc/usage/push-options.en-us.md | 2 +- doc/usage/push-options.zh-tw.md | 2 +- doc/usage/push-to-create.en-us.md | 2 +- 24 files changed, 51 insertions(+), 47 deletions(-) diff --git a/doc/administration/backup-and-restore.en-us.md b/doc/administration/backup-and-restore.en-us.md index 16e8654b..b1e5a6ae 100644 --- a/doc/administration/backup-and-restore.en-us.md +++ b/doc/administration/backup-and-restore.en-us.md @@ -1,6 +1,6 @@ --- date: "2017-01-01T16:00:00+02:00" -title: "Usage: Backup and Restore" +title: "Backup and Restore" slug: "backup-and-restore" weight: 11 toc: false diff --git a/doc/administration/command-line.en-us.md b/doc/administration/command-line.en-us.md index 20b78851..d3362e57 100644 --- a/doc/administration/command-line.en-us.md +++ b/doc/administration/command-line.en-us.md @@ -1,6 +1,6 @@ --- date: "2017-01-01T16:00:00+02:00" -title: "Usage: Command Line" +title: "Gitea Command Line" slug: "command-line" weight: 1 toc: false diff --git a/doc/administration/email-setup.en-us.md b/doc/administration/email-setup.en-us.md index 05a69d56..b8a3324f 100644 --- a/doc/administration/email-setup.en-us.md +++ b/doc/administration/email-setup.en-us.md @@ -1,6 +1,6 @@ --- date: "2019-10-15T10:10:00+05:00" -title: "Usage: Email setup" +title: "Email setup" slug: "email-setup" weight: 12 toc: false diff --git a/doc/administration/fail2ban-setup.en-us.md b/doc/administration/fail2ban-setup.en-us.md index 74622242..420c6ae5 100644 --- a/doc/administration/fail2ban-setup.en-us.md +++ b/doc/administration/fail2ban-setup.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-05-11T11:00:00+02:00" -title: "Usage: Setup fail2ban" +title: "Fail2ban Setup " slug: "fail2ban-setup" weight: 16 toc: false diff --git a/doc/administration/fail2ban-setup.zh-cn.md b/doc/administration/fail2ban-setup.zh-cn.md index 37a0838b..920d3f4a 100644 --- a/doc/administration/fail2ban-setup.zh-cn.md +++ b/doc/administration/fail2ban-setup.zh-cn.md @@ -1,6 +1,6 @@ --- date: "2022-08-01T00:00:00+00:00" -title: "使用: 设置 Fail2ban" +title: "设置 Fail2ban" slug: "fail2ban-setup" weight: 16 toc: false diff --git a/doc/administration/git-lfs-support.en-us.md b/doc/administration/git-lfs-support.en-us.md index 86cc3a50..95f4b958 100644 --- a/doc/administration/git-lfs-support.en-us.md +++ b/doc/administration/git-lfs-support.en-us.md @@ -1,6 +1,6 @@ --- date: "2019-10-06T08:00:00+05:00" -title: "Usage: Git LFS setup" +title: "Git LFS setup" slug: "git-lfs-setup" weight: 12 toc: false diff --git a/doc/administration/https-support.en-us.md b/doc/administration/https-support.en-us.md index fd7badc6..f5cd2868 100644 --- a/doc/administration/https-support.en-us.md +++ b/doc/administration/https-support.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-06-02T11:00:00+02:00" -title: "Usage: HTTPS setup" +title: "HTTPS setup" slug: "https-setup" weight: 12 toc: false diff --git a/doc/administration/logging-documentation.en-us.md b/doc/administration/logging-documentation.en-us.md index 08e7c9b1..13de8ab8 100644 --- a/doc/administration/logging-documentation.en-us.md +++ b/doc/administration/logging-documentation.en-us.md @@ -1,6 +1,6 @@ --- date: "2019-04-02T17:06:00+01:00" -title: "Advanced: Logging Configuration" +title: "Logging Configuration" slug: "logging-configuration" weight: 40 toc: false diff --git a/doc/administration/reverse-proxies.en-us.md b/doc/administration/reverse-proxies.en-us.md index d692473f..5132ee83 100644 --- a/doc/administration/reverse-proxies.en-us.md +++ b/doc/administration/reverse-proxies.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-05-22T11:00:00+00:00" -title: "Usage: Reverse Proxies" +title: "Reverse Proxies" slug: "reverse-proxies" weight: 16 toc: false diff --git a/doc/administration/search-engines-indexation.en-us.md b/doc/administration/search-engines-indexation.en-us.md index 4452fd77..8c7f79d4 100644 --- a/doc/administration/search-engines-indexation.en-us.md +++ b/doc/administration/search-engines-indexation.en-us.md @@ -1,6 +1,6 @@ --- date: "2019-12-31T13:55:00+05:00" -title: "Advanced: Search Engines Indexation" +title: "Search Engines Indexation" slug: "search-engines-indexation" weight: 60 toc: false diff --git a/doc/installation/comparison.en-us.md b/doc/installation/comparison.en-us.md index 819af95b..d372d1f9 100644 --- a/doc/installation/comparison.en-us.md +++ b/doc/installation/comparison.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-05-07T13:00:00+02:00" -title: "Gitea compared to other Git hosting options" +title: "Compared to other Git hosting" slug: "comparison" weight: 5 toc: false diff --git a/doc/installation/database-preparation.en-us.md b/doc/installation/database-preparation.en-us.md index 1b86df97..edad89b0 100644 --- a/doc/installation/database-preparation.en-us.md +++ b/doc/installation/database-preparation.en-us.md @@ -15,7 +15,7 @@ menu: # Database Preparation -You need a database to use Gitea. Gitea supports PostgreSQL (>=10), MySQL (>=5.7), SQLite, and MSSQL (>=2008R2 SP3). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production. +You need a database to use Gitea. Gitea supports PostgreSQL (>=10), MySQL (>=5.7), SQLite, and MSSQL (>=2008R2 SP3). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production. If you plan to use SQLite, you can ignore this chapter. Database instance can be on same machine as Gitea (local database setup), or on different machine (remote database). diff --git a/doc/installation/from-package.en-us.md b/doc/installation/from-package.en-us.md index c9df0d21..2615b7d2 100644 --- a/doc/installation/from-package.en-us.md +++ b/doc/installation/from-package.en-us.md @@ -13,12 +13,25 @@ menu: identifier: "install-from-package" --- -# Installation from package - **Table of Contents** {{< toc >}} +# Official packages + +## macOS + +Currently, the only supported method of installation on MacOS is [Homebrew](http://brew.sh/). +Following the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide may work, +but is not supported. To install Gitea via `brew`: + +``` +brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea +brew install gitea +``` + +# Unofficial packages + ## Alpine Linux Alpine Linux has [Gitea](https://pkgs.alpinelinux.org/packages?name=gitea&branch=edge) in its community repository which follows the latest stable version. @@ -74,17 +87,6 @@ choco install gitea Or follow the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide. -## macOS - -Currently, the only supported method of installation on MacOS is [Homebrew](http://brew.sh/). -Following the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide may work, -but is not supported. To install Gitea via `brew`: - -``` -brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea -brew install gitea -``` - ## FreeBSD A FreeBSD port `www/gitea` is available. To install the pre-built binary package: @@ -108,7 +110,7 @@ is in `/usr/local/etc/rc.d/gitea`. To enable Gitea to run as a service, run `sysrc gitea_enable=YES` and start it with `service gitea start`. -## Third-party +## Others Various other third-party packages of Gitea exist. To see a curated list, head over to [awesome-gitea](https://gitea.com/gitea/awesome-gitea/src/branch/master/README.md#user-content-packages). diff --git a/doc/installation/from-package.zh-cn.md b/doc/installation/from-package.zh-cn.md index 93d3c125..e3ed3aa3 100644 --- a/doc/installation/from-package.zh-cn.md +++ b/doc/installation/from-package.zh-cn.md @@ -13,12 +13,23 @@ menu: identifier: "install-from-package" --- -# 使用包管理器安装 - **目录** {{< toc >}} +# 官方包管理器 + +## macOS + +macOS 平台下当前我们仅支持通过 `brew` 来安装。如果你没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令： + +``` +brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea +brew install gitea +``` + +# 非官方包管理器 + ## Alpine Linux Gitea 已经包含在 Alpine Linux 的[社区存储库](https://pkgs.alpinelinux.org/packages?name=gitea&branch=edge)中，版本与 Gitea 官方保持同步。 @@ -66,15 +77,6 @@ choco install gitea 你也可以 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}}) 。 -## macOS - -macOS 平台下当前我们仅支持通过 `brew` 来安装。如果你没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令： - -``` -brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea -brew install gitea -``` - ## FreeBSD 可以使用 Gitea 的 FreeBSD port `www/gitea`。 请安装预构建的二进制包： diff --git a/doc/usage/agit-support.en-us.md b/doc/usage/agit-support.en-us.md index c71be683..b005e1bd 100644 --- a/doc/usage/agit-support.en-us.md +++ b/doc/usage/agit-support.en-us.md @@ -1,6 +1,6 @@ --- date: " 2022-09-01T20:50:42+0000" -title: "Usage: Agit Setup" +title: "Agit Setup" slug: "agit-setup" weight: 12 toc: false diff --git a/doc/usage/issue-pull-request-templates.en-us.md b/doc/usage/issue-pull-request-templates.en-us.md index f3603795..10748468 100644 --- a/doc/usage/issue-pull-request-templates.en-us.md +++ b/doc/usage/issue-pull-request-templates.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-05-10T16:00:00+02:00" -title: "Usage: Issue and Pull Request templates" +title: "Issue and Pull Request templates" slug: "issue-pull-request-templates" weight: 15 toc: false diff --git a/doc/usage/labels.en-us.md b/doc/usage/labels.en-us.md index 8e5ff1cf..7c249497 100644 --- a/doc/usage/labels.en-us.md +++ b/doc/usage/labels.en-us.md @@ -1,6 +1,6 @@ --- date: "2023-03-04T19:00:00+00:00" -title: "Usage: Labels" +title: "Labels" slug: "labels" weight: 13 toc: false diff --git a/doc/usage/linked-references.en-us.md b/doc/usage/linked-references.en-us.md index 721c2cf1..335d2654 100644 --- a/doc/usage/linked-references.en-us.md +++ b/doc/usage/linked-references.en-us.md @@ -1,6 +1,6 @@ --- date: "2019-11-21T17:00:00-03:00" -title: "Usage: Automatically Linked References" +title: "Automatically Linked References" slug: "automatically-linked-references" weight: 15 toc: false diff --git a/doc/usage/merge-message-templates.en-us.md b/doc/usage/merge-message-templates.en-us.md index c30ac1bf..70710b98 100644 --- a/doc/usage/merge-message-templates.en-us.md +++ b/doc/usage/merge-message-templates.en-us.md @@ -1,6 +1,6 @@ --- date: "2022-08-31T17:35:40+08:00" -title: "Usage: Merge Message templates" +title: "Merge Message templates" slug: "merge-message-templates" weight: 15 toc: false diff --git a/doc/usage/pull-request.en-us.md b/doc/usage/pull-request.en-us.md index 4150f442..c7fea88a 100644 --- a/doc/usage/pull-request.en-us.md +++ b/doc/usage/pull-request.en-us.md @@ -1,6 +1,6 @@ --- date: "2018-06-01T19:00:00+02:00" -title: "Usage: Pull Request" +title: "Pull Request" slug: "pull-request" weight: 13 toc: false diff --git a/doc/usage/pull-request.zh-tw.md b/doc/usage/pull-request.zh-tw.md index ee09e189..b666fece 100644 --- a/doc/usage/pull-request.zh-tw.md +++ b/doc/usage/pull-request.zh-tw.md @@ -1,6 +1,6 @@ --- date: "2018-06-01T19:00:00+02:00" -title: "使用: 合併請求" +title: "合併請求" slug: "pull-request" weight: 13 toc: false diff --git a/doc/usage/push-options.en-us.md b/doc/usage/push-options.en-us.md index b58a91c2..5ed7b47d 100644 --- a/doc/usage/push-options.en-us.md +++ b/doc/usage/push-options.en-us.md @@ -1,6 +1,6 @@ --- date: "2020-07-06T16:00:00+02:00" -title: "Usage: Push Options" +title: "Push Options" slug: "push-options" weight: 15 toc: false diff --git a/doc/usage/push-options.zh-tw.md b/doc/usage/push-options.zh-tw.md index 558492af..49133ce7 100644 --- a/doc/usage/push-options.zh-tw.md +++ b/doc/usage/push-options.zh-tw.md @@ -1,6 +1,6 @@ --- date: "2020-07-06T16:00:00+02:00" -title: "使用: Push Options" +title: "Push Options" slug: "push-options" weight: 15 toc: false diff --git a/doc/usage/push-to-create.en-us.md b/doc/usage/push-to-create.en-us.md index 27b26b16..c461b400 100644 --- a/doc/usage/push-to-create.en-us.md +++ b/doc/usage/push-to-create.en-us.md @@ -1,6 +1,6 @@ --- date: "2020-07-06T16:00:00+02:00" -title: "Usage: Push To Create" +title: "Push To Create" slug: "push-to-create" weight: 15 toc: false