Skip to content

Commit

Permalink
- MDG => Meteor Software
Browse files Browse the repository at this point in the history
- updates CONTRIBUTING.md
  • Loading branch information
filipenevola committed Dec 13, 2019
1 parent 4c83f55 commit 1a5d6fb
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .mailmap
Expand Up @@ -13,7 +13,7 @@
# A command-line way to get the GitHub username for an author:
# scripts/admin/find-author-github.sh 'User Name <foo@bar.com>'
# (Note that this script always outputs GITHUB so you should manually
# check to see if they are an MDG employee!)
# check to see if they are an Meteor Software employee!)

GITHUB: 0a- <a@0a.io>
GITHUB: adnissen <andrew_nissen@yahoo.com>
Expand Down
29 changes: 16 additions & 13 deletions CONTRIBUTING.md
Expand Up @@ -40,22 +40,28 @@ We’ve just begun to create more defined project roles for Meteor. Here are des
Issue Triagers are members of the community that meet with us weekly to help triage Meteor’s open issues and bug reports. Once you’ve begun triaging issues regularly on your own, we will invite you to join our dedicated Slack channel to participate in these regular coordination sessions.

Current Issue Triagers:
- [@hwillson](https://github.com/hwillson)
- [@laosb](https://github.com/laosb)
- [@abernix](https://github.com/abernix)
- [@lorensr](https://github.com/lorensr)
- [@klaussner](https://github.com/klaussner)
- [meteor](https://github.com/meteor/meteor)
- [@klaussner](https://github.com/klaussner)

- [docs](https://github.com/meteor/docs) / [guide](https://github.com/meteor/guide)
- [@lorensr](https://github.com/lorensr)

#### Reviewer

Our most regular and experienced Issue Triagers sometimes move on to doing code reviews for pull requests, and have input into which pull requests should be merged.

Current Reviewers:
- [@hwillson](https://github.com/hwillson)
- [@lorensr](https://github.com/lorensr)
- [@abernix](https://github.com/abernix)
- [@klaussner](https://github.com/klaussner)
- [@zodern](https://github.com/zodern)
- [meteor](https://github.com/meteor/meteor)
- [@klaussner](https://github.com/klaussner)
- [@zodern](https://github.com/zodern)
- [@benjamn](https://github.com/benjamn)
- [@abernix](https://github.com/abernix)
- [@hwillson](https://github.com/hwillson)
- [@filipenevola](https://github.com/filipenevola)

- [docs](https://github.com/meteor/docs) / [guide](https://github.com/meteor/guide)
- [@lorensr](https://github.com/lorensr)
- [@filipenevola](https://github.com/filipenevola)

#### Core Committer

Expand All @@ -64,9 +70,6 @@ The contributors with commit access to meteor/meteor are employees of Meteor Sof
Current Core Committers:
- [@benjamn](https://github.com/benjamn)
- [@filipenevola](https://github.com/filipenevola)
- [@abernix](https://github.com/abernix)
- [@glasser](https://github.com/glasser)
- [@hwillson](https://github.com/hwillson)

#### Documentation Maintainer

Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Expand Up @@ -94,9 +94,9 @@ This will generate a new tarball (`dev_bundle_<Platform>_<arch>_<version>.tar.gz

### Submitting "Dev Bundle" Pull Requests

It's important to note that while `dev_bundle` pull requests are accepted/reviewed, a new `dev_bundle` can only be published to MDG's Meteor infrastructure by an MDG staff member. This means that the build tool and package tests of submitted `dev_bundle` pull requests will always initially fail (since the new `dev_bundle` hasn't yet been built/published by MDG, which means it can't be downloaded by Meteor's continuous integration environment).
It's important to note that while `dev_bundle` pull requests are accepted/reviewed, a new `dev_bundle` can only be published to Meteor Software's Meteor infrastructure by an Meteor Software staff member. This means that the build tool and package tests of submitted `dev_bundle` pull requests will always initially fail (since the new `dev_bundle` hasn't yet been built/published by Meteor Software, which means it can't be downloaded by Meteor's continuous integration environment).

Pull requests that contain `dev_bundle` changes will be noted by repo collaborators, and a request to have a new `dev_bundle` built/published will be forwarded to MDG.
Pull requests that contain `dev_bundle` changes will be noted by repo collaborators, and a request to have a new `dev_bundle` built/published will be forwarded to Meteor Software.

## Additional documentation

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011 - 2019 Meteor Development Group, Inc.
Copyright (c) 2011 - 2019 Meteor Software Ltd.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/deprecated/README
@@ -1,4 +1,4 @@
These packages are no longer actively maintained by MDG. Seek
These packages are no longer actively maintained by Meteor Software. Seek
community alternatives instead.

Note that these packages still exist in atmosphere, and you can still
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/commands-packages.js
Expand Up @@ -822,8 +822,8 @@ main.registerCommand({
// version number, this will use buildmessage to error and exit.)
//
// Without any modifications about forks and package names, this particular
// option is not very useful outside of MDG. Right now, to run this option on
// a non-MDG fork of meteor, someone would probably need to go through and
// option is not very useful outside of Meteor Software. Right now, to run this option on
// a non-Meteor Software fork of meteor, someone would probably need to go through and
// change the package names to have proper prefixes, etc.
if (options['from-checkout']) {
// You must be running from checkout to bundle up your checkout as a release.
Expand Down
6 changes: 3 additions & 3 deletions tools/cli/commands.js
Expand Up @@ -24,8 +24,8 @@ import { iOSRunTarget, AndroidRunTarget } from '../cordova/run-targets.js';

import { EXAMPLE_REPOSITORIES } from './example-repositories.js';

// The architecture used by MDG's hosted servers; it's the architecture used by
// 'meteor deploy'.
// The architecture used by Meteor Software's hosted servers; it's the
// architecture used by 'meteor deploy'.
var DEPLOY_ARCH = 'os.linux.x86_64';

// The default port that the development server listens on.
Expand Down Expand Up @@ -2401,7 +2401,7 @@ main.registerCommand({
json: { type: Boolean },
verbose: { type: Boolean, short: "v" },
// By default, we give you a machine for 5 minutes. You can request up to
// 15. (MDG can reserve machines for longer than that.)
// 15. (Meteor Software can reserve machines for longer than that.)
minutes: { type: Number }
},
pretty: false,
Expand Down
4 changes: 2 additions & 2 deletions tools/isobuild/bundler.js
Expand Up @@ -2754,7 +2754,7 @@ class ServerTarget extends JsImageTarget {
// anything anymore
if (archinfo.VALID_ARCHITECTURES[self.arch] !== true) {
throw new Error(
`MDG does not publish dev_bundles for arch: ${self.arch}`
`Meteor Software does not publish dev_bundles for arch: ${self.arch}`
);
}

Expand Down Expand Up @@ -2874,7 +2874,7 @@ var writeTargetToPath = Profile(
// tend to be written atomically, and it's important on Windows to
// avoid overwriting files that might be open currently in the build
// or server process.
// Server builds do use an in-place build since the server is always stopped
// Server builds do use an in-place build since the server is always stopped
// during the build.
// If client in-place builds were safer on Windows, they
// would be much quicker than from-scratch rebuilds.
Expand Down
8 changes: 4 additions & 4 deletions tools/meteor-services/config.js
Expand Up @@ -7,10 +7,10 @@ import {
} from '../fs/files';
import tropohouse from '../packaging/tropohouse.js';

// A few functions in the `meteor` tool talk to MDG servers: primarily
// checking for updates, logging into your Meteor account, and
// deploying apps to the MDG free hosting sandbox, publishing packages,
// getting an ssh access to a build farm. These functions need
// A few functions in the `meteor` tool talk to Meteor Software servers:
// primarily checking for updates, logging into your Meteor account, and
// deploying apps to the Meteor Software free hosting sandbox, publishing
// packages, getting an ssh access to a build farm. These functions need
// configuration.

// Base URL for Meteor Accounts OAuth services. Endpoints include /authorize
Expand Down
6 changes: 3 additions & 3 deletions tools/meteor-services/deploy.js
Expand Up @@ -33,8 +33,8 @@ const hasOwn = Object.prototype.hasOwnProperty;

const CAPABILITIES = ['showDeployMessages', 'canTransferAuthorization'];

// Make a synchronous RPC to the "classic" MDG deploy API. The deploy
// API has the following contract:
// Make a synchronous RPC to the "classic" Meteor Software deploy API. The
// deploy API has the following contract:
//
// - Parameters are always sent in the query string.
// - A tarball can be sent in the body (when deploying an app).
Expand All @@ -45,7 +45,7 @@ const CAPABILITIES = ['showDeployMessages', 'canTransferAuthorization'];
// provide a human-readable error message in the body.
// - URLs are of the form "/[operation]/[site]".
// - Body encodings are always utf8.
// - Meteor Accounts auth is possible using first-party MDG cookies
// - Meteor Accounts auth is possible using first-party Meteor Software cookies
// (rather than OAuth).
//
// Options include:
Expand Down
2 changes: 1 addition & 1 deletion tools/utils/http-helpers.js
Expand Up @@ -139,7 +139,7 @@ _.extend(exports, {
// - You can provide a 'bodyStream' option which is a stream that
// will be used for the body of the request.
//
// - For authenticated MDG services, you can set the
// - For authenticated Meteor Software services, you can set the
// 'useSessionHeader' and/or 'useAuthHeader' options (to true) to
// send X-Meteor-Session/X-Meteor-Auth headers using values from
// the session file.
Expand Down

0 comments on commit 1a5d6fb

Please sign in to comment.