4 files changed, 58 insertions, 30 deletions
diff --git a/man/1/envify b/man/1/envify
new file mode 100644
index 0000000..50e9e3e
--- /dev/null
+++ b/man/1/envify
@@ -0,0 +1,11 @@
+.TH ENVIFY 1 "2009-10-29" "Daniel Friesel" "User Commands"
+.SH "NAME"
+\fBenvify\fR \- execute a command in the environment saved with envstore
+.SH "SYNOPSIS"
+\fBenvify\fR \fIcommand\fR...
+.SH "DESCRIPTION"
+\fBenvify\fR loads the environment saved by \fBenvstore\fR and then executes \fIcommand\fR.
+.SH "LIMITATIONS"
+The \fIenvstore\fR\|(1) limitations for null bytes apply here as well.
+.SH "SEE ALSO"
+\fIenvstore\fR\|(1)
diff --git a/man/1/envify.pod b/man/1/envify.pod
deleted file mode 100644
index 396cd88..0000000
--- a/man/1/envify.pod
+++ /dev/null
@@ -1,29 +0,0 @@
-=pod
-
-=head1 NAME
-
-envify - execute a command in the environment saved with envstore
-
-=head1 SYNOPSIS
-
-B<envify> I<command>...
-
-=head1 DESCRIPTION
-
-B<envify> loads the environment saved by B<envstore> and then executes I<command>.
-
-=head1 LIMITATIONS
-
-The envstore(1) limitations for null bytes apply here as well.
-
-By default, newlines are not supported.  However, if you remove the newline from
-the B<IFS> when calling envstore, newlines should work.
-Example: C<< IFS=' ' envstore I<command> I<arguments>... >>
-
-=head1 SEE ALSO
-
-envstore(1)
-
-=cut
-
-vim:ft=pod
diff --git a/man/1/envstore b/man/1/envstore
new file mode 100644
index 0000000..2a65781
--- /dev/null
+++ b/man/1/envstore
@@ -0,0 +1,47 @@
+.TH ENVSTORE 1 "2009-10-29" "Daniel Friesel" "User Commands"
+.SH "NAME"
+\fBenvstore\fR \- execute a command in the environment saved with envstore
+.SH "SYNOPSIS"
+\fBenvstore\fR \fIcommand\fR [\fIargs\fR...]
+.SH "DESCRIPTION"
+\fBenvstore\fR can save and restore environment variables,
+thus transferring them between different shells.
+.PP
+\fIcommand\fR must be one of
+.TP
+\fBclear\fR
+Forget all stored variables
+
+.TP
+\fBeval\fR
+Produce shell code for evaluation, restoring all saved variables
+
+.TP
+\fBlist\fR
+List saved variables in better readable format
+
+.TP
+\fBsave\fR \fIvariable\fR [\fIvalue\fR]
+Save \fBvariable\fR either with its current shell value or with \fIvalue\fR
+
+.TP
+\fBrm\fR \fIvariable\fR
+Remove \fIvariable\fR from store
+.PP
+Note: Only the first char of \fIcommand\fR is checked, so "envstore e" is also
+valid.
+.SH "ENVIRONMENT"
+.TP
+\fBENVSTORE_FILE\fR
+The file in which the environment parameters are stored.
+By default /tmp/envstore\-\fIEUID\fR
+
+.SH "LIMITATIONS"
+Variable names or values must not contain null bytes or newlines.
+.PP
+The current maximum length (in bytes) is 127 bytes for the variable name
+and 255 bytes for its content.
+.SH "AUTHOR"
+\fBenvstore\fR was written by Daniel Friesel <derf@derf.homelinux.org>
+.PP
+Original idea and script by Maximilian Gass <mxey@ghosthacking.net>
diff --git a/man/1/envstore.pod b/man/1/envstore.pod
deleted file mode 120000
index 11ae3ec..0000000
--- a/man/1/envstore.pod
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/envstore
-\ No newline at end of file