From c4650de7c7ef540f99ea682e6e23d19838fd3e5c Mon Sep 17 00:00:00 2001
From: Manoj Patel <mapatel@microsoft.com>
Date: Tue, 31 May 2016 17:08:46 -0700
Subject: [PATCH] Fixes #7065: cli help documentation for --debug and
 --debug-brk

---
 doc/api/cli.md      | 14 ++++++++++++++
 doc/api/debugger.md |  4 ++++
 doc/node.1          |  8 ++++++++
 src/node.cc         |  5 +++--
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index e40ddada742bbe..846951edabccf2 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -107,6 +107,20 @@ added: v0.11.14
 
 Throw errors for deprecations.
 
+### `--debug=<port>`
+<!-- YAML
+added: v6.2.0
+-->
+
+listen for debugger commands on user specified port. If port is not specified e.g `--debug` then use 5858 as default.
+
+### `--debug-brk=<port>`
+<!-- YAML
+added: v6.2.0
+-->
+
+same as --debug but break on first line waiting for a client to connect.
+
 ### `--no-warnings`
 <!-- YAML
 added: v6.0.0
diff --git a/doc/api/debugger.md b/doc/api/debugger.md
index 6a31212d9c220b..014002f269c388 100644
--- a/doc/api/debugger.md
+++ b/doc/api/debugger.md
@@ -178,6 +178,10 @@ process or via URI reference to the listening debugger:
 * `node debug -p <pid>` - Connects to the process via the `pid`
 * `node debug <URI>` - Connects to the process via the URI such as
 localhost:5858
+* `node --debug` - Enables debugging and accept commands on tcp port 5858.
+* `node --debug-port=<port>` - Changes the connection port. e.g. `--debug-port=9000`
+* `node --debug-brk` - Breaks on the first line and wait for a debugger client to connect .
+* `node --debug-brk=<port>` - Break on first line and listen on a custom port.
 
 ## V8 Inspector Integration for Node.js
 
diff --git a/doc/node.1 b/doc/node.1
index cec87222b54d11..e3576ddeea3896 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -78,6 +78,14 @@ Print stack traces for deprecations.
 .BR \-\-throw\-deprecation
 Throw errors for deprecations.
 
+.TP
+.BR \-\-debug
+listen for debugger commands on a tcp connection.
+
+.TP
+.BR \-\-debug\-brk
+same as --debug but break on first line.
+
 .TP
 .BR \-\-no\-warnings
 Silence all process warnings (including deprecations).
diff --git a/src/node.cc b/src/node.cc
index 258ebb596a08ca..80d84524f14818 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3463,8 +3463,9 @@ static void PrintHelp() {
          "  -r, --require         module to preload (option can be repeated)\n"
          "  --no-deprecation      silence deprecation warnings\n"
          "  --trace-deprecation   show stack traces on deprecations\n"
-         "  --throw-deprecation   throw an exception anytime a deprecated "
-         "function is used\n"
+         "  --throw-deprecation   throw an exception anytime a deprecated function is used\n"
+         "  --debug               listen for debugger commands on a tcp connection\n"
+         "  --debug-brk           same as --debug but break on first line\n"
          "  --no-warnings         silence all process warnings\n"
          "  --trace-warnings      show stack traces on process warnings\n"
          "  --trace-sync-io       show stack trace when use of sync IO\n"