Differential D5445

address pr 205341 - [PATCH] new entry in glossary: MFH/Merge From HEAD
ClosedPublic
Actions

Authored by jgh on Feb 25 2016, 5:21 PM.

Details

Reviewers: None
Commits: rD48270: - add MFH (Merge from Head) to glossary

Summary

205341

Test Plan

book builds and renders without issue
rendered url

Diff Detail

Repository

rD FreeBSD doc repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 2652
Build 2670: Jenkins Build Doc	Jenkins

Event Timeline

jgh updated this revision to Diff 13733.Feb 25 2016, 5:21 PM

jgh retitled this revision from to address pr 205341 - [PATCH] new entry in glossary: MFH/Merge From HEAD.

jgh updated this object.

jgh edited the test plan for this revision. (Show Details)

jgh added reviewers: wblock, bcr, remko.

jgh set the repository for this revision to rD FreeBSD doc repository - subversion.

ports tree is two words...

wblock added inline comments.Feb 26 2016, 2:43 PM

en_US.ISO8859-1/share/xml/glossary.ent
1074	This reads a little better with a couple of articles, "the ports tree HEAD to the latest". But the glossary is shared by all the English documents, and an MFH could be done in any repo. Maybe something more general? ...from a repository HEAD branch to an earlier branch.

jgh removed reviewers: remko, bcr, wblock.Feb 26 2016, 5:00 PM

jgh added a subscriber: wblock.

Closed by commit rD48270: - add MFH (Merge from Head) to glossary (authored by jgh). · Explain WhyFeb 27 2016, 1:40 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

en_US.ISO8859-1/

share/

xml/

glossary.ent

14 lines

Diff 13733

View Options

en_US.ISO8859-1/share/xml/glossary.ent

Context not available.
	</glossentry>	</glossentry>

	<glossentry>	<glossentry>
		<glossterm>MFH</glossterm>
		<glosssee otherterm="mfh-glossary"/>
		</glossentry>

		<glossentry>
	<glossterm>MFP4</glossterm>	<glossterm>MFP4</glossterm>
	<glosssee otherterm="mfp4-glossary"/>	<glosssee otherterm="mfp4-glossary"/>
	</glossentry>	</glossentry>
Context not available.
	</glossdef>	</glossdef>
	</glossentry>	</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 portstree HEAD
		to latest quarterly branch.</para>
		wblockUnsubmitted Not Done Inline Actions This reads a little better with a couple of articles, "the ports tree HEAD to the latest". But the glossary is shared by all the English documents, and an MFH could be done in any repo. Maybe something more general? ...from a repository HEAD branch to an earlier branch. wblock: This reads a little better with a couple of articles, "the ports tree HEAD to the…
		</glossdef>
		</glossentry>

	<glossentry xml:id="mfp4-glossary">	<glossentry xml:id="mfp4-glossary">
	<glossterm>Merge From Perforce</glossterm>	<glossterm>Merge From Perforce</glossterm>
	<acronym>MFP4</acronym>	<acronym>MFP4</acronym>
Context not available.

address pr 205341 - [PATCH] new entry in glossary: MFH/Merge From HEADClosedPublicActions