add NNTP section, fix name to conform, mostly, with new novell naming conventions.

svn path=/trunk/; revision=25885

14 files changed, 154 insertions, 153 deletions

diff --git a/help/C/apx-authors.xml b/help/C/apx-authors.xml
index c600d49804..e449769224 100644
--- a/help/C/apx-authors.xml
+++ b/help/C/apx-authors.xml
@@ -18,7 +18,7 @@
 
     <para>
      Ximian would like to thank everyone who helped out with the bug
-     tracking process, particularly Miles Lane, and also the staff of
+    tracking process, particularly Miles Lane, and also the staff of
      El Pelon Taqueria, on Peterborough St. in Boston, for
      sustenance.
     </para>
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index d1195cce47..390699661a 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -104,7 +104,7 @@
 	<term><guiicon>Exchange Delegation</guiicon></term>
 	<listitem>
 	  <para>
-            This item will only appear if you have Ximian Connector
+            This item will only appear if you have Evolution Connector
             for Microsoft Exchange installed. It will allow you to
             choose who has access to your Exchange account. This
             feature is covered in <xref linkend="exchange-delegate" />.
@@ -127,7 +127,7 @@
 	<term><guiicon>Out of Office</guiicon></term>
 	<listitem>
 	  <para>
-            This item will only appear if you have Ximian Connector
+            This item will only appear if you have Evolution Connector
             for Microsoft Exchange installed. It allows you to create
             and remove automatic "vacation" messages.  For
             information about how to use this feature, read <xref
@@ -141,7 +141,7 @@
    <sect1 id="config-prefs-mail-identity">
       <title>Working with Mail Accounts</title> 
       <para>
-         Ximian Evolution allows you to
+         Novell Evolution allows you to
          maintain multiple accounts, or identities.  This is useful
          want to keep personal and professional email separate, or if
          you wear several hats at work. When you are writing an email
@@ -383,7 +383,7 @@ smtp.omniport.com:143
               In this section, you will choose and configure a method
               for sending mail.  You may choose <glossterm
               linkend="smtp">SMTP</glossterm>, Microsoft Exchange (if
-              you have installed the Ximian Connector for Microsoft
+              you have installed the Evolution Connector for Microsoft
               Exchange) or <glossterm
               linkend="sendmail">sendmail</glossterm>.
              </para>
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
index 410cb400ce..35ed29b440 100644
--- a/help/C/config-sync.xml
+++ b/help/C/config-sync.xml
@@ -3,7 +3,7 @@
      <para>
         Synchronization presents you with two issues you'll need to
         address. First, your computer needs to recognize and access
-       your handheld.  At this time, Ximian Evolution only supports
+       your handheld.  At this time, Novell Evolution only supports
        PalmOS devices like the Palm Pilot and the Handspring Visor.
        Secondly, you should decide what sort of synchronization
        behavior you want.
@@ -28,7 +28,7 @@
         linkend="conduit">conduits</glossterm> you want under the
         <guilabel>Pilot Conduits</guilabel> section of the Control
         Center.  You may use conduits to synchronize data with several
-        applications; the Ximian Evolution
+        applications; the Novell Evolution
         conduits are labeled <guilabel>EAddress</guilabel>, for the
         contacts in your address book, <guilabel>ECalendar</guilabel>,
         for your calendar, and <guilabel>ETodo</guilabel>, for your
diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index f442d31bf6..b7b663ec55 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -24,7 +24,7 @@
 
 <!ENTITY appversion "1.5">
 <!ENTITY docversion "1.5">
-<!ENTITY pubdate "January, 2004">
+<!ENTITY pubdate "May, 2004">
 
 ]>
 
@@ -55,8 +55,8 @@ entity names correspond.  APX is for appendix.  -->
     </copyright>
     
    <releaseinfo>
-      This is version &docversion; of the Ximian Evolution manual. It describes
-      version &appversion; of the Ximian Evolution groupware suite.
+      This is version &docversion; of the Novell Evolution manual. It describes
+      version &appversion; of the Novell Evolution groupware suite.
    </releaseinfo>
 
 
@@ -76,11 +76,11 @@ entity names correspond.  APX is for appendix.  -->
   </preface>
 
   <part id="usage">
-    <title>Getting Started with Ximian Evolution</title>
+    <title>Getting Started with Novell  Evolution</title>
      <partintro>
       <para>
-        Part one of the Ximian Evolution manual
-        describes how to use Ximian Evolution for
+        Part one of the Novell Evolution manual
+        describes how to use Novell Evolution for
         email, contact management, and appointment and task
         scheduling.  You'll find as you go along that there's more
         than one way to do things, and you can pick whichever method
@@ -97,14 +97,14 @@ entity names correspond.  APX is for appendix.  -->
     &USAGE-SYNC; 
   </part>
   <part id="config">
-  <title>Configuring and Managing Ximian Evolution</title>
+  <title>Configuring and Managing Novell Evolution</title>
     <partintro>
       <para>
