[Xfce4-commits] <orage:master> 4.7.5.11 documentation update

Juha Kautto noreply at xfce.org
Thu Jan 21 16:14:01 CET 2010


Updating branch refs/heads/master
         to 7056061cd3430188a291db3be77877d47ac8e75c (commit)
       from 51fafdfa5a32ec8f66faf5b65fd9930ba8919c11 (commit)

commit 7056061cd3430188a291db3be77877d47ac8e75c
Author: Juha Kautto <juha at xfce.org>
Date:   Thu Jan 21 17:10:06 2010 +0200

    4.7.5.11 documentation update
    
    Documentation now upto date and ready for 4.8 release.
    
    Also minor code cleanout and memory saving.

 configure.in.in                               |    2 +-
 doc/C/images/orage_appointment.png            |  Bin 40307 -> 43542 bytes
 doc/C/images/orage_appointment_alarm.png      |  Bin 41110 -> 45414 bytes
 doc/C/images/orage_appointment_recurrence.png |  Bin 22407 -> 65012 bytes
 doc/C/images/orage_desktop_menuitem.png       |  Bin 68914 -> 73985 bytes
 doc/C/images/orage_preferences_display.png    |  Bin 29375 -> 43580 bytes
 doc/C/images/orage_preferences_extra.png      |  Bin 31327 -> 36344 bytes
 doc/C/images/orage_preferences_main.png       |  Bin 17699 -> 27770 bytes
 doc/C/orage.html                              |  415 ++++++++++++++-----------
 doc/C/orage.xml                               |  316 +++++++++++++------
 src/event-list.c                              |   32 +--
 src/ical-code.c                               |    1 +
 12 files changed, 463 insertions(+), 303 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 52ebcd1..3595f1d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.5.10-git])
+m4_define([orage_version], [4.7.5.11-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/doc/C/images/orage_appointment.png b/doc/C/images/orage_appointment.png
index e450e82..3970811 100644
Binary files a/doc/C/images/orage_appointment.png and b/doc/C/images/orage_appointment.png differ
diff --git a/doc/C/images/orage_appointment_alarm.png b/doc/C/images/orage_appointment_alarm.png
index 24ddd2a..f8d152f 100644
Binary files a/doc/C/images/orage_appointment_alarm.png and b/doc/C/images/orage_appointment_alarm.png differ
diff --git a/doc/C/images/orage_appointment_recurrence.png b/doc/C/images/orage_appointment_recurrence.png
index be457ec..d576b2c 100644
Binary files a/doc/C/images/orage_appointment_recurrence.png and b/doc/C/images/orage_appointment_recurrence.png differ
diff --git a/doc/C/images/orage_desktop_menuitem.png b/doc/C/images/orage_desktop_menuitem.png
index ca3232c..c00ee2b 100644
Binary files a/doc/C/images/orage_desktop_menuitem.png and b/doc/C/images/orage_desktop_menuitem.png differ
diff --git a/doc/C/images/orage_preferences_display.png b/doc/C/images/orage_preferences_display.png
index f838590..326ff3e 100644
Binary files a/doc/C/images/orage_preferences_display.png and b/doc/C/images/orage_preferences_display.png differ
diff --git a/doc/C/images/orage_preferences_extra.png b/doc/C/images/orage_preferences_extra.png
index 0bb8085..a824399 100644
Binary files a/doc/C/images/orage_preferences_extra.png and b/doc/C/images/orage_preferences_extra.png differ
diff --git a/doc/C/images/orage_preferences_main.png b/doc/C/images/orage_preferences_main.png
index 3036f52..90b59a9 100644
Binary files a/doc/C/images/orage_preferences_main.png and b/doc/C/images/orage_preferences_main.png differ
diff --git a/doc/C/orage.html b/doc/C/orage.html
index 3bde38e..c7f7396 100644
--- a/doc/C/orage.html
+++ b/doc/C/orage.html
@@ -1,15 +1,15 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Orage</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"><link rel="start" href="#orage" title="Orage"><link rel="next" href="#orage-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="orage"></a>Orage</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Juha</span> <span class="surname">Kautto</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:juha at xfce.org">juha at xfce.org</a>></code></p></div></div></div><div class="author"><h3 class="author"><span class="firstname">Mickael</span> <span class="surname">Graf</span></h3><div class="affiliatio
 n"><div class="address"><p><code class="email"><<a class="email" href="mailto:korbinus at xfce.org">korbinus at xfce.org</a>></code></p></div></div></div><div class="author"><h3 class="author"><span class="firstname">Benedikt</span> <span class="surname">Meurer</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:benny at xfce.org">benny at xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <strong xmlns="" class="application"><code>orage</code></strong> version 4.6.0.
-    Last updated: January 2009
-  <br></br></span></div><div><p class="copyright">Copyright © 2006-2009 Juha Kautto</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#orage-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#orage-getting-started">Getting started</a></span></dt><dt><span class="sect1"><a href="#orage-calendar-window">The calendar window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#calendar-menu-bar">The menu bar</a></span></dt><dt><span class="sect2"><a href="#calendar-window">The calendar</a></span></dt><dt><span class="sect2"><a href="#calendar-todo-window">The TODO list</a></span></dt><dt><span class="sect2"><a href="#calendar-events-window">The EVENT list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-eventlist-window">The event list window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#event%20list-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a hre
 f="#eventlist-tabs">The tabs</a></span></dt><dt><span class="sect2"><a href="#eventlist-appointments">The appointment list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-daylist-window">The day list window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#daylist-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a href="#daylist-parameters">The parameters</a></span></dt><dt><span class="sect2"><a href="#daylist-list">The day list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-appointment-window">The appointment window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#appointment-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a href="#appointment-general-tab">The general tab</a></span></dt><dt><span class="sect2"><a href="#appointment-alarm-tab">The alarm tab</a></span></dt><dt><span class="sect2"><a href="#appointment-recurrence-tab">The recurrence tab</a></span></dt></dl></dd><dt><span cl
 ass="sect1"><a href="#orage-exchangedata-window">The exchange data window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#exchange-impexp-tab">The import export tab</a></span></dt><dt><span class="sect2"><a href="#exchange-oragefiles-tab">The orage files tab</a></span></dt><dt><span class="sect2"><a href="#exchange-foreign-tab">The foreign files tab</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-preferences-window">The preferences window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#preferences-main-tab">The main tab</a></span></dt><dt><span class="sect2"><a href="#preferences-display-tab">The display tab</a></span></dt><dt><span class="sect2"><a href="#preferences-extra-tab">The extra tab</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-undocumented">Undocumented Features</a></span></dt><dt><span class="sect1"><a href="#orage-faq">Frequently Asked Questions</a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><
 div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-intro"></a>Introduction</h2></div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Orage</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.1"><link rel="home" href="#orage" title="Orage"><link rel="next" href="#orage-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article" title="Orage"><div class="titlepage"><div><div><h2 class="title"><a name="orage"></a>Orage</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Juha</span> <span class="surname">Kautto</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:juha at xfce.org">juha at xfce.org</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <strong xml
 ns="" class="application"><code>orage</code></strong> version 4.8.0.
+    Last updated: January 2010
+  <br></br></span></div><div><p class="copyright">Copyright © 2006-2010 Juha Kautto</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#orage-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#orage-getting-started">Getting started</a></span></dt><dt><span class="sect1"><a href="#orage-calendar-window">The calendar window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#calendar-menu-bar">The menu bar</a></span></dt><dt><span class="sect2"><a href="#calendar-window">The calendar</a></span></dt><dt><span class="sect2"><a href="#calendar-todo-window">The TODO list</a></span></dt><dt><span class="sect2"><a href="#calendar-events-window">The EVENT list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-eventlist-window">The event list window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#event%20list-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a hre
 f="#eventlist-tabs">The tabs</a></span></dt><dt><span class="sect2"><a href="#eventlist-appointments">The appointment list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-daylist-window">The day list window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#daylist-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a href="#daylist-parameters">The parameters</a></span></dt><dt><span class="sect2"><a href="#daylist-list">The day list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-appointment-window">The appointment window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#appointment-action-bar">The button bar</a></span></dt><dt><span class="sect2"><a href="#appointment-general-tab">The general tab</a></span></dt><dt><span class="sect2"><a href="#appointment-alarm-tab">The alarm tab</a></span></dt><dt><span class="sect2"><a href="#appointment-recurrence-tab">The recurrence tab</a></span></dt></dl></dd><dt><span cl
 ass="sect1"><a href="#orage-exchangedata-window">The exchange data window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#exchange-impexp-tab">The import export tab</a></span></dt><dt><span class="sect2"><a href="#exchange-oragefiles-tab">The orage files tab</a></span></dt><dt><span class="sect2"><a href="#exchange-foreign-tab">The foreign files tab</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-preferences-window">The preferences window</a></span></dt><dd><dl><dt><span class="sect2"><a href="#preferences-main-tab">The main tab</a></span></dt><dt><span class="sect2"><a href="#preferences-display-tab">The display tab</a></span></dt><dt><span class="sect2"><a href="#preferences-extra-tab">The extra tab</a></span></dt></dl></dd><dt><span class="sect1"><a href="#orage-undocumented">Undocumented Features</a></span></dt><dt><span class="sect1"><a href="#orage-faq">Frequently Asked Questions</a></span></dt></dl></div><p> </p><div class="sect1" title="Intr
 oduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-intro"></a>Introduction</h2></div></div></div><p>
     Orage is a time-managing application of the
     <a class="ulink" href="http://www.xfce.org" target="_top">Xfce 4 Desktop Environment
     </a>. It includes a calendar window, list of events and day view.
     Orage has several kinds of alarms and is ical compatible so that you can
     transfer appointments from other calendar systems into Orage or vica versa.
     It also provides an easy way to archive and manage your old appointments.
-  </p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-getting-started"></a>Getting started</h2></div></div></div><p>
+  </p></div><p> </p><div class="sect1" title="Getting started"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-getting-started"></a>Getting started</h2></div></div></div><p>
     Orage is started by typing <strong class="application"><code>orage</code></strong> on the command line or in the run
-    application window. The command line accepts some optins like -v, which
+    application window. The command line accepts some options like -v, which
     tells the version and -h, which shows short usage help. You can also start
     <strong class="application"><code>orage</code></strong> by clicking on the item <strong class="application"><code>orage</code></strong> in the submenu "Office" from the
     desktop menu. Another handy way of starting <strong class="application"><code>orage</code></strong> is to click button 1 on
@@ -22,68 +22,70 @@
     local <a class="link" href="#preferences-main-tab" title="The main tab">timezone</a>.
   </p><div class="figure"><a name="desktop-menuitem-fig"></a><p class="title"><b>Figure 1. Orage menu item in the desktop menu</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_desktop_menuitem.png" alt='For starting orage from the desktop menu: "Office" and then click on "Orage".'></div></div></div></div><br class="figure-break"><p>
     When you run <strong class="application"><code>orage</code></strong>, you will first see the calendar window appearing.
-  </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-calendar-window"></a>The calendar window</h2></div></div></div><div class="figure"><a name="default-calendar-fig"></a><p class="title"><b>Figure 2. Default Calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/default_calendar.png" alt="The calendar window."></div></div></div></div><br class="figure-break"><p>
+  </p></div><p> </p><div class="sect1" title="The calendar window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-calendar-window"></a>The calendar window</h2></div></div></div><div class="figure"><a name="default-calendar-fig"></a><p class="title"><b>Figure 2. Default Calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/default_calendar.png" alt="The calendar window."></div></div></div></div><br class="figure-break"><p>
     The calendar window provides you a menu bar giving access to different
     functions. 
     Below that is a standard calendar showing the month, the year, day names 
     and week numbers. At the bottom there is small window showing active 
-    TODOs and EVENTs on the selected day. (Empty parts are not shown.)
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-menu-bar"></a>The menu bar</h3></div></div></div><p>
+    TODOs and EVENTs on the selected day.
+  </p><div class="sect2" title="The menu bar"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-menu-bar"></a>The menu bar</h3></div></div></div><p>
       The menubar contains four menus: File, Edit, View and Help.
-    </p><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-file-menu"></a>The File menu</h4></div></div></div><div class="figure"><a name="calendar-file-menu-fig"></a><p class="title"><b>Figure 3. File menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_file_menu.png" alt="The File menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
+    </p><div class="sect3" title="The File menu"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-file-menu"></a>The File menu</h4></div></div></div><div class="figure"><a name="calendar-file-menu-fig"></a><p class="title"><b>Figure 3. File menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_file_menu.png" alt="The File menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
         The file menu contains four items:
-      </p><div class="itemizedlist"><ul type="disc"><li>
+      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
           New: start an 
           <a class="link" href="#orage-appointment-window" title="The appointment window"> appointment window</a> 
           for creating a new appointment;
-        </li><li>
+        </li><li class="listitem">
           Exchange data: creates window where you can do file level operations
-          to Orage data. (1) import and export appointments between
-          Orage and operating system files or 2) rename Orage files or 3) add 
+          to <strong class="application"><code>orage</code></strong> data. (1) import and export appointments between
+          <strong class="application"><code>orage</code></strong> and operating system files or 2) rename <strong class="application"><code>orage</code></strong> files or 3) add 
           and remove foreign calendar files.);
