Merge branch 'private_api_support' of https://github.com/justinnichol…

…s/apidoc into justinnichols-private_api_support

bin/apidoc

@@ -32,6 +32,8 @@ var argv = nomnom
 
     .option('config', { abbr: 'c', 'default': './', help: 'Path to directory containing config file (apidoc.json)' })
 
+    .option('private', { abbr: 'p', 'default': false, help: 'Include private APIs in output.'})
+
     .option('verbose', { abbr: 'v', flag: true, 'default': false, help: 'Verbose debug output.' })
 
     .option('help', { abbr: 'h', flag: true, help: 'Show this help information.' })
@@ -92,6 +94,7 @@ var options = {
     dest          : argv['output'],
     template      : argv['template'],
     config        : argv['config'],
+    apiprivate    : argv['private'],
     verbose       : argv['verbose'],
     debug         : argv['debug'],
     parse         : argv['parse'],

lib/index.js

@@ -11,15 +11,16 @@ var defaults = {
     dest    : path.join(__dirname, '../doc/'),
     template: path.join(__dirname, '../template/'),
 
-    debug   : false,
-    silent  : false,
-    verbose : false,
-    simulate: false,
-    parse   : false, // Only parse and return the data, no file creation.
-    colorize: true,
-    markdown: true,
-    config  : './',
-    encoding: 'utf8'
+    debug     : false,
+    silent    : false,
+    verbose   : false,
+    simulate  : false,
+    parse     : false, // Only parse and return the data, no file creation.
+    colorize  : true,
+    markdown  : true,
+    config    : './',
+    apiprivate: false,
+    encoding  : 'utf8'
 };
 
 var app = {