-        Ximian Evolution is highly
+        Novell Evolution is highly
         configurable.  Usually, when developers say that, they mean
         that they didn't test it out thoroughly and have left it to
         other programmers to "configure" themselves a working
-        system. In the case of Ximian
+        system. In the case of Novell
         Evolution, "configurable" means that, while you
         can expect the program to work perfectly well with the default
         settings, it's also easy to alter its behavior in a wide
diff --git a/help/C/legal.xml b/help/C/legal.xml
index e989688903..8aaa133820 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -7,16 +7,16 @@
      Preface, and adding a paragraph to the beginning of it -->
 
     <note id="evo-is-free-software">
-      <title>Ximian Evolution is Free Software</title>
+      <title>Novell Evolution is Free Software</title>
       <para>
-        Ximian Evolution is licensed under the terms of the GNU General
+        Novell Evolution is licensed under the terms of the GNU General
         Public License (GPL), and its documentation is licensed
         separately
         under the GNU Free Documentation License (GFDL).  You can find a the
         complete text of the GPL in <xref linkend="apx-gpl" />, and of the
         GFDL in <xref linkend="apx-fdl"/>. The licenses are also available
         in the files COPYING and COPYING-DOCS distributed with this
-        software. The Ximian Connector for Microsoft Exchange  is
+        software. The Evolution Connector for Microsoft Exchange  is
         also licensed under the GPL. Copyright for all three pieces of software and their documentation belongs to
         Novell, Inc.
       </para>
@@ -39,7 +39,7 @@
 	</para>
 
 	<para>
-          Ximian is a registered trademark and Ximian Evolution, the
+          Novell is a registered trademark and Novell Evolution, the
 	  dancing monkey logo and the Ximian capsule logo are
 	  trademarks of Novell, Inc. Other names may be trademarks or
 	  registered trademarks of other companies or
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index cb282c66ae..0a7222783b 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -8,7 +8,7 @@
       You might want to copy this section and tape it to the wall
       next to your computer: it's a very short summary of most of
       the things you'll want to do with
-      Ximian Evolution.
+      Novell Evolution.
    </para>
 
 
@@ -23,7 +23,7 @@
 	    <listitem>
 	      <para>
                 Press <keycombo action="simul"> <keycap>Ctrl</keycap>		  <keycap>N</keycap></keycombo> to open a new item
-		  for whatever part of Ximian
+		  for whatever part of Novell
 		  Evolution you're working on. In mail,
 		  that means you'll create a new message. If you're
 		  looking at your address book, <keycombo
diff --git a/help/C/preface.xml b/help/C/preface.xml
index e6f54f60b5..2518c67bea 100644
--- a/help/C/preface.xml
+++ b/help/C/preface.xml
@@ -94,7 +94,7 @@ Examples are also set off from the rest of the text.  They look like this:
         Evolution &appversion; has a lot of new features to offer. 
         You can find a complete list of bugs fixed and features added
         in the Evolution release notes at the <ulink
-        url="http://developer.ximian.com">Ximian Developer
+        url="http://gnome.org/projects/evolution/">Evolution Developer
       Website</ulink>. Some of the features include:
     </para>
         <variablelist>
@@ -102,7 +102,7 @@ Examples are also set off from the rest of the text.  They look like this:
 	    <term>Junk Mail (Spam) Filtering</term>
 	    <listitem>
 	      <para>
-                Ximian Evolution &appversion; uses the same font
+                Novell Evolution &appversion; uses the same font
                 smoothing technology as the rest of your GNOME 2
                 desktop.
               </para>
@@ -116,7 +116,7 @@ Examples are also set off from the rest of the text.  They look like this:
                 Now you can access GroupWise servers as well as IMAP
                 and POP mail servers, with no additional installation
                 required. Connection to Microsoft Exchange 2000 and
-                2003 servers is possible with the Ximian Connector.
+                2003 servers is possible with the Evolution Connector.
               </para>
 	    </listitem>
 	  </varlistentry>
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 24b4be595e..095ac1bed9 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -6,7 +6,7 @@
   <title>Managing your Schedule</title>
 
      <para>
-      This chapter will show you how to use the Ximian Evolution
+      This chapter will show you how to use the Novell Evolution
       Calendar to manage your schedule alone or in conjunction with
       peers. To learn about importing calendar data, see <xref
       linkend="importing-mail" />, which covers the Import tool.
@@ -70,7 +70,7 @@
       Of course, you'll want to use the calendar to do more than find
       out what day it is. This section will tell you how to schedule
       appointments, set alarms, and determine appointment
-      recurrence. If you have installed the Ximian Connector for
+      recurrence. If you have installed the Evolution Connector for
       Microsoft Exchange, you can also read <xref
       linkend="full-advantage"/> to learn about how to take full
       advantage of the collaborative group scheduling functions
@@ -225,8 +225,8 @@
       </para>
       <para>
 	Evolution can handle free/busy
-	scheduling Using the Ximian Connector on a Microsoft Exchange
-	2000 server. For more information about Ximian Connector, see
+	scheduling Using the Evolution Connector on a Microsoft Exchange
+	2000 server. For more information about Evolution Connector, see
 	<xref linkend="usage-exchange"/>.
       </para>
       <para>
