--- doc/answer.1
+++ doc/answer.1
@@ -31,7 +31,7 @@
electronic mail.
.PP
The program will use standard mail addresses or aliases
-included in the standard .elm directory alias files.
+included in the standard .desk/elm directory alias files.
It can also use
its own alias set (usually a subset of the
system aliases, with more fields per user (i.e. unique first
@@ -92,15 +92,15 @@
.SH FILES
#ETC#/elm.rc customized mailer parameters
.br
-$HOME/.elm/elmrc customized mailer parameters
+$HOME/.desk/elm/elmrc customized mailer parameters
.br
-$HOME/.elm/aliases.text individual alias source
+$HOME/.desk/elm/aliases.text individual alias source
.br
-$HOME/.elm/aliases.dir individual alias dbz directory table
+$HOME/.desk/elm/aliases.dir individual alias dbz directory table
.br
-$HOME/.elm/aliases.pag individual alias dbz hash table
+$HOME/.desk/elm/aliases.pag individual alias dbz hash table
.br
-$HOME/.elm/aliases individual alias data table
+$HOME/.desk/elm/aliases individual alias data table
.br
/tmp/snd.$$ edit buffer for outgoing mail
.SH BUG REPORTS TO
--- doc/elmalias.1
+++ doc/elmalias.1
@@ -37,7 +37,7 @@
.P
There are two possible alias databases, a user-specific alias file
(usually in
-.IR $HOME/.elm/aliases )
+.IR $HOME/.desk/elm/aliases )
and a system-wide alias file (usually in
.IR $lib/aliases ).
By default both files are searched, first the user-specific file and
--- doc/elmbindata.1
+++ doc/elmbindata.1
@@ -80,9 +80,9 @@
.br
#ETC#/elm.mimecharsets system charsets file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
-$HOME/.elm/mime.charsets individual charsets file
+$HOME/.desk/elm/mime.charsets individual charsets file
.br
#LIB#/elm.map.bin/bindata.bin Default location for system bindata file
.br
--- doc/elmcharset.1
+++ doc/elmcharset.1
@@ -75,9 +75,9 @@
.br
#ETC#/elm.mimecharsets system charsets file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
-$HOME/.elm/mime.charsets individual charsets file
+$HOME/.desk/elm/mime.charsets individual charsets file
.br
.SH BUG REPORTS TO
Kari Hurtta elm@elmme-mailer.org
--- doc/elmlibregister.1
+++ doc/elmlibregister.1
@@ -25,7 +25,7 @@
.B Elm 2.4ME+
mail system.
Elmlibregister checks that libraries given on use-library on elm.rc
-(or on .elm/elmrc) are loadable.
+(or on .desk/elm/elmrc) are loadable.
Configure asks which libraries should be registered on
on (post-)install time. Elmlibregister command is used to
add these libraries to use-library line on global elm.rc.
@@ -54,13 +54,13 @@
.TP
.B " -I"
Use system RC file (#ETC#/elm.rc) or individual RC file
-($HOME/.elm/elmrc) as target file.
+($HOME/.desk/elm/elmrc) as target file.
.SH AUTHOR
Kari Hurtta
.SH FILES
#ETC#/elm.rc system RC file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
.SH BUG REPORTS TO
Kari Hurtta elm@elmme-mailer.org
--- doc/elmmimetypes.1
+++ doc/elmmimetypes.1
@@ -56,9 +56,9 @@
.br
#ETC#/elm.mimetypes system file name to media type mapping file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
-$HOME/.elm/mime.types individual file name to media type
+$HOME/.desk/elm/mime.types individual file name to media type
mapping file
.br
.SH BUG REPORTS TO
--- doc/elmrc-info
+++ doc/elmrc-info
@@ -326,7 +326,7 @@
set-window-title
# Enables automatic updating of window's tile and incon name when
-# folder is changed. File ~/.elm/terminal.info or global elm.terminalinfo
+# folder is changed. File ~/.desk/elm/terminal.info or global elm.terminalinfo
# must specify chnaging method used for given terminal.
signature
@@ -476,11 +476,11 @@
# When set other that SYSTEM, specifies Character Set to which
# display should be switch if supported by terminal. Character
# Set of terminal is switched back to System Character Set (given
-# on elm.mimecharsets or ~/.elm/mime.charsets file) when running
+# on elm.mimecharsets or ~/.desk/elm/mime.charsets file) when running
# external programs. This switching is done even when option
# allow-charset-switching is not set.
#
-# Needs information from elm.terminalinfo or ~/.elm/terminal.info file.
+# Needs information from elm.terminalinfo or ~/.desk/elm/terminal.info file.
#
# NOTICE that this (or Character Sets provided by locale) must have
# mapping tables available if "text-charset" value is not DISPLAY
@@ -549,7 +549,7 @@
# List of (8-bit) Character Sets, which are byte-to-byte supersets of
# US-ASCII.
#
-# NOTE: That same information can be given on .elm/mime.charsets file with
+# NOTE: That same information can be given on .desk/elm/mime.charsets file with
# ';MIME-subset=US-ASCII' qualifier -- that is preferred method.
#
# In fact this option should never be set explicity.
@@ -560,7 +560,7 @@
# List of 7-bit Character Sets, which are byte-to-byte supersets of
# INVARIANT.
#
-# NOTE: That same information can be given on .elm/mime.charsets file with
+# NOTE: That same information can be given on .desk/elm/mime.charsets file with
# ';MIME-subset=INVARIANT' qualifier -- that is preferred method.
#
# In fact this option should never be set explicity.
@@ -893,7 +893,7 @@
# filename File is read from directory
# given on map-bin-dir directory
# (normally $lib/elm.map.bin)
-# {rc}/filename File is readed from .elm subdirectory
+# {rc}/filename File is readed from .desk/elm subdirectory
# of user's home
# ~/filename File is readed from user's home
# directory
@@ -908,7 +908,7 @@
# filename File is read from directory
# given on map-bin-dir directory
# (normally $lib/elm.map.bin)
-# {rc}/filename File is readed from .elm subdirectory
+# {rc}/filename File is readed from .desk/elm subdirectory
# of user's home
# ~/filename File is readed from user's home
# directory
--- doc/elmrc-write.1
+++ doc/elmrc-write.1
@@ -50,13 +50,13 @@
.TP
.B " -I"
Use system RC file (#ETC#/elm.rc) or individual RC file
-($HOME/.elm/elmrc) as target file.
+($HOME/.desk/elm/elmrc) as target file.
.SH AUTHOR
Kari Hurtta
.SH FILES
#ETC#/elm.rc system RC file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
.SH BUG REPORTS TO
Kari Hurtta elm@elmme-mailer.org
--- doc/elmrc.samp
+++ doc/elmrc.samp
@@ -288,7 +288,7 @@
### pointnew = ON
# Enables automatic updating of window's tile and incon name when
-# folder is changed. File ~/.elm/terminal.info or global elm.terminalinfo
+# folder is changed. File ~/.desk/elm/terminal.info or global elm.terminalinfo
# must specify chnaging method used for given terminal.
### set-window-title = OFF
@@ -436,11 +436,11 @@
# When set other that SYSTEM, specifies Character Set to which
# display should be switch if supported by terminal. Character
# Set of terminal is switched back to System Character Set (given
-# on elm.mimecharsets or ~/.elm/mime.charsets file) when running
+# on elm.mimecharsets or ~/.desk/elm/mime.charsets file) when running
# external programs. This switching is done even when option
# allow-charset-switching is not set.
#
-# Needs information from elm.terminalinfo or ~/.elm/terminal.info file.
+# Needs information from elm.terminalinfo or ~/.desk/elm/terminal.info file.
#
# NOTICE that this (or Character Sets provided by locale) must have
# mapping tables available if "text-charset" value is not DISPLAY
@@ -486,7 +486,7 @@
# List of (8-bit) Character Sets, which are byte-to-byte supersets of
# US-ASCII.
#
-# NOTE: That same information can be given on .elm/mime.charsets file with
+# NOTE: That same information can be given on .desk/elm/mime.charsets file with
# ';MIME-subset=US-ASCII' qualifier -- that is preferred method.
#
# In fact this option should never be set explicity.
@@ -497,7 +497,7 @@
# List of 7-bit Character Sets, which are byte-to-byte supersets of
# INVARIANT.
#
-# NOTE: That same information can be given on .elm/mime.charsets file with
+# NOTE: That same information can be given on .desk/elm/mime.charsets file with
# ';MIME-subset=INVARIANT' qualifier -- that is preferred method.
#
# In fact this option should never be set explicity.
@@ -814,7 +814,7 @@
# filename File is read from directory
# given on map-bin-dir directory
# (normally $lib/elm.map.bin)
-# {rc}/filename File is readed from .elm subdirectory
+# {rc}/filename File is readed from .desk/elm subdirectory
# of user's home
# ~/filename File is readed from user's home
# directory
@@ -829,7 +829,7 @@
# filename File is read from directory
# given on map-bin-dir directory
# (normally $lib/elm.map.bin)
-# {rc}/filename File is readed from .elm subdirectory
+# {rc}/filename File is readed from .desk/elm subdirectory
# of user's home
# ~/filename File is readed from user's home
# directory
--- doc/elmstringconvert.1
+++ doc/elmstringconvert.1
@@ -70,9 +70,9 @@
.br
#ETC#/elm.mimecharsets system charsets file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
-$HOME/.elm/mime.charsets individual charsets file
+$HOME/.desk/elm/mime.charsets individual charsets file
.br
.SH BUG REPORTS TO
Kari Hurtta elm@elmme-mailer.org
--- doc/elmterminal.1
+++ doc/elmterminal.1
@@ -56,9 +56,9 @@
.br
#ETC#/elm.terminalinfo system terminal info file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/..origelm/elmrc individual RC file
.br
-$HOME/.elm/terminal.info individual terminal info file
+$HOME/..origelm/terminal.info individual terminal info file
.br
.SH BUG REPORTS TO
Kari Hurtta elm@elmme-mailer.org
--- doc/elmunidata.1
+++ doc/elmunidata.1
@@ -62,7 +62,7 @@
.SH FILES
#ETC#/elm.rc system RC file
.br
-$HOME/.elm/elmrc individual RC file
+$HOME/.desk/elm/elmrc individual RC file
.br
#LIB#/elm.map.bin/unidata.bin Default location for system unidata file
.br
--- doc/fastmail.1
+++ doc/fastmail.1
@@ -118,7 +118,7 @@
.SH FILES
#ETC#/elm.rc customized mailer parameters
.br
-$HOME/.elm/elmrc customized mailer parameters
+$HOME/.desk/elm/elmrc customized mailer parameters
.br
/usr/lib/sendmail sendmail transport if available
.br
--- doc/frm.1
+++ doc/frm.1
@@ -139,7 +139,7 @@
.br
#ETC#/elm.map.txt/ system character set mapping directory
.br
-$HOME/.elm/elmrc customized mailer parameters
+$HOME/.desk/elm/elmrc customized mailer parameters
.br
$HOME/mime.charsets locale to MIME charsets mapping information
.SH BUG REPORTS TO
--- doc/mime.types
+++ doc/mime.types
@@ -96,22 +96,74 @@
KWD application/vnd.kde.kword
>"PK" 3 4
+odc application/vnd.oasis.opendocument.chart
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.chart
-# these are not registered
-# odt application/vnd.oasis.opendocument.text
-# ott application/vnd.oasis.opendocument.text-template
-# oth application/vnd.oasis.opendocument.text-web
-# odm application/vnd.oasis.opendocument.text-master
-# odg application/vnd.oasis.opendocument.graphics
-# otg application/vnd.oasis.opendocument.graphics-template
-# odp application/vnd.oasis.opendocument.presentation
-# otp application/vnd.oasis.opendocument.presentation-template
-# ods application/vnd.oasis.opendocument.spreadsheet
-# ots application/vnd.oasis.opendocument.spreadsheet-template
-# odc application/vnd.oasis.opendocument.chart
-# odf application/vnd.oasis.opendocument.formula
+otc application/vnd.oasis.opendocument.chart-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.chart-template
+
+odf application/vnd.oasis.opendocument.formula
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.formula
+
+otf application/vnd.oasis.opendocument.formula-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.formula-template
+
+odg application/vnd.oasis.opendocument.graphics
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.graphics
+
+otg application/vnd.oasis.opendocument.graphics-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.graphics-template
+
+odi application/vnd.oasis.opendocument.image
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.image
+
+oti application/vnd.oasis.opendocument.image-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.image-template
+
+odp application/vnd.oasis.opendocument.presentation
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.presentation
+
+otp application/vnd.oasis.opendocument.presentation-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.presentation-temp
+
+ods application/vnd.oasis.opendocument.spreadsheet
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.spreadsheet
+
+ots application/vnd.oasis.opendocument.spreadsheet-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.spreadsheet-templ
+
+odt application/vnd.oasis.opendocument.text
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.text
+
+odm application/vnd.oasis.opendocument.text-master
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.text-master
+
+ott application/vnd.oasis.opendocument.text-template
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.text-template
+
+oth application/vnd.oasis.opendocument.text-web
+>"PK" 3 4
+# 0:PK,30:mimetype,38:vnd.oasis.opendocument.text-web
+
+
+# not registered?
# odb application/vnd.oasis.opendocument.database
-# odi application/vnd.oasis.opendocument.image
+
# these are not registered
# sxw application/vnd.sun.xml.writer
--- doc/newalias.1
+++ doc/newalias.1
@@ -17,10 +17,10 @@
If the program is invoked with the
.I -g
(global) flag, the program updates the system alias files.
-Otherwise, the program looks for a file called \fI$HOME/.elm/aliases.text\fR
-and, upon finding it, creates files \fI$HOME/.elm/aliases.dir\fR,
-\fI$HOME/.elm/aliases.pag\fR and
-\fI$HOME/.elm/aliases\fR for the
+Otherwise, the program looks for a file called \fI$HOME/.desk/elm/aliases.text\fR
+and, upon finding it, creates files \fI$HOME/.desk/elm/aliases.dir\fR,
+\fI$HOME/.desk/elm/aliases.pag\fR and
+\fI$HOME/.desk/elm/aliases\fR for the
.I elm
program.
.PP
@@ -66,13 +66,13 @@
' onto the next page, if you please
.sp 3
.SH FILES
-$HOME/.elm/aliases.text alias source for user
+$HOME/.desk/elm/aliases.text alias source for user
.br
-$HOME/.elm/aliases.dir alias dbz directory for user
+$HOME/.desk/elm/aliases.dir alias dbz directory for user
.br
-$HOME/.elm/aliases.pag alias dbz hash file for user
+$HOME/.desk/elm/aliases.pag alias dbz hash file for user
.br
-$HOME/.elm/aliases alias data file for user
+$HOME/.desk/elm/aliases alias data file for user
.br
#LIB#/aliases.text alias source for system
.br