FIX lots of typos.

Also, from now on, we will use American spelling (but I didn't correct
anything but `colour` yet).

18 files changed, 38 insertions, 38 deletions

diff --git a/doc/source/configspec.rst b/doc/source/configspec.rst
index ea4b4662..bee1e3a3 100644
--- a/doc/source/configspec.rst
+++ b/doc/source/configspec.rst
@@ -158,7 +158,7 @@ Some default values and behaviours are set here.
 
     
     Controls for how many days into the future we show events (for example, in
-    `khal agenda`.
+    `khal list`) by default.
 
       :type: timedelta
       :default: 2d
diff --git a/doc/source/configure.rst b/doc/source/configure.rst
index 76f25961..697c2ae1 100644
--- a/doc/source/configure.rst
+++ b/doc/source/configure.rst
@@ -28,7 +28,7 @@ Example
 .. literalinclude:: ../../tests/configs/simple.conf
   :language: ini
 
-Examplary discover usage
+Exemplary discover usage
 -------------------------
 If you have the following directory layout::
 
@@ -37,7 +37,7 @@ If you have the following directory layout::
   ├- home/
   └─ family/
 
-where `work`, `home` and `family` are all different vdirs, each containg one
+where `work`, `home` and `family` are all different vdirs, each containing one
 calendar, a matching calendar section could look like this:
 
 .. highlight:: ini
diff --git a/doc/source/news/khal02.rst b/doc/source/news/khal02.rst
index ed96b52c..85f68676 100644
--- a/doc/source/news/khal02.rst
+++ b/doc/source/news/khal02.rst
@@ -24,7 +24,7 @@ Afterwards you will need to re-setup your *khal* configuration (copy the new
 example config file), also you will need to delete your old (local) database, so
 please make sure you did sync everything.
 
-Also *khal*'s command line syntax changed qutie a bit, so you might want to head over the documentation_.
+Also *khal*'s command line syntax changed quite a bit, so you might want to head over the documentation_.
 
 .. _pypi: https://pypi.python.org/pypi/khal/
 .. _vdirsyncer: https://github.com/untitaker/vdirsyncer/
diff --git a/doc/source/news/khal09.rst b/doc/source/news/khal09.rst
index f739c083..e10eea70 100644
--- a/doc/source/news/khal09.rst
+++ b/doc/source/news/khal09.rst
@@ -8,9 +8,9 @@ khal v0.9.0 released
 This is probably the biggest release of khal to date, that is, the one with the
 most changes since the last release. This changes are made up of a bunch of bug
 fixes and enhancements.  Unfortunately, some of these break backwards
-compatibiliy, many of which will make themselves noticeable, because your config
+compatibility, many of which will make themselves noticeable, because your config
 file will no longer be valid, consult the changelog_ or the documentation_.
-Noticable is also, that command `agenda` has been renamed to `list` 
+Noticable is also, that command `agenda` has been renamed to `list`
 
 Some of the larger changes include, among others, new configuration options on
 how events are printed (thanks to first time contributor Taylor Money) and a new
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index f211df31..9d358dbf 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -120,7 +120,7 @@ Several options are common to almost all of :program:`khal`'s commands
         The start time in timeformat OR an appropriate symbol.
 
    to-style
-        A hyphen "-" or nothing such that it appropriatly fits between
+        A hyphen "-" or nothing such that it appropriately fits between
         start-style and end-style.
 
    end-style
