aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-21 19:39:08 +0100
committerMax Kellermann <max@duempel.org>2008-12-21 19:39:08 +0100
commitbc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263 (patch)
tree4fe1de8f00a14274b9146d48a4addb18b49acf1b /README
parenta6e981c08d8f37e86bb6040d23486fd18b05d111 (diff)
parent143b46caf527ca8e53c186db751930ad1d343b4d (diff)
downloadmpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.gz
mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.xz
mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.zip
Merge branch 'master' of git://git.musicpd.org/avuton/mpd
Conflicts: doc/mpdconf.example
Diffstat (limited to 'README')
-rw-r--r--README17
1 files changed, 9 insertions, 8 deletions
diff --git a/README b/README
index b6c4740a4..bc3cbc18f 100644
--- a/README
+++ b/README
@@ -1,16 +1,17 @@
- Music Player Daemon (MPD)
- http://www.musicpd.org
+ Music Player Daemon (MPD)
+ http://www.musicpd.org
A daemon for playing music of various formats. Music is played through the
server's audio device. The daemon stores info about all available music,
and this info can be easily searched and retrieved. Player control, info
retrieval, and playlist management can all be managed remotely.
-To install MPD, see INSTALL.
+For basic installation information see the INSTALL file.
+
+MPD is released under the GNU General Public License version 2, which is
+distributed in the COPYING file.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http://www.gnu.org/licenses/>.
-MPD is released under the GNU General Public License version 2.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-For the full license, see COPYING.