Validation.

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

	* C/evolution.sgml: Validation.

	* C/usage-print.sgml: Add .ps information.

	* C/usage-mail-org.sgml: Virtual Folder/vFolder, Ximian Evolution/Evolution.

svn path=/trunk/; revision=12607

2 files changed, 47 insertions, 42 deletions

diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 19ad87ca12..a40dae6367 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -5,7 +5,7 @@
       want to sort and organize them.  When you get a hundred a day
       and you want to refer to a message you received six weeks ago,
       you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
+      Fortunately, <application>Ximian Evolution</application> has the tools
       to help you do it.
     </para>
 
@@ -43,8 +43,7 @@
       <para>
 	Right-click on one of the column headers to get a list of
 	options:
-	<variablelist>
-	  
+	<variablelist>	  
 	<varlistentry>
 	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
 	  <listitem><para>
@@ -93,7 +92,7 @@
     <sect1 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
-	<application>Evolution</application> keeps mail, as well as
+	<application>Ximian Evolution</application> keeps mail, as well as
 	address cards and calendars, in folders.  You start out with a
 	few, like <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
@@ -101,7 +100,7 @@
 	selecting <guisubmenu>New</guisubmenu> and then
 	<guimenuitem>Folder</guimenuitem> from the
 	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
+	<application>Ximian Evolution</application> will as you for the name
 	and the type of the folder, and will provide you with a folder
 	tree so you can pick where it goes.
       </para>
@@ -123,7 +122,7 @@
       <title>Searching for Messages</title>
       <para>
 	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
+	but <application>Ximian Evolution</application> does it faster. You
 	can search through just the message subjects, just the message
 	body, or both body and subject.
       </para>
@@ -183,14 +182,14 @@
 	</variablelist>
 
         When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
+        <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
         will show your search results in the message list.
       </para>
 
       <para>
          If you think you'll want to return to a search again, you can
          save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
+         Search as vFolder</guilabel>.
       </para>
 
       <para>
@@ -290,7 +289,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in <application>Evolution</application>.
+		    define filters in <application>Ximian Evolution</application>.
 		  </para>
 		</listitem>
 		
@@ -377,14 +376,14 @@
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
-		    Move to Folder - If you select this item, <application>Evolution</application>
+		    Move to Folder - If you select this item, <application>Ximian Evolution</application>
 		    will put the messages into a folder you specify.  Click the 
 		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
 		    to select a folder. 
 		  </para></listitem>
 
 		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Evolution</application>
+		    Copy to Folder - If you select this item, <application>Ximian Evolution</application>
 		    will put the messages into a folder you specify.  Click the 
 		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
 		    to select a folder. 
@@ -408,7 +407,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Assign Color - Select this item, and <application>Evolution</application>
+		    Assign Color - Select this item, and <application>Ximian Evolution</application>
 		    will mark the message with whatever color you please.
 		  </para></listitem>
 		
@@ -516,15 +515,15 @@
   </sect1>
     
     <sect1 id="usage-mail-organize-vfolders">
-      <title>Getting Really Organized with Virtual Folders</title>
+      <title>Getting Really Organized with vFolders</title>
       <para>
 	If filters aren't flexible enough for you, or you find
 	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
+	a vFolder. vFolders, or virtual folders, are an advanced way
+	of viewing your email messages within
+	<application>Ximian Evolution</application>.  If you get a lot of
+	mail or often forget where you put messages, virtual folders
+	can help you stay on top of things.
       </para>
       <para>
 	A virtual folder is really a hybrid of all the other organizational
@@ -538,7 +537,7 @@
 
       <para>
 	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
+	deleted, <application>Ximian Evolution</application> will
 	automatically place them in and remove them from the
 	virtual folder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
@@ -559,25 +558,25 @@
 
 
     <note id="unmatched-vfolder">
-      <title>The Unmatched Virtual Folder</title>
+      <title>The Unmatched vFolder</title>
       <para>
-	Obveously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Evolution</application>
-	includes an UNMATCHED Virtual Folder.  The UNMATCHED Virtual
-	Folder displays messages that are not matched by other rules.
+	Obviously, not all messages will fit into all your Virtual
+	Folders.  That's why <application>Ximian Evolution</application>
+	includes an UNMATCHED vFolder.  The UNMATCHED 
+	vFolder displays messages that are not matched by other rules.
       </para>
     </note>
 
 
     <example id="usage-mail-organize-vFolders-ex">
-      <title>Using Folders, Searches, and Virtual Folders</title>
+      <title>Using Folders, Searches, and vFolders</title>
       <para>
 	To organize his mailbox, Jim sets up a virtual volder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and <application>Evolution</application> in the subject line, so he
+	have ximian.com in the address and <application>Ximian Evolution</application> in the subject line, so he
 	can keep a record of what people from work send him about
 	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Evolution</application>, it only shows up in the "Anna" folder.
+	anything other than <application>Ximian Evolution</application>, it only shows up in the "Anna" folder.
 	When Anna sends him mail about the user interface for
 	<application>evolution</application>, he can see that message both in
 	the "Anna" virtual folder and in the "Internal Evolution Discussion"
@@ -588,7 +587,7 @@
 	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
 
     <sect2 id="vfolder-create">
-      <title>Creating Virtual Folders</title>
+      <title>Creating vFolders</title>
       <para>
 	To create a virtual folder:
 	<orderedlist numeration="arabic">
@@ -596,7 +595,7 @@
 	    <para>
 	    <menuchoice>
 	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Virtual Folder Editor</guimenuitem>
+	      <guimenuitem>vFolder Editor</guimenuitem>
 	    </menuchoice>
 	    </para>
 	  </listitem>
@@ -645,7 +644,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define virtual folders in <application>Evolution</application>.
+		    define virtual folders in <application>Ximian Evolution</application>.
 		  </para>
 		</listitem>
 		
@@ -763,9 +762,9 @@
     </orderedlist>
 
       <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a Virtual Folder Rule</title>
+	<title>Selecting a vFolder Rule</title>
 	<screenshot>
-	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
+	  <screeninfo>Creating a vFolder Rule</screeninfo>
 	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
 	  </graphic>
 	</screenshot>
@@ -777,7 +776,7 @@
     <sect1 id="usage-mail-subscriptions">
       <title>Subscription Management</title>
       <para>
-         <application>Evolution</application> lets you handle your
+         <application>Ximian Evolution</application> lets you handle your
          IMAP and newsgroup subscriptions with the same tool: the
          subscriptions manager.  To start using it, choose
          <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index 4e217dc99c..2645d9ef6c 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -13,6 +13,7 @@
   preview feature to see how your printed output will look.
 </para>
 
+
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
@@ -57,18 +58,23 @@
     <para>
        The printer selection window, shown in <xref
        linkend="print-dest">, lets you choose the format for
-       printing&mdash; <guilabel>Generic
-       Postscript</guilabel>, whether to write to a PDF file,  and whether to print
-	to a file or to an actual printer in Generic Postscript.  If you choose a printer,
-	you'll be asked for the printer command (probably
-	<guilabel>lpr</guilabel>) which your system uses.  If you
-	choose to print to a file, you'll need to decide upon a
-	filename.  And of course, you'll want to choose a number of
-	copies, and whether to collate them.
+       printing&mdash; <guilabel>Generic Postscript</guilabel>,
+       whether to write to a PDF file, and whether to print to a file
+       or to an actual printer in Generic Postscript.  If you choose a
+       printer, you'll be asked for the printer command (probably
+       <guilabel>lpr</guilabel>) which your system uses.  If you
+       choose to print to a file, you'll need to decide upon a
+       filename.  And of course, you'll want to choose a number of
+       copies, and whether to collate them.
+
 	<note id="windows-ps">
 	  <title>Printing to PostScript?</title>
 	  <para>
-	    If you're printing to PostScript, be careful.  Windows cannot open up PostScript files.  If you need your file to be read on a Windows, you should export to PDF.
+           PostScript is the file format used by most laser printers,
+           and in UNIX world is the easiest way to print to a file.
+           However, most systems running Microsoft Windows can't
+           recognize or handle PostScript files.  You'll need to print
+           to PDF if you want to share your file with Windows users.
 	  </para>
 	</note>
     </para>