diff -rNu links-0.96/AUTHORS links-0.96+admin/AUTHORS
--- links-0.96/AUTHORS	Sat Jun 23 01:00:00 2001
+++ links-0.96+admin/AUTHORS	Sat Oct  6 23:23:03 2001
@@ -181,3 +181,10 @@
 Nalin Dahyabhai <nalin@redhat.com>
 	Fixed occasional destroying of read buffer on Alpha
 
+Petr Baudis <pasky@ji.cz>
+	Cookies expiring and saving
+	True HTTP referrer
+	Textarea edit in external editor (still broken)
+	Manpage updates
+	Random fixes
+	Maintainer of links-pb tree
diff -rNu links-0.96/ChangeLog links-0.96+admin/ChangeLog
--- links-0.96/ChangeLog	Mon Jul  2 02:26:02 2001
+++ links-0.96+admin/ChangeLog	Sat Oct  6 23:23:03 2001
@@ -1,3 +1,20 @@
+=== RELEASE 0.96-pb2 ===
+
+Sat Oct  6 22:22:49 CEST 2001 Petr Baudis <pasky@ji.cz>:
+
+	* cookies expiration, saving and resaving
+	* do NOT strip everything after ? in form action
+	* http referer, true http referer
+	* limited textarea external editor support
+	* partial fix of &#13;
+	* enhanced manual page
+	* fixed multi-level HTTP moved when using -dump/-source
+	* fixed keybindings
+
+=== RELEASE 0.96-pb1 ===
+
+	untracked
+
 === RELEASE 0.96 ===
 
 Mon Jul  2 03:25:39 MET DST 2001 Serge Winitzki <serge@scriabin.PHYS.cwru.edu>:
