aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CVS/Entries21
-rw-r--r--doc/CVS/Repository1
-rw-r--r--doc/CVS/Root1
-rw-r--r--doc/MANUAL.html12
-rw-r--r--doc/README5
-rw-r--r--doc/README.img2
-rw-r--r--doc/README.siteconf60
-rw-r--r--doc/STORY.html4
-rw-r--r--doc/w3m.14
9 files changed, 73 insertions, 37 deletions
diff --git a/doc/CVS/Entries b/doc/CVS/Entries
deleted file mode 100644
index 8cae998..0000000
--- a/doc/CVS/Entries
+++ /dev/null
@@ -1,21 +0,0 @@
-/HISTORY/1.2/Tue Jul 9 05:54:46 2002//
-/README.cygwin/1.5/Sun Feb 23 16:00:16 2003//
-/README.dict/1.4/Wed Apr 24 18:46:48 2002//
-/README.func/1.21/Mon Sep 22 21:02:22 2003//
-/README.mouse/1.1/Mon Nov 25 17:23:45 2002//
-/README.pre_form/1.3/Mon May 12 16:24:53 2003//
-/README.tab/1.1/Tue Nov 5 17:24:47 2002//
-/STORY.html/1.3/Wed Nov 21 04:29:14 2001//
-/keymap.lynx/1.4/Fri Dec 13 03:02:04 2002//
-/menu.default/1.4/Fri Apr 7 15:05:49 2006//
-/menu.submenu/1.3/Fri Apr 7 15:05:49 2006//
-/keymap.default/1.8/Sat Jun 10 09:52:18 2006//
-/FAQ.html/1.9/Tue Jan 4 09:22:24 2011//
-/MANUAL.html/1.6/Tue Jan 4 09:22:24 2011//
-/README.img/1.6/Tue Jan 4 09:22:24 2011//
-/README.m17n/1.3/Tue Jan 4 09:22:24 2011//
-/README.passwd/1.1/Tue Aug 3 10:02:16 2010//
-/README.cookie/1.2/Sat Jan 15 01:57:39 2011//
-/README/1.26/Sat Jan 15 02:17:25 2011//
-/w3m.1/1.9/Sat Jan 15 06:37:24 2011//
-D
diff --git a/doc/CVS/Repository b/doc/CVS/Repository
deleted file mode 100644
index 5431c7e..0000000
--- a/doc/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/doc
diff --git a/doc/CVS/Root b/doc/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/doc/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/doc/MANUAL.html b/doc/MANUAL.html
index aff0189..0a00b59 100644
--- a/doc/MANUAL.html
+++ b/doc/MANUAL.html
@@ -55,12 +55,10 @@ If you don't specify this option,
<dt>-l number
<dd>Specify line number preserved internally when reading text/plain document
fron standard input. Default is 10000.
-<dt>-s
-<dd>Display documents with Shift_JIS code.
-<dt>-e
-<dd>Display documents with EUC_JP code.
-<dt>-j
-<dd>Display documents with ISO-2022-JP code.
+<dt>-O charset
+<dd>Specify display/output charset.
+<dt>-I charset
+<dd>Specify document charset.
<dt>-T type
<dd>Specify document type. Without this option, document type
is determined from extension of a file. If the determination
@@ -90,7 +88,7 @@ It is useful when reading E-mail or NetNews messages.
<dd>Monochrome display mode.
<dt>-F
<dd>Automatically render frame.
-<dt>-S
+<dt>-s
<dd>Squeeze blank lines.
<dt>-X
<dd>Upon exit, do not display preserved screen.
diff --git a/doc/README b/doc/README
index 324ea3e..60d6d19 100644
--- a/doc/README
+++ b/doc/README
@@ -115,7 +115,6 @@ Current Maintainer
Tohoku University Hospital
satodai@w3m.jp
-Feel free to send your opinion to the w3m mailing-lists.
- w3m-dev@sic.med.tohoku.ac.jp (Japanese)
- w3m-dev-en@sic.med.tohoku.ac.jp (English)
+Feel free to send your opinion to:
http://w3m.sourceforge.net/
+ https://sourceforge.net/projects/w3m/
diff --git a/doc/README.img b/doc/README.img
index 0c10114..f11362f 100644
--- a/doc/README.img
+++ b/doc/README.img
@@ -41,7 +41,7 @@ Key functions
Specify the following keymaps in ~/.w3m/keymap.
keymap X DISPLAY_IMAGE
keymap C-c STOP_IMAGE
- keyamp t SET_OPTION display_image=toggle
+ keymap t SET_OPTION display_image=toggle
Commandline options
diff --git a/doc/README.siteconf b/doc/README.siteconf
new file mode 100644
index 0000000..f173087
--- /dev/null
+++ b/doc/README.siteconf
@@ -0,0 +1,60 @@
+The siteconf: Site-specific preferences
+
+The siteconf consists of URL patterns and preferences associated to them.
+You can improve "decode_url" feature by giving charsets of URLs site by site,
+or bypass Google's redirector for performance and your privacy.
+
+The siteconf is read from ~/.w3m/siteconf by default.
+
+===== The syntax =====
+
+url <url>|/<re-url>/|m@<re-url>@i [exact]
+substitute_url "<destination-url>"
+url_charset <charset>
+no_referer_from on|off
+no_referer_to on|off
+
+The last match wins.
+
+===== Examples =====
+
+url "http://twitter.com/#!/"
+substitute_url "http://mobile.twitter.com/"
+
+This forwards the twitter.com to its mobile site.
+
+url "http://your.bookmark.net/"
+no_referer_from on
+
+This prevents HTTP referers from being sent when you follow links
+at the your.bookmark.net.
+
+url "http://www.google.com/url?" exact
+substitute_url "file:///cgi-bin/your-redirector.cgi?"
+
+This forwards the Google's redirector to your local CGI.
+
+url /^http:\/\/[a-z]*\.wikipedia\.org\//
+url_charset utf-8
+
+When combinated with "decode_url" option turned on, links to
+Wikipedia will be human-readable.
+
+===== Regular expressions notes =====
+
+Following expressions are all equivalent:
+
+/http:\/\/www\.example\.com\//
+m/http:\/\/www\.example\.com\//
+m@http://www\.example\.com/@
+m!http://www\.example\.com/!
+
+With a trailing 'i' modifier, you can specify a case-insensitive match.
+For example, m@^http://www\.example\.com/abc/@i matches to:
+
+http://www.example.com/abc/
+http://www.example.com/Abc/
+http://www.example.com/ABC/
+
+Hostnames, however, are always converted to lowercases before compared.
+
diff --git a/doc/STORY.html b/doc/STORY.html
index 8e89f8c..4ac29ec 100644
--- a/doc/STORY.html
+++ b/doc/STORY.html
@@ -182,6 +182,10 @@ library. This library was written by H. Boehm and A. Demers.
I could distribute w3m without this library because one can
get the library separately, but I decided to contain it in the
w3m distribution for the convenience of an installer.
+<P>
+# Boehm GC library is no longer included into w3m packages
+# after w3m-0.4.2.
+<P>
W3m doesn't use libwww.
<P>
Boehm GC is a garbage collector for C and C++. I began to use this
diff --git a/doc/w3m.1 b/doc/w3m.1
index aeb4a60..58a8965 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -143,7 +143,7 @@ use graphic character
.B -no-graph
don't use graphic character
.TP
-.B -S
+.B -s
squeeze multiple blank lines
.TP
.B -W
@@ -245,8 +245,6 @@ or on its English version of the site at:
.I
w3m
has incorporated code from several sources.
-Hans J. Boehm, Alan J. Demers, Xerox Corp. and Silicon Graphics
-have the copyright of the GC library comes with w3m package.
Users have contributed patches and suggestions over time.
.SH AUTHOR
Akinori ITO <aito@fw.ipsj.or.jp>