[EN] Corrections.#286
[EN] Corrections.#286ann0see merged 47 commits intojamulussoftware:changesfrom ignotus666:changes_revision
Conversation
|
LGTM |
ann0see
left a comment
ann0see
left a comment
There was a problem hiding this comment.
Thanks very much for yor work! This looks great. See my comments.
wiki/en/en-Client-Troubleshooting.md
Outdated
| You can test whether you are hearing your signal correctly by doing the following: | ||
|
|
||
| 1. Get your audio into your computer. | ||
| 1. Connect your audio source (mic, instrument...) to your computer. |
There was a problem hiding this comment.
remark-lint reported some issues here. I think we might need to go through the whole wiki and fix syntax errors.
That's nothing you should need to worry about now.
There was a problem hiding this comment.
Yeah, I didn't have a clue what it was on about.
| 1. **A computer** running either **Windows 10**, **macOS** (**MacOS X** El Capitan v10.11 or higher), or **Linux**. | ||
| 1. **A wired internet connection** (don't use Wi-Fi, it will cause sound problems). Most broadband connections will be fine[^1]. | ||
| 1. **Wired headphones - not speakers** to prevent echo or feedback and to minimize delay[^2]. | ||
| 1. **Wired headphones - not speakers** to prevent echo or feedback and to minimise delay[^2]. |
There was a problem hiding this comment.
I think we already had a discussion about BE/AE and I think minimize is also ok in BE?
There was a problem hiding this comment.
Minimise is preferred in BE.
wiki/en/en-Installation-for-Linux.md
Outdated
| If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. | ||
|
|
||
| 1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/corrados/jamulus/releases/tag/latest) page | ||
| 1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/jamuluswebsite/jamulus/releases/tag/latest) page |
There was a problem hiding this comment.
We'll probably need to update this link once the release is made. Also apt --fix-broken install is needed on a clean machine. (Not sure if there's a cleaner way to install the dependencies...)
There was a problem hiding this comment.
Ideally we'd just tell people to install from their distribution, rather than from here. They'll likely feel happier about doing it, too, and once it's installed, it'll keep them up to date fairly easily.
We should advise people that many distributions do provide a current version of Jamulus and they only need build it themselves if either they want to get involved in development or their distribution doesn't supply it (and we'd appreciate volunteers for distributions taking on provision as a way of getting involved).
There was a problem hiding this comment.
Agree. #287 might be something we should include here? Probably the installation on Linux needs to be rewritten.
There was a problem hiding this comment.
The Linux installation stuff needs to be re-done now that we're in the repos properly, with compilation instructions relegated to a file in the repo I think (and just linked to in passing from the website).
But in the interests of time, can we keep as is? Release is coming soon...
wiki/en/en-Hardware-Setup.md
Outdated
| ## Points to note about inputs | ||
|
|
||
| - If you want to connect 2 or more sources (eg voice + synth + guitar), it is important to note that Jamulus currently handles only input 2 channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. | ||
| - If you want to connect 2 or more sources (e.g. voice + synth + guitar), it is important to note that Jamulus currently handles only 2 input channels (L/R). So the hardware being used must provide a mixed-down stereo output to Jamulus. |
There was a problem hiding this comment.
"Alternatively run two instances of Jamulus, if your hardware input supports it. Or use virtual audio inputs to Jamulus for each hardware input."
I don't mind keeping it simple - but the original is wrong in the sense it states that no other solution is possible.
There was a problem hiding this comment.
I was mainly sticking to revising existing text - but if the rest of you think that extra info should go in, I'll add it.
There was a problem hiding this comment.
I know what you mean - and I'm not going to hold up this improvement just because it doesn't get us 100% perfection in one hit :).
wiki/en/en-Installation-for-Linux.md
Outdated
| If you're on amd64 **Debian**/**Ubuntu**, you may try the compiled .deb packages from GitHub Actions. | ||
|
|
||
| 1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/corrados/jamulus/releases/tag/latest) page | ||
| 1. Download the jamulus_latest_ubuntu_amd64.deb file from the [Jamulus GitHub release](https://github.com/jamuluswebsite/jamulus/releases/tag/latest) page |
There was a problem hiding this comment.
Ideally we'd just tell people to install from their distribution, rather than from here. They'll likely feel happier about doing it, too, and once it's installed, it'll keep them up to date fairly easily.
We should advise people that many distributions do provide a current version of Jamulus and they only need build it themselves if either they want to get involved in development or their distribution doesn't supply it (and we'd appreciate volunteers for distributions taking on provision as a way of getting involved).
wiki/en/en-Software-Manual.md
Outdated
|  | ||
|
|
||
| The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators can optionally list their servers by musical genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. | ||
| The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. |
There was a problem hiding this comment.
It's not optional. All registered servers have a server list. Some of the server lists are genre-specific. There could be location-specific ones. But they're all on lists. I think this needs explaining more clearly.
There was a problem hiding this comment.
This is the client's manual don't forget, so we're talking about their view of that list. But maybe we can just drop that line so it reads:
"... the maximum number supported. Use the List dropdown to select a genre, click on the server..."
There was a problem hiding this comment.
Rephrased it. See what you reckon.
|
Getting there - I never see everything in one pass when reviewing... |
|
So shall I give this a merge? |
|
Any updates here? Ready to merge? |
|
I will merge this now. |
5 participants
I'm making a pull request to the 'changes' branch as many of the edits need to be included in the translations (e.g. corrected website addresses). Many corrections are just of typos, but in other instances sentences have been changed where I thought they were too vague - though suggestions are welcome.