2011-11-02 [mones] 3.7.10cvs69

	* doc/man/claws-mail.1
		fixed hyphens (patch from Debian packaging)
		fixed header to follow man style closely
		documented new option --compose-from-file
		removed INSTALLATION section, doesn't belong to manpage
		added ENVIRONMENT, COPYRIGHT and BUGS sections
		expanded FILES section to include certs and autofaces dirs
		expanded SEE ALSO section to include manual and plugins

diff --git a/ChangeLog b/ChangeLog
index 33325d9b7652eceb2d32a6d1f5849c53e3965a4b..4a7a7bc6c59d7f40552c0808c03298d7d7a2fc6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-02 [mones]     3.7.10cvs69
+
+       * doc/man/claws-mail.1
+               fixed hyphens (patch from Debian packaging)
+               fixed header to follow man style closely 
+               documented new option --compose-from-file
+               removed INSTALLATION section, doesn't belong to manpage
+               added ENVIRONMENT, COPYRIGHT and BUGS sections
+               expanded FILES section to include certs and autofaces dirs
+               expanded SEE ALSO section to include manual and plugins
+
 2011-11-01 [colin]     3.7.10cvs68
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 86d2ca239c19c2114d53643c7de3d6f01b42204c..769a566adefd55470753057028d9c86d727ddc7b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4272,3 +4272,4 @@
 ( cvs diff -u -r 1.94.2.221 -r 1.94.2.222 src/messageview.c;  cvs diff -u -r 1.83.2.176 -r 1.83.2.177 src/mimeview.c;  cvs diff -u -r 1.20.2.33 -r 1.20.2.34 src/mimeview.h;  cvs diff -u -r 1.395.2.435 -r 1.395.2.436 src/summaryview.c;  ) > 3.7.10cvs66.patchset
 ( cvs diff -u -r 1.382.2.591 -r 1.382.2.592 src/compose.c;  cvs diff -u -r 1.115.2.243 -r 1.115.2.244 src/main.c;  cvs diff -u -r 1.36.2.193 -r 1.36.2.194 src/common/utils.c;  cvs diff -u -r 1.9.2.73 -r 1.9.2.74 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/gtk/gtkaspell.h;  ) > 3.7.10cvs67.patchset
 ( cvs diff -u -r 1.36.2.194 -r 1.36.2.195 src/common/utils.c;  ) > 3.7.10cvs68.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 doc/man/claws-mail.1;  ) > 3.7.10cvs69.patchset

diff --git a/configure.ac b/configure.ac
index 60d9cefeb5f390bcd71f3db631242431f6181ff4..2ecfb7df36bc393d3035f2dd17317aec58c9ed4f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
index 8239f0a0d86757c0d456706d97b190beb8a23ab0..0514f2c817678c1d139037bcb274d8b5fa90af73 100644 (file)
--- a/doc/man/claws-mail.1
+++ b/doc/man/claws-mail.1
@@ -1,4 +1,4 @@
-.TH "Claws Mail" "1" "January 09, 2009" "Hiroyuki Yamamoto & the Claws Mail team"
+.TH "CLAWS MAIL" "1" "November 1, 2011" "The Claws Mail team" "User Manuals"
 
 .SH "NAME"
 .LP 
@@ -10,7 +10,7 @@ Claws Mail \- a GTK+ based fast email and news client
 
 .SH "DESCRIPTION"
 .TP 
-Claws Mail is an email client (and news reader) based on GTK+, running on X Window System, and aiming for
+Claws Mail is an email client (and news reader) based on GTK+, running on the X Window System, and aiming for:
 .br 
 * Quick response
 .br 
@@ -95,6 +95,8 @@ This list is not complete.
 .LP 
 \fB \-\-compose\fR [address]
 .br 
+\fB \-\-compose\-from\-file\fR file
+.br 
 \fB \-\-subscribe\fR [uri]
 .br 
 \fB \-\-attach file1 [file2]...\fR
