Merge branch 'develop' of https://github.com/marklogic/node-client-api into develop

updated

Author: Aries Yuwono

lib/query-builder.js

@@ -3283,16 +3283,19 @@ function copyFromQueryBuilder(otherQueryBuilder) {
  * Sets the where clause of a built query, using the helper functions
  * of a {@link queryBuilder} to specify either a single query by example,
  * a structured query, a string query, or both structured and string queries.
+ * When you include a string and structured query, they are AND'd together.
  * You can use an empty where clause to qualify all documents in the database
  * (though for large databases, you would not want to retrieve all documents
  * in a single request).
  * This function may be called on a query builder or on the result of building a query.
  * @method
  * @memberof queryBuilder#
- * @param {queryBuilder.Query|queryBuilder.ParsedQuery|queryBuilder.QueryByExample} [query] - either
- * one or more composable queries returned by query builder functions,
- * a parsed query returned by the {@link queryBuilder#parsedFrom} function, or
- * a query by example returned by the {@link queryBuilder#byExample} function.
+ * @param {queryBuilder.Query|queryBuilder.ParsedQuery|queryBuilder.QueryByExample} [query] - one
+ * or more composable queries returned by query builder functions; or 
+ * a parsed query returned by the {@link queryBuilder#parsedFrom} function; or
+ * or a parsed query plus one or more composable queries, which are implicitly
+ * AND'd together; or a query by example returned by the 
+ * {@link queryBuilder#byExample} function.
  * @returns {queryBuilder.BuiltQuery} a built query
  */
 function where() {