From be940dc4f93bcc1104293ddb7bee6e3e42a9d8f4 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 17 Feb 2020 20:04:08 -0500 Subject: [PATCH 1/5] balsa --checkmail is not --check-mail parse_options in src/main.c is more authoritative than the manpage. --- balsa.1.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balsa.1.in b/balsa.1.in index 076e98f55..5ba2526b0 100644 --- a/balsa.1.in +++ b/balsa.1.in @@ -41,7 +41,7 @@ When you start Balsa from the command line of an (x)terminal, .SH SYNTAX \fBbalsa \fR[ \fB\ \fR \fB\-\-help \fR] \fR \fR[ \fB\ \fR \fB\-\-version \fR] -\fR \fR[ \fB\-c \fR| \fB\-\-check-mail \fR] +\fR \fR[ \fB\-c \fR| \fB\-\-checkmail \fR] \fR \fR[( \fB\-m \fR| \fB\-\-compose=\fR)\fIemail-address \fR] \fR \fR[( \fB\-a \fR| \fB\-\-attach=\fR)\fIfilename \fR] \fR \fR[( \fB\-o \fR| \fB\-\-open\-mailbox=)\fImailbox\fR[\fI:mailbox\fR]... ] -- GitLab From 9b64653b4d72f1606244a9eee2104715d4de87a0 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 17 Feb 2020 20:11:57 -0500 Subject: [PATCH 2/5] Add --open-inbox and --get-stats to balsa.1 --- balsa.1.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/balsa.1.in b/balsa.1.in index 5ba2526b0..3a7a084af 100644 --- a/balsa.1.in +++ b/balsa.1.in @@ -46,6 +46,8 @@ When you start Balsa from the command line of an (x)terminal, \fR \fR[( \fB\-a \fR| \fB\-\-attach=\fR)\fIfilename \fR] \fR \fR[( \fB\-o \fR| \fB\-\-open\-mailbox=)\fImailbox\fR[\fI:mailbox\fR]... ] \fR \fR[ \fB\-u \fR| \fB\-\-open\-unread\-mailbox \fR] +\fR \fR[ \fB\-u \fR| \fB\-\-open\-inbox \fR] +\fR \fR[ \fB\-u \fR| \fB\-\-get\-stats \fR] \fR \fR[ \fB\-d \fR| \fB\-\-debug\-pop \fR] \fR \fR[ \fB\-D \fR| \fB\-\-debug\-imap \fR] .SH OPTIONS -- GitLab From ba6a89b7aee5405245825854422f85b36249d8d0 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 17 Feb 2020 20:12:14 -0500 Subject: [PATCH 3/5] drop --debug-imap and --debug-pop --debug-pop was removed in d60066c6249ddbc6c7121f611685d96b62789367 and --debug-imap was removed in d964df60bbd85b00269da62b99bf2ce57ae442cc. They should not be documented in the manpage any more. --- balsa.1.in | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/balsa.1.in b/balsa.1.in index 3a7a084af..0222848df 100644 --- a/balsa.1.in +++ b/balsa.1.in @@ -48,8 +48,6 @@ When you start Balsa from the command line of an (x)terminal, \fR \fR[ \fB\-u \fR| \fB\-\-open\-unread\-mailbox \fR] \fR \fR[ \fB\-u \fR| \fB\-\-open\-inbox \fR] \fR \fR[ \fB\-u \fR| \fB\-\-get\-stats \fR] -\fR \fR[ \fB\-d \fR| \fB\-\-debug\-pop \fR] -\fR \fR[ \fB\-D \fR| \fB\-\-debug\-imap \fR] .SH OPTIONS .PP \fB\-? \fR, \fB\-\-help\fR @@ -128,22 +126,6 @@ Example : \fBbalsa -o imap://user@mail.example.com/INBOX\fR Open all mailboxes that may contain unread messages. .RE .PP -\fB\-d \fR, \fB\-\-debug-pop\fR -.RS 7 -Makes Balsa print the POP3 communication to stderr, - including the full text of every message. -.RS 0 -.RE -The former can be useful for debugging POP3 connections. -.RE -.PP -\fB\-D \fR, \fB\-\-debug-imap\fR -.RS 7 -Makes Balsa print the IMAP communication to stderr. -.RS 0 -.RE -This feature is useful for debugging IMAP problems. -.RE .SH WEBSITE Balsa's website is \fI .UR https://pawsa.fedorapeople.org/balsa -- GitLab From 983b19875a43bdb2fd439d706fa9886b5d6a70da Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 17 Feb 2020 20:18:23 -0500 Subject: [PATCH 4/5] correct paths to balsa configuration (Closes: #28) --- balsa.1.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/balsa.1.in b/balsa.1.in index 0222848df..97c912624 100644 --- a/balsa.1.in +++ b/balsa.1.in @@ -161,8 +161,8 @@ See the AUTHORS file included with Balsa, probably at \fB/usr/share/doc/balsa-@VERSION@/AUTHORS \fR. .SH FILES -\fB ~/.gnome2/balsa \fRBalsa's preferences file. -\fB ~/.gnome2_private/balsa \fRBalsa's POP and IMAP passwords file. +\fB ~/.balsa/config \fRBalsa's preferences file. +\fB ~/.balsa/config-private \fRBalsa's POP and IMAP passwords file. \fB /etc/sound/events/balsa.soundlist \fRsystem-wide configuration file .SH SEE ALSO -- GitLab From 2bc7240c109ec3243b644d4e761827604e91b5de Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 17 Feb 2020 20:20:06 -0500 Subject: [PATCH 5/5] update dates in manpage --- balsa.1.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balsa.1.in b/balsa.1.in index 97c912624..8f3f2ce23 100644 --- a/balsa.1.in +++ b/balsa.1.in @@ -184,7 +184,7 @@ Package names given in parenthesis are Debian package names. \fBGNOME \fR(1) - modern desktop environment (package: gnome-bin) .SH COPYRIGHT -(c) 1997-2003 Stuart Parmenter and others, see AUTHORS for a list of people. +(c) 1997-2020 Stuart Parmenter and others, see AUTHORS for a list of people. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -- GitLab