diff options
| author | Aaron Weber <aaron@src.gnome.org> | 2004-05-11 02:01:59 +0800 |
|---|---|---|
| committer | Aaron Weber <aaron@src.gnome.org> | 2004-05-11 02:01:59 +0800 |
| commit | a842853474d83a3b100e19a4ebf4387da65576f8 (patch) | |
| tree | 5c162ce6ae1f8c283b7d9a1b68eb880860752487 /help/C/legal.xml | |
| parent | 4416d2361f7e9a9bde055a673b4c9d72a84855b8 (diff) | |
| download | gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar.gz gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar.bz2 gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar.lz gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar.xz gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.tar.zst gsoc2013-evolution-a842853474d83a3b100e19a4ebf4387da65576f8.zip | |
Update phrasing. Also the apx-authors file seemed to have been corrupted, so I replaced it.
svn path=/trunk/; revision=25844
Diffstat (limited to 'help/C/legal.xml')
| -rw-r--r-- | help/C/legal.xml | 7 |
1 files changed, 3 insertions, 4 deletions
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 |