Spellcheck. Fixed some wording, and responded to clahey's suggestions--

2000-10-04  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
	responded to clahey's suggestions-- notably, commented out the
	"add to master list" category feature.

	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
        description.

	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
	entities.

	* C/usage-notes.sgml: Spellchecked, then decided to comment out
	this file/chapter and all references to it, since it's unlikely to
	be implemented any time soon.

	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
	  need more work in the near future.

	* C/usage-sync.sgml: Now it's really short. And spelled correctly.

2000-10-03  Aaron Weber  <aaron@helixcode.com>

	* C/config-prefs.sgml: Mostly spelling. Still needs major
	alteration.

	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
	ran spellcheck. Still needs lots of work, since many menus have
	changed.

	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
	spellchecked.

svn path=/trunk/; revision=5702

1 files changed, 85 insertions, 26 deletions

diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index f13a56106a..7aa5e494dc 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -63,7 +63,7 @@
   <glossterm>Emoticon</glossterm>
   <glossdef>
    <para>
-     Also called smileys, emoticons are the little sideways faces made
+     Also called "smileys," emoticons are the little sideways faces made
      of colons and parentheses which people use to convey emotion in email.
      Examples: :-) or ;(  .
    </para>
@@ -89,7 +89,8 @@
     executable attachments, but before they can be run, the files must
     be marked as executable with a shell or file manager.  This
     security precaution prevents the automatic or accidental execution
-    of malicious programs.
+    of malicious programs. For more information on executables and file
+    permissions, see the documentation for your file manager or shell.
    </para>
   </glossdef>
  </glossentry>
@@ -131,10 +132,9 @@
   <glossterm>Haiku</glossterm>
   <glossdef>
    <para>
-     A Japanese form of poetry.  Haiku are unrhymed, and
-     three lines long. The first and last lines should have five
-     syllables, and the second line seven syllables.  The subject
-     matter is traditionally related to the seasons.
+     A traditional Japanese form of poetry.  The poems are three lines
+     long, with first and last lines having five syllables, and the
+     second line seven syllables.
    </para>
   </glossdef>
  </glossentry>
@@ -144,9 +144,9 @@
   <glossdef>
    <para>
     Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
-    language which all webpages are written in.  HTML can be used
-    inside of e-mails to insert images, justfiy text different ways,
-    and even include webpages inside the e-mail itself.
+    language which all web pages are written in.  HTML can be used
+    inside of e-mails to insert images, justify text different ways,
+    and even include web pages inside the e-mail itself.
    </para>
   </glossdef>
  </glossentry>
@@ -191,9 +191,9 @@
    <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, the Lightweight Directory Access Protocol, allows a client
+     to search through a large database of addresses, phone numbers,
+     and people stored on a server.
     </para>
    </glossdef>
   </glossentry>
@@ -251,12 +251,26 @@
   </glossdef>
  </glossentry>
 
+ <glossentry id="protocol">
+  <glossterm>Protocol</glossterm>
+  <glossdef>
+   <para>
+     An agreed-upon method of communication, especially one for
+     sending particular types of information between computer systems.
+     Examples include POP (Post Office Protocol), for email, and HTTP
+     (HypterText Transfer Protocol), for web pages.
+
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="regular-expression">
   <glossterm>Regular Expression</glossterm>
   <glossdef>
    <para>
       A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wildcard symbols.  For
+      string of text using metacharacters or wild-card symbols.  For
       example, the statement <userinput>fly*so[a|u]p</userinput> means
       "any phrase beginning with 'fly' and ending in 'soup' or
       'soap'".  If you searched for that expression, you'd find both
@@ -271,18 +285,37 @@
   <glossterm>Script</glossterm>
   <glossdef>
    <para>
-    A program which is written in an interpreted language, which can
-    be executed.
+    A program, which is written in an interpreted (rather than
+    compiled) language.  Scripts are more likely to work on multiple
+    platforms, but they require an additional layer of software (the
+    interpreter) which mediates between them and the operating system.
+    Because of this, they typically suffer from relatively sluggish
+    performance, and are limited to smaller tasks.
    </para>
   </glossdef>
  </glossentry>
 
+ <glossentry id="sendmail">
+  <glossterm>Sendmail</glossterm>
+  <glossdef>
+   <para>
+      As its name implies, <application>sendmail</application> is a
+      program which sends mail.  <application>Evolution</application>
+      can use it instead of <glossterm>SMTP</glossterm>; some people
+      prefer it because it offers more flexibility, but is more
+      difficult to set up.
+   </para>
+  </glossdef>
+ </glossentry>
+
+
  <glossentry id="shortcut-bar">
   <glossterm>Shortcut Bar</glossterm>
   <glossdef>
    <para>
-    The <interface>Shortcut Bar</interface> is where the user accesses
-    all the components of <application>Evolution</application> from.
+     A portion of <application>Evolution</application> which offers
+     users fast access to the most frequently used portions of the
+     application.
    </para>
   </glossdef>
  </glossentry>
@@ -291,22 +324,47 @@
    <glossterm>Signature</glossterm>
    <glossdef>
     <para>
-     Signatures allow a user to specify a message to place at the bottom of
-     every email sent.  A signature can be anything from a favorite quote to
-     a link to a webpage.
+     In email terms, a signature is a piece of text placed at the end
+     of every email sent, like a hand-written signature at the bottom
+     of a written letter.  A signature can be anything from a favorite
+     quotation to a link to a web page; courtesy dictates that it be
+     fewer than four lines long.
     </para>
    </glossdef>
   </glossentry> 
 
+  <glossentry id="SMTP">
+   <glossterm>SMTP</glossterm>
+   <glossdef>
+    <para>
+      This is the most common way of transporting mail messages from
+      the client's computer (you) to the server. SMTP stands for
+      Simple Mail Transfer Protocol.
+    </para>
+   </glossdef>
+  </glossentry> 
 
  <glossentry id="spam">
   <glossterm>Spam</glossterm>
   <glossdef>
    <para>
-    Spam: useless, unwanted e-mail.  Spam normally comes in forms of
-    chain-letters and advertisements for unscrupulous websites or
-    services.  Messages that are merely useless are called
-    "opt-in newsletters."
+    Useless, unwanted e-mail.  Spam normally comes in forms of
+    chain-letters and advertisements for unscrupulous web sites or
+    services.  Messages that are merely useless are called "opt-in
+    newsletters."
+   </para>
+  </glossdef>
+ <
+/glossentry>
+
+ <glossentry id="virus">
+  <glossterm>Virus</glossterm>
+  <glossdef>
+   <para>
+    A malicious program which inserts itself into others so that it will be 
+    executed, allowing it to spread to still more programs and other computers.
+    A virus can cause substantial damage by clogging networks or disk drives, 
+    deleting files, or opening security holes.
    </para>
   </glossdef>
  </glossentry>
@@ -315,8 +373,9 @@
   <glossterm>vFolder</glossterm>
   <glossdef>
    <para>
-    vFolders allow an e-mail to be shared among multiple folders, so
-    it appears that theres a copy of the e-mail in each folder.
+    An email organization tool. vFolders allows you to create a folder
+    that contains the results of a complex search. Folder contents are
+    are updated dynamically.
    </para>
   </glossdef>
  </glossentry>