From f248d5270dcc53c6c360f23bdb605aa7e94ef0f6 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 30 Dec 2005 00:11:56 +0000
Subject: [PATCH] Add a number of new terms.

PR:		docs/70555
Submitted by:	Niclas Zeising <lothrandil at n00b dot apagnu dot se>
---
 .../share/sgml/glossary/freebsd-glossary.sgml | 117 +++++++++++++++---
 1 file changed, 98 insertions(+), 19 deletions(-)

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 2bd2cdd403..95c9da32dc 100644
--- a/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
+++ b/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
@@ -1,4 +1,4 @@
-<!-- 
+<!--
     $FreeBSD$
 
     FreeBSD Glossary Terms
@@ -59,6 +59,11 @@
       <glosssee otherterm="aml-glossary">
     </glossentry>
 
+    <glossentry>
+      <glossterm>API</glossterm>
+      <glosssee otherterm="api-glossary">
+    </glossentry>
+
     <glossentry>
       <glossterm>APIC</glossterm>
       <glosssee otherterm="apic-glossary">
@@ -131,6 +136,17 @@
       </glossdef>
     </glossentry>
 
+    <glossentry id="api-glossary">
+      <glossterm>Application Programming Interface</glossterm>
+      <acronym>API</acronym>
+      <glossdef>
+        <para>A set of procedures, protocols and tools that specify the
+	  canonical interaction of one or more program parts; how, when
+	  and why they do work together, and what data they share or
+	  operate on.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry id="apm-glossary">
       <glossterm>Advanced Power Management</glossterm>
       <acronym>APM</acronym>
@@ -203,7 +219,14 @@
       <glossterm>Basic Input/Output System</glossterm>
       <acronym>BIOS</acronym>
       <glossdef>
-        <para></para>
+        <para>The definition of <acronym>BIOS</acronym> depends a bit on
+	  the context. Some people refer to it as the <acronym>ROM</acronym>
+	  chip with a basic set of routines to provide an interface between
+	  software and hardware.  Others refer to it as the set of routines
+	  contained in the chip that help in bootstrapping the system.  Some
+	  might also refer to it as the screen used to configure the
+	  boostrapping process. The <acronym>BIOS</acronym> is PC-specific
+	  but other systems have something similar.</para>
       </glossdef>
     </glossentry>
 
@@ -211,7 +234,7 @@
       <glossterm>Berkeley Internet Name Domain</glossterm>
       <acronym>BIND</acronym>
       <glossdef>
-        <para></para>
+	<para>An implementation of the <acronym>DNS</acronym> protocols.</para>
       </glossdef>
     </glossentry>
 
@@ -291,7 +314,11 @@
       <glossterm>Central Processing Unit</glossterm>
       <acronym>CPU</acronym>
       <glossdef>
-        <para></para>
+        <para>Also known as the processor.  This is the brain of the
+	  computer where all calculations take place.  There are a number of
+	  different architectures with different instruction sets.  Among
+	  the more well-known are the Intel-x86 and derivatives, Sun SPARC,
+	  PowerPC, and Alpha.</para>
       </glossdef>
     </glossentry>
 
@@ -445,7 +472,8 @@
       <glossterm>Domain Name System</glossterm>
       <acronym>DNS</acronym>
       <glossdef>
-        <para></para>
+	<para>The system that converts humanly readable hostnames (i.e.,
+	  mail.example.net) to Internet addresses and vice versa.</para>
       </glossdef>
     </glossentry>
 
@@ -453,7 +481,9 @@
       <glossterm>Dynamic Host Configuration Protocol</glossterm>
       <acronym>DHCP</acronym>
       <glossdef>
-        <para></para>
+	<para>A protocol that dynamically assigns IP addresses to a computer
+	  (host) when it requests one from the server.  The address assignment
+	  is called a <quote>lease</quote>.<para>
       </glossdef>
     </glossentry>
   </glossdiv>
@@ -544,7 +574,9 @@
       <glossterm>File Transfer Protocol</glossterm>
       <acronym>FTP</acronym>
       <glossdef>
-        <para></para>
+	<para>A member of the family of high-level protocols implemented
+	  on top of <acronym>TCP</acronym> which can be used to transfer
+	  files over a <acronym>TCP/IP</acronym> network.</para>
       </glossdef>
     </glossentry>
 
@@ -680,7 +712,10 @@
       <glossterm><acronym>IP</acronym> Version 4</glossterm>
       <acronym>IPv4</acronym>
       <glossdef>
-        <para></para>
+	<para>The <acronym>IP</acronym> protocol version 4, which uses 32 bits
+	  for addressing.  This version is still the most widely used, but it
+	  is slowly being replaced with <acronym>IPv6</acronym>.</para>
+	<glossseealso otherterm="ipv6-glossary">
       </glossdef>
     </glossentry>
 
@@ -688,7 +723,9 @@
       <glossterm><acronym>IP</acronym> Version 6</glossterm>
       <acronym>IPv6</acronym>
       <glossdef>
-        <para></para>
+	<para>The new <acronym>IP</acronym> protocol. Invented because the
+	  address space in <acronym>IPv4</acronym> is running out.  Uses 128
+	  bits for addressing.</para>
       </glossdef>
     </glossentry>
 