-        </li><li>
-          Close: hide the calendar window but keep Orage running in the 
+        </li><li class="listitem">
+          Close: hide the calendar window but keep <strong class="application"><code>orage</code></strong> running in the 
           background;
-        </li><li>
-          Quit: end Orage;
-        </li></ul></div></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-edit-menu"></a>The Edit menu</h4></div></div></div><div class="figure"><a name="calendar-edit-menu-fig"></a><p class="title"><b>Figure 4. Edit menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_edit_menu.png" alt="The Edit menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
+        </li><li class="listitem">
+          Quit: end <strong class="application"><code>orage</code></strong>;
+        </li></ul></div></div><div class="sect3" title="The Edit menu"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-edit-menu"></a>The Edit menu</h4></div></div></div><div class="figure"><a name="calendar-edit-menu-fig"></a><p class="title"><b>Figure 4. Edit menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_edit_menu.png" alt="The Edit menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
         The Edit menu gives you access to the settings window, which will be
         explained later.
-      </p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-view-menu"></a>The View menu</h4></div></div></div><div class="figure"><a name="calendar-view-menu-fig"></a><p class="title"><b>Figure 5. View menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_view_menu.png" alt="The View menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
+      </p></div><div class="sect3" title="The View menu"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-view-menu"></a>The View menu</h4></div></div></div><div class="figure"><a name="calendar-view-menu-fig"></a><p class="title"><b>Figure 5. View menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_view_menu.png" alt="The View menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
         The View menu has three choices:
-      </p><div class="itemizedlist"><ul type="disc"><li>
+      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
           View selected date: show the event list of currently selected date;
-        </li><li>
+        </li><li class="listitem">
           View selected week: show the day window starting from current day;
-        </li><li>
+        </li><li class="listitem">
           Select today: set calendar's selected day to be today;
-        </li></ul></div></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-help-menu"></a>The Help menu</h4></div></div></div><div class="figure"><a name="calendar-help-menu-fig"></a><p class="title"><b>Figure 6. Help menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_help_menu.png" alt="The Help menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
+        </li></ul></div></div><div class="sect3" title="The Help menu"><div class="titlepage"><div><div><h4 class="title"><a name="calendar-help-menu"></a>The Help menu</h4></div></div></div><div class="figure"><a name="calendar-help-menu-fig"></a><p class="title"><b>Figure 6. Help menu in the calendar window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_calendar_help_menu.png" alt="The Help menu in the calendar window."></div></div></div></div><br class="figure-break"><p>
         The Help menu has also two choices:
-      </p><div class="itemizedlist"><ul type="disc"><li>
+      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
           Help: show this help file;
-        </li><li>
+        </li><li class="listitem">
           About: show information about the version and authors and license;
-        </li></ul></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-window"></a>The calendar</h3></div></div></div><p>
+        </li></ul></div></div></div><div class="sect2" title="The calendar"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-window"></a>The calendar</h3></div></div></div><p>
       Calendar view presents you one month, which you can change by pressing
       the arrow beside the month name or the year number or using the mouse 
       wheel.
-      Days where you have appointments or where you have ending TODO are
-      marked as bold. One day is always selected and shown with a block.
-      You can change the selected day by single clicking any day number.
-      Double clicking a day number causes event list window for that day to be
-      activated.
-    </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-todo-window"></a>The TODO list</h3></div></div></div><p>
+      Days where you have appointments or where you have 
+      <span class="emphasis"><em>Ending</em></span> TODO are marked as bold. One day is always 
+      selected and shown with a block. You can change the selected day by 
+      single clicking any day number. Double clicking a day number causes 
+      event list window for that day to be activated (or day list if you 
+      changed your preferences).
+    </p></div><div class="sect2" title="The TODO list"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-todo-window"></a>The TODO list</h3></div></div></div><p>
       The bottom window lists your active TODOs. You can scroll to see
       them all. Red means the TODO is late (due date has passed). Blue means 
       that the TODO is active (start time has passed, but you still have time
       before the due time passes). And black means a future TODO.
       You can edit TODOs by double clicking the row. All rows have tooltips,
       which show more details about the TODO.
-    </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-events-window"></a>The EVENT list</h3></div></div></div><p>
-      Below the TODO list you see your events from the selected date.
-      Check the tooltip for more details of the event. Also events can be 
-      edited by double clicking them.
-    </p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-eventlist-window"></a>The event list window</h2></div></div></div><div class="figure"><a name="orage-eventlist-fig"></a><p class="title"><b>Figure 7. Orage event list window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_eventlist.png" alt="The event list window."></div></div></div></div><br class="figure-break"><p>
+    </p></div><div class="sect2" title="The EVENT list"><div class="titlepage"><div><div><h3 class="title"><a name="calendar-events-window"></a>The EVENT list</h3></div></div></div><p>
+      Below the TODO list you see your events from the selected date. (Or from
+      several days depending on your settings in the preferences.) Check the
+      tooltip for more details of the event. Also events can be edited by
+      double clicking them.
+    </p></div></div><p> </p><div class="sect1" title="The event list window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-eventlist-window"></a>The event list window</h2></div></div></div><div class="figure"><a name="orage-eventlist-fig"></a><p class="title"><b>Figure 7. Orage event list window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_eventlist.png" alt="The event list window."></div></div></div></div><br class="figure-break"><p>
     The event list (or appointment list as it is also called) window shows all
     activites that you have reserved for the day (date is shown in the window
     heading in your locale format).
@@ -91,72 +93,71 @@
     This is your main activity window and you may want to keep it up all the
     day and even make it to appear on all workspaces or to be always on top
     of other windows.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="event%20list-action-bar"></a>The button bar</h3></div></div></div><p>
+  </p><div class="sect2" title="The button bar"><div class="titlepage"><div><div><h3 class="title"><a name="event%20list-action-bar"></a>The button bar</h3></div></div></div><p>
       There are ten activity buttons in the button bar from left to right:
-    </p><div class="itemizedlist"><ul type="disc"><li>
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
         New: start an <a class="link" href="#orage-appointment-window" title="The appointment window">
         appointment window</a> for creating a new appointment for this day;
-      </li><li>
+      </li><li class="listitem">
         Duplicate: also start an <a class="ulink" href="#orage-appointment-window" target="_top">
         appointment window</a> for creating a new appointment for
         this day. But do not start from scratch, but copy all values
         from the active row in the appointment list below. Note that
         if you do not have any rows selected from the event list, this
         button does not do anything (but gives a warning);
-      </li><li>
+      </li><li class="listitem">
         Delete: remove all selected appointments. There is no undo, so be 
         carefull with this button! Before removing anything Orage asks for 
         your verification.
-      </li><li>
+      </li><li class="listitem">
         Back: show previous day; 
-      </li><li>
+      </li><li class="listitem">
         Today: show today; 
-      </li><li>
+      </li><li class="listitem">
         Forward: show next day; 
-      </li><li>
+      </li><li class="listitem">
         Refresh: redisplay this date;
-      </li><li>
+      </li><li class="listitem">
         Find: activate the search tab;
-      </li><li>
+      </li><li class="listitem">
         Close: close this window; 
-      </li><li>
+      </li><li class="listitem">
         Dayview: start day list window;
-      </li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="eventlist-tabs"></a>The tabs</h3></div></div></div><p>
+      </li></ul></div></div><div class="sect2" title="The tabs"><div class="titlepage"><div><div><h3 class="title"><a name="eventlist-tabs"></a>The tabs</h3></div></div></div><p>
       Each of the four tabs selects the type of appointments to show. 
       There may also be extra selections possible depending on the tab. 
       You can select tab by clicking it or by using the mouse wheel. 
       Let's check each tab:
-    </p><div class="itemizedlist"><ul type="disc"><li>
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
         Event: the event tab shows all EVENT type appointments happening on 
         this day. It is possible to see more than one day in this tab 
-        by setting "Extra days to show" number to larger than 0. Each number
+        by setting "Extra days to show" number to larger than 0. 
+        (You can change the default 0 in the preferences dialog.) Each number
         shows one more day. (It causes the Time column in the event listing 
-        to show also the date.)
-      </li><li>
+        to show also the date.) 
+      </li><li class="listitem">
         Todo: shows your active TODOs similarly than in the main calendar
         window. Only active ones are shown. If you want to see old TODOs,
         you need to find them in Search tab.
-      </li><li>
+      </li><li class="listitem">
         Journal: lists your notebook entries starting from certain date.
         Default start date is one year back and you can not change the 
         default setting.
