Merge branch '3.8.x'

Conflicts: package.json
Automattic · Jan 3, 2015 · f2bfdd1 · f2bfdd1
2 parents 907214d + 8c4a0f5
commit f2bfdd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ Mongoose is a [MongoDB](http://www.mongodb.org/) object modeling tool designed t
 
 Check out the [plugins search site](http://plugins.mongoosejs.com/) to see hundreds of related modules from the community.
 
+Build your own Mongoose plugin through [generator-mongoose-plugin](https://github.com/huei90/generator-mongoose-plugin).
+
 ## Contributors
 
 View all 100+ [contributors](https://github.com/learnboost/mongoose/graphs/contributors). Stand up and be counted as a [contributor](https://github.com/LearnBoost/mongoose/blob/master/CONTRIBUTING.md) too!

diff --git a/lib/model.js b/lib/model.js
@@ -1090,7 +1090,7 @@ Model.findById = function findById (id, fields, options, callback) {
  *     // chaining findOne queries (same as above)
  *     Adventure.findOne({ type: 'iphone' }).select('name').lean().exec(callback);
  *
- * @param {Object} conditions
+ * @param {Object} [conditions]
  * @param {Object} [fields] optional fields to select
  * @param {Object} [options] optional
  * @param {Function} [callback]