1
0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00

Merge with e75bd0e79f2390183ed89fff5a7fd84807dccf0d

(via http://elinks.cz/elinks.git)
This commit is contained in:
Kalle Olavi Niemitalo 2006-01-14 21:16:08 +02:00 committed by Kalle Olavi Niemitalo
commit c8b89aee2a
3 changed files with 13 additions and 14 deletions

View File

@ -934,8 +934,6 @@ B<dia> <I<dialect>> <I<URL>> (or current url)
Dialects: I<redneck>, I<jive>, I<cockney>, I<fudd>, I<bork>, I<moron>, I<piglatin>, or I<hacker>
=back
=cut
############################################################################
# the Dialectizer (dia <dialect> <url>)
@ -1070,6 +1068,8 @@ using the search engine defined by the 'search' configuration option if
}
=back
=head1 FOLLOW URL HOOK
@ -1081,8 +1081,6 @@ I<Developer's usage>: The function I<follow_url_hook> is called when the hook
is triggered, taking the target URL as its only argument. It returns the final
target URL.
=back
=cut
################################################################################
### follow_url_hook ############################################################
@ -1133,6 +1131,8 @@ Translates any I<nntp:> or I<news:> URLs to Google Groups HTTP URLs.
}
=back
=head1 PRE FORMAT HTML HOOK
@ -1151,8 +1151,6 @@ I<Developer's usage>: The function I<pre_format_html_hook> is called when the
hook is triggered, taking the document's URL and the HTML source as its two
arguments. It returns the rewritten HTML code.
=back
=cut
################################################################################
### pre_format_html_hook #######################################################
@ -1242,6 +1240,8 @@ content-type:text/html.
}
=back
=head1 PROXY FOR HOOK
@ -1256,8 +1256,6 @@ I<Developer's usage>: The function I<proxy_for_hook> is called when the hook is
triggered, taking the target URL as its only argument. It returns the proxy
URL, empty string to use no proxy or I<undef> to use the default proxy URL.
=back
=cut
################################################################################
### proxy_for_hook #############################################################
@ -1281,6 +1279,8 @@ Prevents proxy usage for local files and C<http://localhost>.
}
=back
=head1 QUIT HOOK
@ -1294,8 +1294,6 @@ I<Developer's usage>: The function I<quit_hook> is called when the hook is
triggered, taking no arguments nor returning anything. ('cause, you know, what
would be the point?)
=back
=cut
################################################################################
### quit_hook ##################################################################
@ -1367,6 +1365,8 @@ A few words of wisdom from ELinks the Sage.
}
=back
=head1 SEE ALSO

View File

@ -113,10 +113,10 @@ clean-local:
$(TXT_DIR)/import-features.conf.txt: $(FEATURES) $(IMPORT_FEATURES_CONF)
$(IMPORT_FEATURES_CONF) > $@
$(TXT_DIR)/elinks.1.%.txt: $(MAKE_ELINKS_MANPAGE) $(ELINKS)
$(TXT_DIR)/elinks.1.%.txt: $(MAKE_ELINKS_MANPAGE) $(ELINKS) $(HELP2DOC) Makefile
$(LOCALES) $(MAKE_ELINKS_MANPAGE) $@ $(ELINKS) $(HELP2DOC) > $@
$(TXT_DIR)/elinkskeys.5.%.txt: $(MAKE_ELINKSKEYS_MANPAGE) $(KBDBIND)
$(TXT_DIR)/elinkskeys.5.%.txt: $(MAKE_ELINKSKEYS_MANPAGE) $(KBDBIND) Makefile
$(LOCALES) $(MAKE_ELINKSKEYS_MANPAGE) $@ $(KBDBIND) > $@
@ -138,7 +138,7 @@ $(MAN_DIR)/man5/elinkskeys.5: $(XML_DIR)/elinkskeys.5.man.xml
< $@.tmp > $@
rm $@.tmp
$(MAN_DIR)/man5/elinks.conf.5: $(ELINKS)
$(MAN_DIR)/man5/elinks.conf.5: $(ELINKS) $(HELP2DOC) Makefile
$(LOCALES) $(HELP2DOC) --elinks=$(ELINKS) --elinksconf > $@
# XHTML/CSS Man Pages

View File

@ -230,7 +230,6 @@ print_elinksconf_footer()
echo "$dist_info"
echo ".SH \"SEE ALSO\""
echo ".BR elinks (1),"
echo ".BR elinksmanual (1),"
echo ".BR elinkskeys (5)"
}