-      </li><li>
+      </li><li class="listitem">
         Search: enter a free text, which is searched from all the appointments.
         Usually the search is case independent, but for some utf8 characters 
         Orage switches to case sensitive search method. This happens if the 
         length of the string is different in upper case compared to lower case
         (for example German language double s causes this).
-      </li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="eventlist-appointments"></a>The appointment list</h3></div></div></div><p>
+      </li></ul></div></div><div class="sect2" title="The appointment list"><div class="titlepage"><div><div><h3 class="title"><a name="eventlist-appointments"></a>The appointment list</h3></div></div></div><p>
       The list shows all appointments satisfying the conditions and tab type.
       Scrollbars will appear if there are more lines or longer lines than 
       what fits into the window. You can edit any appointment by double 
-      clicking the row. Note that each repeating appointment is shown only 
-      once (=first time) instead of everytime it happens in the specified days.
-      Each line has three fields:
-    </p><div class="itemizedlist"><ul type="disc"><li>
+      clicking the row. Each line has three fields:
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
         Time: the starting and ending times of the appointment (the format
         varies depending on tab and appointment). All times are always shown
-        in our local timezone. It is possible to define special whole day
+        in your local timezone. It is possible to define special whole day
         appointments and they have a text "All day" instead of real start and
         end times. Rows appear in start time order.
         +sign in front of the time means that the appointment started on some
@@ -165,27 +166,27 @@
         If the Event tab shows today, there are few extra formattings used:
         When the event has passed, it is overstriked. Currently active 
         events are shown with blue colour and future events are bold. 
-      </li><li>
+      </li><li class="listitem">
         Flags: gives information about the appointment. If your appointment
         has a category which has been associated with a clour, flags field has
         that colour background. (Note that the explanations are visible as
         a hint when you move your cursor into the appointment list.)
         There are five flags in order:
-        <div class="itemizedlist"><ul type="circle"><li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem">
             Alarm: what kind of action happens when alarm time passes.
             <span class="keycap"><strong>n</strong></span> means no alarm has been defined.
             <span class="keycap"><strong>A</strong></span> means that visible window is raised.
             <span class="keycap"><strong>S</strong></span> means that sound is played.
             (If both visual and sound alarm is defined, S is shown)
-          </li><li>
-            Repeat: how often is that appointment happening.
+          </li><li class="listitem">
+            Recurrence: how often is that appointment happening.
             <span class="keycap"><strong>n</strong></span> means no repeating so that this event only
             happens once. 
             <span class="keycap"><strong>D</strong></span> means daily repeat,
             <span class="keycap"><strong>W</strong></span> weekly, 
             <span class="keycap"><strong>M</strong></span> monthly and
             <span class="keycap"><strong>Y</strong></span> yearly.
-          </li><li>
+          </li><li class="listitem">
             Type: what kind of reservation is this. Two options:
             <span class="keycap"><strong>f</strong></span> means free so that the action is not reserving
             the time and it is possible to schedule more appointments at the
@@ -194,7 +195,7 @@
             nothing else can be done at this time.  Note that current
             version of <strong class="application"><code>orage</code></strong> does not enforce these and the flag is only as a
             comment (in the future this may be enforced).
-          </li><li>
+          </li><li class="listitem">
             File: where this appointment is stored.
             <span class="keycap"><strong>O</strong></span> means it is in the standard active Orage file,
             <span class="keycap"><strong>A</strong></span> in the archive file. (The appointment is
@@ -202,18 +203,18 @@
             can only be found in the Search and Journal tabs.
             <span class="keycap"><strong>F</strong></span> appointment is in foreign file; in other words
             it is not native Orage appointment.
-          </li><li>
+          </li><li class="listitem">
             Appointment type: 
             <span class="keycap"><strong>E</strong></span> for EVENT,
             <span class="keycap"><strong>T</strong></span> for TODO and
             <span class="keycap"><strong>J</strong></span> for JOURNAL.
             This flag is usefull only in search tab since the tab name
             informs the type in other tabs.
-          </li></ul></div></li><li>
+          </li></ul></div></li><li class="listitem">
         Title: the heading of the appointment. Note that the whole title is
         shown, so you may want to avoid using too long titles to keep the view
         cleaner.
-      </li></ul></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-daylist-window"></a>The day list window</h2></div></div></div><div class="figure"><a name="orage-daylist-fig"></a><p class="title"><b>Figure 8. Orage day list window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_daylist.png" alt="The day list window."></div></div></div></div><br class="figure-break"><p>
+      </li></ul></div></div></div><p> </p><div class="sect1" title="The day list window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-daylist-window"></a>The day list window</h2></div></div></div><div class="figure"><a name="orage-daylist-fig"></a><p class="title"><b>Figure 8. Orage day list window</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_daylist.png" alt="The day list window."></div></div></div></div><br class="figure-break"><p>
     The day list window shows all events that you have reserved for the
     next days. Default is to show 7 days, but you can change that and see
     up to 40 days at once.
@@ -221,25 +222,25 @@
     This is another form of your main activity window and more usefull than
     event list window if you want to find room for your new events or see your
     agenda and free time from longer perod than one day.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-action-bar"></a>The button bar</h3></div></div></div><p>
+  </p><div class="sect2" title="The button bar"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-action-bar"></a>The button bar</h3></div></div></div><p>
       There are six activity buttons in the button bar from left to right:
-    </p><div class="itemizedlist"><ul type="disc"><li>
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
         New: start an <a class="link" href="#orage-appointment-window" title="The appointment window">
         appointment window</a> for creating a new appointment for this day;
-      </li><li>
+      </li><li class="listitem">
         Back: start listing one day earlier; 
-      </li><li>
+      </li><li class="listitem">
         Today: change start day to be today; 
-      </li><li>
+      </li><li class="listitem">
         Forward: start listing one day later; 
-      </li><li>
+      </li><li class="listitem">
         Refresh: redisplay the window;
-      </li><li>
+      </li><li class="listitem">
         Close: close this window; 
-      </li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-parameters"></a>The parameters</h3></div></div></div><p>
+      </li></ul></div></div><div class="sect2" title="The parameters"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-parameters"></a>The parameters</h3></div></div></div><p>
       Below the buttonbar are the two settings. You can change the
       start day of the day list and the number of days shown.
-    </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-list"></a>The day list</h3></div></div></div><p>
+    </p></div><div class="sect2" title="The day list"><div class="titlepage"><div><div><h3 class="title"><a name="daylist-list"></a>The day list</h3></div></div></div><p>
       Biggest part of the window is the day list area. You can click the 
       header of the day to open 
       <a class="link" href="#orage-eventlist-window" title="The event list window">event list window</a>
@@ -251,36 +252,36 @@
       the event is taking time (availability=Busy), there is vertical line
       in front of it showing its length. These lines show how full your
       calendar is and makes it easier to find free time quickly. If more than
-      one events starts at the same hour, they all are added to the same row /
-      column after each other and the reservation line is the sum of them.
-    </p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-appointment-window"></a>The appointment window</h2></div></div></div><p>
+      one event starts at the same hour, they all are added to the same row /
+      column after each other and the reservation line is the overlap of them.
+    </p></div></div><p> </p><div class="sect1" title="The appointment window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-appointment-window"></a>The appointment window</h2></div></div></div><p>
     The appointment window is used to add, edit and delete appointments.
     It is the most complex window in <strong class="application"><code>orage</code></strong>, but most fields still have good
     default values and are not mandatory. It has button bar (All actions are
     also available in menus above the buttons) and three tabs controlling
     basic settings and alarms and recurrence settings.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-action-bar"></a>The button bar</h3></div></div></div><p>
+  </p><div class="sect2" title="The button bar"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-action-bar"></a>The button bar</h3></div></div></div><p>
       There are 5 activity buttons in the button bar from left to right:
-    </p><div class="itemizedlist"><ul type="disc"><li>
+    </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
         Save: store the appointment to the orage system. This causes
         also data validity checking.
-      </li><li>
+      </li><li class="listitem">
         Save and close: like Save, but also closes the window.
-      </li><li>
+      </li><li class="listitem">
         Revert: undo all changes done after previous save. Note that
         this button is active only after data has been changed.
-      </li><li>
+      </li><li class="listitem">
         Duplicate: start creating new appointment and copy all values
         from the current activity into it. The new appointment is not created
         until you press <span class="guibutton"><strong>Save</strong></span>.
-      </li><li>
+      </li><li class="listitem">
         Delete: remove current appointment permanently from orage
         system.
-      </li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-general-tab"></a>The general tab</h3></div></div></div><div class="figure"><a name="orage-appointment-fig"></a><p class="title"><b>Figure 9. Orage appointment window - general tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment.png" alt="The appointment window."></div></div></div></div><br class="figure-break"><p>
+      </li></ul></div></div><div class="sect2" title="The general tab"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-general-tab"></a>The general tab</h3></div></div></div><div class="figure"><a name="orage-appointment-fig"></a><p class="title"><b>Figure 9. Orage appointment window - general tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment.png" alt="The appointment window."></div></div></div></div><br class="figure-break"><p>
       In this tab, you define the contents of the appointment.
     </p><div class="variablelist"><dl><dt><span class="term">Type</span></dt><dd><p>
             Orage can handle three types of appointments: 
-          </p><div class="itemizedlist"><ul type="disc"><li>
+          </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
               Event is something that happens sometimes. It has start and 
               end time. This is the most common appointment type and you 
               actually can handle all cases with this, since it also is the 
@@ -288,7 +289,7 @@
               Event is your best bet. Events either reserve your time 
               (Availability=Busy) or are free which means this event does not
               take time from your schedule. 
-            </li><li>
+            </li><li class="listitem">
               Todo is some action that you need to complete. It
               usually has a start time and due time when it has to be finished.
               It has no end time, which is replaced by the due time. You can
@@ -296,7 +297,7 @@
               availability, but instead they have completed time. After you
               set the completed time, the todo is done and is removed from 
               lists visible in main calendar and in todo appointment tab. 
-            </li><li>
+            </li><li class="listitem">
               Journals are just notes. They do not have end times nor
               availability. It is not possible to add alarm or recurrency for
               journals.
@@ -369,11 +370,14 @@
             It is also possible to create a list of categories and associate
             those to colours. You can then pick one of those and get your
             appointment to be shown with that colour in the event list window.
+          </p></dd><dt><span class="term">Priority</span></dt><dd><p>
+            Priority of the appointment. <strong class="application"><code>orage</code></strong> is not using this, so treat it
+            just like a comment.
           </p></dd><dt><span class="term">Note</span></dt><dd><p>
             Free format text, where you can and should explain more
             the appointment. It is shown in the alarm window. Scrollbars
             appear when needed.
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-alarm-tab"></a>The alarm tab</h3></div></div></div><div class="figure"><a name="orage-appointment-alarm-fig"></a><p class="title"><b>Figure 10. Orage appointment window - alarm tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment_alarm.png" alt="The appointment alarm tab."></div></div></div></div><br class="figure-break"><p>
+          </p></dd></dl></div></div><div class="sect2" title="The alarm tab"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-alarm-tab"></a>The alarm tab</h3></div></div></div><div class="figure"><a name="orage-appointment-alarm-fig"></a><p class="title"><b>Figure 10. Orage appointment window - alarm tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment_alarm.png" alt="The appointment alarm tab."></div></div></div></div><br class="figure-break"><p>
       In this tab, you define the alarm for the appointment. <strong class="application"><code>orage</code></strong> supports 
       three kinds of alarms: window, sound and procedure, but they all happen
       at the same time. It is possible to define only one alarm time for each
@@ -424,26 +428,29 @@
             <strong class="application"><code>orage</code></strong> can show two kinds of internal visual alarms. Orage window
             is a small alarm window showing the heading and note text. 
             Notification is more fancy notification using libnotify. You need
-            to have libnotify installed before you can define this kind of
-            visual alarm. <span class="command"><strong>orage -v</strong></span> shows if you have
-            libnotify support included.
+            to have libnotify installed before you can define notification 
+            kind of visual alarm. <span class="command"><strong>orage -v</strong></span> shows if you
+            have libnotify support included.
           </p></dd><dt><span class="term">Procedure</span></dt><dd><p>
             This makes it possible to use external alarms. You can run any
             operating system command or script. Common use for this is sending
             email.
+          </p></dd><dt><span class="term">Execute</span></dt><dd><p>
+            You can test your alarm by pressing this. It raises the alarms
+            immediately so that you can listen the sounds and see the windows.
           </p></dd><dt><span class="term">Default alarm</span></dt><dd><p>
             You can either set alarm back to default options or you can store
             current settings to be default alarm for all new appointments.
             There is only one default alarm, which applies to all appointments.
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-recurrence-tab"></a>The recurrence tab</h3></div></div></div><div class="figure"><a name="orage-appointment-recurrence-fig"></a><p class="title"><b>Figure 11. Orage appointment window - recurrence tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment_recurrence.png" alt="The appointment recurrence tab."></div></div></div></div><br class="figure-break"><p>
+          </p></dd></dl></div></div><div class="sect2" title="The recurrence tab"><div class="titlepage"><div><div><h3 class="title"><a name="appointment-recurrence-tab"></a>The recurrence tab</h3></div></div></div><div class="figure"><a name="orage-appointment-recurrence-fig"></a><p class="title"><b>Figure 11. Orage appointment window - recurrence tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_appointment_recurrence.png" alt="The appointment recurrence tab."></div></div></div></div><br class="figure-break"><p>
       In this tab you can define repeating appointments. Often it makes
       sense that the same appointment happens every day or every month instead
       of creating a new appointment for each event. Note that <strong class="application"><code>orage</code></strong> does not 
-      support exclusions (like you would like to skip holiday period from you
-      work related appointments), so you have to end the whole recurrency
-      and enable it again after it need to resume. <strong class="application"><code>orage</code></strong> also misses the 
-      possibility to modify only one specific event from a recurring set. All
-      changes affect the whole set of appointments.
+      support exclusion day ranges (like you would like to skip holiday period 
+      from you work related appointments), so you have to end the whole 
+      recurrency and enable it again after it need to resume. <strong class="application"><code>orage</code></strong> also 
+      misses the possibility to modify only one specific event from a 
+      recurring set. All changes affect the whole set of appointments.
     </p><div class="variablelist"><dl><dt><span class="term">Complexity</span></dt><dd><p>
             Default is Basic and that makes it possible to define frequency 
             and limit of the appointment only. Often that is enough and these 
@@ -451,9 +458,9 @@
             with calendars and alarms. Selecting Advanced gives you more 
             possibilities and makes it possible to build complex recurrent 
             appointments like for example:
-            </p><div class="itemizedlist"><ul type="disc"><li>
+            </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
                 Every Monday, Tuesday, Wednesday, Thursday and Friday.
-              </li><li>
+              </li><li class="listitem">
                 Last Tuesday on every second month.
               </li></ul></div><p>
           </p></dd><dt><span class="term">Frequency</span></dt><dd><p>
@@ -470,13 +477,13 @@
             and next event happens exactly 3 weeks from that)
           </p></dd><dt><span class="term">Limit</span></dt><dd><p>
             <strong class="application"><code>orage</code></strong> allows you also to limit the repeating count:
-            </p><div class="itemizedlist"><ul type="disc"><li>
+            </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
                 Repeat forever: this is default and does not limit the
                 number of occurrences at all.
-              </li><li>
+              </li><li class="listitem">
                 Repeat n times: the appointment is scheduled exactly n
                 times. After that it ends (but is not removed).
-              </li><li>
+              </li><li class="listitem">
                 Repeat until date: you can select the last date when this
                 event happens. Note that it still happens normally during this 
                 date.
@@ -509,16 +516,35 @@
             from the end of period and zero means that this setting is not used.
             Frequency = Yearly, weekdays = Thursday only clicked and which say =
             -2 means second last Thursday of the year.
-          </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-exchangedata-window"></a>The exchange data window</h2></div></div></div><p>
+          </p></dd><dt><span class="term">Exceptions</span></dt><dd><p>
+            Here is list of exception times. - sign at the end of the row means
+            exclusion where the appointment does not happen even though it was
+            included in the repeat set. + sign means it is extra time to 
+            do the appointment.
+          </p><p>
+            You can remove the exception by double clicking it in the listing
+            window. You can add new exception by first selecting the type
+            (either excluded or included times) and then double clicking a day
+            in one of the calendars below.
+          </p><p>
+            (Note that even though excluded time should be date, it can be shown
+            as time in some systems. This is a way to workaround a bug where
+            some calendar backend systems are not able to handle full date
+            exclusions properly.)
+          </p></dd><dt><span class="term">Action dates</span></dt><dd><p>
+            Three small helper calendars, which show when the appointment
+            will happen next. They show real time data, which is not stored
+            in the system until you press save button.
+          </p></dd></dl></div></div></div><p> </p><div class="sect1" title="The exchange data window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-exchangedata-window"></a>The exchange data window</h2></div></div></div><p>
     The exchange data window is used to control physical files of <strong class="application"><code>orage</code></strong>.
     It is possible to import files having calendar data or just use those
     files as they are (foreign). It is also possible to export appointments
     from <strong class="application"><code>orage</code></strong> to operating system files and change the names of <strong class="application"><code>orage</code></strong> data
     files.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-impexp-tab"></a>The import export tab</h3></div></div></div><div class="figure"><a name="orage-exchange-impexp-fig"></a><p class="title"><b>Figure 12. Orage exchange window - import/export tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_impexp.png" alt="The exchange data import export tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Import</span></dt><dd><p>
+  </p><div class="sect2" title="The import export tab"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-impexp-tab"></a>The import export tab</h3></div></div></div><div class="figure"><a name="orage-exchange-impexp-fig"></a><p class="title"><b>Figure 12. Orage exchange window - import/export tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_impexp.png" alt="The exchange data import export tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Import</span></dt><dd><p>
             Enter the name of the file which you want to copy into <strong class="application"><code>orage</code></strong>.
             You can do several files in a row by separating names with comma.
-            After you hae the file name in place, press Save and <strong class="application"><code>orage</code></strong> reads
+            After you have the file name in place, press Save and <strong class="application"><code>orage</code></strong> reads
             the contents in. After the file has been imported, those 
             appointmenst are part of <strong class="application"><code>orage</code></strong> and can't be differentiated or
             put back into the file.
@@ -538,25 +564,25 @@
             <strong class="application"><code>orage</code></strong> file or force archiving. It is good idea to revert archive
             if you do exports since export does not look data from archive
             file.
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-oragefiles-tab"></a>The orage files tab</h3></div></div></div><div class="figure"><a name="orage-exchange-oragefiles-fig"></a><p class="title"><b>Figure 13. Orage exchange window - orage files tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_oragefiles.png" alt="The exchange data orage files tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Orage files</span></dt><dd><p>
+          </p></dd></dl></div></div><div class="sect2" title="The orage files tab"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-oragefiles-tab"></a>The orage files tab</h3></div></div></div><div class="figure"><a name="orage-exchange-oragefiles-fig"></a><p class="title"><b>Figure 13. Orage exchange window - orage files tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_oragefiles.png" alt="The exchange data orage files tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Orage files</span></dt><dd><p>
             It is possible to relocate and rename both active <strong class="application"><code>orage</code></strong> file
             and the passive archive file. Pressing save does the actual action.
             There are 3 options for these actions:
-            </p><div class="itemizedlist"><ul type="disc"><li>
+            </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
                 Rename: the safest choice. It only updates the file name in
                 <strong class="application"><code>orage</code></strong> internal structures. It does not touch operating system
                 files at all. The new file has to exist before this operation
                 can be done. First copy the file in you operating system
                 and then you can change the name.
-              </li><li>
+              </li><li class="listitem">
                 Copy: another safe choice. File is copied first into the new 
                 place followed by the internal rename described above.
-              </li><li>
+              </li><li class="listitem">
                 Move: File is moved first into the new place followed by the
                 internal rename described above. Note that the original file
                 does not exist in the original place anymore after this change.
               </li></ul></div><p>
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-foreign-tab"></a>The foreign files tab</h3></div></div></div><div class="figure"><a name="orage-exchange-foreign-fig"></a><p class="title"><b>Figure 14. Orage exchange window - foreign files tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_foreign.png" alt="The exchange data foreign files tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Foreign files</span></dt><dd><p>
+          </p></dd></dl></div></div><div class="sect2" title="The foreign files tab"><div class="titlepage"><div><div><h3 class="title"><a name="exchange-foreign-tab"></a>The foreign files tab</h3></div></div></div><div class="figure"><a name="orage-exchange-foreign-fig"></a><p class="title"><b>Figure 14. Orage exchange window - foreign files tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_exchange_foreign.png" alt="The exchange data foreign files tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Foreign files</span></dt><dd><p>
             <strong class="application"><code>orage</code></strong> can include and maintain other than its main data file.
             It is possible to add (and remove) so called foreign files. They
             behave similarly than base data file, but they remain isolated, 
@@ -564,19 +590,19 @@
             where they came from. This is mainly meant to be used when you
             need to maintain your calendar also in other than <strong class="application"><code>orage</code></strong>. Sometimes
             it is good idea to mark the file as read only, which prevents
-            you from modifying any of the appoinments in the corresposnding
+            you from modifying any of the appointments in the corresponding
             file. (Orage uses some private ical components, which are not
             necessarily understood by the other system, so updates may cause
             problems for the other tool.)
           </p><p>
             You can also add foreign files from the operating system using
