- add MFH (Merge from Head) to glossary

PR:		205341
Submitted by:	catcher+freebsdbugzilla@lostpackets.de
Reviewed by:	wblock@
Differential Revision:	https://reviews.freebsd.org/D5445
This commit is contained in:
Jason Helfman 2016-02-27 01:40:36 +00:00
parent ef31de8444
commit a3c15f47da
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=48270

View file

@ -964,6 +964,11 @@
<glosssee otherterm="mfc-glossary"/>
</glossentry>
<glossentry>
<glossterm>MFH</glossterm>
<glosssee otherterm="mfh-glossary"/>
</glossentry>
<glossentry>
<glossterm>MFP4</glossterm>
<glosssee otherterm="mfp4-glossary"/>
@ -1044,6 +1049,15 @@
</glossdef>
</glossentry>
<glossentry xml:id="mfh-glossary">
<glossterm>Merge From Head</glossterm>
<acronym>MFH</acronym>
<glossdef subject="FreeBSD">
<para>To merge functionality or a patch from a repository HEAD
to an earlier branch.</para>
</glossdef>
</glossentry>
<glossentry xml:id="mfp4-glossary">
<glossterm>Merge From Perforce</glossterm>
<acronym>MFP4</acronym>