--- a/doc/xstow.1
+++ b/doc/xstow.1
@@ -1,26 +1,11 @@
-.\" Automatically generated by Pod::Man version 1.15
-.\" Sun Jul 27 00:16:32 2003
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
 .\"
 .\" Standard preamble:
-.\" ======================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
+.\" ========================================================================
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
 .de Vb \" Begin verbatim text
 .ft CW
 .nf
@@ -28,16 +13,15 @@
 ..
 .de Ve \" End verbatim text
 .ft R
-
 .fi
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used
-.\" to do unbreakable dashes and therefore won't be available.  \*(C` and
-.\" \*(C' expand to `' in nroff, nothing in troff, for use with C<>
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -56,26 +40,28 @@
 .    ds R" ''
 'br\}
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr
-.\" for titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and
-.\" index entries marked with X<> in POD.  Of course, you'll have to process
-.\" the output yourself in some meaningful fashion.
-.if \nF \{\
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it
-.\" makes way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.bd B 3
 .    \" fudge factors for nroff and troff
 .if n \{\
 .    ds #H 0
@@ -135,20 +121,19 @@
 .    ds Ae AE
 .\}
 .rm #[ #] #H #V #F C
-.\" ======================================================================
+.\" ========================================================================
 .\"
 .IX Title "XSTOW 1"
-.TH XSTOW 1 "XStow 0.5.1" "2003-07-27" "XStow Reference Guide"
-.UC
+.TH XSTOW 1 "2010-07-02" "XStow 0.5.1" "XStow Reference Guide"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
-XStow, replacement for \s-1GNU\s0 Stow
+XStow \- replacement for GNU Stow
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 xstow        [\s-1OPTION\s0 ...] \s-1PACKAGE\s0
-.PP
-xstow-static [\s-1OPTION\s0 ...] \s-1PACKAGE\s0
-.PP
-xstow-stow   [\s-1OPTION\s0 ...] \s-1PACKAGE\s0
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 XStow is a replacement of \s-1GNU\s0 Stow (\fBstow\fR) written in \*(C+. It
@@ -158,19 +143,6 @@
 packages, keeping them separate (/usr/local/stow/emacs
 vs. /usr/local/stow/perl, for example) while making them appear to be
 installed in the same place (/usr/local).
-.PP
-By default 3 versions of XStow will be compiled
-.Ip "\fBxstow\fR"
-.IX Item "xstow"
-The default binary (dynamically linked)
-.Ip "\fBxstow-static\fR"
-.IX Item "xstow-static"
-A static version with all enabled features except the ncurses support
-.Ip "\fBxstow-stow\fR"
-.IX Item "xstow-stow"
-A static version with few extensions, which results in a smaller binary.
-All features that will blow up the binary and not required for being 
-compatible to \s-1GNU\s0 Stow are disabled.
 .SH "USAGE"
 .IX Header "USAGE"
 xstow [\s-1OPTION\s0 ...] \s-1PACKAGE\s0
@@ -180,53 +152,54 @@
 .Vb 1
 \&        xstow foobar
 .Ve
+.PP
 Uninstall package
 .PP
 .Vb 1
-\&        xstow -D foobar
+\&        xstow \-D foobar
 .Ve
 .SH "OPTIONS"
 .IX Header "OPTIONS"
-.Ip "\fB\-dl \-debug-level\fR \s-1INT\s0"
+.IP "\fB\-dl \-debug\-level\fR \s-1INT\s0" 2
 .IX Item "-dl -debug-level INT"
 Set's the debug level. An unsigned integer is accepted. The
 default value is 0.
-.Ip "\fB\-dm \-debug-module\fR [ALL|ARG|MAIN|TREE|CPPDIR]"
+.IP "\fB\-dm \-debug\-module\fR [ALL|ARG|MAIN|TREE|CPPDIR]" 2
 .IX Item "-dm -debug-module [ALL|ARG|MAIN|TREE|CPPDIR]"
 Filter messages from a specific module.
-.Ip "\fB\-h \-help\fR"
+.IP "\fB\-h \-help\fR" 2
 .IX Item "-h -help"
 Shows a help screen.
-.Ip "\fB\-V \-Version\fR"
+.IP "\fB\-V \-Version\fR" 2
 .IX Item "-V -Version"
 Displays XStows version number and supported features.
-.Ip "\fB\-n \-no\fR"
+.IP "\fB\-n \-no\fR" 2
 .IX Item "-n -no"
 Do not actually make changes
-.Ip "\fB\-c \-conflicts\fR"
+.IP "\fB\-c \-conflicts\fR" 2
 .IX Item "-c -conflicts"
 Scan for conflicts, implies \fB\-n\fR.
-.Ip "\fB\-s \-simulate\fR"
+.IP "\fB\-s \-simulate\fR" 2
 .IX Item "-s -simulate"
 Simulate installation. If this option is set permission problems will
 be ignored and \fB\-verbose\fR will be set to 1.
-.Ip "\fB\-d \-dir\fR \s-1DIR\s0"
+.IP "\fB\-d \-dir\fR \s-1DIR\s0" 2
 .IX Item "-d -dir DIR"
 Set stow dir to \s-1DIR\s0. The default is the current directory.
-.Ip "\fB\-d \-target\fR \s-1DIR\s0"
-.IX Item "-d -target DIR"
+.IP "\fB\-t \-target\fR \s-1DIR\s0" 2
+.IX Item "-t -target DIR"
 Set target to \s-1DIR\s0. The default is the parent of the stow directory.
-.Ip "\fB\-v \-verbose\fR [0|1|2|3]"
+.IP "\fB\-v \-verbose\fR [0|1|2|3]" 2
 .IX Item "-v -verbose [0|1|2|3]"
 Increase verboseness. Possible levels are 0,1,2 or 3. Simple setting
 \&\fB\-v\fR or \fB\-verbose\fR adds 1.
-.Ip "\fB\-D \-delete\fR"
+.IP "\fB\-D \-delete\fR" 2
 .IX Item "-D -delete"
 Unstow instead of stow. Deinstall the package.
-.Ip "\fB\-R \-restow\fR"
+.IP "\fB\-R \-restow\fR" 2
 .IX Item "-R -restow"
 The same like \fB\-delete\fR followed by an reinstall.
-.Ip "\fB\-ap \-absolute-path\fR"
+.IP "\fB\-ap \-absolute\-path\fR" 2
 .IX Item "-ap -absolute-path"
 Create symlinks with absolute path names. XStow can always handle
 packages which were installed with this option. Installing one package
@@ -237,95 +210,95 @@
 be recreated will be recreated as relative ones. It is not good idea
 doing this, even XStow does not have any problems with it.
 \&\fIWarning:\fR Breaks compatibility with Stow!
-.Ip "\fB\-tr \-traversable\fR \s-1LINKS\s0"
+.IP "\fB\-tr \-traversable\fR \s-1LINKS\s0" 2
 .IX Item "-tr -traversable LINKS"
 A list of links pointing to directories, that can be ignored.
 eg.: /usr/local/man is a link to /usr/local/share/man
 \&\fIWarning:\fR Breaks compatibility with Stow!
-.Ip "\fB\-tkt \-tr-keep-targets\fR"
+.IP "\fB\-tkt \-tr\-keep\-targets\fR" 2
 .IX Item "-tkt -tr-keep-targets"
 Add the list of traversable links also to the keep targets list. This
 prevents the targets of the links from beeing removed by XStow, which
 would cause that the traversable link becomes a dead link.
-.Ip "\fB\-tre \-tr-auto\fR \s-1PATTERN\s0"
+.IP "\fB\-tre \-tr\-auto\fR \s-1PATTERN\s0" 2
 .IX Item "-tre -tr-auto PATTERN"
 Automatically add links which target matches this pattern.
-.Ip "\fB\-tre \-tr-auto-regex\fR \s-1REGEX\s0"
+.IP "\fB\-tre \-tr\-auto\-regex\fR \s-1REGEX\s0" 2
 .IX Item "-tre -tr-auto-regex REGEX"
 Automatically add links which target matches this pattern.
-.Ip "\fBkd \-keep-dirs\fR \s-1DIR\s0"
+.IP "\fBkd \-keep\-dirs\fR \s-1DIR\s0" 2
 .IX Item "kd -keep-dirs DIR"
 A list of directories, that should not be removed when a package will be
 removed. \fIWarning:\fR Breaks compatibility with Stow!
-.Ip "\fB\-i \-ignore\fR \s-1PATTERN\s0"
+.IP "\fB\-i \-ignore\fR \s-1PATTERN\s0" 2
 .IX Item "-i -ignore PATTERN"
 Ignore files that matches this pattern.
-.Ip "\fB\-ire \-ignore-regex\fR \s-1REGEX\s0"
+.IP "\fB\-ire \-ignore\-regex\fR \s-1REGEX\s0" 2
 .IX Item "-ire -ignore-regex REGEX"
 Ignore files that matches this expression.
-.Ip "\fB\-ni \-nignore\fR \s-1PATTERN\s0"
+.IP "\fB\-ni \-nignore\fR \s-1PATTERN\s0" 2
 .IX Item "-ni -nignore PATTERN"
 Ignore everything except file and directories matching this
 expression. eg: \*(L"systree/bintree systree/headertree\*(R".
 For using nignore support fnmatch and configration file
 support has to be enabled. For more details see \fIxstow.ini\fR\|(5).
-.Ip "\fB\-cp \-copy\fR \s-1PATTERN\s0"
+.IP "\fB\-cp \-copy\fR \s-1PATTERN\s0" 2
 .IX Item "-cp -copy PATTERN"
 Copy files or directories that matching this pattern.
-.Ip "\fB\-cre \-copy-regex\fR \s-1REGEX\s0"
+.IP "\fB\-cre \-copy\-regex\fR \s-1REGEX\s0" 2
 .IX Item "-cre -copy-regex REGEX"
 Copy files or directories that matching this expression.
-.Ip "\fB\-sd \-stow-dirs\fR \s-1DIR\s0"
+.IP "\fB\-sd \-stow\-dirs\fR \s-1DIR\s0" 2
 .IX Item "-sd -stow-dirs DIR"
 A list of other stow dirs, that xstow is allowed change
-.Ip "\fB\-sda \-sd-auto\fR \s-1PATTERN\s0"
+.IP "\fB\-sda \-sd\-auto\fR \s-1PATTERN\s0" 2
 .IX Item "-sda -sd-auto PATTERN"
 Automatically add directories to the list when matching this
 expression.
-.Ip "\fB\-sde \-sd-auto-regex\fR \s-1REGEX\s0"
+.IP "\fB\-sde \-sd\-auto\-regex\fR \s-1REGEX\s0" 2
 .IX Item "-sde -sd-auto-regex REGEX"
 Automatically add directories to the list when matching this
 expression.
-.Ip "\fB\-pd \-protect-dirs\fR \s-1DIR\s0"
+.IP "\fB\-pd \-protect\-dirs\fR \s-1DIR\s0" 2
 .IX Item "-pd -protect-dirs DIR"
 A list of other dirs, that xstow is not allowed change
-.Ip "\fB\-pda \-pd-auto\fR \s-1PATTERN\s0"
+.IP "\fB\-pda \-pd\-auto\fR \s-1PATTERN\s0" 2
 .IX Item "-pda -pd-auto PATTERN"
 Automatically add directories to the list when matching this
 expression.
-.Ip "\fB\-pde \-pd-auto-regex\fR \s-1REGEX\s0"
+.IP "\fB\-pde \-pd\-auto\-regex\fR \s-1REGEX\s0" 2
 .IX Item "-pde -pd-auto-regex REGEX"
 Automatically add directories to the list when matching this
 expression.
-.Ip "\fB\-pdt \-pd-targets\fR \s-1DIRS\s0"
+.IP "\fB\-pdt \-pd\-targets\fR \s-1DIRS\s0" 2
 .IX Item "-pdt -pd-targets DIRS"
 A list of dirs, xstow is allowed to change.
-.Ip "\fB\-pta \-pdt-add-traversable\fR \s-1DIRS\s0"
+.IP "\fB\-pta \-pdt\-add\-traversable\fR \s-1DIRS\s0" 2
 .IX Item "-pta -pdt-add-traversable DIRS"
 Automatically add the targets of traversable links to the targets list.
-.Ip "\fB\-f \-force\fR"
+.IP "\fB\-f \-force\fR" 2
 .IX Item "-f -force"
 Skip conflicts if possible.
-.Ip "\fB\-C \-no-curses\fR"
+.IP "\fB\-C \-no\-curses\fR" 2
 .IX Item "-C -no-curses"
 Do not detect the terminal width by using curses.
 There is more description at the environment variable section.
-.Ip "\fB\-F file\fR"
+.IP "\fB\-F file\fR" 2
 .IX Item "-F file"
 Read this configuration file too.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
-.Ip "\fB0\fR"
+.IP "\fB0\fR" 2
 .IX Item "0"
-On success. 
-.Ip "\fB1\fR"
+On success.
+.IP "\fB1\fR" 2
 .IX Item "1"
-On a missspelled call of stow. 
-.Ip "\fB2\fR"
+On a missspelled call of stow.
+.IP "\fB2\fR" 2
 .IX Item "2"
 If an internal error occours. This does not include if stowing a
 package fails. If a package cannot be installed 0 is returned.
-.Ip "\fB3\fR"
+.IP "\fB3\fR" 2
 .IX Item "3"
 Installing the package failed of some reason.
 .SH "ENVIRONMENT VARIABLES"
@@ -333,27 +306,28 @@
 Since the debugging of the command line parsing can be hard if the
 debugging level is set by the command line there are two evironment
 variables:
-.Ip "\fB\s-1XSTOW_DEBUG_LEVEL\s0\fR"
+.IP "\fB\s-1XSTOW_DEBUG_LEVEL\s0\fR" 2
 .IX Item "XSTOW_DEBUG_LEVEL"
-Same as the \fB\-debug-level\fR option.
-.Ip "\fB\s-1XSTOW_DEBUG_MODULE\s0\fR"
+Same as the \fB\-debug\-level\fR option.
+.IP "\fB\s-1XSTOW_DEBUG_MODULE\s0\fR" 2
 .IX Item "XSTOW_DEBUG_MODULE"
-Same as the \fB\-debug-module\fR option.
-.PP
+Same as the \fB\-debug\-module\fR option.
+.Sp
 Both values will be overwritten by the settings of the command line,
 after the command line was parsed.
-.Ip "\fB\s-1XSTOW_USE_CURSES\s0\fR"
+.IP "\fB\s-1XSTOW_USE_CURSES\s0\fR" 2
 .IX Item "XSTOW_USE_CURSES"
-Same as the \fB\-no-curses\fR option.
-.PP
+Same as the \fB\-no\-curses\fR option.
+.Sp
 In later versions xstow tried detecting the terminal width and height,
 by default at the startup routine. Even if this value is only used by
 the help screen. The result was:
-.PP
+.Sp
 .Vb 2
 \&    $ TERM="" xstow 
 \&    Error opening terminal: unknown.
 .Ve
+.Sp
 The error message is reported by the ncurses lib. This can cause problems
 if you wan't start xstow as a cron job.
 Now xstow tries detecting the terminal width not in it's startup, but
@@ -370,63 +344,68 @@
 settings of XStow too. Please read it!
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
-.Sh "Common Usage"
+.SS "Common Usage"
 .IX Subsection "Common Usage"
-As an example we install the ixlib library into the /usr/local/ tree. 
+As an example we install the ixlib library into the /usr/local/ tree.
 .PP
 .Vb 4
-\&        tar xvfz ixlib-0.96.2.tar.gz
-\&        cd ixlib-0.96.2
+\&        tar xvfz ixlib\-0.96.2.tar.gz
+\&        cd ixlib\-0.96.2
 \&        ./configure
 \&        make
 .Ve
-So far, this was business as usual. 
+.PP
+So far, this was business as usual.
 .PP
 \&\fINote:\fR by default the configure script prepares the application for
 beeing installed into /usr/local/. Have a look at configure \-\-help for
-more info. 
+more info.
 .PP
 Now installation is done by not installing ixlib directly into
-/usr/local/, we install it into /usr/local/stow/ixlib-0.96.2/.
+/usr/local/, we install it into /usr/local/stow/ixlib\-0.96.2/.
 .PP
 .Vb 1
-\&        make install prefix=/usr/local/stow/ixlib-0.96.2/
+\&        make install prefix=/usr/local/stow/ixlib\-0.96.2/
 .Ve
+.PP
 The last point is creating all necessare symlinks so that ixlib's
 include files can be found by the compiler in
 /usr/local/include. Therefore we are using xstow.
 .PP
 .Vb 2
 \&        cd /usr/local/stow
-\&        xstow ixlib-0.96.2
+\&        xstow ixlib\-0.96.2
 .Ve
+.PP
 And all symlinks will be created.
-.Sh "Installing XStow by using XStow"
+.SS "Installing XStow by using XStow"
 .IX Subsection "Installing XStow by using XStow"
 After calling the configure script and make, XStow is installed into
 the stow directory as I showed it in the upper example.
 .PP
 .Vb 1
-\&        make install prefix=/usr/local/stow/xstow-0.1.0
+\&        make install prefix=/usr/local/stow/xstow\-0.1.0
 .Ve
+.PP
 Then you switch to the stow directory and call XStow
 .PP
 .Vb 2
 \&        cd /usr/local/stow
-\&        xstow-0.1.0/bin/xstow xstow-0.1.0
+\&        xstow\-0.1.0/bin/xstow xstow\-0.1.0
 .Ve
+.PP
 That is it.
 .SH "COMPATIBLE"
 .IX Header "COMPATIBLE"
-.Sh "Link Creation"
+.SS "Link Creation"
 .IX Subsection "Link Creation"
 By default XStow is fully Stow compatible. The usage of some of the
 advanced features can cause that Stow cannot handle the tree any
 more.
-.Sh "Command Line Options"
+.SS "Command Line Options"
 .IX Subsection "Command Line Options"
 XStow supports all command line options of Stow. Even it's
-format. 
+format.
 .PP
 Eg.:
 	xstow \-\-verbose=2 foobar
@@ -443,7 +422,7 @@
 XStow was written by Martin Oberzalek <kingleo@gmx.at>.
 .SH "COPYING"
 .IX Header "COPYING"
-XStow a replacement of \s-1GNU\s0 Stow written in \*(C+.	
+XStow a replacement of \s-1GNU\s0 Stow written in \*(C+.
 .PP
 Copyright (C) 2002\-2003 by Martin Oberzalek <kingleo@gmx.at>
 .PP
--- a/doc/xstow.ini.5
+++ b/doc/xstow.ini.5
@@ -1,26 +1,11 @@
-.\" Automatically generated by Pod::Man version 1.15
-.\" Sun Jul 27 00:16:33 2003
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
 .\"
 .\" Standard preamble:
-.\" ======================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
+.\" ========================================================================
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
 .de Vb \" Begin verbatim text
 .ft CW
 .nf
@@ -28,16 +13,15 @@
 ..
 .de Ve \" End verbatim text
 .ft R
-
 .fi
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used
-.\" to do unbreakable dashes and therefore won't be available.  \*(C` and
-.\" \*(C' expand to `' in nroff, nothing in troff, for use with C<>
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -56,26 +40,28 @@
 .    ds R" ''
 'br\}
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr
-.\" for titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and
-.\" index entries marked with X<> in POD.  Of course, you'll have to process
-.\" the output yourself in some meaningful fashion.
-.if \nF \{\
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it
-.\" makes way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.bd B 3
 .    \" fudge factors for nroff and troff
 .if n \{\
 .    ds #H 0
@@ -135,13 +121,16 @@
 .    ds Ae AE
 .\}
 .rm #[ #] #H #V #F C
-.\" ======================================================================
+.\" ========================================================================
 .\"
-.IX Title "xstow.ini 5"
-.TH xstow.ini 5 "XStow 0.5.1" "2003-07-11" "XStow Reference Guide"
-.UC
+.IX Title "XSTOW.INI 5"
+.TH XSTOW.INI 5 "2010-07-02" "XStow 0.5.1" "XStow Reference Guide"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
-xstow.ini, config file for XStow
+xstow.ini \- config file for XStow
 .SH "CONTENT"
 .IX Header "CONTENT"
 The xstow.ini file contains some static informations about your
@@ -157,41 +146,42 @@
 a comment. Here is an example:
 .PP
 .Vb 3
-\&        [traserve-links]
-\&        keep-targets = true
+\&        [traserve\-links]
+\&        keep\-targets = true
 \&        link = /usr/tmp  # comment
 .Ve
-.Ip "\fB[traserve-links]\fR"
+.IP "\fB[traserve\-links]\fR" 2
 .IX Item "[traserve-links]"
 is a section with the name \*(L"traserve-links\*(R"
-.Ip "\fBkeep-targets = true\fR"
+.IP "\fBkeep-targets = true\fR" 2
 .IX Item "keep-targets = true"
-is a key \- value pair, where 'keep-targets' is the key and 'true' is
+is a key \- value pair, where 'keep\-targets' is the key and 'true' is
 the value.
 .SH "PROCESSING"
 .IX Header "PROCESSING"
 XStow processes the config files one after another. Static
 configuration options like the \fB[debug]\fR=>\fBmodule\fR option can be
 overwritten by the next config file. List keys like
-\&\fB[traverse-links]\fR=>\fBlink\fR will be appended to the list.
+\&\fB[traverse\-links]\fR=>\fBlink\fR will be appended to the list.
 .PP
 If you wan't more informations about the current stow setup call XStow
 like this:
 .PP
 .Vb 1
-\&        xstow -s -dl 1 dummy-package | less
+\&        xstow \-s \-dl 1 dummy\-package | less
 .Ve
+.PP
 For getting information about which config files were processed you
 will have to set some environment values (see \fIxstow\fR\|(1) for
 details).
 Eg.:
 .PP
 .Vb 1
-\&        XSTOW_DEBUG_LEVEL=1 xstow -s -dl 1 dummy-package | less
+\&        XSTOW_DEBUG_LEVEL=1 xstow \-s \-dl 1 dummy\-package | less
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-.Sh "\s-1SECTION\s0 traserve-links"
+.SS "\s-1SECTION\s0 traserve-links"
 .IX Subsection "SECTION traserve-links"
 In this section a number of links are listed, which xstow will
 identify as links that are not part of an xstow managed package.
@@ -206,20 +196,20 @@
 .PP
 The simple solution is telling xstow which links should be handled as
 normal directories. These links can be listed in this section.
-.Ip "\fBlink\fR = \s-1LINK\s0"
+.IP "\fBlink\fR = \s-1LINK\s0" 2
 .IX Item "link = LINK"
 The value of this key must contain an absolute path to the link that
 should be handled as a normal directory. The link itself can be an
 absolute, or relativ link.
 It is allowed that there are more than one \fBlink\fR keys in this section.
-.Ip "\fBkeep-targets\fR = \s-1BOOL\s0"
+.IP "\fBkeep-targets\fR = \s-1BOOL\s0" 2
 .IX Item "keep-targets = BOOL"
 Allowed values are 'true' and '1' (incasesensitive). Anything else
 will be interpreted as false.
 If keep-targets is set to true the target of the links in this section
 will automatically added to the \fBkeep-dirs\fR section. This avoids that
 these targets will be removed and the links will become dead links.
-.Ip "\fBadd-if-target\fR = \s-1PATTERN\s0"
+.IP "\fBadd-if-target\fR = \s-1PATTERN\s0" 2
 .IX Item "add-if-target = PATTERN"
 Automatic add all links which targets match the pattern to the link
 list. XStow will use this as the last chance for solving
@@ -228,40 +218,40 @@
 \&\fB[links]\fR=>\fBabsolute-links\fR to true and using a pattern like /* here. 
 If \fBkeep-targets\fR is set to true the applied links will added to the
 \&\fBkeep-dirs\fR list too.
-.Ip "\fBadd-if-target-regex\fR = \s-1REGEX\s0"
+.IP "\fBadd-if-target-regex\fR = \s-1REGEX\s0" 2
 .IX Item "add-if-target-regex = REGEX"
 Does the same as \fBadd-if-target\fR, but support regular
 expressions. XStow will always try matching the regular expressions
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
-.Sh "\s-1SECTION\s0 keep-dirs"
+.SS "\s-1SECTION\s0 keep-dirs"
 .IX Subsection "SECTION keep-dirs"
 In this section directories are listed that should not be remove. When
 xstow removes a package and a directory becomes emty the directory
 will be removed too.
-.Ip "\fBdir\fR = \s-1DIR\s0"
+.IP "\fBdir\fR = \s-1DIR\s0" 2
 .IX Item "dir = DIR"
 The value of this key must contain an absolute path to the directory
 that should be kept.
 It is allowed that there are more than one \fBdir\fR keys in this
 section. \fBThe value should not end with a '/'!!\fR
-.Sh "\s-1SECTION\s0 matches"
+.SS "\s-1SECTION\s0 matches"
 .IX Subsection "SECTION matches"
 XStow will try matching this pattern to all file names that were found
 in packages. Only the file names. So you do not have to care about the
 slashes.
-.Ip "\fBignore\fR = \s-1PATTERN\s0"
+.IP "\fBignore\fR = \s-1PATTERN\s0" 2
 .IX Item "ignore = PATTERN"
 Ignore files matching this pattern.
 It is allowed that there are more than one \fBignore\fR keys in this
 section.
-.Ip "\fBignore-regex\fR = \s-1PATTERN\s0"
+.IP "\fBignore-regex\fR = \s-1PATTERN\s0" 2
 .IX Item "ignore-regex = PATTERN"
 Does the same as \fBignore\fR, but support regular
 expressions. XStow will always try matching the regular expressions
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
-.Ip "\fBcopy\fR = \s-1PATTERN\s0"
+.IP "\fBcopy\fR = \s-1PATTERN\s0" 2
 .IX Item "copy = PATTERN"
 Copy files or directories matching this pattern instead of linking it.
 This makes sense in case of some global files that will be used by
@@ -276,13 +266,13 @@
 files, installed by the installation process.
 It is allowed that there are more than one \fBcopy\fR keys in this
 section.
-.Ip "\fBcopy-regex\fR = \s-1PATTERN\s0"
+.IP "\fBcopy-regex\fR = \s-1PATTERN\s0" 2
 .IX Item "copy-regex = PATTERN"
 Does the same as \fBcopy\fR, but support regular
 expressions. XStow will always try matching the regular expressions
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
-.Ip "\fBnignore\fR = \s-1NIGNORE_RULE\s0"
+.IP "\fBnignore\fR = \s-1NIGNORE_RULE\s0" 2
 .IX Item "nignore = NIGNORE_RULE"
 Ignore everything except file and directories matching this
 expression. eg: \*(L"systree/bintree\*(R".
@@ -291,27 +281,28 @@
 A rule (eg.: \*(L"systree/headertree\*(R" ) has a set of subrules (eg.: \*(L"systree\*(R" and \*(L"headertree\*(R" ).
 These subrules are defined in a separate section which is named as the subrule.
 Eg, the subrule for \*(L"systree\*(R":
-.PP
+.Sp
 .Vb 4
 \&        [systree]
 \&        dir       = /usr
 \&        dir       = /usr/local
 \&        follow    = false
 .Ve
+.Sp
 There is an example config file \*(L"nignore.ini\*(R" in the doc directory of this package.
-.Sh "\s-1SECTION\s0 \s-1NIGNORE-SUB-RULE\s0"
+.SS "\s-1SECTION\s0 NIGNORE-SUB-RULE"
 .IX Subsection "SECTION NIGNORE-SUB-RULE"
 Description of a nignore subrule. This section is called like the nignore subrule, eg: \*(L"systree\*(R".
-.Ip "\fBdir\fR = \s-1DIR\s0"
+.IP "\fBdir\fR = \s-1DIR\s0" 2
 .IX Item "dir = DIR"
 Directories where a file of the package should be installed. You can use shell pattern's too
-(eg.: \*(L"/man/man*\*(R"), but use this feature only if this subrule is the last one in an nignore rule. 
-.Ip "follow = \s-1BOOL\s0"
+(eg.: \*(L"/man/man*\*(R"), but use this feature only if this subrule is the last one in an nignore rule.
+.IP "follow = \s-1BOOL\s0" 2
 .IX Item "follow = BOOL"
 Follow subdirs.
-.Sh "\s-1SECTION\s0 stow-dirs"
+.SS "\s-1SECTION\s0 stow-dirs"
 .IX Subsection "SECTION stow-dirs"
-.Ip "\fBdir\fR = \s-1DIR\s0"
+.IP "\fBdir\fR = \s-1DIR\s0" 2
 .IX Item "dir = DIR"
 The value of this key must contain an absolute path to the directory
 that can be handled as it would be part of the own stow directory.
@@ -319,133 +310,131 @@
 related to this directory.
 It is allowed that there are more than one \fBdir\fR keys in this
 section. \fBThe value should not end with a '/'!!\fR
-.Ip "\fBauto-add-dirs\fR = \s-1PATTERN\s0"
+.IP "\fBauto-add-dirs\fR = \s-1PATTERN\s0" 2
 .IX Item "auto-add-dirs = PATTERN"
 Automatically add a directory if it matches this pattern. In Stow
 directories, which were detected with this pattern, never will be
 searched for configuration files.
 It is allowed that there are more than one \fBauto-add-dirs\fR keys in
 this section.
-.Ip "\fBauto-add-dirs-regex\fR = \s-1REGEX\s0"
+.IP "\fBauto-add-dirs-regex\fR = \s-1REGEX\s0" 2
 .IX Item "auto-add-dirs-regex = REGEX"
 Does the same as \fBauto-add-dirs\fR, but support regular
 expressions. XStow will always try matching the regular expressions
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
-.Sh "\s-1SECTION\s0 protect-dirs"
+.SS "\s-1SECTION\s0 protect-dirs"
 .IX Subsection "SECTION protect-dirs"
 The goal of this section is limiting the access within a legal target
 directory. Eg.: If your stow directory is '/stow' and you installing
-packages this way: 
+packages this way:
 .PP
 .Vb 1
 \&        make install DESTDIR=/stow/package_name
 .Ve
+.PP
 But the 'prefix' is set to '/usr/local'. In this case target directory 
 will be '/', but the real target directory of package will be
 \&'/usr/local'. The following keys withing this section allowing to
 restrict the installation access within the valid target directory.
-.Ip "\fBdir\fR = \s-1DIR\s0"
+.IP "\fBdir\fR = \s-1DIR\s0" 2
 .IX Item "dir = DIR"
 The value of this key must contain an absolute path to the directory
 that has not be changed. XStow is not allowed installing a package
 there and withing the subdirectories, and will report an error, 
 if it would. It is allowed that there are more than one \fBdir\fR keys 
 in this section. \fBThe value should not end with a '/'!!\fR
-.Ip "\fBauto-add-dirs\fR = \s-1PATTERN\s0"
+.IP "\fBauto-add-dirs\fR = \s-1PATTERN\s0" 2
 .IX Item "auto-add-dirs = PATTERN"
 Automatically add a directory if it matches this pattern.
 It is allowed that there are more than one \fBauto-add-dirs\fR keys in
 this section.
-.Ip "\fBauto-add-dirs-regex\fR = \s-1REGEX\s0"
+.IP "\fBauto-add-dirs-regex\fR = \s-1REGEX\s0" 2
 .IX Item "auto-add-dirs-regex = REGEX"
 Does the same as \fBauto-add-dirs\fR, but support regular
 expressions. XStow will always try matching the regular expressions
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
-.Ip "\fBtarget\fR = \s-1DIR\s0"
+.IP "\fBtarget\fR = \s-1DIR\s0" 2
 .IX Item "target = DIR"
 The value of this key must contain an absolute path to the directory
 that is allowed to be changed. If this value is set, XStow will report
 an error if it would touch any other, or upper directory within the tree.
 It is allowed that there are more than one \fBtarget\fR keys in this
 section. \fBThe value should not end with a '/'!!\fR
-.Ip "\fBtarget-add-traversable-links\fR = \s-1BOOL\s0"
+.IP "\fBtarget-add-traversable-links\fR = \s-1BOOL\s0" 2
 .IX Item "target-add-traversable-links = BOOL"
 Automatically add the targets of traversable links to the targets list.
 This can be useful if you do not add manually all possible targets of 
 traversable links to the target list. By default this value is set to
 false.
-.Sh "\s-1SECTION\s0 debug"
+.SS "\s-1SECTION\s0 debug"
 .IX Subsection "SECTION debug"
 These values will be ignored if one of these values is set by command
 line option.
-.Ip "\fBmodule\fR = \s-1MODULE\s0"
+.IP "\fBmodule\fR = \s-1MODULE\s0" 2
 .IX Item "module = MODULE"
 Set the default debug module.
-.Ip "\fBlevel\fR = \s-1INTEGER\s0"
+.IP "\fBlevel\fR = \s-1INTEGER\s0" 2
 .IX Item "level = INTEGER"
 Set the debug level.
-.Sh "\s-1SECTION\s0 config-files"
+.SS "\s-1SECTION\s0 config-files"
 .IX Subsection "SECTION config-files"
-.Ip "\fBin-home\fR \s-1BOOL\s0"
+.IP "\fBin-home\fR \s-1BOOL\s0" 2
 .IX Item "in-home BOOL"
 Search in home directory for a config file named \*(L"xstow.ini\*(R" or
 \&\*(L".xstow.ini\*(R". Only in the home directory will be searched for hidden
-files. 
-.Ip "\fBin-stow-dir\fR \s-1BOOL\s0"
+files.
+.IP "\fBin-stow-dir\fR \s-1BOOL\s0" 2
 .IX Item "in-stow-dir BOOL"
 Search in current stow directory for a config file
-.Ip "\fBin-other-stow-dirs\fR \s-1BOOL\s0"
+.IP "\fBin-other-stow-dirs\fR \s-1BOOL\s0" 2
 .IX Item "in-other-stow-dirs BOOL"
 Search in other public stow directories for config files.
-.Ip "\fBfile\fR \s-1FILE\s0"
+.IP "\fBfile\fR \s-1FILE\s0" 2
 .IX Item "file FILE"
 Read this config file too.
-.PP
+.Sp
 It is allowed that there are more than one \fBfile\fR keys in this
 section.
-.Sh "\s-1SECTION\s0 links"
+.SS "\s-1SECTION\s0 links"
 .IX Subsection "SECTION links"
-.Ip "\fBabsolute-paths\fR = \s-1BOOL\s0"
+.IP "\fBabsolute-paths\fR = \s-1BOOL\s0" 2
 .IX Item "absolute-paths = BOOL"
 Create links with absolute path names.
 .SH "EXAMPLE xstow.ini"
 .IX Header "EXAMPLE xstow.ini"
-.Sh "\s-1EXAMPLE\s0 1"
+.SS "\s-1EXAMPLE\s0 1"
 .IX Subsection "EXAMPLE 1"
 Here is an example xstow.ini which is common for a system where xstow
 is managing the /usr/local tree.
 .PP
 .Vb 7
-\&        [traverse-links]
-\&        keep-targets = true 
+\&        [traverse\-links]
+\&        keep\-targets = true 
 \&        link = /usr/local/tmp
 \&        link = /usr/local/var
 \&        link = /usr/local/man
 \&        link = /usr/local/doc
 \&        link = /usr/local/info
-.Ve
-.Vb 5
-\&        [keep-dirs]
+\&
+\&        [keep\-dirs]
 \&        dir = /usr/local/bin
 \&        dir = /usr/local/sbin
 \&        dir = /usr/local/lib
 \&        dir = /usr/local/include
-.Ve
-.Vb 5
+\&
 \&        [matches]
 \&        ignore = *~ 
 \&        ignore = core
 \&        ignore = core.*
 \&        ignore = CVS
-.Ve
-.Vb 3
-\&        [stow-dirs]
+\&
+\&        [stow\-dirs]
 \&        dir = /usr/local/stow
 \&        dir = /usr/local/stow2
 .Ve
-.Sh "\s-1EXAMPLE\s0 2"
+.SS "\s-1EXAMPLE\s0 2"
 .IX Subsection "EXAMPLE 2"
 This is an example xstow.ini for a system where xstow is managing the
 \&'/usr/local' tree, but the stow directory is '/stow'.
@@ -455,13 +444,11 @@
 \&        ignore = *~
 \&        ignore = CVS
 \&        ignore = core*
-.Ve
-.Vb 2
-\&        [stow-dirs]
+\&
+\&        [stow\-dirs]
 \&        dir = /stow
-.Ve
-.Vb 2
-\&        [protect-dirs]
+\&
+\&        [protect\-dirs]
 \&        target = /usr/local
 .Ve
 .SH "SEE ALSO"
--- a/doc/xstow.ini.pod
+++ b/doc/xstow.ini.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-xstow.ini, config file for XStow
+xstow.ini - config file for XStow
 
 =head1 CONTENT
 
@@ -21,6 +21,8 @@
 	keep-targets = true
 	link = /usr/tmp  # comment
 
+=over 2
+
 =item B<[traserve-links]> 
 
 is a section with the name "traserve-links"
@@ -30,7 +32,7 @@
 is a key - value pair, where 'keep-targets' is the key and 'true' is
 the value.
 
-
+=back
 
 =head1 PROCESSING
 
@@ -70,6 +72,8 @@
 The simple solution is telling xstow which links should be handled as
 normal directories. These links can be listed in this section.
 
+=over 2
+
 =item B<link> = LINK
 
 The value of this key must contain an absolute path to the link that
@@ -102,12 +106,16 @@
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
 
+=back
+
 =head2 SECTION keep-dirs
 
 In this section directories are listed that should not be remove. When
 xstow removes a package and a directory becomes emty the directory
 will be removed too.
 
+=over 2
+
 =item B<dir> = DIR
 
 The value of this key must contain an absolute path to the directory
@@ -115,6 +123,7 @@
 It is allowed that there are more than one B<dir> keys in this
 section. B<The value should not end with a '/'!!>
 
+=back
 
 =head2 SECTION matches
 
@@ -122,6 +131,8 @@
 in packages. Only the file names. So you do not have to care about the
 slashes.
 
+=over 2
+
 =item B<ignore> = PATTERN
 
 Ignore files matching this pattern.
@@ -176,10 +187,14 @@
 
 There is an example config file "nignore.ini" in the doc directory of this package.
 
+=back
+
 =head2 SECTION NIGNORE-SUB-RULE
 
 Description of a nignore subrule. This section is called like the nignore subrule, eg: "systree".
 
+=over 2
+
 =item B<dir> = DIR
 
 Directories where a file of the package should be installed. You can use shell pattern's too
@@ -189,8 +204,12 @@
 
 Follow subdirs.
 
+=back
+
 =head2 SECTION stow-dirs
 
+=over 2
+
 =item B<dir> = DIR
 
 The value of this key must contain an absolute path to the directory
@@ -215,6 +234,8 @@
 before the normal shell patterns, cause a regex can be much more exact
 than a shell pattern.
 
+=back
+
 =head2 SECTION protect-dirs
 
 The goal of this section is limiting the access within a legal target
@@ -228,6 +249,8 @@
 '/usr/local'. The following keys withing this section allowing to
 restrict the installation access within the valid target directory.
 
+=over 2
+
 =item B<dir> = DIR
 
 The value of this key must contain an absolute path to the directory
@@ -264,11 +287,15 @@
 traversable links to the target list. By default this value is set to
 false.
 
+=back
+
 =head2 SECTION debug
 
 These values will be ignored if one of these values is set by command
 line option.
 
+=over 2
+
 =item B<module> = MODULE
 
 Set the default debug module.
@@ -277,9 +304,12 @@
 
 Set the debug level.
 
+=back
 
 =head2 SECTION config-files
 
+=over 2
+
 =item B<in-home> BOOL
 
 Search in home directory for a config file named "xstow.ini" or
@@ -301,14 +331,17 @@
 It is allowed that there are more than one B<file> keys in this
 section.
 
-
+=back
 
 =head2 SECTION links
 
+=over 2
+
 =item B<absolute-paths> = BOOL
 
 Create links with absolute path names.
 
+=back
 
 =head1 EXAMPLE xstow.ini
 
--- a/doc/xstow.pod
+++ b/doc/xstow.pod
@@ -1,15 +1,11 @@
 =head1 NAME
 
-XStow, replacement for GNU Stow
+XStow - replacement for GNU Stow
 
 =head1 SYNOPSIS
 
 xstow        [OPTION ...] PACKAGE
 
-xstow-static [OPTION ...] PACKAGE
-
-xstow-stow   [OPTION ...] PACKAGE
-
 =head1 DESCRIPTION
 
 XStow is a replacement of GNU Stow (B<stow>) written in C++. It
@@ -20,21 +16,6 @@
 vs. /usr/local/stow/perl, for example) while making them appear to be
 installed in the same place (/usr/local).
 
-By default 3 versions of XStow will be compiled
-
-=item B<xstow>
-
-The default binary (dynamically linked)
-
-=item B<xstow-static>
-
-A static version with all enabled features except the ncurses support
-
-=item B<xstow-stow>
-
-A static version with few extensions, which results in a smaller binary.
-All features that will blow up the binary and not required for being 
-compatible to GNU Stow are disabled.
 
 =head1 USAGE
 
@@ -51,6 +32,8 @@
 
 =head1 OPTIONS
 
+=over 2
+
 =item B<-dl -debug-level> INT
 
 Set's the debug level. An unsigned integer is accepted. The
@@ -86,7 +69,7 @@
 
 Set stow dir to DIR. The default is the current directory.
 
-=item B<-d -target> DIR
+=item B<-t -target> DIR
 
 Set target to DIR. The default is the parent of the stow directory.
 
@@ -212,8 +195,12 @@
 
 Read this configuration file too.
 
+=back
+
 =head1 RETURN VALUES
 
+=over 2
+
 =item B<0>
 
 On success. 
@@ -231,6 +218,7 @@
 
 Installing the package failed of some reason.
 
+=back
 
 =head1 ENVIRONMENT VARIABLES
 
@@ -238,6 +226,8 @@
 debugging level is set by the command line there are two evironment
 variables:
 
+=over 2
+
 =item B<XSTOW_DEBUG_LEVEL>
 
 Same as the B<-debug-level> option.
@@ -267,6 +257,8 @@
 the environment variable B<XSTOW_USE_CURSES>="0" this will tell xstow
 not using curses anyway.
 
+=back
+
 =head1 COFIGURATION FILES
 
 The configuration file xstow.ini can be located in /etc and/or in the 