-            command line.
-          </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-preferences-window"></a>The preferences window</h2></div></div></div><p>
+            command line: <span class="command"><strong>orage --add-foreign file</strong></span>
+          </p></dd></dl></div></div></div><p> </p><div class="sect1" title="The preferences window"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-preferences-window"></a>The preferences window</h2></div></div></div><p>
     The preferences window is used to enter initial values for <strong class="application"><code>orage</code></strong>.
     You can define for example several display options, how old appointments
-    should be archived and what is the play command to be used for playing
+    should be archived and what is the command to be used for playing
     sound alarms and also you can set the local timezone for <strong class="application"><code>orage</code></strong>.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-main-tab"></a>The main tab</h3></div></div></div><div class="figure"><a name="orage-preferences-main-fig"></a><p class="title"><b>Figure 15. Orage preferences window - main tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_main.png" alt="The preferences main tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Timezone</span></dt><dd><p>
+  </p><div class="sect2" title="The main tab"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-main-tab"></a>The main tab</h3></div></div></div><div class="figure"><a name="orage-preferences-main-fig"></a><p class="title"><b>Figure 15. Orage preferences window - main tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_main.png" alt="The preferences main tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Timezone</span></dt><dd><p>
             You should always set the default timezone for <strong class="application"><code>orage</code></strong>. It is
             possible to use also floating times, but then all times should be
             in floating form. It is a bad idea to mix floating and timezone
@@ -613,7 +639,7 @@
             <strong class="application"><code>orage</code></strong> really only starts this program and gives it
             <a class="link" href="#appointment-alarm-tab" title="The alarm tab">the sound file</a>
             as parameter. But this is not the intention of this feature.
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-display-tab"></a>The display tab</h3></div></div></div><div class="figure"><a name="orage-preferences-display-fig"></a><p class="title"><b>Figure 16. Orage preferences window - display tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_display.png" alt="The preferences display tab."></div></div></div></div><br class="figure-break"><p>
+          </p></dd></dl></div></div><div class="sect2" title="The display tab"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-display-tab"></a>The display tab</h3></div></div></div><div class="figure"><a name="orage-preferences-display-fig"></a><p class="title"><b>Figure 16. Orage preferences window - display tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_display.png" alt="The preferences display tab."></div></div></div></div><br class="figure-break"><p>
       In this tab you can define visibility options for the 
       <a class="link" href="#orage-calendar-window" title="The calendar window">main window</a> of <strong class="application"><code>orage</code></strong>.
     </p><div class="variablelist"><dl><dt><span class="term">Show borders</span></dt><dd><p>
@@ -623,10 +649,18 @@
           </p></dd><dt><span class="term">Show menu</span></dt><dd><p>
             By unselecting this you can leave out the menubar in the top of
             the calendar window.
+          </p></dd><dt><span class="term">Show month and year</span></dt><dd><p>
+            Select whether you want to see month and year controls in 
+            the main calendar window.
+          </p></dd><dt><span class="term">Show day names</span></dt><dd><p>
+            Controls day names visibility on top of the calendar window.
+          </p></dd><dt><span class="term">Show week numbers</span></dt><dd><p>
+            Controls visibility of week numbers on left of calendar.
           </p></dd><dt><span class="term">Show todo list</span></dt><dd><p>
             You can hide TODO list in the main calendar by deselecting this.
-          </p></dd><dt><span class="term">Show event list</span></dt><dd><p>
-            You can hide EVENT list in the main calendar by deselecting this.
+          </p></dd><dt><span class="term">Number of days to show in event window</span></dt><dd><p>
+            You can hide EVENT list in the main calendar by setting this to
+            zero. Non zero values means the number of days to show events for.
           </p></dd><dt><span class="term">Set sticked</span></dt><dd><p>
             Show calendar window on all workspaces by selecting this.
           </p></dd><dt><span class="term">Set on top</span></dt><dd><p>
@@ -637,7 +671,7 @@
             Controls if calendar is visible in the pager.
           </p></dd><dt><span class="term">Show in systray</span></dt><dd><p>
             Controls if calendar is visible in the systray. A small 
-            window is presented in the systray if this is selected. It is
+            icon is presented in the systray if this is selected. It is
             recommended that you enable this feature. By clicking this icon
             <strong class="application"><code>orage</code></strong> is toggled visible or hidden. If you do not have <strong class="application"><code>orage</code></strong> in
             the systray, you have two other options to make the main calendar
@@ -646,83 +680,94 @@
           </p></dd><dt><span class="term">Calendar start</span></dt><dd><p>
             It is possible to define that <strong class="application"><code>orage</code></strong> starts in the background or
             as minimized. This option only affects the start of <strong class="application"><code>orage</code></strong>.
-          </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-extra-tab"></a>The extra tab</h3></div></div></div><div class="figure"><a name="orage-preferences-extra-fig"></a><p class="title"><b>Figure 17. Orage preferences window - extra tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_extra.png" alt="The preferences extra tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Select always today</span></dt><dd><p>
+          </p></dd></dl></div></div><div class="sect2" title="The extra tab"><div class="titlepage"><div><div><h3 class="title"><a name="preferences-extra-tab"></a>The extra tab</h3></div></div></div><div class="figure"><a name="orage-preferences-extra-fig"></a><p class="title"><b>Figure 17. Orage preferences window - extra tab</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/orage_preferences_extra.png" alt="The preferences extra tab."></div></div></div></div><br class="figure-break"><div class="variablelist"><dl><dt><span class="term">Select always today</span></dt><dd><p>
             Controls which day is selected after <strong class="application"><code>orage</code></strong> main
         <a class="link" href="#orage-calendar-window" title="The calendar window">calendar window</a> is hidden
             and comes visible again (for example by clicking orageclock panel
             plugin). Default value is off, which means that previously
             selected day will remain selected. Crossing this causes
-            current date always being selected.
-          </p></dd><dt><span class="term">Dynamic icon size</span></dt><dd><p>
-            Setting these X and Y sizes to nonzero causes <strong class="application"><code>orage</code></strong> to use dynamic
-            icon in taskbar (if you have taskbar and you have selected to use
-            taskbar in the Display tab). Dynamic icon includes real month day
-            number and also lists <strong class="application"><code>orage</code></strong> in the top and month name at the
-            bottom if those fit in. <strong class="application"><code>orage</code></strong> tries to fit all those three pieces
-            of information in the available icon size using proper fonts, but
-            if there is not enough space, top and bottom texts can be omitted.
-            Finally <strong class="application"><code>orage</code></strong> switches to static icon if not even the number fits
-            into the icon. Good values to test are 32 (like X=32 Y=32).
+            current date instead being selected.
+          </p></dd><dt><span class="term">Use dynamic tray icon</span></dt><dd><p>
+            Setting this causes <strong class="application"><code>orage</code></strong> to use dynamic icon in taskbar (if you
+            have taskbar and you have selected to use taskbar in the Display
+            tab).  Note that this icon is used also other places where icon 
+            is used.
+            Dynamic icon includes real month day number and also shows weekday
+            in the top and month name at the bottom. (<strong class="application"><code>orage</code></strong> uses appreviations
+            if real names are too long to fit to the available space.)
+            You can revert back to old static icon by deselecting this. 
           </p></dd><dt><span class="term">Main Calendar double click shows</span></dt><dd><p>
             You can define to start either the event list (=appointment list)
             or the day view window when you double click day numbers in the
             main calendar window.
-          </p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-undocumented"></a>Undocumented Features</h2></div></div></div><p>
+          </p></dd><dt><span class="term">Eventlist window</span></dt><dd><p>
+            Define how many days to show in the event list when it starts.
+            (It is possible to change the number in the event list window.)
+          </p></dd></dl></div></div></div><p> </p><div class="sect1" title="Undocumented Features"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-undocumented"></a>Undocumented Features</h2></div></div></div><p>
     Some hidden options allow you to customize <strong class="application"><code>orage</code></strong> behaviour. You can find 
     and change those in <code class="filename">~/.config/orage/oragerc</code>.
     You must be carefull not to change the format of this file or <strong class="application"><code>orage</code></strong> may
     not start anymore. All the other settings are in the same file.
     Undocumented settings are:
-  </p><div class="itemizedlist"><ul type="disc"><li>
-      Main Window Position: normally you do not want to change this. It is the
-      location of <a class="link" href="#orage-calendar-window" title="The calendar window">calendar window</a>
+  </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
+      Main Window Position (Main window X, Main window Y)
+      and Size (Main window size X, Main window size Y): normally you do
+      not want to change these. It is the location and size of
+      <a class="link" href="#orage-calendar-window" title="The calendar window">calendar window</a>
       in the screen. <strong class="application"><code>orage</code></strong> updates this automatically, so your setting will be
       overwritten.
-    </li><li>
-      Event Window Size: normally you do not want to change this. It is the
-      size of <a class="link" href="#orage-eventlist-window" title="The event list window">event list window</a>
+    </li><li class="listitem">
+      Event Window Position (Eventlist window pos X, Eventlist window pos Y)
+      and Size(Eventlist window X, Eventlist window X): normally you do
+      not want to change these. It is the location and size of
+      <a class="link" href="#orage-eventlist-window" title="The event list window">event list window</a>
       in the screen. <strong class="application"><code>orage</code></strong> updates this automatically, so your setting will be
       overwritten.
-    </li><li>
+    </li><li class="listitem">
       Logging level: normally you do not want to change this. It can be used
       to control how much information <strong class="application"><code>orage</code></strong> prints to the screen or log 
       file ~/.xsession-errors. Message number are:
-      <div class="itemizedlist"><ul type="circle"><li>
+      <div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem">
           negative= Debug (Note that special debug code needs to be linked
                   into <strong class="application"><code>orage</code></strong> before these message are in use)
-        </li><li>
+        </li><li class="listitem">
           0-99    = Message (startup and update modification messages
                   for example)
-        </li><li>
+        </li><li class="listitem">
           100-199 = Warning
-        </li><li>
+        </li><li class="listitem">
           200-299 = Critical warning
-        </li><li>
+        </li><li class="listitem">
           300-    = Error (these cause <strong class="application"><code>orage</code></strong> to abort)
-        </li></ul></div></li><li><p>
-        Ical week start day: Defines what is the first day of week in libical.
-        Note, that 
-        it is <span class="emphasis"><em>only</em></span> used in weekly repeating
-        appointments. It will <span class="emphasis"><em>not</em></span> change the
-        calendar view anyway. <strong class="application"><code>orage</code></strong> tries is best to find this setting 
-        automatically, but if your weekly repeating appointments seem to be
-        wrong, you can try to set this. 0 = Monday, 1 = Tuesday...
-      </p></li></ul></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-faq"></a>Frequently Asked Questions</h2></div></div></div><p>
+        </li></ul></div></li><li class="listitem">
+      Ical week start day: Defines what is the first day of week in libical.
+      Note, that it is <span class="emphasis"><em>only</em></span> used in weekly repeating
+      appointments. It will <span class="emphasis"><em>not</em></span> change the
+      calendar view anyway. <strong class="application"><code>orage</code></strong> tries is best to find this setting 
+      automatically, but if your weekly repeating appointments seem to be
+      wrong, you can try to set this. 0 = Monday, 1 = Tuesday...
+    </li><li class="listitem">
+      Priority list limit: Day view listing only shows appointments, which have
+      priority smaller than this limit. It is adviced to keep it as a high 
+      value or you will not see all your appointments in the day view window.
+    </li></ul></div></div><p> </p><div class="sect1" title="Frequently Asked Questions"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="orage-faq"></a>Frequently Asked Questions</h2></div></div></div><p>
     Some common questions and answers.
-  </p><tr class="qandadiv"><td align="left" valign="top" colspan="2"><h4 class="title"><a name="id2544990"></a>1. Frequently Asked Questions</h4></td></tr><tr class="toc"><td align="left" valign="top" colspan="2"><dl><dt>1.1. <a href="#id2544994">
+  </p><tr class="qandadiv"><td align="left" valign="top" colspan="2"><h4 class="title"><a name="id2890346"></a>1. Frequently Asked Questions</h4></td></tr><tr class="toc"><td align="left" valign="top" colspan="2"><dl><dt>1.1. <a href="#id2890350">
           Why does my week start on Saturday?
-        </a></dt><dt>1.2. <a href="#id2545088">
+        </a></dt><dt>1.2. <a href="#id2890444">
           How can I insert my ical file into orage?
-        </a></dt><dt>1.3. <a href="#id2545126">
+        </a></dt><dt>1.3. <a href="#id2890482">
           How can skip my repeating appointment from happening during some 
           period of time?
-        </a></dt><dt>1.4. <a href="#id2545158">
+        </a></dt><dt>1.4. <a href="#id2890531">
           I have found a bug in orage or would like to see a new feature. How
           can I inform that to the developers?
-        </a></dt><dt>1.5. <a href="#id2545208">
-          I upgraded to Orage 4.6 from Orage 4.4 and now my old appointments 
-          are missing. Are they permanently lost?
-        </a></dt></dl></td></tr><tr class="question"><td align="left" valign="top"><a name="id2544994"></a><a name="id2544996"></a><p><b>1.1.</b></p></td><td align="left" valign="top"><p>
+        </a></dt><dt>1.5. <a href="#id2890580">
+          I upgraded to Orage 4.6 or 4.8 from Orage 4.4 and now my old
+          appointments are missing. Are they permanently lost?
+        </a></dt><dt>1.6. <a href="#id2890632">
+          Does orage support group schedules?
+        </a></dt></dl></td></tr><tr class="question" title="1.1."><td align="left" valign="top"><a name="id2890350"></a><a name="id2890352"></a><p><b>1.1.</b></p></td><td align="left" valign="top"><p>
           Why does my week start on Saturday?
         </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
           This really is a problem in your distro. You can check how your
@@ -748,7 +793,7 @@
           After that you can check what the setting is: 
           <span class="command"><strong>grep first_weekday fi_FI</strong></span> and change that if it is
           wrong and after that you need to recompile your locale database.
-        </p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2545088"></a><a name="id2545090"></a><p><b>1.2.</b></p></td><td align="left" valign="top"><p>
+        </p></td></tr><tr class="question" title="1.2."><td align="left" valign="top"><a name="id2890444"></a><a name="id2890446"></a><p><b>1.2.</b></p></td><td align="left" valign="top"><p>
           How can I insert my ical file into <strong class="application"><code>orage</code></strong>?
         </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
           You can do this with so called foreig files. Add your file as
@@ -756,7 +801,7 @@
           and <strong class="application"><code>orage</code></strong> includes the appointmemts (After this you can not tell
           the difference anymore, so you can not easily move them back to
           where they came form.)
-        </p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2545126"></a><a name="id2545128"></a><p><b>1.3.</b></p></td><td align="left" valign="top"><p>
+        </p></td></tr><tr class="question" title="1.3."><td align="left" valign="top"><a name="id2890482"></a><a name="id2890484"></a><p><b>1.3.</b></p></td><td align="left" valign="top"><p>
           How can skip my repeating appointment from happening during some 
           period of time?
         </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
@@ -767,7 +812,10 @@
           feature, but unfortunately <strong class="application"><code>orage</code></strong> does not include that feature.
           The easiest way probably is to end those appointment with end date
           and then after the holiday remove the end date again.
-        </p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2545158"></a><a name="id2545160"></a><p><b>1.4.</b></p></td><td align="left" valign="top"><p>
+        </p><p>
+          <strong class="application"><code>orage</code></strong> has excluded date feature, so you can exclude full days, but
+          only one day at a time. <strong class="application"><code>orage</code></strong> still does not support excluded periods.
+        </p></td></tr><tr class="question" title="1.4."><td align="left" valign="top"><a name="id2890531"></a><a name="id2890533"></a><p><b>1.4.</b></p></td><td align="left" valign="top"><p>
           I have found a bug in <strong class="application"><code>orage</code></strong> or would like to see a new feature. How
           can I inform that to the developers?
         </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
@@ -779,19 +827,24 @@
           to include your full <strong class="application"><code>orage</code></strong> version (preferable the results from
           <span class="command"><strong>orage -v</strong></span> or look the version from the about
           window).
-        </p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2545208"></a><a name="id2545210"></a><p><b>1.5.</b></p></td><td align="left" valign="top"><p>
-          I upgraded to Orage 4.6 from Orage 4.4 and now my old appointments 
-          are missing. Are they permanently lost?
+        </p></td></tr><tr class="question" title="1.5."><td align="left" valign="top"><a name="id2890580"></a><a name="id2890582"></a><p><b>1.5.</b></p></td><td align="left" valign="top"><p>
+          I upgraded to Orage 4.6 or 4.8 from Orage 4.4 and now my old
+          appointments are missing. Are they permanently lost?
         </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
-          <strong class="application"><code>orage</code></strong> 4.6 uses different default location for appointments than
-          the previous version. And there is no automatic upgrade partly
-          because it is safer to leave the old data as it is in case you need
-          revert back. <strong class="application"><code>orage</code></strong> 4.6 appointments are not compatible with older 
-          <strong class="application"><code>orage</code></strong>. You can however copy your old file to the new place or export
-          its contents. You can do that either manually from operating system
-          (make sure <strong class="application"><code>orage</code></strong> is not running) or using the interface menus.
-          Old default location is 
+          Since version 4.6 <strong class="application"><code>orage</code></strong> uses different default location for
+          appointments than the previous version. And there is no automatic
+          upgrade partly because it is safer to leave the old data as it is
+          in case you need revert back. <strong class="application"><code>orage</code></strong> 4.6 appointments are not
+          compatible with older <strong class="application"><code>orage</code></strong>. You can however copy your old file to
+          the new place or export its contents. You can do that either manually
+          from operating system (make sure <strong class="application"><code>orage</code></strong> is not running) or using the
+          interface menus.
+          Old default location (in 4.4) is 
           ~/.config/xfce4/orage/orage.ics
-          and new location is
+          and new location (after 4.6) is
           ~/.local/share/orage/orage.ics
+        </p></td></tr><tr class="question" title="1.6."><td align="left" valign="top"><a name="id2890632"></a><a name="id2890634"></a><p><b>1.6.</b></p></td><td align="left" valign="top"><p>
+          Does <strong class="application"><code>orage</code></strong> support group schedules?
+        </p></td></tr><tr class="answer"><td align="left" valign="top"></td><td align="left" valign="top"><p>
+          No. Not yet at least.
         </p></td></tr></div></div></body></html>
diff --git a/doc/C/orage.xml b/doc/C/orage.xml
index fa9e382..55a36c8 100644
--- a/doc/C/orage.xml
+++ b/doc/C/orage.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?> 
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
           "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY manrevision "1.5"> 
-  <!ENTITY date "January 2009"> 
-  <!ENTITY appversion "4.6.0"> 
+  <!ENTITY manrevision "1.6"> 
+  <!ENTITY date "January 2010"> 
+  <!ENTITY appversion "4.8.0"> 
   <!ENTITY app "<application>orage</application>">
 ]>
 
@@ -14,7 +14,7 @@
 
   <title>Orage</title>
   <copyright>
-    <year>2006-2009</year> <holder>Juha Kautto</holder>
+    <year>2006-2010</year> <holder>Juha Kautto</holder>
   </copyright>
 
 <!-- translators: uncomment this:
@@ -41,18 +41,6 @@
         <address><email>juha at xfce.org</email></address>
       </affiliation>
     </author>
-    <author>
-      <firstname>Mickael</firstname> <surname>Graf</surname>
-      <affiliation>
-        <address><email>korbinus at xfce.org</email></address>
-      </affiliation>
-    </author>
-    <author>
-      <firstname>Benedikt</firstname> <surname>Meurer</surname>
-      <affiliation>
-        <address><email>benny at xfce.org</email></address>
-      </affiliation>
-    </author>
 <!-- This is appropriate place for other contributors: translators,
 maintainers, etc. Commented out by default.
 
@@ -87,6 +75,7 @@ maintainers, etc. Commented out by default.
 
 </articleinfo>
 
+
   <!-- extra space -->
   <para> </para>
   
@@ -102,6 +91,7 @@ maintainers, etc. Commented out by default.
   </para>
 </sect1>
 
+
   <!-- extra space -->
   <para> </para>
   
@@ -109,7 +99,7 @@ maintainers, etc. Commented out by default.
   <title>Getting started</title>
   <para>
     Orage is started by typing &app; on the command line or in the run
-    application window. The command line accepts some optins like -v, which
+    application window. The command line accepts some options like -v, which
     tells the version and -h, which shows short usage help. You can also start
     &app; by clicking on the item &app; in the submenu "Office" from the
     desktop menu. Another handy way of starting &app; is to click button 1 on
@@ -151,6 +141,10 @@ maintainers, etc. Commented out by default.
   </para>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-calendar-window">
   <title>The calendar window</title>
   <figure id="default-calendar-fig">
@@ -179,7 +173,7 @@ maintainers, etc. Commented out by default.
     functions. 
     Below that is a standard calendar showing the month, the year, day names 
     and week numbers. At the bottom there is small window showing active 
-    TODOs and EVENTs on the selected day. (Empty parts are not shown.)
+    TODOs and EVENTs on the selected day.
   </para>
 
   <sect2 id="calendar-menu-bar">
@@ -217,16 +211,16 @@ maintainers, etc. Commented out by default.
         </listitem>
         <listitem>
           Exchange data: creates window where you can do file level operations
