Merge branch 'master' of github.com:spumko/hapi

hapijs · Jun 13, 2014 · aaac166 · aaac166
2 parents 7ebc39f + 07ac1e4
commit aaac166
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## [**6.0.1**](https://github.com/spumko/hapi/issues?milestone=103&state=closed)
+- [**#1710**](https://github.com/spumko/hapi/issues/1710) Buffer based passwords fail schema validation (6.0 regression)
+
 ## [**6.0.0**](https://github.com/spumko/hapi/issues?milestone=102&state=closed)
 - [**#1708**](https://github.com/spumko/hapi/issues/1708) Hapi 6.0 no longer invalidates auth strategy on registration of route
 - [**#1703**](https://github.com/spumko/hapi/issues/1703) Catbox 3.0 and drop internal require support
@@ -498,17 +501,6 @@
 - [**#844**](https://github.com/spumko/hapi/issues/844) Proxy to outside site fails due to request&#39;s old stream api and node 0.10 wrap()
 - [**#843**](https://github.com/spumko/hapi/issues/843) Allow setting custom headers via proxy mapUri
 
-## [**1.0.3**](https://github.com/spumko/hapi/issues?milestone=35&state=closed)
-- [**#823**](https://github.com/spumko/hapi/issues/823) Issue/822
-- [**#822**](https://github.com/spumko/hapi/issues/822) JSONP doesn&#39;t seem to be working
-- [**#817**](https://github.com/spumko/hapi/issues/817) Payload bugfix for PATCH method
-- [**#818**](https://github.com/spumko/hapi/issues/818) Tiny composer documentation fix
-- [**#814**](https://github.com/spumko/hapi/issues/814) Fixed jade compile issues and updated tests to verify fix.
-- [**#804**](https://github.com/spumko/hapi/issues/804) Remove restriction on params in path for static file handler
-
-## [**1.0.2**](https://github.com/spumko/hapi/issues?milestone=34&state=closed)
-- [**#813**](https://github.com/spumko/hapi/issues/813) text/* content-type always echo back the received content
-
 ## [**1.1.0**](https://github.com/spumko/hapi/issues?milestone=32&state=closed)
 - [**#839**](https://github.com/spumko/hapi/issues/839) Cleanup listeners
 - [**#838**](https://github.com/spumko/hapi/issues/838) Issue/808
@@ -524,6 +516,17 @@
 - [**#820**](https://github.com/spumko/hapi/issues/820) Clarified the format of payload in server.inject in the Reference doc
 - [**#824**](https://github.com/spumko/hapi/issues/824) Issue/821
 
+## [**1.0.3**](https://github.com/spumko/hapi/issues?milestone=35&state=closed)
+- [**#823**](https://github.com/spumko/hapi/issues/823) Issue/822
+- [**#822**](https://github.com/spumko/hapi/issues/822) JSONP doesn&#39;t seem to be working
+- [**#817**](https://github.com/spumko/hapi/issues/817) Payload bugfix for PATCH method
+- [**#818**](https://github.com/spumko/hapi/issues/818) Tiny composer documentation fix
+- [**#814**](https://github.com/spumko/hapi/issues/814) Fixed jade compile issues and updated tests to verify fix.
+- [**#804**](https://github.com/spumko/hapi/issues/804) Remove restriction on params in path for static file handler
+
+## [**1.0.2**](https://github.com/spumko/hapi/issues?milestone=34&state=closed)
+- [**#813**](https://github.com/spumko/hapi/issues/813) text/* content-type always echo back the received content
+
 ## [**1.0.0**](https://github.com/spumko/hapi/issues?milestone=26&state=closed)
 - [**#796**](https://github.com/spumko/hapi/issues/796) Allow unencoded double quote and backslash in the cookie value
 - [**#793**](https://github.com/spumko/hapi/issues/793) Use new assert with passed parameters instead of concat string
@@ -624,12 +627,6 @@
 - [**#587**](https://github.com/spumko/hapi/issues/587) Composer config options
 - [**#577**](https://github.com/spumko/hapi/issues/577) Beef up file etag tests
 
-## [**0.13.2**](https://github.com/spumko/hapi/issues?milestone=20&state=closed)
-- [**#474**](https://github.com/spumko/hapi/issues/474) 0.13.2
-- [**#466**](https://github.com/spumko/hapi/issues/466) Directory listing at top level folders now link correctly
-- [**#472**](https://github.com/spumko/hapi/issues/472) Fix matching of wildcard path param with trailing /
-- [**#463**](https://github.com/spumko/hapi/issues/463) Typo: req.session.used -&gt; req.session.user
-
 ## [**0.14.0**](https://github.com/spumko/hapi/issues?milestone=18&state=closed)
 - [**#563**](https://github.com/spumko/hapi/issues/563) Using memory instead of redis for test
 - [**#561**](https://github.com/spumko/hapi/issues/561) Composer
@@ -653,6 +650,12 @@
 - [**#478**](https://github.com/spumko/hapi/issues/478) Cleanup ext options and error handling
 - [**#475**](https://github.com/spumko/hapi/issues/475) Simplify path regex
 
+## [**0.13.2**](https://github.com/spumko/hapi/issues?milestone=20&state=closed)
+- [**#474**](https://github.com/spumko/hapi/issues/474) 0.13.2
+- [**#466**](https://github.com/spumko/hapi/issues/466) Directory listing at top level folders now link correctly
+- [**#472**](https://github.com/spumko/hapi/issues/472) Fix matching of wildcard path param with trailing /
+- [**#463**](https://github.com/spumko/hapi/issues/463) Typo: req.session.used -&gt; req.session.user
+
 ## [**0.13.0**](https://github.com/spumko/hapi/issues?milestone=17&state=closed)
 - [**#448**](https://github.com/spumko/hapi/issues/448) Fixed typos
 

diff --git a/docs/Reference.md b/docs/Reference.md
@@ -393,9 +393,9 @@ The following options are available when adding a route:
               serve if the request supports content encoding. Defaults to `false`.
 
     - <a name="route.config.directory"></a>`directory` - generates a directory endpoint for serving static content from a directory. Routes using the
-      directory handler must include a path parameter at the end of the path string (e.g. '/path/to/somewhere/{param}' where the parameter name does
-      not matter). The path parameter can use any of the parameter options (e.g. '{param}' for one level files only, '{param?}' for one level files or
-      the directory root, '{param*}' for any level, or '{param*3}' for a specific level). If additional path parameters are present, they are ignored for
+      directory handler must include a path parameter at the end of the path string (e.g. `/path/to/somewhere/{param}` where the parameter name does
+      not matter). The path parameter can use any of the parameter options (e.g. `{param}` for one level files only, `{param?}` for one level files or
+      the directory root, `{param*}` for any level, or `{param*3}` for a specific level). If additional path parameters are present, they are ignored for
       the purpose of selecting the file system resource. The directory handler is an object with the following options:
         - `path` - (required) the directory root path (relative paths are resolved based on the server [`files`](#server.config.files) configuration).
           Value can be:
@@ -979,8 +979,8 @@ The `options` object is the same as the server [`views`](#server.config.views) c
 ```javascript
 server.views({
     engines: {
-        html: 'handlebars',
-        jade: 'jade'
+        html: require('handlebars'),
+        jade: require('jade')
     },
     path: '/static/templates'
 });
@@ -1738,7 +1738,7 @@ The [response flow control rules](#flow-control) apply.
 var Hapi = require('hapi');
 var server = new Hapi.Server({
     views: {
-        engines: { html: 'handlebars' },
+        engines: { html: require('handlebars') },
         path: __dirname + '/templates'
     }
 });
@@ -1995,7 +1995,7 @@ response object.
 
 ```javascript
 var Hapi = require('hapi');
-var server = new Hapi.Server({ views: { engines: { html: 'handlebars' } } });
+var server = new Hapi.Server({ views: { engines: { html: require('handlebars') } } });
 
 server.ext('onPreResponse', function (request, reply) {
 
@@ -2542,7 +2542,7 @@ exports.register = function (plugin, options, next) {
     plugin.views({
         engines: {
             html: { 
-              module: require('handlebars') 
+              module: Handlebars.create()
             }
         },
         path: './templates'
@@ -2950,7 +2950,7 @@ installed in the path.  The following arguments are available to the **hapi** CL
 - '-p' - the path to the node_modules folder to load plugins from (optional)
 - '--require' - a module the cli will require before hapi is required (optional) ex. loading a metrics library
 
-Note that `--require` will require from node_modules, an absolute path, a relative path, or from the node_modules
+Note that `--require` will require from `node_modules`, an absolute path, a relative path, or from the `node_modules`
 set by `-p` if available.
 
 In order to help with A/B testing there is [confidence](https://github.com/spumko/confidence). Confidence is a