diff --git a/doc/Makefile b/doc/Makefile
index f7834cdab..2ab6cd55b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,21 +7,23 @@ doc-wrongdir:
MANPAGES := doc/lightning-cli.1 \
doc/lightning-autocleaninvoice.7 \
doc/lightning-close.7 \
+ doc/lightning-connect.7 \
doc/lightning-decodepay.7 \
doc/lightning-delexpiredinvoice.7 \
doc/lightning-delinvoice.7 \
doc/lightning-getroute.7 \
doc/lightning-invoice.7 \
+ doc/lightning-listfunds.7 \
doc/lightning-listinvoices.7 \
doc/lightning-listpayments.7 \
+ doc/lightning-newaddr.7 \
doc/lightning-pay.7 \
doc/lightning-sendpay.7 \
doc/lightning-waitinvoice.7 \
doc/lightning-waitanyinvoice.7 \
doc/lightning-waitsendpay.7 \
- doc/lightning-newaddr.7 \
- doc/lightning-withdraw.7 \
- doc/lightning-listfunds.7
+ doc/lightning-withdraw.7
+
doc-all: $(MANPAGES)
diff --git a/doc/lightning-close.7 b/doc/lightning-close.7
index 275f11074..a73594afe 100644
--- a/doc/lightning-close.7
+++ b/doc/lightning-close.7
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-close \- Protocol for closing channels with direct peers
+lightning-close \- Command for closing channels with direct peers
.SH "SYNOPSIS"
.sp
\fBclose\fR \fIid\fR [\fIforce\fR] [\fItimeout\fR]
diff --git a/doc/lightning-close.7.txt b/doc/lightning-close.7.txt
index a3ef5170e..7c6dd4d14 100644
--- a/doc/lightning-close.7.txt
+++ b/doc/lightning-close.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-CLOSE(7)
NAME
----
-lightning-close - Protocol for closing channels with direct peers
+lightning-close - Command for closing channels with direct peers
SYNOPSIS
--------
diff --git a/doc/lightning-decodepay.7 b/doc/lightning-decodepay.7
index 77fcde74b..badec11b5 100644
--- a/doc/lightning-decodepay.7
+++ b/doc/lightning-decodepay.7
@@ -2,12 +2,12 @@
.\" Title: lightning-decodepay
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 04/05/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-DECODEPAY" "7" "04/05/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-DECODEPAY" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-decodepay \- Protocol for decoding a bolt11 string (low\-level)
+lightning-decodepay \- Command for decoding a bolt11 string (low\-level)
.SH "SYNOPSIS"
.sp
\fBdecodepay\fR \fIbolt11\fR [\fIdescription\fR]
diff --git a/doc/lightning-decodepay.7.txt b/doc/lightning-decodepay.7.txt
index c867a1bd7..b6c338fd3 100644
--- a/doc/lightning-decodepay.7.txt
+++ b/doc/lightning-decodepay.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-DECODEPAY(7)
NAME
----
-lightning-decodepay - Protocol for decoding a bolt11 string (low-level)
+lightning-decodepay - Command for decoding a bolt11 string (low-level)
SYNOPSIS
diff --git a/doc/lightning-delexpiredinvoice.7 b/doc/lightning-delexpiredinvoice.7
index d5f99e6c1..bbfb6de6a 100644
--- a/doc/lightning-delexpiredinvoice.7
+++ b/doc/lightning-delexpiredinvoice.7
@@ -2,12 +2,12 @@
.\" Title: lightning-delexpiredinvoice
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 03/17/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-DELEXPIRE" "7" "03/17/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-DELEXPIRE" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-delexpiredinvoice \- Protocol for removing expired invoices\&.
+lightning-delexpiredinvoice \- Command for removing expired invoices\&.
.SH "SYNOPSIS"
.sp
\fBdelexpiredinvoice\fR [\fImaxexpirytime\fR]
diff --git a/doc/lightning-delexpiredinvoice.7.txt b/doc/lightning-delexpiredinvoice.7.txt
index 521e77b58..de8b7b832 100644
--- a/doc/lightning-delexpiredinvoice.7.txt
+++ b/doc/lightning-delexpiredinvoice.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-DELEXPIREDINVOICE(7)
NAME
----
-lightning-delexpiredinvoice - Protocol for removing expired invoices.
+lightning-delexpiredinvoice - Command for removing expired invoices.
SYNOPSIS
--------
diff --git a/doc/lightning-delinvoice.7 b/doc/lightning-delinvoice.7
index 775e47527..050ab1aaf 100644
--- a/doc/lightning-delinvoice.7
+++ b/doc/lightning-delinvoice.7
@@ -2,12 +2,12 @@
.\" Title: lightning-delinvoice
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 03/17/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-DELINVOIC" "7" "03/17/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-DELINVOIC" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-delinvoice \- Protocol for removing an invoice\&.
+lightning-delinvoice \- Command for removing an invoice\&.
.SH "SYNOPSIS"
.sp
\fBdelinvoice\fR \fIlabel\fR \fIstatus\fR
diff --git a/doc/lightning-delinvoice.7.txt b/doc/lightning-delinvoice.7.txt
index 50dca972d..06f0b2917 100644
--- a/doc/lightning-delinvoice.7.txt
+++ b/doc/lightning-delinvoice.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-DELINVOICE(7)
NAME
----
-lightning-delinvoice - Protocol for removing an invoice.
+lightning-delinvoice - Command for removing an invoice.
SYNOPSIS
--------
diff --git a/doc/lightning-getroute.7 b/doc/lightning-getroute.7
index e26a7b060..28565c536 100644
--- a/doc/lightning-getroute.7
+++ b/doc/lightning-getroute.7
@@ -2,12 +2,12 @@
.\" Title: lightning-getroute
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 02/19/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-GETROUTE" "7" "02/19/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-GETROUTE" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-getroute \- Protocol for routing a payment (low\-level)\&.
+lightning-getroute \- Command for routing a payment (low\-level)\&.
.SH "SYNOPSIS"
.sp
\fBgetroute\fR \fIid\fR \fImsatoshi\fR \fIriskfactor\fR [\fIcltv\fR] [\fIfuzzpercent\fR] [\fIseed\fR]
diff --git a/doc/lightning-getroute.7.txt b/doc/lightning-getroute.7.txt
index 8cdd6fadc..3bd7f5f5b 100644
--- a/doc/lightning-getroute.7.txt
+++ b/doc/lightning-getroute.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-GETROUTE(7)
NAME
----
-lightning-getroute - Protocol for routing a payment (low-level).
+lightning-getroute - Command for routing a payment (low-level).
SYNOPSIS
diff --git a/doc/lightning-invoice.7 b/doc/lightning-invoice.7
index de503eef7..584995b14 100644
--- a/doc/lightning-invoice.7
+++ b/doc/lightning-invoice.7
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-invoice \- Protocol for accepting payments\&.
+lightning-invoice \- Command for accepting payments\&.
.SH "SYNOPSIS"
.sp
\fBinvoice\fR \fImsatoshi\fR \fIlabel\fR \fIdescription\fR [\fIexpiry\fR] [\fIfallbacks\fR] [\fIpreimage\fR]
diff --git a/doc/lightning-invoice.7.txt b/doc/lightning-invoice.7.txt
index b6bc1fd9d..fa3916535 100644
--- a/doc/lightning-invoice.7.txt
+++ b/doc/lightning-invoice.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-INVOICE(7)
NAME
----
-lightning-invoice - Protocol for accepting payments.
+lightning-invoice - Command for accepting payments.
SYNOPSIS
--------
diff --git a/doc/lightning-listinvoices.7 b/doc/lightning-listinvoices.7
index ce7b90a4e..15fbb8664 100644
--- a/doc/lightning-listinvoices.7
+++ b/doc/lightning-listinvoices.7
@@ -2,12 +2,12 @@
.\" Title: lightning-listinvoices
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 01/18/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-LISTINVOI" "7" "01/18/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-LISTINVOI" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-listinvoices \- Protocol for querying invoice status
+lightning-listinvoices \- Command for querying invoice status
.SH "SYNOPSIS"
.sp
\fBlistinvoices\fR [\fIlabel\fR]
diff --git a/doc/lightning-listinvoices.7.txt b/doc/lightning-listinvoices.7.txt
index 4579a1c66..83cd18c63 100644
--- a/doc/lightning-listinvoices.7.txt
+++ b/doc/lightning-listinvoices.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-LISTINVOICES(7)
NAME
----
-lightning-listinvoices - Protocol for querying invoice status
+lightning-listinvoices - Command for querying invoice status
SYNOPSIS
--------
diff --git a/doc/lightning-listpayments.7 b/doc/lightning-listpayments.7
index f86183a4c..cf63dca0d 100644
--- a/doc/lightning-listpayments.7
+++ b/doc/lightning-listpayments.7
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-listpayments \- Protocol for querying payment status
+lightning-listpayments \- Command for querying payment status
.SH "SYNOPSIS"
.sp
\fBlistpayments\fR
diff --git a/doc/lightning-listpayments.7.txt b/doc/lightning-listpayments.7.txt
index 9afccd8db..2bbe53470 100644
--- a/doc/lightning-listpayments.7.txt
+++ b/doc/lightning-listpayments.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-LISTPAYMENTS(7)
NAME
----
-lightning-listpayments - Protocol for querying payment status
+lightning-listpayments - Command for querying payment status
SYNOPSIS
--------
diff --git a/doc/lightning-pay.7 b/doc/lightning-pay.7
index 84b1d02a6..eb48cf619 100644
--- a/doc/lightning-pay.7
+++ b/doc/lightning-pay.7
@@ -2,12 +2,12 @@
.\" Title: lightning-pay
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 03/21/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-PAY" "7" "03/21/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-PAY" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-pay \- Protocol for sending a payment to a BOLT11 invoice
+lightning-pay \- Command for sending a payment to a BOLT11 invoice
.SH "SYNOPSIS"
.sp
\fBpay\fR \fIbolt11\fR [\fImsatoshi\fR] [\fIdescription\fR] [\fIriskfactor\fR] [\fImaxfeepercent\fR] [\fIretry_for\fR] [\fImaxdelay\fR]
diff --git a/doc/lightning-pay.7.txt b/doc/lightning-pay.7.txt
index 4f5c0c58d..fa80a2cce 100644
--- a/doc/lightning-pay.7.txt
+++ b/doc/lightning-pay.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-PAY(7)
NAME
----
-lightning-pay - Protocol for sending a payment to a BOLT11 invoice
+lightning-pay - Command for sending a payment to a BOLT11 invoice
SYNOPSIS
--------
diff --git a/doc/lightning-sendpay.7 b/doc/lightning-sendpay.7
index 94e789ad3..43a25e461 100644
--- a/doc/lightning-sendpay.7
+++ b/doc/lightning-sendpay.7
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-sendpay \- Protocol for sending a payment via a route\&.
+lightning-sendpay \- Command for sending a payment via a route\&.
.SH "SYNOPSIS"
.sp
\fBsendpay\fR \fIroute\fR \fIhash\fR [\fImsatoshi\fR]
diff --git a/doc/lightning-sendpay.7.txt b/doc/lightning-sendpay.7.txt
index 301d01e87..2d55054d0 100644
--- a/doc/lightning-sendpay.7.txt
+++ b/doc/lightning-sendpay.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-SENDPAY(7)
NAME
----
-lightning-sendpay - Protocol for sending a payment via a route.
+lightning-sendpay - Command for sending a payment via a route.
SYNOPSIS
--------
diff --git a/doc/lightning-waitanyinvoice.7 b/doc/lightning-waitanyinvoice.7
index eabd7c8b7..02b9af0e0 100644
--- a/doc/lightning-waitanyinvoice.7
+++ b/doc/lightning-waitanyinvoice.7
@@ -2,12 +2,12 @@
.\" Title: lightning-waitanyinvoice
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 01/13/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-WAITANYIN" "7" "01/13/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-WAITANYIN" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-waitanyinvoice \- Protocol for waiting for payments\&.
+lightning-waitanyinvoice \- Command for waiting for payments\&.
.SH "SYNOPSIS"
.sp
\fBwaitanyinvoice\fR [\fIlastpay_index\fR]
diff --git a/doc/lightning-waitanyinvoice.7.txt b/doc/lightning-waitanyinvoice.7.txt
index 42743109b..4f9945fc5 100644
--- a/doc/lightning-waitanyinvoice.7.txt
+++ b/doc/lightning-waitanyinvoice.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-WAITANYINVOICE(7)
NAME
----
-lightning-waitanyinvoice - Protocol for waiting for payments.
+lightning-waitanyinvoice - Command for waiting for payments.
SYNOPSIS
--------
diff --git a/doc/lightning-waitinvoice.7 b/doc/lightning-waitinvoice.7
index 7fd4b3541..d492982c3 100644
--- a/doc/lightning-waitinvoice.7
+++ b/doc/lightning-waitinvoice.7
@@ -2,12 +2,12 @@
.\" Title: lightning-waitinvoice
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 02/03/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-WAITINVOI" "7" "02/03/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-WAITINVOI" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-waitinvoice \- Protocol for waiting for specific payment\&.
+lightning-waitinvoice \- Command for waiting for specific payment\&.
.SH "SYNOPSIS"
.sp
\fBwaitinvoice\fR \fIlabel\fR
diff --git a/doc/lightning-waitinvoice.7.txt b/doc/lightning-waitinvoice.7.txt
index eba1baa33..44215669a 100644
--- a/doc/lightning-waitinvoice.7.txt
+++ b/doc/lightning-waitinvoice.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-WAITINVOICE(7)
NAME
----
-lightning-waitinvoice - Protocol for waiting for specific payment.
+lightning-waitinvoice - Command for waiting for specific payment.
SYNOPSIS
--------
diff --git a/doc/lightning-waitsendpay.7 b/doc/lightning-waitsendpay.7
index 79f9e829e..ce08e83b4 100644
--- a/doc/lightning-waitsendpay.7
+++ b/doc/lightning-waitsendpay.7
@@ -2,12 +2,12 @@
.\" Title: lightning-waitsendpay
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 03/14/2018
+.\" Date: 04/26/2018
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "LIGHTNING\-WAITSENDP" "7" "03/14/2018" "\ \&" "\ \&"
+.TH "LIGHTNING\-WAITSENDP" "7" "04/26/2018" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-lightning-waitsendpay \- Protocol for sending a payment via a route\&.
+lightning-waitsendpay \- Command for sending a payment via a route\&.
.SH "SYNOPSIS"
.sp
\fBwaitsendpay\fR \fIpayment_hash\fR [\fItimeout\fR]
diff --git a/doc/lightning-waitsendpay.7.txt b/doc/lightning-waitsendpay.7.txt
index b00bbc0d4..9888fbca5 100644
--- a/doc/lightning-waitsendpay.7.txt
+++ b/doc/lightning-waitsendpay.7.txt
@@ -4,7 +4,7 @@ LIGHTNING-WAITSENDPAY(7)
NAME
----
-lightning-waitsendpay - Protocol for sending a payment via a route.
+lightning-waitsendpay - Command for sending a payment via a route.
SYNOPSIS
--------