Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						caa996c6a1
					 | 
					
						
						
							
							[w3m-dev 03985] Re: support for 307 Temporary Redirect
						
						
						
						
						
						
						
						* file.c (loadGeneralFile): support 307 Temporary Redirect
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> 
						
						
					 | 
					
						2003-10-08 14:51:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						683e546c2d
					 | 
					
						
						
							
							fix build error --disbable-m17n
						
						
						
						
						
						
						
						* config.h.in: undef USE_M17N, USE_UNICODE
* etc.c (url_unquote_conv): USE_M17N
* file.c (convertLine): USE_M17N
	(loadHTMLStream): fix ifdef USE_IMAGE->USE_M17N
	(loadBuffer): fix USE_M17N
	(getNextPage): fix USE_M17N
* fm.h (USE_M17N): don't define USE_M17N in case LANG == JA
		(this should be done by configure)
	(wc_ces): dummy typedef
	(wc_Str_conv): fix non-m17n macro args
	(wc_Str_conv_strict): ditto
* ftp.c (loadFTPDir): fix undefined USE_M17N
* mimehead.c (decodeWord): ditto
	(decodeMIME): ditto
* news.c (loadNewsgroup): ditto
* proto.h (convertLine): ditto
	(loadGopherDir): ditto
	(loadFTPDir): ditto
	(loadNewsgroup): ditto
	(decodeWord): ditto
	(decodeMIME): ditto
	(url_unquote_conv): ditto
* terms.c (SETCH): ditto
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-10-05 18:52:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						6fa7555a9f
					 | 
					
						
						
							
							* --with-imagelib request on [w3m-dev 03981]
						
						
						
						
						
						
						
						from Mamoru KOMACHI <usata@sodan.ecc.u-tokyo.ac.jp>
* acinclude.m4 (AC_W3M_IMAGE): add --with-imagelib
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-10-05 16:59:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						30d3c1b37a
					 | 
					
						
						
							
							* scripts/w3mman/w3mman.1.in:
						
						
						
						
						
						
						
						change @LIB_DIR@ to @libexecdir@/@PACKAGE@/cgi-bin/ 
						
						
					 | 
					
						2003-10-05 16:24:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						f94b5a4348
					 | 
					
						
						
							
							fix variable usage
						
						
						
						
						
						
					 | 
					
						2003-10-05 16:16:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						6250f5bdc5
					 | 
					
						
						
							
							fix problem reported on [w3m-dev 03981]
						
						
						
						
						
						
						
						from Mamoru KOMACHI <usata@sodan.ecc.u-tokyo.ac.jp>
* configure.in: add AC_SUBST(HELP_DIR)
* Makefile.in (HELP_DIR): use AC_SUBT(HELP_DIR)
* scripts/Makefile.in: add PACKAGE, VERSION, DOMAIN
		use PACKAGE instead of package:
		 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
		add SUBDIRS
		(install unstall): do $(SUBDIRS)
* scripts/multipart/Makefile.in: add PACKAGE,VERSION,DOMAIN
		use PACKAGE instead of package:
		 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
