4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e11e1c..7c507d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-04-08  Dai Sato  <satodai@w3m.jp>
 
+	* [w3m-dev 04152] [PATCH] Add more explanation for the usage of the option setting panel.
+	* doc(-jp)/FAQ.html, doc-jp/MANUAL.html: add explanations for .w3m/config and -o option.
+
+2006-04-08  Dai Sato  <satodai@w3m.jp>
+
 	* [w3m-dev 04150] vi-prec_num
 	* main.c: fix vi_prec_num switching.
 
@@ -8693,4 +8698,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.957 2006/04/08 11:21:07 inu Exp $
+$Id: ChangeLog,v 1.958 2006/04/08 11:26:22 inu Exp $
diff --git a/doc-jp/FAQ.html b/doc-jp/FAQ.html
index d74b35d..e16a986 100644
--- a/doc-jp/FAQ.html
+++ b/doc-jp/FAQ.html
@@ -222,6 +222,9 @@ application/x-dvi;           xdvi %s
 <dl>
 <dt>����ե�����Ϥɤ��ˤ���Ρ�
 <dd>~/.w3m �ǥ��쥯�ȥ�β��� config �Ǥ���
+���ץ��������ѥͥ���ѹ��Ǥ���ȵ��Ҥ���Ƥ��륪�ץ������ͤ�
+���Υե�������ѹ�����ȡ�w3m �ε�ư��Ĵ���Ǥ��ޤ���
+���ץ�����̾�����ͤ����Ƕ��ڤä���Τ� 1 �Ԥ� 1 �Ȥ��Ľ񤤤����ꤷ�ޤ���
 <p>
 <dt>~/.w3m �β��� w3mXXXXXX �Τ褦�ʥե����뤬�������󤢤뤱�ɡ�����
 <dd>WWW�����Ф���ե�������ɤ�Ǥ���Ȥ��ˡ��������Ū����¸����
diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html
index 9dab5d9..0b24619 100644
--- a/doc-jp/MANUAL.html
+++ b/doc-jp/MANUAL.html
@@ -97,6 +97,7 @@ HTML�ե�����Υ�������ɽ������
 <dd>�ޤ��֤���������Ȥ����ɤ������ڤ꤫���롥
 <dt>-o option=value
 <dd>���ץ�������ꤹ�롥
+���ץ�����̾�����ͤϡ�~/.w3m/config �ǻ��ꤹ���Τ�Ʊ����
 <dt>-no-proxy
 <dd>�ץ����������Ѥ��ʤ���
 <dt>-pauth user:pass
diff --git a/doc/FAQ.html b/doc/FAQ.html
index a3e0cfc..50478e3 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -270,6 +270,10 @@ with Ctrl-u. What to do?</h3>
 <dl>
 <dt><h3>What is w3m's configuration file?</h3>
 <dd>It is ~/.w3m/config.
+With this file, you can adjust w3m's behavior by changing values of options
+that are described to be varied with the option setting panel.
+Each line contains setting for one option, which is a pair of an option name
+and its value with a space as a separator.
 <p>
 <dt><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3>
 <dd>These are temporary files used by w3m when reading documents from a