Update phrasing. Also the apx-authors file seemed to have been corrupted, so I replaced it.

svn path=/trunk/; revision=25844

6 files changed, 24 insertions, 128 deletions

diff --git a/help/C/apx-authors.xml b/help/C/apx-authors.xml
index 3c20953afc..c600d49804 100644
--- a/help/C/apx-authors.xml
+++ b/help/C/apx-authors.xml
@@ -1,18 +1,18 @@
   <appendix id="authors">
     <title>Authors</title>
      <para>
-      Evolution was written by the Ximian
+      <application>Evolution</application> was written by the Ximian
       Evolution team and numerous other dedicated GNOME programmers.
       You can see their names by selecting <menuchoice>
       <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
       </menuchoice> from any Evolution window.
      </para>
     <para>
-      The Evolution code owes a great debt
+      The <application>Evolution</application> code owes a great debt
        to the <application>GNOME-pim</application> and
        <application>GNOME-Calendar</application> applications, and to
        <application>KHTMLW</application>.  The developers of
-       Evolution acknowledge the efforts
+       <application>Evolution</application> acknowledge the efforts
        and contributions of all who worked on those projects.
     </para>
 
@@ -25,8 +25,8 @@
 
    <para>
       For more information please visit the
-      Evolution <ulink
-      url="http://www.ximian.com/products/evolution/"
+      <application>Evolution</application> <ulink
+      url="http://www.ximian.com/products/ximian_evolution/"
       type="http">Web page</ulink>.  Please send all comments,
       suggestions, and bug reports to the <ulink
       url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
@@ -59,11 +59,7 @@
             </para></listitem>
           
             <listitem><para>
-              
-              For Spanish (.es): Versions prior to 1.2, H&eacute;ctor 
-              Garc&iacute;a &Aacute;lvarez; from 1.2 completely redone 
-              by Ismael Olea and Ignacio R. Maturana for Lambdaux 
-              Software Services.
+              Hector Garcia Alvarez for Spanish (.es)
             </para></listitem>
 
             <listitem><para>
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 2c19dceef0..d1195cce47 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -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 purchased the Ximian Connector for Microsoft
+              you have installed the Ximian Connector for Microsoft
               Exchange) or <glossterm
               linkend="sendmail">sendmail</glossterm>.
              </para>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 3bb42ad3a8..e989688903 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -16,9 +16,8 @@
         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 2000 is
-        proprietary software and is subject to a different license. Copyright
-        for all three pieces of software and their documentation belongs to
+        software. The Ximian 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>
     </note>
@@ -42,7 +41,7 @@
 	<para>
           Ximian is a registered trademark and Ximian Evolution, the
 	  dancing monkey logo and the Ximian capsule logo are
-	  trademarks of Ximian, Inc. Other names may be trademarks or
+	  trademarks of Novell, Inc. Other names may be trademarks or
 	  registered trademarks of other companies or
 	  organizations. Where those names appear in any GNOME
 	  documentation, and the members of the GNOME Documentation
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index f21b34df06..155409a0c7 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -1,23 +1,18 @@
  <chapter id="usage-exchange">
     <title>The Ximian Connector for Microsoft Exchange</title>
-    <para>
-    The Ximian Connector for Microsoft Exchange allows Ximian
+    <para>The Ximian Connector for Microsoft Exchange allows Ximian
     Evolution clients to access accounts on Microsoft Exchange 2000
     servers. It is available through Ximian Red Carpet in its own
-    channel, but cannot be used without a license file.  The license
-    file may be purchased from the Ximian online store at <ulink
-    url="http://store.ximian.com">store.ximian.com</ulink>. Unlike the
-    regular Ximian Evolution client, the Ximian Connector for
-    Microsoft Exchange is proprietary software and source code is not
-    available.
-    </para>
+    channel. Like Ximian 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 requires
+      Ximian Connector works only with Exchange 2000 and later, and requires
       that Outlook Web Access be enabled. Each user will need a
-      valid Microsoft Exchange 2000 server account, including license.
+      valid Microsoft Exchange server account, including license.
   </para>
   </warning>
 
@@ -195,20 +190,7 @@ There are, however, some features which are not available:
        the Connector by downloading the individual packages from
        ftp.ximian.com if you wish.
    </para>
