From c810b16f0b24465990c2ef83c01d635c2f8aab09 Mon Sep 17 00:00:00 2001 From: Mike Brady Date: Fri, 21 Jun 2019 22:59:18 +0100 Subject: [PATCH 01/26] Typo fix --- UPDATING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING.md b/UPDATING.md index 31b87526..66916847 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -61,5 +61,5 @@ Your Shairport Sync should be upgraded now. ``` $ sudo amixer sset unmute ``` -Alternatively you can use `alsamixer`. A muted output has the letter(s) `M` as its value. Select it an type `M` again to unmute. +Alternatively you can use `alsamixer`. A muted output has the letter(s) `M` as its value. Select it and type `M` again to unmute. From 3a386a6a6b2a4f8f761f01f1e6556ad6fc91c263 Mon Sep 17 00:00:00 2001 From: Chris Boot Date: Thu, 18 Jul 2019 16:11:04 -0300 Subject: [PATCH 02/26] Fix some typos and spelling errors --- RELEASENOTES.md | 2 +- common.h | 2 +- man/shairport-sync.7.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2e97e747..6dd6b2f7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -910,7 +910,7 @@ Version 2.3.1 Some big changes "under the hood" have been made, leading to limited support for unsynchronised output to `stdout` or to a named pipe and continuation of defacto support for unsynchronised PulseAudio. Also, support for a configuration file in preference to command line options, an option to ignore volume control and other improvements are provided. In this release, Shairport Sync gains the ability to read settings from `/etc/shairport-sync.conf`. -This gives more flexibility in adding features gives better compatability across different versions of Linux. +This gives more flexibility in adding features gives better compatibility across different versions of Linux. Existing command-line options continue to work, but some will be deprecated and may disappear in a future version of Shairport Sync. New settings will only be available via the configuration file. Note that, for the present, settings in the configuration will have priority over command line options for Shairport Sync itself, in contravention of the normal unix convention. Audio back end command line options, i.e. those after the `--`, have priority over configuration file settings for the audio backends. diff --git a/common.h b/common.h index ae7f5cd3..a80a8f97 100644 --- a/common.h +++ b/common.h @@ -162,7 +162,7 @@ typedef struct { int allow_session_interruption; int timeout; // while in play mode, exit if no packets of audio come in for more than this number // of seconds . Zero means never exit. - int dont_check_timeout; // this is used to maintain backward compatability with the old -t option + int dont_check_timeout; // this is used to maintain backward compatibility with the old -t option // behaviour; only set by -t 0, cleared by everything else char *output_name; audio_output *output; diff --git a/man/shairport-sync.7.xml b/man/shairport-sync.7.xml index 199e97fd..993a85ce 100644 --- a/man/shairport-sync.7.xml +++ b/man/shairport-sync.7.xml @@ -111,7 +111,7 @@ i.e. the System Configuration Directory.)

-

Within the configuraton file, settings are organised into groups, for +

Within the configuration file, settings are organised into groups, for example, there is a "general" group of standard settings, and there is an "alsa" group with settings that pertain to the ALSA back end. Here is an example of a typical configuration file:

@@ -223,7 +223,7 @@