* scripts/w3mman/Makefile.in: add PACKAGE,VERSION,DOMAIN
		use PACKAGE instead of package:
			 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
		add BIN_DIR, MAN1_DIR
		LIB_TARGETS->CGIBIN_TARGETS
		fix INSTALL_MAN 
						
						
					 | 
					
						2003-10-05 16:14:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						742b489496
					 | 
					
						
						
							
							* acinclude.m4 (AC_W3M_SSL): use PKG_CHECK_MODULES
						
						
						
						
						
						
						
						From: Akira TAGOH <at@gclab.org> 
						
						
					 | 
					
						2003-09-30 15:42:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						44f4bc70f7
					 | 
					
						
						
							
							distclean
						
						
						
						
						
						
					 | 
					
						2003-09-29 16:37:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						3c576cd040
					 | 
					
						
						
							
							distclean
						
						
						
						
						
						
					 | 
					
						2003-09-29 16:37:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						908ea87996
					 | 
					
						
						
							
							Makefile.in (distclean): remove posubst
						
						
						
						
						
						
					 | 
					
						2003-09-29 16:34:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						6b5a6bf11f
					 | 
					
						
						
							
							fix functable.c action
						
						
						
						
						
						
					 | 
					
						2003-09-28 16:13:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						1ce0d7fe50
					 | 
					
						
						
							
							fix indent
						
						
						
						
						
						
					 | 
					
						2003-09-26 20:58:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						82cbecec07
					 | 
					
						
						
							
							fix indent
						
						
						
						
						
						
					 | 
					
						2003-09-26 20:48:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						28bc348680
					 | 
					
						
						
							
							* funcname.tab: generated from DEFUN
						
						
						
						
						
						
						
						* main.c menu.c: use DEFUN 
						
						
					 | 
					
						2003-09-26 20:45:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						eb5aa3e915
					 | 
					
						
						
							
							add comments
						
						
						
						
						
						
					 | 
					
						2003-09-26 17:59:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						0a1f4d97bf
					 | 
					
						
						
							
							conv.c ucs_eucjp.h ucs_latin1.h: deleted
						
						
						
						
						
						
					 | 
					
						2003-09-26 16:57:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						92184a48fb
					 | 
					
						
						
							
							ignore remove-potcdate.sed
						
						
						
						
						
						
					 | 
					
						2003-09-25 18:35:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						e03485a3b1
					 | 
					
						
						
							
							update-po
						
						
						
						
						
						
					 | 
					
						2003-09-25 18:35:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						4cd6cfe675
					 | 
					
						
						
							
							ignore posubst
						
						
						
						
						
						
					 | 
					
						2003-09-25 18:15:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						320288f8d5
					 | 
					
						
						
							
							add posubst.in
						
						
						
						
						
						
					 | 
					
						2003-09-25 18:15:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						2b0913ff2a
					 | 
					
						
						
							
							add posubst,  compile-time message l10n
						
						
						
						
						
						
						
						* Makefile.in: @POSUBST@
* acinclude.m4(AC_W3M_M17N): add POSUBST, POLANG
	--enable-messagel10n
* configure.in (W3M_LANG): subst
	(AM_GET_GNUTEXT): if messagel10n enabled, don't use NLS
	(AC_OUTOUT): add posubst, chmod +x
* menu.c: remove if LANG == JA messages
* rc.c: ditto
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-25 18:08:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						f28aedff05
					 | 
					
						
						
							
							check header locale.h
						
						
						
						
						
						
						
						check func setlocale
no need to output intl/Makefile 
						
						
					 | 
					
						2003-09-25 16:56:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						643e12ed8c
					 | 
					
						
						
							
							* remove ./intl
						
						
						
						
						
						
						
						* configure.in: external fo AM_GNU_GETTEXT
* Makefile.in: remove intl, INTLTARGET
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-25 16:39:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						4065eca46e
					 | 
					
						
						
							
							gettextize
						
						
						
						
						
						
					 | 
					
						2003-09-25 04:38:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						aa1e6eef49
					 | 
					
						
						
							
							add NLSTARGET
						
						
						
						
						
						
					 | 
					
						2003-09-25 04:36:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						01696913c0
					 | 
					
						
						
							
							update comment
						
						
						
						
						
						
					 | 
					
						2003-09-25 03:38:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						b2b9d4db5a
					 | 
					
						
						
							
							fix [w3m-dev 03975] Re: gettextize
						
						
						
						
						
						
						
						* Makefile.in: add INTLTARGET, cleanup
* configure.in: INTLTARGET=intl if USE_NLS
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-25 03:35:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						b411c1109d
					 | 
					
						
						
							
							fix indent
						
						
						
						
						
						
					 | 
					
						2003-09-24 18:48:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						ed6197d1a0
					 | 
					
						
						
							
							gettextize
						
						
						
						
						
						
						
						* Makefile.in: updated
* menu.c: gettextize
* rc.c: gettextize
* intl/.cvsignore: added
* po/.cvsignore: added
* po/Makevars: added
* po/Makevars.template: removed
* po/POTFILES.in: updated
* po/w3m.pot: created
* po/ja.po: created
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-24 18:35:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						cd007d6830
					 | 
					
						
						
							
							based on [w3m-dev 03970]
						
						
						
						
						
						
						
						SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