-   <para>
-       Once you have installed the software, you will also need to
-       install a license file.  The license file is the verification
-       that you have paid for a license to use the Ximian
-       Connector. You can get the license file from the the Ximian
-       online store at <ulink
-       url="http://store.ximian.com">store.ximian.com</ulink>.  You
-       will need a browser with strong (128-bit or greater) encryption
-       to access the store. When you purchase a Ximian Connector
-       license, the store will mail you the license file with
-       instructions for installation. Once installed, the license file
-       unlocks the Ximian Connector functionality and you may connect
-       to an Exchange server.
-    </para>
+ 
  </sect1>
 
   <sect1 id="exchange-configure">
@@ -266,30 +248,13 @@ There are, however, some features which are not available:
         the standard account tool described in <xref
         linkend="config-client" /> below.
       </para>
-      <para>
-        The simple assistant works in the following cases:
-        <itemizedlist>
-          <listitem>
-            <para>
-              If you receive your license key in Ximian Evolution, the
-              simple assistant will start when you click the
-              license file attachment and choose <guilabel>Open in
-            Ximian Connector</guilabel>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you have no accounts configured, and your system
-            administrator has preinstalled a license key file,            
+	<para>
+            If you have no accounts configured, 
             the simple assistant will start when you start Ximian
             Evolution. It asks only for the name of your Outlook
             Web Access server, and your username and password. Ximian
             Connector will determine the remaining information on its own.
           </para>
-        </listitem>
-      </itemizedlist>
-    </para>
       <para>
         If the simple account tool does not run automatically, create
         an account as described below.
@@ -315,29 +280,6 @@ There are, however, some features which are not available:
           system administrator.
         </para>
 
-     <note id="license-file-issues">
-       <title>Installing the License File</title>
-       <para>
-         Your purchase email will contain instructions for installing
-         the license file: it may be opened with Ximian Evolution and
-         installed automatically that way, or placed in the
-         <systemitem>evolution</systemitem> directory in your home
-         directory.
-       </para>
-       <para>
-         Be aware that the <systemitem>evolution</systemitem> directory in
-         your home directory won't exist if you haven't already run 
-         Ximian Evolution. If you have not
-         done so already, start Ximian
-         Evolution and configure an account as described
-         below.  Then, quit the application and place the
-         <systemitem>connector-key.txt</systemitem> file in your
-         <systemitem>evolution</systemitem> directory. When you start
-         Evolution again, the license will
-         be verified and Ximian Connector will work properly.
-       </para>
-     </note>
-
 
 	<variablelist>
 	  <varlistentry>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 33342cff12..da55603eca 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -179,7 +179,7 @@
 		<listitem>
 		  <para>
 		    Microsoft Exchange: Available only if you have
-		    purchased the Ximian Connector for Microsoft
+		    installed the Ximian 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
@@ -297,7 +297,7 @@
       <tip id="exchange-info">
 	<title>Use Ximian Evolution with Microsoft Exchange</title>
          <para>
-	   If you have purchased Ximian Connector for Microsoft
+	   If you have installed Ximian 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
@@ -474,13 +474,11 @@
 		</listitem>
 
 		<listitem>
-		  <para>
-		    Microsoft Exchange: Sends mail through a Microsoft
+		  <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. You must
-		    have a valid license key purchased from <ulink
-		    url="http://store.ximian.com">store.ximian.com</ulink>.
+		    Ximian Connector for Microsoft Exchange, which is installed
+		    separately.
 		  </para>
 		</listitem>
 
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
deleted file mode 100644
index 5b93a65736..0000000000
--- a/help/C/usage-sync.sgml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter is very short.  It describes how to synchronize
-        the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
-        information on how to set up handheld synchronization, consult
-        <xref linkend="config-sync">.
-      </para>
-
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device in its cradle and press the
-          HotSync button.
-        </para>
-
-<tip id="sync-tip">
-<title>Palm OS v. 4.0 with Passwords</title>
-<para>
-If you use Palm OS v. 4.0 and have password protection turned on for
-your handheld device, you may encounter trouble synchronizing.  If
-this happens, try turning off password protection on your handheld,
-synchronize it with your desktop computer, and then re-enable password
-protection on your handheld.
-</para>
-</tip>
-        <para>
-	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
-        </para>
-
-         <para>
-            That's it.
-         </para>
-
-       </sect1>
-    </chapter>