From 7c7c65d1945af07cdc8c81f847c83c6e94bce628 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Thu, 17 May 2012 16:38:40 +0200
Subject: Document removal of the "-N" command line option

This option was removed in 6b95f7b67dc8e29072fed4e05efa450422661348.
Update the usage message, the man page and the manual accordingly.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
 doc/calcurse.1.txt | 9 ++++-----
 doc/manual.txt     | 8 ++++----
 src/args.c         | 5 +----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/doc/calcurse.1.txt b/doc/calcurse.1.txt
index 4463c03..70049c7 100644
--- a/doc/calcurse.1.txt
+++ b/doc/calcurse.1.txt
@@ -42,7 +42,7 @@ Synopsis
 --------
 
 [verse]
-*calcurse* [*-h*|*-v*] [*-N*] [*-an*] [*-t*[num]] [*-c*<file> | *-D*<dir>]
+*calcurse* [*-h*|*-v*] [*-an*] [*-t*[num]] [*-c*<file> | *-D*<dir>]
          [*-i*<file>] [*-x*[format]] [*-d* <date>|<num>]
          [*-s*[date]] [*-r*[range]] [*-S* <regex>] [*--status*]
 
@@ -143,10 +143,6 @@ appointments can be specified using the *-c* flag.
 'Note:' the calendar from which to read the appointments can be specified using
 the *-c* flag.
 
-*-N*, *--note*::
-  When used with the *-a* or *-t* flag, also print note content if one is
-  associated with the displayed item.
-
 *-r*[num], *--range*[=num]::
   Print events and appointments for the 'num' number of days and exit. If no
   'num' is given, a range of 1 day is considered.
@@ -193,6 +189,9 @@ such as:
 $ calcurse --export > my_data.dat
 ----
 
+'Note:' The *-N* option has been removed in calcurse 3.0.0. See the 'FORMAT
+STRINGS' section on how to print note along with appointments and events.
+
 Format strings
 --------------
 
diff --git a/doc/manual.txt b/doc/manual.txt
index 17b45dd..70e7e4b 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -251,10 +251,6 @@ can be specified using the `-c` flag.
 Note: the calendar from which to read the appointments can be specified using
 the `-c` flag.
 
-`-N, --note`::
-  When used with the `-a` or `-t` flag, also print note content if one is
-  associated with the displayed item.
-
 `-r[num], --range[=num]`::
   Print events and appointments for the num number of days and exit. If no num
   is given, a range of 1 day is considered.
@@ -301,6 +297,10 @@ such as:
 $ calcurse --export > my_data.dat
 ----
 
+NOTE: The `-N` option has been removed in calcurse 3.0.0. See the
+<<basics_format_strings,Format strings>> section on how to print note along
+with appointments and events.
+
 [[basics_format_strings]]
 Format strings
 ^^^^^^^^^^^^^^
diff --git a/src/args.c b/src/args.c
index 1a4b38c..cab1952 100644
--- a/src/args.c
+++ b/src/args.c
@@ -62,7 +62,7 @@ static void
 usage (void)
 {
   const char *arg_usage =
-    _("Usage: calcurse [-g|-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
+    _("Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
       "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
       "                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
       "                [--read-only]\n");
@@ -127,9 +127,6 @@ help_arg (void)
       "	print next appointment within upcoming 24 hours "
       "and exit. Also given\n\tis the remaining time before this "
       "next appointment.\n"
-      "\n  -N, --note\n"
-      "	when used with the '-a' or '-t' flag, also print note content\n"
-      "	if one is associated with the displayed item.\n"
       "\n  -r[num], --range[=num]\n"
       "	print events and appointments for the [num] number of days"
       "\n\tand exit. If no [num] is given, a range of 1 day is considered.\n"
-- 
cgit v1.2.3-54-g00ecf