1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-10-01 03:36:26 -04:00

Merge with git+ssh://pasky/srv/git/elinks.git

This commit is contained in:
Jonas Fonseca 2005-12-29 06:55:30 +01:00 committed by Jonas Fonseca
commit 5a75bbc427
14 changed files with 30 additions and 27 deletions

View File

@ -241,7 +241,7 @@ Jimenez Martinez Angel Luis <al026635@alumail.uji.es>
Jonas Fonseca <fonseca@diku.dk> Jonas Fonseca <fonseca@diku.dk>
Maintainer Maintainer
Danish translation Danish translation
http://elinks.or.cz/ http://elinks.cz/
Mailcap support Mailcap support
Major cleanups Major cleanups
BFU and document management hacking BFU and document management hacking
@ -442,7 +442,7 @@ Petr Baudis <pasky@ucw.cz>
Feature of the Day implementation Feature of the Day implementation
LEDs, exmode, marks and other worthless toys LEDs, exmode, marks and other worthless toys
Actually even some documentation! Actually even some documentation!
http://elinks.or.cz/ (original cut) http://elinks.cz/ (original cut)
Petr Cech <cech@atrey.karlin.mff.cuni.cz> Petr Cech <cech@atrey.karlin.mff.cuni.cz>
Allow spaces at the beginning of URL Allow spaces at the beginning of URL

2
BUGS
View File

@ -1,4 +1,4 @@
All the known bugs are now kept in the Bugzilla, available at All the known bugs are now kept in the Bugzilla, available at
http://bugzilla.elinks.or.cz/ http://bugzilla.elinks.cz/

8
README
View File

@ -8,7 +8,7 @@ on a variety of platforms.
The ELinks official website is available at The ELinks official website is available at
http://elinks.or.cz/ http://elinks.cz/
Please see the SITES file for mirrors or other recommended sites. If you Please see the SITES file for mirrors or other recommended sites. If you
want to install ELinks on your computer, see the INSTALL file for further want to install ELinks on your computer, see the INSTALL file for further
@ -18,8 +18,8 @@ A good start point is documentation files available in doc/, especially the
file named index.txt. file named index.txt.
If you want to request features or report bugs, see community information at If you want to request features or report bugs, see community information at
http://elinks.or.cz/community.html and feedback information available at http://elinks.cz/community.html and feedback information available at
http://elinks.or.cz/feedback.html. http://elinks.cz/feedback.html.
If you want to write some patches, please first read the doc/hacking.txt If you want to write some patches, please first read the doc/hacking.txt
document. document.
@ -55,7 +55,7 @@ separation of add-on modules (like cookies, bookmarks, ssl, scripting etc).
For more details about ELinks history, please see For more details about ELinks history, please see
http://elinks.or.cz/history.html http://elinks.cz/history.html
If you are more interested in the history and various Links clones and versions, If you are more interested in the history and various Links clones and versions,
you can examine the website at you can examine the website at

2
THANKS
View File

@ -12,6 +12,6 @@ Thanks to Gerard Beekmans <gerard@linuxfromscratch.org> for providing us the
resources for our mailing lists at linuxfromscratch.org servers. resources for our mailing lists at linuxfromscratch.org servers.
Thanks to Jan Sembera <jan.sembera@flexible.cz> for providing us the space and Thanks to Jan Sembera <jan.sembera@flexible.cz> for providing us the space and
bandwidth on his server for elinks.or.cz and cvs.elinks.or.cz. bandwidth on his server for elinks.cz and cvs.elinks.cz.
Thanks to Zdenek Burda for donating the elinks.cz domain. Thanks to Zdenek Burda for donating the elinks.cz domain.

2
TODO
View File

@ -1,4 +1,4 @@
The ELinks TODO items are kept in Bugzilla (http://bugzilla.elinks.or.cz/), The ELinks TODO items are kept in Bugzilla (http://bugzilla.elinks.cz/),
look for the bugs with 'enhancement' severity. Some generic goals are still look for the bugs with 'enhancement' severity. Some generic goals are still
kept here, though, to be more on the developers' eyes ;-). kept here, though, to be more on the developers' eyes ;-).

View File

@ -37,8 +37,8 @@ License: GPL
Vendor: ELinks project <elinks-users@linuxfromscratch.org> Vendor: ELinks project <elinks-users@linuxfromscratch.org>
Packager: Petr Baudis <pasky@ucw.cz> Packager: Petr Baudis <pasky@ucw.cz>
Group: Applications/Internet Group: Applications/Internet
Source: http://elinks.or.cz/download/%{name}-%{version}.tar.bz2 Source: http://elinks.cz/download/%{name}-%{version}.tar.bz2
URL: http://elinks.or.cz/ URL: http://elinks.cz/
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: gpm-devel BuildRequires: gpm-devel
@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
# date +"%a %b %d %Y" # date +"%a %b %d %Y"
%changelog %changelog
* Thu Dec 29 2005 Miciah Dashiel Butler Masters <mdm0304@ecu.edu>
- elinks.or.cz -> elinks.cz
*Tue Jun 14 2005 Witold Filipczyk <witekfl@pld-linux.org> *Tue Jun 14 2005 Witold Filipczyk <witekfl@pld-linux.org>
- removed unused texi2html dependency - removed unused texi2html dependency
- removed unused libdir directory - removed unused libdir directory

View File

@ -19,8 +19,8 @@ cd "$GIT_DIR"
echo "[grafthistory] Downloading the history" echo "[grafthistory] Downloading the history"
mkdir -p objects/pack mkdir -p objects/pack
cd objects/pack cd objects/pack
wget -c http://elinks.or.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.idx wget -c http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.idx
wget -c http://elinks.or.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.pack wget -c http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.pack
echo "[grafthistory] Setting up the grafts" echo "[grafthistory] Setting up the grafts"
cd ../.. cd ../..

View File

