Updates after rebase on latest master

I didn't resolve the merge conflict correctly, I believe
This commit is contained in:
Rylan Polster 2021-01-18 21:29:21 -05:00
parent 1e4fef8123
commit 862ffb6e8b
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
2 changed files with 3 additions and 3 deletions

View File

@ -1088,7 +1088,7 @@ casks to check is taken from `HOMEBREW_LIVECHECK_WATCHLIST` or
* `--cask`:
Only check casks.
### `man` [*`--fail-if-changed`*] [*`--link`*]
### `man` [*`--fail-if-changed`*]
Generate Homebrew's manpages.

View File

@ -1502,14 +1502,14 @@ Only check formulae\.
\fB\-\-cask\fR
Only check casks\.
.
.SS "\fBman\fR [\fI\-\-fail\-if\-changed\fR] [\fI\-\-link\fR]"
.SS "\fBman\fR [\fI\-\-fail\-if\-changed\fR]"
Generate Homebrew\'s manpages\.
.
.TP
\fB\-\-fail\-if\-changed\fR
Return a failing status code if changes are detected in the manpage outputs\. This can be used to notify CI when the manpages are out of date\. Additionally, the date used in new manpages will match those in the existing manpages (to allow comparison without factoring in the date)\.
.
.SS "\fBmirror\fR \fIformula\fR [\fIformula\fR \.\.\.]"
.SS "\fBmirror\fR [\fIoptions\fR] \fIformula\fR [\.\.\.]"
Reupload the stable URL of a formula to Bintray for use as a mirror\.
.
.TP