Index: app/dist/files/README
===================================================================
--- app/dist/files/README	(revision a4d0da553f29bc0fd967ebb3e0e910e46b1f4439)
+++ app/dist/files/README	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -18,4 +18,34 @@
 Installation
 **************
-Run utt_make_config.pl to create configuration files.
-Configuration files will be created in ~/.utt/
+
+1) unpack the UTT tar archive
+2) in the same directory, unpack the tar archives of all UTT dictionary modules you have
+3) run
+	make install
+   in the root directory of the installation
+4) add the bin directory to the PATH variable
+
+
+Requirements
+*************
+
+* File::HomeDir
+
+  the Perl package File::HomeDir must be installed
+  (to install the package, run 'perl -MCPAN -e shell' and write
+   'install File::HomeDir' after the 'cpan>' prompt appears)
+   
+* flex
+
+  to run the ser component, flex must be installed in your system
+
+* ruby
+
+  to run the tre component, ruby must be installed in your system
+
+* locale pl_PL.iso-8852-2
+
+  the locales pl_PL.iso-8859-2 (pl_PL in short) must be installed
+  and set while using UTT with the Polish module. The text you 
+  process with UTT must be encoded in iso-8859-2.
+  
Index: app/doc/utt.texinfo
===================================================================
--- app/doc/utt.texinfo	(revision 261bf629fbaab5db9bf8a88242a386ba8b45b3bf)
+++ app/doc/utt.texinfo	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -367,5 +367,5 @@
 @section Flattened UTT file
 
-A UTT file format has two variants: regular and flattend. The regular
+A UTT file format has two variants: regular and flattened. The regular
 format was described above.  In the flattened format some of the
 end-of-line characters are replaced with line-feed characters.
@@ -1608,9 +1608,9 @@
 
 @example
-cat corpus | tok | sen | lem | grp -a p | lzop -7 > corpus.grp.lzo
-@end example
-
-@example
-lzop -cd corpus.grp.lzo | grp -a gP -e @var{EXPR} | ser -e @var{EXPR}
+cat corpus | tok | sen | lem -1 | fla | lzop -7 > corpus.grp.lzo
+@end example
+
+@example
+lzop -cd corpus.grp.lzo | grp -e @var{EXPR} | unfla | ser -e @var{EXPR}
 @end example
 
@@ -1627,8 +1627,12 @@
 @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}
 @item @strong{Authors:}                 @tab Marcin Walas, Tomasz Obrêbski
-@item @strong{Component category:}      @tab filter
+@item @strong{Input format:}            @tab UTT flattened
+@item @strong{Output format:}           @tab UTT flattened
+@item @strong{Required annotation:}     @tab tok, sen, lem -1
 @end multitable
 
 [TODO]
+
+(see mar's help 'mar -h' for some information)
 
 @c ---------------------------------------------------------------------
@@ -1871,4 +1875,8 @@
 
 
+@c -------------------------------------------------------------------------------
+@c FLA
+@c -------------------------------------------------------------------------------
+
 @page
 @node fla
@@ -1877,7 +1885,19 @@
 @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}
 @item @strong{Authors:}                 @tab Tomasz Obrêbski
-@item @strong{Component category:}      @tab filter
+@item @strong{Input format:}            @tab UTT regular
+@item @strong{Output format:}           @tab UTT flattened
+@item @strong{Required annotation:}     @tab sen
 @end multitable
 @c
+
+@menu
+* fla description::
+@c * fla command line options::
+@c * fla usage example::
+@end menu
+
+
+@node fla description
+@subsection Description
 
 @command{fla} ``flattens'' a utt file by merging segments belonging
@@ -1902,11 +1922,8 @@
 segment contains a fragment matching the @code{<bosregex>}). By
 default, segments containing a field @code{BOS} are seeked.
-@c @menu
-@c * con command line options::
-@c * con usage example::
-@c * con hints::    
-@c @end menu
-
-
+
+@c -------------------------------------------------------------------------------
+@c UNFLA
+@c -------------------------------------------------------------------------------
 
 @page
@@ -1916,7 +1933,17 @@
 @multitable {aaaaaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}
 @item @strong{Authors:}                 @tab Tomasz Obrêbski
