more meetings-by-mail additions. Had no idea this needed so much work.

2001-09-19  Aaron Weber  <aaron@ximian.com>

	* C/usage-calendar.sgml: more meetings-by-mail additions. Had no
	idea this needed so much work.

	* C/usage-mail.sgml: Added info about meetings-by-mail.

	* C/menuref.sgml: added F9 instructions.

	* C/config-prefs.sgml: added info on how to connect to an arbitrary port.

	* C/usage-mail.sgml: Revised gnome-vfs-http-proxy info.

	* C/usage-exec-summary.sgml: added gnome-vfs-http-proxy
	info. Almost the same as the stuff in usage-mail.

	* C/usage-mail-org.sgml: removed regex item.

svn path=/trunk/; revision=12971

7 files changed, 219 insertions, 48 deletions

diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 48da53b775..001add09c6 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -132,6 +132,21 @@
              connection.  To turn SSL connections on, just click the
              <guibutton>Use Secure Connection (SSL)</guibutton>
              button.
+
+<note id="config-arbitrary-port">
+<title>Specifying Port Numbers</title>
+<para>
+Your system administrator may ask you to connect to a specific port on
+a mail server. To specify which port you use, just type a colon and
+the port number after the server name. For example, to connect to port
+143 on the server smtp.omniport.com, you would enter
+as
+<userinput>
+smtp.omniport.com:143
+</userinput> as the server name.
+</para>
+</note>
+
 	  </para>
 	  </listitem>
 	  </varlistentry>
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index fca576d52c..bc5008f68d 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -150,7 +150,20 @@
         mouse:
          <variablelist>
 
-          <varlistentry>
+  
+        <varlistentry>
+	    <term>Send and Receive Mail</term>
+	    <listitem>
+	      <para>
+                Press <keycap>F9</keycap>, click the
+                <guibutton>Send/Receive</guibutton> button in the
+                toolbar, or choose
+                <menuchoice><guimenu>Actions</guimenu> 
+                 <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
+                </para>
+	    </listitem>
+	  </varlistentry>
+        <varlistentry>
 	    <term>Navigating the Message List with the Keyboard</term>
 	    <listitem>
 	      <para>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 631ea41d84..710b637bfd 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -219,25 +219,15 @@
     <sect2 id="usage-calendar-apts-group">
       <title>Appointments for Groups</title>
       <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
+	You can use <application>Evolution</application> to mark a
+	meeting request on another person's calendar.  To do it, click
+	<guibutton>New</guibutton> in the calendar toolbar, or select
+	<menuchoice> <guimenu>File</guimenu>
 	<guisubmenu>New</guisubmenu>
 	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new appointment</interface> window.  Then describe
-	the appointment as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
+	up the <interface>new appointment</interface> window.  Then
+	describe the appointment as you would any other. When you are
+	ready to send the invitation <guibutton>OK</guibutton>
 	<application>Evolution</application> will automatically send
 	email to each person on the request list, notifying of the
 	time and date of the meeting you have requested with them.  In
@@ -253,6 +243,18 @@
 	window, click the "tentative" button to De-select the
 	appointment.
       </para>
+      <para>
+        When your meeting attendees get the email inviting them to the
+        meeting, they'll be able to enter the information into their
+        calendars and let you know if they'll be able to attend; if
+        they use <application>Ximian Evolution</application> or
+        another iCal compliant mail client, they can do this with just
+        one click. When you get a response from them, it will include
+        an iCal attachment. Opening and accepting this attachment will
+        change the meeting data in your calendar to indicate that they
+        have responded to your invitation, and whether they will be in
+        attendance.
+     </para>
     </sect2>
 
 
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index fc2963cc0a..be59cb389d 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -52,6 +52,100 @@
       to suit your needs.  For example, you can choose which mail
       boxes are summarized, and which news services appear.
     </para>
+
+
+  <note id="summary-http-proxy">
+	<title>Using the Summary through an HTTP Proxy</title>
+        <para>
+           If you use an HTTP proxy, <application>Ximian
+           Evolution</application> must be able to find it through the
+           <systemitem>gnome-vfs</systemitem> subsystem before it can
+           access news and weather from the Internet.  This is also
+           the case if you wish to load remote images into HTML mail
+           message.  You can tell the GNOME Virtual File System about
+           your HTTP proxy in one of two ways:
+            <variablelist>
+	    <varlistentry>
+	      <term>Configure it with Nautilus</term>
+	      <listitem>
+		<para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+			Open a Nautilus window
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+	                 Select <menuchoice>
+			  <guimenu>Preferences</guimenu>
+			  <guimenuitem>Edit Preferences</guimenuitem>
+			</menuchoice>.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Go to the <guilabel>Navigation</guilabel> tab.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Click the <guilabel>Use HTTP Proxy</guilabel>
+			checkbox and enter the location of your HTTP
+			proxy in the <guilabel>Location</guilabel> field.
+	               </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Configure it with the gconftool command</term>
+	      <listitem>
+	      <para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+                        Open a terminal.
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
+                        </command>                  
+                      </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+		<para>
+                  For more information about the gconftool command,
+                  read the gconftool man page.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+         </para>
+      </note>
+
+
     <sect2 id="customizing-summary-weather">
       <title>Customizing the Weather Summary</title>
       <para>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index a40dae6367..7a5fe92d53 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -702,14 +702,6 @@
 		
 		<listitem>
 		  <para>