diff -rNu links-0.96/INFO links-0.96+admin/INFO
--- links-0.96/INFO	Thu Jan  1 01:00:00 1970
+++ links-0.96+admin/INFO	Sat Oct  6 23:26:12 2001
@@ -0,0 +1,211 @@
+all those patches are lying at http://pasky.ji.cz/~pasky/dev/links/.
+
+all those patches against links-lua, however should apply w/o probs to ordinary links
+as well. nevertheless check http://links.sourceforge.net/links-lua/ for links-lua, it's
+a GREAT thing :-)
+
+
+
+  TODO: (nope, i don't expect implementing everything from this list :-)
+        - http auth (urgent)
+	- clear support of editarea
+	- merge nice things from ftp://ftp.civo.aca.nsc.ru/userq/qmax/patches/
+	- cookies manager
+	- css support
+	- ecmascript support
+	- windowing support
+	- make most my patches optional on compile/run time
+	- IPv6 support
+	- rewrite HTML parser
+	- user interface for rebinding of keys
+	- documentation
+
+
+
+
+links-0.96-pb2
+~~~~~~~~~~~~~~
+  this package is just a compilation of several useful patches for links, for authors and
+  details see their description bellow.
+
+  this patch contains:
+  - referer-0.96.patch true-referer-0.96.patch true-referer-0.96-man.patch
+    true-referer-0.96-lng.patch
+  - editarea-0.96.patch editarea-0.96-man.patch
+  - cookies-expire-0.96.patch cookies-save-0.96.patch cookies-resave-0.96.patch
+    cookies-save-0.96-man.patch cookies-resave-0.96-man.patch
+  - crfix-0.96.patch moved-0.96.patch noqstrip-0.96.patch kbindfix-0.96.patch
+  - admin-0.96-pbX.patch
+
+  there's also a -lua version of this patch, which contains -lua compatible true-referer
+  patch.
+
+  note that you need to touch * in links/ directory after patching, due to some broken
+  rules in Makefile..
+
+
+
+
+links-0.96-pb1
+~~~~~~~~~~~~~~
+  this package is just a compilation of several useful patches for links, for authors and
+  details see their description bellow.
+
+  this patch contains: referer-0.96.patch true-referer-0.96-lua.patch editarea-0.96.patch
+  cookies-expire-0.96.patch cookies-save-0.96.patch (Oct 1 ver) cookies-resave-0.96.patch
+  crfix-0.96.patch moved-0.96.patch
+
+
+
+
+referer patches
+~~~~~~~~~~~~~~~
+  referer-0.96		patch by Petr Kulhavy <brain@artax.karlin.mff.cuni.cz>
+  			depends on: N/A
+  true-referer-0.96	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: referer-0.96
+  true-referer-0.96-lua	patch by Petr Baudis <pasky@ji.cz> (as previous, but for links-lua)
+  			depends on: referer-0.96 lua-0.96-p11
+  true-referer-0.96-lng	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: referer-0.96
+  true-referer-0.96-lnl	patch by Petr Baudis <pasky@ji.cz> (as previous, but for links-lua)
+  			depends on: referer-0.96 lua-0.96-p11
+  true-referer-0.96-man	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: manpage-0.96
+
+  first patch adds http referer support to links, so many sites won't panic from seeing links
+  crawling around. second patch extends this capability and you can even send http referers
+  which looks just like those sent by ordinary browsers.
+
+  the last patch documents the switches added by previous patches.
+
+  after applying do either:
+  1.) cd intl; ./syncintl; cd ..;
+  2.) apply true-referer-0.96-ln[gl] patch
+  then, to be sure, do touch * (links' make rules are somewhat broken ;), and try
+  to compile it.
+
+
+cookies patches
+~~~~~~~~~~~~~~~
+  cookies-expire-0.96	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+  cookies-save-0.96	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: cookies-expire-0.96
+  cookies-resave-0.96	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: cookies-save-0.96
+  cookies-save-0.96-man	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: manpage-0.96
+  cookies-resave-0.96-man	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: manpage-0.96
+
+  first patch adds possibility of cookie expiration, it's very tiny (compared to the one
+  which actually can be found on download sites of links) etc :-). second patch extends this
+  possibility and it saves/restores cookies (not expired ones, of course, and not the ones
+  about which you didn't say they should expire with browser shutdown) from the file at
+  shutdown/start of links.
+
+  the resave patch is kinda arcane - it will save ~/.links/cookies every time it will get a
+  cookie, and it will add a keybinding cookies-load (^K), which will re-load ~/.links/cookies
+  and modify internal cookies list accordingly. so you can edit your cookies in your favorite
+  editor, and add/remove/modify ones.
+
+  the two last patches document the ~/.links/cookies file or ^K key respective.
+
+  note that the cookies-save patch was fixed at Mon Oct  1 14:12:17 CEST 2001 - the previous one
+  contained potential problem when cookies file was broken.
+  
+  after applying just compile :-)
+
+
+moved patch
+~~~~~~~~~~~
+  moved-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch fixes small bug in links' -dump/-source feature - it correctly handles
+  relative redirect on the site you want to download...
+  
+  after applying just compile :-)
+
+
+editarea patch
+~~~~~~~~~~~~~~
+  editarea-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+  editarea-0.96-man	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: manpage-0.96
+
+  this patch allows you to open textarea you have actually selected in your favourite text
+  editor, make whatever changes, save it and get saved changes back in links... this can
+  be pretty useful sometimes. you will launch the editor by pressing ^T, or (theoretically,
+  not working yet) F4 in some textarea. note that textarea will update after any move of
+  cursor (will be maybe fixed as well).
+
+  BEWARE! this patch is DIRTY! you are FORBIDDEN to take any kind of inspiration from it,
+  it's just a nasty hack! it probably will make your links CRASH when you will use it
+  (hopefully not normally, just after pressing ^T ;) - but you may try it, i still wonder how
+  it even can work for me :-) i would do it in any better way, if i would ever found one :(
+  suggestions are very welcomed... normally it doesn't wait for editor to finish, so it
+  reads the old version of file, so i have to tweak with global variable etc.. brr..
+
+  after applying just compile, pray and never press ^T ;)
+
+
+crfix patch
+~~~~~~~~~~~
+  crfix-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch adds lynx-like behaviour to links, when &#013; entity is found. Then it
+  is just treated like &#010; one. It is not ideal, but really simple, and could be
+  useful for someone.
+
+  [later note] it works only when using -dump - unfortunately this part of html parser
+  is incredibly ugly, dirty, Mikulas had to be stoned or something when writing that,
+  i'm almost sure ;-).. and with current knowledge of links' code i'm not yet able
+  to rewrite that part completely, and even not going to, just to fix this..
+
+
+noqstrip patch
+~~~~~~~~~~~~~~
+  noqstrip-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch removes links' mis-feature of stripping query string (?...) from action attribute
+  of form tag. many sites depend on query string in action, and i'm not sure why is links
+  even doing it - in changelog there are google groups mentioned, but i didn't expected
+  any problems with this patch there. anyway old links' behaviour is non-standard ;-).
+
+
+manpage patch
+~~~~~~~~~~~~~
+  manpage-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch contains a lot of fixes in links(1) manual page, adding explanation of some
+  undocumented features etc. however, it doesn't add documentation for some features added
+  by other patches available here, they will add it themselves, however depending on this
+  patch.
+
+
+kbindfix patch
+~~~~~~~~~~~~~~
+  kbindfix-0.96		patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch contains really tiny fix for keybinding - "reallyquit" binding was missing,
+  so there was a difference between enum{} in links.h and array in parse_act, which broke
+  things somewhat. ;-)
+
+  thanks to qMax for pointing out this problem.
+
+
+admin-pb patch
+~~~~~~~~~~~~~~
+  admin-0.96-pb2	patch by Petr Baudis <pasky@ji.cz>
+  			depends on: N/A
+
+  this patch contains just misc changes in links tree, clarifying docs coming along the
+  source and propagating itself as links-0.96-pbX :-). just to keep pbX patches really
+  breakable up completely. it won't have a big mean for you, really.
diff -rNu links-0.96/README links-0.96+admin/README
--- links-0.96/README	Sun Dec 31 23:26:52 2000
+++ links-0.96+admin/README	Sat Oct  6 23:23:03 2001
@@ -7,46 +7,17 @@
 See end of file default.c for list of options. Most options can be set in luser
 interface or config file, so you do not need to care about them.
 
