From e16ac08f6f7995978fcbddac3db3cf4d1fa14090 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sat, 19 Oct 2019 01:36:52 +0300 Subject: [PATCH] Change order of paragraphs in manpage of fundchannel --- doc/lightning-fundchannel.7 | 12 +++++++----- doc/lightning-fundchannel.7.md | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/lightning-fundchannel.7 b/doc/lightning-fundchannel.7 index 33c3ea93e..78b48ffbf 100644 --- a/doc/lightning-fundchannel.7 +++ b/doc/lightning-fundchannel.7 @@ -36,17 +36,17 @@ so) or \fIslow\fR (next 100 blocks or so) to use lightningd’s internal estimates: \fInormal\fR is the default\. -\fIannounce\fR is an optional flag that triggers whether to announce this -channel or not\. Defaults to \fBtrue\fR\. An unannounced channel is considered -private\. - - Otherwise, \fIfeerate\fR is a number, with an optional suffix: \fIperkw\fR means the number is interpreted as satoshi-per-kilosipa (weight), and \fIperkb\fR means it is interpreted bitcoind-style as satoshi-per-kilobyte\. Omitting the suffix is equivalent to \fIperkb\fR\. +\fIannounce\fR is an optional flag that triggers whether to announce this +channel or not\. Defaults to \fBtrue\fR\. An unannounced channel is considered +private\. + + \fIminconf\fR specifies the minimum number of confirmations that used outputs should have\. Default is 1\. @@ -63,6 +63,7 @@ is reported and the channel is not funded\. The following error codes may occur: +.RS .IP \[bu] -1: Catchall nonspecific error\. .IP \[bu] @@ -74,6 +75,7 @@ The following error codes may occur: .IP \[bu] 303: Broadcasting of the funding transaction failed, the internal call to bitcoin-cli returned with an error\. +.RE Failure may also occur if \fBlightningd\fR and the peer cannot agree on channel parameters (funding limits, channel reserves, fees, etc\.)\. diff --git a/doc/lightning-fundchannel.7.md b/doc/lightning-fundchannel.7.md index 5b329b5fd..cf921eb32 100644 --- a/doc/lightning-fundchannel.7.md +++ b/doc/lightning-fundchannel.7.md @@ -34,15 +34,15 @@ the strings *urgent* (aim for next block), *normal* (next 4 blocks or so) or *slow* (next 100 blocks or so) to use lightningd’s internal estimates: *normal* is the default. -*announce* is an optional flag that triggers whether to announce this -channel or not. Defaults to `true`. An unannounced channel is considered -private. - Otherwise, *feerate* is a number, with an optional suffix: *perkw* means the number is interpreted as satoshi-per-kilosipa (weight), and *perkb* means it is interpreted bitcoind-style as satoshi-per-kilobyte. Omitting the suffix is equivalent to *perkb*. +*announce* is an optional flag that triggers whether to announce this +channel or not. Defaults to `true`. An unannounced channel is considered +private. + *minconf* specifies the minimum number of confirmations that used outputs should have. Default is 1.