aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--doc/FAQ.html2
-rw-r--r--doc/w3m.171
3 files changed, 75 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cbbb6b..a50349e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-11 d+w3m@vdr.jp
+
+ * [w3m-dev 04414] Re: "normal" bugs from bugs.debian.org
+ * doc/w3m.1: add documents about some options.
+ * doc/FAQ.html: fix typo.
+
2010-08-24 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04393] [patch] locale-related character management
@@ -9194,4 +9200,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.1038 2010/08/24 10:11:51 htrb Exp $
+$Id: ChangeLog,v 1.1039 2010/10/11 12:59:36 htrb Exp $
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 50478e3..ed2a704 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -54,7 +54,7 @@ Corrected by Tom Berger &lt;tom.be@gmx.net&gt;
<li><h3>w3m appends a URL to the former one despite of having cleared the line with Ctrl-u. What to do?</h3>
</ul>
<br>
-<li><a href="other"><h2>Misc</a></h2>
+<li><a href="#other"><h2>Misc</a></h2>
<ul>
<li><h3>What is w3m's configuration file?</h3>
<li><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3>
diff --git a/doc/w3m.1 b/doc/w3m.1
index 93a943a..29caeea 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -8,7 +8,6 @@ w3m \- a text based Web browser and pager
.B w3m
[options] [URL or filename]
.PP
-Use "w3m -h" to display a complete list of current options.
.SH DESCRIPTION
.\" This defines appropriate quote strings for nroff and troff
.ds lq \&"
@@ -53,6 +52,12 @@ ignore backspace effect
.B -l line
# of preserved line (default 10000)
.TP
+.B -I charset
+document charset
+.TP
+.B -O charset
+display/output charset
+.TP
.B -B
load bookmark
.TP
@@ -71,6 +76,9 @@ visual startup mode
.B -M
monochrome display
.TP
+.B -N
+open URL of command line on each new tab
+.TP
.B -F
automatically render frame
.TP
@@ -81,8 +89,11 @@ dump formatted page into stdout
specify column width (used with -dump)
.TP
.B -ppc count
-specify the number of pixels per character (default 8.0)
-Larger values will make tables narrower.
+specify the number of pixels per character (4.0...32.0).
+Larger values will make tables narrower. [default 8.0]
+.TP
+.B -ppl count
+specify the number of pixels per line (4.0...64.0)
.TP
.B -dump_source
dump page source into stdout
@@ -111,6 +122,12 @@ show line number
.B -no-proxy
don't use proxy
.TP
+.B -4
+IPv4 only (-o dns_order=4)
+.TP
+.B -6
+IPv6 only (-o dns_order=6)
+.TP
.B -no-mouse
don't use mouse
.TP
@@ -120,6 +137,12 @@ use cookie.
.B -no-cookie
don't use cookie
.TP
+.B -graph
+use graphic character
+.TP
+.B -no-graph
+don't use graphic character
+.TP
.B -S
squeeze multiple blank lines
.TP
@@ -148,6 +171,9 @@ show usage
.B -version
show w3m version
.TP
+.B -reqlog
+write request logfile
+.TP
.B -debug
DO NOT USE
.SH EXAMPLES
@@ -164,12 +190,49 @@ $ cat foo.html | w3m -T text/html
or
.br
$ cat foo.html | w3m -dump -T text/html >foo.txt
+.SH FILES
+.TP
+.I ${HOME}/.w3m/config
+configuration file
+.TP
+.I ${HOME}/.w3m/keymap
+key binding configuration file
+.\" .TP
+.\" .I ${HOME}/.w3m/menu
+.\" ???
+.TP
+.I ${HOME}/.w3m/mouse
+mouse configuration file
+.TP
+.I ${HOME}/.w3m/cookie
+cookie file
+.TP
+.I ${HOME}/.w3m/history
+history file
+.TP
+.I ${HOME}/.w3m/passwd
+passowrd and username file
+.TP
+.I ${HOME}/.w3m/pre_form
+form parameters file
+.TP
+.I ${HOME}/.w3m/mailcap
+external viewer configuration file
+.TP
+.I ${HOME}/.w3m/mime.types
+MIME types file
+.\" .TP
+.\" .I ${HOME}/.w3m/urimethodmap
+.\" ???
.SH NOTES
This is the
.I
w3m
-0.2.1 Release.
+0.5.2 Release.
.PP
+Please see the MANUAL.html file distributed with w3m for
+more detailed documentation.
+
Additional information about
.I
w3m