@@ -458,7 +458,7 @@
         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 Ximian Evolution or
+        they use Novell Evolution 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
@@ -570,14 +570,14 @@
 	<title>Scheduling an Appointment</title>
 	<para>
 	  To schedule an appointment, you'll first need people's
-	  free/busy information.  If you're using the Ximian Connector
+	  free/busy information.  If you're using the Evolution Connector
 	  for Microsoft Exchange, all of the information is already
 	  available to you in the Global Address List. Otherwise, each
 	  person will have to email you their schedule files and you
 	  will have to incorporate them into your calendar.
         </para>
         <para>
-          Regardless of how you get the information, Ximian Evolution
+          Regardless of how you get the information, Novell Evolution
           will display it in the <guilabel>Scheduling</guilabel> tab.
           The pending appointment time will appear in white with bold
           black borders.  Each attendee's free and busy times appear
@@ -595,7 +595,7 @@
 
         <para>
          Read <xref linkend="full-advantage"/> to learn about how to
-	 use this feature with the Ximian Connector for Microsoft
+	 use this feature with the Evolution Connector for Microsoft
 	 Exchange.
        </para>
       </sect3>
@@ -678,7 +678,7 @@
     </para>
     <para>
       The list of tasks is sorted in a similar way to the list of
-      email messages in Ximian Evolution
+      email messages in Novell Evolution
       Mail.  Click once on the message headers to change
       the direction and type of sorting, or right-click to add or
       remove columns from the display.
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index de49efdea7..0986b0c766 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -181,24 +181,15 @@
 	    <para>
 		  To see how it works, type a name in the
 		  <guilabel>Full Name</guilabel> field. As an example,
-		  we'll use the Ximian mascot, <userinput>Rupert
-		  T. Monkey</userinput>.  You'll notice that the
+		  we'll use <userinput>John
+		  T. Doe</userinput>.  You'll notice that the
 		  <guilabel>File As</guilabel> field also fills in,
-		  but in reverse: <computeroutput>Monkey,
-		  Rupert</computeroutput>.  You can pick
-		  <computeroutput>Rupert Monkey </computeroutput> from
+		  but in reverse: <computeroutput>Doe,
+		  John</computeroutput>.  You can pick
+		  <computeroutput>John Doe</computeroutput> from
 		  the drop-down, or type in your own, such as
-		  <userinput> T. Rupert Monkey </userinput>.
+		  <userinput>T. Doe, John</userinput>.
 		</para>
-	    <tip>
-	      <title>Filing Suggestion</title>
-	      <para>
-		 Don't enter something entirely different from the
-		 actual name, since you might forget that you've filed
-		 Rupert's information under "F" for "Fictitious Ximian
-		 Employee."
-              </para>
-	    </tip>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
@@ -467,13 +458,13 @@
         </para>
 	<para>
            To mail the list, open a new email and type the name you
-           chose for the list. Ximian Evolution will address the
+           chose for the list. Novell Evolution will address the
            message to the entire list when you send it. You can also
            right-click on the list's address card in the contacts tool
            and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
         <para>
-           Ximian Evolution cannot store contact lists on Exchange
+           Novell Evolution cannot store contact lists on Exchange
            servers.
         </para>
     </sect2>
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 155409a0c7..9fb63bf03c 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -1,16 +1,16 @@
  <chapter id="usage-exchange">
-    <title>The Ximian Connector for Microsoft Exchange</title>
-    <para>The Ximian Connector for Microsoft Exchange allows Ximian
+    <title>The Evolution Connector for Microsoft Exchange</title>
+    <para>The Evolution Connector for Microsoft Exchange allows Novell
     Evolution clients to access accounts on Microsoft Exchange 2000
-    servers. It is available through Ximian Red Carpet in its own
-    channel. Like Ximian Evolution, it is free software and licensed under the
+    servers. It is available through Novell Red Carpet in its own
+    channel. Like Novell Evolution, it is free software and licensed under the
     GPL.
   </para>
    
   <warning id="licensing">
     <title>Requirements</title>
     <para>
-      Ximian Connector works only with Exchange 2000 and later, and requires
+      Evolution Connector works only with Exchange 2000 and later, and requires
       that Outlook Web Access be enabled. Each user will need a
       valid Microsoft Exchange server account, including license.
   </para>
@@ -19,13 +19,13 @@
   <sect1 id="new-in-connector">
 <title>What's New in Connector &appversion;</title>
   <para>
-    Ximian Connector &appversion; has added the <guilabel>Out of
+    Evolution Connector &appversion; has added the <guilabel>Out of
     Office</guilabel> feature and an automatic configuration tool for
     large Exchange deployments.
   </para>
 
   <para>
-    Previous versions of Ximian Connector for Microsoft Exchange added
+    Previous versions of Evolution Connector for Microsoft Exchange added
     support for the <guilabel>Flag for Followup</guilabel> feature,
     public folders, delegation, direct booking, and more. For
     information on setting up delegation, see <xref
@@ -37,7 +37,7 @@
   <sect1 id="features">
     <title>Connector Features</title>
     <para>
-      In addition to the features listed above, Ximian
+      In addition to the features listed above, Evolution
       Connector supports the following basic 
       <application>Microsoft Exchange</application> features:
       <itemizedlist>
@@ -180,10 +180,10 @@ There are, however, some features which are not available:
   <sect1 id="install">
     <title>Installing the Connector</title>
     <para>
-       To install the Ximian Connector, run Ximian Red Carpet by
+       To install the Evolution Connector, run Red Carpet by
        selecting <menuchoice><guimenu>System</guimenu><guimenuitem>Get
-       Software</guimenuitem></menuchoice>.  Subscribe to the Ximian
-       Connector for Microsoft Exchange channel, select the Ximian
+       Software</guimenuitem></menuchoice>.  Subscribe to the Evolution
+       Connector for Microsoft Exchange channel, select the Evolution
        Connector for Microsoft
        Exchange2000, and click the
        <guilabel>Install</guilabel> button.  You can also install
@@ -194,7 +194,7 @@ There are, however, some features which are not available:
  </sect1>
 
   <sect1 id="exchange-configure">
-    <title>Adding your Exchange Account in Ximian Evolution</title>
+    <title>Adding your Exchange Account in Novell Evolution</title>
     <para>
       Once you have installed the Connector, you need to set up access
       for your Exchange account on both the
@@ -223,36 +223,36 @@ There are, however, some features which are not available:
       </para>
       
       <para>
-	The Ximian website knowledge base, at <ulink type="http"
+	The Novell website knowledge base, at <ulink type="http"
 	url="http://support.ximian.com">support.ximian.com</ulink>,
 	has additional information about checking to make sure that
 	your Exchange server will accept
-	connections from Ximian Evolution.
+	connections from Novell Evolution.
       </para>
     </sect2>
     
 
     <sect2 id="config-client">
-      <title>Standard Configuration Tool for Ximian Connector</title>
+      <title>Standard Configuration Tool for Evolution Connector</title>
       <para>
 	Once you know that your server is ready for you to connect,
-        you are ready to add your Exchange account to Ximian Connector.
+        you are ready to add your Exchange account to Evolution Connector.
      </para>
 
 
     <sect3 id="config-easy">
-      <title>Simple Configuration Tool for Ximian Connector</title>
+      <title>Simple Configuration Tool for Evolution Connector</title>
       <para>
-        Ximian Connector 1.4 comes with a simple account creation tool
+        Evolution Connector 1.4 comes with a simple account creation tool
         for some installations. Other installations will require
         the standard account tool described in <xref
         linkend="config-client" /> below.
       </para>
 	<para>
             If you have no accounts configured, 
-            the simple assistant will start when you start Ximian
+            the simple assistant will start when you start Novell
             Evolution. It asks only for the name of your Outlook
-            Web Access server, and your username and password. Ximian
+            Web Access server, and your username and password. Evolution
             Connector will determine the remaining information on its own.
           </para>
       <para>
@@ -550,7 +550,7 @@ There are, however, some features which are not available:
 			   Server. The GAL is maintained by your
 			   system administrator and you cannot add,
 			   change, or remove items from it using
-			   Ximian Evolution. However, you can use it
+			   Novell Evolution. However, you can use it
 			   to invite people to meetings and to look up
 			   addresses and other information.
 			 </para>
@@ -615,7 +615,7 @@ There are, however, some features which are not available:
       </para>
 	<para>
           Then, quit Evolution and start it
-          up again. Changes to the Ximian Connector accounts
+          up again. Changes to the Evolution Connector accounts
           configuration are not active until you have restarted the
           application.
        </para>
@@ -679,7 +679,7 @@ There are, however, some features which are not available:
       <title>Special Connector Only Settings</title>
       <para>
         There are two items in the Evolution preferences window that
-        are available only with Ximian Connector. The first is
+        are available only with Evolution Connector. The first is
         delegation and permissions handling, and the second is the
         creation of "Out of Office" messages.
       </para>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 29c6d2ddee..18c21eadaa 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -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, Ximian Evolution has the tools
+      Fortunately, Novell Evolution has the tools
       to help you do it.
     </para>
 
@@ -19,7 +19,7 @@
     <sect2 id="importing-mail">
       <title>Importing Single Files</title>
       <para>
-        Ximian Evolution can import the
+        Novell Evolution can import the
         following types of files:
         <variablelist>
           <varlistentry>
@@ -39,7 +39,7 @@
 	    <listitem>
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
-		PalmOS based handhelds, Ximian
+		PalmOS based handhelds, Novell
                 Evolution, and 
 		<application>Microsoft Outlook</application>.
 	      </para>
@@ -71,7 +71,7 @@
             <listitem>
               <para>
                 The email box format used by Mozilla, Netscape,
-                Ximian Evolution, Eudora, and many other email clients.
+                Novell Evolution, Eudora, and many other email clients.
               </para>
             </listitem>
           </varlistentry>
@@ -149,7 +149,7 @@
 	  <title>Microsoft Outlook and Outlook Express Users</title>
 	  <para>
 	    Microsoft Outlook, and versions of Outlook Express after
-	    version 4, use proprietary formats that Ximian
+	    version 4, use proprietary formats that Novell
 	      Evolution cannot read or import.  For contacts,
 	    you may have to email them to yourself and import them that
 	    way.  For email, there is a simpler workaround:
@@ -166,15 +166,15 @@
 	      <listitem>
 		<para>
 		  Copy the files to the system or partition you use for
-		  Ximian Evolution.  
+		  Novell Evolution.  
 		</para>
 	      </listitem>
 	      
 	      <listitem>
 		<para>
-		  Use the Ximian Evolution import
+		  Use the Novell Evolution import
 		  tool to import the files.  There's more information about
-		  why this works, and how, at the Ximian support website.
+		  why this works, and how, at the Novell support website.
 		</para>
 	      </listitem>
 	    </orderedlist>
@@ -188,7 +188,7 @@
 	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
 		Folders</guimenuitem></menuchoice> from within
             Netscape or Mozilla. Otherwise,
-	    Ximian Evolution will import and undelete
+	    Novell Evolution will import and undelete
 	    the messages in Trash folders.
 	  </para>
 	</note>     
@@ -331,7 +331,7 @@
     <sect1 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
-      Ximian Evolution, like most other mail systems, stores mail in
+      Novell Evolution, like most other mail systems, stores mail in
         folders.  You start out with a
 	few mail folders, such as <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
@@ -373,7 +373,7 @@
     <title>Searching for Messages</title>
     <para>
       Most mail clients can search through your messages for you,
-      but Ximian Evolution does it faster than most, thanks to its
+      but Novell Evolution does it faster than most, thanks to its
       automatic search index.
     </para>
     <para>
@@ -684,7 +684,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in Ximian Evolution.
+		    define filters in Novell Evolution.
 		  </para>
 
 <para>
@@ -836,14 +836,14 @@
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
-		    Move to Folder - If you select this item, Ximian Evolution
+		    Move to Folder - If you select this item, Novell Evolution
 		    will put the messages into a folder you specify.  Click the 
 		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
 		    to select a folder. 
 		  </para></listitem>
 
 		<listitem><para>
-		    Copy to Folder - If you select this item, Ximian Evolution
+		    Copy to Folder - If you select this item, Novell Evolution
 		    will put the messages into a folder you specify.  Click the 
 		    <guilabel>&lt;click here to select a folder&gt;</guilabel> button
 		    to select a folder. 
@@ -862,7 +862,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Assign Color - Select this item, and Ximian Evolution
+		    Assign Color - Select this item, and Novell Evolution
 		    will mark the message with whatever color you please.
 		  </para></listitem>
 		
@@ -1074,7 +1074,7 @@
 	yourself performing the same search again and again, consider
 	a vFolder. vFolders, or virtual folders, are an advanced way
 	of viewing your email messages within
-	Ximian Evolution.  If you get a lot of
+	Novell Evolution.  If you get a lot of
 	mail or often forget where you put messages, vFolders
 	can help you stay on top of things.
       </para>
@@ -1131,10 +1131,10 @@
       <para>
 	To organize his mailbox, Jim sets up a virtual folder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and Ximian Evolution in the subject line, so he
+	have ximian.com in the address and Novell Evolution in the subject line, so he
 	can keep a record of what people from work send him about
 	Evolution.  If Anna sends him a message about
-	anything other than Ximian Evolution, it only shows up in the "Anna" folder.
+	anything other than Novell Evolution, it only shows up in the "Anna" folder.
 	When Anna sends him mail about the user interface for
 	Evolution, he can see that message both in
 	the "Anna" vFolder and in the "Internal Evolution Discussion"
@@ -1211,7 +1211,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define vFolders in Ximian Evolution.
+		    define vFolders in Novell Evolution.
 		  </para>
 		</listitem>
 		
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 7a608f206e..18a4c63899 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -328,21 +328,29 @@
             </tip>
 
 
-<!-- NOT FOR 1.0
        <sect2 id="usage-mail-getnsend-get-news">
 	  <title>Using Evolution for News</title>
 	<para>
 	  Newsgroups are so similar to email that there's no reason not
 	  to read them side by side.  If you want to do that, add a
-	  news source to your configuration (see <xref
-	  linkend="config-prefs-network-news"/>). The news server will
-	  appear as a remote server, and will look quite similar to an
-        IMAP folder.  When you click <guilabel>Send/Receive</guilabel>,
-	  Evolution will also check for news
-	  messages.
+	  news source to your configuration the same way you would add a mail
+	account, selecting <guilabel>NNTP</guilabel> as the source type. 
+	The news server will appear as a remote mail server, and each news
+	group works like an IMAP folder.  When you click 
+	<guilabel>Send/Receive</guilabel>, Evolution will 
+	also check for news messages.
 	</para>
-	</sect2>
--->
+
+        <para>
+	  To subscribe to a news group, select <menuchoice>
+	  <guimenu>Tools</guimenu> <guimenuitem>Subscribe To
+	    Folders</guimenuitem></menuchoice> and select your NNTP account. Then, select
+	  the groups you want to subscribe to.
+	</para>
+      
+
+
+    </sect2>
 
      <sect2 id="usage-mail-getnsend-get-attach">
 	 <title>Working with Attachments and HTML Mail</title>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index da55603eca..09aa7d96c6 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -1,14 +1,14 @@
 <chapter id="usage-mainwindow">
 
-  <title>Getting Started with Ximian Evolution</title>
+  <title>Getting Started with Novell Evolution</title>
 
     <sect1 id="what"> 
-      <title>What is Ximian Evolution, and What Can It Do for Me?</title>
+      <title>What is Novell Evolution, and What Can It Do for Me?</title>
       <para>
         Information is useless unless it's organized and accessible;
         it's hardly even worth the name if you can't look at it and be
         <emphasis>informed</emphasis>.  The goal of
-        Ximian Evolution is to make the
+        Novell Evolution is to make the
         tasks of storing, organizing, and retrieving your personal
         information easier, so you can work and communicate with
         others.  That is, it's a highly evolved <glossterm
@@ -16,7 +16,7 @@
         part of the Internet-connected desktop.
       </para>
       <para>
-        In other words, Ximian Evolution is
+        In other words, Novell Evolution is
         a tool to help you get your work done. It can help you work in
         a group by handling email, address and other contact
         information, and one or more calendars.  It can do that on one
@@ -25,11 +25,11 @@
       </para>
 
       <para>
-        With Ximian Evolution, you can
+        With Novell Evolution, you can
         accomplish your most common daily tasks faster.  For example, it
         takes only one or two clicks to enter appointment or
         contact information sent to you by email, or to send email to a contact
-        or appointment.  Ximian Evolution
+        or appointment.  Novell Evolution
         makes displays faster and more efficient, so searches are faster
         and memory usage is lower.  People who get lots of mail will
         appreciate advanced features like <link
@@ -40,9 +40,9 @@
    </sect1>
 
    <sect1 id="usage-mainwindow-starting">
-     <title>The First Time you Start Ximian Evolution</title>
+     <title>The First Time you Start Novell Evolution</title>
      <para>
-       To start Ximian Evolution, do either
+       To start Novell Evolution, do either
       of the following: 
       <itemizedlist>
       <listitem>
@@ -162,7 +162,7 @@
 	  <listitem>
 	    <para>
 	      Server Type: There are numerous types of servers
-	      from which Ximian Evolution
+	      from which Novell Evolution
 	      can fetch your mail.  Ask your system administrator if
 	      you're not sure which of the following are available to
 	      you:
@@ -179,7 +179,7 @@
 		<listitem>
 		  <para>
 		    Microsoft Exchange: Available only if you have
-		    installed the Ximian Connector for Microsoft
+		    installed the Novell Connector for Microsoft
 		    Exchange, this will allow you to connect to a
 		    Microsoft Exchange 2000 or 2003 server, which
                     stores email, calendar, and contact information on
@@ -295,9 +295,9 @@
 		    </itemizedlist>
 
       <tip id="exchange-info">
-	<title>Use Ximian Evolution with Microsoft Exchange</title>
+	<title>Use Novell Evolution with Microsoft Exchange</title>
          <para>
-	   If you have installed Ximian Connector for Microsoft
+	   If you have installed Novell Connector for Microsoft
 	   Exchange, you can access Microsoft Exchange 2000 servers
 	   natively.  If you do not have the Connector, or if you use
 	   an older version of Microsoft Exchange, talk to your system
@@ -462,7 +462,7 @@
 	  <listitem>
 	    <para>
 	      Server Type: There are numerous server types that
-	      Ximian Evolution supports for sending your
+	      Novell Evolution supports for sending your
 	      mail.
 	      <itemizedlist>
 		<listitem>
@@ -477,7 +477,7 @@
 		  <para>Microsoft Exchange: Sends mail through a Microsoft
 		    Exchange server using the Microsoft Exchange 2000
 		    protocol. Available only if you have are using the
-		    Ximian Connector for Microsoft Exchange, which is installed
+		    Novell Connector for Microsoft Exchange, which is installed
 		    separately.
 		  </para>
 		</listitem>
@@ -524,7 +524,7 @@
 	      your best bet is to leave this set at
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
-	      Ximian Evolution check for
+	      Novell Evolution check for
 	      you by clicking <guilabel>Check for supported
 	      types</guilabel>.
 	    </para>
@@ -578,7 +578,7 @@
   <sect2 id="fourth-step">
       <title>Importing Mail (Optional)</title>
       <para>
-	If Ximian Evolution finds mail or
+	If Novell Evolution finds mail or
 	address files from another application, it will offer to
 	import them.  If you're not sure which file format your mail
 	program uses, ask your system administrator.  If you want, you
