diff --git a/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml b/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml index fdf4b1ac4f..fcd5f2cd7a 100644 --- a/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml +++ b/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml @@ -1,97 +1,97 @@ &os; Glossary This glossary contains terms and acronyms specific to &os;. B Berkeley Software Distribution BSD This is the name that the Computer Systems Research Group at Berkeley gave to their improvements and modifications to AT&T's 32V &unix;. Bikeshed Building A phenomenon whereby many people will give an opinion on an uncomplicated topic, whilst a complex topic receives little or no discussion. See the FAQ for the origin of the term. BSD - K Kernel Scheduler Entities KSE A kernel-supported threading system. See the project home page for further details. KSE M Merge From Current MFC To merge functionality or a patch from the -CURRENT branch to another, most often -STABLE. Merge From Stable MFS In the normal course of FreeBSD development, a change will be committed to the -CURRENT branch for testing before being merged to -STABLE. On rare occassions, a change will go into -STABLE first and then be merged to -CURRENT. MFC MFS