From efafdf1cf07d508e75db5ad77c07b11a8ffd9641 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:08:26 +0100 Subject: [PATCH 1/3] Update 1-index.html Shorten intro text as per discussion https://github.com/jamulussoftware/jamuluswebsite/issues/322#issuecomment-799796098 --- 1-index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-index.html b/1-index.html index 5226888c6..97bb6ec83 100644 --- a/1-index.html +++ b/1-index.html @@ -17,7 +17,7 @@

What is Jamulus?

- Jamulus is software for playing music, rehearsing, or just jamming with anyone online with low latency. You can use your Windows, macOS or Linux machine to connect to Jamulus servers worldwide. Jamulus is free and you can just use your normal broadband connection. Simply connect to a public server or host your own private one. Jamulus has been in development since 2006 and is designed for high quality, low-latency sound, making it easy to play together remotely and in time. Have a look at how people do it! + Jamulus is for playing, rehearsing, or just jamming with your friends, your band or just anyone you find online. With high quality, low-latency sound on a normal broadband connection, it's easy to play together remotely and in time. Have a look at how people do it - and download it here!
From ba7e41107000e8da2f0b7cef4829ccc8071dbf5d Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:11:45 +0100 Subject: [PATCH 2/3] Update en-Contribution.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: The hope is that this page looks easy and non-threatening, doesn’t talk about forking Git repos, pull requests etc. That information has now moved to the relevant README.md file for the website repo. This is the top-level “overview” page for people following the “get involved” link on the website footer or similar. This page points people to the next stage, depending on what they want. It’s also the non-coders equivalent of README.md. --- wiki/en/en-Contribution.md | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index 53f2201c0..f96a1e01e 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -7,32 +7,13 @@ permalink: "/wiki/Contribution" # Contributing to the Jamulus Project -## Jamulus Software +If you find a mistake, typo or something out of date (in any language) on this website or in Jamulus itself, you can raise it as a bug. -If you want to contribute code or have a feature request, [open an issue on GitHub](https://github.com/jamulussoftware/jamulus/issues/) (preferred) or [post your idea on the forum](https://github.com/jamulussoftware/jamulus/discussions) if you don't have a GitHub account. This allows us to discuss the changes before e.g. making a pull request (be sure to read main dev's [Volker's manifesto for contributions on GitHub](https://github.com/jamulussoftware/jamulus/discussions/915) and the [CONTRIBUTING file](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)) +If you think some documentation or information is missing or can be improved, post about that on this forum so that it can be discussed first. -See the [Jamulus GitHub repo](https://github.com/jamulussoftware/jamulus) for further information. +If you want to help out with translation, you will need to have a GitHub account and be familiar with using git and Jekyll. Read about our [documentation and translation process](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md), and [introduce yourself](https://github.com/jamulussoftware/jamulus/discussions) if you’d like to get involved. -## Jamulus Website -* If you find a mistake, typo or something out of date (in any language) on the website, you can [open an issue on GitHub](https://github.com/jamulussoftware/jamuluswebsite/issues). +## Want to contribute code? -* If you think some documentation or information is missing or can be improved, post about that on [the discussion forum](https://github.com/jamulussoftware/jamulus/discussions) so that it can be discussed first. - -Have a look at the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md) for the website and the [Website GitHub repo](https://github.com/jamulussoftware/jamuluswebsite) for further information. - -### I'm not familiar with GitHub. What do I need to know? - -**The following content is for the documentation on jamulus.io only, not for the Jamulus software!** - -If you aren't comfortable with Pull Requests, commits, etc. just open an issue. We will then take care of your changes. If you want to do the changes on your own and open a Pull Request, follow these instructions: - -1. Fork the repo (there's a fork button on the top right of the GitHub page) -2. Decide which branch you have to commit your changes to (rule of thumb: everything which might need translation should go to the `changes` branch, typos should go to the `release` branch; more information can be found in the [CONTRIBUTING file](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md)). Create a new branch from the up-to-date branch you chose -3. Make your changes -4. If you did the changes offline, push the new branch to your repository -5. Submit your Pull Request, give a short description of your changes and link the issue you opened -6. Wait for a review and a merge - -**Hint (for git):** *Do not merge your work* into your local `changes` branch, only keep it in sync by pooling from the remote Jamulus website repository. Create a new branch for your proposed changes. -If the `changes` branch is modified before submitting your request, keep the local `changes` branch in sync by pooling from the official one, merge the local changes branch into your working branch, resolve conflicts, push your changes and create the Pull Request. +See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md). From 919805019e67784a1ea74288df1138d6adeeb8bc Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Mon, 29 Mar 2021 08:04:00 +0100 Subject: [PATCH 3/3] Update en-Contribution.md --- wiki/en/en-Contribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/en-Contribution.md b/wiki/en/en-Contribution.md index f96a1e01e..73ea6ab2c 100644 --- a/wiki/en/en-Contribution.md +++ b/wiki/en/en-Contribution.md @@ -11,7 +11,7 @@ If you find a mistake, typo or something out of date (in any language) on this w If you think some documentation or information is missing or can be improved, post about that on this forum so that it can be discussed first. -If you want to help out with translation, you will need to have a GitHub account and be familiar with using git and Jekyll. Read about our [documentation and translation process](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md), and [introduce yourself](https://github.com/jamulussoftware/jamulus/discussions) if you’d like to get involved. +If you want to help out with translation, you will need to have a GitHub account and should be familiar with using git and Jekyll. Read about our [documentation and translation process](https://github.com/jamulussoftware/jamuluswebsite/blob/changes/CONTRIBUTING.md), and [introduce yourself](https://github.com/jamulussoftware/jamulus/discussions) if you’d like to get involved. ## Want to contribute code?