-          to Orage data. (1) import and export appointments between
-          Orage and operating system files or 2) rename Orage files or 3) add 
+          to &app; data. (1) import and export appointments between
+          &app; and operating system files or 2) rename &app; files or 3) add 
           and remove foreign calendar files.);
         </listitem>
         <listitem>
-          Close: hide the calendar window but keep Orage running in the 
+          Close: hide the calendar window but keep &app; running in the 
           background;
         </listitem>
         <listitem>
-          Quit: end Orage;
+          Quit: end &app;;
         </listitem>
       </itemizedlist>
     </sect3>
@@ -327,11 +321,12 @@ maintainers, etc. Commented out by default.
       Calendar view presents you one month, which you can change by pressing
       the arrow beside the month name or the year number or using the mouse 
       wheel.
-      Days where you have appointments or where you have ending TODO are
-      marked as bold. One day is always selected and shown with a block.
-      You can change the selected day by single clicking any day number.
-      Double clicking a day number causes event list window for that day to be
-      activated.
+      Days where you have appointments or where you have 
+      <emphasis>Ending</emphasis> TODO are marked as bold. One day is always 
+      selected and shown with a block. You can change the selected day by 
+      single clicking any day number. Double clicking a day number causes 
+      event list window for that day to be activated (or day list if you 
+      changed your preferences).
     </para>
   </sect2>
 
@@ -350,13 +345,18 @@ maintainers, etc. Commented out by default.
   <sect2 id="calendar-events-window">
     <title>The EVENT list</title>
     <para>
-      Below the TODO list you see your events from the selected date.
-      Check the tooltip for more details of the event. Also events can be 
-      edited by double clicking them.
+      Below the TODO list you see your events from the selected date. (Or from
+      several days depending on your settings in the preferences.) Check the
+      tooltip for more details of the event. Also events can be edited by
+      double clicking them.
     </para>
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-eventlist-window">
   <title>The event list window</title>
   <figure id="orage-eventlist-fig">
@@ -443,9 +443,10 @@ maintainers, etc. Commented out by default.
       <listitem>
         Event: the event tab shows all EVENT type appointments happening on 
         this day. It is possible to see more than one day in this tab 
-        by setting "Extra days to show" number to larger than 0. Each number
+        by setting "Extra days to show" number to larger than 0. 
+        (You can change the default 0 in the preferences dialog.) Each number
         shows one more day. (It causes the Time column in the event listing 
-        to show also the date.)
+        to show also the date.) 
       </listitem>
       <listitem>
         Todo: shows your active TODOs similarly than in the main calendar
@@ -473,15 +474,13 @@ maintainers, etc. Commented out by default.
       The list shows all appointments satisfying the conditions and tab type.
       Scrollbars will appear if there are more lines or longer lines than 
       what fits into the window. You can edit any appointment by double 
-      clicking the row. Note that each repeating appointment is shown only 
-      once (=first time) instead of everytime it happens in the specified days.
-      Each line has three fields:
+      clicking the row. Each line has three fields:
     </para>
     <itemizedlist>
       <listitem>
         Time: the starting and ending times of the appointment (the format
         varies depending on tab and appointment). All times are always shown
-        in our local timezone. It is possible to define special whole day
+        in your local timezone. It is possible to define special whole day
         appointments and they have a text "All day" instead of real start and
         end times. Rows appear in start time order.
         +sign in front of the time means that the appointment started on some
@@ -506,7 +505,7 @@ maintainers, etc. Commented out by default.
             (If both visual and sound alarm is defined, S is shown)
           </listitem>
           <listitem>
-            Repeat: how often is that appointment happening.
+            Recurrence: how often is that appointment happening.
             <keycap>n</keycap> means no repeating so that this event only
             happens once. 
             <keycap>D</keycap> means daily repeat,
@@ -552,6 +551,10 @@ maintainers, etc. Commented out by default.
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-daylist-window">
   <title>The day list window</title>
   <figure id="orage-daylist-fig">
@@ -629,12 +632,16 @@ maintainers, etc. Commented out by default.
       the event is taking time (availability=Busy), there is vertical line
       in front of it showing its length. These lines show how full your
       calendar is and makes it easier to find free time quickly. If more than
-      one events starts at the same hour, they all are added to the same row /
-      column after each other and the reservation line is the sum of them.
+      one event starts at the same hour, they all are added to the same row /
+      column after each other and the reservation line is the overlap of them.
     </para>
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-appointment-window">
   <title>The appointment window</title>
   <para>
@@ -859,6 +866,15 @@ maintainers, etc. Commented out by default.
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term>Priority</term>
+        <listitem>
+          <para>
+            Priority of the appointment. &app; is not using this, so treat it
+            just like a comment.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Note</term>
         <listitem>
           <para>
@@ -965,9 +981,9 @@ maintainers, etc. Commented out by default.
             &app; can show two kinds of internal visual alarms. Orage window
             is a small alarm window showing the heading and note text. 
             Notification is more fancy notification using libnotify. You need
-            to have libnotify installed before you can define this kind of
-            visual alarm. <command>orage -v</command> shows if you have
-            libnotify support included.
+            to have libnotify installed before you can define notification 
+            kind of visual alarm. <command>orage -v</command> shows if you
+            have libnotify support included.
           </para>
         </listitem>
       </varlistentry>
@@ -979,17 +995,15 @@ maintainers, etc. Commented out by default.
             operating system command or script. Common use for this is sending
             email.
           </para>
-<!--  fixed now to use system, so this works now 
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Execute</term>
+        <listitem>
           <para>
-            Note that &app; can not handle normal linux redirection. So to send
-            email you can not set command to: 
-            <command>mail -s hi first.last at address < send_this_file.txt
-            </command> because < is not interpreted as redirection of 
-            standard input, but it is normal parameter instead. You need to 
-            write a shell script to do this and give the file name as a 
-            parameter to your script.
+            You can test your alarm by pressing this. It raises the alarms
+            immediately so that you can listen the sounds and see the windows.
           </para>
--->
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1027,11 +1041,11 @@ maintainers, etc. Commented out by default.
       In this tab you can define repeating appointments. Often it makes
       sense that the same appointment happens every day or every month instead
       of creating a new appointment for each event. Note that &app; does not 
-      support exclusions (like you would like to skip holiday period from you
-      work related appointments), so you have to end the whole recurrency
-      and enable it again after it need to resume. &app; also misses the 
-      possibility to modify only one specific event from a recurring set. All
-      changes affect the whole set of appointments.
+      support exclusion day ranges (like you would like to skip holiday period 
+      from you work related appointments), so you have to end the whole 
+      recurrency and enable it again after it need to resume. &app; also 
+      misses the possibility to modify only one specific event from a 
+      recurring set. All changes affect the whole set of appointments.
     </para>
     <variablelist>
       <varlistentry>
@@ -1138,10 +1152,47 @@ maintainers, etc. Commented out by default.
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>Exceptions</term>
+        <listitem>
+          <para>
+            Here is list of exception times. - sign at the end of the row means
+            exclusion where the appointment does not happen even though it was
+            included in the repeat set. + sign means it is extra time to 
+            do the appointment.
+          </para>
+          <para>
+            You can remove the exception by double clicking it in the listing
+            window. You can add new exception by first selecting the type
+            (either excluded or included times) and then double clicking a day
+            in one of the calendars below.
+          </para>
+          <para>
+            (Note that even though excluded time should be date, it can be shown
+            as time in some systems. This is a way to workaround a bug where
+            some calendar backend systems are not able to handle full date
+            exclusions properly.)
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Action dates</term>
+        <listitem>
+          <para>
+            Three small helper calendars, which show when the appointment
+            will happen next. They show real time data, which is not stored
+            in the system until you press save button.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-exchangedata-window">
   <title>The exchange data window</title>
   <para>
@@ -1177,7 +1228,7 @@ maintainers, etc. Commented out by default.
           <para>
             Enter the name of the file which you want to copy into &app;.
             You can do several files in a row by separating names with comma.
-            After you hae the file name in place, press Save and &app; reads
+            After you have the file name in place, press Save and &app; reads
             the contents in. After the file has been imported, those 
             appointmenst are part of &app; and can't be differentiated or
             put back into the file.
@@ -1296,14 +1347,14 @@ maintainers, etc. Commented out by default.
             where they came from. This is mainly meant to be used when you
             need to maintain your calendar also in other than &app;. Sometimes
             it is good idea to mark the file as read only, which prevents
-            you from modifying any of the appoinments in the corresposnding
+            you from modifying any of the appointments in the corresponding
             file. (Orage uses some private ical components, which are not
             necessarily understood by the other system, so updates may cause
             problems for the other tool.)
           </para>
           <para>
             You can also add foreign files from the operating system using
-            command line.
+            command line: <command>orage --add-foreign file</command>
           </para>
         </listitem>
       </varlistentry>
@@ -1311,12 +1362,16 @@ maintainers, etc. Commented out by default.
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-preferences-window">
   <title>The preferences window</title>
   <para>
     The preferences window is used to enter initial values for &app;.
     You can define for example several display options, how old appointments
-    should be archived and what is the play command to be used for playing
+    should be archived and what is the command to be used for playing
     sound alarms and also you can set the local timezone for &app;.
   </para>
 
@@ -1442,6 +1497,31 @@ maintainers, etc. Commented out by default.
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term>Show month and year</term>
+        <listitem>
+          <para>
+            Select whether you want to see month and year controls in 
+            the main calendar window.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Show day names</term>
+        <listitem>
+          <para>
+            Controls day names visibility on top of the calendar window.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Show week numbers</term>
+        <listitem>
+          <para>
+            Controls visibility of week numbers on left of calendar.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Show todo list</term>
         <listitem>
           <para>
@@ -1450,10 +1530,11 @@ maintainers, etc. Commented out by default.
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Show event list</term>
+        <term>Number of days to show in event window</term>
         <listitem>
           <para>
-            You can hide EVENT list in the main calendar by deselecting this.
+            You can hide EVENT list in the main calendar by setting this to
+            zero. Non zero values means the number of days to show events for.
           </para>
         </listitem>
       </varlistentry>
@@ -1494,7 +1575,7 @@ maintainers, etc. Commented out by default.
         <listitem>
           <para>
             Controls if calendar is visible in the systray. A small 
-            window is presented in the systray if this is selected. It is
+            icon is presented in the systray if this is selected. It is
             recommended that you enable this feature. By clicking this icon
             &app; is toggled visible or hidden. If you do not have &app; in
             the systray, you have two other options to make the main calendar
@@ -1543,23 +1624,22 @@ maintainers, etc. Commented out by default.
             and comes visible again (for example by clicking orageclock panel
             plugin). Default value is off, which means that previously
             selected day will remain selected. Crossing this causes
-            current date always being selected.
+            current date instead being selected.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Dynamic icon size</term>
+        <term>Use dynamic tray icon</term>
         <listitem>
           <para>
