diff --git a/docs/user/actions.md b/docs/user/actions.md index 52f86caf..2d8698a4 100644 --- a/docs/user/actions.md +++ b/docs/user/actions.md @@ -647,7 +647,7 @@ jobs: runs-on: docker ``` -means that the `Forgejo runner` that claims to provide a kind of machine labelled `docker` will be selected by `Forgejo` and sent the job to be run. +means that the `Forgejo runner` that claims to provide a kind of machine labeled `docker` will be selected by `Forgejo` and sent the job to be run. The actual machine provided by the runner **entirely depends on how the `Forgejo runner` was registered** (see the [Forgejo Actions administrator guide](../../admin/actions/) for more information). diff --git a/docs/user/merge-message-templates.md b/docs/user/merge-message-templates.md index 28c1b0b1..af274c9f 100644 --- a/docs/user/merge-message-templates.md +++ b/docs/user/merge-message-templates.md @@ -37,4 +37,4 @@ You can use the following variables enclosed in `${}` inside these templates whi When rebasing without a merge commit, `REBASE_TEMPLATE.md` modifies the message of the last commit. The following additional variables are available in this template: - CommitTitle: Commit's title -- CommitBody: Commits's body text +- CommitBody: Commit's body text diff --git a/docs/user/profile.md b/docs/user/profile.md index 4aef3cde..a785b232 100644 --- a/docs/user/profile.md +++ b/docs/user/profile.md @@ -22,7 +22,7 @@ Making the `.profile` repository private will hide the Profile README. Rather than supporting multiple social links on the profile card, under the user avatar, such links - including [`rel=me`](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/me) -attributes - can be placed in the `.profile` readme instead. This gives a user a +attributes - can be placed in the `.profile` README instead. This gives a user a lot of flexibility on how they wish to display these links. To add a `rel=me` attribute, the link should be written in HTML, rather than in Markdown format, for example: `.wiki.git`. +The wiki is essentially a separate Git repository in your repository with a predefined name in the form of `.wiki.git`. It consists of [Markdown](https://en.wikipedia.org/wiki/Markdown) files (file extension `.md`) and additional assets like images. No further stylesheets are needed. The Markdown files are automatically rendered according to the selected Forgejo theme. @@ -40,7 +40,7 @@ Clicking on the "Insert Image" button will make the following text appear in you ## Adding content using a local Git client -You can work with the wiki repo as you would with any other Git repo on Forgejo. +You can work with the wiki repository as you would with any other Git repository on Forgejo. ```shell git clone git@codeberg.org:knut/foobar.wiki.git