diff --git a/khal/calendar_display.py b/khal/calendar_display.py
index 5d456641..73b24156 100644
--- a/khal/calendar_display.py
+++ b/khal/calendar_display.py
@@ -96,7 +96,7 @@ def str_week(week, today, collection=None,
              hmethod=None, default_color=None, multiple=None, color=None,
              highlight_event_days=False, locale=None, bold_for_light_color=True):
     """returns a string representing one week,
-    if for day == today colour is reversed
+    if for day == today color is reversed
 
     :param week: list of 7 datetime.date objects (one week)
     :type day: list()
diff --git a/khal/cli.py b/khal/cli.py
index 863998ca..77f7a51a 100644
--- a/khal/cli.py
+++ b/khal/cli.py
@@ -351,7 +351,7 @@ def _get_cli():
 
         START and END can be either dates, times or datetimes, please have a
         look at the man page for details.
-        Everthing than can not be interpreted as a (date)times or a timezone is
+        Everything that cannot be interpreted as a (date)time or a timezone is
         assumed to be the event's summary, if two colons (::) are present,
         everything behind them is taken as the event's description.
         '''
@@ -554,7 +554,7 @@ def _get_cli():
     @multi_calendar_option
     @click.option('--format', '-f',
                   help=('The format of the events.'))
-    @click.option('--show-past', help=('Show events that have already occured as options'),
+    @click.option('--show-past', help=('Show events that have already occurred as options'),
                   is_flag=True)
     @click.argument('search_string', nargs=-1)
     @click.pass_context
diff --git a/khal/controllers.py b/khal/controllers.py
index c414ec20..bfe1e86e 100644
--- a/khal/controllers.py
+++ b/khal/controllers.py
@@ -183,7 +183,7 @@ def get_events_between(
     events_float = sorted(collection.get_floating(start, end))
     events = sorted(events + events_float)
     for event in events:
-        # yes the the logic could be simplified, but I believe it's easier
+        # yes the logic could be simplified, but I believe it's easier
         # to understand what's going on here this way
         if notstarted:
             if event.allday and event.start < original_start.date():
@@ -423,7 +423,7 @@ def edit_event(event, collection, locale, allow_quit=False, width=80):
         edited = False
 
         if choice == "Delete":
-            if confirm("Delete all occurances of event?"):
+            if confirm("Delete all occurences of event?"):
                 collection.delete(event.href, event.etag, event.calendar)
                 return True
         elif choice == "datetime range":
diff --git a/khal/khalendar/backend.py b/khal/khalendar/backend.py
index 4dd7c883..df3e075a 100644
--- a/khal/khalendar/backend.py
+++ b/khal/khalendar/backend.py
@@ -83,7 +83,7 @@ class SQLiteDb(object):
     """
     This class should provide a caching database for a calendar, keeping raw
     vevents in one table but allowing to retrieve events by dates (via the help
-    of some utilsiliary tables)
+    of some auxiliary tables)
 
     :param calendar: the `name` of this calendar, if the same *name* and
                      *dbpath* is given on next creation of an SQLiteDb object
@@ -140,7 +140,7 @@ class SQLiteDb(object):
                 raise CouldNotCreateDbDir()
 
     def _check_table_version(self):
-        """tests for curent db Version
+        """tests for current db Version
         if the table is still empty, insert db_version
         """
         self.cursor.execute('SELECT version FROM version')
@@ -280,7 +280,7 @@ class SQLiteDb(object):
             if isinstance(bday, list):
                 logger.warning(
                     'Vcard {0} in collection {1} has more than one '
-                    'BIRTHDAY, will be skippend and not be available '
+                    'BIRTHDAY, will be skipped and not be available '
                     'in khal.'.format(href, calendar)
                 )
                 return
@@ -319,9 +319,9 @@ class SQLiteDb(object):
     def _update_impl(self, vevent, href, calendar):
         """insert `vevent` into the database
 
-        expand `vevent`'s reccurence rules (if needed) and insert all instance
+        expand `vevent`'s recurrence rules (if needed) and insert all instance
         in the respective tables
-        than insert non-reccuring and original recurring (those with an RRULE
+        than insert non-recurring and original recurring (those with an RRULE
         property) events into table `events`
         """
         # TODO FIXME this function is a steaming pile of shit
@@ -422,7 +422,7 @@ class SQLiteDb(object):
         """
         removes the event from the db,
 
-        :param etag: only there for compatiblity with vdirsyncer's Storage,
+        :param etag: only there for compatibility with vdirsyncer's Storage,
                      we always delete
         :returns: None
         """
diff --git a/khal/khalendar/event.py b/khal/khalendar/event.py
index 82505cc3..8a05d544 100644
--- a/khal/khalendar/event.py
+++ b/khal/khalendar/event.py
@@ -173,10 +173,10 @@ class Event(object):
     def update_start_end(self, start, end):
         """update start and end time of this event
 
-        calling this an a recurring event will lead to the proto instance
+        calling this on a recurring event will lead to the proto instance
         be set to the new start and end times
 
-        beware, this methods performs some open heart surgerly
+        beware, this methods performs some open heart surgery
         """
         if type(start) != type(end):  # flake8: noqa
             raise ValueError('DTSTART and DTEND should be of the same type (datetime or date)')
@@ -316,7 +316,7 @@ class Event(object):
 
     @property
     def raw(self):
-        """needed for vdirsyncer comat
+        """needed for vdirsyncer compatibility
 
         return text
         """
diff --git a/khal/khalendar/khalendar.py b/khal/khalendar/khalendar.py
index 12fc68ed..527a1821 100644
--- a/khal/khalendar/khalendar.py
+++ b/khal/khalendar/khalendar.py
@@ -56,7 +56,7 @@ def create_directory(path):
 class CalendarCollection(object):
     """CalendarCollection allows access to various calendars stored in vdirs
 
-    all calendars are cached in an sqlitedb for perforamce reasons"""
+    all calendars are cached in an sqlitedb for performance reasons"""
 
     def __init__(self,
                  calendars=None,
diff --git a/khal/khalendar/utils.py b/khal/khalendar/utils.py
index 41658f97..fc0d461a 100644
--- a/khal/khalendar/utils.py
+++ b/khal/khalendar/utils.py
@@ -49,7 +49,7 @@ def expand(vevent, href=''):
                  nothing else
     :type href: str
     :returns: list of start and end (date)times of the expanded event
-    :rtyped list(tuple(datetime, datetime))
+    :rtype: list(tuple(datetime, datetime))
     """
     # we do this now and than never care about the "real" end time again
     if 'DURATION' in vevent:
@@ -72,7 +72,7 @@ def expand(vevent, href=''):
         vevent = sanitize_rrule(vevent)
 
         # dst causes problem while expanding the rrule, therefore we transform
-        # everything to naive datetime objects and tranform back after
+        # everything to naive datetime objects and transform back after
         # expanding
         # See https://github.com/dateutil/dateutil/issues/102
         dtstart = vevent['DTSTART'].dt
@@ -147,10 +147,10 @@ def sanitize(vevent, default_timezone, href='', calendar=''):
          were supposed to be localized but which timezone was not understood
          by icalendar
     :type timezone: pytz.timezone
-    :param href: used for for logging to inform user which .ics files are
+    :param href: used for logging to inform user which .ics files are
         problematic
     :type href: str
-    :param calendar: used for for logging to inform user which .ics files are
+    :param calendar: used for logging to inform user which .ics files are
         problematic
     :type calendar: str
     :returns: clean vevent
diff --git a/khal/settings/khal.spec b/khal/settings/khal.spec
index c744fa7a..3d18096b 100644
--- a/khal/settings/khal.spec
+++ b/khal/settings/khal.spec
@@ -49,11 +49,11 @@ readonly = boolean(default=False)
 # birthdays from those VCARDS, that is only files with ``.ics`` extension will
 # be considered, all other files will be ignored.  ``birthdays`` also implies
 # ``readonly=True``.
-# 
+#
 # If set to ``discover``, khal will use
 # `globbing <https://en.wikipedia.org/wiki/Glob_(programming)>`_ to expand this
 # calendar's `path` to (possibly) several paths and use those as individual
-# calendars (this cannot be used with `birthday` collections`). See `Examplary
+# calendars (this cannot be used with `birthday` collections`). See `Exemplary
 # discover usage`_ for an example.
 #
 # If an individual calendar vdir has a `color` file, the calendar's color will
@@ -138,7 +138,7 @@ delete = force_list(default=list('d'))
 # show details or edit (if details are already shown) the currently selected event
 view = force_list(default=list('enter'))
 
-# edit the currently selected events's raw .ics file with $EDITOR
+# edit the currently selected events' raw .ics file with $EDITOR
 # Only use this, if you know what you are doing, the icalendar library we use
 # doesn't do a lot of validation, it silently disregards most invalid data.
 external_edit = force_list(default=list('meta E'))
diff --git a/khal/settings/settings.py b/khal/settings/settings.py
index 1cfc8918..77ebb79a 100644
--- a/khal/settings/settings.py
+++ b/khal/settings/settings.py
@@ -115,7 +115,7 @@ def get_config(
                                 file_error=True,
                                 )
     except ConfigObjError as error:
-        logger.fatal('parsing the config file file with the following error: '
+        logger.fatal('parsing the config file with the following error: '
                      '{}'.format(error))
         logger.fatal('if you recently updated khal, the config file format '
                      'might have changed, in that case please consult the '
diff --git a/khal/settings/utils.py b/khal/settings/utils.py
index 91dbd57c..e66b2d1f 100644
--- a/khal/settings/utils.py
+++ b/khal/settings/utils.py
@@ -100,7 +100,7 @@ def is_color(color):
     # 2) auto
     # 3) a color name from the 16 color palette
     # 4) a color index from the 256 color palette
-    # 5) a HTML-style color code
+    # 5) an HTML-style color code
     if (color in ['', 'auto'] or
             color in COLORS.keys() or
             (color.isdigit() and int(color) >= 0 and int(color) <= 255) or
diff --git a/khal/ui/__init__.py b/khal/ui/__init__.py
index bf05a786..5b4110d2 100644
--- a/khal/ui/__init__.py
+++ b/khal/ui/__init__.py
@@ -124,7 +124,7 @@ class DateHeader(SelectableText):
         :param day: day to be converted
         :type: day: datetime.day
         :param dtformat: the format day is to be printed in, passed to strftime
-        :tpye dtformat: str
+        :type dtformat: str
         :rtype: str
         """
 
@@ -776,7 +776,7 @@ class EventColumn(urwid.WidgetWrap):
             else:
                 self.pane.window.backtrack()
                 self.pane.window.alert(
-                    ('light green', 'Event successfuly exported'))
+                    ('light green', 'Event successfully exported'))
 
         overlay = urwid.Overlay(
             ExportDialog(
@@ -838,7 +838,7 @@ class EventColumn(urwid.WidgetWrap):
         """duplicate the event in focus"""
         # TODO copying from birthday calendars is currently problematic
         # because their title is determined by X-BIRTHDAY and X-FNAME properties
-        # which are also copied. If the events's summary is edited it will show
+        # which are also copied. If the events' summary is edited it will show
         # up on disk but not be displayed in khal
         event = self.focus_event.event.duplicate()
         try:
@@ -1144,7 +1144,7 @@ class EventEditor(urwid.WidgetWrap):
             self.pane.window.backtrack()
             self.pane.window.alert(
                 ('light green',
-                 'Event successfuly exported'))
+                 'Event successfully exported'))
 
         overlay = urwid.Overlay(
             ExportDialog(
diff --git a/khal/ui/startendeditor.py b/khal/ui/startendeditor.py
index 660ef75a..e9cf646c 100644
--- a/khal/ui/startendeditor.py
+++ b/khal/ui/startendeditor.py
@@ -77,7 +77,7 @@ class CalendarPopUp(urwid.PopUpLauncher):
 
 
 class StartEndEditor(urwid.WidgetWrap):
-    """Wigdet for editing start and end times (of an event)"""
+    """Widget for editing start and end times (of an event)"""
 
     def __init__(self, start, end, conf, on_date_change=lambda x: None):
         """
diff --git a/khal/utils.py b/khal/utils.py
index 567b2e92..eda364ab 100644
--- a/khal/utils.py
+++ b/khal/utils.py
@@ -41,7 +41,7 @@ from khal.exceptions import FatalError
 def timefstr(dtime_list, timeformat):
     """converts the first item of a list (a time as a string) to a datetimeobject
 
-    where the date is today and the time is given by the a string
+    where the date is today and the time is given by a string
     removes "used" elements of list
 
     :type dtime_list: list(str)
@@ -177,7 +177,7 @@ def datefstr_weekday(dtime_list, _):
     """interprets first element of a list as a relative date and removes that
     element
 
-    :param dtime_list: event descrpition in list form
+    :param dtime_list: event description in list form
     :type dtime_list: list
     :returns: date
     :rtype: datetime.datetime