From owner-svn-doc-all@freebsd.org  Sat Feb 27 01:40:38 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37F7DAB6CDE;
 Sat, 27 Feb 2016 01:40:38 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0968099;
 Sat, 27 Feb 2016 01:40:37 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1R1ebOn092133;
 Sat, 27 Feb 2016 01:40:37 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1R1ebXa092132;
 Sat, 27 Feb 2016 01:40:37 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201602270140.u1R1ebXa092132@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 27 Feb 2016 01:40:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48270 - head/en_US.ISO8859-1/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Feb 2016 01:40:38 -0000

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@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>