aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO6
-rw-r--r--UPGRADING4
-rw-r--r--doc/COMMANDS2
-rw-r--r--doc/mpd.conf.52
4 files changed, 7 insertions, 7 deletions
diff --git a/TODO b/TODO
index c6a29b30a..deca35e93 100644
--- a/TODO
+++ b/TODO
@@ -38,7 +38,7 @@
*) while pausing, play silence for the devices that don't support
"pausing"
*) write a sun native audioOutput
- *) more accurate time reporting by determing how much of audio_device
+ *) more accurate time reporting by determining how much of audio_device
buffer has been played
*) state
@@ -74,7 +74,7 @@ post-1.0
*) use pull model for audio_output
*) threads
0) managing thread
- *) recieves commands
+ *) receives commands
*) manages state
*) handles time/metadata sending
1) decoding thread
@@ -85,7 +85,7 @@ post-1.0
*) thread for each audio_output device
*) dynamic metadata
- *) implment by recording the ftell positions of entries
+ *) implement by recording the ftell positions of entries
*) buffer changes and flush them once every 60 seconds
*) buffer changes while doing an update
*) be sure to check that the metadata "header" is what we expect
diff --git a/UPGRADING b/UPGRADING
index 8c6300f8f..a2079576d 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -9,7 +9,7 @@ any changes. However, if you downgrade back to 0.10.x, then you will need
to recreate your db.
The default port for MPD is now 6600, so update your mpd and client
-configurations appropriatly.
+configurations appropriately.
Upgrading to 0.10.0
-------------------
@@ -21,7 +21,7 @@ recommended that you recreate the db. To do so, run mpd with the
character set will be determined from your current locale settings.
If your locale settings are not the same as those used for the filesystem,
then use the config file parameter "filesystem_charset" to specify the
-correct character set (this maybe neccessary if you create the db with root).
+correct character set (this maybe necessary if you create the db with root).
Upgrading to 0.9.3
------------------
diff --git a/doc/COMMANDS b/doc/COMMANDS
index cdd234183..652e31511 100644
--- a/doc/COMMANDS
+++ b/doc/COMMANDS
@@ -244,7 +244,7 @@ update <string path>
in status, while the requested update is happening
increments playlist version by 1
NOTE: To update a number of paths/songs at once, use command_list,
- it will be much more faster/effecient. Also, if you use a
+ it will be much more faster/efficient. Also, if you use a
command_list for updating, only one update_db job id will be returned
per sequence of updates.
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 2b3d174fa..f6bf12fd9 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -138,7 +138,7 @@ This specifies the port that mpd listens on. The default is 6600.
.TP
.B password <password@permissions>
This specifies a password for access to mpd. The format is
-"password@permissions" where permissions is a comma delimmitted list composed
+"password@permissions" where permissions is a comma delimited list composed
of "read", "add", "control", and/or "admin". "read" allows for reading of the
database, displaying the current playlist, and current status of mpd. "add"
allows for adding songs and loading playlists. "control" allows for all other