diff --git a/wiki/en/Directories.md b/wiki/en/Directories.md index b29eb84d1..3efc9b453 100644 --- a/wiki/en/Directories.md +++ b/wiki/en/Directories.md @@ -10,7 +10,7 @@ permalink: "/wiki/Directories" # Running a Directory -This is a specialised Jamulus Server configuration, as described in [Server Types](Running-a-Server#server-modes). +This is a specialised Jamulus Server configuration, as described in [Server Modes](Running-a-Server#server-modes). To view Servers listed by a Custom Directory, users must enter the address of that Directory in their Client's Settings > Advanced Setup > Custom Directories field. Multiple addresses can be added in this way if needed. Custom Directories will then appear in the Directory drop-down list on their Connect window. Custom Directories otherwise work for Clients in the same way as Public Directories, displaying a list of Servers registered with them. diff --git a/wiki/en/Installation-for-Linux.md b/wiki/en/Installation-for-Linux.md index 134881cea..fcbebbb2d 100644 --- a/wiki/en/Installation-for-Linux.md +++ b/wiki/en/Installation-for-Linux.md @@ -15,7 +15,7 @@ Make sure you read the [Getting Started](Getting-Started) page. **Upgrading?** You may want to [back up your configuration](Software-Manual#backing-up-jamulus) first. -**Installing a server?** Read the [guide for server adminstrators](Running-a-Server) first. +**Installing a server?** Read the [guide for server adminstrators](Running-a-Server) first. ### Debian and Ubuntu @@ -28,9 +28,9 @@ After you downloaded the correct file: 1. *Ubuntu only* - Enable the Ubuntu "universe" repository (you can use the [GUI-based approach](https://askubuntu.com/a/148645) or [CLI-based approach](https://askubuntu.com/a/227788)). 1. Update apt by opening a console window (CTRL+ALT+T should work) and type: `sudo apt-get update` -1. Go to where you downloaded the installer and either double-click on it, or use the command line: +1. Go to where you downloaded the installer and either double-click on it, or use the command line: - `sudo apt install ./{{ site.download_file_names.deb-gui }}` (or for Raspberry Pi etc. as above) + `sudo apt install ./{{ site.download_file_names.deb-gui }}` (or for Raspberry Pi etc. as above) 1. Once installed, you can delete the file and close any console windows. **Upgrades:** If you need to upgrade Jamulus to a newer version, just download the new .deb file and re-install as above. @@ -44,6 +44,7 @@ For installers on other distributions, see their package managers and [Repology] ### Configure JACK with QjackCtl Jamulus Clients need [JACK](https://jackaudio.org/) to run, but you need to configure that first. The recommended method is to use `QjackCtl`. + 1. Launch QjackCtl. You will see the **Qt JACK Control utility main page** 2. Configure your audio hardware as follows (the exact settings for JACK will depend on what your audio hardware is capable of): diff --git a/wiki/en/Installation-for-Macintosh.md b/wiki/en/Installation-for-Macintosh.md index 91e485a0d..df9adbd4f 100644 --- a/wiki/en/Installation-for-Macintosh.md +++ b/wiki/en/Installation-for-Macintosh.md @@ -30,6 +30,7 @@ _You can remove the folder in the Downloads directory containing the `.dmg` and If you are using the "legacy" version of Jamulus (because you are running an older version of macOS), the first time you run Jamulus, you will see a message saying it cannot be opened. To open Jamulus + 1. Go to the Applications folder via Finder 1. Double-click on Jamulus and wait for the above-mentioned message 1. Close this message by clicking on "Cancel" diff --git a/wiki/en/Installation-for-Windows.md b/wiki/en/Installation-for-Windows.md index 4e913cb7e..6a724baad 100644 --- a/wiki/en/Installation-for-Windows.md +++ b/wiki/en/Installation-for-Windows.md @@ -52,6 +52,7 @@ You may or may not need to experiment a bit depending on your sound hardware. If Before you start with Jamulus: + 1. **Close all applications** (especially those which could access your sound card like your browser/media player). ASIO4ALL needs exclusive access to your sound card which means that other programs will not be able to use audio if ASIO4ALL and Jamulus are running. 1. If the Jamulus audio doesn’t work out of the box, make sure that only the **correct inputs/outputs** in ASIO4ALL **are switched on**. Everything else should be switched off. Search the [community list of working ASIO4ALL configurations](/kb/2021/03/20/ASIO4ALL-Examples.html) for your configuration or do it manually if you can't find yours: diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index 712d3d973..bd15535b4 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -136,7 +136,7 @@ Any settings made using the graphical interface will be stored in the `Jamulusse ##### `-e or --directoryserver` -Required for a [Registered Server](Running-a-Server#2-registered). Also required to run Jamulus as a [Directory](Directories). +Required for a [Registered Server](Running-a-Server#registered-mode). Also required to run Jamulus as a [Directory](Directories). This option takes the format: