Changeset View
Changeset View
Standalone 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 November 27, 2018 | .Dd May 20, 2021 | ||||
.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 | ||||
▲ Show 20 Lines • Show All 417 Lines • ▼ Show 20 Lines | |||||
.Xr make 1 , | .Xr make 1 , | ||||
.Xr less 1 , | .Xr less 1 , | ||||
.Xr sdiff 1 , | .Xr sdiff 1 , | ||||
.Xr etcupdate 8 , | .Xr etcupdate 8 , | ||||
.Xr pwd_mkdb 8 | .Xr pwd_mkdb 8 | ||||
.Pp | .Pp | ||||
.Pa /usr/src/etc/Makefile | .Pa /usr/src/etc/Makefile | ||||
.Rs | .Rs | ||||
.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html | .%U https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld | ||||
.%T The Cutting Edge (using make world) | .%T The FreeBSD Handbook | ||||
.%A Nik Clayton | |||||
.Re | .Re | ||||
.Sh HISTORY | .Sh HISTORY | ||||
The | The | ||||
.Nm | .Nm | ||||
utility was first publicly available on one of my | utility was first publicly available on one of my | ||||
web pages in a much simpler form under the name | web pages in a much simpler form under the name | ||||
.Pa comproot | .Pa comproot | ||||
on 13 March 1998. | on 13 March 1998. | ||||
The idea for creating the | The idea for creating the | ||||
temporary root environment comes from Nik Clayton's | temporary root environment comes from Nik Clayton's | ||||
make world tutorial which is referenced above. | make world tutorial which is referenced above. | ||||
.Sh AUTHORS | .Sh AUTHORS | ||||
This manual page and the script itself were written by | This manual page and the script itself were written by | ||||
.An Douglas Barton Aq Mt dougb@FreeBSD.org . | .An Douglas Barton Aq Mt dougb@FreeBSD.org . |