Updated docs.

Author: killme2008

lib/av.js

@@ -1375,7 +1375,7 @@
 
   /**
    * Call this method to set production environment variable.
-   * @param {Boolean} production, true is production environment,and
+   * @param {Boolean} production True is production environment,and
    *  it's true by default.
    */
   AV.setProduction = function(production){
@@ -4167,7 +4167,7 @@
 
   /**
    * Creates a file object with exists objectId.
-   * @param {String} The objectId string
+   * @param {String} objectId The objectId string
    * @return {AV.File} the file object
    */
   AV.File.createWithoutData = function(objectId){
@@ -9016,6 +9016,7 @@
     /**
      * Makes a call to verify sms code that sent by AV.Cloud.requestSmsCode
      * @param {String} code The sms code sent by AV.Cloud.requestSmsCode
+     * @param {phone} phone The mobile phoner number(optional).
      * @param {Object} options A Backbone-style options object
      * @return {AV.Promise} A promise that will be resolved with the result
      * of the function.

lib/av_merged.js

@@ -1359,6 +1359,21 @@
     AV._initialize(applicationId, applicationKey,masterKey);
   };
 
+  /**
+   * Call this method to set production environment variable.
+   * @param {Boolean} production True is production environment,and
+   *  it's true by default.
+   */
+  AV.setProduction = function(production){
+    if(!AV._isNullOrUndefined(production)) {
+      //make sure it's a number
+      production = production ? 1 : 0;
+    }
+    //default is 1
+    AV.applicationProduction = AV._isNullOrUndefined(production) ? 1: production;
+  }
+
+
   /**
    * Call this method first to set up authentication tokens for AV.
    * This method is for AV's own private use.
@@ -4126,8 +4141,40 @@
     return file;
   };
 
+  /**
+   * Creates a file object with exists objectId.
+   * @param {String} objectId The objectId string
+   * @return {AV.File} the file object
+   */
+  AV.File.createWithoutData = function(objectId){
+    var file = new AV.File();
+    file.id = objectId;
+    return file;
+  };
+
+
   AV.File.prototype = {
 
+    /**
+     * Returns the ACL for this file.
+     * @returns {AV.ACL} An instance of AV.ACL.
+     */
+    getACL: function() {
+      return this._acl;
+    },
+
+    /**
+     * Sets the ACL to be used for this file.
+     * @param {AV.ACL} acl An instance of AV.ACL.
+     */
+    setACL: function(acl) {
+        if(!(acl instanceof AV.ACL)) {
+          return new AV.Error(AV.Error.OTHER_CAUSE,
+                               "ACL must be a AV.ACL.");
+        }
+        this._acl = acl;
+    },
+
     /**
      * Gets the name of the file. Before save is called, this is the filename
      * given by the user. After save is called, that name gets prefixed with a
@@ -7342,6 +7389,34 @@
     return query;
   };
 
+  /**
+   * Constructs a AV.Query that is the AND of the passed in queries.  For
+   * example:
+   * <pre>var compoundQuery = AV.Query.and(query1, query2, query3);</pre>
+   *
+   * will create a compoundQuery that is an 'and' of the query1, query2, and
+   * query3.
+   * @param {...AV.Query} var_args The list of queries to AND.
+   * @return {AV.Query} The query that is the AND of the passed in queries.
+   */
+  AV.Query.and = function() {
+    var queries = _.toArray(arguments);
+    var className = null;
+    AV._arrayEach(queries, function(q) {
+      if (_.isNull(className)) {
+        className = q.className;
+      }
+
+      if (className !== q.className) {
+        throw "All queries must be for the same class";
+      }
+    });
+    var query = new AV.Query(className);
+    query._andQuery(queries);
+    return query;
+  };
+
+
   /**
    * Retrieves a list of AVObjects that satisfy the CQL.
    * CQL syntax please see <a href='https://cn.avoscloud.com/docs/cql_guide.html'>CQL Guide.</a>
@@ -8923,11 +8998,12 @@
     /**
      * Makes a call to verify sms code that sent by AV.Cloud.requestSmsCode
      * @param {String} code The sms code sent by AV.Cloud.requestSmsCode
+     * @param {phone} phone The mobile phoner number(optional).
      * @param {Object} options A Backbone-style options object
      * @return {AV.Promise} A promise that will be resolved with the result
      * of the function.
      */
-    verifySmsCode: function(code, options){
+    verifySmsCode: function(code, phone, options){
       if(!code)
         throw "Missing sms code.";
       var request = AV._request("verifySmsCode", code, null, 'POST',