aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2013-04-20 10:39:19 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2013-04-20 10:39:19 +0300
commit67dce06bb26798e2b11ee0883bdc7e08d7edb663 (patch)
tree3f3655179dded2bbdd16c411d3f0558fe4515bf9
parent347387193da605922ed98742dbc7fa3f67a908f4 (diff)
downloadeclat-67dce06bb26798e2b11ee0883bdc7e08d7edb663.tar.gz
eclat-67dce06bb26798e2b11ee0883bdc7e08d7edb663.tar.bz2
Major rewrite. Provide short names for each command.
-rw-r--r--doc/Makefile.am58
-rw-r--r--doc/eclat-allocaddr.1 (renamed from doc/eclat-allocate-address.1)14
-rw-r--r--doc/eclat-assocaddr.1 (renamed from doc/eclat-associate-address.1)22
-rw-r--r--doc/eclat-atvol.1 (renamed from doc/eclat-attach-volume.1)20
-rw-r--r--doc/eclat-conmesg.1 (renamed from doc/eclat-get-console-output.1)10
-rw-r--r--doc/eclat-deimg.1 (renamed from doc/eclat-deregister-image.1)16
-rw-r--r--doc/eclat-devol.1 (renamed from doc/eclat-detach-volume.1)20
-rw-r--r--doc/eclat-disasaddr.1 (renamed from doc/eclat-disassociate-address.1)14
-rw-r--r--doc/eclat-freeaddr.1 (renamed from doc/eclat-release-address.1)22
-rw-r--r--doc/eclat-lsaddr.1 (renamed from doc/eclat-describe-addresses.1)18
-rw-r--r--doc/eclat-lsiattr.1 (renamed from doc/eclat-describe-instance-attribute.1)14
-rw-r--r--doc/eclat-lsimg.1 (renamed from doc/eclat-describe-images.1)12
-rw-r--r--doc/eclat-lsinst.1 (renamed from doc/eclat-describe-instances.1)16
-rw-r--r--doc/eclat-lsistat.1 (renamed from doc/eclat-describe-instance-status.1)14
-rw-r--r--doc/eclat-lsreg.1 (renamed from doc/eclat-describe-regions.1)10
-rw-r--r--doc/eclat-lssattr.1 (renamed from doc/eclat-describe-snapshot-attribute.1)18
-rw-r--r--doc/eclat-lssg.1 (renamed from doc/eclat-describe-security-groups.1)8
-rw-r--r--doc/eclat-lssnap.1 (renamed from doc/eclat-describe-snapshots.1)12
-rw-r--r--doc/eclat-lstag.1 (renamed from doc/eclat-describe-tags.1)16
-rw-r--r--doc/eclat-lsvol.1 (renamed from doc/eclat-describe-volumes.1)10
-rw-r--r--doc/eclat-mkimg.1 (renamed from doc/eclat-create-image.1)12
-rw-r--r--doc/eclat-mksnap.1 (renamed from doc/eclat-create-snapshot.1)14
-rw-r--r--doc/eclat-mktag.1 (renamed from doc/eclat-create-tags.1)24
-rw-r--r--doc/eclat-mkvol.1 (renamed from doc/eclat-create-volume.1)18
-rw-r--r--doc/eclat-reboot.1 (renamed from doc/eclat-reboot-instances.1)14
-rw-r--r--doc/eclat-rmsnap.1 (renamed from doc/eclat-delete-snapshot.1)12
-rw-r--r--doc/eclat-rmtag.1 (renamed from doc/eclat-delete-tags.1)14
-rw-r--r--doc/eclat-rmvol.1 (renamed from doc/eclat-delete-volume.1)16
-rw-r--r--doc/eclat-setiattr.1 (renamed from doc/eclat-modify-instance-attribute.1)14
-rw-r--r--doc/eclat-start.1 (renamed from doc/eclat-start-instances.1)14
-rw-r--r--doc/eclat-stop.1 (renamed from doc/eclat-stop-instances.1)14
-rw-r--r--doc/eclat.1164
-rw-r--r--doc/eclat.conf.512
-rw-r--r--doc/lszon.1 (renamed from doc/eclat-describe-availability-zones.1)2
-rw-r--r--src/Makefile.am76
-rw-r--r--src/atvol.c (renamed from src/attvol.c)0
-rw-r--r--src/cmdline.opt7
-rw-r--r--src/deimg.c (renamed from src/drgimg.c)0
-rw-r--r--src/devol.c (renamed from src/detvol.c)0
-rw-r--r--src/disasaddr-cl.opt (renamed from src/disassaddr-cl.opt)0
-rw-r--r--src/disasaddr.c (renamed from src/disassaddr.c)2
-rw-r--r--src/eclat.c235
-rw-r--r--src/eclat.h12
-rw-r--r--src/freeaddr-cl.opt (renamed from src/reladdr-cl.opt)0
-rw-r--r--src/freeaddr.c (renamed from src/reladdr.c)2
-rw-r--r--src/lsaddr-cl.opt (renamed from src/dscraddrs-cl.opt)0
-rw-r--r--src/lsaddr.c (renamed from src/dscraddrs.c)2
-rw-r--r--src/lsiattr.c (renamed from src/dscrinstattr.c)0
-rw-r--r--src/lsimg-cl.opt (renamed from src/dscrimgs-cl.opt)0
-rw-r--r--src/lsimg.c (renamed from src/dscrimgs.c)2
-rw-r--r--src/lsinst.c (renamed from src/dscrinsts.c)0
-rw-r--r--src/lsistat-cl.opt (renamed from src/dscrinststat-cl.opt)0
-rw-r--r--src/lsistat.c (renamed from src/dscrinststat.c)2
-rw-r--r--src/lsreg.c (renamed from src/dscrregs.c)0
-rw-r--r--src/lssattr.c (renamed from src/dscrsnapattr.c)0
-rw-r--r--src/lssg-cl.opt (renamed from src/dscrsecgrps-cl.opt)0
-rw-r--r--src/lssg.c (renamed from src/dscrsecgrps.c)2
-rw-r--r--src/lssnap-cl.opt (renamed from src/dscrsnap-cl.opt)0
-rw-r--r--src/lssnap.c (renamed from src/dscrsnap.c)2
-rw-r--r--src/lstag-cl.opt (renamed from src/dscrtags-cl.opt)0
-rw-r--r--src/lstag.c (renamed from src/dscrtags.c)2
-rw-r--r--src/lsvol.c (renamed from src/dscrvols.c)0
-rw-r--r--src/lszon.c (renamed from src/dscrazs.c)0
-rw-r--r--src/mkimg-cl.opt (renamed from src/creimg-cl.opt)0
-rw-r--r--src/mkimg.c (renamed from src/creimg.c)2
-rw-r--r--src/mkinst-cl.opt (renamed from src/runinsts-cl.opt)0
-rw-r--r--src/mkinst.c (renamed from src/runinsts.c)2
-rw-r--r--src/mksnap.c (renamed from src/cresnap.c)0
-rw-r--r--src/mktags-cl.opt (renamed from src/cretags-cl.opt)0
-rw-r--r--src/mktags.c (renamed from src/cretags.c)2
-rw-r--r--src/mkvol-cl.opt (renamed from src/crevol-cl.opt)0
-rw-r--r--src/mkvol.c (renamed from src/crevol.c)2
-rw-r--r--src/rmsnap.c (renamed from src/delsnap.c)0
-rw-r--r--src/rmvol.c (renamed from src/delvol.c)0
-rw-r--r--src/setiattr.c (renamed from src/modinstattr.c)0
-rw-r--r--src/startinst.c87
76 files changed, 597 insertions, 532 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a736b48..523cac1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,32 +18,32 @@ MANPAGES1=\
eclat.1\
- eclat-allocate-address.1\
- eclat-associate-address.1\
- eclat-attach-volume.1\
- eclat-create-image.1\
- eclat-create-snapshot.1\
- eclat-create-tags.1\
- eclat-create-volume.1\
- eclat-delete-snapshot.1\
- eclat-delete-tags.1\
- eclat-deregister-image.1\
- eclat-describe-addresses.1\
+ eclat-allocaddr.1\
+ eclat-assocaddr.1\
+ eclat-atvol.1\
+ eclat-mkimg.1\
+ eclat-mksnap.1\
+ eclat-mktag.1\
+ eclat-mkvol.1\
+ eclat-rmsnap.1\
+ eclat-rmtag.1\
+ eclat-deimg.1\
+ eclat-lsaddr.1\
eclat-describe-availability-zones.1\
- eclat-describe-images.1\
- eclat-describe-instance-attribute.1\
- eclat-describe-instance-status.1\
- eclat-describe-instances.1\
- eclat-describe-regions.1\
- eclat-describe-security-groups.1\
- eclat-describe-snapshot-attribute.1\
- eclat-describe-snapshots.1\
- eclat-describe-tags.1\
- eclat-describe-volumes.1\
- eclat-detach-volume.1\
- eclat-disassociate-address.1\
- eclat-modify-instance-attribute.1\
- eclat-get-console-output.1\
- eclat-start-instances.1\
- eclat-stop-instances.1\
- eclat-reboot-instances.1\
- eclat-release-address.1
+ eclat-lsimg.1\
+ eclat-lsiattr.1\
+ eclat-lsistat.1\
+ eclat-lsinst.1\
+ eclat-lsreg.1\
+ eclat-lssg.1\
+ eclat-lssattr.1\
+ eclat-lssnap.1\
+ eclat-lstag.1\
+ eclat-lsvol.1\
+ eclat-devol.1\
+ eclat-disasaddr.1\
+ eclat-setiattr.1\
+ eclat-conmesg.1\
+ eclat-start.1\
+ eclat-stop.1\
+ eclat-reboot.1\
+ eclat-freeaddr.1
diff --git a/doc/eclat-allocate-address.1 b/doc/eclat-allocaddr.1
index 75f4241..2c97280 100644
--- a/doc/eclat-allocate-address.1
+++ b/doc/eclat-allocaddr.1
@@ -15,12 +15,12 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH ALLOCATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ALLOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat allocate\-address \- allocate an Elastic IP address
+eclat allocaddr \- allocate an Elastic IP address
.SH SYNOPSIS
-\fBeclat allocate\-address\fR [\fB\-v\fR] [\f\--vpc\fR]
+\fBeclat allocaddr\fR [\fB\-v\fR] [\f\--vpc\fR]
-\fBeclat allocate\-address\fR \fB\-\-help\fR
+\fBeclat allocaddr\fR \fB\-\-help\fR
.SH DESCRIPTION
The
-.B allocate\-address
+.B allocaddr
command allocates an Elastic IP address. It does not take arguments.
@@ -39,4 +39,4 @@ is returned on error.
.BR eclat (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-release\-address (1).
+.BR eclat\-assocaddr (1),
+.BR eclat\-freeaddr (1).
.SH AUTHORS
diff --git a/doc/eclat-associate-address.1 b/doc/eclat-assocaddr.1
index cc45341..5c84232 100644
--- a/doc/eclat-associate-address.1
+++ b/doc/eclat-assocaddr.1
@@ -15,14 +15,14 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH ASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat associate\-address \- associate an IP address with an instance
+eclat assocaddr \- associate an IP address with an instance
.SH SYNOPSIS
-\fBeclat associate\-address\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIIP\fR
+\fBeclat assocaddr\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIIP\fR
-\fBeclat associate\-address\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIALLOC\-ID\fR
+\fBeclat assocaddr\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIALLOC\-ID\fR
-\fBeclat associate\-address\fR \fB\-\-help\fR
+\fBeclat assocaddr\fR \fB\-\-help\fR
.SH DESCRIPTION
The
-.B associate\-address
+.B assocaddr
command associates an Elastic IP address with an non-VPC instance or
@@ -64,3 +64,3 @@ Assign an Elastic IP to the instance:
.nf
-.B eclat associate\-address i\-2ea64347 192.0.2.1
+.B eclat assocaddr i\-2ea64347 192.0.2.1
.fi
@@ -70,3 +70,3 @@ Associate an IP address with an instance in the VPC:
.nf
-.B eclat associate\-address \-\-vpc i\-4fd2431a eipalloc\-5723d13e
+.B eclat assocaddr \-\-vpc i\-4fd2431a eipalloc\-5723d13e
.fi
@@ -74,5 +74,5 @@ Associate an IP address with an instance in the VPC:
.BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-release\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-freeaddr (1),
+.BR eclat\-disassaddr (1).
.SH AUTHORS
diff --git a/doc/eclat-attach-volume.1 b/doc/eclat-atvol.1
index 7566eca..87c85bf 100644
--- a/doc/eclat-attach-volume.1
+++ b/doc/eclat-atvol.1
@@ -15,11 +15,11 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT\-ATTACH\-VOLUME 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ECLAT\-ATVOL 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat attach\-volume \- attach a volume to an instance
+eclat atvol \- attach a volume to an instance
.SH SYNOPSIS
-\fBeclat attach\-volume\fR \fBVOL\-ID\fR \fBINST\-ID\fR \fBDEV\-NAME\fR
+\fBeclat atvol\fR \fBVOL\-ID\fR \fBINST\-ID\fR \fBDEV\-NAME\fR
-\fBeclat attach\-volume\fR \fB\-\-help\fR
+\fBeclat atvol\fR \fB\-\-help\fR
.SH DESCRIPTION
-The \fBattach\-volume\fR command attaches an existing volume to an EC2
+The \fBatvol\fR command attaches an existing volume to an EC2
instance. The
@@ -42,3 +42,3 @@ argument specifies the name of the device to use for this volume.
.sp 2
-$ \fBeclat attach\-volume vol-12340156 i-40ed7ef3 /dev/xvdf\fR
+$ \fBeclat atvol vol-12340156 i-40ed7ef3 /dev/xvdf\fR
vol-12340156 attaching i-40ed7ef3 /dev/xvdf
@@ -47,6 +47,6 @@ vol-12340156 attaching i-40ed7ef3 /dev/xvdf
.BR eclat (1),
-.BR eclat-create-volume (1),
-.BR eclat-delete-volume (1),
-.BR eclat-describe-volumes (1),
-.BR eclat-detach-volume (1).
+.BR eclat-mkvol (1),
+.BR eclat-rmvol (1),
+.BR eclat-lsvol (1),
+.BR eclat-devol (1).
.SH AUTHORS
diff --git a/doc/eclat-get-console-output.1 b/doc/eclat-conmesg.1
index bb30637..60c2011 100644
--- a/doc/eclat-get-console-output.1
+++ b/doc/eclat-conmesg.1
@@ -15,12 +15,12 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH GET\-CONSOLE\-OUTPUT 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH MESG 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat get\-console\-output \- get console output from the instance
+eclat conmesg \- get console output from the instance
.SH SYNOPSIS
-\fBeclat get\-console\-output\fR \fIINSTANCE\-ID\fR
+\fBeclat conmesg\fR \fIINSTANCE\-ID\fR
-\fBeclat get\-console\-output\fR \fB\-\-help\fR
+\fBeclat conmesg\fR \fB\-\-help\fR
.SH DESCRIPTION
The command
-.B get\-console\-output
+.B conmesg
retrieves and prints on the standard output the console output for the
diff --git a/doc/eclat-deregister-image.1 b/doc/eclat-deimg.1
index 95030d5..8da014c 100644
--- a/doc/eclat-deregister-image.1
+++ b/doc/eclat-deimg.1
@@ -15,9 +15,9 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DEREGISTER\-IMAGE 1 "April 11, 2013" "ECLAT" "Eclat User Reference"
+.TH DEIMG 1 "April 11, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat deregister\-image \- deregister an EC2 image
+eclat deimg \- deregister an EC2 image
.SH SYNOPSIS
-\fBeclat deregister\-image\fR \fBID\fR
+\fBeclat deimg\fR \fBID\fR
-\fBeclat deregister\-image\fR \fB\-\-help\fR
+\fBeclat deimg\fR \fB\-\-help\fR
.SH DESCRIPTION
@@ -33,3 +33,3 @@ map to translate it.
Note that this command does not destroy other resources associated with the
-image, such as snapshots. Use the \fBeclat delete\-snapshot\fR
+image, such as snapshots. Use the \fBeclat rmsnap\fR
command for that.
@@ -41,5 +41,5 @@ Display a short usage summary.
.BR eclat (1),
-.BR eclat\-delete\-snapshot (1),
-.BR eclat\-create\-image (1),
-.BR eclat\-describe\-images (1).
+.BR eclat\-rmsnap (1),
+.BR eclat\-mkimg (1),
+.BR eclat\-lsimg (1).
.SH AUTHORS
diff --git a/doc/eclat-detach-volume.1 b/doc/eclat-devol.1
index 00b2246..a06417c 100644
--- a/doc/eclat-detach-volume.1
+++ b/doc/eclat-devol.1
@@ -15,12 +15,12 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT\-DETACH\-VOLUME 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ECLAT\-DEVOL 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat detach\-volume \- detach a volume from an instance
+eclat devol \- detach a volume from an instance
.SH SYNOPSIS
-\fBeclat detach\-volume\fR [\fB\-f\fR] [\fB\-\-force\fR] \fBVOL\-ID\fR\
+\fBeclat devol\fR [\fB\-f\fR] [\fB\-\-force\fR] \fBVOL\-ID\fR\
[\fBINST\-ID\fR [\fBDEV\-NAME\fR]]
-\fBeclat detach\-volume\fR \fB\-\-help\fR
+\fBeclat devol\fR \fB\-\-help\fR
.SH DESCRIPTION
-The \fBdetach\-volume\fR command detaches a volume from an EC2
+The \fBdevol\fR command detaches a volume from an EC2
instance. The volume is identified by the
@@ -43,3 +43,3 @@ specifies the name of the device that refers to this volume.
.sp 2
-$ \fBeclat detach\-volume vol-12340156 i-40ed7ef3 /dev/xvdf\fR
+$ \fBeclat devol vol-12340156 i-40ed7ef3 /dev/xvdf\fR
vol-12340156 detaching i-40ed7ef3 /dev/xvdf
@@ -48,6 +48,6 @@ vol-12340156 detaching i-40ed7ef3 /dev/xvdf
.BR eclat (1),
-.BR eclat-attach-volume (1),
-.BR eclat-create-volume (1),
-.BR eclat-delete-volume (1),
-.BR eclat-describe-volumes (1).
+.BR eclat-atvol (1),
+.BR eclat-mkvol (1),
+.BR eclat-rmvol (1),
+.BR eclat-lsvol (1).
.SH AUTHORS
diff --git a/doc/eclat-disassociate-address.1 b/doc/eclat-disasaddr.1
index 81529f1..a76659b 100644
--- a/doc/eclat-disassociate-address.1
+++ b/doc/eclat-disasaddr.1
@@ -15,9 +15,9 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DISASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH DISASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat disassociate\-address \- disassociate IP address from EC2 instance.
+eclat disassaddr \- disassociate IP address from EC2 instance.
.SH SYNOPSIS
-\fBeclat disassociate\-address\fR [\fB\-\-vpc\fR] [\fB\-v\fR] IP
+\fBeclat disassaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] IP
-\fBeclat disassociate\-address\fR \fB\-\-help\fR
+\fBeclat disassaddr\fR \fB\-\-help\fR
.SH DESCRIPTION
@@ -43,3 +43,3 @@ Disassociate the Elastic IP:
.nf
-.B eclat disassociate\-address 192.0.2.1
+.B eclat disassaddr 192.0.2.1
.fi
@@ -49,3 +49,3 @@ Disassociate the VPC Elastic IP:
.nf
-.B eclat disassociate\-address \-\-vpc eipalloc\-5723d13e
+.B eclat disassaddr \-\-vpc eipalloc\-5723d13e
.fi
@@ -53,3 +53,3 @@ Disassociate the VPC Elastic IP:
.BR eclat (1),
-.BR eclat\-associate\-address (1).
+.BR eclat\-assocaddr (1).
.SH AUTHORS
diff --git a/doc/eclat-release-address.1 b/doc/eclat-freeaddr.1
index f1b0224..847e7d5 100644
--- a/doc/eclat-release-address.1
+++ b/doc/eclat-freeaddr.1
@@ -15,9 +15,9 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DISASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH DISASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat release\-address \- release Elastic IP address.
+eclat freeaddr \- release Elastic IP address.
.SH SYNOPSIS
-\fBeclat release\-address\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR
+\fBeclat freeaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR
-\fBeclat release\-address\fR \fB\-\-help\fR
+\fBeclat freeaddr\fR \fB\-\-help\fR
.SH DESCRIPTION
@@ -25,3 +25,3 @@ This command releases an Elastic IP address. The address must have been
previously allocated using the
-.B allocate-address
+.B allocaddr
command.
@@ -48,3 +48,3 @@ Release the Elastic IP:
.nf
-.B $ eclat release\-address 192.0.2.1
+.B $ eclat freeaddr 192.0.2.1
Really release IP 192.0.2.1 [Y/n] y
@@ -55,3 +55,3 @@ Same, with confirmation disabled:
.nf
-.B $ eclat -Y release\-address 192.0.2.1
+.B $ eclat -Y freeaddr 192.0.2.1
.fi
@@ -61,3 +61,3 @@ Release the VPC Elastic IP:
.nf
-.B eclat release\-address \-\-vpc eipalloc\-5723d13e
+.B eclat freeaddr \-\-vpc eipalloc\-5723d13e
.fi
@@ -65,5 +65,5 @@ Release the VPC Elastic IP:
.BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-assocaddr (1),
+.BR eclat\-disassaddr (1).
.SH AUTHORS
diff --git a/doc/eclat-describe-addresses.1 b/doc/eclat-lsaddr.1
index bbfd4ca..8ae1565 100644
--- a/doc/eclat-describe-addresses.1
+++ b/doc/eclat-lsaddr.1
@@ -15,10 +15,10 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-ADDRESSES 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat describe\-addresses \- return information about IP addresses in
+eclat lsaddr \- return information about IP addresses in
your account
.SH SYNOPSIS
-\fBeclat describe\-addresses\fR [\fB\-v\fR] [\fB\-\-vpc\fR] [\fBFILTER\fR...]
+\fBeclat lsaddr\fR [\fB\-v\fR] [\fB\-\-vpc\fR] [\fBFILTER\fR...]
-\fBeclat describe\-addresses\fR \fB\-\-help\fR
+\fBeclat lsaddr\fR \fB\-\-help\fR
.SH DESCRIPTION
@@ -69,3 +69,3 @@ allocation ID and association ID.
.in +2
-$ eclat describe-addresses
+$ eclat lsaddr
standard 192.0.2.1 i-f15ebb98
@@ -76,6 +76,6 @@ standard 198.51.100.2
.BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-release\-address (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-freeaddr (1),
+.BR eclat\-assocaddr (1),
+.BR eclat\-disassaddr (1).
.SH AUTHORS
diff --git a/doc/eclat-describe-instance-attribute.1 b/doc/eclat-lsiattr.1
index d4ce503..403c156 100644
--- a/doc/eclat-describe-instance-attribute.1
+++ b/doc/eclat-lsiattr.1
@@ -15,9 +15,9 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-INSTANCE\-ATTRIBUTE 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSIATTR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat describe\-instance\-attribute \- describes attribute of an instance
+eclat lsiattr \- describes attribute of an instance
.SH SYNOPSIS
-\fBeclat describe\-instance\-attribute\fR \fIINSTANCE-ID\fR \fIATTR\fR
+\fBeclat lsiattr\fR \fIINSTANCE-ID\fR \fIATTR\fR
-\fBeclat describe\-instance\-attribute\fR \fB\-\-help\fR
+\fBeclat lsiattr\fR \fB\-\-help\fR
.SH DESCRIPTION
@@ -47,5 +47,5 @@ The \fIATTR\fR argument can be one of the following:
.BR eclat (1),
-.BR eclat-modify-instance-attribute (1),
-.BR eclat-describe-instance-status (1),
-.BR eclat-describe-instances (1).
+.BR eclat-setiattr (1),
+.BR eclat-lsistat (1),
+.BR eclat-lsinst (1).
.SH AUTHORS
diff --git a/doc/eclat-describe-images.1 b/doc/eclat-lsimg.1
index b939cc7..da945bb 100644
--- a/doc/eclat-describe-images.1
+++ b/doc/eclat-lsimg.1
@@ -15,7 +15,7 @@
.\" along with Eclat. If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-IMAGES 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
+.TH LSIMG 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
.SH NAME
-eclat describe\-images \- describe available Amazon images
+eclat lsimg \- describe available Amazon images
.SH SYNOPSIS
-\fBeclat describe\-images\fB\
+\fBeclat lsimg\fB\
[\fB\-a\fR] [\fB\-u\fR \fIID\fR]\
@@ -25,3 +25,