-@item @strong{Component category:}      @tab filter
+@item @strong{Input format:}            @tab UTT flattened
+@item @strong{Output format:}           @tab UTT regular
+@item @strong{Required annotation:}     @tab -
 @end multitable
 
+@menu
+* unfla description::
+@c * fla command line options::
+@c * fla usage example::
+@end menu
+
+@node unfla description
+@subsection Description
 @command{unfla} transforms a flattened UTT file, produced by
 @command{fla}, into the regular format by restoring end-of-line
@@ -1971,5 +1998,5 @@
 
 @example
-cat text | tok | lem --only-fail | cor -1 > output3
+cat text | tok | egrep ' W ' | lem | egrep -v 'lem:' | cor -1
 @end example
 
@@ -2020,13 +2047,14 @@
 As @command{grp} (@command{grep}) processes data faster then it is
 read from the disk drive, the search time may be still shortened by
-using file compression techniques.  We suggest usin @command{lzop}.
+using file compression techniques.  We suggest using the
+@command{lzop} compressor/decompressor.
 
 @item the fastest way to search a large corpus
 
-step 1: preprocessing
+step 1: corpus preprocessing
 
 @example
 cat corpus | tok | sen | lem -1 \
-| grp -a p | lzop -7 > corpus.grp.lzo
+| fla | lzop -7 > corpus.grp.lzo
 @end example
 
@@ -2034,5 +2062,5 @@
 
 @example
-lzop -cd corpus.grp.lzo | grp -a gP -e 'cat(<V>) space
+lzop -cd corpus.grp.lzo | unfla | grp -e 'cat(<V>) space
 lexeme(rozmowa)' | ser -e 'cat(<V>) space lexeme(rozmowa)' | con
 @end example
@@ -2040,21 +2068,21 @@
 @end enumerate
 
-@subsubheading More complicated configurations
-
-
-@example
-mknod fifo1 p
-mknod fifo2 p
-mknod fifo3 p
-mknod fifo4 p
-mknod fifo5 p
-
-tok | lem -p W -e fifo1 > fifo2 &
-cor -e fifo3 < fifo1 | lem > fifo4 &
-gue < fifo3 > fifo5 &
-sort -m fifo2 fifo4 fifo5
-
-rm fifo?
-@end example
+@c @subsubheading More complicated configurations
+
+
+@c @example
+@c mknod fifo1 p
+@c mknod fifo2 p
+@c mknod fifo3 p
+@c mknod fifo4 p
+@c mknod fifo5 p
+
+@c tok | lem -p W -e fifo1 > fifo2 &
+@c cor -e fifo3 < fifo1 | lem > fifo4 &
+@c gue < fifo3 > fifo5 &
+@c sort -m fifo2 fifo4 fifo5
+
+@c rm fifo?
+@c @end example
 
 
Index: app/src/common/cmdline_common.ggo
===================================================================
--- app/src/common/cmdline_common.ggo	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/common/cmdline_common.ggo	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -2,9 +2,9 @@
 
 
-option  "input"		f	"Input file" string no hidden
+option  "input"		f	"Input file" string no
 
-option  "output"	o	"Output file" string no hidden
+option  "output"	o	"Output file for succesfully processed segments" string no
 
-option  "fail"		e	"Output file for unsuccesfully processed segments " string no hidden
+option  "fail"		e	"Output file for unsuccesfully processed segments " string no
 
 option 	"only-fail"	-	"Print only segments the program failed to process" flag off hidden
@@ -12,5 +12,5 @@
 option 	"no-fail"	-	"Print only segments the program processed" flag off hidden 
 
-option  "copy"		c       "Copy succesfully processed segments to standard output" flag off hidden
+option  "copy"		c       "Copy succesfully processed segments to standard output" flag off
 
 option  "process"	p	"Process segments with this tag" string no multiple
Index: app/src/cor/Makefile
===================================================================
--- app/src/cor/Makefile	(revision 13a8a67bce500a27f4c2121c096be175d5daab52)
+++ app/src/cor/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -1,4 +1,3 @@
-PAR=-Wno-deprecated -m32 -fpermissive
-# -static
+PAR=-Wno-deprecated -m32 -fpermissive -static
 PAR2=-c -Wno-deprecated -m32 -fpermissive
 LIB_PATH=../lib
