1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-12 23:10:51 +00:00

Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

	NEWS (merged)
	configure.in (merged)
	doc/man/man1/elinks.1.in (regenerated)
	doc/man/man5/elinks.conf.5 (regenerated)
	doc/man/man5/elinkskeys.5 (regenerated)
	po/fr.po (kept 0.13.GIT version)
	po/pl.po (kept 0.13.GIT version)
This commit is contained in:
Kalle Olavi Niemitalo 2008-09-27 16:28:28 +03:00 committed by Kalle Olavi Niemitalo
commit b40736cafe
22 changed files with 1962 additions and 1609 deletions

19
NEWS
View File

@ -59,11 +59,11 @@ have already been considered.
(mostly reverted)
//////////////////////////////////////////////////////////////////////
ELinks 0.12pre1.GIT now:
------------------------
ELinks 0.12pre2:
----------------
To be released as 0.12pre2, 0.12rc1, or even 0.12.0. This branch also
includes the changes listed under "ELinks 0.11.4.GIT now" below.
Released on 2008-09-21. This release also included the changes listed
under "ELinks 0.11.5" below.
* bug 954, enhancement 952: Keep track of ECMAScript form and input
objects instead of constructing new ones on every access. When the
@ -84,6 +84,8 @@ includes the changes listed under "ELinks 0.11.4.GIT now" below.
SSL errors especially in HTTP POST requests using GnuTLS.
* bugs 1007, 1041: Display unrecognized lines in FTP directory
listings, instead of annoying the user with error messages.
* Hurd bug 22861: Work around select() falsely reporting exceptions
in pipes.
* minor bug 951: SpiderMonkey scripting objects used to prevent ELinks
from removing files from the memory cache.
* build bug 1044: Check whether -rdynamic works with libraries.
@ -110,6 +112,9 @@ Bugs that should be removed from NEWS before the 0.12.0 release:
* Global ECMAScript functions alert, open, and setTimeout again work
with SEE. ELinks 0.12pre1 was the first release that supported SEE
at all.
* build bug 1045: Fix ``void function cannot return value'' in
never_for_this_site() of src/formhist/formhist.c. ELinks 0.12pre1
was the first release that had this bug.
ELinks 0.12pre1:
----------------
@ -268,10 +273,10 @@ Changes in the experimental SGML/DOM implementation:
* enhancement: incremental parsing
* and more.
ELinks 0.11.4.GIT now:
----------------------
ELinks 0.11.5:
--------------
To be released as 0.11.5.
Released on 2008-09-21.
* critical bug 1027 in user SMJS: make elinks.keymaps treat null and
"none" as equivalent actions, avoiding a segfault

View File

