Add .pro.user.* to svn:ignore and remove it in the release target.

[toast/confclerk.git] / data / confclerk.pod

diff --git a/data/confclerk.pod b/data/confclerk.pod
index 8606e2adbe5b0b6b7b473b6f88ae437062f1d334..4704905b4491c4f71bcb518dcfdf5a082e5c3edc 100644 (file)
--- a/data/confclerk.pod
+++ b/data/confclerk.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
 
 =head1 NAME
 

-ConfClerk - offline conference scheduler
+ConfClerk - offline conference schedule application

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 


@@ -12,15 +12,15 @@ B<confclerk>
 
 B<ConfClerk> is an application written in Qt, which makes conference
 schedules available offline.  It displays the conference schedule
 
 B<ConfClerk> is an application written in Qt, which makes conference
 schedules available offline.  It displays the conference schedule

-from various views, support searches on various items (speaker, speech topic,
+from various views, supports searches on various items (speaker, speech topic,

 location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 location, etc.) and enables you to select favorite events and create your own
 schedule.
 

-At the moment B<ConfClerk> is able to import schedules in XML format created by
-the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and
-the CCC.
+At the moment B<ConfClerk> is able to import schedules in XML format created
+by the PentaBarf conference management system (or frab) used by e.g. FOSDEM,
+DebConf, FrOSCon, Grazer Linuxtage, and the CCC.

 
 

-ConfClerk is targetted at mobile devices like the Nokia N810 and N900 but
+ConfClerk is targeted at mobile devices like the Nokia N810 and N900 but

 works on any sytem running Qt.
 
 =head1 OPTIONS
 works on any sytem running Qt.
 
 =head1 OPTIONS


@@ -42,7 +42,7 @@ F<~/.config/Toastfreeware/ConfClerk.conf>
 =item Windows
 
 In the registry (search for the Toastfreeware key, should be at
 =item Windows
 
 In the registry (search for the Toastfreeware key, should be at

-F<HKEY_CURRENT_USER\Software\Toastfreeware\Desafinado>).
+F<HKEY_CURRENT_USER\Software\Toastfreeware\ConfClerk>).

 
 =item Other OS
 
 
 =item Other OS
 


@@ -65,8 +65,9 @@ F<~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite>.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.

-    Copyright (C) 2011, Philipp Spitzer <philipp@toastfreeware.priv.at>
-    Copyright (C) 2011, gregor herrmann <gregor@toastfreeware.priv.at>
+    Copyright (C) 2011-2012, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2011-2012, gregor herrmann <gregor@toastfreeware.priv.at>
+    Copyright (C) 2011-2012, Stefan Strahl <stefan@toastfreeware.priv.at>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -116,4 +117,14 @@ the following notice (as of 2011-06-24):
     GNOME icon theme is distributed under the terms of either
     GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.
 
     GNOME icon theme is distributed under the terms of either
     GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.
 

+=item src/icons/favourite*, src/icons/alarm*, src/icons/collapse*, src/icons/expand*:
+
+    Copyright (C) 2012, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2012, Stefan Strahl <stefan@toastfreeware.priv.at>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+

 =back
 =back