git: a39decd73f82 - main - etcupdate: remove mergemaster cross-reference

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Tue, 16 Jul 2024 01:38:03 UTC

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=a39decd73f82c74cbe2cecb8f71ca5d3417e5978

commit a39decd73f82c74cbe2cecb8f71ca5d3417e5978
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-07-16 01:36:34 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-07-16 01:37:14 +0000

    etcupdate: remove mergemaster cross-reference
    
    It will be retired soon.
    
    Sponsored by:   The FreeBSD Foundation
---
 usr.sbin/etcupdate/etcupdate.8 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8
index 82c36fc9cb68..22d3d91bb6eb 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/usr.sbin/etcupdate/etcupdate.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 9, 2022
+.Dd July 15, 2024
 .Dt ETCUPDATE 8
 .Os
 .Sh NAME
@@ -894,7 +894,6 @@ but it has been removed in the destination directory.
 .Xr make 1 ,
 .Xr newaliases 1 ,
 .Xr sh 1 ,
-.Xr mergemaster 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr services_mkdb 8 ,
 .Xr tzsetup 8