* acinclude.m4 (AC_W3M_IMAGE): add IMGTARGETS
* w3mimg/Makefile.in (all): use @IMGTARGETS@
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-24 14:05:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						2b74f5b767
					 | 
					
						
						
							
							gettextize initial modifications
						
						
						
						
						
						
					 | 
					
						2003-09-23 18:42:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						c671efea32
					 | 
					
						
						
							
							cd in subdir
						
						
						
						
						
						
					 | 
					
						2003-09-23 17:42:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						20f7494492
					 | 
					
						
						
							
							fix srcdir, top_srcdir
						
						
						
						
						
						
					 | 
					
						2003-09-22 23:16:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						655e0f310b
					 | 
					
						
						
							
							fix top_srcdir
						
						
						
						
						
						
					 | 
					
						2003-09-22 23:12:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						fbec4f7f09
					 | 
					
						
						
							
							clean libwc.a
						
						
						
						
						
						
					 | 
					
						2003-09-22 23:02:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						8e34e9b255
					 | 
					
						
						
							
							use srcdir
						
						
						
						
						
						
					 | 
					
						2003-09-22 23:01:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						149ff2aa6f
					 | 
					
						
						
							
							more autoconfiscate
						
						
						
						
						
						
					 | 
					
						2003-09-22 22:53:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						8de528a07b
					 | 
					
						
						
							
							m17n patch merge done
						
						
						
						
						
						
					 | 
					
						2003-09-22 21:37:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						6be3de8b91
					 | 
					
						
						
							
							m17n patch merged
						
						
						
						
						
						
					 | 
					
						2003-09-22 21:29:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						b0754b366a
					 | 
					
						
						
							
							fix build problem
						
						
						
						
						
						
					 | 
					
						2003-09-22 21:27:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						604c11affe
					 | 
					
						
						
							
							merge m17n patch
						
						
						
						
						
						
						
						add libwc 
						
						
					 | 
					
						2003-09-22 21:02:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						6d122c7f45
					 | 
					
						
						
							
							* version.c.in: cvs version
						
						
						
						
						
						
					 | 
					
						2003-09-22 19:07:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						d05aab3acc
					 | 
					
						
						
							
							* w3m 0.4.2
						
						
						
						
						
						
						
						* version.c.in: update
* doc/README: version 0.4.2, release date
* doc-jp/README: ditto
* NEWS: update
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-22 18:11:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						f9f7f794a2
					 | 
					
						
						
							
							[w3m-dev 03967] Re: IPv4/IPv6 only option patch
						
						
						
						
						
						
						
						* NEWS: options: -4, -6
* fm.h (DNS_ORDER_INET_ONLY): added
	(DNS_ORDER_INET6_ONLY): added
	(ai_family_order_table): [3]->[7]
* main.c (fusage): add -4/-6
	(main): -4/-6 mapped to dns_order=4/dns_order=6
* rc.c (dnsorders): add DNS_ORDER_INET_ONLY, DNS_ORDER_INET6_ONLY
* url.c (dnsorders): add 3-6
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-09-22 17:37:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						d29dc6b852
					 | 
					
						
						
							
							rerun aclocal & autoconf
						
						
						
						
						
						
					 | 
					
						2003-09-16 14:23:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						df57a9f221
					 | 
					
						
						
							
							[w3m-dev 03960]
						
						
						
						
						
						
						
						* acinclude.m4 (AC_W3M_CHECK_VER): fix version check logic
From: Hiroyuki Ito <hito@crl.go.jp> 
						
						
					 | 
					
						2003-09-16 14:23:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						2086c1e90c
					 | 
					
						
						
							
							[w3m-dev 03958] w3mimgdisplay on jfbterm
						
						
						
						
						
						
						
						* w3mimg/fb/fb_w3mimg.c (w3mimg_fbopen): check TERM=jfbterm
From: Fumitoshi UKAI  <ukai@debian.or.jp> 
						
						
					 | 
					
						2003-08-29 15:06:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						9b35e9d994
					 | 
					
						
						
							
							[w3m-dev 03957] Location: from local-CGI
						
						
						
						
						
						
						
						* file.c (loadGeneralFile): don't parse header for local file
	redirected by Location: from local-CGI
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> 
						
						
					 | 
					
						2003-08-29 14:49:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						4550ab0e2a
					 | 
					
						
						
							
							[w3m-dev 03950] rel attribute of anchor tag
						
						
						
						
						
						
						
						* html.c (ALST_A): add ATTR_REL
	(MAXA_A): +1
From: TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp> 
						
						
					 | 
					
						2003-08-11 17:33:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fumitoshi UKAI
							
						 
					 | 
					
						
						
							
						
						c50eeeb4f7
					 | 
					
						
						
							
							* configuration file in $(sysconfdir)/$(package)/
						
						
						
						
						
						
					 | 
					
						2003-07-26 17:20:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |