Differential D23327 Diff 118239 usr.sbin/mergemaster/mergemaster.8

Changeset View

Standalone View

usr.sbin/mergemaster/mergemaster.8

	Show All 18 Lines
	.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)			.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT			.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY			.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF			.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	.\" SUCH DAMAGE.			.\" SUCH DAMAGE.
	.\"			.\"
	.\" $FreeBSD$			.\" $FreeBSD$
	.\"			.\"
	.Dd May 20, 2021			.Dd March 2, 2023
	.Dt MERGEMASTER 8			.Dt MERGEMASTER 8
	.Os			.Os
	.Sh NAME			.Sh NAME
	.Nm mergemaster			.Nm mergemaster
	.Nd merge configuration files, et al during an upgrade			.Nd merge configuration files, et al during an upgrade
	.Sh SYNOPSIS			.Sh SYNOPSIS
	.Nm			.Nm
	.Op Fl scrvhpCP			.Op Fl scrvhpCP
	.Op Fl a\|iFU			.Op Fl a\|iFU
	.Op Fl -run-updates=[always\|never]			.Op Fl -run-updates=[always\|never]
	.Op Fl m Ar /path/to/sources			.Op Fl m Ar /path/to/sources
	.Op Fl t Ar /path/to/temp/root			.Op Fl t Ar /path/to/temp/root
	.Op Fl d			.Op Fl d
	.Op Fl u Ar N			.Op Fl u Ar N
	.Op Fl w Ar N			.Op Fl w Ar N
	.Op Fl A Ar Target architecture			.Op Fl A Ar Target architecture
	.Op Fl D Ar /destdir/path			.Op Fl D Ar /destdir/path
	.Sh DESCRIPTION			.Sh DESCRIPTION
				.Bf -symbolic
				The
				.Nm
				utility is deprecated and may not be available in
				rgrimesUnsubmitted Not Done Inline Actions utility is being deprecated at .Fx 13.0. Then this can be merged to stable/11 and stable/12? rgrimes: utility is being deprecated at .Fx 13.0. Then this can be merged to stable/11 and stable/12?
				emasteAuthorUnsubmitted Done Inline Actions Do you suggest we indicate it's deprecated in 13 and then remove it before 14, or remove in 13? i.e., what about one of these: The .Nm utility is deprecated and will not be available in .Fx 13.0. The .Nm utility is deprecated and will not be available in .Fx 14.0. etcupdate is available in all supported releases emaste: Do you suggest we indicate it's deprecated in 13 and then remove it before 14, or remove in 13?
				.Fx 14.0
				or later.
				Users are advised to use
				.Xr etcupdate 8
				instead.
				.Ef
				.Pp
	The			The
	.Nm			.Nm
	utility is a Bourne shell script which is designed to aid you			utility is a Bourne shell script which is designed to aid you
	in updating the various configuration and other files			in updating the various configuration and other files
	associated with			associated with
	.Fx .			.Fx .
	It is			It is
	.Sy HIGHLY			.Sy HIGHLY
	▲ Show 20 Lines • Show All 423 Lines • Show Last 20 Lines