-            Setting these X and Y sizes to nonzero causes &app; to use dynamic
-            icon in taskbar (if you have taskbar and you have selected to use
-            taskbar in the Display tab). Dynamic icon includes real month day
-            number and also lists &app; in the top and month name at the
-            bottom if those fit in. &app; tries to fit all those three pieces
-            of information in the available icon size using proper fonts, but
-            if there is not enough space, top and bottom texts can be omitted.
-            Finally &app; switches to static icon if not even the number fits
-            into the icon. Good values to test are 32 (like X=32 Y=32).
+            Setting this causes &app; to use dynamic icon in taskbar (if you
+            have taskbar and you have selected to use taskbar in the Display
+            tab).  Note that this icon is used also other places where icon 
+            is used.
+            Dynamic icon includes real month day number and also shows weekday
+            in the top and month name at the bottom. (&app; uses appreviations
+            if real names are too long to fit to the available space.)
+            You can revert back to old static icon by deselecting this. 
           </para>
         </listitem>
       </varlistentry>
@@ -1573,10 +1653,23 @@ maintainers, etc. Commented out by default.
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>Eventlist window</term>
+        <listitem>
+          <para>
+            Define how many days to show in the event list when it starts.
+            (It is possible to change the number in the event list window.)
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </sect2>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-undocumented">
   <title>Undocumented Features</title>
   <para>
@@ -1588,14 +1681,18 @@ maintainers, etc. Commented out by default.
   </para>
   <itemizedlist>
     <listitem>
-      Main Window Position: normally you do not want to change this. It is the
-      location of <link linkend="orage-calendar-window">calendar window</link>
+      Main Window Position (Main window X, Main window Y)
+      and Size (Main window size X, Main window size Y): normally you do
+      not want to change these. It is the location and size of
+      <link linkend="orage-calendar-window">calendar window</link>
       in the screen. &app; updates this automatically, so your setting will be
       overwritten.
     </listitem>
     <listitem>
-      Event Window Size: normally you do not want to change this. It is the
-      size of <link linkend="orage-eventlist-window">event list window</link>
+      Event Window Position (Eventlist window pos X, Eventlist window pos Y)
+      and Size(Eventlist window X, Eventlist window X): normally you do
+      not want to change these. It is the location and size of
+      <link linkend="orage-eventlist-window">event list window</link>
       in the screen. &app; updates this automatically, so your setting will be
       overwritten.
     </listitem>
@@ -1624,19 +1721,25 @@ maintainers, etc. Commented out by default.
       </itemizedlist>
     </listitem>
     <listitem>
-      <para>
-        Ical week start day: Defines what is the first day of week in libical.
-        Note, that 
-        it is <emphasis>only</emphasis> used in weekly repeating
-        appointments. It will <emphasis>not</emphasis> change the
-        calendar view anyway. &app; tries is best to find this setting 
-        automatically, but if your weekly repeating appointments seem to be
-        wrong, you can try to set this. 0 = Monday, 1 = Tuesday...
-      </para>
+      Ical week start day: Defines what is the first day of week in libical.
+      Note, that it is <emphasis>only</emphasis> used in weekly repeating
+      appointments. It will <emphasis>not</emphasis> change the
+      calendar view anyway. &app; tries is best to find this setting 
+      automatically, but if your weekly repeating appointments seem to be
+      wrong, you can try to set this. 0 = Monday, 1 = Tuesday...
+    </listitem>
+    <listitem>
+      Priority list limit: Day view listing only shows appointments, which have
+      priority smaller than this limit. It is adviced to keep it as a high 
+      value or you will not see all your appointments in the day view window.
     </listitem>
   </itemizedlist>
 </sect1>
 
+
+  <!-- extra space -->
+  <para> </para>
+  
 <sect1 id="orage-faq">
   <title>Frequently Asked Questions</title>
   <para>
@@ -1713,6 +1816,10 @@ maintainers, etc. Commented out by default.
           The easiest way probably is to end those appointment with end date
           and then after the holiday remove the end date again.
         </para>
+        <para>
+          &app; has excluded date feature, so you can exclude full days, but
+          only one day at a time. &app; still does not support excluded periods.
+        </para>
       </answer>
     </qandaentry>
     <qandaentry>
@@ -1739,26 +1846,39 @@ maintainers, etc. Commented out by default.
     <qandaentry>
       <question>
         <para>
-          I upgraded to Orage 4.6 from Orage 4.4 and now my old appointments 
-          are missing. Are they permanently lost?
+          I upgraded to Orage 4.6 or 4.8 from Orage 4.4 and now my old
+          appointments are missing. Are they permanently lost?
         </para>
       </question>
       <answer>
         <para>
-          &app; 4.6 uses different default location for appointments than
-          the previous version. And there is no automatic upgrade partly
-          because it is safer to leave the old data as it is in case you need
-          revert back. &app; 4.6 appointments are not compatible with older 
-          &app;. You can however copy your old file to the new place or export
-          its contents. You can do that either manually from operating system
-          (make sure &app; is not running) or using the interface menus.
-          Old default location is 
+          Since version 4.6 &app; uses different default location for
+          appointments than the previous version. And there is no automatic
+          upgrade partly because it is safer to leave the old data as it is
+          in case you need revert back. &app; 4.6 appointments are not
+          compatible with older &app;. You can however copy your old file to
+          the new place or export its contents. You can do that either manually
+          from operating system (make sure &app; is not running) or using the
+          interface menus.
+          Old default location (in 4.4) is 
           ~/.config/xfce4/orage/orage.ics
-          and new location is
+          and new location (after 4.6) is
           ~/.local/share/orage/orage.ics
         </para>
       </answer>
     </qandaentry>
+    <qandaentry>
+      <question>
+        <para>
+          Does &app; support group schedules?
+        </para>
+      </question>
+      <answer>
+        <para>
+          No. Not yet at least.
+        </para>
+      </answer>
+    </qandaentry>
   </qandadiv>
 </sect1>
 <!--
diff --git a/src/event-list.c b/src/event-list.c
index 4fb6426..6f52f4d 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -467,7 +467,7 @@ static void search_data(el_win *el)
     gint i;
 
     search_string = g_utf8_strup(gtk_entry_get_text(
-                (GtkEntry *)el->search_entry),-1);
+                (GtkEntry *)el->search_entry), -1);
     /* first search base orage file */
     if (!xfical_file_open(TRUE))
         return;
@@ -1146,26 +1146,22 @@ static void build_toolbar(el_win *el)
 
 static void build_event_tab(el_win *el)
 {
-    gint row;
-    GtkWidget *label, *hbox;
+    GtkWidget *label;
 
     el->event_tab_label = gtk_label_new(_("Event"));
-    /* FIXME: remove these tables, which are not needed anymore */
+    /* we do not really need table, but it is efficient and easy way to
+       do this. Using hboxes takes actually more memory */
     el->event_notebook_page = orage_table_new(1, BORDER_SIZE);
 
     label = gtk_label_new(_("Extra days to show "));
-    hbox =  gtk_hbox_new(FALSE, 0);
     el->event_spin = gtk_spin_button_new_with_range(0, 999, 1);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(el->event_spin)
             , (gdouble)el->days);
-    gtk_box_pack_start(GTK_BOX(hbox), el->event_spin, FALSE, FALSE, 15);
     orage_table_add_row(el->event_notebook_page
-            , label, hbox
-            , row = 0, (GTK_FILL), (0));
+            , label, el->event_spin, 0, (GTK_FILL), (0));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(el->Notebook)
             , el->event_notebook_page, el->event_tab_label);
-
     g_signal_connect((gpointer)el->event_spin, "value-changed"
             , G_CALLBACK(on_spin_changed), el);
 }
@@ -1173,8 +1169,7 @@ static void build_event_tab(el_win *el)
 static void build_todo_tab(el_win *el)
 {
     el->todo_tab_label = gtk_label_new(_("Todo"));
-    /* FIXME: remove these tables, which are not needed anymore */
-    el->todo_notebook_page = orage_table_new(1, BORDER_SIZE);
+    el->todo_notebook_page = gtk_hbox_new(FALSE, 0);
 
     gtk_notebook_append_page(GTK_NOTEBOOK(el->Notebook)
             , el->todo_notebook_page, el->todo_tab_label);
@@ -1182,28 +1177,22 @@ static void build_todo_tab(el_win *el)
 
 static void build_journal_tab(el_win *el)
 {
-    gint row;
-    GtkWidget *label, *hbox;
+    GtkWidget *label;
     struct tm *tm;
     gchar *sdate;
 
     el->journal_tab_label = gtk_label_new(_("Journal"));
-    /* FIXME: remove these tables, which are not needed anymore */
     el->journal_notebook_page = orage_table_new(1, BORDER_SIZE);
 
     label = gtk_label_new(_("Journal entries starting from:"));
-    hbox =  gtk_hbox_new(FALSE, 0);
     el->journal_start_button = gtk_button_new();
     tm = orage_localtime();
     tm->tm_year -= 1;
     sdate = orage_tm_date_to_i18_date(tm);
     gtk_button_set_label(GTK_BUTTON(el->journal_start_button)
             , (const gchar *)sdate);
-    gtk_box_pack_start(GTK_BOX(hbox), el->journal_start_button
-            , FALSE, FALSE, 15);
     orage_table_add_row(el->journal_notebook_page
-            , label, hbox
-            , row = 0, (GTK_FILL), (0));
+            , label, el->journal_start_button, 0, (GTK_FILL), (0));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(el->Notebook)
             , el->journal_notebook_page, el->journal_tab_label);
@@ -1213,18 +1202,15 @@ static void build_journal_tab(el_win *el)
 
 static void build_search_tab(el_win *el)
 {
-    gint row;
     GtkWidget *label;
 
     el->search_tab_label = gtk_label_new(_("Search"));
-    /* FIXME: remove these tables, which are not needed anymore */
     el->search_notebook_page = orage_table_new(1, BORDER_SIZE);
 
     label = gtk_label_new(_("Search text "));
     el->search_entry = gtk_entry_new();
     orage_table_add_row(el->search_notebook_page
-            , label, el->search_entry
-            , row = 0, (GTK_EXPAND | GTK_FILL), (0));
+            , label, el->search_entry, 0, (GTK_EXPAND | GTK_FILL), (0));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(el->Notebook)
             , el->search_notebook_page, el->search_tab_label);
diff --git a/src/ical-code.c b/src/ical-code.c
index 56bbc94..15f3f61 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -3716,6 +3716,7 @@ static xfical_appt *xfical_appt_get_next_with_string_internal(char *str
              * We only accept SUMMARY, DESCRIPTION and LOCATION ical strings
              * to be valid. */
             /* First we need to find the beginning of our row */
+            /* FIXME: this does not work if description has line changes */
             for (tmp = cur; tmp > beg && *tmp != '\n'; tmp--)
                 ;
             tmp++; /* skip the '\n' */



More information about the Xfce4-commits mailing list