Merge branch 'development' 3.3rc7+ to 'master'

1 files changed, 14 insertions, 15 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 15a1c64..33058c8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,11 +7,10 @@ In the commands below, note the convention that a `#` prompt means you are in su
 ### Configure and Update
 Do the usual update and upgrade:
 ```
-# apt update
-# apt upgrade
+# apt-get update
+# apt-get upgrade
+# rpi-update
 ``` 
-**Note:** The upgrade step above will automatically update to the most recent stable Rapsberry Pi firmware.
-
 (Separately, if you haven't done so already, consider using the `raspi-config` tool to expand the file system to use the entire card.)
 
 ### Turn Off WiFi Power Management
@@ -19,14 +18,14 @@ If you are using WiFi, you should turn off WiFi Power Management:
 ```
 # iwconfig wlan0 power off
 ```
-WiFi Power Management will put the WiFi system in low-power mode when the WiFi system is considered inactive, and in this mode it may not respond to events initiated from the network, such as AirPlay requests. Hence, WiFi Power Management should be turned off. (See [TROUBLESHOOTING.md](https://github.com/mikebrady/shairport-sync/blob/master/TROUBLESHOOTING.md#wifi-adapter-running-in-power-saving--low-power-mode) for more details.)
+WiFi Power Management will put the WiFi system in low-power mode when the WiFi system considered inactive, and in this mode it may not respond to events initiated from the network, such as AirPlay requests. Hence, WiFi Power Management should be turned off. (See [TROUBLESHOOTING.md](https://github.com/mikebrady/shairport-sync/blob/master/TROUBLESHOOTING.md#wifi-adapter-running-in-power-saving--low-power-mode) for more details.)
 
 Reboot the Pi.
 
-### Remove Old Copies and Old Startup Scripts
-Before you begin building Shairport Sync, it's best to search for and remove any existing copies of the application, called `shairport-sync`. Use the command `$ which -a shairport-sync` to find them. For example, if `shairport-sync` has been installed previously, this might happen:
+### Remove Old Copies
+Before you begin building Shairport Sync, it's best to search for and remove any existing copies of the application, called `shairport-sync`. Use the command `$ which shairport-sync` to find them. For example, if `shairport-sync` has been installed previously, this might happen:
 ```
-$ which -a shairport-sync
+$ which shairport-sync
 /usr/local/bin/shairport-sync
 ```
 Remove it as follows:
@@ -35,22 +34,20 @@ Remove it as follows:
 ```
 Do this until no more copies of `shairport-sync` are found.
 
-You should also remove the initialisation script files `/etc/systemd/system/shairport-sync.service` and `/etc/init.d/shairport-sync` if they exist – new ones will be installed if necessary.
-
 ### Build and Install
 Okay, now let's get the tools and sources for building and installing Shairport Sync.
 
 First, install the packages needed by Shairport Sync:
 ```
-# apt install build-essential git xmltoman autoconf automake libtool libdaemon-dev \
-    libpopt-dev libconfig-dev libasound2-dev avahi-daemon libavahi-client-dev libssl-dev
+# apt-get install build-essential git xmltoman autoconf automake libtool \
+    libpopt-dev libconfig-dev libasound2-dev avahi-daemon libavahi-client-dev libssl-dev libsoxr-dev
 ```
 Next, download Shairport Sync, configure it, compile and install it:
 ```
 $ git clone https://github.com/mikebrady/shairport-sync.git
 $ cd shairport-sync
 $ autoreconf -fi
-$ ./configure --sysconfdir=/etc --with-alsa --with-avahi --with-ssl=openssl --with-systemd
+$ ./configure --sysconfdir=/etc --with-alsa --with-soxr --with-avahi --with-ssl=openssl --with-systemd
 $ make
 $ sudo make install
 ```
@@ -61,7 +58,7 @@ Now to configure Shairport Sync. Here are the important options for the Shairpor
 // Sample Configuration File for Shairport Sync on a Raspberry Pi using the built-in audio DAC
 general =
 {
-  volume_range_db = 60;
+  volume_range_db = 60; 
 };
 
 alsa =
@@ -71,6 +68,8 @@ alsa =
 };
 
 ```
+The `volume_range_db = 60;` setting makes Shairport Sync use only the usable part of the built-in audio card mixer's attenuation range.
+
 The next step is to enable Shairport Sync to start automatically on boot up:
 ```
 # systemctl enable shairport-sync
@@ -79,6 +78,6 @@ Finally, either reboot the Pi or start the `shairport-sync` service:
 ```
 # systemctl start shairport-sync
 ```
-The Shairport Sync AirPlay service should now appear on the network with a service name made from the Pi's hostname with the first letter capitalised, e.g. hostname `raspberrypi` gives a service name `Raspberrypi`. You can change the service name and set a password in the configuration file. BTW, you should *never* use an important password as the AirPlay password for a Shairport Sync player – the password is stored in Shairport Sync's configuration file in plain text and is thus completely vulnerable.
+The Shairport Sync AirPlay service should now appear on the network with a service name made from the Pi's hostname with the first letter capitalised, e.g. hostname `raspberrypi` gives a service name `Raspberrypi`. You can change the service name and set a password in the configuration file.
 
 Connect and enjoy...