diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp
index 3945325d5..7844eed68 100644
--- a/trunk/src/core/srs_core_autofree.hpp
+++ b/trunk/src/core/srs_core_autofree.hpp
@@ -27,7 +27,7 @@
 #include <srs_core.hpp>
 
 /**
- * auto free the instance in the current scope, for instance, MyClass* ptr,
+ * To free the instance in the current scope, for instance, MyClass* ptr,
  * which is a ptr and this class will:
  *       1. free the ptr.
  *       2. set ptr to NULL.
@@ -56,9 +56,6 @@ private:
     T** ptr;
     bool is_array;
 public:
-    /**
-     * auto delete the ptr.
-     */
     impl_SrsAutoFree(T** p, bool array) {
         ptr = p;
         is_array = array;
diff --git a/trunk/src/core/srs_core_mem_watch.hpp b/trunk/src/core/srs_core_mem_watch.hpp
index 580007372..7339d5c6a 100644
--- a/trunk/src/core/srs_core_mem_watch.hpp
+++ b/trunk/src/core/srs_core_mem_watch.hpp
@@ -28,15 +28,17 @@
 
 #ifdef SRS_AUTO_MEM_WATCH
 
+#warning "MemoryWatch is deprecated."
+
 #include <string>
 
-// watch the specified memory.
+// Watch the specified memory.
 extern void srs_memory_watch(void* ptr, std::string category, int size);
 
-// unwatch the specified memory.
+// Unwatch the specified memory.
 extern void srs_memory_unwatch(void* ptr);
 
-// report the memory watch.
+// Report the memory watch.
 extern void srs_memory_report();
 
 #endif