aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/doc/installation/from-binary.en-us.md
diff options
context:
space:
mode:
authorAidan Fitzgerald <aidan-fitz@users.noreply.github.com>2019-03-09 16:15:45 -0500
committertechknowlogick <matti@mdranta.net>2019-03-09 16:15:45 -0500
commitf5cf9a8355c46fa5619c03465178b51171ac30b9 (patch)
tree0163eb48ca238b03612176817449133cb31e34cf /docs/content/doc/installation/from-binary.en-us.md
parent8fffb0616866cfe7a293b457d8703724666374cb (diff)
downloadgitea-f5cf9a8355c46fa5619c03465178b51171ac30b9.tar.gz
gitea-f5cf9a8355c46fa5619c03465178b51171ac30b9.zip
Copyedit docs (#6275)
Diffstat (limited to 'docs/content/doc/installation/from-binary.en-us.md')
-rw-r--r--docs/content/doc/installation/from-binary.en-us.md28
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/content/doc/installation/from-binary.en-us.md b/docs/content/doc/installation/from-binary.en-us.md
index 700642213c..8fa96bd96e 100644
--- a/docs/content/doc/installation/from-binary.en-us.md
+++ b/docs/content/doc/installation/from-binary.en-us.md
@@ -26,7 +26,7 @@ chmod +x gitea
```
## Verify GPG signature
-Gitea signs all binaries with a [GPG key](https://pgp.mit.edu/pks/lookup?op=vindex&fingerprint=on&search=0x2D9AE806EC1592E2) to prevent against unwanted modification of binaries. To validate the binary download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.
+Gitea signs all binaries with a [GPG key](https://pgp.mit.edu/pks/lookup?op=vindex&fingerprint=on&search=0x2D9AE806EC1592E2) to prevent against unwanted modification of binaries. To validate the binary, download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.
```sh
gpg --keyserver pgp.mit.edu --recv 7C9E68152594688862D62AF62D9AE806EC1592E2
@@ -49,12 +49,12 @@ Of note, configuring `GITEA_WORK_DIR` will tell Gitea where to base its working
### Prepare environment
-Check that git is installed on the server, if it is not install it first.
+Check that Git is installed on the server. If it is not, install it first.
```sh
git --version
```
-Create user to run gitea (ex. `git`)
+Create user to run Gitea (ex. `git`)
```sh
adduser \
--system \
@@ -77,7 +77,7 @@ chown root:git /etc/gitea
chmod 770 /etc/gitea
```
-**NOTE:** `/etc/gitea` is temporary set with write rights for user `git` so that Web installer could write configuration file. After installation is done it is recommended to set rights to read-only using:
+**NOTE:** `/etc/gitea` is temporary set with write rights for user `git` so that Web installer could write configuration file. After installation is done, it is recommended to set rights to read-only using:
```
chmod 750 /etc/gitea
chmod 644 /etc/gitea/app.ini
@@ -90,7 +90,7 @@ chmod 644 /etc/gitea/app.ini
export GITEA_WORK_DIR=/var/lib/gitea/
```
-### Copy gitea binary to global location
+### Copy Gitea binary to global location
```
cp gitea /usr/local/bin/gitea
@@ -112,7 +112,7 @@ GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini
## Updating to a new version
-You can update to a new version of gitea by stopping gitea, replacing the binary at `/usr/local/bin/gitea` and restarting the instance.
+You can update to a new version of Gitea by stopping Gitea, replacing the binary at `/usr/local/bin/gitea` and restarting the instance.
The binary file name should not be changed during the update to avoid problems
in existing repositories.
@@ -122,7 +122,7 @@ If you have carried out the installation steps as described above, the binary sh
have the generic name `gitea`. Do not change this, i.e. to include the version number.
See below for troubleshooting instructions to repair broken repositories after
-an update of your gitea version.
+an update of your Gitea version.
## Troubleshooting
@@ -135,16 +135,16 @@ SQLite support in the binaries provided by dl.gitea.io. In this situation, it is
possible to [install from source]({{< relref "from-source.en-us.md" >}}) without sqlite
support.
-### Running gitea on another port
+### Running Gitea on another port
For errors like `702 runWeb()] [E] Failed to start server: listen tcp 0.0.0.0:3000:
-bind: address already in use` gitea needs to be started on another free port. This
-is possible using `./gitea web -p $PORT`. It's possible another instance of gitea
+bind: address already in use` Gitea needs to be started on another free port. This
+is possible using `./gitea web -p $PORT`. It's possible another instance of Gitea
is already running.
-### Git error after updating to a new version of gitea
+### Git error after updating to a new version of Gitea
-If the binary file name has been changed during the update to a new version of gitea,
+If the binary file name has been changed during the update to a new version of Gitea,
git hooks in existing repositories will not work any more. In that case, a git
error will be displayed when pushing to the repository.
@@ -152,7 +152,7 @@ error will be displayed when pushing to the repository.
remote: ./hooks/pre-receive.d/gitea: line 2: [...]: No such file or directory
```
-The `[...]` part of the error message will contain the path to your previous gitea
+The `[...]` part of the error message will contain the path to your previous Gitea
binary.
To solve this, go to the admin options and run the task `Resynchronize pre-receive,
@@ -160,6 +160,6 @@ update and post-receive hooks of all repositories` to update all hooks to contai
the new binary path. Please note that this overwrite all git hooks including ones
with customizations made.
-If you aren't using the built-in to Gitea ssh server you will also need to re-write
+If you aren't using the built-in to Gitea SSH server you will also need to re-write
the authorized key file by running the `Update the '.ssh/authorized_keys' file with
Gitea SSH keys.` task in the admin options.