Merge branch 'master' of git://git.musicpd.org/avuton/mpd

Conflicts:

	doc/mpdconf.example

1 files changed, 24 insertions, 8 deletions

diff --git a/INSTALL b/INSTALL
index b1a24fd06..cb58a5cd0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,12 @@
                        Music Player Daemon (MPD) - INSTALL
 
 
+Introduction
+------------
+This document is a very small amount of documentation about what is needed to 
+install MPD. If more information is desired see the community wiki at 
+http://mpd.wikia.com.
+
 Dependencies
 ------------
 
@@ -28,6 +34,18 @@ ALSA - http://www.alsa-project.org/
 The Advanced Linux Sound Architecture.  Recommended audio output if you use
 Linux.  You will need libasound.
 
+FIFO
+This is a mostly undocumented, developer plugin to transmit raw data.
+
+MVP - http://en.wikipedia.org/wiki/Hauppauge_MediaMVP
+A network media player.
+
+OSS - http://www.opensound.com
+Open Sound System.
+
+OSX - http://www.apple.com
+Necessary if you are on Mac OSX.
+
 PulseAudio - http://www.pulseaudio.org/
 An advanced sound daemon.  You will need libpulse.
 
@@ -144,16 +162,14 @@ Run
 
 $ mpd <config file>
 
-(if no config file is specified, mpd's looks for ~/.mpdconf then /etc/mpd.conf)
-
-an example would be:
-
-$ mpd playlists/.mpdconf
+First default is ~/.mpdconf then /etc/mpd.conf. If neither of these exist
+a mpd configuration file must be specified at runtime. A
 
-A sample config file is included with the source of MPD, mpdconf.example .
+A sample config file is included with the source of MPD, mpdconf.example.
 
-Note: The first time you run mpd, it will "explore" your mp3 directory for
-mp3's.
+The first time MPD is run it will attempt to discover all music in your
+music root, recursively. This can be affected by the symbolic link 
+options specified in the example mpd.conf.
 
 Using MPD
 ---------