aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-24 14:14:28 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-24 14:14:28 +0000
commitdbd52ac2ca59d404bdcc29c5c90bda822f2c9334 (patch)
treeeb26b5d041a592583fa1ae5a918e64186bb3e78d /doc
parentMerge from upstream on 2011-01-17 (diff)
downloadw3m-dbd52ac2ca59d404bdcc29c5c90bda822f2c9334.tar.gz
w3m-dbd52ac2ca59d404bdcc29c5c90bda822f2c9334.zip
Merge from upstream on 2012-05-22
Diffstat (limited to '')
-rw-r--r--doc-jp/STORY.html3
-rw-r--r--doc/STORY.html4
-rw-r--r--doc/w3m.12
3 files changed, 7 insertions, 2 deletions
diff --git a/doc-jp/STORY.html b/doc-jp/STORY.html
index c261b47..a3b22a4 100644
--- a/doc-jp/STORY.html
+++ b/doc-jp/STORY.html
@@ -158,6 +158,9 @@ w3m は,
<a href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">Boehm GC</a>
というライブラリを利用している.これは私が書いたものではないが,
コンパイル時の便宜を考えて配布パッケージに含めている.
+<P>
+# Boehm GC は、w3m-0.4.2 以降のパッケージには含まれていません。
+<P>
なお,libwww は使っていない.
<P>
Boehm GCは,Cから使えるガベージコレクタだ.table を実装したあたりにこれを
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..8f071c6 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -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>