@ -795,7 +795,7 @@ fi
# ===================================================================
enable_python="no";
AC_ARG_WITH(python, [ --with-python=[DIR] enable Python support],
AC_ARG_WITH(python, [[ --with-python[=DIR] enable Python support]],
[ if test "x$withval" != xno; then enable_python=yes; fi ])
EL_SAVE_FLAGS
@ -946,7 +946,7 @@ enable_gnutls=""
AC_ARG_WITH(gnutls, [ --without-gnutls disable GNUTLS SSL support],
[if test "$with_gnutls" = no; then disable_gnutls=yes; fi])
AC_ARG_WITH(gnutls, [ --with-gnutls[=DIR] enable GNUTLS SSL support],
AC_ARG_WITH(gnutls, [[ --with-gnutls[=DIR] enable GNUTLS SSL support]],
[if test "$with_gnutls" != no; then enable_gnutls=yes; fi])
gnutls_withval="$withval"
@ -956,7 +956,7 @@ fi
AC_ARG_WITH(openssl, [ --without-openssl disable OpenSSL support],
[if test "$with_openssl" = no; then disable_openssl=yes; fi])
AC_ARG_WITH(openssl, [ --with-openssl[=DIR] enable OpenSSL support (default)])
AC_ARG_WITH(openssl, [[ --with-openssl[=DIR] enable OpenSSL support (default)]])
openssl_withval="$withval"
# ---- OpenSSL

View File

@ -31,40 +31,41 @@ To make use of many of ELinks features you will need to have some external
libraries and utility programs installed on your system. It is recommended to
have the following libraries and programs installed:
`-----------------------`----------------------------------------------------
Dependency Description
-----------------------------------------------------------------------------
Lua or Guile Makes it possible to write scripting plugins. \
[separator="|"]
`_______________________`____________________________________________________
Dependency |Description
_____________________________________________________________________________
Lua or Guile |Makes it possible to write scripting plugins. \
ifdef::installation-webpage[]
See link:manual.html#lua-scripting[the Elinks - Lua interface] \
See link:manual.html#lua-scripting[the Elinks - Lua interface] \
endif::installation-webpage[]
ifndef::installation-webpage[]
See <<lua-scripting,the Elinks - Lua interface>> \
See <<lua-scripting,the Elinks - Lua interface>> \
endif::installation-webpage[]
for more info.
zlib 1.2.0.2 or later For handling gzip or deflate compressed documents \
both locally and sent from server.
bzip2 Likewise, for bzip2 compressed documents.
LZMA Utils Likewise, for LZMA compressed documents. \
Version 4.32.5 should work.
OpenSSL or GNU TLS For handling secure HTTP browsing.
GPM 'General Purpose Mouse' for mouse support.
expat 'XML Parser Toolkit' needed for XBEL support.
smbclient Program needed for smb:// protocol support.
rxvt-unicode For terminal emulator which supports 88 colors.
xterm with 256 colors Program atleast patch level 179 or rxvt program \
from version 2.7.9 for support of 256 colors. \
Newer PuTTY also has 256 color support.
libidn For internationalized domain names.
SpiderMonkey Mozilla's JavaScript engine for getting \
JavaScript/ECMAScript support in ELinks. \
for more info.
zlib 1.2.0.2 or later |For handling gzip or deflate compressed documents \
both locally and sent from server.
bzip2 |Likewise, for bzip2 compressed documents.
LZMA Utils |Likewise, for LZMA compressed documents. \
Version 4.32.5 should work.
OpenSSL or GNU TLS |For handling secure HTTP browsing.
GPM |'General Purpose Mouse' for mouse support.
expat |'XML Parser Toolkit' needed for XBEL support.
libsmbclient |Library needed for smb:// protocol support.
rxvt-unicode |For terminal emulator which supports 88 colors.
xterm with 256 colors |Program atleast patch level 179 or rxvt program \
from version 2.7.9 for support of 256 colors. \
Newer PuTTY also has 256 color support.
libidn |For internationalized domain names.
SpiderMonkey |Mozilla's JavaScript engine for getting \
JavaScript/ECMAScript support in ELinks. \
ifdef::installation-webpage[]
See also link:manual.html#ecmascript[notes on ECMAScript support].
See also link:manual.html#ecmascript[notes on ECMAScript support].
endif::installation-webpage[]
ifndef::installation-webpage[]
See also <<ecmascript,notes on ECMAScript support>>.
See also <<ecmascript,notes on ECMAScript support>>.
endif::installation-webpage[]
-----------------------------------------------------------------------------
_____________________________________________________________________________
When compiling, you also need the header files for the libraries. Most OS
distributors put a given library's headers in a package separate from the

View File

@ -1,50 +1,49 @@
.\" Title: elinks
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
.\" Date: 06/08/2008
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: 09/27/2008
.\" Manual: The Elinks text-browser
.\" Source: ELinks 0.13.GIT
.\"
.TH "ELINKS" "1" "06/08/2008" "ELinks 0.13.GIT" "The Elinks text\-browser"
.TH "ELINKS" "1" "09/27/2008" "ELinks 0\&.13\&.GIT" "The Elinks text\-browser"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
elinks \- lynx\-like alternative character mode WWW browser
elinks \- lynx-like alternative character mode WWW browser
.SH "SYNOPSIS"
\fIelinks\fR [OPTION]\&... [URL]\&...
.sp
.SH "DESCRIPTION"
\fIELinks\fR is a text mode WWW browser, supporting colors, table rendering, background downloading, menu driven configuration interface, tabbed browsing and slim code.
\fIELinks\fR is a text mode WWW browser, supporting colors, table rendering, background downloading, menu driven configuration interface, tabbed browsing and slim code\&.
.sp
Frames are supported. You can have different file formats associated with external viewers. mailto: and telnet: are supported via external clients.
Frames are supported\&. You can have different file formats associated with external viewers\&. mailto: and telnet: are supported via external clients\&.
.sp
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.
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\&.
.sp
The homepage of \fIELinks\fR can be found at <http://elinks.cz/>, where the ELinks manual is also hosted.
The homepage of \fIELinks\fR can be found at <http://elinks\&.cz/>, where the ELinks manual is also hosted\&.
.sp
.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 roughly equivalent to the output of running ELinks with the option \-\-long\-help.
.sp
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\&.
.PP
\fB\-anonymous\fR \fI[0|1]\fR (default: 0)
.RS 4
Restricts
ELinks
so it can run on an anonymous account. Local file browsing, downloads, and modification of options will be disabled. Execution of viewers is allowed, but entries in the association table can't be added or modified.
so it can run on an anonymous account\&. Local file browsing, downloads, and modification of options will be disabled\&. Execution of viewers is allowed, but entries in the association table can\'t be added or modified\&.
.RE
.PP
\fB\-auto\-submit\fR \fI[0|1]\fR (default: 0)
.RS 4
Automatically submit the first form in the given URLs.
Automatically submit the first form in the given URLs\&.
.RE
.PP
\fB\-base\-session\fR \fI<num>\fR (default: 0)
.RS 4
Used internally when opening
ELinks
instances in new windows. The ID maps to information that will be used when creating the new instance. You don't want to use it.
instances in new windows\&. The ID maps to information that will be used when creating the new instance\&. You don\'t want to use it\&.
.RE
.PP
\fB\-config\-dir\fR \fI<str>\fR (default: "")
@ -52,126 +51,126 @@ instances in new windows. The ID maps to information that will be used when crea
Path of the directory
ELinks
will read and write its config and runtime state files to instead of
\fI~/.elinks\fR. If the path does not begin with a '/' it is assumed to be relative to your
\fI~/\&.elinks\fR\&. If the path does not begin with a \'/\' it is assumed to be relative to your
\fBHOME\fR
directory.
directory\&.
.RE
.PP
\fB\-config\-dump\fR
.RS 4
Print a configuration file with options set to the built\-in defaults to stdout.
Print a configuration file with options set to the built\-in defaults to stdout\&.
.RE
.PP
\fB\-config\-file\fR \fI<str>\fR (default: "elinks.conf")
\fB\-config\-file\fR \fI<str>\fR (default: "elinks\&.conf")
.RS 4
Name of the configuration file that all configuration options will be read from and written to. It should be relative to
config\-dir.
Name of the configuration file that all configuration options will be read from and written to\&. It should be relative to
config\-dir\&.
.RE
.PP
\fB\-config\-help\fR
.RS 4
Print help for configuration options and exit.
Print help for configuration options and exit\&.
.RE
.PP
\fB\-default\-mime\-type\fR (alias for mime.default_type)
\fB\-default\-mime\-type\fR (alias for mime\&.default_type)
.RS 4
The default MIME type used for documents of unknown type.
The default MIME type used for documents of unknown type\&.
.RE
.PP
\fB\-default\-keys\fR \fI[0|1]\fR (default: 0)
.RS 4
When set, all keybindings from configuration files will be ignored. It forces use of default keybindings and will reset user\-defined ones on save.
When set, all keybindings from configuration files will be ignored\&. It forces use of default keybindings and will reset user\-defined ones on save\&.
.RE
.PP
\fB\-dump\fR \fI[0|1]\fR (default: 0)
.RS 4
Print formatted plain\-text versions of given URLs to stdout.
Print formatted plain\-text versions of given URLs to stdout\&.
.RE
.PP
\fB\-dump\-charset\fR (alias for document.dump.codepage)
\fB\-dump\-charset\fR (alias for document\&.dump\&.codepage)
.RS 4
Codepage used when formatting dump output.
Codepage used when formatting dump output\&.
.RE
.PP
\fB\-dump\-color\-mode\fR (alias for document.dump.color_mode)
\fB\-dump\-color\-mode\fR (alias for document\&.dump\&.color_mode)
.RS 4
Color mode used with
\-dump.
\-dump\&.
.RE
.PP
\fB\-dump\-width\fR (alias for document.dump.width)
\fB\-dump\-width\fR (alias for document\&.dump\&.width)
.RS 4
Width of the dump output.
Width of the dump output\&.
.RE
.PP
\fB\-eval\fR
.RS 4
Specify configuration file directives on the command\-line which will be evaluated after all configuration files has been read. Example usage:
\fB\-eval 'set protocol.file.allow_special_files = 1'\fR
Specify configuration file directives on the command\-line which will be evaluated after all configuration files has been read\&. Example usage:
\fB\-eval \'set protocol\&.file\&.allow_special_files = 1\'\fR
.RE
.PP
\fB\-force\-html\fR
.RS 4
Makes
ELinks
assume documents of unknown types are HTML. Useful when using
assume documents of unknown types are HTML\&. Useful when using
ELinks
as an external viewer from MUAs. This is equivalent to
\fB\-default\-mime\-type\fR\fB text/html\fR.
as an external viewer from MUAs\&. This is equivalent to
\fB\-default\-mime\-type\fR\fB text/html\fR\&.
.RE
.PP
\fB\-?\fR, \fB\-h\fR, \fB\-help\fR
.RS 4
Print usage help and exit.
Print usage help and exit\&.
.RE
.PP
\fB\-localhost\fR \fI[0|1]\fR (default: 0)
.RS 4
Restricts
ELinks
to work offline and only connect to servers with local addresses (ie. 127.0.0.1). No connections to remote servers will be permitted.
to work offline and only connect to servers with local addresses (ie\&. 127\&.0\&.0\&.1)\&. No connections to remote servers will be permitted\&.
.RE
.PP
\fB\-long\-help\fR
.RS 4
Print detailed usage help and exit.
Print detailed usage help and exit\&.
.RE
.PP
\fB\-lookup\fR
.RS 4
Look up specified host and print all DNS resolved IP addresses.
Look up specified host and print all DNS resolved IP addresses\&.
.RE
.PP
\fB\-no\-connect\fR \fI[0|1]\fR (default: 0)
.RS 4
Run
ELinks
as a separate instance instead of connecting to an existing instance. Note that normally no runtime state files (bookmarks, history, etc.) are written to the disk when this option is used. See also
\-touch\-files.
as a separate instance instead of connecting to an existing instance\&. Note that normally no runtime state files (bookmarks, history, etc\&.) are written to the disk when this option is used\&. See also
\-touch\-files\&.
.RE
.PP
\fB\-no\-home\fR \fI[0|1]\fR (default: 0)
.RS 4
Disables creation and use of files in the user specific home configuration directory (\fI~/.elinks\fR). It forces default configuration values to be used and disables saving of runtime state files.
Disables creation and use of files in the user specific home configuration directory (\fI~/\&.elinks\fR)\&. It forces default configuration values to be used and disables saving of runtime state files\&.
.RE
.PP
\fB\-no\-numbering\fR (alias for document.dump.numbering)
\fB\-no\-numbering\fR (alias for document\&.dump\&.numbering)
.RS 4
Prevents printing of link number in dump output. Note that this really affects only
\-dump, nothing else.
Prevents printing of link number in dump output\&. Note that this really affects only
\-dump, nothing else\&.
.RE
.PP
\fB\-no\-references\fR (alias for document.dump.references)
\fB\-no\-references\fR (alias for document\&.dump\&.references)
.RS 4
Prevents printing of references (URIs) of document links in dump output. Note that this really affects only
\-dump, nothing else.
Prevents printing of references (URIs) of document links in dump output\&. Note that this really affects only
\-dump, nothing else\&.
.RE
.PP
\fB\-remote\fR
.RS 4
Control a remote
ELinks
instance by passing commands to it. The option takes an additional argument containing the method which should be invoked and any parameters that should be passed to it. For ease of use, the additional method argument can be omitted in which case any URL arguments will be opened in new tabs in the remote instance. Following is a list of the supported methods:
instance by passing commands to it\&. The option takes an additional argument containing the method which should be invoked and any parameters that should be passed to it\&. For ease of use, the additional method argument can be omitted in which case any URL arguments will be opened in new tabs in the remote instance\&. Following is a list of the supported methods:
.sp
.RS 4
\h'-04'\(bu\h'+03'\fBping()\fR: look for a remote instance
@ -210,34 +209,34 @@ instance by passing commands to it. The option takes an additional argument cont
.RS 4
ID of session ring this
ELinks
session should connect to.
session should connect to\&.
ELinks
works in so\-called session rings, whereby all instances of
ELinks
are interconnected and share state (cache, bookmarks, cookies, and so on). By default, all
are interconnected and share state (cache, bookmarks, cookies, and so on)\&. By default, all
ELinks
instances connect to session ring 0. You can change that behaviour with this switch and form as many session rings as you want. Obviously, if the session\-ring with this number doesn't exist yet, it's created and this
instances connect to session ring 0\&. You can change that behaviour with this switch and form as many session rings as you want\&. Obviously, if the session\-ring with this number doesn\'t exist yet, it\'s created and this
ELinks
instance will become the master instance (that usually doesn't matter for you as a user much). Note that you usually don't want to use this unless you're a developer and you want to do some testing \- if you want the
instance will become the master instance (that usually doesn\'t matter for you as a user much)\&. Note that you usually don\'t want to use this unless you\'re a developer and you want to do some testing \- if you want the
ELinks
instances each running standalone, rather use the
\-no\-connect
command\-line option. Also note that normally no runtime state files are written to the disk when this option is used. See also
\-touch\-files.
command\-line option\&. Also note that normally no runtime state files are written to the disk when this option is used\&. See also
\-touch\-files\&.
.RE
.PP
\fB\-source\fR \fI[0|1]\fR (default: 0)
.RS 4
Print given URLs in source form to stdout.
Print given URLs in source form to stdout\&.
.RE
.PP
\fB\-touch\-files\fR \fI[0|1]\fR (default: 0)
.RS 4
When enabled, runtime state files (bookmarks, history, etc.) are written to disk, even when
When enabled, runtime state files (bookmarks, history, etc\&.) are written to disk, even when
\-no\-connect
or
\-session\-ring
is used. The option has no effect if not used in conjunction with any of these options.
is used\&. The option has no effect if not used in conjunction with any of these options\&.
.RE
.PP
\fB\-verbose\fR \fI<num>\fR (default: 1)
@ -261,26 +260,26 @@ The verbose level controls what messages are shown at start up and while running
.RS 4
Print
ELinks
version information and exit.
version information and exit\&.
.RE
Generated using output from ELinks version 0.13.GIT.
Generated using output from ELinks version 0\&.13\&.GIT\&.
.sp
.SH "ENVIRONMENT VARIABLES"
.PP
COMSPEC, SHELL
.RS 4
The shell used for File \-> OS Shell on DOS/Windows and UNIX, respectively.
The shell used for File \-> OS Shell on DOS/Windows and UNIX, respectively\&.
.RE
.PP
EDITOR
.RS 4
The program to use for external editor (when editing textareas).
The program to use for external editor (when editing textareas)\&.
.RE
.PP
ELINKS_CONFDIR
.RS 4
The location of the directory containing configuration files. If not set the default is
~/.elinks/.
The location of the directory containing configuration files\&. If not set the default is
~/\&.elinks/\&.
.RE
.PP
ELINKS_TWTERM, LINKS_TWTERM
@ -288,7 +287,7 @@ ELINKS_TWTERM, LINKS_TWTERM
The command to run when selecting File \-> New window and if
TWDISPLAY
is defined (default
twterm \-e).
twterm \-e)\&.
.RE
.PP
ELINKS_XTERM, LINKS_XTERM
@ -296,110 +295,109 @@ ELINKS_XTERM, LINKS_XTERM
The command to run when selecting File \-> New window and if
DISPLAY
is defined (default
xterm \-e).
xterm \-e)\&.
.RE
.PP
FTP_PROXY, HTTP_PROXY, HTTPS_PROXY
.RS 4
The host to proxy the various protocol traffic through.
The host to proxy the various protocol traffic through\&.
.RE
.PP
NO_PROXY
.RS 4
A comma separated list of URLs which should not be proxied.
A comma separated list of URLs which should not be proxied\&.
.RE
.PP
HOME
.RS 4
The path to the users home directory. Used when expanding
~/.
The path to the users home directory\&. Used when expanding
~/\&.
.RE
.PP
WWW_HOME
.RS 4
Homepage location (as in
\fBlynx\fR(1)).
\fBlynx\fR(1))\&.
.RE
.SH "FILES"
Configuration files controlled by ELinks are located in the user configuration directory, defaulting to \fI~/.elinks/\fR. In addition to the files listed below, a user defined CSS stylesheet can be defined using the \fIdocument.css.stylesheet\fR option.
.sp
Configuration files controlled by ELinks are located in the user configuration directory, defaulting to \fI~/\&.elinks/\fR\&. In addition to the files listed below, a user defined CSS stylesheet can be defined using the \fIdocument\&.css\&.stylesheet\fR option\&.
.PP
@sysconfdir@/elinks.conf
@sysconfdir@/elinks\&.conf
.RS 4
Site\-wide configuration file.
Site\-wide configuration file\&.
.RE
.PP
~/.elinks/elinks.conf
~/\&.elinks/elinks\&.conf
.RS 4
Per\-user config file, loaded after site\-wide configuration.
Per\-user config file, loaded after site\-wide configuration\&.
.RE
.PP
~/.elinks/bookmarks
~/\&.elinks/bookmarks
.RS 4
Bookmarks file.
Bookmarks file\&.
.RE
.PP
~/.elinks/cookies
~/\&.elinks/cookies
.RS 4
Cookies file.
Cookies file\&.
.RE
.PP
~/.elinks/exmodehist
~/\&.elinks/exmodehist
.RS 4
Exmode history file.
Exmode history file\&.
.RE
.PP
~/.elinks/formhist
~/\&.elinks/formhist
.RS 4
Form history file.
Form history file\&.
.RE
.PP
~/.elinks/globhist
~/\&.elinks/globhist
.RS 4
History file containing most recently visited URLs.
History file containing most recently visited URLs\&.
.RE
.PP
~/.elinks/gotohist
~/\&.elinks/gotohist
.RS 4
GoTo URL dialog history file.
GoTo URL dialog history file\&.
.RE
.PP
~/.elinks/hooks.{js,lua,pl,py,rb,scm}
~/\&.elinks/hooks\&.{js,lua,pl,py,rb,scm}
.RS 4
Browser scripting hooks.
Browser scripting hooks\&.
.RE
.PP
~/.elinks/searchhist
~/\&.elinks/searchhist
.RS 4
Search history file.
Search history file\&.
.RE
.PP
~/.elinks/socket
~/\&.elinks/socket
.RS 4
Internal
\fIELinks\fR
socket for communication between its instances.
socket for communication between its instances\&.
.RE
.PP
~/.mailcap, /etc/mailcap
~/\&.mailcap, /etc/mailcap
.RS 4
Mappings of MIME types to external handlers.
Mappings of MIME types to external handlers\&.
.RE
.PP
~/.mime.types, /etc/mime.types
~/\&.mime\&.types, /etc/mime\&.types
.RS 4
Mappings of file extensions to MIME types.
Mappings of file extensions to MIME types\&.
.RE
.SH "BUGS"
Please report any other bugs you find to the either the ELinks mailing list at <elinks\-users@linuxfromscratch.org> or if you prefer enter them into the bug tracking system <http://bugzilla.elinks.cz/>. More information about how to get in contact with developers and getting help can be found on the community page <http://elinks.cz/community.html>.
Please report any other bugs you find to the either the ELinks mailing list at <elinks\-users@linuxfromscratch\&.org> or if you prefer enter them into the bug tracking system <http://bugzilla\&.elinks\&.cz/>\&. More information about how to get in contact with developers and getting help can be found on the community page <http://elinks\&.cz/community\&.html>\&.
.sp
.SH "LICENSE"
\fIELinks\fR is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License <http://www.gnu.org/copyleft/gpl.html> as published by the Free Software Foundation; version 2 of the License.
\fIELinks\fR is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License <http://www\&.gnu\&.org/copyleft/gpl\&.html> as published by the Free Software Foundation; version 2 of the License\&.
.sp
.SH "AUTHORS"
The \fILinks\fR browser \- on which \fIELinks\fR is based \- was written by Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>. \fIELinks\fR was written by Petr Baudis <pasky@ucw.cz>. See file AUTHORS in the source tree for a list of people contributing to this project.
The \fILinks\fR browser \- on which \fIELinks\fR is based \- was written by Mikulas Patocka <mikulas@artax\&.karlin\&.mff\&.cuni\&.cz>\&. \fIELinks\fR was written by Petr Baudis <pasky@ucw\&.cz>\&. See file AUTHORS in the source tree for a list of people contributing to this project\&.
.sp
This manual page was written by Peter Gervai <grin@tolna.net>, 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 <pasky@ucw.cz>. Updated by Zas <zas@norz.org>. The conversion to Asciidoc and trimming was done by Jonas Fonseca <fonseca@diku.dk>.
This manual page was written by Peter Gervai <grin@tolna\&.net>, 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 <pasky@ucw\&.cz>\&. Updated by Zas <zas@norz\&.org>\&. The conversion to Asciidoc and trimming was done by Jonas Fonseca <fonseca@diku\&.dk>\&.
.sp
.SH "SEE ALSO"
\fBelinkskeys\fR(5), \fBelinks.conf\fR(5), \fBlinks\fR(1), \fBlynx\fR(1), \fBw3m\fR(1), \fBwget\fR(1)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8,6 +8,8 @@
#include "elinks.h"
#include "ecmascript/spidermonkey-shared.h"
#include "ecmascript/spidermonkey.h"
#include "scripting/smjs/core.h"
/** A shared runtime used for both user scripts (scripting/smjs/) and
* scripts on web pages (ecmascript/spidermonkey/).
@ -31,6 +33,38 @@ JSContext *spidermonkey_empty_context;
* it can be initialized and shut down in arbitrary order. */
static int spidermonkey_runtime_refcount;
static void
error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
{
/* We have three types of JSContexts.
* - spidermonkey_empty_context never has anything defined or
* evaluated in it, so this error_reporter() should not be
* called for it.
* - smjs_ctx for user scripts.
* - many JSContexts for web scripts.
* Check which one ctx is and call the appropriate function.
*
* Instead of the scheme used here, we could:
* (a) make the private pointer of every context point to a
* structure of known type and put a function pointer or
* enum in that structure, or
* (b) assume that JS_GetContextPrivate(smjs_ctx) == NULL. */
assert(ctx != spidermonkey_empty_context);
if_assert_failed return;
#ifdef CONFIG_SCRIPTING_SPIDERMONKEY
if (ctx == smjs_ctx) {
smjs_error_reporter(ctx, message, report);
return;
}
#endif
#ifdef CONFIG_ECMASCRIPT_SMJS
spidermonkey_error_reporter(ctx, message, report);
#endif
}
/** Initialize ::spidermonkey_runtime and ::spidermonkey_empty_context.
* If already initialized, just increment the reference count.
*
@ -56,7 +90,13 @@ spidermonkey_runtime_addref(void)
JS_DestroyRuntime(spidermonkey_runtime);
spidermonkey_runtime = NULL;
JS_ShutDown();
return 0;
}
/* Although JS_SetErrorReporter gets the JSContext as
* a parameter, it affects the whole JSRuntime. */
JS_SetErrorReporter(spidermonkey_empty_context,
error_reporter);
}
assert(spidermonkey_runtime);

View File

@ -57,8 +57,8 @@
static int js_module_init_ok;
static void
error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
void
spidermonkey_error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
{
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
struct session *ses = interpreter->vs->doc_view->session;
@ -172,7 +172,6 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
/* XXX: JSOPTION_COMPILE_N_GO will go (will it?) when we implement
* some kind of bytecode cache. (If we will ever do that.) */
JS_SetOptions(ctx, JSOPTION_VAROBJFIX | JSOPTION_COMPILE_N_GO);
JS_SetErrorReporter(ctx, error_reporter);
window_obj = JS_NewObject(ctx, (JSClass *) &window_class, NULL, NULL);
if (!window_obj) {

View File

@ -2,6 +2,10 @@
#define EL__ECMASCRIPT_SPIDERMONKEY_H
struct ecmascript_interpreter;
struct form_state;
struct form_view;
struct JSContext;
struct JSErrorReport;
struct string;
void *spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter);
@ -15,5 +19,7 @@ void spidermonkey_eval(struct ecmascript_interpreter *interpreter, struct string
unsigned char *spidermonkey_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
int spidermonkey_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
void spidermonkey_error_reporter(struct JSContext *ctx, const char *message, struct JSErrorReport *report);
extern struct module spidermonkey_module;
#endif

View File

@ -358,7 +358,7 @@ never_for_this_site(void *form_)
struct formhist_data *form = form_;
form->dontsave = 1;
return remember_form(form);
remember_form(form);
}
unsigned char *

View File

@ -10,6 +10,9 @@
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
#ifdef __GNU__ /* For GNU Hurd bug workaround in set_handlers() */
#include <sys/stat.h> /* OS/2 needs this after sys/types.h */
#endif
#include <sys/types.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
@ -146,6 +149,21 @@ set_handlers(int fd, select_handler_T read_func, select_handler_T write_func,
fd, FD_SETSIZE);
if_assert_failed return;
#endif
#ifdef __GNU__
/* GNU Hurd pflocal bug <http://savannah.gnu.org/bugs/?22861>:
* If ELinks does a select() where the initial exceptfds set
* includes a pipe that is not listed in the other fd_sets,
* then select() always reports an exception there. That
* makes Elinks think the pipe has failed and close it.
* To work around this bug, do not monitor exceptions for
* pipes on the Hurd. */
if (error_func) {
struct stat st;
if (fstat(fd, &st) == 0 && S_ISFIFO(st.st_mode))
error_func = NULL;
}
#endif /* __GNU__ */
threads[fd].read_func = read_func;
threads[fd].write_func = write_func;
threads[fd].error_func = error_func;

View File

@ -125,6 +125,7 @@ static const struct s_msg_dsc msg_dsc[] = {
{S_BITTORRENT_METAINFO, N_("The BitTorrent metainfo file contained errors")},
{S_BITTORRENT_TRACKER, N_("The tracker requesting failed")},
{S_BITTORRENT_BAD_URL, N_("The BitTorrent URL does not point to a valid URL")},
{S_BITTORRENT_PEER_URL, N_("The bittorrent-peer URL scheme is for internal use only")},
#endif
/* fsp_open_session() failed but did not set errno.

View File

@ -104,6 +104,7 @@ enum connection_basic_state {
S_BITTORRENT_METAINFO = -100801,
S_BITTORRENT_TRACKER = -100802,
S_BITTORRENT_BAD_URL = -100803,
S_BITTORRENT_PEER_URL = -100804,
S_FSP_OPEN_SESSION_UNKN = -100900,
};

View File

@ -418,3 +418,9 @@ bittorrent_protocol_handler(struct connection *conn)
bittorrent_metainfo_callback, conn, 0);
done_uri(uri);
}
void
bittorrent_peer_protocol_handler(struct connection *conn)
{
abort_connection(conn, connection_state(S_BITTORRENT_PEER_URL));
}

View File

@ -9,8 +9,10 @@ struct connection;
#ifdef CONFIG_BITTORRENT
extern protocol_handler_T bittorrent_protocol_handler;
extern protocol_handler_T bittorrent_peer_protocol_handler;
#else
#define bittorrent_protocol_handler NULL
#define bittorrent_peer_protocol_handler NULL
#endif
void update_bittorrent_connection_state(struct connection *conn);

View File

@ -271,12 +271,13 @@ enum bittorrent_state
make_bittorrent_peer_connection(struct bittorrent_connection *bittorrent,
struct bittorrent_peer *peer_info)
{
struct uri uri;
enum bittorrent_state result = BITTORRENT_STATE_OUT_OF_MEM;
struct uri *uri = NULL;
struct string uri_string = NULL_STRING;
struct bittorrent_peer_connection *peer;
unsigned char port[5];
peer = init_bittorrent_peer_connection(-1);
if (!peer) return BITTORRENT_STATE_OUT_OF_MEM;
if (!peer) goto out;
peer->local.initiater = 1;
@ -284,10 +285,7 @@ make_bittorrent_peer_connection(struct bittorrent_connection *bittorrent,
peer->bittorrent = bittorrent;
peer->bitfield = init_bitfield(bittorrent->meta.pieces);
if (!peer->bitfield) {
done_bittorrent_peer_connection(peer);
return BITTORRENT_STATE_OUT_OF_MEM;
}
if (!peer->bitfield) goto out;
memcpy(peer->id, peer_info->id, sizeof(peer->id));
@ -295,17 +293,28 @@ make_bittorrent_peer_connection(struct bittorrent_connection *bittorrent,
* can extract the IP address and port number. */
/* FIXME: Rather change the make_connection() interface. This is an ugly
* hack. */
/* FIXME: Set the ipv6 flag iff ... */
memset(&uri, 0, sizeof(uri));
uri.protocol = PROTOCOL_BITTORRENT;
uri.host = peer_info->ip;
uri.hostlen = strlen(peer_info->ip);
uri.port = port;
uri.portlen = snprintf(port, sizeof(port), "%u", peer_info->port);
if (!init_string(&uri_string)) goto out;
if (!add_format_to_string(&uri_string,
#ifdef CONFIG_IPV6
strchr(peer_info->ip, ':') ?
"bittorrent-peer://[%s]:%u/" :
#endif
"bittorrent-peer://%s:%u/",
peer_info->ip, (unsigned) peer_info->port))
goto out;
uri = get_uri(uri_string.source, 0);
if (!uri) goto out;
make_connection(peer->socket, &uri, send_bittorrent_peer_handshake, 1);
make_connection(peer->socket, uri, send_bittorrent_peer_handshake, 1);
result = BITTORRENT_STATE_OK;
return BITTORRENT_STATE_OK;
out:
if (uri)
done_uri(uri);
done_string(&uri_string);
if (peer && result != BITTORRENT_STATE_OK)
done_bittorrent_peer_connection(peer);
return result;
}

View File

@ -58,6 +58,7 @@ struct protocol_backend {
static const struct protocol_backend protocol_backends[] = {
{ "about", 0, about_protocol_handler, 0, 0, 1, 0, 1 },
{ "bittorrent", 0, bittorrent_protocol_handler, 0, 0, 1, 0, 1 },
{ "bittorrent-peer",0,bittorrent_peer_protocol_handler, 1, 1, 0, 0, 1 },
{ "data", 0, data_protocol_handler, 0, 0, 1, 0, 1 },
{ "file", 0, file_protocol_handler, 1, 0, 0, 0, 0 },
{ "finger", 79, finger_protocol_handler, 1, 1, 0, 0, 1 },

View File

@ -11,6 +11,7 @@ struct uri;
enum protocol {
PROTOCOL_ABOUT,
PROTOCOL_BITTORRENT,
PROTOCOL_BITTORRENT_PEER,
PROTOCOL_DATA,
PROTOCOL_FILE,
PROTOCOL_FINGER,

View File

@ -33,8 +33,8 @@ alert_smjs_error(unsigned char *msg)
smjs_ses, msg);
}
static void
error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
void
smjs_error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
{
unsigned char *strict, *exception, *warning, *error;
struct string msg;
@ -127,14 +127,15 @@ init_smjs(struct module *module)
{
if (!spidermonkey_runtime_addref()) return;
/* Set smjs_ctx immediately after creating the JSContext, so
* that any error reports from SpiderMonkey are forwarded to
* smjs_error_reporter(). */
smjs_ctx = JS_NewContext(spidermonkey_runtime, 8192);
if (!smjs_ctx) {
spidermonkey_runtime_release();
return;
}
JS_SetErrorReporter(smjs_ctx, error_reporter);
smjs_init_global_object();
smjs_init_elinks_object();

View File

@ -10,6 +10,7 @@ struct string;
extern JSContext *smjs_ctx;
extern struct session *smjs_ses;
void smjs_error_reporter(JSContext *ctx, const char *message, JSErrorReport *report);
void alert_smjs_error(unsigned char *msg);
void init_smjs(struct module *module);

397
test/GFDL-1.2 Normal file
View File

@ -0,0 +1,397 @@
GNU Free Documentation License
Version 1.2, November 2002
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
0. PREAMBLE
The purpose of this License is to make a manual, textbook, or other
functional and useful document "free" in the sense of freedom: to
assure everyone the effective freedom to copy and redistribute it,
with or without modifying it, either commercially or noncommercially.
Secondarily, this License preserves for the author and publisher a way
to get credit for their work, while not being considered responsible
for modifications made by others.
This License is a kind of "copyleft", which means that derivative
works of the document must themselves be free in the same sense. It
complements the GNU General Public License, which is a copyleft
license designed for free software.
We have designed this License in order to use it for manuals for free
software, because free software needs free documentation: a free
program should come with manuals providing the same freedoms that the
software does. But this License is not limited to software manuals;
it can be used for any textual work, regardless of subject matter or
whether it is published as a printed book. We recommend this License
principally for works whose purpose is instruction or reference.
1. APPLICABILITY AND DEFINITIONS
This License applies to any manual or other work, in any medium, that
contains a notice placed by the copyright holder saying it can be
distributed under the terms of this License. Such a notice grants a
world-wide, royalty-free license, unlimited in duration, to use that
work under the conditions stated herein. The "Document", below,
refers to any such manual or work. Any member of the public is a
licensee, and is addressed as "you". You accept the license if you
copy, modify or distribute the work in a way requiring permission
under copyright law.
A "Modified Version" of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
modifications and/or translated into another language.
A "Secondary Section" is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall subject
(or to related matters) and contains nothing that could fall directly
within that overall subject. (Thus, if the Document is in part a
textbook of mathematics, a Secondary Section may not explain any
mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
commercial, philosophical, ethical or political position regarding
them.
The "Invariant Sections" are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
that says that the Document is released under this License. If a
section does not fit the above definition of Secondary then it is not
allowed to be designated as Invariant. The Document may contain zero
Invariant Sections. If the Document does not identify any Invariant
Sections then there are none.
The "Cover Texts" are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
the Document is released under this License. A Front-Cover Text may
be at most 5 words, and a Back-Cover Text may be at most 25 words.
A "Transparent" copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
general public, that is suitable for revising the document
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
format whose markup, or absence of markup, has been arranged to thwart
or discourage subsequent modification by readers is not Transparent.
An image format is not Transparent if used for any substantial amount
of text. A copy that is not "Transparent" is called "Opaque".
Examples of suitable formats for Transparent copies include plain
ASCII without markup, Texinfo input format, LaTeX input format, SGML
or XML using a publicly available DTD, and standard-conforming simple
HTML, PostScript or PDF designed for human modification. Examples of
transparent image formats include PNG, XCF and JPG. Opaque formats
include proprietary formats that can be read and edited only by
proprietary word processors, SGML or XML for which the DTD and/or
processing tools are not generally available, and the
machine-generated HTML, PostScript or PDF produced by some word
processors for output purposes only.
The "Title Page" means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
this License requires to appear in the title page. For works in
formats which do not have any title page as such, "Title Page" means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.
A section "Entitled XYZ" means a named subunit of the Document whose
title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a
specific section name mentioned below, such as "Acknowledgements",
"Dedications", "Endorsements", or "History".) To "Preserve the Title"
of such a section when you modify the Document means that it remains a
section "Entitled XYZ" according to this definition.
The Document may include Warranty Disclaimers next to the notice which
states that this License applies to the Document. These Warranty
Disclaimers are considered to be included by reference in this
License, but only as regards disclaiming warranties: any other
implication that these Warranty Disclaimers may have is void and has
no effect on the meaning of this License.
2. VERBATIM COPYING
You may copy and distribute the Document in any medium, either
commercially or noncommercially, provided that this License, the
copyright notices, and the license notice saying this License applies
to the Document are reproduced in all copies, and that you add no other
conditions whatsoever to those of this License. You may not use
technical measures to obstruct or control the reading or further
copying of the copies you make or distribute. However, you may accept
compensation in exchange for copies. If you distribute a large enough
number of copies you must also follow the conditions in section 3.
You may also lend copies, under the same conditions stated above, and
you may publicly display copies.
3. COPYING IN QUANTITY
If you publish printed copies (or copies in media that commonly have
printed covers) of the Document, numbering more than 100, and the
Document's license notice requires Cover Texts, you must enclose the
copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
the full title with all words of the title equally prominent and
visible. You may add other material on the covers in addition.
Copying with changes limited to the covers, as long as they preserve
the title of the Document and satisfy these conditions, can be treated
as verbatim copying in other respects.
If the required texts for either cover are too voluminous to fit
legibly, you should put the first ones listed (as many as fit
reasonably) on the actual cover, and continue the rest onto adjacent
pages.
If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
a computer-network location from which the general network-using
public has access to download using public-standard network protocols
a complete Transparent copy of the Document, free of added material.
If you use the latter option, you must take reasonably prudent steps,
when you begin distribution of Opaque copies in quantity, to ensure
that this Transparent copy will remain thus accessible at the stated
location until at least one year after the last time you distribute an
Opaque copy (directly or through your agents or retailers) of that
edition to the public.
It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to give
them a chance to provide you with an updated version of the Document.
4. MODIFICATIONS
You may copy and distribute a Modified Version of the Document under
the conditions of sections 2 and 3 above, provided that you release
the Modified Version under precisely this License, with the Modified
Version filling the role of the Document, thus licensing distribution
and modification of the Modified Version to whoever possesses a copy
of it. In addition, you must do these things in the Modified Version:
A. Use in the Title Page (and on the covers, if any) a title distinct
from that of the Document, and from those of previous versions
(which should, if there were any, be listed in the History section
of the Document). You may use the same title as a previous version
if the original publisher of that version gives permission.
B. List on the Title Page, as authors, one or more persons or entities
responsible for authorship of the modifications in the Modified
Version, together with at least five of the principal authors of the
Document (all of its principal authors, if it has fewer than five),
unless they release you from this requirement.
C. State on the Title page the name of the publisher of the
Modified Version, as the publisher.
D. Preserve all the copyright notices of the Document.
E. Add an appropriate copyright notice for your modifications
adjacent to the other copyright notices.
F. Include, immediately after the copyright notices, a license notice
giving the public permission to use the Modified Version under the
terms of this License, in the form shown in the Addendum below.
G. Preserve in that license notice the full lists of Invariant Sections
and required Cover Texts given in the Document's license notice.
H. Include an unaltered copy of this License.
I. Preserve the section Entitled "History", Preserve its Title, and add
to it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section Entitled "History" in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.
J. Preserve the network location, if any, given in the Document for
public access to a Transparent copy of the Document, and likewise
the network locations given in the Document for previous versions
it was based on. These may be placed in the "History" section.
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.
K. For any section Entitled "Acknowledgements" or "Dedications",
Preserve the Title of the section, and preserve in the section all
the substance and tone of each of the contributor acknowledgements
and/or dedications given therein.
L. Preserve all the Invariant Sections of the Document,
unaltered in their text and in their titles. Section numbers
or the equivalent are not considered part of the section titles.
M. Delete any section Entitled "Endorsements". Such a section
may not be included in the Modified Version.
N. Do not retitle any existing section to be Entitled "Endorsements"
or to conflict in title with any Invariant Section.
O. Preserve any Warranty Disclaimers.
If the Modified Version includes new front-matter sections or
appendices that qualify as Secondary Sections and contain no material
copied from the Document, you may at your option designate some or all
of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
You may add a section Entitled "Endorsements", provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
standard.
You may add a passage of up to five words as a Front-Cover Text, and a
passage of up to 25 words as a Back-Cover Text, to the end of the list
of Cover Texts in the Modified Version. Only one passage of
Front-Cover Text and one of Back-Cover Text may be added by (or
through arrangements made by) any one entity. If the Document already
includes a cover text for the same cover, previously added by you or
by arrangement made by the same entity you are acting on behalf of,
you may not add another; but you may replace the old one, on explicit
permission from the previous publisher that added the old one.
The author(s) and publisher(s) of the Document do not by this License
give permission to use their names for publicity for or to assert or
imply endorsement of any Modified Version.
5. COMBINING DOCUMENTS
You may combine the Document with other documents released under this
License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
license notice, and that you preserve all their Warranty Disclaimers.
The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
copy. If there are multiple Invariant Sections with the same name but
different contents, make the title of each such section unique by
adding at the end of it, in parentheses, the name of the original
author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.
In the combination, you must combine any sections Entitled "History"
in the various original documents, forming one section Entitled
"History"; likewise combine any sections Entitled "Acknowledgements",
and any sections Entitled "Dedications". You must delete all sections
Entitled "Endorsements".
6. COLLECTIONS OF DOCUMENTS
You may make a collection consisting of the Document and other documents
released under this License, and replace the individual copies of this
License in the various documents with a single copy that is included in
the collection, provided that you follow the rules of this License for
verbatim copying of each of the documents in all other respects.
You may extract a single document from such a collection, and distribute
it individually under this License, provided you insert a copy of this
License into the extracted document, and follow this License in all
other respects regarding verbatim copying of that document.
7. AGGREGATION WITH INDEPENDENT WORKS
A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
distribution medium, is called an "aggregate" if the copyright
resulting from the compilation is not used to limit the legal rights
of the compilation's users beyond what the individual works permit.
When the Document is included in an aggregate, this License does not
apply to the other works in the aggregate which are not themselves
derivative works of the Document.
If the Cover Text requirement of section 3 is applicable to these
copies of the Document, then if the Document is less than one half of
the entire aggregate, the Document's Cover Texts may be placed on
covers that bracket the Document within the aggregate, or the
electronic equivalent of covers if the Document is in electronic form.
Otherwise they must appear on printed covers that bracket the whole
aggregate.
8. TRANSLATION
Translation is considered a kind of modification, so you may
distribute translations of the Document under the terms of section 4.
Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License, and all the license notices in the
Document, and any Warranty Disclaimers, provided that you also include
the original English version of this License and the original versions
of those notices and disclaimers. In case of a disagreement between
the translation and the original version of this License or a notice
or disclaimer, the original version will prevail.
If a section in the Document is Entitled "Acknowledgements",
"Dedications", or "History", the requirement (section 4) to Preserve
its Title (section 1) will typically require changing the actual
title.
9. TERMINATION
You may not copy, modify, sublicense, or distribute the Document except
as expressly provided for under this License. Any other attempt to
copy, modify, sublicense or distribute the Document is void, and will
automatically terminate your rights under this License. However,
parties who have received copies, or rights, from you under this
License will not have their licenses terminated so long as such
parties remain in full compliance.
10. FUTURE REVISIONS OF THIS LICENSE
The Free Software Foundation may publish new, revised versions
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
http://www.gnu.org/copyleft/.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
License "or any later version" applies to it, you have the option of
following the terms and conditions either of that specified version or
of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation.
ADDENDUM: How to use this License for your documents
To use this License in a document you have written, include a copy of
the License in the document and put the following copyright and
license notices just after the title page:
Copyright (c) YEAR YOUR NAME.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
replace the "with...Texts." line with this:
with the Invariant Sections being LIST THEIR TITLES, with the
Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
If you have Invariant Sections without Cover Texts, or some other
combination of the three, merge those two alternatives to suit the
situation.
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of
free software license, such as the GNU General Public License,
to permit their use in free software.

View File

@ -5,3 +5,7 @@ occuring inside of these documents. No automated testsuite yet, though.
Possible meaningful content of the documents is completely irrelevant and you
should ignore it. Noone takes any responsibility for it :).
optgroup.html originates from <http://iccl.fi/>. Ari Sovijärvi kindly
granted us the "GNU free documentation licence" (included in the file
GFDL-1.2).