Merge branch 'master' into version-NEXT

Conflicts:
	themes/meteor

Author: tmeasday

_config.yml

@@ -497,7 +497,7 @@ In addition to _property selectors_, you can use a _field selector_ to reduce th
 
 ```js
 Tracker.autorun(function(){
-  var postAuthors = Posts.find({}, {fields: {tag: 0, author: 1, title: 0).fetch();
+  var postAuthors = Posts.find({}, {fields: {tag: 0, author: 1, title: 0}}).fetch();
   postAuthors.forEach(function (post) {
     console.log(post.author);
   });

long-form/tracker-manual.md

@@ -186,7 +186,7 @@ sites:
 
 - Facebook: <http://developers.facebook.com/docs/authentication/permissions/>
 - GitHub: <http://developer.github.com/v3/oauth/#scopes>
-- Google: <https://developers.google.com/accounts/docs/OAuth2Login#scopeparameter>
+- Google: <https://developers.google.com/identity/protocols/googlescopes>
 - Meetup: <http://www.meetup.com/meetup_api/auth/#oauth2-scopes>
 - Twitter, Weibo, Meteor developer accounts: `requestPermissions` currently not supported
 

source/api/accounts.md

@@ -4,15 +4,16 @@ order: 18
 description: Documentation of how to use assets in Meteor.
 ---
 
+> Currently, it is not possible to import `Assets` as an ES6 module.  Any of the `Assets` methods below can simply be called directly in any Meteor server code.
+
 `Assets` allows server code in a Meteor application to access static server
 assets, which are located in the `private` subdirectory of an application's
 tree. Assets are not processed as source files and are copied directly
 into your application's bundle.
 
 {% apibox "Assets.getText" %}
 {% apibox "Assets.getBinary" %}
-<!-- commented out because this does not exist in master -->
-<!-- { % apibox "Assets.absoluteFilePath" %} -->
+{% apibox "Assets.absoluteFilePath" %}
 
 Static server assets are included by placing them in the application's `private`
 subdirectory. For example, if an application's `private` subdirectory includes a

source/api/assets.md

@@ -201,7 +201,7 @@ add the `ddp-rate-limiter` package to your project in your terminal:
 meteor add ddp-rate-limiter
 ```
 
-{% apibox "DDPRateLimiter.addRule" nested:true %}
+{% apibox "DDPRateLimiter.addRule" nested:true instanceDelimiter:. %}
 
 Custom rules can be added by calling `DDPRateLimiter.addRule`. The rate
 limiter is called on every method and subscription invocation.

source/api/methods.md

@@ -41,6 +41,10 @@ Package.onUse(function (api) {
   api.export('Email', 'server');
   // Specify the source code for the package.
   api.addFiles('email.js', 'server');
+
+  // When using ecmascript or modules packages, you can use this instead of
+  // api.export and api.addFiles:
+  api.mainModule('email.js', 'server');
 });
 
 /* This defines the tests for the package */
@@ -59,6 +63,8 @@ Npm.depends({
   "stream-buffers": "0.2.5"});
 ```
 
+`api.mainModule` is documented in the [modules](http://docs.meteor.com/packages/modules.html#Modular-package-structure) section.
+
 Build plugins are created with
 [`Package.registerBuildPlugin`](#Package-registerBuildPlugin). See the
 coffeescript package for an example. Build plugins are fully-fledged Meteor

source/api/packagejs.md

@@ -30,18 +30,9 @@ On the client, this function logs in as the newly created user on
 successful completion. On the server, it returns the newly created user
 id.
 
-On the client, you must pass `password` and at least one of `username` or
-`email` — enough information for the user to be able to log in again
-later. If there are existing users with a username or email only differing in
-case, `createUser` will fail. On the server, you do not need to specify
-`password`, but the user will not be able to log in until it has a password (eg,
-set with [`Accounts.setPassword`](#accounts_setpassword)).
-
-To create an account without a password on the server and still let the
-user pick their own password, call `createUser` with the `email` option
-and then
-call [`Accounts.sendEnrollmentEmail`](#accounts_sendenrollmentemail). This
-will send the user an email with a link to set their initial password.
+On the client, you must pass `password` and at least one of `username` or `email` — enough information for the user to be able to log in again later. If there are existing users with a username or email only differing in case, `createUser` will fail. The callback's `error.reason` will be `'Username already exists.'` or `'Email already exists.'` In the latter case, the user can then either [login](accounts.html#Meteor-loginWithPassword) or [reset their password](#Accounts-resetPassword).
+
+On the server, you do not need to specify `password`, but the user will not be able to log in until it has a password (eg, set with [`Accounts.setPassword`](#accounts_setpassword)). To create an account without a password on the server and still let the user pick their own password, call `createUser` with the `email` option and then call [`Accounts.sendEnrollmentEmail`](#accounts_sendenrollmentemail). This will send the user an email with a link to set their initial password.
 
 By default the `profile` option is added directly to the new user document. To
 override this behavior, use [`Accounts.onCreateUser`](#accounts_oncreateuser).
@@ -59,7 +50,7 @@ insensitive duplicates before updates.
 
 By default, an email address is added with `{ verified: false }`. Use
 [`Accounts.sendVerificationEmail`](#Accounts-sendVerificationEmail) to send an
-email with a link the user can use verify their email address.
+email with a link the user can use to verify their email address.
 
 {% apibox "Accounts.removeEmail" %}
 
@@ -172,4 +163,8 @@ Accounts.emailTemplates.enrollAccount.text = function (user, url) {
      + " To activate your account, simply click the link below:\n\n"
      + url;
 };
+Accounts.emailTemplates.resetPassword.from = function () {
+   // Overrides value set in Accounts.emailTemplates.from when resetting passwords
+   return "AwesomeSite Password Reset <no-reply@example.com>";
+};
 ```

