Merge tag '3.16.7'

Contributing.md

@@ -1,7 +1,7 @@
 
 ## Website Issues
 
-Issues for the expressjs.com website go here https://github.com/visionmedia/expressjs.com
+Issues for the expressjs.com website go here https://github.com/strongloop/expressjs.com
 
 ## PRs and Code contributions
 

History.md

@@ -1,3 +1,10 @@
+unreleased
+==========
+
+  * deps: [email protected]
+    - deps: [email protected]
+    - deps: [email protected]
+
 4.8.4 / 2014-08-14
 ==================
 
@@ -398,6 +405,18 @@
    - `app.route()` - Proxy to the app's `Router#route()` method to create a new route
    - Router & Route - public API
 
+3.16.7 / 2014-08-18
+===================
+
+  * deps: [email protected]
+    - deps: body-parser@~1.6.5
+    - deps: express-session@~1.7.6
+    - deps: morgan@~1.2.3
+    - deps: serve-static@~1.5.3
+  * deps: [email protected]
+    - deps: [email protected]
+    - deps: [email protected]
+
 3.16.6 / 2014-08-14
 ===================
 

Readme.md

@@ -2,10 +2,10 @@
 
   Fast, unopinionated, minimalist web framework for [node](http://nodejs.org).
 
-  [![NPM Version](https://badge.fury.io/js/express.svg)](https://badge.fury.io/js/express)
-  [![Build Status](https://travis-ci.org/visionmedia/express.svg?branch=master)](https://travis-ci.org/visionmedia/express)
-  [![Coverage Status](https://img.shields.io/coveralls/visionmedia/express.svg)](https://coveralls.io/r/visionmedia/express)
-  [![Gittip](http://img.shields.io/gittip/dougwilson.svg)](https://www.gittip.com/dougwilson/)
+  [![NPM Version](https://img.shields.io/npm/v/express.svg?style=flat)](https://www.npmjs.org/package/express)
+  [![Build Status](https://img.shields.io/travis/strongloop/express.svg?style=flat)](https://travis-ci.org/strongloop/express)
+  [![Coverage Status](https://img.shields.io/coveralls/strongloop/express.svg?style=flat)](https://coveralls.io/r/strongloop/express)
+  [![Gittip](https://img.shields.io/gittip/dougwilson.svg?style=flat)](https://www.gittip.com/dougwilson/)
 
 ```js
 var express = require('express')
@@ -18,7 +18,7 @@ app.get('/', function (req, res) {
 app.listen(3000)
 ```
 
-  **PROTIP** Be sure to read [Migrating from 3.x to 4.x](https://github.com/visionmedia/express/wiki/Migrating-from-3.x-to-4.x) as well as [New features in 4.x](https://github.com/visionmedia/express/wiki/New-features-in-4.x).
+  **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).
 
 ### Installation
 
@@ -76,10 +76,10 @@ $ npm start
 
 ## More Information
 
-  * [Website and Documentation](http://expressjs.com/) - [[website repo](https://github.com/visionmedia/expressjs.com)]
+  * [Website and Documentation](http://expressjs.com/) - [[website repo](https://github.com/strongloop/expressjs.com)]
   * [Github Organization](https://github.com/expressjs) for Official Middleware & Modules
   * [#express](https://webchat.freenode.net/?channels=express) on freenode IRC
-  * Visit the [Wiki](https://github.com/visionmedia/express/wiki)
+  * Visit the [Wiki](https://github.com/strongloop/express/wiki)
   * [Google Group](https://groups.google.com/group/express-js) for discussion
   * [Русскоязычная документация](http://jsman.ru/express/)
   * [한국어 문서](http://expressjs.kr) - [[website repo](https://github.com/Hanul/expressjs.kr)]
@@ -90,7 +90,7 @@ $ npm start
   Clone the Express repo, then install the dev dependencies to install all the example / test suite dependencies:
 
 ```bash
-$ git clone git://github.com/visionmedia/express.git --depth 1
+$ git clone git://github.com/strongloop/express.git --depth 1
 $ cd express
 $ npm install
 ```
@@ -121,7 +121,7 @@ $ npm test
 
  * Author: [TJ Holowaychuk](https://github.com/visionmedia)
  * Lead Maintainer: [Douglas Christopher Wilson](https://github.com/dougwilson)
- * [All Contributors](https://github.com/visionmedia/express/graphs/contributors)
+ * [All Contributors](https://github.com/strongloop/express/graphs/contributors)
 
 ### License
 

examples/view-constructor/index.js

@@ -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', 'visionmedia/express');
+app.set('views', 'strongloop/express');
 
 // register a new view constructor
 app.set('view', GithubView);
@@ -36,7 +36,7 @@ app.get('/', function(req, res){
 });
 
 app.get('/Readme.md', function(req, res){
-  // rendering a view from https://github.com/visionmedia/express/blob/master/Readme.md
+  // rendering a view from https://github.com/strongloop/express/blob/master/Readme.md
   res.render('Readme.md');
 });
 

examples/web-service/index.js

@@ -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/visionmedia/express' }
+    { name: 'express', url: 'http://github.com/strongloop/express' }
   , { name: 'stylus', url: 'http://github.com/learnboost/stylus' }
   , { name: 'cluster', url: 'http://github.com/learnboost/cluster' }
 ];

package.json

@@ -23,8 +23,9 @@
     "app",
     "api"
   ],
-  "repository": "visionmedia/express",
+  "repository": "strongloop/express",
   "license": "MIT",
+  "homepage": "http://expressjs.com/",
   "dependencies": {
     "accepts": "~1.0.7",
     "buffer-crc32": "0.2.3",
@@ -39,7 +40,7 @@
     "proxy-addr": "1.0.1",
     "qs": "1.2.2",
     "range-parser": "1.0.0",
-    "send": "0.8.2",
+    "send": "0.8.3",
     "serve-static": "~1.5.2",
     "type-is": "~1.3.2",
     "vary": "0.1.0",

test/acceptance/web-service.js

@@ -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\/visionmedia\/express"/)
+        .expect(/"url":"http:\/\/github.com\/strongloop\/express"/)
         .expect(200, done)
       })
     })