@@ -729,7 +766,13 @@
       <glossterm>Internet Protocol</glossterm>
       <acronym>IP</acronym>
       <glossdef>
-        <para></para>
+	<para>The packet transmitting protocol that is the basic protocol on
+	  the Internet.  Originally developed at the U.S. Department of
+	  Defense and an extremly important part of the <acronym>TCP/IP
+	  </acronym> stack.  Without the Internet Protocol, the Internet
+	  would not have become what it is today.  For more information, see
+	  <ulink url="ftp://ftp.rfc-editor.org/in-notes/rfc791.txt">
+	  RFC 791</ulink>.</para>
       </glossdef>
     </glossentry>
 
@@ -737,7 +780,7 @@
       <glossterm>Internet Service Provider</glossterm>
       <acronym>ISP</acronym>
       <glossdef>
-        <para></para>
+	<para>A company that provides access to the Internet.</para>
       </glossdef>
   </glossdiv>
 
@@ -817,7 +860,9 @@
       <glossterm>Kilo Bits Per Second</glossterm>
       <acronym>Kbps</acronym>
       <glossdef>
-        <para></para>
+	<para>Used to measure bandwith (how much data can pass a given
+	  point at a specified amount of time).  Alternates to the Kilo
+	  prefix include Mega, Giga, Tera, and so forth.</para>
       </glossdef>
     </glossentry>
   </glossdiv>
@@ -852,7 +897,8 @@
       <glossterm>Local Area Network</glossterm>
       <acronym>LAN</acronym>
       <glossdef>
-        <para></para>
+	<para>A network used on a local area, e.g. office, home, or so forth.
+	  </para>
       </glossdef>
     </glossentry>
 
@@ -935,7 +981,11 @@
       <glossterm>Mail Transfer Agent</glossterm>
       <acronym>MTA</acronym>
       <glossdef>
-        <para></para>
+	<para>An application used to transfer email.  An
+	  <acronym>MTA</acronym> has traditionally been part of the BSD
+	  base system.  Today Sendmail is included in the base system, but
+	  there are many other <acronym>MTAs</acronym>, such as postfix,
+	  qmail and Exim.</para>
       </glossdef>
     </glossentry>
 
@@ -943,7 +993,7 @@
       <glossterm>Mail User Agent</glossterm>
       <acronym>MUA</acronym>
       <glossdef>
-        <para></para>
+	<para>An application used by users to display and write email.</para>
       </glossdef>
     </glossentry>
 
@@ -1116,7 +1166,13 @@
       <glossterm>Operating System</glossterm>
       <acronym>OS</acronym>
       <glossdef>
-        <para></para>
+	<para>A set of programs, libraries and tools that provide access to
+	  the hardware resources of a computer.  Operating systems range
+	  today from simplistic designs that support only one program
+	  running at a time, accessing only one device to fully
+	  multi-user, multi-tasking and multi-process systems that can
+	  serve thousands of users simultaneously, each of them running
+	  dozens of different applications.</para>
       </glossdef>
     </glossentry>
 
@@ -1530,7 +1586,13 @@
       <glossterm>Request For Comments</glossterm>
       <acronym>RFC</acronym>
       <glossdef>
-        <para></para>
+	<para>A set of documents defining Internet standards, protocols, and
+	  so forth.  See
+	  <ulink url="http://www.rfc-editor.org/">www.rfc-editor.org</ulink>.
+	  <para>
+	  
+	<para>Also used as a general term when someone has a suggested change
+	  and wants feedback.</para>
       </glossdef>
     </glossentry>
 
@@ -1681,6 +1743,11 @@
       <glosssee otherterm="tcp-glossary">
     </glossentry>
 
+    <glossentry>
+      <glossterm>TCP/IP</glossterm>
+      <glosssee otherterm="tcpip-glossary">
+    </glossentry>
+
     <glossentry>
       <glossterm>TD</glossterm>
       <glosssee otherterm="td-glossary">
@@ -1714,7 +1781,7 @@
       <acronym>TSC</acronym>
       <!-- From dg@, 20040814125503.GF40460@nexus.dglawrence.com -->
       <glossdef>
-        <para>A profiling counter internal to modern &pentium; processors
+	<para>A profiling counter internal to modern &pentium; processors
 	  that counts core frequency clock ticks.</para>
       </glossdef>
     </glossentry>
@@ -1723,7 +1790,19 @@
       <glossterm>Transmission Control Protocol</glossterm>
       <acronym>TCP</acronym>
       <glossdef>
-        <para></para>
+        <para>A protocol that sits on top of (e.g.) the <acronym>IP</acronym>
+	  protocol and guarantees that packets are delivered in a reliable,
+	  ordered, fashion.</para>
+      </glossdef>
+    </glossentry>
+
+    <glossentry id="tcpip-glossary">
+      <glossterm>Transmission Control Protocol/Internet Protocol</glossterm>
+      <acronym>TCP/IP</acronym>
+      <glossdef>
+        <para>The term for the combination of the <acronym>TCP</acronym>
+	  protocol running over the <acronym>IP</acronym> protocol.  Much of
+	  the Internet runs over <acronym>TCP/IP</acronym>.</para>
       </glossdef>
     </glossentry>