Fix error in the xml and recompile man and htmp files

3 files changed, 40 insertions, 6 deletions

diff --git a/man/shairport-sync.7 b/man/shairport-sync.7
index 1acbade..d7c0577 100644
--- a/man/shairport-sync.7
+++ b/man/shairport-sync.7
@@ -2,7 +2,7 @@
 .SH NAME
 shairport-sync \- Synchronised Audio Player for iTunes / AirPlay
 .SH SYNOPSIS
-\fBshairport-sync [-dvw]\fB [-a \fB\fIname\fB]\fB [-A \fB\fIlatency\fB]\fB [-B \fB\fIcommand\fB]\fB [-E \fB\fIcommand\fB]\fB [--forkedDaapdLatency=\fB\fIlatency\fB]\fB [-i \fB\fIlatency\fB]\fB [-L \fB\fIlatency\fB]\fB [-m \fB\fIbackend\fB]\fB [-o \fB\fIbackend\fB]\fB [--password=\fB\fIsecret\fB]\fB [-r \fB\fIthreshold\fB]\fB [--statistics]\fB [-S \fB\fImode\fB]\fB [-t \fB\fItimeout\fB]\fB [--tolerance=\fB\fIframes\fB]\fB [-- \fB\fIaudio_backend_options\fB]\fB
+\fBshairport-sync [-dvw]\fB [-a \fB\fIname\fB]\fB [-A \fB\fIlatency\fB]\fB [-B \fB\fIcommand\fB]\fB [-E \fB\fIcommand\fB]\fB [--forkedDaapdLatency=\fB\fIlatency\fB]\fB [--get-cover-art]\fB [-i \fB\fIlatency\fB]\fB [-L \fB\fIlatency\fB]\fB [-m \fB\fIbackend\fB]\fB [--meta-dir=\fB\fIdirectory\fB]\fB [-o \fB\fIbackend\fB]\fB [--password=\fB\fIsecret\fB]\fB [-r \fB\fIthreshold\fB]\fB [--statistics]\fB [-S \fB\fImode\fB]\fB [-t \fB\fItimeout\fB]\fB [--tolerance=\fB\fIframes\fB]\fB [-- \fB\fIaudio_backend_options\fB]\fB
 
 shairport-sync -D\fB
 
@@ -52,6 +52,11 @@ If you want shairport-sync to wait until the command has completed before contin
 \fB--forkedDaapdLatency=\f1\fIlatency\f1
 Use this \fIlatency\f1, in frames, for audio streamed from a forked-daapd based source. The default is 99,400 frames, where there are 44,100 frames to the second. 
 .TP
+\fB--get-coverart\f1
+This option requires the \fB--meta-dir\f1 option to be set, and enables shairport-sync to request cover art from the source and to transmit it through the metadata pipe.
+
+Please note that cover art data may be very large, and may place too great a burden on your network. Also, at the time of writing, there appears to be a serious bug in iTunes which stalls transmission of large cover art items, stalling and potentially crashing shairport-sync. 
+.TP
 \fB-h | --help\f1
 Print brief help message and exit. 
 .TP
