* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 531 insertions, 115 deletions

diff --git a/doc/kleopatra/index.docbook b/doc/kleopatra/index.docbook
index ba4672156..09f9531b3 100644
--- a/doc/kleopatra/index.docbook
+++ b/doc/kleopatra/index.docbook
@@ -146,8 +146,8 @@ menu, as well as from the command line. The &kleopatra; executable is
 named <userinput><command>kleopatra</command></userinput>.</para>
 
 <note><para>This program is named after Cleopatra, a famous female
-Egyptian pharaoh that lived at the time of Julius Caesar, whom she is
-said to have had an intimate relationship with.</para>
+Egyptian pharaoh that lived at the time of Julius Caesar, with whom 
+she had a child, Caesarion, unacknowledged as his heir.</para>
 
 <para>The name was chosen since this program originates from the
 <ulink url="http://www.gnupg.org/aegypten2/">&Auml;gypten
@@ -494,7 +494,7 @@ command line interface).</para>
 
 
 <varlistentry id="view-stop-operation">
-<term><menuchoice><shortcut><keycombo action="simul"><keycap>Esc</keycap></keycombo></shortcut>
+<term><menuchoice><shortcut><keycombo action="simul">&Esc;</keycombo></shortcut>
 <guimenu>View</guimenu><guimenuitem>Stop Operation</guimenuitem></menuchoice></term>
 
 <listitem>
diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook
index a66665ad3..7643b3562 100644
--- a/doc/kmail/configure.docbook
+++ b/doc/kmail/configure.docbook
@@ -648,7 +648,7 @@ so you can choose a monospaced font for the date field for better readability.</
 quoted more than three times will appear in color. Note that the
 <guilabel>Quoted text</guilabel> colors only work in the message reader, not in
 the composer. If you want folders which are close to their quota
-(space alotment, usually used on IMAP servers) to be displayed in a different color,
+(space allotment, usually used on IMAP servers) to be displayed in a different color,
 you can specify a percentage value as a threshold for this. The color to be used
 can be configured along with the other custom colors.<!-- TODO --></para>
 
@@ -657,6 +657,11 @@ can be configured along with the other custom colors.<!-- TODO --></para>
 <sect2 id="configure-appearance-layout">
 <title>Layout</title>
 
+<para>If the <guilabel>Close message window after replying or forwarding</guilabel> option is
+activated, KMail will close the message window after replying to or forwarding the message that
+is displayed in the window. This only applies to the separate message window, not to the embedded
+message preview pane.</para>
+
 <para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader
 pane that tells you if a message is &html; or not. This is important because
 &html; messages might imitate the look of a signed and encrypted message, so
@@ -777,6 +782,32 @@ folder will be selected in &kmail;'s main window.
 	    </para>
 	  </listitem>
 	</varlistentry>
+  <varlistentry id="configure-composer-general-quote-selection-only">
+    <term>
+      <guilabel>Only quote selected text when repyling</guilabel>
+    </term>
+    <listitem>
+      <para>
+        If checked, &kmail; will quote only the selected text in the message window,
+        instead of the complete message, when replying.
+        With this, it is possible to quickly generate replies that quote only the relevant
+        paragraph to which you are actually replying, and omits the other paragraphs that are
+        not relevant to the context.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry id="configure-composer-general-strip-signatures">
+    <term>
+      <guilabel>Remove the signature when replying</guilabel>
+    </term>
+    <listitem>
+      <para>
+        If checked, &kmail; will remove the signature from the quoted text
+        when replying to a message. This is useful since it reduces the amount
+        of quoted text, which makes it easier to read the reply.
+      </para>
+    </listitem>
+  </varlistentry>
 	<varlistentry id="configure-composer-general-auto-request-mdns">
 	  <term>
 	    <guilabel>Automatically request message disposition notifications</guilabel>
@@ -806,6 +837,19 @@ folder will be selected in &kmail;'s main window.
 	    </para>
 	  </listitem>
 	</varlistentry>
+    <varlistentry id="configure-composer-general-too-many-recipients">
+      <term>
+        <guilabel>Warn if the number of recipients is larger than</guilabel>
+      </term>
+      <listitem>
+        <para>
+          If the number of recipients is larger than this value, KMail will
+          warn and ask for a confirmation before sending the mail.
+          The default is to warn if there are more than <literal>5</literal> recipients.
+          This warning can be turned off.
+        </para>
+      </listitem>
+    </varlistentry>
 	<varlistentry id="configure-composer-general-autosave-interval">
 	  <term>
 	    <guilabel>Autosave interval</guilabel>
@@ -819,6 +863,18 @@ folder will be selected in &kmail;'s main window.
 	    </para>
 	  </listitem>
 	</varlistentry>
+    <varlistentry id="configure-composer-general-forwading-type">
+	  <term>
+	    <guilabel>Default Forwarding Type</guilabel>
+	  </term>
+	  <listitem>
+	    <para>
+           Lets you decide whether you want to forward messages inline or as an attachment by default.
+           This changes which type of forwarding mechanism is used when you click the toolbar icon or
+           when you activate the shortcut for forwarding.
+	    </para>
+	  </listitem>
+	</varlistentry>
 	<varlistentry id="configure-composer-general-external-editor">
 	  <term>
 	    <guilabel>External Editor</guilabel>
@@ -1102,7 +1158,7 @@ of key words can be modified.</para>
 		  <para>
 		    Attaches the complete message to the disposition
 		    notification. Usually, this is overkill. It does
-		    not add any valueable information that cannot be
+		    not add any valuable information that cannot be
 		    deduced from the message headers alone, but people
 		    sometimes insist on this, since it is much easier
 		    for humans to correlate the content of the message
@@ -1276,7 +1332,7 @@ of key words can be modified.</para>
 	  </term>
 	  <listitem>
 	    <para>
-	      If checked, everytime you encrypt a message, a dialog
+	      If checked, every time you encrypt a message, a dialog
 	      will appear that presents you with the encryption keys
 	      that will be used for each recipient. You can then
 	      review the choice of keys, change them, and approve or
@@ -1335,7 +1391,7 @@ of key words can be modified.</para>
       </title>
 
       <para>
-	On this tab you can switch security-relavant warnings on and
+	On this tab you can switch security-relevant warnings on and
 	off.
       </para>
 
@@ -1386,7 +1442,7 @@ of key words can be modified.</para>
 	  <listitem>
 	    <para>
 	      If checked, &kmail; will emit a warning if an &smime;
-	      certifciate or &openpgp; key will be used for a recipient
+	      certificate or &openpgp; key will be used for a recipient
 	      whose email address is not listed in the email addresses
 	      stored in the certificate.
 	    </para>
@@ -1698,7 +1754,7 @@ of key words can be modified.</para>
 	backends. Below each backend entry, you can see what protocols
 	(&openpgp; and/or &smime;) the backend supports. If a protocol
 	is not listed, the backend does not support it. If it is
-	listed, but greyed out, the backend supports the protocol, but
+	listed, but grayed out, the backend supports the protocol, but
 	some required programs were not found, or other errors
 	occurred during initialization. If you press
 	<guibutton>Rescan</guibutton>, a dialog box will appear that
