From 6ee8bc7966f8d88392aa0429b96b24e3ae7c16f9 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 29 Dec 2005 04:19:27 +0000 Subject: [PATCH 1/4] Fix an error message: the cvs prefix takes one to three arguments, not two to three. --- contrib/lua/hooks.lua.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lua/hooks.lua.in b/contrib/lua/hooks.lua.in index 295f781f..0b24a33c 100644 --- a/contrib/lua/hooks.lua.in +++ b/contrib/lua/hooks.lua.in @@ -225,7 +225,7 @@ function cvsweb (base, project, url) string.gsub(url, "([^%s]+)", function (w) table.insert(t, w) end) 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 new then return base..project.."/"..file..".diff?r1="..old.."&r2="..new.."&f=u" From 59ffb72b8f8d1768351a3b9a839abf9c6726b5ce Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 29 Dec 2005 04:35:02 +0000 Subject: [PATCH 2/4] Drop .or from elinks.or.cz. --- AUTHORS | 4 ++-- BUGS | 2 +- README | 8 ++++---- THANKS | 2 +- TODO | 2 +- debian/README.Debian | 4 ++-- po/README | 2 +- src/protocol/rewrite/rewrite.c | 2 +- src/protocol/uri.h | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AUTHORS b/AUTHORS index 33187ae5..cf076cf8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -241,7 +241,7 @@ Jimenez Martinez Angel Luis Jonas Fonseca Maintainer Danish translation - http://elinks.or.cz/ + http://elinks.cz/ Mailcap support Major cleanups BFU and document management hacking @@ -442,7 +442,7 @@ Petr Baudis Feature of the Day implementation LEDs, exmode, marks and other worthless toys Actually even some documentation! - http://elinks.or.cz/ (original cut) + http://elinks.cz/ (original cut) Petr Cech Allow spaces at the beginning of URL diff --git a/BUGS b/BUGS index e78eb02b..16f85ec5 100644 --- a/BUGS +++ b/BUGS @@ -1,4 +1,4 @@ All the known bugs are now kept in the Bugzilla, available at - http://bugzilla.elinks.or.cz/ + http://bugzilla.elinks.cz/ diff --git a/README b/README index a3d3cd7b..b54d4a06 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ on a variety of platforms. 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 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. 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.or.cz/feedback.html. +http://elinks.cz/community.html and feedback information available at +http://elinks.cz/feedback.html. If you want to write some patches, please first read the doc/hacking.txt document. @@ -55,7 +55,7 @@ separation of add-on modules (like cookies, bookmarks, ssl, scripting etc). 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, you can examine the website at diff --git a/THANKS b/THANKS index adb1b669..5438a252 100644 --- a/THANKS +++ b/THANKS @@ -12,6 +12,6 @@ Thanks to Gerard Beekmans for providing us the resources for our mailing lists at linuxfromscratch.org servers. Thanks to Jan Sembera 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. diff --git a/TODO b/TODO index 544b99c9..63e34c3f 100644 --- a/TODO +++ b/TODO @@ -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 kept here, though, to be more on the developers' eyes ;-). diff --git a/debian/README.Debian b/debian/README.Debian index 9304c99b..d638f09c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -32,7 +32,7 @@ different config format, I work on this.] You can find the snapshot Debian packages at ftp://yikes.tolna.net/pub/linux/release/debian/ -Homepage is http://elinks.or.cz/ +Homepage is http://elinks.cz/ -- Peter Gervai , 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) Q: The "move" doesn't work in the bookmark manager. -A: Read +A: Read to learn how to use this unintuitive feature. (contributed by Miciah Dashiel Butler Masters) diff --git a/po/README b/po/README index cfbcfb26..a44ef044 100644 --- a/po/README +++ b/po/README @@ -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 -mailinglists or file it as a bug at . +mailinglists or file it as a bug at . 2. Updating .po files: diff --git a/src/protocol/rewrite/rewrite.c b/src/protocol/rewrite/rewrite.c index a09290c5..c3886c1c 100644 --- a/src/protocol/rewrite/rewrite.c +++ b/src/protocol/rewrite/rewrite.c @@ -55,7 +55,7 @@ static struct option_info uri_rewrite_options[] = { N_("Enable dumb prefixes - simple URI abbreviations which can\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" - "http://elinks.or.cz/.")), + "http://elinks.cz/.")), INIT_OPT_BOOL("protocol.rewrite", N_("Enable smart prefixes"), "enable-smart", 0, 1, diff --git a/src/protocol/uri.h b/src/protocol/uri.h index c0f7abe4..dac654e5 100644 --- a/src/protocol/uri.h +++ b/src/protocol/uri.h @@ -291,8 +291,8 @@ unsigned char *get_extension_from_uri(struct uri *uri); /* Resolves a @relative URI to absolute form using @base URI. - * Example: if @base is http://elinks.or.cz/ and @relative is #news - * the outcome would be http://elinks.or.cz/#news */ + * Example: if @base is http://elinks.cz/ and @relative is #news + * the outcome would be http://elinks.cz/#news */ 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. From efcc17428f79727897fd5504d52faa98a043e440 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 29 Dec 2005 04:38:26 +0000 Subject: [PATCH 3/4] Update the reference to the bookmarks documentation with a valid URI. --- debian/README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index d638f09c..8da15493 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -46,7 +46,7 @@ A: Please check the menus. Download manager is under Tools>Download, proxy (with contribution by Jonas Fonseca) Q: The "move" doesn't work in the bookmark manager. -A: Read +A: Read to learn how to use this unintuitive feature. (contributed by Miciah Dashiel Butler Masters) From ca4e79f123ab331da61e80ebd92da18bcd0b1fa3 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Thu, 29 Dec 2005 04:43:25 +0000 Subject: [PATCH 4/4] Drop .or from elinks.or.cz. --- contrib/elinks.spec.in | 7 +++++-- contrib/grafthistory.sh | 4 ++-- contrib/lua/hooks.lua.in | 8 ++++---- contrib/perl/hooks.pl | 4 ++-- debian/control.in | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/contrib/elinks.spec.in b/contrib/elinks.spec.in index 356a90d6..991a5396 100644 --- a/contrib/elinks.spec.in +++ b/contrib/elinks.spec.in @@ -37,8 +37,8 @@ License: GPL Vendor: ELinks project Packager: Petr Baudis Group: Applications/Internet -Source: http://elinks.or.cz/download/%{name}-%{version}.tar.bz2 -URL: http://elinks.or.cz/ +Source: http://elinks.cz/download/%{name}-%{version}.tar.bz2 +URL: http://elinks.cz/ BuildRequires: bzip2-devel BuildRequires: expat-devel BuildRequires: gpm-devel @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT # date +"%a %b %d %Y" %changelog +* Thu Dec 29 2005 Miciah Dashiel Butler Masters +- elinks.or.cz -> elinks.cz + *Tue Jun 14 2005 Witold Filipczyk - removed unused texi2html dependency - removed unused libdir directory diff --git a/contrib/grafthistory.sh b/contrib/grafthistory.sh index 005b4b4e..b725c244 100755 --- a/contrib/grafthistory.sh +++ b/contrib/grafthistory.sh @@ -19,8 +19,8 @@ cd "$GIT_DIR" echo "[grafthistory] Downloading the history" mkdir -p objects/pack cd objects/pack -wget -c http://elinks.or.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.idx +wget -c http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.pack echo "[grafthistory] Setting up the grafts" cd ../.. diff --git a/contrib/lua/hooks.lua.in b/contrib/lua/hooks.lua.in index 0b24a33c..c0283d40 100644 --- a/contrib/lua/hooks.lua.in +++ b/contrib/lua/hooks.lua.in @@ -171,8 +171,8 @@ end dumbprefixes = { arc = "http://web.archive.org/web/*/%c", b = "http://babelfish.altavista.com/babelfish/tr", - bz = "http://bugzilla.elinks.or.cz", - bug = "http://bugzilla.elinks.or.cz", + bz = "http://bugzilla.elinks.cz", + bug = "http://bugzilla.elinks.cz", d = "http://www.dict.org", g = "http://www.google.com/", gg = "http://www.google.com/", @@ -263,12 +263,12 @@ end smartprefixes = { 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", cliki = "http://www.cliki.net/admin/search?words=%s", -- If you want to add a smartprefix for another project's CVSweb, -- 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", debcontents = debian_contents, debfile = debian_file, diff --git a/contrib/perl/hooks.pl b/contrib/perl/hooks.pl index 4de820a4..5edb1811 100644 --- a/contrib/perl/hooks.pl +++ b/contrib/perl/hooks.pl @@ -896,7 +896,7 @@ There's no place like home... my ($bug) = $url =~ /^.* (.*)/; if ($url =~ '^b') { - my $bugzilla = 'http://bugzilla.elinks.or.cz'; + my $bugzilla = 'http://bugzilla.elinks.cz'; if (not $bug) { if (loadrc("email")) @@ -922,7 +922,7 @@ There's no place like home... $doc = '/documentation' if $url =~ '^doc'; $doc = '/faq.html' if $url =~ '^(faq|help)$'; $doc = '/documentation/html/manual.html' if $url =~ '^manual$'; - return 'http://elinks.or.cz' . $doc; + return 'http://elinks.cz' . $doc; } } diff --git a/debian/control.in b/debian/control.in index ded15680..e467c1b2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -17,4 +17,4 @@ Description: advanced text-mode WWW browser language, IPV6 and has many other features. ELinks is linked against GNUTLS to prevent license issues. . - Homepage: http://elinks.or.cz/ + Homepage: http://elinks.cz/