aboutsummaryrefslogtreecommitdiffstats
path: root/help/C/apx-gloss.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'help/C/apx-gloss.sgml')
-rw-r--r--help/C/apx-gloss.sgml32
1 files changed, 28 insertions, 4 deletions
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 5693ecda1c..f13a56106a 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -173,14 +173,27 @@
</glossdef>
</glossentry>
-
+ <glossentry id="imap">
+ <glossterm>IMAP</glossterm>
+ <glossdef>
+ <para>
+ Depending upon whom you ask, IMAP stands for the Internet Mail
+ Access Protocol, or the Interim Mail Access Protocol. Whatever it
+ stands for, it allows access to email which is typically (although
+ not always) stored remotely on a server rather than on a local
+ hard disk. Often contrasted with <glossterm>POP</glossterm>.
+ This will not be on the test.
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry id="ldap">
<glossterm>LDAP</glossterm>
<glossdef>
<para>
- LDAP is a protocol which allows a client to search through a large database
- of addresses, phone numbers, and people, as an alternative to a physical
- phone book.
+ LDAP is a protocol which allows a client to search through a
+ large database of addresses, phone numbers, and people, as an
+ alternative to a physical phone book.
</para>
</glossdef>
</glossentry>
@@ -227,6 +240,17 @@
</glossdef>
</glossentry>
+ <glossentry id="pop">
+ <glossterm>POP</glossterm>
+ <glossdef>
+ <para>
+ POP, the Post Office Protocol, is a mechanism for email
+ transport. In contrast to IMAP, it is used only to get mail from
+ a server and store it locally on your hard disk.
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry id="regular-expression">
<glossterm>Regular Expression</glossterm>
<glossdef>