* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index e94c0315e..13f14c580 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -125,7 +125,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     virtual bool createDCOPInterface( const TQString& /*serviceType*/ ) { return false; }
 
     /**
-      Reimplement this method and return wether a standalone application is still running
+      Reimplement this method and return whether a standalone application is still running
       This is only required if your part is also available as standalone application.
     */
     virtual bool isRunningStandalone() { return false; }
@@ -174,7 +174,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
 
     /**
-      Returns wether the plugin provides a part that should be shown in the sidebar.
+      Returns whether the plugin provides a part that should be shown in the sidebar.
     */
     virtual bool showInSideBar() const;