@@ -587,7 +587,7 @@
 	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
       </para>
       <para>
-	Ximian Evolution can import the following types of
+	Novell Evolution can import the following types of
 	files:
           <variablelist>
            <varlistentry>
@@ -620,7 +620,7 @@
 	    <listitem>
 	      <para>
 	       The email box format used by Mozilla, Netscape,
-	       Ximian Evolution, Eudora, and many other email clients.
+	       Novell Evolution, Eudora, and many other email clients.
   	     </para>
 	    </listitem>
 	  </varlistentry>
@@ -632,7 +632,7 @@
       <para>
         <application>Microsoft Outlook</application>, and versions of
         <application>Outlook Express</application> after
-	version 4, use proprietary formats that Ximian
+	version 4, use proprietary formats that Novell
 	Evolution cannot read or import.  For contacts,
 	you may have to email them to yourself and import them that
 	way.  For email, see the instructions in <xref
@@ -646,14 +646,14 @@
 	Before importing mail from Netscape, make sure you select
 	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
 	Folders</guimenuitem></menuchoice>. If you don't,
-	Ximian Evolution will import and undelete
+	Novell Evolution will import and undelete
 	the messages in your Trash folders.
       </para>
     </note>     
     <tip>
-      <title>Exporting Files From Ximian Evolution</title>
+      <title>Exporting Files From Novell Evolution</title>
       <para>
-        Ximian Evolution uses standard file types for all its information,
+        Novell Evolution uses standard file types for all its information,
         so you should have no trouble taking your information
           elsewhere if you want.
         </para>
@@ -686,7 +686,7 @@
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Open Ximian Evolution
+	      Open Novell Evolution
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -745,7 +745,7 @@ standard mbox file format, which
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Open Ximian Evolution
+	      Open Novell Evolution
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -794,16 +794,16 @@ standard mbox file format, which
   </sect1>
   
   <sect1 id="ui-intro">
-    <title>What's What in Ximian Evolution</title>
+    <title>What's What in Novell Evolution</title>
     <para>
         Now that you've gotten the first-run configuration out of the
         way, you're ready to get down to work.  Here's a quick
         explanation of what's going on in your main
-        Ximian Evolution window.
+        Novell Evolution window.
     </para>
 
     <figure id="preface-basic-interface">
-      <title>The Ximian Evolution Main Window</title>
+      <title>The Novell Evolution Main Window</title>
       <screenshot>
 	<screeninfo>Inbox</screeninfo>
 	  <mediaobject>
@@ -823,7 +823,7 @@ standard mbox file format, which
     
     <para>
       The <guilabel>menu bar</guilabel> gives you access to nearly all
-      the features that can be found in Ximian
+      the features that can be found in Novell
       Evolution.
     </para>
 
@@ -846,7 +846,9 @@ standard mbox file format, which
       The <guilabel>Shortcut Bar</guilabel> lets you switch between
     folders and between Evolution tools.  At the bottom of the
     shortcut bar there are buttons that let you switch tools, and 
-    above that, all the available folders for the current tool.
+    above that, all the available folders for the current tool. If you have the
+      Evolution Connector for Microsoft Exchange installed, you will have an
+      <guilabel>Exchange</guilabel> button in addition to buttons for the other tools.
     </para>
     
     <para>
@@ -855,7 +857,7 @@ standard mbox file format, which
     </para>
     
     <para>
-      Periodically, Ximian Evolution will need to quietly
+      Periodically, Novell Evolution will need to quietly
       display a message, or tell you the progress of a task.  This most
       often happens when you're checking or sending email.  These progress
     queues are shown here, in the <guilabel>Status Bar</guilabel>.
@@ -875,7 +877,7 @@ standard mbox file format, which
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
-        Ximian Evolution's most important job is
+        Novell Evolution's most important job is
         to give you access to your information and help you use it
         quickly.  One way it does that is through the
         shortcut bar, the column on the left
@@ -935,14 +937,14 @@ standard mbox file format, which
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
-        Ximian Evolution lets you nest folders
+        Novell Evolution lets you nest folders
 	inside of each other, so that you can have a detailed
 	organizational system.
       </para>
 
     <para>
       Right-clicking will bring up a menu for just about anything in
-      Ximian Evolution.  If you right-click on a
+      Novell Evolution.  If you right-click on a
       folder, you'll have a menu with the following options:
       <itemizedlist>
 	<listitem><para><guimenuitem>Copy</guimenuitem>, to copy the folder to another place. When you select this item, Evolution offers a choice of locations to copy to. </para></listitem>
@@ -974,7 +976,7 @@ standard mbox file format, which
       provide all the possible actions for any given view of your
       data.  If you're looking at your Inbox, most of the menu items
       will relate to mail; some will relate to other components of
-      Ximian Evolution and some, especially those
+      Novell Evolution and some, especially those
       in the <guimenu>File Menu</guimenu> will relate to the
       application as a whole. 
    </para> 
@@ -1000,9 +1002,9 @@ standard mbox file format, which
        <varlistentry>
           <term> <guimenu>View</guimenu>:</term>
           <listitem><para>
