svn commit: r48270 - head/en_US.ISO8859-1/share/xml

[Jason Helfman]

Author: jgh
Date: Sat Feb 27 01:40:36 2016
New Revision: 48270
URL: https://svnweb.freebsd.org/changeset/doc/48270

Log:
  - add MFH (Merge from Head) to glossary
  
  PR:		205341
  Submitted by:	catcher+freebsdbugzilla at lostpackets.de
  Reviewed by:	wblock@
  Differential Revision:	https://reviews.freebsd.org/D5445

Modified:
  head/en_US.ISO8859-1/share/xml/glossary.ent

Modified: head/en_US.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/glossary.ent	Fri Feb 26 22:35:51 2016	(r48269)
+++ head/en_US.ISO8859-1/share/xml/glossary.ent	Sat Feb 27 01:40:36 2016	(r48270)
@@ -965,6 +965,11 @@
     </glossentry>
 
     <glossentry>
+      <glossterm>MFH</glossterm>
+      <glosssee otherterm="mfh-glossary"/>
+    </glossentry>
+
+    <glossentry>
       <glossterm>MFP4</glossterm>
       <glosssee otherterm="mfp4-glossary"/>
     </glossentry>
@@ -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>