@ -171,8 +171,8 @@ end
dumbprefixes = { dumbprefixes = {
arc = "http://web.archive.org/web/*/%c", arc = "http://web.archive.org/web/*/%c",
b = "http://babelfish.altavista.com/babelfish/tr", b = "http://babelfish.altavista.com/babelfish/tr",
bz = "http://bugzilla.elinks.or.cz", bz = "http://bugzilla.elinks.cz",
bug = "http://bugzilla.elinks.or.cz", bug = "http://bugzilla.elinks.cz",
d = "http://www.dict.org", d = "http://www.dict.org",
g = "http://www.google.com/", g = "http://www.google.com/",
gg = "http://www.google.com/", gg = "http://www.google.com/",
@ -225,7 +225,7 @@ function cvsweb (base, project, url)
string.gsub(url, "([^%s]+)", function (w) table.insert(t, w) end) string.gsub(url, "([^%s]+)", function (w) table.insert(t, w) end)
file, old, new = t[1], t[2], t[3] file, old, new = t[1], t[2], t[3]
if t[4] then error('this smartprefix takes only two to three arguments') return nil end if t[4] then error('this smartprefix takes only one to three arguments') return nil end
if not file then error('no file given') return nil end if not file then error('no file given') return nil end
if new then return base..project.."/"..file..".diff?r1="..old.."&r2="..new.."&f=u" if new then return base..project.."/"..file..".diff?r1="..old.."&r2="..new.."&f=u"
@ -263,12 +263,12 @@ end
smartprefixes = { smartprefixes = {
arc = "http://web.archive.org/web/*/%s", arc = "http://web.archive.org/web/*/%s",
bug = function (url) return bugzilla('http://bugzilla.elinks.or.cz/', url) end, bug = function (url) return bugzilla('http://bugzilla.elinks.cz/', url) end,
cambridge = "http://dictionary.cambridge.org/results.asp?searchword=%s", cambridge = "http://dictionary.cambridge.org/results.asp?searchword=%s",
cliki = "http://www.cliki.net/admin/search?words=%s", cliki = "http://www.cliki.net/admin/search?words=%s",
-- If you want to add a smartprefix for another project's CVSweb, -- If you want to add a smartprefix for another project's CVSweb,
-- just create a lambda like this. Aren't high-level languages fun? -- just create a lambda like this. Aren't high-level languages fun?
cvs = function (x) return cvsweb ("http://cvsweb.elinks.or.cz/cvsweb.cgi/", "elinks", x) end, cvs = function (x) return cvsweb ("http://cvsweb.elinks.cz/cvsweb.cgi/", "elinks", x) end,
d = "http://www.dict.org/bin/Dict?Query=%s&Form=Dict1&Strategy=*&Database=*&submit=Submit+query", d = "http://www.dict.org/bin/Dict?Query=%s&Form=Dict1&Strategy=*&Database=*&submit=Submit+query",
debcontents = debian_contents, debcontents = debian_contents,
debfile = debian_file, debfile = debian_file,

View File

@ -896,7 +896,7 @@ There's no place like home...
my ($bug) = $url =~ /^.* (.*)/; my ($bug) = $url =~ /^.* (.*)/;
if ($url =~ '^b') if ($url =~ '^b')
{ {
my $bugzilla = 'http://bugzilla.elinks.or.cz'; my $bugzilla = 'http://bugzilla.elinks.cz';
if (not $bug) if (not $bug)
{ {
if (loadrc("email")) if (loadrc("email"))
@ -922,7 +922,7 @@ There's no place like home...
$doc = '/documentation' if $url =~ '^doc'; $doc = '/documentation' if $url =~ '^doc';
$doc = '/faq.html' if $url =~ '^(faq|help)$'; $doc = '/faq.html' if $url =~ '^(faq|help)$';
$doc = '/documentation/html/manual.html' if $url =~ '^manual$'; $doc = '/documentation/html/manual.html' if $url =~ '^manual$';
return 'http://elinks.or.cz' . $doc; return 'http://elinks.cz' . $doc;
} }
} }

View File

@ -32,7 +32,7 @@ different config format, I work on this.]
You can find the snapshot Debian packages at You can find the snapshot Debian packages at
ftp://yikes.tolna.net/pub/linux/release/debian/ ftp://yikes.tolna.net/pub/linux/release/debian/
Homepage is http://elinks.or.cz/ Homepage is http://elinks.cz/
-- Peter Gervai <grin@tolna.net>, Thu, 9 Oct 2003 01:17:26 +0200 -- Peter Gervai <grin@tolna.net>, Thu, 9 Oct 2003 01:17:26 +0200
@ -46,7 +46,7 @@ A: Please check the menus. Download manager is under Tools>Download, proxy
(with contribution by Jonas Fonseca) (with contribution by Jonas Fonseca)
Q: The "move" doesn't work in the bookmark manager. Q: The "move" doesn't work in the bookmark manager.
A: Read <http://elinks.or.cz/documentation/bookmarks.txt> A: Read <http://elinks.cz/documentation/html/manual.html-chunked/ch04.html>
to learn how to use this unintuitive feature. to learn how to use this unintuitive feature.
(contributed by Miciah Dashiel Butler Masters) (contributed by Miciah Dashiel Butler Masters)

2
debian/control.in vendored
View File

@ -17,4 +17,4 @@ Description: advanced text-mode WWW browser
language, IPV6 and has many other features. ELinks is linked against language, IPV6 and has many other features. ELinks is linked against
GNUTLS to prevent license issues. GNUTLS to prevent license issues.
. .
Homepage: http://elinks.or.cz/ Homepage: http://elinks.cz/

View File

@ -78,7 +78,7 @@ name of your language (in English) so you end up with something like:
------------------------------------------------ ------------------------------------------------
Finally to make it part of the ELinks distribution send it to one of the Finally to make it part of the ELinks distribution send it to one of the
mailinglists or file it as a bug at <http://bugzilla.elinks.or.cz>. mailinglists or file it as a bug at <http://bugzilla.elinks.cz>.
2. Updating .po files: 2. Updating .po files:

View File

@ -55,7 +55,7 @@ static struct option_info uri_rewrite_options[] = {
N_("Enable dumb prefixes - simple URI abbreviations which can\n" N_("Enable dumb prefixes - simple URI abbreviations which can\n"
"be written to the Goto URL dialog instead of actual URIs - i.e.\n" "be written to the Goto URL dialog instead of actual URIs - i.e.\n"
"if you write 'elinks' there, you are directed to\n" "if you write 'elinks' there, you are directed to\n"
"http://elinks.or.cz/.")), "http://elinks.cz/.")),
INIT_OPT_BOOL("protocol.rewrite", N_("Enable smart prefixes"), INIT_OPT_BOOL("protocol.rewrite", N_("Enable smart prefixes"),
"enable-smart", 0, 1, "enable-smart", 0, 1,

View File

@ -291,8 +291,8 @@ unsigned char *get_extension_from_uri(struct uri *uri);
/* Resolves a @relative URI to absolute form using @base URI. /* Resolves a @relative URI to absolute form using @base URI.
* Example: if @base is http://elinks.or.cz/ and @relative is #news * Example: if @base is http://elinks.cz/ and @relative is #news
* the outcome would be http://elinks.or.cz/#news */ * the outcome would be http://elinks.cz/#news */
unsigned char *join_urls(struct uri *base, unsigned char *relative); unsigned char *join_urls(struct uri *base, unsigned char *relative);
/* Return position if end of string @s matches a known tld or -1 if not. /* Return position if end of string @s matches a known tld or -1 if not.