-            This menu lets you decide how Ximian Evolution 
+            This menu lets you decide how Novell Evolution 
             should look. Some of the features control the appearance of 
-            Ximian Evolution as a whole, and others 
+            Novell Evolution as a whole, and others 
             the way a particular kind of information appears.
           </para></listitem>
         </varlistentry>
@@ -1041,7 +1043,7 @@ standard mbox file format, which
           <term> <guimenu>Help</guimenu>:</term>
           <listitem><para>
              Select among these items to open the
-             Ximian Evolution manual.
+             Novell Evolution manual.
           </para></listitem>
         </varlistentry>
       </variablelist>
@@ -1051,7 +1053,7 @@ standard mbox file format, which
       Once you've familiarized yourself with the main
       window you can start doing things with it.  We'll
       start with the <guilabel>Summary</guilabel>, which provides a
-      quick overview of your Ximian
+      quick overview of your Novell
       Evolution information.
     </para>
     </sect2>
@@ -1059,7 +1061,7 @@ standard mbox file format, which
     <sect2 id="basics-mail">
       <title>Introducing Email</title>
       <para>
-         Ximian Evolution email is like other
+         Novell Evolution email is like other
          email programs in several ways:
      <itemizedlist>
 	  <listitem>
@@ -1092,7 +1094,7 @@ standard mbox file format, which
 	</itemizedlist>
       </para>
       <para>
-        However, Ximian Evolution has some
+        However, Novell Evolution has some
         important differences.  First, it's built to handle very large
       amounts of mail.  The <link
       linkend="usage-mail-organize-spam">junk mail</link>, message <link
@@ -1112,7 +1114,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
  <!-- ==============Figure=================================== -->
 
       <figure id="usage-mail-intro-fig">
-          <title>Ximian Evolution Mail</title>
+          <title>Novell Evolution Mail</title>
           <screenshot>
             <screeninfo>Inbox</screeninfo>
             <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="PNG" srccredit="Aaron Weber"/>
@@ -1171,7 +1173,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
 
        <para>
-         For an in-depth guide to the email capabilities of Ximian
+         For an in-depth guide to the email capabilities of Novell
          Evolution, read <xref linkend="usage-mail"/>.
       </para>
     </sect2>
@@ -1189,9 +1191,9 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
 
    <!-- ============== Figure ============================= -->
     <figure id="usage-calendar-fig">
-      <title>Ximian Evolution Calendar View</title>
+      <title>Novell Evolution Calendar View</title>
       <screenshot>
-	<screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
+	<screeninfo>Novell Evolution Contact Manager Window</screeninfo>
 	<mediaobject><imageobject><imagedata  fileref="figures/calendar" format="PNG" srccredit="Aaron Weber"/>
 	</imageobject></mediaobject>
       </screenshot>
@@ -1244,16 +1246,16 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
     <sect2 id="basics-contacts">
       <title>Introducing the Contacts Tool</title>
       <para>
-        The Ximian Evolution contacts tool
+        The Novell Evolution contacts tool
         can handle all of the functions of an address book, phone
         book, or Rolodex.  Of course, it's a lot easier to update
-        Evolution than it is to change an actual paper book. Ximian
+        Evolution than it is to change an actual paper book. Novell
         Evolution also allows easy synchronization with
         hand-held devices and functions with <glossterm
         linkend="ldap">LDAP</glossterm> directories on a network.
       </para>
       <para>
-        Another advantage of the Ximian Evolution
+        Another advantage of the Novell Evolution
         contacts tool is its integration with the rest of the
         application.  For example, you can right-click on an email
         address in Evolution mail to create a contact entry instantly.
@@ -1273,9 +1275,9 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         The contacts tool looks like this:
 
       <figure id="usage-contact-fig">
-	<title>Ximian Evolution Contact Interface</title>
+	<title>Novell Evolution Contact Interface</title>
 	<screenshot>
-	  <screeninfo>Ximian Evolution Contact List Window</screeninfo>
+	  <screeninfo>Novell Evolution Contact List Window</screeninfo>
 	  <mediaobject><imageobject><imagedata  fileref="figures/contact" format="PNG" srccredit="Kevin Breit"/>
   	  </imageobject></mediaobject>
 	</screenshot>
diff --git a/help/C/usage-sync.xml b/help/C/usage-sync.xml
index 98ab6be928..74108ffd0d 100644
--- a/help/C/usage-sync.xml
+++ b/help/C/usage-sync.xml
@@ -3,7 +3,7 @@
       <para>
         This chapter is very short.  It describes how to synchronize
         the data on your Palm-OS device with the data you store in
-        Ximian Evolution.  If you need
+        Novell Evolution.  If you need
         information on how to set up handheld synchronization, consult
         <xref linkend="config-sync"/>.
       </para>
@@ -27,7 +27,7 @@ protection on your handheld.
 </tip>
         <para>
 	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with Ximian
+	 Palm-OS device will synchronize data with Novell
 	 Evolution.
         </para>