Skip to content

Commit

Permalink
Update documentation with up-to-date links (#144)
Browse files Browse the repository at this point in the history
- Update documentation links to match the Gitea instance (#87)
- Update discord link to the short link (#116)
- Update email to helpdesk (#115)

Co-authored-by: Ethan Lane <ethan@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/Droplet/pulls/144
Reviewed-by: VylpesTester <tester@vylpes.com>
  • Loading branch information
Vylpes committed Mar 17, 2023
1 parent 36acc01 commit aadf6e3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -12,7 +12,7 @@ This project and everyone participating in it is governed by the Droplet of Cond

> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
You can ask a question about the project in the `#development` channel in the [Discord Server](https://discord.gg/UyAhAVp).
You can ask a question about the project in the `#development` channel in the [Discord Server](https://go.vylpes.xyz/A6HcA).

## What you should know

Expand Down Expand Up @@ -140,15 +140,15 @@ If you want to understand how Droplet works or want to debug an issue, you'll wa
First, fork the Droplet repository so that you can make a pull request. Then, clone your fork locally:

```bash
git clone https://github.com/<your-github-account>/droplet.git
git clone https://gitea.vylpes.xyz/<your-gitea-account>/droplet.git
```

Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork.

```bash
cd droplet
git checkout main
git pull https://github.com/vylpes/droplet.git master
git pull https://gitea.vylpes.xyz/rabbitlabs/droplet.git master
```

Manage any merge conflicts, commit them, and then push them to your fork.
Expand Down
8 changes: 6 additions & 2 deletions README.md
Expand Up @@ -12,7 +12,11 @@ We will not merge pull requests unless all checks pass and at least one of the r
See CONTRIBUTING.md for more details.

## Feedback
Feedback is also welcome. Any improvements/bug reports please [create an issue](https://github.com/vylpes/droplet/issues/new), or [email me](mailto:ethan@vylpes.com).
Feedback is also welcome. Any improvements/bug reports please either:

- [create an issue](https://gitea.vylpes.xyz/rabbitlabs/droplet/issues/new)
- [email me](mailto:helpdesk@vylpes.com)
- [join our discord server](https://go.vylpes.xyz/A6HcA)

## Code of Conduct
This project has adopted the **Contributor Covenant Code of Conduct**. For more information see `CODE_OF_CONDUCT.md`, or email me at [ethan@vylpes.com](mailto:ethan@vylpes.com) for any further enquiries or comments.
This project has adopted the **Contributor Covenant Code of Conduct**. For more information see `CODE_OF_CONDUCT.md`, or email me at [ethan@vylpes.com](mailto:helpdesk@vylpes.com) for any further enquiries or comments.

0 comments on commit aadf6e3

Please sign in to comment.