diff --git a/assets/images/collaborating/create-organization/Create-orga.PNG b/assets/images/collaborating/create-organization/create-orga.png similarity index 100% rename from assets/images/collaborating/create-organization/Create-orga.PNG rename to assets/images/collaborating/create-organization/create-orga.png diff --git a/assets/images/collaborating/create-organization/Dashboard.PNG b/assets/images/collaborating/create-organization/dashboard.png similarity index 100% rename from assets/images/collaborating/create-organization/Dashboard.PNG rename to assets/images/collaborating/create-organization/dashboard.png diff --git a/assets/images/collaborating/create-organization/Orga.PNG b/assets/images/collaborating/create-organization/orga.png similarity index 100% rename from assets/images/collaborating/create-organization/Orga.PNG rename to assets/images/collaborating/create-organization/orga.png diff --git a/assets/images/collaborating/create-organization/people.PNG b/assets/images/collaborating/create-organization/people.png similarity index 100% rename from assets/images/collaborating/create-organization/people.PNG rename to assets/images/collaborating/create-organization/people.png diff --git a/assets/images/collaborating/create-organization/team-settings.PNG b/assets/images/collaborating/create-organization/team-settings.png similarity index 100% rename from assets/images/collaborating/create-organization/team-settings.PNG rename to assets/images/collaborating/create-organization/team-settings.png diff --git a/assets/images/collaborating/create-organization/teams.PNG b/assets/images/collaborating/create-organization/teams.png similarity index 100% rename from assets/images/collaborating/create-organization/teams.PNG rename to assets/images/collaborating/create-organization/teams.png diff --git a/content/collaborating/resolve-conflicts.md b/content/collaborating/resolve-conflicts.md index adc9c82..7ff0e27 100644 --- a/content/collaborating/resolve-conflicts.md +++ b/content/collaborating/resolve-conflicts.md @@ -10,7 +10,7 @@ When collaborating with others on a big project, sometimes it occurs that someon First of all: Do not panic! You should be able to resolve merge conflicts with a little time and patience. -While it is a good idea to rebase your branch before creating a pull request, as described in the article on [Pull requests and Git flow](pull-requests-and-git-flow.md), +While it is a good idea to rebase your branch before creating a pull request, as described in the article on [Pull requests and Git flow](/collaborating/pull-requests-and-git-flow), sometimes merge conflicts are unavoidable. This article will explain what to do in case of a merge conflict, and how to resolve it using the command line. diff --git a/content/contact.md b/content/contact.md index 04f40bc..d4b3b7a 100644 --- a/content/contact.md +++ b/content/contact.md @@ -16,7 +16,7 @@ If you need quicker help or want to freely discuss topics, or follow up on Codeb - use the unofficial (community-created) [Codeberg Subreddit](https://www.reddit.com/r/Codeberg/) ## Email -For user support on Codeberg.org that *can not be handled by the channels mentioned above* (e.g. because it requires sensitive information), you can send an email to [help@codeberg.org](help-PLEASE-REMOVE-THIS-FOR-SPAM-PROTECTION@codeberg.org). +For user support on Codeberg.org that *can not be handled by the channels mentioned above* (e.g. because it requires sensitive information), you can send an email to [help@codeberg.org](mailto:help-PLEASE-REMOVE-THIS-FOR-SPAM-PROTECTION@codeberg.org). If you need to get in touch with the people behind the non-profit Codeberg e.V. (e.g. for managing your membership etc), please instead write to [codeberg@codeberg.org](mailto:codeberg-PLEASE-REMOVE-THIS-FOR-SPAM-PROTECTION@codeberg.org). ## Legal inquiries diff --git a/content/getting-started/install-git.md b/content/getting-started/install-git.md index 85caa14..b4b6768 100644 --- a/content/getting-started/install-git.md +++ b/content/getting-started/install-git.md @@ -86,7 +86,7 @@ If you'd prefer not to store your credentials in Windows but e.g. in a password > > > -> win-error +> win-error > ### Run diff --git a/content/markdown/topics.md b/content/markdown/topics.md index 788b72d..804e4e9 100644 --- a/content/markdown/topics.md +++ b/content/markdown/topics.md @@ -17,7 +17,7 @@ The Setext provides only two layers of subdivision and the ATX-Style provides up The Codeberg documentation uses the ATX-style. In the documentation, the first topic is omitted as it is already provided in the header section of the documentation file. -See the article on [How do I create a new article?](/improving-documentation/create-article.md) +See the article on [How do I create a new article?](/improving-documentation/create-article/) for further details. **Note:** This document may seem a little unstructured, as there are a bunch of topics with only a small