From 59850711ae13793a8cbb1acd76a3e28372ba06e3 Mon Sep 17 00:00:00 2001 From: Aaron Weber Date: Thu, 28 Mar 2002 00:12:23 +0000 Subject: add from branch. merge from branch merge from branch merge from branch 2002-03-27 Aaron Weber * C/topic.dat: add from branch. * C/figures/*: merge from branch * C/usage-calendar.sgml: merge from branch * C/usage-mail.sgml: merge from branch * C/usage-mail-org.sgml: merge from branch * C/Makefile.am: changes from other branch * C/usage-print.sgml: merge from branch * C/usage-exchange.sgml: merge from branch * C/usage-mail.sgml: merge from evolution-1-0-branch branch. svn path=/trunk/; revision=16267 --- help/C/Makefile.am | 56 ++++++++++++++++++ help/C/usage-calendar.sgml | 22 ++++--- help/C/usage-exchange.sgml | 4 +- help/C/usage-mail-org.sgml | 36 ++++++------ help/C/usage-mail.sgml | 133 ++++++++++++++++++++++++------------------- help/C/usage-mainwindow.sgml | 66 ++++++++++----------- help/C/usage-print.sgml | 8 +-- help/ChangeLog | 34 ++++++++--- 8 files changed, 230 insertions(+), 129 deletions(-) diff --git a/help/C/Makefile.am b/help/C/Makefile.am index b8ae7f23c3..199d6a84e3 100644 --- a/help/C/Makefile.am +++ b/help/C/Makefile.am @@ -1 +1,57 @@ EXTRA_DIST = sgmldocs.make +figs = \ + figures/calendar.png \ + figures/config-cal.png \ + figures/config-mail.png \ + figures/contact-editor.png \ + figures/contact.png \ + figures/exchange-identity.png \ + figures/exchange-receive-options.png \ + figures/exchange-receive.png \ + figures/filter-assist-fig.png \ + figures/filter-new-fig.png \ + figures/full-1.png \ + figures/full-2.png \ + figures/full-3.png \ + figures/full-4.png \ + figures/full-5.png \ + figures/full-6.png \ + figures/full-7.png \ + figures/mail-composer.png \ + figures/mail-druid-pic.png \ + figures/mail-inbox.png \ + figures/mail-threaded.png \ + figures/mainwindow-pic.png \ + figures/newmsg.png \ + figures/print-dest.png \ + figures/print-preview.png \ + figures/replymsg.png \ + figures/schedule.png \ + figures/small_desktop.png \ + figures/summary.png \ + figures/vfolder-createrule-fig.png \ + + +docname = evolution +lang = C +omffile = evolution-C.omf +sgml_ents = \ + apx-authors.sgml \ + apx-bugs.sgml \ + apx-gloss.sgml \ + config-prefs.sgml \ + config-sync.sgml \ + evolution-faq.sgml \ + menuref.sgml \ + preface.sgml \ + usage-calendar.sgml \ + usage-contact.sgml \ + usage-exec-summary.sgml \ + usage-exchange.sgml \ + usage-mail-org.sgml \ + usage-mail.sgml \ + usage-mainwindow.sgml \ + usage-print.sgml \ + usage-sync.sgml +include $(top_srcdir)/help/sgmldocs.make +dist-hook: app-dist-hook diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml index 05f5e8e3d8..9da056b3b4 100644 --- a/help/C/usage-calendar.sgml +++ b/help/C/usage-calendar.sgml @@ -372,7 +372,7 @@ - + Getting Responses to Meeting Requests Once you get a reply to your meeting invitation, you'll need @@ -440,13 +440,14 @@ ########## END UNIMPLEMENTED FEATURESET ############ --> - The Free/Busy View + Scheduling Meetings and The Free/Busy View - Evolution has a Free/Busy window so - that you can view people's schedules together to help you - schedule appointments. Read to - learn about how to use this feature with the Ximian Connector - for Microsoft Exchange. + In addition to the standard meeting scheduling tools, you can + use the Free/Busy view to check whether people are available + in advance. At this time, the Free/Busy feature only works + with Microsoft Exchange servers. However, you can still use + iCal event invitations to coordinate schedules with other + people no matter what server you're using. To access the free/busy view: @@ -548,8 +549,15 @@ automatically; others will receive email notification of any change in plans. + + + Read to learn about how to + use this feature with the Ximian Connector for Microsoft + Exchange. + + diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml index b87aee9cdc..e2f0085d4f 100644 --- a/help/C/usage-exchange.sgml +++ b/help/C/usage-exchange.sgml @@ -705,6 +705,4 @@ There are, however, some features which are not available: - - - + \ No newline at end of file diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml index 19f054b73e..e933d6a033 100644 --- a/help/C/usage-mail-org.sgml +++ b/help/C/usage-mail-org.sgml @@ -12,6 +12,7 @@ Importing Your Old Email and Settings + Evolution allows you to import your old email and data so that you don't need to worry about losing your old information. @@ -136,8 +137,8 @@ - The left-most column shows the application which your - information will be imported from. Select + The left-most column shows the application from which + your information will be imported from. Then, select checkboxes on each component to import different properties of each application. @@ -154,16 +155,20 @@ - Microsoft Outlook and Outlook Express Users Microsoft Outlook, and versions of Outlook Express after - version 4, use proprietary formats that Ximian - Evolution cannot read or import. For contacts, - you may have to email them to yourself and import them. - For email, there is a more simple workaround: + version 4, use proprietary formats that + Ximian Evolution cannot read or + import. For contacts, you may wish to consider using + OutPort, a third-party conversion tool. Ximian does not + support OutPort but you can find more information about it + at the Outport + homepage. For email, there is a more simple + workaround: @@ -202,7 +207,6 @@ the messages in your Trash folders. - @@ -521,16 +525,16 @@ looking for messages less than two days old. - - Date Recieved - This works the same way as the Date Sent - option, except that it compares the time you got the message - with the dates you specify. - + Date Received - This works the same + way as the Date Sent option, + except that it compares the time you got the + message with the dates you specify. + Score - Emails have a standard priority range from -3 (least important) to 3 (most important). You can have filters set the - priority of messages you recieve, and then have other filters + priority of messages you receive, and then have other filters applied only to those messages which have a certain priority. @@ -981,7 +985,7 @@ - Date Recieved - This works the same way as the Date Sent + Date Received - This works the same way as the Date Sent option, except that it compares the time you got the message with the dates you specify. @@ -989,7 +993,7 @@ Score - Emails have a standard priority range from -3 (least important) to 3 (most important). You can have vFolders set the - priority of messages you recieve, and then have other + priority of messages you receive, and then have other vFolders applied only to those messages which have a certain priority. diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml index 59c9210ced..70bc78bd1d 100644 --- a/help/C/usage-mail.sgml +++ b/help/C/usage-mail.sgml @@ -15,8 +15,7 @@ them. Read to find out how. - - + Reading Mail @@ -90,7 +89,7 @@ Threaded Mail View - + @@ -120,9 +119,10 @@ When you press Delete or click the trash button, your mail isn't actually deleted, but is marked for deletion. Your email is not gone - until you have expunged it. When you "Expunge" a - folder, you remove all the mail that you have marked - for deletion. + until you have expunged it. When you + expunge a folder, you remove all the mail that you + have marked for deletion. If you don't like this behavior, select @@ -152,13 +152,15 @@ Trash is Actually a vFolder? - Your trash folder is actually a vFolder that displays all - messages you have marked for later deletion. For more - information about vFolders, see . If you choose - Actions Empty - Trash you will expunge - all your folders. + Both local and IMAP Trash folders are actually vFolders that + display all messages you have marked for later deletion. + For more information about vFolders, see . Since emptying + your trash expunges the messages in your Trash folder, + choosing Actions + Empty Trash is the + same as expunging deleted mail from all + your folders. @@ -214,17 +216,17 @@ - Your personal information + Your personal information. - Your outgoing email server information + Your outgoing email server information. - Your mail account identity name + Your mail account identity name. @@ -513,9 +515,8 @@ File New - Mail Message - - , or by pressing the + Mail Message + , or by pressing the Compose button in the Inbox toolbar. When you do so, the New Message window will open, as shown in New Message Window Evolution Main Window - + @@ -554,7 +555,7 @@ charges: you can remain offline until you need to send mail, then connect and send all your mail at once. Mail in the outbox is sent when you click - Send/Recieve in the main window. + Send/Receive in the main window. To learn more about how you can specify message queue and @@ -789,7 +790,7 @@ Reply Message Window Evolution Main Window - + @@ -1605,7 +1606,7 @@ - Making Your Email Fancier + Improving Email Appearance with HTML Evolution can do a lot with email by utilizing the HTML features. Making an email functional @@ -1624,41 +1625,48 @@ Indented Text with Headlines - - Notice how professional the email looks, but it gets the - content across well. Each section is broken up in its own - subsection. The title is bolded, while the text which - follows is indented one time. + This message is not only more attractive, but more + informative. Each section is broken down into subsctions. + The title for each section is in bold text, with the + following content indented. Making your headlines a larger size instead of bold can help as well. Header size 4 is often the best alternative for bold. You can change your text to size 4 by selecting it and - pressing Ctrl+4. You can set your text to regular size later - by hitting Ctrl+0. + pressing Ctrl4, + and change it back to normal size with Ctrl0. Bulleted Lists - Often times, people use asterisks instead of real bullets. - Not only do asterisks look nicer, but - Evolution will word wrap for you, - which makes your text looks nicer. + Select the Bulleted List option + from the text style drop-down box to begin making a bulleted + list. Evolution will handle the + word wrap and indentation for you. If you prefer to send + the message in plain text, you can still write it up in + HTML, and Evolution will convert + to a well-formed plain-text bulleted list, using asterisks + instead of HTML bullets. Images In Your Email - Images can help people to understand your point. You should - also consider using the HTML Picture Frame Template in - Evolution, as it looks good and - has captions below it. + Another way to improve the appearance of messages is to add + images to them. Especially if you want to discuss a + particular image in the message, the the HTML picture frame + template in Evolution, as it + looks good and has captions below it. If you do choose to use images, try to keep them narrow. If @@ -1671,7 +1679,7 @@ Images in an email - + @@ -1679,9 +1687,10 @@ Coloring Your Text - Colors can help bring words or sentences out for emphasis. You - should choose your colors carefully though, as the wrong color - can be distracting. Some good colors to use would be: + Colors can help bring words or sentences out for emphasis. + You should choose your colors carefully though, because the + wrong color can be distracting. Some good colors to use + are: @@ -1699,21 +1708,28 @@ - - Notice how these colors are similar saturation + + + All of these colors are of a similar level of saturation and are + easy to read on a white background. + HTML Signatures in Your Email - A lot of people use signatures to sign their emails to - provide personal information about themselves. - Evolution gives you the option of - easily designing your signatures in HTML. This can give - your signatures a more professional or fun look. + The last few lines of an email message are often devoted to + a signature block, typically a few lines of text appended + automatically to every email by the mail program itself. You + can use the signature to add your address and any other + contact information you think is important, or simply to + provide an amusing or interesting closing line for your + message. Evolution gives you the + option of designing your signatures in HTML or in plain + text. - To setup your HTML signature, read the following steps: + To set up an HTML signature: @@ -1756,9 +1772,9 @@ - The HTML signature editor uses mostly the same - interface as the composer. You can create your - signature in this window. + The HTML signature editor uses the same interface as + the composer. You can create your signature in this + window. @@ -1925,7 +1941,7 @@ Public Key? Private Key? What is the difference? GPG uses two keys: public and private. You can give your - public key to anyone you want to recieve + public key to anyone you want to receive encrypted messages, or put it on a public key server so that people can look it up before contacting you. Never give your private key to anyone, @@ -2028,7 +2044,8 @@ Choose a key length. The default, 1024 bits, should be - long enough. Some say that 2048 should be used. + long enough, and 2048 bits is considered very strong + indeed. @@ -2158,7 +2175,7 @@ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for Mail Settings Once there, select the account with which you'd like to send - and recieve encrypted mail, and click the + and receive encrypted mail, and click the Edit button. In the Security tab is a section labeled Pretty Good Privacy. Enter your key ID @@ -2210,7 +2227,7 @@ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for - Unencrypting a Recieved Message + Unencrypting a Received Message If you get an encrypted message, you will need to decrypt it before you read it. Remember, the sender has to have your @@ -2224,4 +2241,4 @@ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for - + \ No newline at end of file diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml index b1494a1423..99d914422b 100644 --- a/help/C/usage-mainwindow.sgml +++ b/help/C/usage-mainwindow.sgml @@ -52,7 +52,7 @@ 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 Virtual Folders, + linkend="usage-mail-organize-vFolders">VFolders, which let you save searches as though they were ordinary mail folders. @@ -131,10 +131,10 @@ - Recieving Email + Receiving Email - The Recieving Email step lets you configure - receving email people have sent you. + The Receiving Email lets you determine + which you will get your email. @@ -151,7 +151,6 @@ permanent storage. - Microsoft Exchange: Available only if you have @@ -163,6 +162,7 @@ + IMAP: Keeps the email on your server so you can @@ -174,9 +174,8 @@ Standard Unix mbox spools: If you want to read and store mail in the mail spool on your local system, - choose this option. You'll need - to provide the path to the mail spool you want to - use. + choose this option. You'll need to provide the + path to the mail spool you want to use. @@ -320,9 +319,9 @@ - Create a Global Address List folder: If you would - like to have a seperate folder for the Active Directory's - Global Address List, leave this box checked. + Create a Global Address List folder: If you want to + use your organization's Active Directory or Global Address + List, leave this box checked. @@ -382,14 +381,13 @@ server: If you'd like your filters to work on this account as well as on locally downloaded mail, check this box. - - - - - + + + + What's an IMAP Namespace? @@ -431,9 +429,9 @@ Microsoft Exchange: Sends mail through a Microsoft Exchange server using the Microsoft Exchange 2000 - protocol. Available only if you have purchased the - Ximian Connector for Microsoft Exchange from - store.ximian.com. @@ -444,7 +442,7 @@ from your system. Sendmail is more flexible, but is not as easy to configure, so you should only select this option if you know how to set up a - sendmail service. + Sendmail service. @@ -466,11 +464,12 @@ - Authentication Type: Chances are you are using + Authentication Type: Unless you've been told otherwise, + your best bet is to leave this set at Password. If you're not sure, ask your system administrator or ISP, or have - Ximian Evolution check for you by - clicking Check for supported + Ximian Evolution check for + you by clicking Check for supported types. @@ -573,7 +572,8 @@ the workaround described in the note below. Use the Ximian 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 Ximian support website. @@ -619,11 +619,11 @@ the workaround described in the note below. Importing Mail from mutt - mutt is a full-featured mail client - which is shipped with most Linux and Unix distributions. + mutt is a text-based mail client + which is shipped with many Linux and Unix distributions. mutt uses the standard mbox, - maildir, and MH file formats, which makes importing your mail into - Evolution easy. By default, + maildir, and MH file formats, which makes importing your mail + into Evolution easy. By default, mutt uses the mbox file format. @@ -678,9 +678,9 @@ the workaround described in the note below. Importing Mail from KMail - KMail is a full-featured mail client which is shipped with the - KDE desktop environment. KMail uses the standard mbox file - format, which means that importing your mail into + KMail is the mail client which is shipped with the KDE desktop + environment. KMail uses the standard mbox file format, which + means that importing your mail into Evolution is easy. @@ -1251,7 +1251,7 @@ Shows your pending tasks It can send and receive mail in HTML or as plain text, - and makes it easy to send and recieve multiple file + and makes it easy to send and receive multiple file attachments. @@ -1453,7 +1453,7 @@ Shows your pending tasks your cards in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust - the width of the columns by clicking and dragging the grey + the width of the columns by clicking and dragging the gray column dividers. diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml index dc088e79da..c36a53fe2a 100644 --- a/help/C/usage-print.sgml +++ b/help/C/usage-print.sgml @@ -8,12 +8,12 @@ Whether you're printing a message, a calendar page, or a selection - of address cards, you can choose to print directly to a printer, or - save the print output to a postscript file. You can also use the - preview feature to see how your printed output will look. + of address cards, you can choose to print directly to a printer, + or save the print output to a postscript file. You can also + use the preview feature to see how your printed output will look. - Print Preview diff --git a/help/ChangeLog b/help/ChangeLog index 609a1e0c64..4175bc54fc 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -1,10 +1,24 @@ +2002-03-27 Aaron Weber + + * C/topic.dat: add from branch. + * C/figures/*: merge from branch + * C/usage-calendar.sgml: merge from branch + * C/usage-mail.sgml: merge from branch + * C/usage-mail-org.sgml: merge from branch + * C/Makefile.am: changes from other branch + * C/usage-print.sgml: merge from branch + * C/usage-exchange.sgml: merge from branch + * C/usage-mail.sgml: merge from evolution-1-0-branch branch. + 2002-03-25 Kevin Breit - * C/usage-mail.sgml: Added mention that 2048 maybe recommended by some people. Fixed a typo. + * C/usage-mail.sgml: Added mention that 2048 maybe recommended by + some people. Fixed a typo. 2002-03-23 Kevin Breit - * C/usage-print.sgml: I fixed a typo which caused the documentation to not build. + * C/usage-print.sgml: I fixed a typo which caused the + documentation to not build. 2002-03-14 Kevin Breit @@ -16,15 +30,18 @@ * C/apx-gloss.sgml: Added Postscript as a glossary definition. - * C/usage-print.sgml: Changed the introduction of this. Do users really care about gnome-print? - Linked the Postscript line to the glossary. + * C/usage-print.sgml: Changed the introduction of this. Do users + really care about gnome-print? Linked the Postscript line to the + glossary. * C/usage-mail.sgml: Pulled warning about the HTML mail stuff. 2002-03-12 Kevin Breit - * C/usage-mail.sgml: Replaced "png" with "PNG". This shouldn't break the SGML build and it's a slow start to the XML porting process. - Included information about how to create an HTML signature. + * C/usage-mail.sgml: Replaced "png" with "PNG". This shouldn't + break the SGML build and it's a slow start to the XML porting + process. Included information about how to create an HTML + signature. 2002-03-11 Kevin Breit @@ -41,8 +58,9 @@ C/figures/schedule.png,exchange-identity.png exchange-receive.png, exchange-receive-options.png - * C/usage-exchange.sgml: expanded note about active directory server. - added screenshot for Free/Busy feature. Doubled the size of the config instructions. + * C/usage-exchange.sgml: expanded note about active directory + server. added screenshot for Free/Busy feature. Doubled the size + of the config instructions. * C/figures/schedule.png: New file, screenshot for free/busy feature. -- cgit v1.2.3