Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2020 20:04:09 +0000 (UTC)
From:      Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r53861 - head/en_US.ISO8859-1/share/xml
Message-ID:  <202002032004.013K49Kt094410@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: carlavilla
Date: Mon Feb  3 20:04:08 2020
New Revision: 53861
URL: https://svnweb.freebsd.org/changeset/doc/53861

Log:
  Add MFV explanation in freebsd glossary
  
  PR:		214228
  Submitted by:	chris@cretaforce.gr
  Patch by:	carlavilla@
  Approved by:	bcr@(mentor)
  Differential Revision:	https://reviews.freebsd.org/D23455

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	Mon Feb  3 18:54:01 2020	(r53860)
+++ head/en_US.ISO8859-1/share/xml/glossary.ent	Mon Feb  3 20:04:08 2020	(r53861)
@@ -975,6 +975,11 @@
     </glossentry>
 
     <glossentry>
+      <glossterm>MFV</glossterm>
+      <glosssee otherterm="mfv-glossary"/>
+    </glossentry>
+
+    <glossentry>
       <glossterm>MIT</glossterm>
       <glosssee otherterm="mit-glossary"/>
     </glossentry>
@@ -1065,6 +1070,14 @@
 	<para>This term is also used when a patch is merged from -STABLE
 	  to a security branch.</para>
 	<glossseealso otherterm="mfc-glossary"/>
+      </glossdef>
+    </glossentry>
+
+    <glossentry xml:id="mfv-glossary">
+      <glossterm>Merge From Vendor</glossterm>
+      <acronym>MFV</acronym>
+      <glossdef>
+        <para/>
       </glossdef>
     </glossentry>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002032004.013K49Kt094410>