diff --git a/doc/elinks.1.txt b/doc/elinks.1.txt
index aafb0aea..0866fa49 100644
--- a/doc/elinks.1.txt
+++ b/doc/elinks.1.txt
@@ -22,16 +22,18 @@ external viewers. `mailto:` and `telnet:` are supported via external clients.
ELinks can handle both local files and remote URLs. The main supported remote
URL protocols are 'HTTP', 'HTTPS' (with SSL support compiled in) and 'FTP'.
-Additional protocol support exists for 'finger', 'Gopher', 'SMB' and
-'NNTP'.
+Additional protocol support exists for 'BitTorrent' 'finger', 'Gopher',
+'SMB' and 'NNTP'.
+
+The homepage of 'ELinks' can be found at http://elinks.cz/[], where the ELinks
+manual is also hosted.
OPTIONS
-------
Most options can be set in the user interface or config file, so usually you
-do not need to care about them. Note that this list is by no means complete
-and it is not kept up-to-date. To get complete list of commandline options,
-start 'ELinks' with parameter `--help`.
+do not need to care about them. Note that this list is roughly equivalent to
+the output of running ELinks with the option `--long-help`.
include::option-command.txt[]
@@ -93,14 +95,20 @@ FILES
~/.elinks/cookies::
Cookies file.
+~/.elinks/exmodehist::
+ Exmode history file.
+
~/.elinks/formhist::
Form history file.
+~/.elinks/globhist::
+ History file containing most recently visited URLs.
+
~/.elinks/gotohist::
GoTo URL dialog history file.
-~/.elinks/globhist::
- History file containing most recently visited URLs.
+~/.elinks/hooks.{js,lua,pl,py,rb,scm}::
+ Browser scripting hooks.
~/.elinks/searchhist::
Search history file.
@@ -108,6 +116,16 @@ FILES
~/.elinks/socket::
Internal 'ELinks' socket for communication between its instances.
+~/.mailcap::
+ Mappings of MIME types to external handlers.
+
+~/.mime.types::
+ Mappings of file extensions to MIME types.
+
+Other files that ELinks uses from '~/.elinks/' includes the user defined CSS
+stylesheet. The name of the file can set in the 'document.css.stylesheet'
+option.
+
PLATFORMS
---------
@@ -139,8 +157,6 @@ Patocka mailto:mikulas@artax.karlin.mff.cuni.cz[]. 'ELinks' was written by
Petr Baudis mailto:pasky@ucw.cz[]. See file `AUTHORS` in the source tree for a
list of people contributing to this project.
-The homepage of 'ELinks' can be found at http://elinks.cz/[].
-
This manual page was written by Peter Gervai mailto:grin@tolna.net[], using
excerpts from a (yet?) unknown 'Links' fan for the 'Debian GNU/Linux system'
(but may be used by others). Contributions from Francis A. Holop. Extended,
diff --git a/doc/man/man1/elinks.1.in b/doc/man/man1/elinks.1.in
index ebed7135..7a23b8a2 100644
--- a/doc/man/man1/elinks.1.in
+++ b/doc/man/man1/elinks.1.in
@@ -17,7 +17,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "ELINKS" 1 "The Elinks text-browser" "2006-01-12" "The Elinks text-browser"
+.TH "ELINKS" 1 "The Elinks text-browser" "2006-01-14" "The Elinks text-browser"
.SH NAME
elinks \- lynx-like alternative character mode WWW browser
.SH "SYNOPSIS"
@@ -34,12 +34,15 @@ elinks \- lynx-like alternative character mode WWW browser
Frames are supported\&. You can have different file formats associated with external viewers\&. mailto: and telnet: are supported via external clients\&.
-ELinks can handle both local files and remote URLs\&. The main supported remote URL protocols are \fIHTTP\fR, \fIHTTPS\fR (with SSL support compiled in) and \fIFTP\fR\&. Additional protocol support exists for \fIfinger\fR, \fIGopher\fR, \fISMB\fR and \fINNTP\fR\&.
+ELinks can handle both local files and remote URLs\&. The main supported remote URL protocols are \fIHTTP\fR, \fIHTTPS\fR (with SSL support compiled in) and \fIFTP\fR\&. Additional protocol support exists for \fIBitTorrent\fR \fIfinger\fR, \fIGopher\fR, \fISMB\fR and \fINNTP\fR\&.
+
+
+The homepage of \fIELinks\fR can be found at , where the ELinks manual is also hosted\&.
.SH "OPTIONS"
-Most options can be set in the user interface or config file, so usually you do not need to care about them\&. Note that this list is by no means complete and it is not kept up\-to\-date\&. To get complete list of commandline options, start \fIELinks\fR with parameter \-\-help\&.
+Most options can be set in the user interface or config file, so usually you do not need to care about them\&. Note that this list is roughly equivalent to the output of running ELinks with the option \-\-long\-help\&.
.TP
\-anonymous [0|1] (default: 0)
@@ -259,17 +262,25 @@ Bookmarks file\&.
~/\&.elinks/cookies
Cookies file\&.
+.TP
+~/\&.elinks/exmodehist
+Exmode history file\&.
+
.TP
~/\&.elinks/formhist
Form history file\&.
+.TP
+~/\&.elinks/globhist
+History file containing most recently visited URLs\&.
+
.TP
~/\&.elinks/gotohist
GoTo URL dialog history file\&.
.TP
-~/\&.elinks/globhist
-History file containing most recently visited URLs\&.
+~/\&.elinks/hooks\&.{js,lua,pl,py,pl,scm}
+Browser scripting hooks\&.
.TP
~/\&.elinks/searchhist
@@ -279,6 +290,17 @@ Search history file\&.
~/\&.elinks/socket
Internal \fIELinks\fR socket for communication between its instances\&.
+.TP
+~/\&.mailcap
+Mappings of MIME types to external handlers\&.
+
+.TP
+~/\&.mime\&.types
+Mappings of file extensions to MIME types\&.
+
+
+Other files that ELinks uses from \fI~/\&.elinks/\fR includes the user defined CSS stylesheet\&. The name of the file can set in the \fIdocument\&.css\&.stylesheet\fR option\&.
+
.SH "PLATFORMS"
@@ -300,9 +322,6 @@ Please report any other bugs you find to the either the ELinks mailing list at <
The \fILinks\fR browser \- on which \fIELinks\fR is based \- was written by Mikulas Patocka \&. \fIELinks\fR was written by Petr Baudis \&. See file AUTHORS in the source tree for a list of people contributing to this project\&.
-The homepage of \fIELinks\fR can be found at \&.
-
-
This manual page was written by Peter Gervai , using excerpts from a (yet?) unknown \fILinks\fR fan for the \fIDebian GNU/Linux system\fR (but may be used by others)\&. Contributions from Francis A\&. Holop\&. Extended, clarified and made more up\-to\-date by Petr Baudis \&. Updated by Zas \&. The conversion to Asciidoc and trimming was done by Jonas Fonseca \&.
.SH "SEE ALSO"
diff --git a/src/scripting/guile/core.c b/src/scripting/guile/core.c
index 0878bdab..6c0b839d 100644
--- a/src/scripting/guile/core.c
+++ b/src/scripting/guile/core.c
@@ -16,6 +16,8 @@
#include "util/file.h"
#include "util/string.h"
+#define GUILE_HOOKS_FILENAME "hooks.scm"
+#define GUILE_USERHOOKS_FILENAME "user-hooks.scm"
/*
* Bindings
@@ -52,7 +54,7 @@ init_guile(struct module *module)
/* Remember the current module. */
user_module = scm_current_module();
- path = straconcat(elinks_home, "internal-hooks.scm", NULL);
+ path = straconcat(elinks_home, GUILE_HOOKS_FILENAME, NULL);
if (!path) return;
if (file_can_read(path)) {
@@ -74,7 +76,7 @@ init_guile(struct module *module)
mem_free(path);
- path = straconcat(elinks_home, "user-hooks.scm", NULL);
+ path = straconcat(elinks_home, GUILE_USERHOOKS_FILENAME, NULL);
if (!path) return;
if (file_can_read(path))
scm_c_primitive_load_path(path);