Skip to content

Commit

Permalink
build: move repository to expressjs
Browse files Browse the repository at this point in the history
  • Loading branch information
dougwilson committed Jan 22, 2016
1 parent 6847405 commit e7a02f6
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 34 deletions.
6 changes: 1 addition & 5 deletions Contributing.md
@@ -1,7 +1,4 @@

## Website Issues

Issues for the expressjs.com website go here https://github.com/strongloop/expressjs.com
# Contributing

## PRs and Code contributions

Expand All @@ -22,4 +19,3 @@ Things that will help get your question issue looked at:
* Steps you have taken to debug it yourself.

If you post a question and do not outline the above items or make it easy for us to understand and reproduce your issue, it will be closed.

18 changes: 7 additions & 11 deletions Readme.md
Expand Up @@ -37,16 +37,12 @@ $ npm install express

## Docs & Community

* [Website and Documentation](http://expressjs.com/) - [[website repo](https://github.com/strongloop/expressjs.com)]
* [#express](https://webchat.freenode.net/?channels=express) on freenode IRC
* [Github Organization](https://github.com/expressjs) for Official Middleware & Modules
* Visit the [Wiki](https://github.com/strongloop/express/wiki)
* [Google Group](https://groups.google.com/group/express-js) for discussion
* [Gitter](https://gitter.im/strongloop/express) for support and discussion
* [Gitter](https://gitter.im/expressjs/express) for support and discussion
* [Русскоязычная документация](http://jsman.ru/express/)

**PROTIP** Be sure to read [Migrating from 3.x to 4.x](https://github.com/strongloop/express/wiki/Migrating-from-3.x-to-4.x) as well as [New features in 4.x](https://github.com/strongloop/express/wiki/New-features-in-4.x).

###Security Issues

If you discover a security vulnerability in Express, please see [Security Policies and Procedures](Security.md).
Expand Down Expand Up @@ -94,7 +90,7 @@ $ npm start
To view the examples, clone the Express repo and install the dependencies:

```bash
$ git clone git://github.com/strongloop/express.git --depth 1
$ git clone git://github.com/expressjs/express.git --depth 1
$ cd express
$ npm install
```
Expand All @@ -120,7 +116,7 @@ The original author of Express is [TJ Holowaychuk](https://github.com/tj) [![TJ'

The current lead maintainer is [Douglas Christopher Wilson](https://github.com/dougwilson) [![Doug's Gratipay][gratipay-image-dougwilson]][gratipay-url-dougwilson]

[List of all contributors](https://github.com/strongloop/express/graphs/contributors)
[List of all contributors](https://github.com/expressjs/express/graphs/contributors)

## License

Expand All @@ -130,12 +126,12 @@ The current lead maintainer is [Douglas Christopher Wilson](https://github.com/d
[npm-url]: https://npmjs.org/package/express
[downloads-image]: https://img.shields.io/npm/dm/express.svg
[downloads-url]: https://npmjs.org/package/express
[travis-image]: https://img.shields.io/travis/strongloop/express/master.svg?label=linux
[travis-url]: https://travis-ci.org/strongloop/express
[travis-image]: https://img.shields.io/travis/expressjs/express/master.svg?label=linux
[travis-url]: https://travis-ci.org/expressjs/express
[appveyor-image]: https://img.shields.io/appveyor/ci/dougwilson/express/master.svg?label=windows
[appveyor-url]: https://ci.appveyor.com/project/dougwilson/express
[coveralls-image]: https://img.shields.io/coveralls/strongloop/express/master.svg
[coveralls-url]: https://coveralls.io/r/strongloop/express?branch=master
[coveralls-image]: https://img.shields.io/coveralls/expressjs/express/master.svg
[coveralls-url]: https://coveralls.io/r/expressjs/express?branch=master
[gratipay-image-visionmedia]: https://img.shields.io/gratipay/visionmedia.svg
[gratipay-url-visionmedia]: https://gratipay.com/visionmedia/
[gratipay-image-dougwilson]: https://img.shields.io/gratipay/dougwilson.svg
Expand Down
15 changes: 3 additions & 12 deletions Security.md
Expand Up @@ -15,10 +15,9 @@ Thank you for improving the security of Express. We appreciate your efforts and
responsible disclosure and will make every effort to acknowledge your
contributions.

Report security bugs by emailing security@expressjs.com. Email to this address
is delivered to a subset of the core team who handle security issues.
Report security bugs by emailing the lead maintainer in the Readme.md file.

The security team will acknowledge your email within 24 hours, and will send a
The lead maintainer will acknowledge your email within 48 hours, and will send a
more detailed response within 48 hours indicating the next steps in handling
your report. After the initial reply to your report, the security team will
endeavor to keep you informed of the progress towards a fix and full
Expand All @@ -39,15 +38,7 @@ involving the following steps:
* Prepare fixes for all releases still under maintenance. These fixes will be
released as fast as possible to npm.

## Receiving Security Updates

Security notifications will be distributed via the following methods.

* https://groups.google.com/forum/#!forum/express-js
* http://blog.strongloop.com
* http://expressjs.com/advanced/security-updates.html

## Comments on this Policy

If you have suggestions on how this process could be improved please submit a
pull request or email security@expressjs.com to discuss.
pull request.
4 changes: 2 additions & 2 deletions examples/view-constructor/index.js
Expand Up @@ -23,7 +23,7 @@ app.engine('md', function(str, options, fn){
});

// pointing to a particular github repo to load files from it
app.set('views', 'strongloop/express');
app.set('views', 'expressjs/express');

// register a new view constructor
app.set('view', GithubView);
Expand All @@ -36,7 +36,7 @@ app.get('/', function(req, res){
});

app.get('/Readme.md', function(req, res){
// rendering a view from https://github.com/strongloop/express/blob/master/Readme.md
// rendering a view from https://github.com/expressjs/express/blob/master/Readme.md
res.render('Readme.md');
});

Expand Down
2 changes: 1 addition & 1 deletion examples/web-service/index.js
Expand Up @@ -49,7 +49,7 @@ var apiKeys = ['foo', 'bar', 'baz'];
// these two objects will serve as our faux database

var repos = [
{ name: 'express', url: 'http://github.com/strongloop/express' }
{ name: 'express', url: 'http://github.com/expressjs/express' }
, { name: 'stylus', url: 'http://github.com/learnboost/stylus' }
, { name: 'cluster', url: 'http://github.com/learnboost/cluster' }
];
Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -13,8 +13,7 @@
"Young Jae Sim <hanul@hanul.me>"
],
"license": "MIT",
"repository": "strongloop/express",
"homepage": "http://expressjs.com/",
"repository": "expressjs/express",
"keywords": [
"express",
"framework",
Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/web-service.js
Expand Up @@ -53,7 +53,7 @@ describe('web-service', function(){
.get('/api/repos?api-key=foo')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(/"name":"express"/)
.expect(/"url":"http:\/\/github.com\/strongloop\/express"/)
.expect(/"url":"http:\/\/github.com\/expressjs\/express"/)
.expect(200, done)
})
})
Expand Down

1 comment on commit e7a02f6

@mikermcneil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dougwilson the express repo and its buddies in the expressjs org: together at last

Please sign in to comment.