From 862ffb6e8b27892fc2ff111484f8964a8fc42b01 Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Mon, 18 Jan 2021 21:29:21 -0500
Subject: [PATCH] Updates after rebase on latest master

I didn't resolve the merge conflict correctly, I believe
---
 docs/Manpage.md | 2 +-
 manpages/brew.1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Manpage.md b/docs/Manpage.md
index 9c1403206c..0e06c37f7e 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -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.
 
diff --git a/manpages/brew.1 b/manpages/brew.1
index 6321c4bb1a..0513a2af82 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -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