-		    Regex Match - If you know your way around a <glossterm
-									   linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use here.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
 		    Source Account - Search messages according the server you got them from.
 		    You can enter a URL or choose one from the drop-down
 		    list.  This ability is only relevant if you use more
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index e9e693c57e..ab80bc8a13 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -422,8 +422,10 @@
            If you use an HTTP proxy,
            <application>Evolution</application> must be able to find
            it through the <systemitem>gnome-vfs</systemitem> subsystem
-           before it can load images from the Internet.  You can set
-           this in one of two ways:
+           before it can load images from the Internet.  This is also
+           the case if you wish to access weather and news information
+           through the Summary tool. You can tell the GNOME Virtual
+           File System about your HTTP proxy in one of two ways:
             <variablelist>
 	    <varlistentry>
 	      <term>Configure it with Nautilus</term>
@@ -753,9 +755,6 @@
            with the quoted material as shown in <xref
            linkend="usage-mail-getnsend-reply-fig">.
 
-<!-- note that this figure should have a reply message ready to send,
-with quoted materials and the relevant replies interspersed-->
-<!-- I want to wait for the formatting bugs to be fixed first -->
  <!-- ==============Figure=================================== -->
        <figure id="usage-mail-getnsend-reply-fig">
          <title>Reply Message Window</title>
@@ -1536,17 +1535,68 @@ with quoted materials and the relevant replies interspersed-->
   <sect1 id="rsvp-stuff">
     <title>RSVPs in Mail</title>
     <para>
-      If an event is created in the calendar component, an attendee list can be used to invite users to the event.  The invite card is sent as an attachment in iCal format.
+      If you create an event in the calendar component, you can then
+      send invitations to the attendee list through the
+      <application>Ximian Evolution</application> email tool.  The
+      invitation card is sent as an attachment in iCal format.
     </para>
     <para>
-      If you click on the attachment button and click the  <guibutton>View Inline</guibutton>, the card will show up in your email.  It gives information about:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Meeting hours
-	  </para>
-	</listitem>
-      </itemizedlist>
+      If you click on the attachment button and click the
+      <guibutton>View Inline</guibutton>, <application>Ximian
+      Evolution</application> will show you information about the
+      meeting, and let you respond to the meeting in several ways.
+      Select the response that you would like, and then click the
+      <guibutton>OK</guibutton> button.
+   </para>
+   <para>
+  Your options are:
+      <variablelist>
+	<varlistentry>
+	  <term>Accept</term>
+	  <listitem>
+	    <para>
+	  Select this entry if you will attend the meeting.  When you
+	  click the <guibutton>OK</guibutton> button, the meeting will
+	  be entered into your calendar.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>>Accept</term>
+	  <listitem>
+	    <para>
+	  Select this entry if you will probably attend the meeting.
+	  When you click the <guibutton>OK</guibutton> button, the
+	  meeting will be entered into your calendar, but marked as
+	  tentative.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>Decline</term>
+	  <listitem>
+	    <para>
+	  Select this item if you will be unable to attend the
+	  meeting. The meeting will not be entered into your calendar
+	  when you click the <guibutton>OK</guibutton>, although your
+	  response will be sent to the meeting host if you have
+	  checked the <guilabel>RSVP</guilabel> box.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>RSVP</term>
+	  <listitem>
+	    <para>
+	     Check this box if you would like your response sent to
+	     the meeting organizers.
+	    </para>
+	  </listitem>
+	</varlistentry>
+     </variablelist>
     </para>
   </sect1>
 
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 6e349e3ef6..5bd5b78711 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -138,8 +138,9 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous types of servers which
-	      <application>Ximian Evolution</application> can download your email from:
+	      Server Type &mdash; There are numerous types of servers
+	      from which <application>Ximian Evolution</application>
+	      can fetch your mail:
 	      <itemizedlist>
 		<listitem>
 		  <para>
@@ -159,14 +160,16 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    Unix mbox spool-format file &mdash; Bad description, we're
-		    getting a better definition shortly.
+		    Unix mail spool file &mdash; If you run a mail
+		    server on your desktop computer, choose this optino.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Standard Unix mailbox file &mdash; Bad description, we're
-		    getting a better definition shortly.
+		    Standard Unix .mbox file &mdash; If you want
+		    <application>Ximian Evolution</application> to
+		    read mail from a specific file, or if you download
+		    mail with another application, choose this option.
 		  </para>
 		</listitem>
 		<listitem>
@@ -1019,8 +1022,10 @@
       <para>
         The <guilabel>Task List</guilabel> compliments the
         <guilabel>Appointment List </guilabel> as it keeps track of
-        tasks which don't have any time associated with them.  These
-        may include "" or "Call Repairman".  </para>
+        tasks which don't have a time associated with them. Tasks can
+        have complex notes associated with them, and you can also note
+        their completeness on a percentage scale.
+      </para>
 
       <para>
 	<inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>