source/api/passwords.md

@@ -24,15 +24,24 @@ If you return multiple cursors in an array, they currently must all be from
 different collections. We hope to lift this restriction in a future release.
 {% endpullquote %}
 
+A client will see a document if the document is currently in the published
+record set of any of its subscriptions. If multiple publications publish a
+document with the same `_id` to the same collection the documents will be
+merged for the client. If the values of any of the top level fields
+conflict, the resulting value will be one of the published values, chosen
+arbitrarily.
+
 ```js
-// server: publish the rooms collection, minus secret info.
+// server: publish the rooms collection, minus secret info...
 Meteor.publish("rooms", function () {
   return Rooms.find({}, {fields: {secretInfo: 0}});
 });
 
 // ... and publish secret info for rooms where the logged-in user
 // is an admin. If the client subscribes to both streams, the records
 // are merged together into the same documents in the Rooms collection.
+// Note that currently object values are not recursively merged, so the
+// fields that differ must be top level fields.
 Meteor.publish("adminSecretInfo", function () {
   return Rooms.find({admin: this.userId}, {fields: {secretInfo: 1}});
 });
@@ -134,7 +143,8 @@ project that includes the `autopublish` package.  Your publish function
 will still work.
 {% endpullquote %}
 
-Read more about publications and how to use them in the [Data Loading](http://guide.meteor.com/data-loading.html) article in the Meteor Guide.
+Read more about publications and how to use them in the [Data Loading]
+(http://guide.meteor.com/data-loading.html) article in the Meteor Guide.
 
 {% apibox "Subscription#userId" %}
 
@@ -177,7 +187,17 @@ Players = new Mongo.Collection("players");
 ```
 
 The client will see a document if the document is currently in the published
-record set of any of its subscriptions.
+record set of any of its subscriptions. If multiple publications publish a
+document with the same `_id` for the same collection the documents are merged for
+the client. If the values of any of the top level fields conflict, the resulting
+value will be one of the published values, chosen arbitrarily.
+
+{% pullquote 'warning' %}
+Currently, when multiple subscriptions publish the same document *only the top
+level fields* are compared during the merge. This means that if the documents
+include different sub-fields of the same top level field, not all of them will
+be available on the client. We hope to lift this restriction in a future release.
+{% endpullquote %}
 
 The `onReady` callback is called with no arguments when the server [marks the
 subscription as ready](#publish_ready). The `onStop` callback is called with
@@ -229,7 +249,3 @@ messages. When you change rooms by calling `Session.set("current-room",
 "new-room")`, Meteor will subscribe to the new room's chat messages,
 unsubscribe from the original room's chat messages, and continue to
 stay subscribed to your private messages.
-
-If more than one subscription sends conflicting values for a field (same
-collection name, document ID, and field name), then the value on the client will
-be one of the published values, chosen arbitrarily.

source/api/pubsub.md

@@ -1,5 +1,5 @@
 ---
-title: Introduction
+title: Introducing Meteor API Docs
 order: 0
 ---
 
@@ -32,3 +32,5 @@ Meteor is a full-stack JavaScript platform for developing modern web and mobile
 
 
 {% oldRedirects %}
+
+<!-- ABC: hidden comment for cache testing -->

source/index.md

@@ -11,16 +11,16 @@ To add Accounts and a set of login controls to an application, add the
 `accounts-password`, `accounts-facebook`, `accounts-github`,
 `accounts-google`, `accounts-twitter`, or `accounts-weibo`.
 
-Then simply add the `{{dstache}}> loginButtons}}` helper to an HTML file. This
+Then simply add the `{% raw %}{{> loginButtons}}{% endraw %}` helper to an HTML file. This
 will place a login widget on the page. If there is only one provider configured
 and it is an external service, this will add a login/logout button. If you use
 `accounts-password` or use multiple external login services, this will add
 a "Sign in" link which opens a dropdown menu with login options. If you plan to
 position the login dropdown in the right edge of the screen, use
-`{{dstache}}> loginButtons align="right"}}` in order to get the dropdown to lay
+`{% raw %}{{> loginButtons align="right"}}{% endraw %}` in order to get the dropdown to lay
 itself out without expanding off the edge of the screen.
 
-To configure the behavior of `{{dstache}}> loginButtons}}`, use
+To configure the behavior of `{% raw %}{{> loginButtons}}{% endraw %}`, use
 [`Accounts.ui.config`](#accounts_ui_config).
 
 `accounts-ui` also includes modal popup dialogs to handle links from