-GLOBAL KEYS:
-------------
+See also the manpage for more detailed description of links and its features.
 
-ESC,F9		menu
-F10		menu "files"
-TAB		next frame
-LEFT		back
-CTRL-r,R	reload
-g		goto URL dialog
-G		goto URL dialog with current URL
-a,A		add bookmark dialog
-s,S		bookmarks menu
-q,Q		quit with confirmation
-CTRL-c,C	quit without confirmation
-=		URL info
-|		header info
-\		toggle source
+This is the links-pb tree - not officional links release! It contains more
+features and some bugfixes, but is more experimental.
 
+You can get latest version from http://pasky.ji.cz/~pasky/dev/links. There's
+the whole pb patch available, and broken up smaller patches, from which
+the pb patch consists (it consists just from them, nothing additional
+is there). Always read the README file, it will tell you exactly from what
+the patch consists and dependencies between supplied patches.
 
-KEYS WITHIN FRAME:
-------------------
-
-PGDN,SPACE	next page
-PGUP,b,B	previous page
-DOWN		next link
-UP		previous link
-INS,CTRL-p,P	scroll up
-DEL,CTRL-n,N	scroll down
-[		scroll left
-]		scroll right
-HOME		top of the document
-END		bottom of the document
-RIGHT,ENTER	follow link
-d,D		download link
-/		search (forward) dialog
-?		search (backward) dialog
-n		next search
-N		previous search
-f,F		frame at full screen
-0-9		repeat prefix or go to numbered link
-Alt-0-Alt-9	repeat prefix
+Good luck!
 
 vim: textwidth=80
diff -rNu links-0.96/SITES links-0.96+admin/SITES
--- links-0.96/SITES	Fri Mar 23 03:18:19 2001
+++ links-0.96+admin/SITES	Sat Oct  6 23:23:03 2001
@@ -20,7 +20,10 @@
 	ftp://ftp.scripty.com/pub/redhat/6.x/SRPMS/links-0.95-1.src.rpm
 
 Mailing list:
-	links-list@appwatch.com
-	links-subscribe@appwatch.com
-	links-help@appwatch.com
+	http://links.sf.net/mailing.html
+	links-list@linuxfromscratch.com (bugs, announces)
+	links-discuss@linuxfromscratch.com (developers)
+	listar@linuxfromscratch.com (Subject: subscribe links-list)
 
+pb tree:
+	http://pasky.ji.cz/~pasky/dev/link/
diff -rNu links-0.96/TODO links-0.96+admin/TODO
--- links-0.96/TODO	Sun Dec 31 23:26:52 2000
+++ links-0.96+admin/TODO	Sat Oct  6 23:23:03 2001
@@ -1,24 +1,31 @@
 HTTP User/password
 
-Bookmarks
-
-Cookies (I don't like them, so someone else must do it)
+Cookies manager
 
 NNTP
 
-Html frames (parts of code are ready)
-
 Rewrite html parser
 
 Disk cache
 
 IPv6 support
 
-SSL
-
-Rebindable keys
+User interface for rebindable keys
 
 Passing url to external command
 
 Write some documentation
 
+&#13; broken in <pre>, fixed only partially when using -dump
+
+Fix calling of textarea external editor
+
+EcmaScript support
+
+CSS support
+
+Multiple windows in one console
+
+Better tunability from user interface
+
+-- see INFO file for most actual TODO list for -pb tree
diff -rNu links-0.96/config2.h links-0.96+admin/config2.h
--- links-0.96/config2.h	Mon Jul  2 02:25:24 2001
+++ links-0.96+admin/config2.h	Sat Oct  6 23:23:03 2001
@@ -5,7 +5,7 @@
 #define PACKAGE "links"
 
 /* Version number of package */
-#define VERSION "0.96"
+#define VERSION "0.96-pb2"
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff -rNu links-0.96/configure links-0.96+admin/configure
--- links-0.96/configure	Mon Jul  2 02:28:55 2001
+++ links-0.96+admin/configure	Sat Oct  6 23:23:03 2001
@@ -694,7 +694,7 @@
 
 PACKAGE=links
 
-VERSION=0.96
+VERSION=0.96-pb2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff -rNu links-0.96/configure.in links-0.96+admin/configure.in
--- links-0.96/configure.in	Mon Jul  2 02:25:15 2001
+++ links-0.96+admin/configure.in	Sat Oct  6 23:23:03 2001
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(main.c)
 
-AM_INIT_AUTOMAKE(links, 0.96)
+AM_INIT_AUTOMAKE(links, 0.96-pb2)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