@@ -64,6 +69,9 @@ Kill the shairport-sync daemon and exit. (Requires that the daemon has written i
 \fB-L | --latency=\f1\fIlatency\f1
 Use this to set the \fIdefault latency\f1, in frames, for audio coming from an unidentified source or from an iTunes Version 9 or earlier source. The standard value for the \fIdefault latency\f1 is 88,200 frames, where there are 44,100 frames to the second. 
 .TP
+\fB--meta-dir=\f1\fIdirectory\f1
+Listen for metadata coming from the source and send it, along with metadata from shairport-sync itself, to a pipe called \fIshairport-sync-metadata\f1 in the \fIdirectory\f1 you specify. If you add the \fB--get-cover-art\f1 then cover art will be sent through the pipe too. See https://github.com/mikebrady/shairport-sync-metadata-reader for a sample metadata reader. 
+.TP
 \fB-m \f1\fImdnsbackend\f1\fB | --mdns=\f1\fImdnsbackend\f1
 Force the use of the specified mDNS backend to advertise the player on the network. The default is to try all mDNS backends until one works. 
 .TP
@@ -91,7 +99,7 @@ Stuff the audio stream using the \fImode\f1. "Stuffing" refers to the process of
 \fB-t \f1\fItimeout\f1\fB | --timeout=\f1\fItimeout\f1
 Exit play mode if the stream disappears for more than \fItimeout\f1 seconds.
 
-When shairport-sync plays an audio stream, it startes a play session and will return a busy signal to any other sources that attempt to use it. If the audio stream disappears for longer than \fItimeout\f1 seconds, the play session will be terminated. If you specify a timeout time of \fB0\f1, shairport-sync will never signal that it is busy and will not prevent other sources from "barging in" on an existing play session. The default value is 120 seconds. 
+When shairport-sync plays an audio stream, it starts a play session and will return a busy signal to any other sources that attempt to use it. If the audio stream disappears for longer than \fItimeout\f1 seconds, the play session will be terminated. If you specify a timeout time of \fB0\f1, shairport-sync will never signal that it is busy and will not prevent other sources from "barging in" on an existing play session. The default value is 120 seconds. 
 .TP
 \fB--tolerance=\f1\fIframes\f1
 Allow playback to be up to \fIframes\f1 out of exact synchronization before attempting to correct it. The default is 88 frames, i.e. 2 ms. The smaller the tolerance, the more likely it is that overcorrection will occur. Overcorrection is when more corrections (insertions and deletions) are made than are strictly necessary to keep the stream in sync. Use the \fB--statistics\f1 option to monitor correction levels. Corrections should not greatly exceed net corrections. 
diff --git a/man/shairport-sync.7.xml b/man/shairport-sync.7.xml
index da57360..8b7685e 100644
--- a/man/shairport-sync.7.xml
+++ b/man/shairport-sync.7.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!--
+  <!--
   This man pager source file is part of shairport-sync.
-  Copyright (c) Mike Brady 2014--2015
+  Copyright (c) Mike Brady 2014-2015
 
   All rights reserved.
  
@@ -27,7 +27,7 @@
   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
--->
+  -->
 
   <manpage name="shairport-sync" section="7" desc="Synchronised Audio Player for iTunes / AirPlay">
 
diff --git a/man/shairport-sync.html b/man/shairport-sync.html
index 5cc6f56..1662968 100644
--- a/man/shairport-sync.html
+++ b/man/shairport-sync.html
@@ -12,9 +12,11 @@
       <b>[-B </b><em>command</em><b>]</b>
       <b>[-E </b><em>command</em><b>]</b>
       <b>[--forkedDaapdLatency=</b><em>latency</em><b>]</b>
+      <b>[--get-cover-art]</b>
       <b>[-i </b><em>latency</em><b>]</b>
       <b>[-L </b><em>latency</em><b>]</b>
       <b>[-m </b><em>backend</em><b>]</b>
+      <b>[--meta-dir=</b><em>directory</em><b>]</b>
       <b>[-o </b><em>backend</em><b>]</b>
       <b>[--password=</b><em>secret</em><b>]</b>
       <b>[-r </b><em>threshold</em><b>]</b>
@@ -144,6 +146,19 @@
     frames to the second.
     </p>
 	  
+	  
+	  
+		<p><b>--get-coverart</b></p>
+		<p>
+		This option requires the <b>--meta-dir</b> option to be set, and enables
+		shairport-sync to request cover art from the source and to transmit it through
+		the metadata pipe.</p>
+		<p>Please note that cover art data may be very large, and may place too great a
+		burden on your network. Also, at the time of writing, there appears to be a
+		serious bug in iTunes which stalls transmission of large cover art items,
+		stalling and potentially crashing shairport-sync.
+    </p>
+	  
 
 	  
 		<p><b>-h | --help</b></p>
@@ -178,6 +193,17 @@
 	  
 
 	  
+		<p><b>--meta-dir=</b><em>directory</em></p>
+		<p>
+		Listen for metadata coming from the source and send it, along with metadata from
+		shairport-sync itself, to a pipe called <em>shairport-sync-metadata</em>
+		in the <em>directory</em> you specify. If you add the <b>--get-cover-art</b> then
+		cover art will be sent through the pipe too. See https://github.com/mikebrady/shairport-sync-metadata-reader
+		for a sample metadata reader.
+		</p>
+	  
+
+	  
 		<p><b>-m </b><em>mdnsbackend</em><b> | --mdns=</b><em>mdnsbackend</em></p>
 		<p>
 		Force the use of the specified mDNS backend to advertise the
@@ -258,7 +284,7 @@
 		<p>
 		Exit play mode if the stream disappears for  more  than  <em>timeout</em>
     seconds.</p>
-    <p>When shairport-sync plays an audio stream, it startes a play
+    <p>When shairport-sync plays an audio stream, it starts a play
     session and will return a busy signal to any other sources that
     attempt to use it. If the audio stream disappears for longer
     than <em>timeout</em> seconds, the play session will be terminated.