@@ -158,6 +160,12 @@ Default directory for user's configuration files directory
 $HOME/.claws\-mail/addrbook/*
 Addressbook files
 .TP 
+$HOME/.claws\-mail/autofaces/*
+Automatic Faces and X\-Faces files for accounts
+.TP 
+$HOME/.claws\-mail/certs/*
+SSL certificates received from mail servers
+.TP 
 $HOME/.claws\-mail/templates
 User\-defined templates directory
 .TP 
@@ -207,7 +215,7 @@ $HOME/.claws\-mail/messagesearch_history
 User\-specified searches in message bodies
 .TP 
 $HOME/.claws\-mail/quicksearch_history
-User\-specified quick-search list
+User\-specified quick\-search list
 .TP 
 $HOME/.claws\-mail/messagesearch_history
 User\-specified searches in message bodies
@@ -231,6 +239,12 @@ Alternatively you can run it with the following options:
 .TP 
 \fB\-\-compose [address]\fR 
 to open a Compose window
+.TP
+\fB\-\-compose\-from\-file file
+open composition window with data from given file. Use \- as file name
+for reading from standard input. Content format: headers first (To: 
+header required) until an empty line is found, then mail body until
+end of file.
 .TP 
 \fB\-\-subscribe [uri]\fR
 subscribe to the given URI if possible
@@ -240,9 +254,9 @@ open composition window with specified files attached
 .TP 
 \fB\-\-compose\fR "mailto:\fI%t\fR?subject=\fI%s\fR&cc=\fI%c\fR&body=\fI%b\fR"
 this syntax can be used in web\-browsers and CLI to open a pre\-populated Compose window.
-Possible fields after the destination recipient are: subject, from, cc, bcc, in-reply-to,
+Possible fields after the destination recipient are: subject, from, cc, bcc, in\-reply\-to,
 body, insert (insert a file in body part, needs an absolute path), attach (attach a file,
-needs an absolute path, see also: --attach)
+needs an absolute path, see also: \-\-attach)
 .TP 
 \fB\-\-receive\fR
 receive new messages
@@ -270,13 +284,13 @@ show the total number of messages per folder
 [new][unread][unread answers to marked][total]
 .TP 
 \fB\-\-select [#mh/mailbox/]folder[/msg|/msgid]\fR
-On startup, jumps to the specified folder/message
+on startup, jumps to the specified folder/message
 .TP 
 \fB\-\-online\fR
-Start claws\-mail in (or switch to, if already running) online mode
+start Claws Mail in (or switch to, if already running) online mode
 .TP 
 \fB\-\-offline\fR
-Start claws\-mail in (or switch to, if already running) offline mode
+start Claws Mail in (or switch to, if already running) offline mode
 .TP 
 \fB\-\-help\fR
 display the help message and exit
@@ -290,8 +304,8 @@ for debug mode
 \fB\-\-version\fR
 display version number and exit
 .TP 
-\fB\-\-version-full\fR
-display version number and compiled-in features then exit
+\fB\-\-version\-full\fR
+display version number and compiled\-in features then exit
 .TP 
 \fB\-\-config\-dir\fR
 display the CONFIG\-DIR and exit
@@ -299,27 +313,65 @@ display the CONFIG\-DIR and exit
 \fB\-\-alternate\-config\-dir [dir]\fR
 start Claws Mail with the configuration stored in [dir] directory
 
-.SH "INSTALLATION"
-.LP 
-This program requires GTK+ 2.6.x or higher to be compiled.
-.LP 
-Please make sure that gtk\-devel and glib\-devel (or similar) packages are
-installed before the compilation (you may also require flex (lex) and bison
-(yacc)).
-.LP 
-To compile and install, just type:
-.LP 
-% ./configure
-.br 
-% make
-.br 
-% su
-.br 
-Password: [Enter password]
-.br 
-# make install
-.LP 
-Refer to ./configure \-\-help for further information.
+.SH "ENVIRONMENT"
+.LP
+.TP
+\fBLC_ALL\fR
+.TP
+\fBLC_CTYPE\fR
+.TP
+\fBLANG\fR
+locale to use for non-win32 systems (the first one not empty is used)
+.TP
+\fBSSL_CERT_FILE\fR
+use this CA certificates file instead of searching known system files
+.TP
+\fBSSL_CERT_DIR\fR
+use this CA certificates directory instead known system directories
+.TP
+\fBPOSIXLY_CORRECT\fR
+if defined regular expressions matching follows POSIX standards
+.TP
+\fBHOME\fR
+full path of the user's home directory
+.TP
+\fBCLAWS_NO_CRASH\fR
+if defined disables crash dialog (only if Claws Mail has been built with
+crash dialog feature enabled)
+.TP
+\fBG_BROKEN_FILENAMES\fR
+assumes that filenames are in the locale encoding rather than in UTF-8
+.TP
+\fBPILOT_CHARSET\fR
+if defined overrides default J-Pilot charset (CP1252)
+.TP
+\fBSESSION_MANAGER\fR
+if defined tries to use the Session Manager (only if Claws Mail has been
+built with libSM feature enabled)
+.TP
+\fBDISPLAY\fR
+default host and display number to use
+.TP
+\fBGPG_AGENT_INFO\fR
+the information to access the GPG agent if using GPG agent is enabled in
+GPG plugin preferences (this is usually set by the agent when launched,
+otherwise it likely means the GPG agent is not running)
+.TP
+\fBSHELL\fR
+if defined overrides default shell "sh" used by Spamassassin plugin to
+launch spamc wrappers
+
+.SH "BUGS"
+.LP
+.TP
+You can search for existing bugs and report new ones on Claws Mail bugzilla:
+.br
+<http://www.thewildbeast.co.uk/claws-mail/bugzilla/>
+
+.SH "COPYRIGHT"
+.LP
+.TP
+1999-2011 Hiroyuki Yamamoto and the Claws Mail team
 
 .SH "AUTHORS"
 .LP 
@@ -380,3 +432,10 @@ Hiroyuki Yamamoto
 .TP 
 Claws Mail Homepage
 <http://www.claws\-mail.org>
+.TP
+Claws Mail online manual
+<http://www.claws\-mail.org/manual>
+.TP
+Claws Mail plugins
+<http://www.claws\-mail.org/plugins.php>
+