Index: app/src/cor/cmdline_cor.ggo
===================================================================
--- app/src/cor/cmdline_cor.ggo	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/cor/cmdline_cor.ggo	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -5,4 +5,4 @@
 option "dictionary"		d	"Dictionary" string typestr="FILENAME" default="cor.bin" no
 option "distance"		n	"Maximal edit distance." int default="1" no
-option "replace"		r	"Replace original form with corrected form, place original form in the cor field. This option has no effect in single mode" flag off
+option "replace"		r	"Replace original form with corrected form, place original form in the cor field. This option has no effect in single mode" flag off hidden
 #option "single"			-	"Place all alternatives in the same line" flag off
Index: app/src/gue/Makefile
===================================================================
--- app/src/gue/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
+++ app/src/gue/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -1,4 +1,3 @@
-PAR=-Wno-deprecated -O3 -fpermissive -m32
-#-static
+PAR=-Wno-deprecated -O3 -fpermissive -m32 -static
 PAR2=-c -Wno-deprecated -O3 -fpermissive -m32
 LIB_PATH=../lib
Index: app/src/kor/Makefile
===================================================================
--- app/src/kor/Makefile	(revision 13a8a67bce500a27f4c2121c096be175d5daab52)
+++ app/src/kor/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -1,4 +1,3 @@
-PAR=-Wno-deprecated -m32 -fpermissive
-# -static
+PAR=-Wno-deprecated -m32 -fpermissive -static
 PAR2=-c -Wno-deprecated -m32 -fpermissive
 LIB_PATH=../lib
Index: app/src/lem/Makefile
===================================================================
--- app/src/lem/Makefile	(revision 13a8a67bce500a27f4c2121c096be175d5daab52)
+++ app/src/lem/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -1,5 +1,4 @@
-PAR=-Wno-deprecated -m32 -O3 -fpermissive
-#-static
-PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive
+PAR=-Wno-deprecated -m32 -O3 -fpermissive -static
+PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive -static
 LIB_PATH=../lib
 COMMON_PATH=../common
Index: lang/Makefile
===================================================================
--- lang/Makefile	(revision ef85bd7e83d1ab6ee403fb373e64f271ac6e1648)
+++ lang/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -11,4 +11,5 @@
 export UTT_DIC_OUTPUT=${CUR_DIR}
 
+export LANG_MODULES=pl_PL.ISO-8852-2 pl_PL.UTF-8
 
 # path to dictionary compiler
@@ -32,2 +33,8 @@
 	cd dist && make tarball; cd ${CUR_DIR};
 	
+	
+.PHONY: dist_tarball_pl_PL.ISO-8859-2
+dist_tarball:
+	export DIC_LANG=pl_PL.ISO-8859-2 && \
+	cd dist && make tarball; cd ${CUR_DIR};
+	
Index: lang/dist/tarball/Makefile
===================================================================
--- lang/dist/tarball/Makefile	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
+++ lang/dist/tarball/Makefile	(revision e28a62525995e07b8d354225ae96189c5c02a06d)
@@ -13,5 +13,6 @@
 _TARBALL_ROOT=$(DIR)/utt-$(_UTT_VER).$(_UTT_REL)
 _UTT_DIC_HOME=share/utt
-_TAR_FILE_NAME=utt.dic.$(_UTT_VER)_$(_UTT_REL)
+_TAR_FILE_NAME=utt.$(_UTT_VER)_$(_UTT_REL)
+
 
 #defualt task
@@ -21,5 +22,5 @@
 	@echo Output directory for tarball: ${UTT_DIC_OUTPUT}
 	mkdir -p ${_TARBALL_ROOT}/${_UTT_DIC_HOME}
-	if test -n "${DIC_LANG}" -a -d ${UTT_DIC_BIN}/${DIC_LANG} ; \
+	if [[ -n "${DIC_LANG}" && -d ${UTT_DIC_BIN}/${DIC_LANG} ]]; \
 	then \
 	    echo "Tworze dystrybucje ${DIC_LANG}"; \