Cosmetics. %s/assoicated/associated/g

7 files changed, 10 insertions, 10 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 68d823a9..52a63525 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -151,7 +151,7 @@
 	- Added lyricswiki link Ticket #70
 	- Updated README language
 	- Updated getid3 library 2.0.0b4 to 2.0.0b5
-	- Make the Democratic playlist be assoicated with the user
+	- Make the Democratic playlist be associated with the user
 		who sends it to a 'player' 
 	- Fixed missing page headers on democratic playlist
 	- Show who voted for the sogns on democratic playlist
diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index 5c2575fd..fc42a9fe 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -398,7 +398,7 @@ class Api {
 
 	/**
 	 * tag_artists
-	 * This returns the artists assoicated with the tag in question as defined by the UID
+	 * This returns the artists associated with the tag in question as defined by the UID
 	 */
 	public static function tag_artists($input) {
 
@@ -414,7 +414,7 @@ class Api {
 
 	/**
 	 * tag_albums
-	 * This returns the albums assoicated with the tag in question
+	 * This returns the albums associated with the tag in question
 	 */
 	public static function tag_albums($input) {
 
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 2c62427c..2bce9b51 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -190,7 +190,7 @@ class Catalog extends database_object {
 	/**
 	 * get_stats
 	 * This returns an hash with the #'s for the different
-	 * objects that are assoicated with this catalog. This is used
+	 * objects that are associated with this catalog. This is used
 	 * to build the stats box, it also calculates time
 	 */
 	public static function get_stats($catalog_id=0) {
@@ -1711,7 +1711,7 @@ class Catalog extends database_object {
 
 	/**
 	 * clean_tags
-	 * This cleans out tag_maps that are not assoicated with a 'living' object
+	 * This cleans out tag_maps that are not associated with a 'living' object
 	 * and then cleans the tags that have no maps
 	 */
 	public static function clean_tags() {
@@ -2604,7 +2604,7 @@ class Catalog extends database_object {
 
 	/**
 	 * delete
-	 * Deletes the catalog and everything assoicated with it
+	 * Deletes the catalog and everything associated with it
 	 * it takes the catalog id
 	 */
 	public static function delete($catalog_id) {
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 1e30ae3d..dc19b7f0 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -173,7 +173,7 @@ class Dba {
 
 	/**
 	 * finish
-	 * This closes a result handle and clears the memory assoicated with it
+	 * This closes a result handle and clears the memory associated with it
 	 */
 	public static function finish($resource) {
 
diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php
index 6c1bf145..685d7d7b 100644
--- a/lib/class/shoutbox.class.php
+++ b/lib/class/shoutbox.class.php
@@ -127,7 +127,7 @@ class shoutBox {
 	/**
 	 * get_image
 	 * This returns an image tag if the type of object we're currently rolling with
-	 * has an image assoicated with it
+	 * has an image associated with it
 	 */
 	public function get_image() {
 
diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php
index 5fb6cc18..83548e36 100644
--- a/lib/class/tag.class.php
+++ b/lib/class/tag.class.php
@@ -454,7 +454,7 @@ class Tag extends database_object {
 
 	/**
 	 * count
-	 * This returns the count for the all objects assoicated with this tag
+	 * This returns the count for the all objects associated with this tag
 	 * If a type is specific only counts for said type are returned
 	 */
 	public function count($type='') {
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index f4bc68b5..0c5c0653 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -915,7 +915,7 @@ class User extends database_object {
 
 	/**
 	 * delete
-	 * deletes this user and everything assoicated with it. This will affect
+	 * deletes this user and everything associated with it. This will affect
 	 * ratings and tottal stats
 	 */
 	public function delete() {