sync with Codeberg 85d333f48badb27f8e4371263db3354f70836dfd

https://codeberg.org/Codeberg/Documentation

git diff 7bb8fa5ca559073c028805888195ee31b1f3d9c2..85d333f48badb27f8e4371263db3354f70836dfd > doc.patch

docs/user/email-settings.md

@@ -1,11 +1,14 @@
 ---
 title: 'Email Settings'
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/getting-started/email-settings.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/getting-started/email-settings.md'
 ---
 
 By default, Forgejo will send notifications to your registered email addresses.
 
+This section only concerns your Forgejo account and will not affect the commits you do not make on the website.
+If you don't know how to **configure your name and email in Git**, take a look at the ["Configuring Git" man page](https://git-scm.com/docs/git-config).
+
 ## Configuring all notifications
 
 To change your notification preferences, go to your [Account Settings](https://codeberg.org/user/settings/account) or manually navigate to the settings page.

docs/user/first-repository.md

@@ -1,7 +1,7 @@
 ---
 title: Your First Repository
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/getting-started/first-repository.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/getting-started/first-repository.md'
 ---
 
 Almost everything on Forgejo happens in a repository. Think of a repository as a home for your project, where all of its source code can be organized using Git, as well as where you can track issues and read and write wikis.
@@ -10,8 +10,6 @@ This article will guide you through creating your first repository on Forgejo, c
 
 ## Creating a Repository
 
-> A note to more advanced users: It's currently not possible to use Push-to-Create to push a fresh repository onto Forgejo.
-
 To create a new repository, you need be logged in to your account.
 
 When you're logged in, you can use one of the two buttons shown in the two following screenshots to create a new repository:
@@ -66,7 +64,7 @@ In this guide, we'll focus on connecting to Forgejo via HTTP using Git on the co
 - [Clone & Commit via CLI](/git/clone-commit-via-cli/) and
 - [Clone & Commit via Web](/git/clone-commit-via-web/)
 
-> Although we use HTTP in this Getting Started guide, it is a good idea to setup SSH-based authentication once you feel confident to do so
+> Although we use HTTP in this guide, it is a good idea to setup SSH-based authentication once you feel confident to do so.
 
 ### Option A: Clone the newly created, empty repository
 
@@ -132,13 +130,13 @@ Now, you need to tell Git where to push your changes. You would do that by speci
 knut@iceberg:~/my-project$ git remote add origin https://codeberg.org/knut/foobar
 ```
 
-If all is done correctly, this command should output nothing.
+When you clone a repository from the Internet, the URL that you got your copy of the repository from will be automatically used for the `origin` remote.
 
-> **Errors:**
+If your local copy of the repository is missing some commits that exist in the remote repository, pushing will result in an error. There are two ways to fix this:
-> If you added an already initalized remote repository and try to push, you will get an error, if your local commit history is different from the history of the remote. You have some choices to resolve the conflict:
+
->
+- Run `git pull` to combine your local changes with the changes that exist in the remote repository. If this does not work, please follow the instructions in your terminal.
-> - Merge your changes with the ones in the remote `git pull`
+- If you know what you are doing, you can also overwrite the remote repository uaing `git -f push`.
-> - If you are sure, that you want to overwrite all changes in the remote, you can force push with `git -f push`
+  This action will **permanently** alter your remote repository and is not suitable if you are working on a project together with other people.
 
 ## Making your first commit
 

docs/user/issue-tracking-basics.md

@@ -1,7 +1,7 @@
 ---
 title: 'The Basics of Issue Tracking'
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/getting-started/issue-tracking-basics.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/getting-started/issue-tracking-basics.md'
 ---
 
 Issues are an important mean of communication on Forgejo.

docs/user/pull-requests-and-git-flow.md

@@ -1,7 +1,7 @@
 ---
 title: Pull requests and Git flow
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/collaborating/pull-requests-and-git-flow.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/collaborating/pull-requests-and-git-flow.md'
 ---
 
 ## Benefits of a pull request based workflow

docs/user/repo-permissions.md

@@ -1,7 +1,7 @@
 ---
 title: 'Repository Permissions'
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/collaborating/repo-permissions.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/collaborating/repo-permissions.md'
 ---
 
 When you invite collaborators to join your repository or when you create teams for your organization, you have to decide what each collaborator/team is allowed to do.

docs/user/wiki.md

@@ -1,7 +1,7 @@
 ---
 title: 'Integrated Wiki'
 license: 'CC-BY-SA-4.0'
-origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/7bb8fa5ca559073c028805888195ee31b1f3d9c2/content/getting-started/wiki.md'
+origin_url: 'https://codeberg.org/Codeberg/Documentation/src/commit/85d333f48badb27f8e4371263db3354f70836dfd/content/getting-started/wiki.md'
 ---
 
 A [wiki](https://en.wikipedia.org/wiki/Wiki) is a collaborative space on the web. It is a common practice to use wikis to collect knowledge and share information.