Merge pull request #3742 from mlepage/develop

Clean up some API documentation

cocos2dx/CCDirector.h

@@ -59,7 +59,7 @@ class KeypadDispatcher;
 class Accelerometer;
 
 /**
-@brief Class that creates and handle the main Window and manages how
+@brief Class that creates and handles the main Window and manages how
 and when to execute the Scenes.
  
  The Director is also responsible for:
@@ -117,7 +117,7 @@ public:
 
     // attribute
 
-    /** Get current running Scene. Director can only run one Scene at the time */
+    /** Get current running Scene. Director can only run one Scene at a time */
     inline Scene* getRunningScene() { return _runningScene; }
 
     /** Get the FPS value */
@@ -178,7 +178,7 @@ public:
     Node* getNotificationNode();
     void setNotificationNode(Node *node);
     
-    /** Director delegate. It shall implemente the DirectorDelegate protocol
+    /** Director delegate. It shall implement the DirectorDelegate protocol
      @since v0.99.5
      * @js NA
      * @lua NA
@@ -240,20 +240,20 @@ public:
      */
     void pushScene(Scene *scene);
 
-    /** Pops out a scene from the queue.
+    /** Pops out a scene from the stack.
      * This scene will replace the running one.
      * The running scene will be deleted. If there are no more scenes in the stack the execution is terminated.
      * ONLY call it if there is a running scene.
      */
     void popScene();
 
-    /** Pops out all scenes from the queue until the root scene in the queue.
+    /** Pops out all scenes from the stack until the root scene in the queue.
      * This scene will replace the running one.
      * Internally it will call `popToSceneStackLevel(1)`
      */
     void popToRootScene();
 
-    /** Pops out all scenes from the queue until it reaches `level`.
+    /** Pops out all scenes from the stack until it reaches `level`.
      If level is 0, it will end the director.
      If level is 1, it will pop all scenes until it reaches to root scene.
      If level is <= than the current stack level, it won't do anything.
@@ -301,7 +301,7 @@ public:
 
     // Memory Helper
 
-    /** Removes cached all cocos2d cached data.
+    /** Removes all cocos2d cached data.
      It will purge the TextureCache, SpriteFrameCache, LabelBMFont cache
      @since v0.99.3
      */

cocos2dx/base_nodes/CCNode.h

@@ -619,7 +619,7 @@ public:
      *     node->setPosition(0,0);
      * }
      * @endcode
-     * This sample code traverses all children nodes, and set theie position to (0,0)
+     * This sample code traverses all children nodes, and set their position to (0,0)
      *
      * @return An array of children
      */

cocos2dx/include/CCProtocols.h

@@ -223,7 +223,7 @@ class CC_DLL LabelProtocol
 {
 public:
     /**
-     * Sets a new label using an string
+     * Sets a new label using a string
      *
      * @param label A null terminated string
      * @js NA

cocos2dx/layers_scenes_transitions_nodes/CCScene.h

@@ -39,7 +39,7 @@ NS_CC_BEGIN
 
 /** @brief Scene is a subclass of Node that is used only as an abstract concept.
 
-Scene and Node are almost identical with the difference that Scene has it's
+Scene and Node are almost identical with the difference that Scene has its
 anchor point (by default) at the center of the screen.
 
 For the moment Scene has no other logic than that, but in future releases it might have