@@ -1793,12 +1849,39 @@ Correspondingly, if you ask &kmail; to go to the previous unread message.
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Jump to first unread message when entering a folder</guilabel></term>
+
+<term><guilabel>When entering a folder</guilabel></term>
+<listitem>
+<para>This option controls what happens if you open a folder.
+<itemizedlist>
+<listitem>
+<para>If <guilabel>Jump to First New Message</guilabel> is selected then &kmail; will select the
+first message it finds that is marked as new.
+</para>
+</listitem>
+<listitem>
+<para>If <guilabel>Jump to First Unread or New Message</guilabel> is selected then &kmail; will
+select the first message it finds that is marked either as new or as unread.
+</para>
+</listitem>
+<listitem>
+<para>If <guilabel>Jump to Last Selected Message</guilabel> is selected then &kmail; will select
+the message that was selected when the folder was open the last time.
+</para>
+</listitem>
+<listitem>
+<para>If <guilabel>Jump to Newest Message</guilabel> is selected then &kmail; will select the newest
+message by date.
+</para>
+</listitem>
 <listitem>
-<para>If this option is enabled &kmail; will go to the first unread message
-when you enter a folder; if it is not enabled, &kmail; will go to first
-new message or, if there is no new message, to the message
-that was selected when you last left the folder.</para>
+<para>If <guilabel>Jump to Oldest Message</guilabel> is selected then &kmail; will select the oldest
+message by date.
+</para>
+</listitem>
+</itemizedlist>
+
+</para>
 </listitem>
 </varlistentry>
 
@@ -1908,6 +1991,21 @@ option is selected.</para>
 <para>Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para>
 </listitem>
 </varlistentry>
+<varlistentry>
+<term><guilabel>Exchange compatible invitations naming</guilabel></term>
+<listitem>
+<para>Microsoft Outlook, when used in combination with a Microsoft Exchange
+server, has a problem understanding standards-compliant groupware e-mail.
+Enable this option to send groupware invitations in a way that Microsoft
+Exchange understands. The invitation will be sent as an attachment with name <filename>ical.ics</filename>.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Outlook compatible invitation reply comments</guilabel></term>
+<listitem>
+<para>When the user provides comments when responding to invitations, send the comment in way that Microsoft Outlook(tm) understands. If this option is not enabled, the response comments will not be seen in Outlook.</para>
+</listitem>
+</varlistentry>
 </variablelist>
 </sect2>
 
@@ -1934,7 +2032,7 @@ SendMDNsWithEmptySender=true
 to the [MDN] section of the kmail configuration file. If there is no such section, simply add "[MDN]" on
 a line by itself just above the option.
 
-Note that the default setting of "false" strictly speaking violates internet standards, but is
+Note that the default setting of "false" strictly speaking violates Internet standards, but is
 set that way for practical reasons, to avoid servers rejecting MDNs that KMail generates because they
 think they are SPAM.
 </para>
