jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 10:52:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mergemaster: postpone removal to FreeBSD 15

Browse Source 
Mergemaster has been deprecated for quite some time, but was not
removed prior to FreeBSD 14.0.  Update the deprecation notice in the man
page to reflect this.

PR:		274967
Reported by:	naddy
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 73cce7d888)
(cherry picked from commit c0e5d8f9bd)
This commit is contained in:
Ed Maste 2024-04-16 10:19:14 -04:00
parent 61d43332e6
commit 6e1a7ade21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/mergemaster/mergemaster.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd March 2, 2023
.Dd April 16, 2024
.Dt MERGEMASTER 8
.Os
.Sh NAME
@ -45,7 +45,7 @@
The
.Nm
utility is deprecated and may not be available in
.Fx 14.0
.Fx 15.0
or later.
Users are advised to use
.Xr etcupdate 8