Index: wp-includes/cache.php
===================================================================
--- wp-includes/cache.php	(revision 12644)
+++ wp-includes/cache.php	(working copy)
@@ -12,8 +12,7 @@
  * Adds data to the cache, if the cache key doesn't aleady exist.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::add()
+ * @global WP_Object_Cache WordPress Object Cache
  *
  * @param int|string $key The cache ID to use for retrieval later
  * @param mixed $data The data to add to the cache store
@@ -22,6 +21,7 @@
  * @return unknown
  */
 function wp_cache_add($key, $data, $flag = '', $expire = 0) {
+	/* @var $wp_object_cache WP_Object_Cache */
 	global $wp_object_cache;
 
 	return $wp_object_cache->add($key, $data, $flag, $expire);
@@ -47,14 +47,14 @@
  * Removes the cache contents matching ID and flag.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::delete()
+ * @global WP_Object_Cache WordPress Object Cache
  *
  * @param int|string $id What the contents in the cache are called
  * @param string $flag Where the cache contents are grouped
  * @return bool True on successful removal, false on failure
  */
 function wp_cache_delete($id, $flag = '') {
+	/* @var $wp_object_cache WP_Object_Cache */
 	global $wp_object_cache;
 
 	return $wp_object_cache->delete($id, $flag);
@@ -64,12 +64,12 @@
  * Removes all cache items.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::flush()
+ * @global WP_Object_Cache WordPress Object Cache
  *
- * @return bool Always returns true
+ * @return bool true
  */
 function wp_cache_flush() {
+	/* @var $wp_object_cache WP_Object_Cache */
 	global $wp_object_cache;
 
 	return $wp_object_cache->flush();
@@ -79,15 +79,15 @@
  * Retrieves the cache contents from the cache by ID and flag.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::get()
+ * @global WP_Object_Cache WordPress Object Cache
  *
  * @param int|string $id What the contents in the cache are called
  * @param string $flag Where the cache contents are grouped
  * @return bool|mixed False on failure to retrieve contents or the cache
  *		contents on success
- */
+  */
 function wp_cache_get($id, $flag = '') {
+	/* @var $wp_object_cache WP_Object_Cache */
 	global $wp_object_cache;
 
 	return $wp_object_cache->get($id, $flag);
@@ -97,7 +97,6 @@
  * Sets up Object Cache Global and assigns it.
  *
  * @since 2.0.0
- * @global WP_Object_Cache $wp_object_cache WordPress Object Cache
  */
 function wp_cache_init() {
 	$GLOBALS['wp_object_cache'] =& new WP_Object_Cache();
@@ -107,8 +106,7 @@
  * Replaces the contents of the cache with new data.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::replace()
+ * @global WP_Object_Cache WordPress Object Cache
  *
  * @param int|string $id What to call the contents in the cache
  * @param mixed $data The contents to store in the cache
@@ -117,6 +115,7 @@
  * @return bool False if cache ID and group already exists, true on success
  */
 function wp_cache_replace($key, $data, $flag = '', $expire = 0) {
+	/* @var $wp_object_cache WP_Object_Cache */
 	global $wp_object_cache;
 
 	return $wp_object_cache->replace($key, $data, $flag, $expire);
@@ -126,8 +125,7 @@
  * Saves the data to the cache.
  *
  * @since 2.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::set()
+ * @global WP_Object_Cache WordPress Object Cache
  *
  * @param int|string $id What to call the contents in the cache
  * @param mixed $data The contents to store in the cache
@@ -136,6 +134,7 @@
  * @return bool False if cache ID and group already exists, true on success
  */
 function wp_cache_set($key, $data, $flag = '', $expire = 0) {
+	/* @var $wp_object_cache WP_Object_Cache */	
 	global $wp_object_cache;
 
 	return $wp_object_cache->set($key, $data, $flag, $expire);
@@ -279,7 +278,7 @@
 	 *
 	 * @since 2.0.0
 	 *
-	 * @return bool Always returns true
+	 * @return bool true
 	 */
 	function flush() {
 		$this->cache = array ();
@@ -449,4 +448,5 @@
 		return true;
 	}
 }
-?>
+
+?>
\ No newline at end of file