summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/add.txt16
-rw-r--r--doc/config.txt6
-rw-r--r--doc/delete.txt6
-rw-r--r--doc/edit.txt6
-rw-r--r--doc/enote.txt6
-rw-r--r--doc/export.txt4
-rw-r--r--doc/general.txt8
-rw-r--r--doc/goto.txt2
-rw-r--r--doc/import.txt4
-rw-r--r--doc/priority.txt6
-rw-r--r--doc/save.txt2
-rw-r--r--doc/tab.txt4
-rw-r--r--doc/view.txt4
-rw-r--r--doc/vnote.txt4
14 files changed, 39 insertions, 39 deletions
diff --git a/doc/add.txt b/doc/add.txt
index ba3baf5..bce42ee 100644
--- a/doc/add.txt
+++ b/doc/add.txt
@@ -1,20 +1,20 @@
Add
===
-Add an item in either the TODO or Appointment list, depending on which panel is
+Add an item in either the todo or appointment list, depending on which panel is
selected.
-To enter a new item in the TODO list, you will need first to enter the
+To enter a new item in the todo list, you will need first to enter the
description of this new item. Then you will be asked to specify the todo
priority. This priority is represented by a number going from 9 for the lowest
priority, to 1 for the highest one. It is still possible to change the item
priority afterwards, by using the '+' and '-' keys inside the todo panel.
-If the APPOINTMENT panel is selected, you will be able to enter either a new
-appointment or a new all-day long event. To enter a new event, press [ENTER]
+If the appointment panel is selected, you will be able to enter either a new
+appointment or a new all-day long event. To enter a new event, press [ENTER]
instead of the item start time, and just fill in the event description.
-To enter a new appointment to be added in the APPOINTMENT list, you will need
+To enter a new appointment to be added in the appointment list, you will need
to enter successively the time at which the appointment begins, the appointment
length (either by specifying the end time in [hh:mm] or the duration in
[+hh:mm], [+xxdxxhxxm] or [+mm] format), and the description of the event.
@@ -30,8 +30,8 @@ Notes
beginning or ending hour will be replaced by '..' if the event does not begin
or end on the day.
-* If you only press [ENTER] at the APPOINTMENT or TODO event description
- prompt, without any description, no item will be added.
+* If you only press [ENTER] at the description prompt, without any description,
+ no item will be added.
* Do not forget to save the calendar data to retrieve the new event next time
- you launch Calcurse.
+ you launch calcurse.
diff --git a/doc/config.txt b/doc/config.txt
index 3fb459a..d5bace1 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -7,15 +7,15 @@ your key bindings.
The color submenu lets you choose the color theme.
-The layout submenu lets you choose the Calcurse screen layout, in other words
+The layout submenu lets you choose the calcurse screen layout, in other words
where to place the three different panels on the screen.
The general options submenu brings a screen with the different options which
-modifies the way Calcurse interacts with the user.
+modifies the way calcurse interacts with the user.
The notify submenu allows you to change the notify-bar settings.
The keys submenu lets you define your own key bindings.
Do not forget to save the calendar data to retrieve your configuration next
-time you launch Calcurse.
+time you launch calcurse.
diff --git a/doc/delete.txt b/doc/delete.txt
index 7606a0f..ff652e8 100644
--- a/doc/delete.txt
+++ b/doc/delete.txt
@@ -1,10 +1,10 @@
Delete
======
-Delete an element in the TODO or Appointment list.
+Delete an element in the todo or appointment list.
Depending on which panel is selected when you press the delete key, the
-highlighted item of either the TODO or Appointment list will be removed from
+highlighted item of either the todo or appointment list will be removed from
this list.
If the item to be deleted is recurrent, you will be asked if you wish to
@@ -12,4 +12,4 @@ suppress all of the item occurrences or just the one you selected.
If the general option 'confirm_delete' is set to 'YES', then you will be asked
for confirmation before deleting the selected event. Do not forget to save the
-calendar data to retrieve the modifications next time you launch Calcurse.
+calendar data to retrieve the modifications next time you launch calcurse.
diff --git a/doc/edit.txt b/doc/edit.txt
index 24afb3e..4597a36 100644
--- a/doc/edit.txt
+++ b/doc/edit.txt
@@ -3,9 +3,9 @@ Edit Item
Edit the item which is currently selected.
-Depending on the item type (appointment, event, or todo), and if it is repeated
-or not, you will be asked to choose one of the item properties to modify. An
-item property is one of the following: the start time, the end time, the
+Depending on the item type (appointment, event or todo) and item repetition,
+you will be asked to choose one of the item properties to modify. An item
+property is one of the following: the start time, the end time, the
description, or the item repetition.
Once you have chosen the property you want to modify, you will be shown its
diff --git a/doc/enote.txt b/doc/enote.txt
index 73299ff..78fd14b 100644
--- a/doc/enote.txt
+++ b/doc/enote.txt
@@ -1,7 +1,7 @@
EditNote
========
-Attach a note to any type of item, or edit an already existing note. This
+Attach a note to any type of item, or edit an already existing note. This
feature is useful if you do not have enough space to store all of your item
description, or if you would like to add sub-tasks to an already existing todo
item for example.
@@ -19,6 +19,6 @@ edit your note. This editor is chosen the following way:
* If none of the above environment variables is set, then '/usr/bin/vi' will be
used.
-Once the item note is edited and saved, quit your favorite editor. You will
-then go back to Calcurse, and the '>' sign will appear in front of the
+Once the item note is edited and saved, quit your favorite editor. You will
+then go back to calcurse, and the '>' sign will appear in front of the
highlighted item, meaning there is a note attached to it.
diff --git a/doc/export.txt b/doc/export.txt
index 0f6a8c9..2238141 100644
--- a/doc/export.txt
+++ b/doc/export.txt
@@ -5,7 +5,7 @@ Export calcurse data (appointments, events and todos).
This leads to the export submenu, from which you can choose between two
different export formats: 'ical' and 'pcal'. Choosing one of those formats lets
-you export calcurse data to icalendar or pcal format.
+you export calcurse data to iCal or pcal format.
You first need to specify the file to which the data will be exported. By
default, this file is:
@@ -18,4 +18,4 @@ for an ical export, and:
for a pcal export.
-Calcurse data are exported in the following order: events, appointments, todos.
+calcurse data are exported in the following order: events, appointments, todos.
diff --git a/doc/general.txt b/doc/general.txt
index ab5ba86..d2a79d9 100644
--- a/doc/general.txt
+++ b/doc/general.txt
@@ -2,7 +2,7 @@ Generic key bindings
====================
Some of the key bindings apply whatever panel is selected. They are called
-generic key binding.
+generic key bindings.
Here is the list of all the generic key bindings, together with their
corresponding action:
@@ -23,6 +23,6 @@ corresponding action:
'^G' : Goto today -> move to current day
The '^P' and '^N' keys are used to scroll text upward or downward when inside
-specific screens such the help screens for example. They are also used when
-the calendar screen is selected to switch between the available views (monthly
-and weekly calendar views).
+specific screens such the help screens for example. They are also used when the
+calendar screen is selected to switch between the available views (monthly and
+weekly calendar views).
diff --git a/doc/goto.txt b/doc/goto.txt
index b520791..b1c34eb 100644
--- a/doc/goto.txt
+++ b/doc/goto.txt
@@ -6,7 +6,7 @@ Jump to a specific day in the calendar.
Using this command, you do not need to travel to that day using the
displacement keys inside the calendar panel.
-If you hit [ENTER] without specifying any date, Calcurse checks the system
+If you hit [ENTER] without specifying any date, calcurse checks the system
current date and you will be taken to that date.
Notice that you can also specify a global key binding to return to the current
diff --git a/doc/import.txt b/doc/import.txt
index b79d7de..88e63be 100644
--- a/doc/import.txt
+++ b/doc/import.txt
@@ -1,9 +1,9 @@
Import
======
-Import data from an icalendar file.
+Import data from an iCal file.
-You will be asked to enter the file name from which to load ical items. At the
+You will be asked to enter the file name from which to load iCal items. At the
end of the import process, and if the general option 'system_dialogs' is set to
'yes', a report indicating how many items were imported is shown.
diff --git a/doc/priority.txt b/doc/priority.txt
index e2c0534..2476825 100644
--- a/doc/priority.txt
+++ b/doc/priority.txt
@@ -1,11 +1,11 @@
Priority
========
-Change the priority of the currently selected item in the TODO list.
+Change the priority of the currently selected item in the todo list.
Priorities are represented by the number appearing in front of the todo
description. This number goes from 9 for the lowest priority to 1 for the
-highest priority. Todo having higher priorities are placed first (at the top)
-inside the todo panel.
+highest priority. Todo items having higher priorities are placed first (at the
+top) inside the todo panel.
By default, if you want to raise the priority of a todo item, you need to press
'+'. In doing so, the number in front of this item will decrease, meaning its
diff --git a/doc/save.txt b/doc/save.txt
index 12658e8..9c453ba 100644
--- a/doc/save.txt
+++ b/doc/save.txt
@@ -11,5 +11,5 @@ Data are split into four different files which contain :
| ~/.calcurse/todo -> data related to the todo list
\ ~/.calcurse/keys -> user-defined key bindings
-In the config menu, you can choose to save the Calcurse data automatically
+In the config menu, you can choose to save the calcurse data automatically
before quitting.
diff --git a/doc/tab.txt b/doc/tab.txt
index 8637696..348a633 100644
--- a/doc/tab.txt
+++ b/doc/tab.txt
@@ -6,8 +6,8 @@ Switch between panels.
The panel currently in use has its border colorized.
Some actions are possible only if the right panel is selected. For example, if
-you want to add a task in the TODO list, you need first to press the 'TAB' key
-to get the TODO panel selected. Then you can press 'a' to add your item.
+you want to add a task in the todo list, you need first to press the 'TAB' key
+to get the todo panel selected. Then you can press 'a' to add your item.
Notice that at the bottom of the screen the list of possible actions change
while pressing 'TAB', so you always know what action can be performed on the
diff --git a/doc/view.txt b/doc/view.txt
index 1f80db9..c50f028 100644
--- a/doc/view.txt
+++ b/doc/view.txt
@@ -1,12 +1,12 @@
View
====
-View the item you select in either the Todo or Appointment panel.
+View the item you select in either the todo or appointment panel.
This is useful when an event description is longer than the available space to
display it. If that is the case, the description will be shortened and its end
replaced by '...'. To be able to read the entire description, just run the view
command and a popup window will appear, containing the whole event.
-Press any key to close the popup window and go back to the main Calcurse
+Press any key to close the popup window and go back to the main calcurse
screen.
diff --git a/doc/vnote.txt b/doc/vnote.txt
index cb7ba53..2099c48 100644
--- a/doc/vnote.txt
+++ b/doc/vnote.txt
@@ -8,7 +8,7 @@ This command only permits to view the note, not to edit it (to do so, use the
'EditNote' command).
Once you highlighted an item with a note attached to it, and the view note key
-was pressed, you will be driven to an external pager to view that note. The
+was pressed, you will be driven to an external pager to view that note. The
default pager is chosen the following way:
* If the 'PAGER' environment variable is set, then this will be the default
@@ -17,4 +17,4 @@ default pager is chosen the following way:
* If the above environment variable is not set, then '/usr/bin/less' will be
used.
-As for editing a note, quit the pager and you will be driven back to Calcurse.
+As for editing a note, quit the pager and you will be driven back to calcurse.