summaryrefslogtreecommitdiffstats
path: root/docs/content/doc/advanced
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/advanced
parent8fffb0616866cfe7a293b457d8703724666374cb (diff)
downloadgitea-f5cf9a8355c46fa5619c03465178b51171ac30b9.tar.gz
gitea-f5cf9a8355c46fa5619c03465178b51171ac30b9.zip
Copyedit docs (#6275)
Diffstat (limited to 'docs/content/doc/advanced')
-rw-r--r--docs/content/doc/advanced/api-usage.en-us.md6
-rw-r--r--docs/content/doc/advanced/config-cheat-sheet.en-us.md2
-rw-r--r--docs/content/doc/advanced/customizing-gitea.en-us.md2
-rw-r--r--docs/content/doc/advanced/external-renderers.en-us.md4
-rw-r--r--docs/content/doc/advanced/hacking-on-gitea.en-us.md48
-rw-r--r--docs/content/doc/advanced/specific-variables.en-us.md2
6 files changed, 32 insertions, 32 deletions
diff --git a/docs/content/doc/advanced/api-usage.en-us.md b/docs/content/doc/advanced/api-usage.en-us.md
index 0000465c49..d5a7b3a6ef 100644
--- a/docs/content/doc/advanced/api-usage.en-us.md
+++ b/docs/content/doc/advanced/api-usage.en-us.md
@@ -31,18 +31,18 @@ Gitea supports these methods of API authentication:
- `access_token=...` parameter in URL query string
- `Authorization: token ...` header in HTTP headers
-All of these methods accept the same apiKey token type. You can
+All of these methods accept the same API key token type. You can
better understand this by looking at the code -- as of this writing,
Gitea parses queries and headers to find the token in
[modules/auth/auth.go](https://github.com/go-gitea/gitea/blob/6efdcaed86565c91a3dc77631372a9cc45a58e89/modules/auth/auth.go#L47).
-You can create an apiKey token via your gitea install's web interface:
+You can create an API key token via your Gitea installation's web interface:
`Settings | Applications | Generate New Token`.
### More on the `Authorization:` header
For historical reasons, Gitea needs the word `token` included before
-the apiKey token in an authorization header, like this:
+the API key token in an authorization header, like this:
```
Authorization: token 65eaa9c8ef52460d22a93307fe0aee76289dc675
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index 40c96efa33..2fc78efcb3 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -44,7 +44,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
- `ROOT`: **~/gitea-repositories/**: Root path for storing all repository data. It must be
an absolute path.
-- `SCRIPT_TYPE`: **bash**: The script type this server supports, usually this is `bash`,
+- `SCRIPT_TYPE`: **bash**: The script type this server supports. Usually this is `bash`,
but some users report that only `sh` is available.
- `ANSI_CHARSET`: **\<empty\>**: The default charset for an unrecognized charset.
- `FORCE_PRIVATE`: **false**: Force every new repository to be private.
diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md
index fb61470fa7..983fe5f0c7 100644
--- a/docs/content/doc/advanced/customizing-gitea.en-us.md
+++ b/docs/content/doc/advanced/customizing-gitea.en-us.md
@@ -18,7 +18,7 @@ menu:
Customizing Gitea is typically done using the `custom` folder. This is the central
place to override configuration settings, templates, etc.
-If Gitea is deployed from binary, all default paths will be relative to the gitea
+If Gitea is deployed from binary, all default paths will be relative to the Gitea
binary. If installed from a distribution, these paths will likely be modified to
the Linux Filesystem Standard. Gitea will create required folders, including `custom/`.
Application settings are configured in `custom/conf/app.ini`. Distributions may
diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md
index 52374bc01d..e1d773725c 100644
--- a/docs/content/doc/advanced/external-renderers.en-us.md
+++ b/docs/content/doc/advanced/external-renderers.en-us.md
@@ -16,10 +16,10 @@ menu:
# Custom files rendering configuration
Gitea supports custom file renderings (i.e., Jupyter notebooks, asciidoc, etc.) through external binaries,
-it is just matter of:
+it is just a matter of:
* installing external binaries
* add some configuration to your `app.ini` file
-* restart your gitea instance
+* restart your Gitea instance
## Installing external binaries
diff --git a/docs/content/doc/advanced/hacking-on-gitea.en-us.md b/docs/content/doc/advanced/hacking-on-gitea.en-us.md
index ee2dc00fd9..1fabc1a118 100644
--- a/docs/content/doc/advanced/hacking-on-gitea.en-us.md
+++ b/docs/content/doc/advanced/hacking-on-gitea.en-us.md
@@ -32,24 +32,24 @@ necessary. To be able to use these you must have the `"$GOPATH"/bin` directory
on the executable path. If you don't add the go bin directory to the
executable path you will have to manage this yourself.
-**Note 2**: Go version 1.9 or higher is required, however it is important
+**Note 2**: Go version 1.9 or higher is required; however, it is important
to note that our continuous integration will check that the formatting of the
source code is not changed by `gofmt` using `make fmt-check`. Unfortunately,
-the results of `gofmt` can differ by the version of `go` it is therefore
+the results of `gofmt` can differ by the version of `go`. It is therefore
recommended to install the version of go that our continuous integration is
-running. At the time of writing this is Go version 1.11, however this can be
+running. At the time of writing this is Go version 1.12; however, this can be
checked by looking at the
[master `.drone.yml`](https://github.com/go-gitea/gitea/blob/master/.drone.yml)
(At the time of writing
[line 67](https://github.com/go-gitea/gitea/blob/8917d66571a95f3da232a0c27bc1300210d10fde/.drone.yml#L67)
-is the relevant line - however this may change.)
+is the relevant line - but this may change.)
## Downloading and cloning the Gitea source code
Go is quite opinionated about where it expects its source code, and simply
cloning the Gitea repository to an arbitrary path is likely to lead to
-problems - the fixing of which is out of scope for this document. Further some
-internal packages are referenced using their respective Github URL and at
+problems - the fixing of which is out of scope for this document. Further, some
+internal packages are referenced using their respective GitHub URL and at
present we use `vendor/` directories.
The recommended method of obtaining the source code is by using the `go get` command:
@@ -65,7 +65,7 @@ is not set `"$HOME/go/src/code.gitea.io/gitea"`.
## Forking Gitea
As stated above, you cannot clone Gitea to an arbitrary path. Download the master Gitea source
-code as above. Then fork the [Gitea repository](https://github.com/go-gitea/gitea) on GitHub,
+code as above. Then, fork the [Gitea repository](https://github.com/go-gitea/gitea) on GitHub,
and either switch the git remote origin for your fork or add your fork as another remote:
```bash
@@ -86,7 +86,7 @@ git fetch --all --prune
```
To be able to create pull requests, the forked repository should be added as a remote
-to the Gitea sources, otherwise changes can't be pushed.
+to the Gitea sources. Otherwise, changes can't be pushed.
## Building Gitea (Basic)
@@ -141,10 +141,10 @@ make vet lint misspell-check
To generate the stylsheets, you will need [Node.js](https://nodejs.org/) at version 8.0 or above.
At present we use [less](http://lesscss.org/) and [postcss](https://postcss.org) to generate our stylesheets. Do
-**not** edit the files in `public/css/` directly as they are generated from
+**not** edit the files in `public/css/` directly, as they are generated from
`lessc` from the files in `public/less/`.
-If you wish to work on the stylesheets you will need to install `lessc` the
+If you wish to work on the stylesheets, you will need to install `lessc` the
less compiler and `postcss`. The recommended way to do this is using `npm install`:
```bash
@@ -163,17 +163,17 @@ PRs.
### Updating the API
-When creating new API routes or modifying existing API routes you **MUST**
+When creating new API routes or modifying existing API routes, you **MUST**
update and/or create [Swagger](https://swagger.io/docs/specification/2-0/what-is-swagger/)
documentation for these using [go-swagger](https://goswagger.io/) comments.
The structure of these comments is described in the [specification](https://goswagger.io/use/spec.html#annotation-syntax).
-If you want more information about the Swagger structure you can look at the
+If you want more information about the Swagger structure, you can look at the
[Swagger 2.0 Documentation](https://swagger.io/docs/specification/2-0/basic-structure/)
-or compare with a previous PR adding a new API endpoint e.g. [PR #5483](https://github.com/go-gitea/gitea/pull/5843/files#diff-2e0a7b644cf31e1c8ef7d76b444fe3aaR20)
+or compare with a previous PR adding a new API endpoint, e.g. [PR #5483](https://github.com/go-gitea/gitea/pull/5843/files#diff-2e0a7b644cf31e1c8ef7d76b444fe3aaR20)
You should be careful not to break the API for downstream users which depend
-on a stable API. In general this means additions are acceptable, but deletions
-or fundamental changes of API will be rejected.
+on a stable API. In general, this means additions are acceptable, but deletions
+or fundamental changes to the API will be rejected.
Once you have created or changed an API endpoint, please regenerate the Swagger
documentation using:
@@ -208,7 +208,7 @@ found in `docs/content/doc/advanced/config-cheat-sheet.en-us.md`
### Changing the logo
-When changing the Gitea logo svg. You will need to run and commit the results
+When changing the Gitea logo SVG, you will need to run and commit the results
of:
```bash
@@ -220,7 +220,7 @@ This will create the necessary Gitea favicon and others.
### Database Migrations
If you make breaking changes to any of the database persisted structs in the
-`models/` directory you will need to make a new migration. These can be found
+`models/` directory, you will need to make a new migration. These can be found
in `models/migrations/`. You can ensure that your migrations work for the main
database types using:
@@ -236,23 +236,23 @@ There are two types of test run by Gitea: Unit tests and Integration Tests.
TAGS="bindata sqlite sqlite_unlock_notify" make test # Runs the unit tests
```
-Unit tests will not and cannot completely test Gitea alone. Therefore we
-have written integration tests, however, these are database dependent.
+Unit tests will not and cannot completely test Gitea alone. Therefore, we
+have written integration tests; however, these are database dependent.
```bash
TAGS="bindata sqlite sqlite_unlock_notify" make generate build test-sqlite
```
-Will run the integration tests in an sqlite environment. Other database tests
-are available however may need adjustment for local environment.
+will run the integration tests in an sqlite environment. Other database tests
+are available but may need adjustment to the local environment.
Look at
[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/master/integrations/README.md)
for more information and how to run a single test.
Our continuous integration will test the code passes its unit tests and that
-all supported databases will pass integration test in a docker environment.
-Migration from several recent versions of gitea will also be tested.
+all supported databases will pass integration test in a Docker environment.
+Migration from several recent versions of Gitea will also be tested.
Please submit your PR with additional tests and integration tests as
appropriate.
@@ -268,7 +268,7 @@ make trans-copy clean build
```
You will require a copy of [Hugo](https://gohugo.io/) to run this task. Please
-note this may generate a number of untracked git objects which will need to
+note: this may generate a number of untracked git objects, which will need to
be cleaned up.
## Visual Studio Code
diff --git a/docs/content/doc/advanced/specific-variables.en-us.md b/docs/content/doc/advanced/specific-variables.en-us.md
index b0f54c13a7..d9c6d3c3e3 100644
--- a/docs/content/doc/advanced/specific-variables.en-us.md
+++ b/docs/content/doc/advanced/specific-variables.en-us.md
@@ -59,7 +59,7 @@ For documentation about each of the variables available, refer to the
* `HOST`: Host Macaron will listen on
* `PORT`: Port Macaron will listen on
* `MACARON_ENV`: global variable to provide special functionality for development environments
- vs. production environments. If MACARON_ENV is set to "" or "development" then templates will
+ vs. production environments. If MACARON_ENV is set to "" or "development", then templates will
be recompiled on every request. For more performance, set the MACARON_ENV environment variable
to "production".