Squashed commit of the following:

ekatek · ekatek · commit 85a2a78e2abf · 2015-06-16T14:12:04.000-07:00
commit 6d34609 Merge: 800ec27 2ce8171 Author: freiit <freiit@users.noreply.github.com> Date: Tue Jun 16 11:56:53 2015 +0200 Merge pull request meteor#1 from freiit/freiit-patch-1 Trivial inconsistency in the docs fixed. commit 2ce8171 Author: freiit <freiit@users.noreply.github.com> Date: Tue Jun 16 11:47:30 2015 +0200 Trivial inconsistency in the docs fixed.
diff --git a/docs/client/full-api/api/passwords.md b/docs/client/full-api/api/passwords.md
@@ -121,14 +121,14 @@ Override fields of the object by assigning to them:
    the application (eg: `awesome.meteor.com`).
 - `headers`: An `Object` for custom email headers as described in
     [`Email.send`](#email_send).
-- `resetPassword`: An `Object` with two fields:
- - `resetPassword.from`: A `Function` used to override the `from` address defined
+- `resetPassword`: An `Object` with the fields:
+ - `from`: A `Function` used to override the `from` address defined
    by the `emailTemplates.from` field.
- - `resetPassword.subject`: A `Function` that takes a user object and returns
+ - `subject`: A `Function` that takes a user object and returns
    a `String` for the subject line of a reset password email.
- - `resetPassword.text`: A `Function` that takes a user object and a url, and
+ - `text`: A `Function` that takes a user object and a url, and
    returns the body text for a reset password email.
- - `resetPassword.html`: An optional `Function` that takes a user object and a
+ - `html`: An optional `Function` that takes a user object and a
    url, and returns the body html for a reset password email.
 - `enrollAccount`: Same as `resetPassword`, but for initial password setup for
    new accounts.
@@ -151,4 +151,4 @@ Accounts.emailTemplates.enrollAccount.text = function (user, url) {
 };
 ```
 
-{{/template}}
+{{/template}}