@@ -1956,20 +2054,6 @@ The option is enabled by default. To disable the feature, add a line reading (un
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>ForwardingInlineByDefault</guilabel></term>
-<listitem>
-<para>
-This option allows you to make inline forwarding the default forwarding method instead
-of forwarding as attachement.
-
-To enable the feature, add a line reading (under [Composer] section):
-</para>
-<programlisting>ForwardingInlineByDefault=true
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term><guilabel>MaximumAttachmentSize</guilabel></term>
 <listitem>
 <para>
@@ -2011,6 +2095,73 @@ To disable the feature, add a line reading (under [OutOfOffice] section):
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term><guilabel>Allow out-of-office settings to be adjusted by the user.</guilabel></term>
+<listitem>
+<para>
+In case you don't want users to be able to upload their own out-of-office scripts to
+the server you can add:
+</para>
+<programlisting>AllowOutOfOfficeSettings=false
+</programlisting><para>
+to the [OutOfOffice] section of the kmail configuration file. If there is no such section, simply add "[OutOfOffice]" on
+a line by itself just above the option.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Allow out-of-office scripts to be uploaded by the user, but no settings changed.</guilabel></term>
+<listitem>
+<para>
+If you want to allow your users to upload their own out-of-office scripts but you do not want them to be
+able to change the domain to react to and the react-to-spam setting, you can add:
+</para>
+<programlisting>AllowOutOfOfficeUploadButNoSettings=true
+</programlisting><para>
+to the [OutOfOffice] section of the kmail configuration file. If there is no such section, simply add "[OutOfOffice]" on
+a line by itself just above the option.
+</para>
+</listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><guilabel>Default domain to limit out-of-office replies to.</guilabel></term>
+<listitem>
+<para>
+When editing vacation (out-of-office) scripts, the user can specify a domain to
+limit the sending of such replies to. To pre-load this setting with a default
+value, add
+</para>
+<programlisting>OutOfOfficeDomain=myMailDomain.test
+</programlisting><para>
+to the [OutOfOffice] section of the kmail configuration file. If there is no such section, simply add "[OutOfOffice]" on
+a line by itself just above the option.
+
+Applying defaults to the out-of-office configuration dialog via the corresponding
+button will restore this domain, in case the user has changed it.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Enable sending of out-of-office replies to messages marked as SPAM.</guilabel></term>
+<listitem>
+<para>
+By default, out-of-office replies are not sent to messages marked as SPAM. To override this
+behavior, add
+</para>
+<programlisting>OutOfOfficeReactToSpam=true
+</programlisting><para>
+to the [OutOfOffice] section of the kmail configuration file. If there is no such section, simply add "[OutOfOffice]" on
+a line by itself just above the option.
+
+Applying defaults to the out-of-office configuration dialog via the corresponding
+button will restore this setting, in case the user has changed it.
+</para>
+</listitem>
+</varlistentry>
 
 <varlistentry>
 <term><guilabel>disregardUmask</guilabel></term>
@@ -2030,7 +2181,7 @@ To enable the feature, add a line reading (under [General] section):
 <listitem><para>Activate this option to automate the handling of not yet uploaded messages in disconnected IMAP
 folders that can not be uploaded. This can happen if the folder was removed from the server or your access
 rights have been restricted. Such messages will automatically moved to a newly created lost+found folder if
-this option is enabled, you will be ask how to proceed everytime otherwise.
+this option is enabled, you will be ask how to proceed every time otherwise.
 
 To enable the feature, add a line reading:
 </para>
diff --git a/doc/kmail/index.docbook b/doc/kmail/index.docbook
index fe38a5100..06faeb065 100644
--- a/doc/kmail/index.docbook
+++ b/doc/kmail/index.docbook
@@ -9,6 +9,7 @@
   <!ENTITY kmail-menus SYSTEM "menus.docbook">
   <!ENTITY kmail-faq SYSTEM "faq.docbook">
   <!ENTITY kmail-importing SYSTEM "importing.docbook">
+  <!ENTITY kmail-chiasmus SYSTEM "using-chiasmus.docbook">
   <!ENTITY kmail-credits-and-licenses SYSTEM "credits-and-licenses.docbook">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -126,6 +127,7 @@
 &kmail-menus;
 &kmail-faq;
 &kmail-importing;
+&kmail-chiasmus;
 &kmail-credits-and-licenses;
 
 <appendix id="installation">
diff --git a/doc/kmail/using-chiasmus.docbook b/doc/kmail/using-chiasmus.docbook
new file mode 100644
index 000000000..cd075d868
--- /dev/null
+++ b/doc/kmail/using-chiasmus.docbook
@@ -0,0 +1,158 @@
+<chapter id="chiasmus">
+
+<chapterinfo>
+<authorgroup>
+<author>
+<firstname>Jan-Oliver</firstname>
+<surname>Wagner</surname>
+<affiliation><address>
+<email>jan@intevation.de</email>
+</address></affiliation>
+</author>
+<author>
+<firstname>Till</firstname>
+<surname>Adam</surname>
+<affiliation><address>
+<email>till@kdab.net</email>
+</address></affiliation>
+</author>
+
+</authorgroup>
+
+<date>2005-06-30</date>
+<releaseinfo>1.8</releaseinfo>
+</chapterinfo>
+
+<title>Using the Chiasmus encryption tool</title>
+
+<sect1 id="chiasmus-preparations">
+<title>Preparations</title>
+
+<para>
+To encrypt and decrypt with Chiasmus, you need the BSI's Chiasmus 
+command line tool for GNU/Linux. It is intended solely for use in
+government agencies and availabe from the BSI on request.
+</para>
+
+<para>
+When executed without parameters, the <command>chiasmus</command>
+program should output something like:
+</para>
+
+<para>
+<screen>
+Chiasmus (R) fuer Windows K 1.8.0.0
+Bundesamt fuer Sicherheit in der Informationstechnik
+Kontakt: Chiasmus@bsi.bund.de
+(C) 2001 - 2005
+[ ...]
+</screen>
+</para>
+
+<para>
+Version 1.8.0.0 was tested succesfully. Other versions may or may not
+work correctly.
+</para>
+
+<para>
+As a last preparation step a directory which will hold the key files
+ending in <filename>.xis</filename> has to be created, if none already exists. Usually
+<filename class="directory">~/.chiasmus/</filename>  is used.
+</para>
+
+</sect1>
+
+<sect1 id="chiasmus-configuration">
+	<title>Configuration</title>
+<para>
+Select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KMail
+</guimenuitem></menuchoice> and choose the <guilabel>Crypto-Backends</guilabel>
+tab on the Security page. Select the entry for <guilabel>Chiasmus</guilabel> and click 
+<guibutton>Configure....</guibutton> to open the configuration dialog 
+for the Chiasmus backend.
+</para>
+
+<para>
+Specify the path to the Chiasmus binary and the directory where key files are
+to be stored, using the file selection dialogs which open when you click the
+folder icons next to the path entries.
+</para>
+
+<para>
+Close the backend configuration dialog by clicking <guibutton>Ok</guibutton>
+and check the <guilabel>Chiasmus Checkbox</guilabel> to activate it. Then also close the main 
+configuration dialog.
+</para>
+
+</sect1>
+
+
+<sect1 id="chiasmus-encryption">
+	<title>Encryption</title>
+<para>
+To encrypt a message with Chiasmus, select <menuchoice><guimenu>
+Options</guimenu><guimenuitem>Encrypt message with chiasmus
+</guimenuitem></menuchoice>. A dialog comes up in which you can select
+the key file to use, as well as additional command line arguments to
+be passed to <command>chiasmus</command>.
+</para>
+
+<note>
+<para>
+If you want to use Chiasmus encryption regularly, you should add
+an icon for that option to your toolbar, using <menuchoice><guimenu>
+Settings</guimenu><guimenuitem>Configure toolbars</guimenuitem>
+</menuchoice>. Move the entry for <guilabel>Encrypt with Chiasmus
+</guilabel> from the left side of the dialog to the right, using the
+buttons between the two panes. You can then quickly enable or disable
+Chiasmus encryption using that toolbar button and have a visual 
+indication of the current state.
+</para>
+</note>
+
+<note>
+<para>
+If automatic saving of backup copies of currently edited messages is
+enabled, you will be prompted for your Chiasmus password, if Chiamsus
+encryption is active.
+</para>
+</note>
+
+<para>
+On message sending, you will be prompted for the password. If the password
+is correct, the text of the message and all its attachments will be
+encrypted.
+</para>
+
+<note>
+<para>
+The other signing and encryption options are completely independent of
+the Chiasmus encryption. You can use those in addition to Chiasmus,
+&eg; to sign the message.  Additional encryption, on the other hand,
+does not make much sense and complicates decryption for the
+recipients.
+</para>
+</note>
+
+</sect1>
+
+<sect1 id="chiasmus-decryption">
+	<title>Decryption</title>
+<para>
+&kmail; and &kontact; detect messages that have been encrypted
+using Chiasmus and will automatically ask for the key file to use for
+decryption, as well as the corresponding password. If the password is correct, the
+message will be decrypted and displayed.
+</para>
+
+<para>
+To decrypt attachments that were encrypted using Chiasmus (&ie; those which have
+a file name ending in <filename>.xia</filename>), right-click on the 
+attachment you want to decrypt and select <menuchoice><guimenuitem>Decrypt using Chiasmus
+</guimenuitem></menuchoice>. After you have chosen a key file to be used for decryption and
+entered the correct password for it, a file selection dialog will allow you
+to specify where the decrypted attachment should be saved.
+</para>
+</sect1>
+
+</chapter>
diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook
index 1d3b3e381..6bc1046fa 100644
--- a/doc/kmail/using-kmail.docbook
+++ b/doc/kmail/using-kmail.docbook
@@ -375,6 +375,25 @@ checker. Note that you may first need to configure the spellchecker using
 
 </sect2>
 
+<sect2 id="setup-text-snippets">
+<title>Setting Up the Text Snippets Tool</title>
+<para>
+When editing in the composer window you can store often used parts of text as snippets. To configure the capabilities of the mail snippets part select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Snippets</guimenuitem> </menuchoice> from the menubar. A new panel will appear on the left side of the composer.
+</para>
+<para>To add a new snippet to Snippet Panel, right click on panel, click on <menuchoice><guimenu>Add Snippet</guimenu></menuchoice> in the context menu. A snippet editor dialog will appear, in which new text can be added and the snippet can be given a name. Also a <guilabel>Shortcut</guilabel> can be associated with the snippet. 
+Snippets can be grouped together as well by creating groups and adding snippets to particular group. If you want to view the stored text in a tooltip window whenever you keep the mouse cursor over the title of that snippet.
+</para>
+<para>The <guilabel>Snippets</guilabel> tool allows for a variable text in predefined places any time you insert a snippet into a file. To accomplish this  <guilabel>Snippets</guilabel> provides its own variables' mechanism. You can set up its behaviour in the snippet text itself by using separators ( $ ) that enclose the variable names. For example : $variablename$, $invoicenumber$, $weekno$.
+</para>
+<para>
+The variable separator can be changed to some other character by changing "snippetDelimiter" in [SnippetPart] section. The Text Snippet configuration file can be found here $KDEHOME/share/config/kmailsnippetrc .
+<programlisting>
+snippetDelimiter=$
+</programlisting>
+
+</para>
+
+</sect2>
 </sect1>
 
 <sect1 id="folders">
@@ -503,7 +522,7 @@ events by using the <guilabel>Generate free/busy and activate alarms for</guilab
 choice box.</para>
 
 <para>In case you don't want to receive reminders for folders shared by someone else,
-you can block them locally by activating the <guilabel>Block free/busy and alarms locally</guilabel>
+you can block them locally by activating the <guilabel>Block alarms locally</guilabel>
 checkbox.</para>
 
 </sect3>
@@ -1321,7 +1340,7 @@ which you do not like.</para>
 </varlistentry>
 <varlistentry>
 <term><guilabel>Forward To</guilabel></term>
-<listitem><para>This will forward the message inline (&ie; as if you selected <menuchoice><guimenu>Message</guimenu><guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address.</para>
+<listitem><para>This will forward the message inline (&ie; as if you selected <menuchoice><guimenu>Message</guimenu><guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address. You can select the template to be used when forwarding with this filter with the drop down list.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook
index 15a7c2c01..25b0a31f6 100644
--- a/doc/kontact/index.docbook
+++ b/doc/kontact/index.docbook
@@ -948,10 +948,89 @@ documentation</ulink>.
 </sect1>
 <sect1 id="kontact-configure-profiles">
 <title>&kontact; Profiles</title>
-<para>&kontact;'s profile support makes it possible to load and save user settings in profiles.
-The settings stored in the profile include typical Look&amp;Feel related options such as app-specific color schemes, icon sets, toolbar layout and application defaults. Personal information, e.g. accounts and identities are not stored in profiles. 
+<para>A profile is an arbitrary set of configuration values for any of the kontact components (mail, calendar, etc.) accompanied by a configuration file for the profile itself, which specifies its name, description etc. An example profile configuration file looks like this:
+</para>
+
+<informalexample>
+<para>
+<literallayout>
+[Kontact Profile]
+Description=Default KDE Kontact settings
+Identifier=KontactDefaults
+Name=Kontact Style
+</literallayout>
+</para>
+<para>
+The format is the standard .ini file format used for configuration throughout KDE, including in kiosk.
+</para>
+</informalexample>
+
+<para>
+&kontact;'s profile support makes it possible to load and save user settings in profiles.
+The settings stored in the profile include typical Look&amp;Feel related options such as app-specific color schemes, icon sets, toolbar layout and application defaults. Personal information, e.g. accounts and identities are not stored in profiles.
+</para>
+
+<para>
 Two default profiles are provided by Kontact: &quot;&kontact; Style&quot;, which contains the default &kontact; settings, and &quot;Outlook Style&quot;, adapting &kontact; to Microsoft Outlook Look&amp;Feel.
-The user can adapt existing profiles, create new profiles from his current settings, and import and export profiles. To manage profiles, choose &quot;Configure Profiles&quot; from the &quot;Settings&quot; menu.
+The user can adapt existing profiles, create new profiles from his current settings, and import and export profiles. 
+</para>
+
+<para>
+The dialog opened through Settings -> "Configure Profiles" allows profiles to be imported, exported, created, deleted and saved. They can also be loaded (applied) from there. Saving applies the currently active settings throughout Kontact to the selected profile, while import and export allow existing profiles to be written to or read from directories. To change a setting, one can edit the kontactrc file using a text editor and save it.
+</para>
+
+<para>
+Apart from the configuration file, a profile directory can contain configuration skeleton files for Kontact as a whole (kontactrc) or for any of the components (korganizerrc, kmailrc, etc.). These files can in turn contain any configuration values that the profile should set (overriding the user's current configuration) when the profile is loaded.
+
+<itemizedlist>
+        <listitem><para>
+          The korganizer configuration for the "Kontact Defaults" profile for example sets the calendar view to be merged, by default :
+<informalexample>
+<para>
+                [Views]
+                Agenda View Calendar Display=CalendarsMerged
+</para>
+</informalexample>
+</para>
+        </listitem>
+
+        <listitem><para>
+           The Outlook-like profile, on the other hand, sets it to be side by side, like in Outlook:
+<informalexample>
+<para>
+                [Views]
+                Agenda View Calendar Display=CalendarsSideBySide
+</para>
+</informalexample>
+</para>
+        </listitem>
+
+        <listitem><para>
+           If a profile wants to reset or remove a configuration key, it can specify that key like so:
+<informalexample>
+<para>
+                [General]
+                activeBackground=KONTACT_PROFILE_DELETE_KEY
+</para>
+</informalexample>
+</para>
+        </listitem>
+       
+        <listitem><para>
+           This example resets the background color to whatever the KDE style suggests. The Outlook compatability profile sets this key to the Windows/Outlook color style:
+<informalexample>
+<para>
+           [General]
+           activeBackground=47,103,255
+</para>
+</informalexample>
+</para>
+        </listitem>
+    </itemizedlist>
+</para>
+
+<para>
+Currently Kontact ships with two (incomplete) profiles, one which (re-)configures things to look and feel the way Kontact natively does, while the other one attempts to approach the look&amp;feel of Outlook on Windows. To this end they change a variety of things, concretely the color palette used, the icon theme used, how the calendar view is layed out, whether the navigation toolbar is visible how the splitter sizes are initialized, in the main kontact interface.
 </para>
 </sect1>
 </chapter>
diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook
index a0398ed26..83b207e14 100644
--- a/doc/korganizer/index.docbook
+++ b/doc/korganizer/index.docbook
@@ -4,8 +4,6 @@
   <!ENTITY kappname "&korganizer;">
   <!ENTITY package "kdepim">
   <!ENTITY plugins-chapter SYSTEM "plugins-chapter.docbook">
-  <!ENTITY exchange-plugin-workshop SYSTEM "exchange-plugin.docbook">
-  <!ENTITY group-scheduling-workshop SYSTEM "group-scheduling.docbook">
   <!ENTITY outlook-to-vcalendar-workshop SYSTEM "outlook-to-vcalendar.docbook">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -123,7 +121,7 @@ help you keep your schedule. </para></abstract>
 <keyword>alarm</keyword>
 <keyword>appointment</keyword>
 <keyword>event</keyword>
-<keyword>jornal</keyword>
+<keyword>journal</keyword>
 <keyword>to-do</keyword>
 </keywordset>
 
@@ -153,7 +151,7 @@ information and the freedom to choose the best solutions.
 &kontact;, offering you an integrated solution for your
 communication and information management needs: email, notes, contacts
 management, news reader, synchronization with portable devices, and news feeds
-reader.  Even if you don't use it inside &kontact;, &korganizer; is
+reader.  Even if you do not use it inside &kontact;, &korganizer; is
 integrated with the other &kde; <acronym>PIM</acronym> applications.
 For instance, you can configure it to show birthdays from &kaddressbook; in your
 agenda, use &kmail; to send and receive invitations, &etc;</para>
@@ -350,7 +348,7 @@ appear instantly, allowing you to set the new due date.</para>
 
 <para>This five-minute course covered only the basic operation of &korganizer;.
 Now you should go on and read the rest of this manual to unleash the full
-power of &korganizer;'s capabilities. But if you don't feel like it, you
+power of &korganizer;'s capabilities. But if you do not feel like it, you
 should at least skip through the <link linkend="faq">&FAQ;</link>.</para>
 
 </sect1>
@@ -405,7 +403,7 @@ want to use another resource, especially if you use a supported groupware
 server. Please ask the server administrator for the information required to
 configure the groupware resource, including free/busy information publishing
 and retrieving. Access to free/busy information allows an event organizer to
-take the attendee's calendar in consideration when adding him to the the event's
+take the attendee's calendar in consideration when adding him to the event's
 attendee list.</para>
 
 <note><para>Besides calendar storage, groupware servers typically offer contacts,
@@ -514,7 +512,7 @@ storing your calendar information under
 <listitem><para>
 If you have access to a server that supports the
 <ulink url="http://www.groupdav.org">GroupDav protocol</ulink>, add this
-resource in order to be able to to save (and load) events<!--, journals, free/busy information?--> and to-dos
+resource in order to be able to save (and load) events<!--, journals, free/busy information?--> and to-dos
 to the server. To add the resource, you will need to know the server &URL;, your
 user name and your password. The GroupDav protocol supports the storage of 
 contacts, so you may want to add and configure the &kaddressbook;
@@ -532,7 +530,7 @@ date list can be obtained at the
 <listitem><para>
 If you have access to a
 <ulink url="http://www.novell.com/products/groupwise">Novell GroupWise Server</ulink>
-(version 6.5 or later), add this resource in order to be able to to save (and load)
+(version 6.5 or later), add this resource in order to be able to save (and load)
 events, free/busy information <!--,journals ?-->and to-dos to the server. To add the resource, you will
 need to know the server &URL;, your user name and your password. There is
 support for storage of contacts, so you may want to configure &kaddressbook;
@@ -552,7 +550,7 @@ GroupWise resources, but &kmail;, &kaddressbook; too.</para>
 <term><guilabel>Calendar on IMAP Server via &kmail;</guilabel></term>
 <listitem><para>
 If you have access to a server that shares calendar data via IMAP, add this
-resource in order to be able to to save (and load) events, to-dos, free/busy
+resource in order to be able to save (and load) events, to-dos, free/busy
 information and journal entries to the IMAP server. To enable IMAP access, you
 will need to configure &kmail; first, then add the &korganizer; resource.
 Also, since you are using &kmail; to contact the server, &korganizer; will
@@ -617,7 +615,7 @@ corruption, you will lose only one calendar item, not the whole calendar.</para>
 <listitem><para>
 If you have access to a
 <ulink url="http://www.microsoft.com/exchange">Exchange 2000 Server</ulink>,
-add this resource in order to be able to to save (and load)
+add this resource in order to be able to save (and load)
 events FIXME:,journals, free/busy information and to-dos? to the server. To add the resource, you will
 need to know the server &URL;, FIXME:port? your user name and your password. There
 is support for (read only) contacts, so you may want to configure &kaddressbook;
@@ -690,7 +688,7 @@ the next start, if you set the <guilabel>Automatic Save</guilabel> to
 to a regular interval). If you plan to use a calendar resource in
 writable mode, make sure that your connection is stable, configure the
 resource to save the file on each change (or at frequent intervals),
-and don't reload the file at regular intervals.</para>
+and do not reload the file at regular intervals.</para>
 
 <para>A related, but opposite problem, is that two users cannot safely edit
 the same remote file at the same time, because the remote file resource does not
@@ -706,13 +704,13 @@ the file, his changes will be lost.
 <term><guilabel>SUSE &Linux; OpenExchange Server</guilabel></term>
 <listitem><para>
 If you have access to a
-<ulink url="http://www.novell.com/products/groupwise">SUSE &Linux; OpenExchange
-Server</ulink>, version 4.1, add this resource in order to be able to to save
+<ulink url="http://www.novell.com/coolsolutions/openexchange/">SUSE &Linux; OpenExchange
+Server</ulink>, version 4.1, add this resource in order to be able to save
 (and load) events, free/busy information <!--,journals ?-->and to-dos to the server. To add the
 resource, you will need to know the server &URL;, your user name and your
 password. There is support for storage of contacts, so you may want to configure
 &kaddressbook; resource.</para>
-<para>The most practical way to configure the access to a GroupWise server is
+<para>The most practical way to configure the access to an OpenExchange server is
 to use the <application>sloxwizard</application> wizard. You can start it
 from the command line prompt:
 
@@ -730,7 +728,7 @@ OpenExchange resources, but &kmail;, &kaddressbook; too.</para>
 <listitem><para>
 If you have access to a
 <ulink url="http://www.egroupware.org">eGroupware
-Server</ulink>, version 1.0, add this resource in order to be able to to save
+Server</ulink>, version 1.0, add this resource in order to be able to save
 (and load) events, free/busy information <!--,journals ?-->and to-dos to the server. To add the
 resource, you will need to know the server &URL;, your user name and your
 password. There is support for storage of contacts, so you may want to configure
@@ -827,8 +825,8 @@ calendar information with your colleagues and friends.</para>
 <!--TODO: use case: export your friends birthdays?-->
 
 <procedure id="procedure-export-html">
-<step><para>Disable all the resources you don't want to export, and filter out
-the items you don't want to export.</para></step>
+<step><para>Disable all the resources you do not want to export, and filter out
+the items you do not want to export.</para></step>
 <step><para>Choose the <menuchoice><guimenu>File</guimenu>
 <guisubmenu>Export</guisubmenu><guimenuitem>Export Web Page...</guimenuitem>
 </menuchoice> menu item. You will get a window with three tabs:
@@ -1062,7 +1060,7 @@ a <guiicon>chasing-arrows</guiicon> icon is displayed if it repeats multiple
 times. Hovering the mouse over an calendar item will bring up a tooltip
 with the item detailed information. To make &korganizer; show a red line
 marking the current-time on the current day (the Marcus Bains line),
-check the <guilabel>Show current-time (Marcus Bains Line)</guilabel> box in the
+check the <guilabel>Show current-time (Marcus Bains) line</guilabel> box in the
 <link linkend="config-main-views">&korganizer; view
 configuration</link>.</para>
 
@@ -1110,7 +1108,7 @@ will be able to quickly identify the type of event by its color.
 </para>
 
 <para>
-The aganda view can display events from all your calendars merged into one view or
+The agenda view can display events from all your calendars merged into one view or
 show a view per calendar. Having both views available via tabs is also possible and
 can be <link linkend="config-main-views">customized in the preferences dialog</link>.
 </para>
@@ -1337,7 +1335,7 @@ the agenda view or in the month view (depending on the
 <title>Filters</title>
 
 <para>To help you view, find and export your data, you can create and
-use filters for your calendars. For instance, if you don't want to view
+use filters for your calendars. For instance, if you do not want to view
 completed to-dos, you can filter them out, instead of
 <link linkend="managing-purge-archive">purging them</link>. If you assign
 categories, you can use them to create filters.</para>
@@ -1354,11 +1352,11 @@ and edit filters that will affect which items will be displayed by
 <para>The <menuchoice><guimenu>View</guimenu>
 <guisubmenu>Filter</guisubmenu></menuchoice> submenu and the filter toolbar drop
 down offer access to all available filters  created using
-the <link linkend="menu-settings-edit-filters"><guilabel>Edit
+the <link linkend="menu-settings-edit-filters"><guilabel>Edit Calendar
 Filters</guilabel></link> dialog. To toggle the display of the filters toolbar
 on and off, choose the <menuchoice><guimenu>Settings</guimenu>
 <guisubmenu>Toolbars</guisubmenu><guimenuitem>Filter toolbar</guimenuitem></menuchoice>.
-If you don't want to use any filter, choose <guilabel>No filter</guilabel>.</para>
+If you do not want to use any filter, choose <guilabel>No filter</guilabel>.</para>
 
 <para>Filters are useful when <link linkend="managing-export">exporting your
 calendar</link>. If you use a filter, only the filtered (visible) items will
@@ -1381,8 +1379,8 @@ entries) according to title, description, and/or categories.
 The find action will only search the specified fields.</para>
 
 <tip><para>You can use wildcards if you do not remember the exact summary. If
-you don't know single character of the summary, put <userinput>?</userinput>
-instead of the missing character. If you don't know more characters, use
+you do not know single character of the summary, put <userinput>?</userinput>
+instead of the missing character. If you do not know more characters, use
 <userinput>*</userinput>. For instance if you know that the event or to-do has
 <emphasis>meeting</emphasis> in the beginning and <emphasis>product</emphasis>
 after, you would write <userinput>meeting*product</userinput> in the Find dialog.
@@ -1449,7 +1447,7 @@ Enter your data as described below.</para></step>
 
 <para>This is a thorough description of the individual event window fields and
 widgets. Not all fields have to be filled in; some can be left empty. Read the
-<link linkend="entering-data-required-fields">Required fields section</link>
+<link linkend="entering-data-required-fields">Required fields</link> section
 for detailed information. And if you prefer to learn by example, there's one
 in the <link linkend="examples-entering-event">Entering event</link> section.
 </para>
@@ -1511,7 +1509,7 @@ program; if you do not, the program will not run.</para></tip>-->
 reminded, or click the <guibutton>Advanced</guibutton> button to open the
 <guilabel>Edit Reminders</guilabel> dialog. Using this dialog, you can set
 repeating intervals for your reminders, and create special reminders that play
-sounds, run programs, or send emails.</para>
+sounds or run programs.</para>
 
 <!--Click the musical <guiicon>Note</guiicon> symbol to choose the
 alarm sound. Click the <guiicon>Gear</guiicon> icon to browse for a
@@ -1522,7 +1520,7 @@ program that should run at the alarm time.</para>--></listitem>
 <term><guilabel>Show Time As:</guilabel></term>
 <listitem><para>The duration of the event may be shown as Busy or Free in your
 schedule. Choose it from the <guilabel>Show Time As</guilabel>
-menu.</para></listitem>
+drop down box.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -1540,7 +1538,7 @@ you.</para></listitem>
 <term><guilabel>Select Categories</guilabel></term>
 <listitem><para>You can assign several
 <link linkend="categories-view">categories</link> to a calendar item. Click the
-<guilabel>Select Categories</guilabel> button to open the
+<guilabel>Select</guilabel> button to open the
 <guilabel>Select Categories</guilabel> dialog. Check the category boxes to
 assign suitable categories to the event. You can also add a new category, modify
 a category or delete a category by pressing the button
@@ -1556,8 +1554,8 @@ either Personal or Special Occasion - it is your choice.</para></tip>
 <varlistentry>
 <term><guilabel>Access:</guilabel></term>
 <listitem><para>Choose <guilabel>Private</guilabel> or <guilabel>Confidential</guilabel>
-to keep the event private or confidential. Currently, this choice correctly
-sets the <quote>CLASS</quote> attribute of the events to
+to keep the event private or confidential. Currently, this choice correctly
+sets the <quote>CLASS</quote> attribute of the events to
 <quote>PUBLIC</quote>, <quote>PRIVATE</quote> or <quote>CONFIDENTIAL</quote>.
 However, if these settings are really used to restrict the access of the information
 depends on the client and / or groupware server implementation.</para>
@@ -1572,7 +1570,7 @@ only you can access.</para></warning></listitem>
 
 </variablelist>
 
-<para>When you want to confirm, call off or revert the entered data, choose
+<para>When you want to confirm, apply or call off the entered data, choose
 among the <link linkend="reference-action-buttons">Action Buttons</link>,
 <guibutton>OK</guibutton>, <guibutton>Apply</guibutton> and
 <guibutton>Cancel</guibutton>.</para>
@@ -1649,7 +1647,7 @@ on.</para></listitem>
 <para>This is similar to Monthly.  You need to choose whether or not you
 are indicating a calendar day of the year (&eg;, the 250th day of the
 year) - <guilabel>Recur on day <replaceable>#</replaceable> of the
-year</guilabel>, in in a specific week on a specific day of the week of a month
+year</guilabel>, in a specific week on a specific day of the week of a month
 (&eg;, the 2nd Tuesday of March), or the day of the month in a
 particular month of the year - <guilabel>Recur on day <replaceable>#</replaceable>
 of the <replaceable>month</replaceable></guilabel>.  By default, &korganizer;
@@ -1775,7 +1773,7 @@ is displayed in the details list window gives you quick overview of what
 should be done to make the event successful. It can be used for sorting (see
 above). If you use groupware schedule and request responses from your
 attendees, as you receive the responses the status of the attendee will be
-updated. If you don't request responses, you will have to update the status
+updated. If you do not request responses, you will have to update the status
 manually.</para></listitem>
 </varlistentry>
 
@@ -1819,7 +1817,7 @@ sending the invitations.</para>
 represents one of the attendees, listed on the left. The marked areas on the
 chart represent the time already taken by other events, unmarked areas represent
 time free from other events. You can move the event to a different point in time
-by dragging it with the mouse, or resize it, by moving the edges of the highlighted
+by dragging it with the mouse, or resize it by moving the edges of the highlighted
 area with the mouse.</para>
 
 <para>The free/busy information is only available if the
@@ -1827,7 +1825,7 @@ attendee publishes his free/busy schedule, and if &korganizer; is correctly
 configured to retrieve it. For more information about configuring &korganizer;
 to publish and retrieve free/busy information, please check the
 <xref linkend="config" />. Double-clicking on an attendee entry in the list
-will allow you to enter the location of their free/busy information. 
+will allow you to enter the location of their free/busy information.
 </para>
 
 <variablelist>
@@ -1837,7 +1835,7 @@ will allow you to enter the location of their free/busy information.
 <listitem><para>Sets the zoom level on the schedule chart. <guilabel>Hour</guilabel>
 shows a range of several hours, <guilabel>Day</guilabel> shows a range of a few
 days, <guilabel>Week</guilabel> shows a range of a few months, and
-<guilabel>Month</guilabel> shows a range of a few years, while
+<guilabel>Month</guilabel> shows a range of a few months, while
 <guilabel>Automatic</guilabel> selects the range most appropriate for the
 current event or to-do.</para></listitem>
 </varlistentry>
@@ -1989,7 +1987,7 @@ where the to-do will take place.</para></listitem>
 <term><guilabel>Date &amp; Time</guilabel></term>
 <listitem><para>The <guilabel>Due</guilabel> and <guilabel>Start</guilabel>
 boxes are not initially checked, as to-dos usually do not have a start and due
-date. Check one of both boxes and 
+date. Check one or both boxes and
 change these dates as desired. Enter the dates directly or use the 
 <link linkend="glossary" endterm="gloss-calendar-widget">Calendar Widget</link>. 
 Choose time from quarter hour intervals, or enter the desired time directly into 
@@ -2013,7 +2011,7 @@ in steps of 10%.</para></listitem>
 <varlistentry>
 <term><guilabel>Priority</guilabel></term>
 <listitem><para>Assign a priority to your to-do.  This drop down menu offers
-priorities from one to five, one being the highest.  Initially to-dos are set
+priorities from one to nine, one being the highest.  Initially to-dos are set
 to priority five (medium).</para></listitem>
 </varlistentry>
 
@@ -2029,7 +2027,7 @@ program; if you do not, the program will not run.</para></tip>-->
 reminded, or click the <guibutton>Advanced</guibutton> button to open the
 <guilabel>Edit Reminders</guilabel> dialog. Using this dialog, you can set
 repeating intervals for your reminders, and create special reminders that play
-sounds, run programs, or send emails.</para>
+sounds or run programs.</para>
 
 <!--Click the musical <guiicon>Note</guiicon> symbol to choose the
 alarm sound. Click the <guiicon>Gear</guiicon> icon to browse for a
@@ -2188,7 +2186,7 @@ events with other users using one of these clients.
 &korganizer; is integrated with &kmail; for receiving, processing, and sending
 events, event responses, updates, cancellations, &etc; For instance, when you
 get an invitation in &kmail;, and decide to
-accept it, by clicking the the <guilabel>accept</guilabel> link in the mail
+accept it, by clicking the <guilabel>accept</guilabel> link in the mail
 body, the event is added to your calendar, and a response to the event's
 organizer is sent automatically.</para>
 
@@ -2288,11 +2286,11 @@ choosing the <menuchoice><guimenu>Schedule</guimenu><guimenuitem>Send Invitation
 to Attendees</guimenuitem></menuchoice> menu item.
 The attendees get an email containing all the relevant information
 for the event or to-do. They can respond to the meeting proposal by accepting or
-rejecting it or by making a counter proposal. They can also delegate or forward the 
+rejecting it or by making a counter proposal. They can also delegate or forward the
 invitation.
-All this information is sent to you by email again and, if you have configured &kmail; 
-appropriately the attendees responses are automatically inserted in your calendar. If
-there are additional attendees willing to participate (e.g. by accepting a forwarded 
+All this information is sent to you by email again and, if you have configured &kmail;
+appropriately, the attendees responses are automatically inserted in your calendar.
+If there are additional attendees willing to participate (e.g. by accepting a forwarded
 invitation) you will be asked to accept the new attendees.
 </para>
 
@@ -2340,12 +2338,14 @@ view</link>.</para>
 <guibutton>Accept</guibutton> or <guibutton>Accept Cond.</guibutton>. The
 last two actions will insert the item to your calendar. In any case, &kmail; will
 send your response to the organizer automatically.</para>
-<para>You can also <guibutton>Delegate</guibutton> or <guibutton>Forward</guibutton> 
+
+<para>You can also <guibutton>Delegate</guibutton> or <guibutton>Forward</guibutton>
 the invitation. When delegating, you can suggest another person as your proxy.
-Using <guibutton>Forward</guibutton> you can forward the invitation to one or more 
+Using <guibutton>Forward</guibutton> you can forward the invitation to one or more
 people not yet invited.
-When the receiver of the delegation or forward accepts the invitation, 
+When the receiver of the delegation or forward accepts the invitation,
 the organizer will be asked to approve the new attendee.</para>
+
 <para>If for any reason you changed your mind, edit your status in the item's
 <link linkend="entering-data-events-attendees">attendee tab</link>. If you
 checked the <guilabel>Use Groupware Communication</guilabel> box
@@ -2565,7 +2565,7 @@ network files, &etc;), please check <xref linkend="managing-resources" />.</para
 <title>Personal</title>
 
 <para>The personal options relate to your personal identity, and other
-miscellaneous things that don't fall under any of the other general
+miscellaneous things that do not fall under any of the other general
 categories.</para>
 
 <variablelist>
@@ -2732,10 +2732,10 @@ defined in the <guilabel>Use holiday region</guilabel> drop down above.</para>
 <variablelist>
 
 <varlistentry>
-<term><guilabel>Enable tooltips displaying summary of events</guilabel></term>
+<term><guilabel>Enable tooltips for displaying summaries</guilabel></term>
 <listitem><para>If your summary for an event is longer than would fit in the
 current View, the remaining characters are not displayed. Check <guilabel>Enable
-tooltips displaying summary of events</guilabel> if you want the full summary
+tooltips for displaying summaries</guilabel> if you want the full summary
 displayed when the hovering the mouse pointer over the appointment for a few
 seconds.</para></listitem>
 </varlistentry>
@@ -2769,6 +2769,13 @@ navigator</guilabel> box is checked, the days containing weekly recurring
 events are shown in bold typeface in the date navigator.</para></listitem>
 </varlistentry>
 
+<varlistentry>
+<term><guilabel>Week numbers select a work week when in work week view</guilabel></term>
+<listitem><para>If the <guilabel>Week numbers select a work week when in work
+week view</guilabel> box is checked, clicking on the week numbers along the 
+side of the date navigator will navigate through work weeks rather than
+through normal 7-day weeks.</para></listitem>
+</varlistentry>
 
 </variablelist>
 
@@ -2785,7 +2792,7 @@ in the agenda view.</para></listitem>
 <varlistentry>
 <term><guilabel>Next x days:</guilabel></term>
 <listitem><para>This option allows you to change the amount of days of the
-<guimenu>Next x Days</guimenu> menu item in the <guimenu>Views</guimenu>
+<guimenu>Next x Days</guimenu> menu item in the <guimenu>View</guimenu>
 menu.</para></listitem>
 </varlistentry>
 
@@ -2817,7 +2824,7 @@ plan.</para></listitem>
 <link linkend="config-main-colors">assign a different color to each
 resource</link>. This check box toggles the use the resource color when
 displaying the to-do or event in the agenda view on and off. Note that if you
-don't assign different colors, there is little sense in using this feature,
+do not assign different colors, there is little sense in using this feature,
 as &korganizer; default configuration is to use the same color for
 all resources.</para></listitem>
 </varlistentry>
@@ -2856,7 +2863,7 @@ in the whole &korganizer; window instead of sharing the window with the sidebar
 <link linkend="config-main-colors">assign a different color to each
 category</link>. If you check this box, the event or to-do color in the month
 view will reflect the category color, instead of using no color, or only the
-resource color. Note that if you don't assign different category colors,
+resource color. Note that if you do not assign different category colors,
 there is little sense in using this feature, as &korganizer; default
 configuration is to use the same color for all categories.</para></listitem>
 </varlistentry>
@@ -2867,7 +2874,7 @@ configuration is to use the same color for all categories.</para></listitem>
 <link linkend="config-main-colors">assign a different color to each
 resource</link>. If you check this box, the event or to-do color in the month
 view will reflect the resource color, instead of using no color, or only the
-category color. Note that if you don't assign different resource colors, there
+category color. Note that if you do not assign different resource colors, there
 is little sense in using this feature, as &korganizer; default configuration
 is to use the same color for all resources.</para></listitem>
 </varlistentry>
@@ -2953,7 +2960,7 @@ navigator.</para></listitem>
 <listitem><para>This button opens the <guilabel>Select Color</guilabel> dialog,
 allowing you to select the highlight color. The highlight color will be used for
 marking the currently selected area in your agenda and in the date
-navigator.navigator.</para></listitem>
+navigator.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -2974,7 +2981,7 @@ allowing you to select the agenda view background color.</para></listitem>
 <varlistentry>
 <term><guilabel>Working hours color</guilabel></term>
 <listitem><para>This button opens the <guilabel>Select Color</guilabel> dialog,
-allowing you to select the agenda view.</para></listitem>
+allowing you to select the color of the working hours background in the agenda view.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -2992,7 +2999,7 @@ allowing you to select the to-do overdue color.</para></listitem>
 <varlistentry>
 <term><guilabel>Categories</guilabel></term>
 <listitem><para>This group allows you to assign a color to each category. Select
-a category in the drop down, and press the button to open the
+a category in the drop down list, and press the button to open the
 <guilabel>Select Color</guilabel> dialog, allowing you to select the color for
 that category. <link linkend="config-main-views">Depending on the view
 preferences</link>, this color will be used to mark events and to-dos which
@@ -3002,7 +3009,7 @@ belong to this category in your agenda and in the month view.</para></listitem>
 <varlistentry>
 <term><guilabel>Resources</guilabel></term>
 <listitem><para>This group allows you to assign a color to each resource. Select
-a resource in the drop down, and press the button to open the
+a resource in the drop down list, and press the button to open the
 <guilabel>Select Color</guilabel> dialog, allowing you to select the color for
 that resource. <link linkend="config-main-views">Depending on the view
 preferences</link>, this color will be used to mark events and to-dos which are
@@ -3026,7 +3033,7 @@ updating or deleting events or to-dos which involve others. This mail can be
 an invitation to attendees of an event you created, a cancellation of an event
 you created, an answer or an update on your invitation status, an event change
 request, &etc; Check this option if you you want to use the groupware
-functionality (e.g Configuring &kontact; as a &kde;
+functionality (&eg; Configuring &kontact; as a &kde;
 <guilabel>Kolab</guilabel> client).</para></listitem>
 </varlistentry>
 
@@ -3119,7 +3126,7 @@ when inviting you to an event.</para>
 <variablelist>
 
 <varlistentry>
-<term><guilabel>Publish free/busy information</guilabel></term>
+<term><guilabel>Publish free/busy information automatically</guilabel></term>
 <listitem><para>Enable this option if you wish your Free/Busy information to be
 uploaded automatically. Note that you may skip this option and choose to mail or
 upload your Free/Busy information via the <guilabel>Schedule</guilabel> menu of
@@ -3133,7 +3140,7 @@ it from other users.</para>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Minimum time between uploads in minutes</guilabel></term>
+<term><guilabel>Minimum time between uploads (in minutes)</guilabel></term>
 <listitem><para>In case you choose to publish your information automatically,
 you may configure the interval of time in minutes between each upload.</para>
 </listitem>
@@ -3160,7 +3167,7 @@ shall be published. Ask the server administrator for this information.</para>
 <para>Kolab2 server specificity: Registered your UID (Unique IDentifier), by
 default your UID would be similar to your email address on the Kolab2 server
 but it may also be different. In the last case enter your UID. Ask about your
-UID to the server administrator if you don't know it.</para></listitem>
+UID to the server administrator if you do not know it.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -3222,7 +3229,7 @@ server.</para>
 (Unique IDentifier), by default your UID would be similar to your email address
 on the <guilabel>Kolab2 server</guilabel> but it may also be different. In the
 last case enter your UID. Ask about your UID to the server administrator if you
-don't know it.</para></listitem>
+do not know it.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -3295,7 +3302,7 @@ linkend="other-features-drag-and-drop">drag-and-drop operations</link>.
 <itemizedlist>
 <listitem><para>The tool set is configured in the <menuchoice><guimenu>
 Settings</guimenu><guimenuitem>Configure
-Toolbars....</guimenuitem></menuchoice> menu item.
+Toolbars...</guimenuitem></menuchoice> menu item.
 </para></listitem>
 <listitem><para>The graphic style (icon size, text position, &etc;) is
 adjusted through the <guimenu>Toolbar Context Menu</guimenu>. Right click the
@@ -3324,9 +3331,9 @@ the window.</para>
 
 <para>There are two rectangles below the toolbar title: <guilabel>Available
 actions</guilabel> and <guilabel>Current actions</guilabel>. Using the left and
-right arrows (located between the rectangles) you can add icons from the
-Available actions group to the <guilabel>Current actions</guilabel> group. The
-toolbar will have every icon that is in the <guilabel>Current action</guilabel>
+right arrows (located between the rectangles) you can move icons from the
+<guilabel>Available actions</guilabel> group to the <guilabel>Current actions</guilabel> group. The
+toolbar will have every icon that is in the <guilabel>Current actions</guilabel>
 box. The up and down arrows allow you reposition an icon.</para>
 
 <tip><para>Remember that less icons may be better, because the screen is less
@@ -3439,7 +3446,7 @@ menu item and choose a different calendar). </para></listitem>
 menu item to give your new calendar a filename and to save it).</para></listitem>
 </itemizedlist>
 
-<para>For more information about this acton, please refer to
+<para>For more information about this action, please refer to
 <xref linkend="managing-import-export" />.</para>
 
 </listitem>
@@ -3518,7 +3525,7 @@ that you want to save, but also want to keep separate from your
 File</guimenu> <guimenuitem>Revert</guimenuitem></menuchoice></term>
 <listitem><para>When you choose <guimenuitem>Revert</guimenuitem>, &korganizer;
 <action>loads the last saved version of the calendar, discarding all the
-changes made after the last save.</action>.</para>
+changes made after the last save</action>.</para>
 <para>For more information about this action, please refer to
 <xref linkend="managing-import-export" />.</para>
 </listitem>
@@ -3578,8 +3585,8 @@ vCalendar with a few entries via email, for instance.</para>
 <guimenuitem>Import From &UNIX; Ical Tool</guimenuitem>
 </menuchoice></term>
 <listitem><para>If you have used <application>ical</application>, a popular but
-older calendar program for &UNIX;, you may wish to <action>import your events,
-events, and to-do</action> directly to &korganizer;. This action
+older calendar program for &UNIX;, you may wish to <action>import your events
+and to-do</action> directly to &korganizer;. This action
 will read the <filename>.calendar</filename> file from your home
 folder and merge any entries it contains into your current calendar.
 If any errors or suspicious things occur during the process, you will be
@@ -3864,7 +3871,7 @@ enough to remember in between sessions what the last active view was, and the
 next time it is started, it will display that view.</para>
 
 <para>In general, each view will provide a way of displaying your journal
-entries, to-dos and and events, constrained to a particular time period or
+entries, to-dos and events, constrained to a particular time period or
 style of display. Click any item to select it for further action.
 <mousebutton>Right</mousebutton> click an item to bring up a menu
 with options such as <guimenuitem>edit</guimenuitem>,
@@ -4014,7 +4021,7 @@ day (<guimenuitem>Zoom In Vertically</guimenuitem> and
 <listitem><para>This submenu offers access to the filters already created using
 the <link linkend="menu-settings-edit-filters"><guilabel>Edit
 Filters</guilabel></link> dialog. <action>Select on this submenu the filter
-that will be used in &korganizer; view.</action>. If you don't want to use a
+that will be used in &korganizer; view</action>. If you do not want to use a
 filter, choose <guilabel>No filter</guilabel>.</para></listitem>
 </varlistentry>
 
@@ -4091,8 +4098,8 @@ linkend="entering-data-to-do">the Entering To-dos</link> section.</para></listit
 <guimenuitem>New Sub-to-do...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Choose <guilabel>New Sub-to-do...</guilabel> to <action>start
-writing a new sub-to-do. The currently selected to-do will be the the
-sub-to-do parent.</action>. Initially the to-do has no due date, but you can
+writing a new sub-to-do. The currently selected to-do will be the
+sub-to-do parent</action>. Initially the to-do has no due date, but you can
 specify one.</para>
 <para>You can get a detailed description of the to-do window in <link
 linkend="entering-data-to-do">Entering To-dos</link> section.</para></listitem>
@@ -4104,7 +4111,7 @@ linkend="entering-data-to-do">Entering To-dos</link> section.</para></listitem>
 <guimenuitem>New Journal...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Choose <guilabel>New Journal...</guilabel> to <action>start
-writing a new journal entry.</action>.</para></listitem>
+writing a new journal entry</action>.</para></listitem>
 </varlistentry>
 
 <varlistentry id="menu-actions-show-event">
@@ -4650,7 +4657,7 @@ calendar.</para>
 <tip><para>However, you cannot drag from agenda view in one calendar to
 agenda view in other calendar.</para></tip></listitem>
 <listitem><para>Toolbars can be dragged on the screen. Move the mouse pointer
-over the tollbar's handle, and drag it to a new location on your
+over the toolbar's handle, and drag it to a new location on your
 screen.</para></listitem>
 </itemizedlist>
 
@@ -4820,7 +4827,7 @@ on your platform and the size of your calendar(s).</para>
 (kdelibs). &kde; base package (kdebase) must also be installed to change
 localization preferences like date and time formats. &korganizer; itself
 is in the kdepim package. All packages can be found on <ulink
-url="http://www.kde.org">&kde; home page.</ulink>.</para>
+url="http://www.kde.org">&kde; home page</ulink>.</para>
 
 <para>The &korganizer; homepage is at <ulink
 url="http://korganizer.kde.org">http://korganizer.kde.org</ulink>
@@ -4856,7 +4863,7 @@ The single-arrow icons move forwards and backwards in time by increments of a
 month, while the double-arrows allow moving by years at a time. Today's date
 will be outlined with a small box. Dates which have events scheduled on them
 will be bold. If you want to select a date, simply click it. Hold down the
-Control key and click the dates if you wish to select multiple neighbor dates at
+&Ctrl; key and click the dates if you wish to select multiple neighbor dates at
 once. The dates will be displayed in the main panel.</para>
 
 <para>Recurring events are not always displayed. You can forbid the display of
@@ -4939,7 +4946,7 @@ dialog.</para>
 
 <itemizedlist>
 <listitem><para>Events start and finish at distinct date. You can also specify
-distinct start and finish times, but you don't have to. While business
+distinct start and finish times, but you do not have to. While business
 meetings, personal anniversaries and cinema visits are examples of carefully
 planned events with exact time scheduling, a holiday is an event that takes
 several days and thus there is no need to specify exact start and finish