aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/share
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2018-06-06 05:45:24 +0000
committerEitan Adler <eadler@FreeBSD.org>2018-06-06 05:45:24 +0000
commitf1498b46ba632ab3c754364cd668f7a21c0e7bfe (patch)
tree2a0a711bc1e1350b74ea2af19ace90c197ea94ad /en_US.ISO8859-1/share
parent762b1d27412b37828480c2e5743d60c9df03a230 (diff)
downloaddoc-f1498b46ba632ab3c754364cd668f7a21c0e7bfe.tar.gz
doc-f1498b46ba632ab3c754364cd668f7a21c0e7bfe.zip
glossary: remove perforce related entries
We no longer run a p4 server, and upstream stopped supporting fbsd, so stop documenting it.
Notes
Notes: svn path=/head/; revision=51781
Diffstat (limited to 'en_US.ISO8859-1/share')
-rw-r--r--en_US.ISO8859-1/share/xml/glossary.ent34
1 files changed, 0 insertions, 34 deletions
diff --git a/en_US.ISO8859-1/share/xml/glossary.ent b/en_US.ISO8859-1/share/xml/glossary.ent
index e552ac4021..5fca9e86cf 100644
--- a/en_US.ISO8859-1/share/xml/glossary.ent
+++ b/en_US.ISO8859-1/share/xml/glossary.ent
@@ -970,11 +970,6 @@
</glossentry>
<glossentry>
- <glossterm>MFP4</glossterm>
- <glosssee otherterm="mfp4-glossary"/>
- </glossentry>
-
- <glossentry>
<glossterm>MFS</glossterm>
<glosssee otherterm="mfs-glossary"/>
</glossentry>
@@ -1058,16 +1053,6 @@
</glossdef>
</glossentry>
- <glossentry xml:id="mfp4-glossary">
- <glossterm>Merge From Perforce</glossterm>
- <acronym>MFP4</acronym>
- <glossdef subject="FreeBSD">
- <para>To merge functionality or a patch from the Perforce
- repository to the -CURRENT branch.</para>
- <glossseealso otherterm="perforce-glossary"/>
- </glossdef>
- </glossentry>
-
<glossentry xml:id="mfs-glossary">
<glossterm>Merge From Stable</glossterm>
<acronym>MFS</acronym>
@@ -1231,11 +1216,6 @@
<title>P</title>
<glossentry>
- <glossterm>p4</glossterm>
- <glosssee otherterm="perforce-glossary"/>
- </glossentry>
-
- <glossentry>
<glossterm>PAE</glossterm>
<glosssee otherterm="pae-glossary"/>
</glossentry>
@@ -1339,20 +1319,6 @@
</glossdef>
</glossentry>
- <glossentry xml:id="perforce-glossary">
- <glossterm>Perforce</glossterm>
- <glossdef>
- <para>A source code control product made by
- <link xlink:href="http://www.perforce.com/">Perforce Software</link>.
- Although not open source, its use
- is free of charge to open-source projects such as &os;.</para>
-
- <para>Some &os; developers use a Perforce repository as a staging
- area for code that is considered too experimental for the
- -CURRENT branch.</para>
- </glossdef>
- </glossentry>
-
<glossentry xml:id="pc-glossary">
<glossterm>Personal Computer</glossterm>
<acronym>PC</acronym>