[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

Sun Jun 16 02:31:31 UTC 2013

The following commit has been merged in the master branch:
commit d81e2ff914b42b9164314cda317574be48880795
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed May 29 16:31:25 2013 -0700

    Generate new man pages
    
    It shouldn't be necessary to re-run generate-manpages.sh after every
    build, but it's quite useful for generating new ones or for dealing with
    changes.
    
    Also note that euca-version's man page is handwritten.  Keep this in
    mind when considering simply deleting man/* and generating them all
    anew.

diff --git a/generate-manpages.sh b/generate-manpages.sh
index f1b2de0..eeb0ca1 100755
--- a/generate-manpages.sh
+++ b/generate-manpages.sh
@@ -1,15 +1,17 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 
 mkdir -p man
-rm -rf man/*
 export PYTHONPATH=".:$PYTHONPATH"
 
-# eucacommand-based
-for exe in build/*/euca-*; do
-    help2man "$exe" -N -o "man/$(basename $exe).1" -n "$($exe --help | sed '/^$/,$d')"
-done
+version="$(build/*/euca-version 2>&1 | sed -e 's/^euca2ools *\([^(]*\).*/\1/' -e 's/ *$//')"
 
-# roboto-based
-for exe in build/*/euare-* build/*/eustore-*; do
-    help2man "$exe" -N -o "man/$(basename $exe).1" -n "$($exe --help | sed '1,2d;/^$/,$d')"
+for exe in $@; do
+    description="$(build/*/$exe --help 2>&1 | python -c 'import sys; print sys.stdin.read().split("\n\n")[1]')"
+    #version="$(build/*/$exe --version 2>&1 | sed -e 's/^euca2ools *\([^(]*\).*/\1/' -e 's/ *$//')"
+    help2man -N --no-discard-stderr -S "euca2ools $version" -n "$description" --version-string "$version" -o man/$(basename $exe).1 build/*/$exe
+    sed -i -e 's/^.SH DESCRIPTION/.SH SYNOPSIS/' \
+           -e 's/usage: *//' \
+           -e '/^\.IP/{/^\.IP/d}' \
+           -e '/^\.PP/{s/^\.PP.*/.SH DESCRIPTION/}' \
+           man/$(basename $exe).1
 done
diff --git a/install-manpages.sh b/install-manpages.sh
deleted file mode 100755
index 52642c0..0000000
--- a/install-manpages.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-[ -z "$PREFIX" ] && PREFIX="/usr/local"
-[ -z "$MANDIR" ] && MANDIR="$PREFIX/share/man"
-
-install -d "$DESTDIR/$MANDIR/man1"
-for manpage in man/*; do
-    install -m 644 "$manpage" "$DESTDIR/$MANDIR/man1/`basename $manpage`"
-done
diff --git a/man/euare-accountaliascreate.1 b/man/euare-accountaliascreate.1
index f33f8de..2d3fb54 100644
--- a/man/euare-accountaliascreate.1
+++ b/man/euare-accountaliascreate.1
@@ -1,44 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTALIASCREATE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Create an alias for your account
+euare-accountaliascreate \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountaliascreate
-[\fIoptions\fR]
+euare\-accountaliascreate \fB\-a\fR ALIAS [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-Create an alias for your account
-.SH OPTIONS
+Create an alias for an account, a.k.a. an account name
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_ALIAS, \fB\-\-account\-alias\fR=\fIACCOUNT_ALIAS\fR
-The new alias for the account.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-a\fR ALIAS, \fB\-\-account\-alias\fR ALIAS
+name of the alias to create (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountaliasdelete.1 b/man/euare-accountaliasdelete.1
index 7cd03c8..71f349b 100644
--- a/man/euare-accountaliasdelete.1
+++ b/man/euare-accountaliasdelete.1
@@ -1,44 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTALIASDELETE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Delete an alias for your account
+euare-accountaliasdelete \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountaliasdelete
-[\fIoptions\fR]
+euare\-accountaliasdelete \fB\-a\fR ALIAS [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-Delete an alias for your account
-.SH OPTIONS
+Delete an account's alias, a.k.a. its account name
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_ALIAS, \fB\-\-account\-alias\fR=\fIACCOUNT_ALIAS\fR
-The alias to be deleted.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-a\fR ALIAS, \fB\-\-account\-alias\fR ALIAS
+name of the alias to delete (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountaliaslist.1 b/man/euare-accountaliaslist.1
index 3d9019b..2612b97 100644
--- a/man/euare-accountaliaslist.1
+++ b/man/euare-accountaliaslist.1
@@ -1,41 +1,38 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTALIASLIST "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- List the alias for your account
+euare-accountaliaslist \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountaliaslist
-[\fIoptions\fR]
+euare\-accountaliaslist [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-List the alias for your account
-.SH OPTIONS
+List your account's aliases
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountcreate.1 b/man/euare-accountcreate.1
index 7b90a15..6e26961 100644
--- a/man/euare-accountcreate.1
+++ b/man/euare-accountcreate.1
@@ -1,39 +1,40 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTCREATE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Create a new account
+euare-accountcreate \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountcreate
-[\fIoptions\fR]
+euare\-accountcreate \fB\-a\fR ACCOUNT [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Create a new account
-.SH OPTIONS
+[Eucalyptus cloud admin only] Create a new account
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-The name of the new account.
-.IP
-Standard Options:
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+name of the account to create (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountdel.1 b/man/euare-accountdel.1
index 0fe5faf..a028ff9 100644
--- a/man/euare-accountdel.1
+++ b/man/euare-accountdel.1
@@ -1,42 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTDEL "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Delete an account
+euare-accountdel \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountdel
-[\fIoptions\fR]
+euare\-accountdel \fB\-a\fR ACCOUNT [\-r] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-Delete an account
-.SH OPTIONS
+[Eucalyptus cloud admin only] Delete an account
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-The name of the account to delete.
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+name of the account to delete (required)
 .TP
 \fB\-r\fR, \fB\-\-recursive\fR
-True if to delete the account recursively.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+delete all users, groups, and policies associated with
+the account as well
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountdelpolicy.1 b/man/euare-accountdelpolicy.1
index 4133b18..c932058 100644
--- a/man/euare-accountdelpolicy.1
+++ b/man/euare-accountdelpolicy.1
@@ -1,42 +1,40 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTDELPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteAccountPolicy
+euare-accountdelpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountdelpolicy
-[\fIoptions\fR]
+euare\-accountdelpolicy \fB\-a\fR ACCOUNT \fB\-p\fR POLICY
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteAccountPolicy
-.SH OPTIONS
+[Eucalyptus cloud admin only] Remove a policy from an account
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-Name of the account the policy is associated with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to delete.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+account the policy is attached to (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to delete (required)
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountgetpolicy.1 b/man/euare-accountgetpolicy.1
index 0c6e875..48de1f7 100644
--- a/man/euare-accountgetpolicy.1
+++ b/man/euare-accountgetpolicy.1
@@ -1,42 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTGETPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetAccountPolicy
+euare-accountgetpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountgetpolicy
-[\fIoptions\fR]
+euare\-accountgetpolicy \fB\-a\fR ACCOUNT \fB\-p\fR POLICY [\-\-pretty\-print]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-GetAccountPolicy
-.SH OPTIONS
+Display an account's policy
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-Name of the account the policy is associated with.
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+account the policy is attached to (required)
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to get.
-.IP
-Standard Options:
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to show (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-pretty\-print\fR
+reformat the policy for easier reading
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountgetsummary.1 b/man/euare-accountgetsummary.1
index a6ad0b7..380cdf2 100644
--- a/man/euare-accountgetsummary.1
+++ b/man/euare-accountgetsummary.1
@@ -1,41 +1,35 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTGETSUMMARY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Retrieve account-level information
+euare-accountgetsummary \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountgetsummary
-[\fIoptions\fR]
+euare\-accountgetsummary [\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-Retrieve account\-level information
-.SH OPTIONS
+Display account\-level information about account entity usage and IAM
+quotas
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-debug\fR
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
-.TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
-.TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountlist.1 b/man/euare-accountlist.1
index 49c2c60..13960fe 100644
--- a/man/euare-accountlist.1
+++ b/man/euare-accountlist.1
@@ -1,36 +1,37 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTLIST "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- List accounts in the system.
+euare-accountlist \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountlist
-[\fIoptions\fR]
+euare\-accountlist [\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-List accounts in the system.
-.SH OPTIONS
+[Eucalyptus cloud admin only] List all of the cloud's accounts
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountlistpolicies.1 b/man/euare-accountlistpolicies.1
index 745c29d..db65b33 100644
--- a/man/euare-accountlistpolicies.1
+++ b/man/euare-accountlistpolicies.1
@@ -1,55 +1,51 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTLISTPOLICIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListAccountPolicies
+euare-accountlistpolicies \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountlistpolicies
-[\fIoptions\fR]
+euare\-accountlistpolicies \fB\-a\fR ACCOUNT [\-p POLICY] [\-v] [\-\-pretty\-print]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ListAccountPolicies
-.SH OPTIONS
+[Eucalyptus only] List one specific policy or all policies attached to
+an account. If no policies are attached to the account, the action
+still succeeds.
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+account owning the policies to list
 .TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-The name of the account to list policies for.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of policy names you want in the
-response. If there are additional policy names beyond
-the maximum you specify, the IsTruncated response
-element is true.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+display a specific policy
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-v\fR, \fB\-\-verbose\fR
+display the contents of the resulting policies (in
+addition to their names)
+.TP
+\fB\-\-pretty\-print\fR
+when printing the contents of policies, reformat them
+for easier reading
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-accountuploadpolicy.1 b/man/euare-accountuploadpolicy.1
index 1edbd2b..8239d6e 100644
--- a/man/euare-accountuploadpolicy.1
+++ b/man/euare-accountuploadpolicy.1
@@ -1,48 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-ACCOUNTUPLOADPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- PutAccountPolicy
+euare-accountuploadpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-accountuploadpolicy
-[\fIoptions\fR]
+euare\-accountuploadpolicy \fB\-a\fR ACCOUNT \fB\-p\fR POLICY
+(\fB\-o\fR POLICY_CONTENT | \fB\-f\fR FILE)
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-PutAccountPolicy
-.SH OPTIONS
+[Eucalyptus cloud admin only] Attach a policy to an account
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR ACCOUNT_NAME, \fB\-\-account\-name\fR=\fIACCOUNT_NAME\fR
-Name of the account to associate the policy with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document.
-.TP
-\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR=\fIPOLICY_CONTENT\fR
-The policy document content.
+\fB\-a\fR ACCOUNT, \fB\-\-account\-name\fR ACCOUNT
+account to attach the policy to (required)
 .TP
-\fB\-f\fR POLICY_DOCUMENT, \fB\-\-policy\-document\fR=\fIPOLICY_DOCUMENT\fR
-The policy document as file.
-.IP
-Standard Options:
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR POLICY_CONTENT
+the policy to attach
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-f\fR FILE, \fB\-\-policy\-document\fR FILE
+file containing the policy to attach
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-getldapsyncstatus.1 b/man/euare-getldapsyncstatus.1
index 10cd265..bd52340 100644
--- a/man/euare-getldapsyncstatus.1
+++ b/man/euare-getldapsyncstatus.1
@@ -1,36 +1,39 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GETLDAPSYNCSTATUS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetLdapSyncStatus
+euare-getldapsyncstatus \- Display information about regions
 .SH SYNOPSIS
-.B euare-getldapsyncstatus
-[\fIoptions\fR]
+euare\-getldapsyncstatus [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-GetLdapSyncStatus
-.SH OPTIONS
+[Eucalyptus cloud admin only] Show the status of the cloud's LDAP
+synchronization
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupaddpolicy.1 b/man/euare-groupaddpolicy.1
index 02611a7..c78d414 100644
--- a/man/euare-groupaddpolicy.1
+++ b/man/euare-groupaddpolicy.1
@@ -1,55 +1,58 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPADDPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Add a new policy to a group
+euare-groupaddpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupaddpolicy
-[\fIoptions\fR]
+euare\-groupaddpolicy \fB\-g\fR GROUP \fB\-p\fR POLICY \fB\-e\fR {Allow,Deny} \fB\-a\fR ACTION \fB\-r\fR
+RESOURCE [\-o] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Add a new policy to a group
-.SH OPTIONS
+Add a new policy to a group. To add more complex policies than this
+tool supports, see euare\-groupuploadpolicy.
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to associate the policy with.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group to attach the policy to (required)
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the new policy (required)
 .TP
-\fB\-e\fR EFFECT, \fB\-\-effect\fR=\fIEFFECT\fR
-The value for the policy's Effect element.
+\fB\-e\fR {Allow,Deny}, \fB\-\-effect\fR {Allow,Deny}
+whether the new policy should Allow or Deny (required)
 .TP
-\fB\-a\fR ACTION, \fB\-\-action\fR=\fIACTION\fR
-The value for the policy's Action element
+\fB\-a\fR ACTION, \fB\-\-action\fR ACTION
+action the policy should apply to (required)
 .TP
-\fB\-r\fR RESOURCE, \fB\-\-resource\fR=\fIRESOURCE\fR
-The value for the policy's Resource element.
+\fB\-r\fR RESOURCE, \fB\-\-resource\fR RESOURCE
+resource the policy should apply to (required)
 .TP
 \fB\-o\fR, \fB\-\-output\fR
-Causes the output to include the JSON policy document
-created for you
-.IP
-Standard Options:
+display the newly\-created policy
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupadduser.1 b/man/euare-groupadduser.1
index ef0bf80..8274e95 100644
--- a/man/euare-groupadduser.1
+++ b/man/euare-groupadduser.1
@@ -1,47 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPADDUSER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- AddUserToGroup
+euare-groupadduser \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupadduser
-[\fIoptions\fR]
+euare\-groupadduser \fB\-g\fR GROUPNAME \fB\-u\fR USERNAME [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-AddUserToGroup
-.SH OPTIONS
+Add a user to a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to update.
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to add.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-g\fR GROUPNAME, \fB\-\-group\-name\fR GROUPNAME
+group to add the user to
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-u\fR USERNAME, \fB\-\-user\-name\fR USERNAME
+user to add
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupcreate.1 b/man/euare-groupcreate.1
index beadb72..4f1f9db 100644
--- a/man/euare-groupcreate.1
+++ b/man/euare-groupcreate.1
@@ -1,57 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPCREATE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- CreateGroup
+euare-groupcreate \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupcreate
-[\fIoptions\fR]
+euare\-groupcreate \fB\-g\fR GROUP [\-p PATH] [\-v] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-CreateGroup
-.SH OPTIONS
+Create a new group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-p\fR PATH, \fB\-\-path\fR=\fIPATH\fR
-The path to the group. For more information about
-paths,               see Identifiers for IAM Entities
-in Using AWS Identity and               Access
-Management.  This parameter is optional. If it is not
-included, it defaults to a slash (/).
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+name of the new group (required)
 .TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to create. Do not include the path
-.IP
-in this value.
+\fB\-p\fR PATH, \fB\-\-path\fR PATH
+path for the new group (default: "/")
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Causes the response to include the newly created
-group's ARN and GUID.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+print the new group's ARN and GUID
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupdel.1 b/man/euare-groupdel.1
index ecc3e19..01d5864 100644
--- a/man/euare-groupdel.1
+++ b/man/euare-groupdel.1
@@ -1,58 +1,49 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPDEL "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteGroup
+euare-groupdel \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupdel
-[\fIoptions\fR]
+euare\-groupdel \fB\-g\fR GROUP [\-r] [\-p] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteGroup
-.SH OPTIONS
+Delete a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+name of the group to delete (required)
 .TP
 \fB\-r\fR, \fB\-\-recursive\fR
-Removes all Users from the Group, deletes all
-Policies associated with the Group, then deletes the
-Group.
-.TP
-\fB\-R\fR, \fB\-\-recursive\-euca\fR
-[Eucalyptus extension] Same as \fB\-r\fR, but all operations
-are performed by the server instead of the client.
+remove all user memberships and policies associated
+with the group first
 .TP
 \fB\-p\fR, \fB\-\-pretend\fR
-Returns a list of Users and Policies that would be
-deleted if the \fB\-r\fR or \fB\-R\fR option were actually
-performed.
-.IP
-Standard Options:
+list the user memberships and policies that would be
+deleted instead of actually deleting them. Implies \fB\-r\fR.
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupdelpolicy.1 b/man/euare-groupdelpolicy.1
index c8aa9f9..7c525f4 100644
--- a/man/euare-groupdelpolicy.1
+++ b/man/euare-groupdelpolicy.1
@@ -1,47 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPDELPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteGroupPolicy
+euare-groupdelpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupdelpolicy
-[\fIoptions\fR]
+euare\-groupdelpolicy \fB\-g\fR GROUP \fB\-p\fR POLICY [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteGroupPolicy
-.SH OPTIONS
+Remove a policy from a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group the policy is associated with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group the policy is attached to (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to delete (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupgetpolicy.1 b/man/euare-groupgetpolicy.1
index 4df5e0b..cecb32c 100644
--- a/man/euare-groupgetpolicy.1
+++ b/man/euare-groupgetpolicy.1
@@ -1,47 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPGETPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetGroupPolicy
+euare-groupgetpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupgetpolicy
-[\fIoptions\fR]
+euare\-groupgetpolicy \fB\-g\fR GROUP \fB\-p\fR POLICY [\-\-pretty\-print]
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-GetGroupPolicy
-.SH OPTIONS
+Display a group's policy
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group the policy is associated with.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group the policy is attached to (required)
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to get.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to show (required)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-pretty\-print\fR
+reformat the policy for easier reading
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-grouplistbypath.1 b/man/euare-grouplistbypath.1
index fd719b1..314a1c0 100644
--- a/man/euare-grouplistbypath.1
+++ b/man/euare-grouplistbypath.1
@@ -1,65 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPLISTBYPATH "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListGroups
+euare-grouplistbypath \- Display information about regions
 .SH SYNOPSIS
-.B euare-grouplistbypath
-[\fIoptions\fR]
+euare\-grouplistbypath [\-p PATH] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListGroups
-.SH OPTIONS
+List your account's groups
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-p\fR PATH_PREFIX, \fB\-\-path\-prefix\fR=\fIPATH_PREFIX\fR
-The path prefix for filtering the results. For
-.IP
-example: /division_abc/subdivision_xyz/, which would
-get all groups whose path starts with
-/division_abc/subdivision_xyz/.  This parameter is
-optional. If it is not included, it defaults to a
-slash (/), listing all groups.
+\fB\-p\fR PATH, \fB\-\-path\-prefix\fR PATH
+restrict results to groups whose paths begin with a
+specific prefix
 .TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of groups you want in the response. If
-there are additional groups beyond the maximum you
-specify, the IsTruncated response element is true.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-debug\fR
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
-.TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
-.TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-grouplistpolicies.1 b/man/euare-grouplistpolicies.1
index 1e7a018..8faefe0 100644
--- a/man/euare-grouplistpolicies.1
+++ b/man/euare-grouplistpolicies.1
@@ -1,67 +1,55 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPLISTPOLICIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListGroupPolicies
+euare-grouplistpolicies \- Display information about regions
 .SH SYNOPSIS
-.B euare-grouplistpolicies
-[\fIoptions\fR]
+euare\-grouplistpolicies \fB\-g\fR GROUP [\-p POLICY] [\-v] [\-\-pretty\-print]
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ListGroupPolicies
-.SH OPTIONS
+List one specific policy or all policies attached to a group.  If no
+policies are attached to the group, the command still succeeds.
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-The name of the group to list policies for.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group owning the policies to list
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to display.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+display a specific policy
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Displays the contents of the resulting policies (in
-addition to the policy names).
+display the contents of the resulting policies (in
+addition to their names)
 .TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
+\fB\-\-pretty\-print\fR
+when printing the contents of policies, reformat them
+for easier reading
 .TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of policy names you want in the
-response. If there are additional policy names beyond
-the maximum you specify, the IsTruncated response
-element is true.
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-grouplistusers.1 b/man/euare-grouplistusers.1
index fa9b20b..d88da39 100644
--- a/man/euare-grouplistusers.1
+++ b/man/euare-grouplistusers.1
@@ -1,59 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPLISTUSERS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetGroup
+euare-grouplistusers \- Display information about regions
 .SH SYNOPSIS
-.B euare-grouplistusers
-[\fIoptions\fR]
+euare\-grouplistusers \fB\-g\fR GROUP [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-GetGroup
-.SH OPTIONS
+List all the users in a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+name of the group to show info about
 .TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of User names you want in the response.
-If there are additional User names beyond the maximum
-you specify, the IsTruncated response element is true.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupmod.1 b/man/euare-groupmod.1
index 53a1ae9..69acc91 100644
--- a/man/euare-groupmod.1
+++ b/man/euare-groupmod.1
@@ -1,56 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPMOD "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateGroup
+euare-groupmod \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupmod
-[\fIoptions\fR]
+euare\-groupmod \fB\-g\fR GROUP [\-n GROUP] [\-p PATH] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateGroup
-.SH OPTIONS
+Change the name and/or path of a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to update. If you're changing the
-.IP
-name of the group, this is the original name.
-.TP
-\fB\-p\fR NEW_PATH, \fB\-\-new\-path\fR=\fINEW_PATH\fR
-New path for the group. Only include this if changing
-.IP
-the group's path.
-.TP
-\fB\-n\fR NEW_GROUP_NAME, \fB\-\-new\-group\-name\fR=\fINEW_GROUP_NAME\fR
-New name for the group. Only include this if changing
-.IP
-the group's name.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+name of the group to update
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-n\fR GROUP, \fB\-\-new\-group\-name\fR GROUP
+new name for the group
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR PATH, \fB\-\-new\-path\fR PATH
+new path for the group
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupremoveuser.1 b/man/euare-groupremoveuser.1
index 7ad64ed..c9827a0 100644
--- a/man/euare-groupremoveuser.1
+++ b/man/euare-groupremoveuser.1
@@ -1,47 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPREMOVEUSER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- RemoveUserFromGroup
+euare-groupremoveuser \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupremoveuser
-[\fIoptions\fR]
+euare\-groupremoveuser \fB\-u\fR USER \fB\-g\fR GROUP [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-RemoveUserFromGroup
-.SH OPTIONS
+Remove a user from a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to update.
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to remove.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to remove from the group (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group to remove the user from (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-groupuploadpolicy.1 b/man/euare-groupuploadpolicy.1
index d17c349..54ca81c 100644
--- a/man/euare-groupuploadpolicy.1
+++ b/man/euare-groupuploadpolicy.1
@@ -1,53 +1,53 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-GROUPUPLOADPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- PutGroupPolicy
+euare-groupuploadpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-groupuploadpolicy
-[\fIoptions\fR]
+euare\-groupuploadpolicy \fB\-g\fR GROUP \fB\-p\fR POLICY
+(\fB\-o\fR POLICY_CONTENT | \fB\-f\fR FILE)
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-PutGroupPolicy
-.SH OPTIONS
+Attach a policy to a group
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of the group to associate the policy with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document.
-.TP
-\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR=\fIPOLICY_CONTENT\fR
-The policy document content.
+\fB\-g\fR GROUP, \fB\-\-group\-name\fR GROUP
+group to attach the policy to (required)
 .TP
-\fB\-f\fR POLICY_DOCUMENT, \fB\-\-policy\-document\fR=\fIPOLICY_DOCUMENT\fR
-The policy document as file.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy (required)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR POLICY_CONTENT
+the policy to attach
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-f\fR FILE, \fB\-\-policy\-document\fR FILE
+file containing the policy to attach
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-servercertdel.1 b/man/euare-servercertdel.1
index d16c909..d14f370 100644
--- a/man/euare-servercertdel.1
+++ b/man/euare-servercertdel.1
@@ -1,41 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-SERVERCERTDEL "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteServerCertificate
+euare-servercertdel \- Display information about regions
 .SH SYNOPSIS
-.B euare-servercertdel
-[\fIoptions\fR]
+euare\-servercertdel \fB\-s\fR CERT [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteServerCertificate
-.SH OPTIONS
+Delete a server certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-s\fR SERVER_CERTIFICATE_NAME, \fB\-\-server\-certificate\-name\fR=\fISERVER_CERTIFICATE_NAME\fR
-The name of the server certificate you want to
-.IP
-delete.
-.IP
-Standard Options:
+\fB\-s\fR CERT, \fB\-\-server\-certificate\-name\fR CERT
+name of the server certificate to delete (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-servercertgetattributes.1 b/man/euare-servercertgetattributes.1
index a5858b9..ceaef7c 100644
--- a/man/euare-servercertgetattributes.1
+++ b/man/euare-servercertgetattributes.1
@@ -1,41 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-SERVERCERTGETATTRIBUTES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetServerCertificate
+euare-servercertgetattributes \- Display information about regions
 .SH SYNOPSIS
-.B euare-servercertgetattributes
-[\fIoptions\fR]
+euare\-servercertgetattributes \fB\-s\fR CERT [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-GetServerCertificate
-.SH OPTIONS
+Show the ARN and GUID of a server certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-s\fR SERVER_CERTIFICATE_NAME, \fB\-\-server\-certificate\-name\fR=\fISERVER_CERTIFICATE_NAME\fR
-The name of the server certificate you want to
-.IP
-retrieve information about.
-.IP
-Standard Options:
+\fB\-s\fR CERT, \fB\-\-server\-certificate\-name\fR CERT
+name of the server certificate to retrieve info about
+(required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-servercertlistbypath.1 b/man/euare-servercertlistbypath.1
index 94beb0e..e23543a 100644
--- a/man/euare-servercertlistbypath.1
+++ b/man/euare-servercertlistbypath.1
@@ -1,61 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-SERVERCERTLISTBYPATH "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListServerCertificates
+euare-servercertlistbypath \- Display information about regions
 .SH SYNOPSIS
-.B euare-servercertlistbypath
-[\fIoptions\fR]
+euare\-servercertlistbypath [\-p PREFIX] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ListServerCertificates
-.SH OPTIONS
+List your account's server certificates
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-p\fR PREFIX, \fB\-\-path\-prefix\fR PREFIX
+limit results to server certificates that begin with a
+given path
 .TP
-\fB\-p\fR PATH_PREFIX, \fB\-\-path\-prefix\fR=\fIPATH_PREFIX\fR
-The path prefix for filtering the results. For
-.IP
-example: /company/servercerts would get all server
-certificates for which the path starts with
-/company/servercerts.  This parameter is optional. If
-it is not included, it defaults to a slash (/),
-listing all server certificates.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of server certificates you want in the
-response. If there are additional server certificates
-beyond the maximum you specify, the IsTruncated
-response element will be set to true.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-servercertmod.1 b/man/euare-servercertmod.1
index a836c84..e465a5d 100644
--- a/man/euare-servercertmod.1
+++ b/man/euare-servercertmod.1
@@ -1,53 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-SERVERCERTMOD "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateServerCertificate
+euare-servercertmod \- Display information about regions
 .SH SYNOPSIS
-.B euare-servercertmod
-[\fIoptions\fR]
+euare\-servercertmod \fB\-s\fR CERT [\-n CERT] [\-p PATH] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateServerCertificate
-.SH OPTIONS
+Change the name and/or path of a server certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-s\fR SERVER_CERTIFICATE_NAME, \fB\-\-server\-certificate\-name\fR=\fISERVER_CERTIFICATE_NAME\fR
-The name of the server certificate that you want to
-.IP
-update.
+\fB\-s\fR CERT, \fB\-\-server\-certificate\-name\fR CERT
+name of the server certificate to update
 .TP
-\fB\-n\fR NEW_PATH, \fB\-\-new\-path\fR=\fINEW_PATH\fR
-The new path for the server certificate. Include this
-.IP
-only if you are updating the server certificate's
-path.
+\fB\-n\fR CERT, \fB\-\-new\-server\-certificate\-name\fR CERT
+new name for the server certificate
 .TP
-\fB\-\-new\-server\-certificate\-name\fR=\fINEW_SERVER_CERTIFICATE_NAME\fR
-The new name for the server certificate. Include this
-.IP
-only if you are updating the server certificate's
-name.
-.IP
-Standard Options:
+\fB\-p\fR PATH, \fB\-\-new\-path\fR PATH
+new path for the server certificate
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-servercertupload.1 b/man/euare-servercertupload.1
index da1c335..de04b35 100644
--- a/man/euare-servercertupload.1
+++ b/man/euare-servercertupload.1
@@ -1,62 +1,69 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-SERVERCERTUPLOAD "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UploadServerCertificate
+euare-servercertupload \- Display information about regions
 .SH SYNOPSIS
-.B euare-servercertupload
-[\fIoptions\fR]
+euare\-servercertupload \fB\-s\fR CERTNAME (\fB\-c\fR CERT | \fB\-\-certificate\-file\fR FILE)
+(\fB\-\-private\-key\fR KEY | \fB\-\-private\-key\-file\fR FILE)
+(\fB\-\-certificate\-chain\fR CHAIN | \fB\-\-certificate\-chain\-file\fR FILE)
+[\-p PATH] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UploadServerCertificate
-.SH OPTIONS
+Upload a server certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-s\fR CERTNAME, \fB\-\-server\-certificate\-name\fR CERTNAME
+name to give the new server certificate (required)
 .TP
-\fB\-p\fR PATH, \fB\-\-path\fR=\fIPATH\fR
-The path for the server certificate. For more
-information about paths, see Identifiers for IAM
-Entities in Using AWS Identity and Access Management.
-This parameter is optional. If it is not included, it
-defaults to a slash (/).
-.TP
-\fB\-s\fR SERVER_CERTIFICATE_NAME, \fB\-\-server\-certificate\-name\fR=\fISERVER_CERTIFICATE_NAME\fR
-The name for the server certificate. Do not include
-.IP
-the path in this value.
-.TP
-\fB\-c\fR CERTIFICATE_BODY, \fB\-\-certificate\-body\fR=\fICERTIFICATE_BODY\fR
-The contents of the public key certificate in PEMencoded format.
-.TP
-\fB\-\-private\-key\fR=\fIPRIVATE_KEY\fR
-The contents of the private key in PEM\-encoded
-.IP
-format.
-.TP
-\fB\-\-certificate\-chain\fR=\fICERTIFICATE_CHAIN\fR
-The contents of the certificate chain. This is
-.IP
-typically a concatenation of the PEM\-encoded public
-key certificates of the chain.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-c\fR CERT, \fB\-\-certificate\-body\fR CERT
+PEM\-encoded certificate
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-certificate\-file\fR FILE
+file containing the PEM\-encoded certificate
+.TP
+\fB\-\-private\-key\fR KEY
+PEM\-encoded private key
+.TP
+\fB\-\-private\-key\-file\fR FILE
+file containing the PEM\-encoded private key
+.TP
+\fB\-\-certificate\-chain\fR CHAIN
+PEM\-encoded certificate chain. This is typically the
+PEM\-encoded certificates of the chain, concatenated
+together.
+.TP
+\fB\-\-certificate\-chain\-file\fR FILE
+file containing the PEM\-encoded certificate chain.
+This is typically the PEM\-encoded certificates of the
+chain, concatenated together.
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-p\fR PATH, \fB\-\-path\fR PATH
+path for the new server certificate (default: "/")
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-useraddcert.1 b/man/euare-useraddcert.1
index 9e180aa..1fde935 100644
--- a/man/euare-useraddcert.1
+++ b/man/euare-useraddcert.1
@@ -1,50 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERADDCERT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UploadSigningCertificate
+euare-useraddcert \- Display information about regions
 .SH SYNOPSIS
-.B euare-useraddcert
-[\fIoptions\fR]
+euare\-useraddcert (\fB\-c\fR CERT | \fB\-f\fR FILE) [\-u USER] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UploadSigningCertificate
-.SH OPTIONS
+Upload a signing certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-c\fR CERTIFICATE_BODY, \fB\-\-certificate\-body\fR=\fICERTIFICATE_BODY\fR
-The contents of the signing certificate.
-.TP
-\fB\-f\fR CERTIFICATE_FILE, \fB\-\-certificate\-file\fR=\fICERTIFICATE_FILE\fR
-A file containing the signing certificate.
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User the signing certificate is for.
+\fB\-c\fR CERT, \fB\-\-certificate\-body\fR CERT
+contents of the new certificate
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-f\fR FILE, \fB\-\-certificate\-file\fR FILE
+file containing the new certificate
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user the signing certificate is for (default: current
+user)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-useraddkey.1 b/man/euare-useraddkey.1
index 4666f9b..96e3416 100644
--- a/man/euare-useraddkey.1
+++ b/man/euare-useraddkey.1
@@ -1,44 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERADDKEY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- CreateAccessKey
+euare-useraddkey \- Display information about regions
 .SH SYNOPSIS
-.B euare-useraddkey
-[\fIoptions\fR]
+euare\-useraddkey [\-u USERNAME] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-CreateAccessKey
-.SH OPTIONS
+Create a new access key for a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-The User name that the new key will belong to.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-u\fR USERNAME, \fB\-\-user\-name\fR USERNAME
+user the new key will belong to (default: calling
+user)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-useraddloginprofile.1 b/man/euare-useraddloginprofile.1
index 17a065b..fda5751 100644
--- a/man/euare-useraddloginprofile.1
+++ b/man/euare-useraddloginprofile.1
@@ -1,47 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERADDLOGINPROFILE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- CreateLoginProfile
+euare-useraddloginprofile \- Display information about regions
 .SH SYNOPSIS
-.B euare-useraddloginprofile
-[\fIoptions\fR]
+euare\-useraddloginprofile \fB\-u\fR USER [\-p PASSWORD] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-CreateLoginProfile
-.SH OPTIONS
+Create a password for the specified user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to create a login profile for.
-.TP
-\fB\-p\fR PASSWORD, \fB\-\-password\fR=\fIPASSWORD\fR
-The new password for the User name.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to create a password for (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR PASSWORD, \fB\-\-password\fR PASSWORD
+the new password. If unspecified, the new password
+will be read from the console.
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-useraddpolicy.1 b/man/euare-useraddpolicy.1
index 6788d80..5aa4ddc 100644
--- a/man/euare-useraddpolicy.1
+++ b/man/euare-useraddpolicy.1
@@ -1,55 +1,58 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERADDPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Add a new policy to a user
+euare-useraddpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-useraddpolicy
-[\fIoptions\fR]
+euare\-useraddpolicy \fB\-u\fR USER \fB\-p\fR POLICY \fB\-e\fR {Allow,Deny} \fB\-a\fR ACTION \fB\-r\fR
+RESOURCE [\-o] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Add a new policy to a user
-.SH OPTIONS
+Add a new policy to a user. To add more complex policies than this
+tool supports, see euare\-useruploadpolicy.
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the user to associate the policy with.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to attach the policy to (required)
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the new policy (required)
 .TP
-\fB\-e\fR EFFECT, \fB\-\-effect\fR=\fIEFFECT\fR
-The value for the policy's Effect element.
+\fB\-e\fR {Allow,Deny}, \fB\-\-effect\fR {Allow,Deny}
+whether the new policy should Allow or Deny (required)
 .TP
-\fB\-a\fR ACTION, \fB\-\-action\fR=\fIACTION\fR
-The value for the policy's Action element
+\fB\-a\fR ACTION, \fB\-\-action\fR ACTION
+action the policy should apply to (required)
 .TP
-\fB\-r\fR RESOURCE, \fB\-\-resource\fR=\fIRESOURCE\fR
-The value for the policy's Resource element.
+\fB\-r\fR RESOURCE, \fB\-\-resource\fR RESOURCE
+resource the policy should apply to (required)
 .TP
 \fB\-o\fR, \fB\-\-output\fR
-Causes the output to include the JSON policy document
-created for you
-.IP
-Standard Options:
+display the newly\-created policy
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usercreate.1 b/man/euare-usercreate.1
index 826fee1..2714b35 100644
--- a/man/euare-usercreate.1
+++ b/man/euare-usercreate.1
@@ -1,61 +1,56 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERCREATE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- CreateUser
+euare-usercreate \- Display information about regions
 .SH SYNOPSIS
-.B euare-usercreate
-[\fIoptions\fR]
+euare\-usercreate \fB\-u\fR USERNAME [\-p PATH] [\-g GROUP_NAME] [\-k] [\-v]
+[\-\-as\-account ACCOUNT] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-CreateUser
-.SH OPTIONS
+Create a new user and optionally add the user to a group or generate
+an access key for the user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-p\fR PATH, \fB\-\-path\fR=\fIPATH\fR
-The path for the User name. For more information
-about paths, see Identifiers for IAM Entities in Using
-AWS Identity and Access Management.  This parameter is
-optional. If it is not included, it defaults to a
-slash (/).
+\fB\-u\fR USERNAME, \fB\-\-user\-name\fR USERNAME
+name of the new user
 .TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to create.
+\fB\-p\fR PATH, \fB\-\-path\fR PATH
+path for the new user (default: "/")
 .TP
-\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR=\fIGROUP_NAME\fR
-Name of a group you want to add the User to.
+\fB\-g\fR GROUP_NAME, \fB\-\-group\-name\fR GROUP_NAME
+add the new user to a group
 .TP
 \fB\-k\fR, \fB\-\-create\-accesskey\fR
-Creates an access key for the User.
+create an access key for the new user and print it to
+standard out
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-causes the response to include the newly created
-User's ARN and GUID
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+print the new user's ARN and GUID
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usercreatecert.1 b/man/euare-usercreatecert.1
index c6f2196..b118ff5 100644
--- a/man/euare-usercreatecert.1
+++ b/man/euare-usercreatecert.1
@@ -1,44 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERCREATECERT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- CreateSigningCertificate
+euare-usercreatecert \- Display information about regions
 .SH SYNOPSIS
-.B euare-usercreatecert
-[\fIoptions\fR]
+euare\-usercreatecert \fB\-u\fR USER [\-\-out FILE] [\-\-keyout FILE]
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-CreateSigningCertificate
-.SH OPTIONS
+[Eucalyptus only] Create a new signing certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to create the signing certificate for (required)
 .TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User the signing certificate is for.
+\fB\-\-out\fR FILE
+file to write the certificate to (default: stdout)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-keyout\fR FILE
+file to write the private key to (default: stdout)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdeactivatemfadevice.1 b/man/euare-userdeactivatemfadevice.1
index bbb35fd..3ccab1f 100644
--- a/man/euare-userdeactivatemfadevice.1
+++ b/man/euare-userdeactivatemfadevice.1
@@ -1,46 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDEACTIVATEMFADEVICE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeactivateMFADevice
+euare-userdeactivatemfadevice \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdeactivatemfadevice
-[\fIoptions\fR]
+euare\-userdeactivatemfadevice \fB\-u\fR USER \fB\-s\fR SERIAL [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeactivateMFADevice
-.SH OPTIONS
+Deactivate an MFA device
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose MFA device you want to
-.IP
-deactivate.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user whose MFA device to deactivate (required)
 .TP
-\fB\-s\fR SERIAL_NUMBER, \fB\-\-serial\-number\fR=\fISERIAL_NUMBER\fR
-The serial number that uniquely identifies the MFA
-.IP
-device.
-.IP
-Standard Options:
+\fB\-s\fR SERIAL, \fB\-\-serial\-number\fR SERIAL
+serial number of the MFA device to deactivate
+(required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdel.1 b/man/euare-userdel.1
index 77b6a1e..1315e59 100644
--- a/man/euare-userdel.1
+++ b/man/euare-userdel.1
@@ -1,57 +1,49 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDEL "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteUser
+euare-userdel \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdel
-[\fIoptions\fR]
+euare\-userdel \fB\-u\fR USER [\-r] [\-p] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteUser
-.SH OPTIONS
+Delete a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to delete (required)
 .TP
 \fB\-r\fR, \fB\-\-recursive\fR
-Deletes the user from associated groups; deletes the
-user's credentials, policies, and login profiles; and
-finally deletes the user.
-.TP
-\fB\-R\fR, \fB\-\-recursive\-euca\fR
-[Eucalyptus extension] Same as \fB\-r\fR, but all operations
-are performed by the server instead of the client.
+remove all IAM resources associated with the user
+first
 .TP
 \fB\-p\fR, \fB\-\-pretend\fR
-List what would be deleted without actually
-recursively deleting the user. Use only with \fB\-r\fR.
-.IP
-Standard Options:
+list the resources that would be deleted instead of
+actually deleting them. Implies \fB\-r\fR.
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdelcert.1 b/man/euare-userdelcert.1
index 88dc1b9..a86f8b8 100644
--- a/man/euare-userdelcert.1
+++ b/man/euare-userdelcert.1
@@ -1,47 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDELCERT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteSigningCertificate
+euare-userdelcert \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdelcert
-[\fIoptions\fR]
+euare\-userdelcert \fB\-u\fR USER \fB\-c\fR CERT [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteSigningCertificate
-.SH OPTIONS
+Delete a signing certificate
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User the signing certificate belongs to.
-.TP
-\fB\-c\fR CERTIFICATE_ID, \fB\-\-certificate\-id\fR=\fICERTIFICATE_ID\fR
-ID of the signing certificate to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user the signing certificate belongs to (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-c\fR CERT, \fB\-\-certificate\-id\fR CERT
+ID of the signing certificate to delete (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdelkey.1 b/man/euare-userdelkey.1
index ec58e28..8f094fe 100644
--- a/man/euare-userdelkey.1
+++ b/man/euare-userdelkey.1
@@ -1,49 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDELKEY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteAccessKey
+euare-userdelkey \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdelkey
-[\fIoptions\fR]
+euare\-userdelkey \fB\-u\fR USER \fB\-k\fR KEY_ID [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteAccessKey
-.SH OPTIONS
+Delete an access key
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose key you want to delete.
-.TP
-\fB\-k\fR USER_KEY_ID, \fB\-\-user\-key\-id\fR=\fIUSER_KEY_ID\fR
-The Access Key ID for the Access Key ID and Secret
-.IP
-Access Key you want to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user whose key to delete (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-k\fR KEY_ID, \fB\-\-user\-key\-id\fR KEY_ID
+ID of the access key to delete (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdelloginprofile.1 b/man/euare-userdelloginprofile.1
index 60dba8c..57e0718 100644
--- a/man/euare-userdelloginprofile.1
+++ b/man/euare-userdelloginprofile.1
@@ -1,46 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDELLOGINPROFILE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteLoginProfile
+euare-userdelloginprofile \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdelloginprofile
-[\fIoptions\fR]
+euare\-userdelloginprofile \fB\-u\fR USER [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-DeleteLoginProfile
-.SH OPTIONS
+Delete a user's password
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose login profile you want to
-.IP
-delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user whose password should be deleted
+(required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userdelpolicy.1 b/man/euare-userdelpolicy.1
index 8032d79..c238563 100644
--- a/man/euare-userdelpolicy.1
+++ b/man/euare-userdelpolicy.1
@@ -1,47 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERDELPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- DeleteUserPolicy
+euare-userdelpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-userdelpolicy
-[\fIoptions\fR]
+euare\-userdelpolicy \fB\-u\fR USER \fB\-p\fR POLICY [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-DeleteUserPolicy
-.SH OPTIONS
+Remove a policy from a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User the policy is associated with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to delete.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user the policy is attached to (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to delete (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userenablemfadevice.1 b/man/euare-userenablemfadevice.1
index c73dd5e..2b49b49 100644
--- a/man/euare-userenablemfadevice.1
+++ b/man/euare-userenablemfadevice.1
@@ -1,54 +1,54 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERENABLEMFADEVICE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ResyncMFADevice
+euare-userenablemfadevice \- Display information about regions
 .SH SYNOPSIS
-.B euare-userenablemfadevice
-[\fIoptions\fR]
+euare\-userenablemfadevice \fB\-u\fR USER \fB\-s\fR SERIAL \fB\-c1\fR CODE \fB\-c2\fR CODE
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ResyncMFADevice
-.SH OPTIONS
+Enable an MFA device
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose MFA device you want to
-.IP
-resynchronize.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to enable the MFA device for (required)
 .TP
-\fB\-s\fR SERIAL_NUMBER, \fB\-\-serial\-number\fR=\fISERIAL_NUMBER\fR
-Serial number that uniquely identifies the MFA
-.IP
-device.
+\fB\-s\fR SERIAL, \fB\-\-serial\-number\fR SERIAL
+serial number of the MFA device to activate (required)
 .TP
-\fB\-a\fR AUTHENTICATION_CODE1, \fB\-\-authentication\-code1\fR=\fIAUTHENTICATION_CODE1\fR
-An authentication code emitted by the device.
+\fB\-c1\fR CODE
+an authentication code emitted by the MFA device
+(required)
 .TP
-\fB\-\-authentication\-code2\fR=\fIAUTHENTICATION_CODE2\fR
-A subsequent authentication code emitted by the
-.IP
-device.
-.IP
-Standard Options:
+\fB\-c2\fR CODE
+a subsequent authentication code emitted by the MFA
+device (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usergetattributes.1 b/man/euare-usergetattributes.1
index 0eab8d7..3ec8a8b 100644
--- a/man/euare-usergetattributes.1
+++ b/man/euare-usergetattributes.1
@@ -1,51 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERGETATTRIBUTES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetUser
+euare-usergetattributes \- Display information about regions
 .SH SYNOPSIS
-.B euare-usergetattributes
-[\fIoptions\fR]
+euare\-usergetattributes [\-u USER] [\-\-show\-extra] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-GetUser
-.SH OPTIONS
+Display a user's ARN and GUID
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to get information about.  This
-.IP
-parameter is optional. If it is not included, it
-defaults to the User making the request.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to show info about (default: current
+user)
 .TP
 \fB\-\-show\-extra\fR
-[Eucalyptus extension] Display the extra user
-attributes.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+also display additional user info
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usergetinfo.1 b/man/euare-usergetinfo.1
index 9ac024a..ff1759a 100644
--- a/man/euare-usergetinfo.1
+++ b/man/euare-usergetinfo.1
@@ -1,47 +1,49 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERGETINFO "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetUserInfo
+euare-usergetinfo \- Display information about regions
 .SH SYNOPSIS
-.B euare-usergetinfo
-[\fIoptions\fR]
+euare\-usergetinfo [\-u USER] [\-k INFOKEY] [\-\-as\-account ACCOUNT]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-GetUserInfo
-.SH OPTIONS
+[Eucalyptus only] Display information about a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to display info for (default: current
+user)
 .TP
-\fB\-k\fR INFO_KEY, \fB\-\-info\-key\fR=\fIINFO_KEY\fR
-Specify the name of the user information to get.
+\fB\-k\fR INFOKEY, \fB\-\-info\-key\fR INFOKEY
+name of the piece of user info to show
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usergetloginprofile.1 b/man/euare-usergetloginprofile.1
index 6240a79..25c33a7 100644
--- a/man/euare-usergetloginprofile.1
+++ b/man/euare-usergetloginprofile.1
@@ -1,46 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERGETLOGINPROFILE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetLoginProfile
+euare-usergetloginprofile \- Display information about regions
 .SH SYNOPSIS
-.B euare-usergetloginprofile
-[\fIoptions\fR]
+euare\-usergetloginprofile \fB\-u\fR USER [\-\-verbose] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-GetLoginProfile
-.SH OPTIONS
+Verify that a user has a password
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose login profile you want to
-.IP
-retrieve.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user whose password to verify (required)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-verbose\fR
+print extra info about the user's password
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usergetpolicy.1 b/man/euare-usergetpolicy.1
index 7fdac0a..6db80a5 100644
--- a/man/euare-usergetpolicy.1
+++ b/man/euare-usergetpolicy.1
@@ -1,47 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERGETPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- GetUserPolicy
+euare-usergetpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-usergetpolicy
-[\fIoptions\fR]
+euare\-usergetpolicy \fB\-u\fR USER \fB\-p\fR POLICY [\-\-pretty\-print]
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-GetUserPolicy
-.SH OPTIONS
+Display a user's policy
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User who the policy is associated with.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user the poilcy is attached to (required)
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to get.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to show (required)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-pretty\-print\fR
+reformat the policy for easier reading
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistbypath.1 b/man/euare-userlistbypath.1
index 78a5590..9b69614 100644
--- a/man/euare-userlistbypath.1
+++ b/man/euare-userlistbypath.1
@@ -1,66 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTBYPATH "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListUsers
+euare-userlistbypath \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistbypath
-[\fIoptions\fR]
+euare\-userlistbypath [\-p PREFIX] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListUsers
-.SH OPTIONS
+List your account's users
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-p\fR PATH_PREFIX, \fB\-\-path\-prefix\fR=\fIPATH_PREFIX\fR
-The path prefix for filtering the results. For
-.IP
-example: /division_abc/subdivision_xyz/, which would
-get all User names whose path starts with
-/division_abc/subdivision_xyz/.  This parameter is
-optional. If it is not included, it defaults to a
-slash (/), listing all User names.
+\fB\-p\fR PREFIX, \fB\-\-path\-prefix\fR PREFIX
+limit results to users who begin with a given path
 .TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this parameter only when paginating results, and
-.IP
-only in a subsequent request after you've received a
-response where the results are truncated. Set it to
-the value of the Marker element in the response you
-just received.
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this parameter only when paginating results to
-.IP
-indicate the maximum number of User names you want in
-the response. If there are additional User names
-beyond the maximum you specify, the IsTruncated
-response element is true.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-debug\fR
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
-.TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
-.TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistcerts.1 b/man/euare-userlistcerts.1
index 329ef88..32ef511 100644
--- a/man/euare-userlistcerts.1
+++ b/man/euare-userlistcerts.1
@@ -1,63 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTCERTS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListSigningCertificates
+euare-userlistcerts \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistcerts
-[\fIoptions\fR]
+euare\-userlistcerts [\-u USER] [\-v] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListSigningCertificates
-.SH OPTIONS
+List a user's signing certificates
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-The name of the User.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to list certificates for (default: current user)
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Causes output to include the certificate body
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of certificate IDs you want in the
-response. If there are additional certificate IDs
-beyond the maximum you specify, the IsTruncated
-response element is true.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+also show certificates' contents
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistgroups.1 b/man/euare-userlistgroups.1
index 83f3a91..71e6670 100644
--- a/man/euare-userlistgroups.1
+++ b/man/euare-userlistgroups.1
@@ -1,59 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTGROUPS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListGroupsForUser
+euare-userlistgroups \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistgroups
-[\fIoptions\fR]
+euare\-userlistgroups \fB\-u\fR USER [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListGroupsForUser
-.SH OPTIONS
+List all groups a user is a member of
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to list membership for (required)
 .TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-The name of the User to list groups for.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of groups you want in the response. If
-there are additional groups beyond the maximum you
-specify, the IsTruncated response element is true.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistkeys.1 b/man/euare-userlistkeys.1
index b3c6cd8..cf3fdb0 100644
--- a/man/euare-userlistkeys.1
+++ b/man/euare-userlistkeys.1
@@ -1,59 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTKEYS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListAccessKeys
+euare-userlistkeys \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistkeys
-[\fIoptions\fR]
+euare\-userlistkeys [\-u USER] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListAccessKeys
-.SH OPTIONS
+List a user's access keys
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to list keys for (default: current user)
 .TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of keys you want in the response. If
-there are additional keys beyond the maximum you
-specify, the IsTruncated response element is true.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistmfadevices.1 b/man/euare-userlistmfadevices.1
index 07a4fda..5e64a10 100644
--- a/man/euare-userlistmfadevices.1
+++ b/man/euare-userlistmfadevices.1
@@ -1,54 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTMFADEVICES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListMFADevices
+euare-userlistmfadevices \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistmfadevices
-[\fIoptions\fR]
+euare\-userlistmfadevices [\-u USER] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ListMFADevices
-.SH OPTIONS
+List a user's MFA devices
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to list MFA devices for (default: current user)
 .TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose MFA devices you want to list.
-.TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
-.TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of keys you want in the response. If
-there are additional keys beyond the maximum you
-specify, the IsTruncated response element is true.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userlistpolicies.1 b/man/euare-userlistpolicies.1
index 667311e..24f0696 100644
--- a/man/euare-userlistpolicies.1
+++ b/man/euare-userlistpolicies.1
@@ -1,67 +1,54 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERLISTPOLICIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ListUserPolicies
+euare-userlistpolicies \- Display information about regions
 .SH SYNOPSIS
-.B euare-userlistpolicies
-[\fIoptions\fR]
+euare\-userlistpolicies \fB\-u\fR USER [\-p POLICY] [\-v] [\-\-pretty\-print]
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-ListUserPolicies
-.SH OPTIONS
+List one specific policy or all policies attached to a user.  If no
+policies are attached to the user, the action still succeeds.
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-The name of the User to list policies for.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user owning the policies to list
 .TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document to display.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+display a specific policy
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Displays the contents of the resulting policies (in
-addition to the policy names).
+display the contents of the resulting policies (in
+addition to their names)
 .TP
-\fB\-m\fR MARKER, \fB\-\-marker\fR=\fIMARKER\fR
-Use this only when paginating results, and only in a
-.IP
-subsequent request after you've received a response
-where the results are truncated. Set it to the value
-of the Marker element in the response you just
-received.
+\fB\-\-pretty\-print\fR
+when printing the contents of policies, reformat them
+for easier reading
 .TP
-\fB\-\-max\-items\fR=\fIMAX_ITEMS\fR
-Use this only when paginating results to indicate the
-.IP
-maximum number of policy names you want in the
-response. If there are additional policy names beyond
-the maximum you specify, the IsTruncated response
-element is true.
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
-.TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usermod.1 b/man/euare-usermod.1
index 7ca41bf..9583bb7 100644
--- a/man/euare-usermod.1
+++ b/man/euare-usermod.1
@@ -1,72 +1,61 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERMOD "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateUser
+euare-usermod \- Display information about regions
 .SH SYNOPSIS
-.B euare-usermod
-[\fIoptions\fR]
+euare\-usermod \fB\-u\fR USER [\-n USER] [\-p PATH] [\-\-enabled {true,false}]
+[\-\-reg\-status {REGISTERED,APPROVED,CONFIRMED}]
+[\-\-pwd\-expires DATETIME] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateUser
-.SH OPTIONS
+Change the name and/or path of a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to update.  If you're changing the
-.IP
-name of the User, this is the original User name.
-.TP
-\fB\-p\fR NEW_PATH, \fB\-\-new\-path\fR=\fINEW_PATH\fR
-New path for the User. Include this parameter only if
-.IP
-you're changing the User's path.
-.TP
-\fB\-n\fR NEW_USER_NAME, \fB\-\-new\-user\-name\fR=\fINEW_USER_NAME\fR
-New name for the User. Include this parameter only if
-.IP
-you're changing the User's name.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to update
 .TP
-\fB\-\-enabled\fR=\fIENABLED\fR
-[Eucalyptus extension] 'true' if to set user to be
-enabled. Otherwise 'false'.
+\fB\-n\fR USER, \fB\-\-new\-user\-name\fR USER
+new name for the user
 .TP
-\fB\-\-reg\-status\fR=\fIREG_STATUS\fR
-[Eucalyptus extension] New registration status for
-.IP
-user. Pick one from REGISTERED, APPROVED or CONFIRMED
-(use any case combination as you want). Only CONFIRMED
-user is valid to access the system.
+\fB\-p\fR PATH, \fB\-\-new\-path\fR PATH
+new path for the user
 .TP
-\fB\-\-pwd\-expires\fR=\fIPWD_EXPIRES\fR
-[Eucalyptus extension] New password expiration date.
-.IP
-Use ISO8601 format.
+\fB\-\-enabled\fR {true,false}
+[Eucalyptus only] 'true' to enable the user, or
+\&'false' to disable the user
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-\-reg\-status\fR {REGISTERED,APPROVED,CONFIRMED}
+[Eucalyptus only] new registration status. Only
+CONFIRMED users may access the system.
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-pwd\-expires\fR DATETIME
+[Eucalyptus only] New password expiration date, in
+ISO8601 format
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usermodcert.1 b/man/euare-usermodcert.1
index 9f4c66e..31e2de1 100644
--- a/man/euare-usermodcert.1
+++ b/man/euare-usermodcert.1
@@ -1,54 +1,50 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERMODCERT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateSigningCertificate
+euare-usermodcert \- Display information about regions
 .SH SYNOPSIS
-.B euare-usermodcert
-[\fIoptions\fR]
+euare\-usermodcert [\-u USER] \fB\-c\fR CERT \fB\-s\fR {Active,Inactive}
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateSigningCertificate
-.SH OPTIONS
+Change the status of a signing certificate from Active to Inactive, or
+vice versa
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User the signing certificate belongs to.
-.TP
-\fB\-c\fR CERTIFICATE_ID, \fB\-\-certificate\-id\fR=\fICERTIFICATE_ID\fR
-The ID of the signing certificate you want to update.
-.TP
-\fB\-s\fR STATUS, \fB\-\-status\fR=\fISTATUS\fR
-The status you want to assign to the certificate.
-.IP
-Active means the certificate can be used for API calls
-to AWS, while Inactive means the certificate cannot be
-used.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user owning the signing certificate to update
+(default: current user)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-c\fR CERT, \fB\-\-certificate\-id\fR CERT
+ID of the signing certificate to update
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-s\fR {Active,Inactive}, \fB\-\-status\fR {Active,Inactive}
+status to assign to the certificate
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usermodkey.1 b/man/euare-usermodkey.1
index b775a01..910cecc 100644
--- a/man/euare-usermodkey.1
+++ b/man/euare-usermodkey.1
@@ -1,55 +1,50 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERMODKEY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateAccessKey
+euare-usermodkey \- Display information about regions
 .SH SYNOPSIS
-.B euare-usermodkey
-[\fIoptions\fR]
+euare\-usermodkey [\-u USER] \fB\-k\fR KEY_ID \fB\-s\fR {Active,Inactive}
+[\-\-as\-account ACCOUNT] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateAccessKey
-.SH OPTIONS
+Change the status of an access key from Active to Inactive, or vice
+versa
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose key you want to update.
-.TP
-\fB\-k\fR USER_KEY_ID, \fB\-\-user\-key\-id\fR=\fIUSER_KEY_ID\fR
-The Access Key ID of the Secret Access Key you want
-.IP
-to update.
-.TP
-\fB\-s\fR STATUS, \fB\-\-status\fR=\fISTATUS\fR
-The status you want to assign to the Secret Access
-.IP
-Key. Active means the key can be used for API calls to
-AWS, while Inactive means the key cannot be used.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user owning the access key to update (default: current
+user)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-k\fR KEY_ID, \fB\-\-user\-key\-id\fR KEY_ID
+ID of the access key to update (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-s\fR {Active,Inactive}, \fB\-\-status\fR {Active,Inactive}
+status to assign to the access key
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-usermodloginprofile.1 b/man/euare-usermodloginprofile.1
index b09d6a5..e4a84fe 100644
--- a/man/euare-usermodloginprofile.1
+++ b/man/euare-usermodloginprofile.1
@@ -1,49 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERMODLOGINPROFILE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateLoginProfile
+euare-usermodloginprofile \- Display information about regions
 .SH SYNOPSIS
-.B euare-usermodloginprofile
-[\fIoptions\fR]
+euare\-usermodloginprofile \fB\-u\fR USER [\-p PASSWORD] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-UpdateLoginProfile
-.SH OPTIONS
+Update a user's password
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose login profile you want to
-.IP
-update.
-.TP
-\fB\-p\fR PASSWORD, \fB\-\-password\fR=\fIPASSWORD\fR
-The new password for the User name.
-.TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+name of the user to change a password for (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-p\fR PASSWORD, \fB\-\-password\fR PASSWORD
+the new password. If unspecified, the new password
+will be read from the console.
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userresyncmfadevice.1 b/man/euare-userresyncmfadevice.1
index 1c96175..6d51afd 100644
--- a/man/euare-userresyncmfadevice.1
+++ b/man/euare-userresyncmfadevice.1
@@ -1,54 +1,54 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERRESYNCMFADEVICE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- ResyncMFADevice
+euare-userresyncmfadevice \- Display information about regions
 .SH SYNOPSIS
-.B euare-userresyncmfadevice
-[\fIoptions\fR]
+euare\-userresyncmfadevice \fB\-u\fR USER \fB\-s\fR SERIAL \fB\-c1\fR CODE \fB\-c2\fR CODE
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
 .SH DESCRIPTION
-ResyncMFADevice
-.SH OPTIONS
+Re\-synchronize an MFA device with the server
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User whose MFA device you want to
-.IP
-resynchronize.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to re\-synchronize the MFA device for (required)
 .TP
-\fB\-s\fR SERIAL_NUMBER, \fB\-\-serial\-number\fR=\fISERIAL_NUMBER\fR
-Serial number that uniquely identifies the MFA
-.IP
-device.
+\fB\-s\fR SERIAL, \fB\-\-serial\-number\fR SERIAL
+serial number of the MFA device (required)
 .TP
-\fB\-a\fR AUTHENTICATION_CODE1, \fB\-\-authentication\-code1\fR=\fIAUTHENTICATION_CODE1\fR
-An authentication code emitted by the device.
+\fB\-c1\fR CODE
+an authentication code emitted by the MFA device
+(required)
 .TP
-\fB\-\-authentication\-code2\fR=\fIAUTHENTICATION_CODE2\fR
-A subsequent authentication code emitted by the
-.IP
-device.
-.IP
-Standard Options:
+\fB\-c2\fR CODE
+a subsequent authentication code emitted by the MFA
+device (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-userupdateinfo.1 b/man/euare-userupdateinfo.1
index 3de3696..86479d1 100644
--- a/man/euare-userupdateinfo.1
+++ b/man/euare-userupdateinfo.1
@@ -1,53 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERUPDATEINFO "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- UpdateUserInfo
+euare-userupdateinfo \- Display information about regions
 .SH SYNOPSIS
-.B euare-userupdateinfo
-[\fIoptions\fR]
+euare\-userupdateinfo [\-u USER] \fB\-k\fR KEY [\-i VALUE] [\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-UpdateUserInfo
-.SH OPTIONS
+[Eucalyptus only] Update a user's information
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User.
-.TP
-\fB\-k\fR INFO_KEY, \fB\-\-info\-key\fR=\fIINFO_KEY\fR
-Specify the name of the user information to set.
-.TP
-\fB\-i\fR INFO_VALUE, \fB\-\-info\-value\fR=\fIINFO_VALUE\fR
-Specify the value of the user information to set,
-.IP
-without setting this will effectively remove the
-specified information.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to update (default: current user)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-k\fR KEY, \fB\-\-info\-key\fR KEY
+name of the info field to set (required)
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-i\fR VALUE, \fB\-\-info\-value\fR VALUE
+value to set the info field to (omit to delete it)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euare-useruploadpolicy.1 b/man/euare-useruploadpolicy.1
index 2022d7b..644597d 100644
--- a/man/euare-useruploadpolicy.1
+++ b/man/euare-useruploadpolicy.1
@@ -1,53 +1,51 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUARE-USERUPLOADPOLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- PutUserPolicy
+euare-useruploadpolicy \- Display information about regions
 .SH SYNOPSIS
-.B euare-useruploadpolicy
-[\fIoptions\fR]
+euare\-useruploadpolicy \fB\-u\fR USER \fB\-p\fR POLICY (\fB\-o\fR POLICY_CONTENT | \fB\-f\fR FILE)
+[\-\-as\-account ACCOUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-PutUserPolicy
-.SH OPTIONS
+Attach a policy to a user
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-u\fR USER_NAME, \fB\-\-user\-name\fR=\fIUSER_NAME\fR
-Name of the User to associate the policy with.
-.TP
-\fB\-p\fR POLICY_NAME, \fB\-\-policy\-name\fR=\fIPOLICY_NAME\fR
-Name of the policy document.
-.TP
-\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR=\fIPOLICY_CONTENT\fR
-The content of policy document.
+\fB\-u\fR USER, \fB\-\-user\-name\fR USER
+user to attach the policy to (required)
 .TP
-\fB\-f\fR POLICY_DOCUMENT, \fB\-\-policy\-document\fR=\fIPOLICY_DOCUMENT\fR
-The policy document as a file.
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy (required)
 .TP
-\fB\-\-delegate\fR=\fIDELEGATE\fR
-[Eucalyptus extension] Process this command as if the
-administrator of the specified account had run it.
-This option is only usable by cloud administrators.
-.IP
-Standard Options:
+\fB\-o\fR POLICY_CONTENT, \fB\-\-policy\-content\fR POLICY_CONTENT
+the policy to attach
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-f\fR FILE, \fB\-\-policy\-document\fR FILE
+file containing the policy to attach
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-as\-account\fR ACCOUNT
+[Eucalyptus cloud admin only] run this command as the
+administrator of another account
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+identity service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-allocate-address.1 b/man/euca-allocate-address.1
index f4ecb81..efca65b 100644
--- a/man/euca-allocate-address.1
+++ b/man/euca-allocate-address.1
@@ -1,46 +1,41 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-ALLOCATE-ADDRESS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Allocate a public IP address
+euca-allocate-address \- Display information about regions
+.SH SYNOPSIS
+euca\-allocate\-address [\-d vpc] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
 Allocate a public IP address
-.PP
-euca\-allocate\-address  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-d\fR vpc, \fB\-\-domain\fR vpc
+[VPC only] "vpc" to allocate the address for use in a
+VPC
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-associate-address.1 b/man/euca-associate-address.1
index 3303f91..8559264 100644
--- a/man/euca-associate-address.1
+++ b/man/euca-associate-address.1
@@ -1,56 +1,63 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-ASSOCIATE-ADDRESS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Associate an instance with a public IP address.
+euca-associate-address \- Display information about regions
+.SH SYNOPSIS
+euca\-associate\-address (\fB\-i\fR INSTANCE | \fB\-n\fR INTERFACE) [\-a ALLOC]
+[\-p ADDRESS] [\-\-allow\-reassociation]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+[ADDRESS]
 .SH DESCRIPTION
-Associate an instance with a public IP address.
-.PP
-euca\-associate\-address  \fB\-i\fR, \fB\-\-instance\fR <instance_id> [\-a, \fB\-\-access\-key\fR
-.IP
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key> ][\-\-config
-<config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url>
-][\-\-version][\-\-euca\-auth] ip
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-i\fR,\-\-instance
-unique identifier for a running instance
-to associate the address with.
-.TP
-ip
-IP address to associate
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Associate an elastic IP address with a running instance
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+ADDRESS
+[Non\-VPC only] IP address to associate (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-i\fR INSTANCE, \fB\-\-instance\-id\fR INSTANCE
+ID of the instance to associate the address with
+.TP
+\fB\-n\fR INTERFACE, \fB\-\-network\-interface\fR INTERFACE
+[VPC only] network interface to associate the address
+with
+.TP
+\fB\-a\fR ALLOC, \fB\-\-allocation\-id\fR ALLOC
+[VPC only] VPC allocation ID (required)
+.TP
+\fB\-p\fR ADDRESS, \fB\-\-private\-ip\-address\fR ADDRESS
+[VPC only] the private address to associate with the
+address being associated in the VPC (default: primary
+private IP)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-allow\-reassociation\fR
+[VPC only] allow the address to be associated even if
+it is already associated with another interface
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-attach-volume.1 b/man/euca-attach-volume.1
index 835f542..d58788c 100644
--- a/man/euca-attach-volume.1
+++ b/man/euca-attach-volume.1
@@ -1,60 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-ATTACH-VOLUME "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Attaches an EBS volume to an instance.
+euca-attach-volume \- Display information about regions
+.SH SYNOPSIS
+euca\-attach\-volume \fB\-i\fR INSTANCE \fB\-d\fR DEVICE [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+VOLUME
 .SH DESCRIPTION
-Attaches an EBS volume to an instance.
-.PP
-euca\-attach\-volume  \fB\-i\fR, \fB\-\-instance\fR <instance_id> \fB\-d\fR, \fB\-\-device\fR <device> [\-a,
-.IP
-\fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth] volume_id
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-i\fR,\-\-instance
-unique id of a running instance to attach
-the volume to.
-.TP
-\fB\-d\fR,\-\-device
-local device name (inside the guest VM) to
-use.
-.TP
-volume_id
-unique id for the volume to be attached
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Attach an EBS volume to an instance
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+VOLUME
+ID of the volume to attach (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-i\fR INSTANCE, \fB\-\-instance\fR INSTANCE
+instance to attach the volume to (required)
+.TP
+\fB\-d\fR DEVICE, \fB\-\-device\fR DEVICE
+device name exposed to the instance (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-authorize.1 b/man/euca-authorize.1
index ee27e99..ee22178 100644
--- a/man/euca-authorize.1
+++ b/man/euca-authorize.1
@@ -1,77 +1,70 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-AUTHORIZE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Authorize a rule for a security group.
+euca-authorize \- Display information about regions
+.SH SYNOPSIS
+euca\-authorize [\-\-egress] [\-P {tcp,udp,icmp,6,17,1}] [\-p RANGE]
+[\-t TYPE:CODE] [\-s CIDR | \fB\-o\fR GROUP] [\-u ACCOUNT]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+GROUP
 .SH DESCRIPTION
-Authorize a rule for a security group.
-.PP
-euca\-authorize  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-P, \fB\-\-protocol\fR <protocol> ][\-p, \fB\-\-port\-range\fR
-<port_range> ][\-t, \fB\-\-icmp\-type\-code\fR <icmp_type_code> ][\-o,
-\fB\-\-source\-group\fR <source_group> ][\-u, \fB\-\-source\-group\-user\fR
-<source_group_user> ][\-s, \fB\-\-source\-subnet\fR <source_subnet> ]
-group_name
-.PP
-REQUIRED PARAMETERS
+Add a rule to a security group that allows traffic to pass
+.SS "positional arguments:"
 .TP
-group_name
-Name of the group to add the rule to.
-.PP
-OPTIONAL PARAMETERS
+GROUP
+name or ID of the security group to modify (required)
+.SS "optional arguments:"
 .TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-\-egress\fR
+[VPC only] manage an egress rule, which controls
+traffic leaving the group
 .TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-P\fR {tcp,udp,icmp,6,17,1}, \fB\-\-protocol\fR {tcp,udp,icmp,6,17,1}
+protocol to affect (default: tcp)
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-p\fR RANGE, \fB\-\-port\-range\fR RANGE
+range of ports (specified as "from\-to") or a single
+port number (required for tcp and udp)
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-t\fR TYPE:CODE, \fB\-\-icmp\-type\-code\fR TYPE:CODE
+ICMP type and code (specified as "type:code")
+(required for icmp)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-s\fR CIDR, \fB\-\-cidr\fR CIDR
+IP range (default: 0.0.0.0/0)
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-o\fR GROUP
+[Non\-VPC only] name of a security group with which to
+affect network communication
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-u\fR ACCOUNT
+ID of the account that owns the security group
+specified with \fB\-o\fR
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-P\fR,\-\-protocol
-The protocol.
-Valid Values: tcp|udp|icmp|6|17|1
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-p\fR,\-\-port\-range
-Range of ports for the rule (specified as
-"from\-to").
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-t\fR,\-\-icmp\-type\-code
-ICMP type and code specified as "type:code"
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-o\fR,\-\-source\-group
-Group from which traffic is authorized
-by the rule.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-u\fR,\-\-source\-group\-user
-User ID for the source group.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-s\fR,\-\-source\-subnet
-The source subnet for the rule.
-Defaults to 0.0.0.0/0.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-bundle-image.1 b/man/euca-bundle-image.1
index a0a2631..e11c7eb 100644
--- a/man/euca-bundle-image.1
+++ b/man/euca-bundle-image.1
@@ -1,103 +1,81 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-BUNDLE-IMAGE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Bundles an image for use with Eucalyptus or Amazon EC2.
+euca-bundle-image \- Display information about regions
+.SH SYNOPSIS
+euca\-bundle\-image \fB\-i\fR FILE [\-p PREFIX] \fB\-r\fR {i386,x86_64,armhf} [\-c FILE]
+[\-k FILE] [\-u ACCOUNT] [\-\-region USER at REGION]
+[\-\-ec2cert FILE] [\-\-kernel IMAGE] [\-\-ramdisk IMAGE]
+[\-B VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,...] [\-d DIR]
+[\-\-productcodes CODE1,CODE2,...]
+[\-\-progress | \fB\-\-no\-progress]\fR [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-Bundles an image for use with Eucalyptus or Amazon EC2.
-.PP
-euca\-bundle\-image  \fB\-i\fR, \fB\-\-image\fR <image_path> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-u, \fB\-\-user\fR <user>
-][\-c, \fB\-\-cert\fR <cert_path> ][\-k, \fB\-\-privatekey\fR
-<private_key_path> ][\-p, \fB\-\-prefix\fR <prefix> ][\-\-kernel
-<kernel_id> ][\-\-ramdisk <ramdisk_id> ][\-\-product\-codes
-<product_codes> ][\-b, \fB\-\-block\-device\-mapping\fR
-<block_device_mapping> ][\-d, \fB\-\-destination\fR <destination>
-][\-\-ec2cert <ec2cert_path> ][\-r, \fB\-\-arch\fR <target_arch>
-][\-\-batch]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-i\fR,\-\-image
-Path to the image file to bundle.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Prepare an image for uploading to a cloud
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-i\fR FILE, \fB\-\-image\fR FILE
+file containing the image to bundle (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+the file name prefix to give the bundle's files
+(default: the image's file name)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-r\fR {i386,x86_64,armhf}, \fB\-\-arch\fR {i386,x86_64,armhf}
+the image's processor architecture (required)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-c\fR FILE, \fB\-\-cert\fR FILE
+file containing your X.509 certificate.
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-k\fR FILE, \fB\-\-privatekey\fR FILE
+file containing the private key to sign the bundle's
+manifest with. This private key will also be required
+to unbundle the image in the future.
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-u\fR ACCOUNT, \fB\-\-user\fR ACCOUNT
+your account ID
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-region\fR USER at REGION
+use encryption keys and the account ID specified for a
+user and/or region in configuration files
 .TP
-\fB\-u\fR,\-\-user
-User ID (12\-digit) of the user who is
-bundling the image
+\fB\-\-ec2cert\fR FILE
+file containing the cloud's X.509 certificate
 .TP
-\fB\-c\fR,\-\-cert
-Path the users PEM\-encoded certificate.
+\fB\-\-kernel\fR IMAGE
+ID of the kernel image to associate with the machine
+bundle
 .TP
-\fB\-k\fR,\-\-privatekey
-Path to users PEM\-encoded private key.
+\fB\-\-ramdisk\fR IMAGE
+ID of the ramdisk image to associate with the machine
+bundle
 .TP
-\fB\-p\fR,\-\-prefix
-The prefix for the bundle image files.
-(default: image name).
+\fB\-B\fR VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,..., \fB\-\-block\-device\-mappings\fR VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,...
+default block device mapping scheme with which to
+launch instances of this machine image
 .TP
-\fB\-\-kernel\fR
-ID of the kernel to be associated with the
-image.
+\fB\-d\fR DIR, \fB\-\-destination\fR DIR
+location to place the bundle's files (default: dir
+named by TMPDIR, TEMP, or TMP environment variables,
+or otherwise /var/tmp)
 .TP
-\fB\-\-ramdisk\fR
-ID of the ramdisk to be associated with the
-image.
+\fB\-\-productcodes\fR CODE1,CODE2,...
+comma\-separated list of product codes
 .TP
-\fB\-\-product\-codes\fR
-Product code to be associated with the image.
+\fB\-\-progress\fR
+show progress (the default when run interactively)
 .TP
-\fB\-b\fR,\-\-block\-device\-mapping
-Default block device mapping for the image
-(comma\-separated list of key=value pairs).
+\fB\-\-no\-progress\fR
+do not show progress (the default when run noninteractively)
 .TP
-\fB\-d\fR,\-\-destination
-Directory to store the bundled image in.
-Defaults to /tmp.  Recommended.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-ec2cert\fR
-Path to the Cloud's X509 public key
-certificate.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-r\fR,\-\-arch
-Target architecture for the image.
-Valid Values: i386|x86_64|armhf
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-batch\fR
-Run in batch mode.  Compatibility only, has no
-effect
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-bundle-instance.1 b/man/euca-bundle-instance.1
index 8f943a7..ce164b1 100644
--- a/man/euca-bundle-instance.1
+++ b/man/euca-bundle-instance.1
@@ -1,74 +1,71 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-BUNDLE-INSTANCE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Bundles an S3-backed Windows instance.
+euca-bundle-instance \- Display information about regions
+.SH SYNOPSIS
+euca\-bundle\-instance \fB\-b\fR BUCKET \fB\-p\fR PREFIX \fB\-o\fR KEY\-ID [\-c POLICY]
+[\-s SIGNATURE] [\-w KEY] [\-x HOURS]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE
 .SH DESCRIPTION
-Bundles an S3\-backed Windows instance.
-.PP
-euca\-bundle\-instance  \fB\-b\fR, \fB\-\-bucket\fR <bucket> \fB\-p\fR, \fB\-\-prefix\fR <prefix> \fB\-o\fR, \fB\-\-useraccess\-key\fR <access_key_id> \fB\-w\fR, \fB\-\-user\-secret\-key\fR
-.IP
-<secret_key> \fB\-x\fR, \fB\-\-expires\fR <expires> [\-a, \fB\-\-access\-key\fR
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key> ][\-\-config
-<config_path> ][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth][\-c, \fB\-\-policy\fR <policy> ] [ instance_id ]
-.PP
-REQUIRED PARAMETERS
+Bundle an S3\-backed Windows instance
+.SS "positional arguments:"
 .TP
-\fB\-b\fR,\-\-bucket
-Name of the bucket to upload.
+INSTANCE
+ID of the instance to bundle (required)
+.SS "optional arguments:"
 .TP
-\fB\-p\fR,\-\-prefix
-The prefix for the image file name
+\fB\-b\fR BUCKET, \fB\-\-bucket\fR BUCKET
+bucket in which to store the new machine image
+(required)
 .TP
-\fB\-o\fR,\-\-user\-access\-key
-Access Key ID of the owner of the bucket
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+beginning of the machine image bundle name (required)
 .TP
-\fB\-w\fR,\-\-user\-secret\-key
-Secret key used to sign the upload policy
+\fB\-o\fR KEY\-ID, \fB\-\-owner\-akid\fR KEY\-ID, \fB\-\-user\-access\-key\fR KEY\-ID
+bucket owner's access key ID (required)
 .TP
-\fB\-x\fR,\-\-expires
-Expiration for the generated policy (hours).
-.PP
-OPTIONAL PARAMETERS
+\fB\-c\fR POLICY, \fB\-\-policy\fR POLICY
+Base64\-encoded upload policy that allows the server to
+upload a bundle on your behalf. If unused, \fB\-w\fR is
+required.
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-s\fR SIGNATURE, \fB\-\-policy\-signature\fR SIGNATURE
+signature of the Base64\-encoded upload policy. If
+unused, \fB\-w\fR is required.
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-w\fR KEY, \fB\-\-owner\-sak\fR KEY, \fB\-\-user\-secret\-key\fR KEY
+bucket owner's secret access key, used to sign upload
+policies. This is required unless both \fB\-c\fR and \fB\-s\fR are
+used.
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-x\fR HOURS, \fB\-\-expires\fR HOURS
+generated upload policy expiration time (default: 24)
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-\fB\-c\fR,\-\-policy
-Base64 encoded upload policy that defines
-upload permissions and conditions.  If no
-policy is specified, a default policy
-is generated.                            NOTE:
-Not supported on Eucalyptus.
+show the program's version and exit
 .TP
-instance_id
-ID of the instance to be bundled.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-bundle-upload.1 b/man/euca-bundle-upload.1
index 18efdf7..51a322a 100644
--- a/man/euca-bundle-upload.1
+++ b/man/euca-bundle-upload.1
@@ -1,103 +1,66 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH REQUESTBUILDER "1" "May 2013" "euca2ools requestbuilder 0.1.0-alpha10 (Prelude)" "User Commands"
 .SH NAME
-euca2ools \- Bundles an image and uploads on behalf of user.
-                     NOTE: For use by the Eucalyptus Node Controller only
+requestbuilder \- Display information about regions
+.SH SYNOPSIS
+euca\-bundle\-upload \fB\-b\fR BUCKET \fB\-i\fR IMAGE [\-r ARCH] [\-d DIRECTORY]
+[\-\-cert FILE] [\-\-privatekey FILE]
+[\-\-spoof\-key\-id KEY_ID] [\-\-ec2cert FILE]
+[\-\-user ACCOUNT] [\-c POLICY]
+[\-\-upload\-policy\-signature SIGNATURE] [\-U URL]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Bundles an image and uploads on behalf of user.
-.IP
-NOTE: For use by the Eucalyptus Node Controller only
-.PP
-euca\-bundle\-upload  \fB\-b\fR, \fB\-\-bucket\fR <bucket> \fB\-i\fR, \fB\-\-image\fR <image_path> [\-a,
-.IP
-\fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-u, \fB\-\-user\fR <user> ][\-d, \fB\-\-directory\fR
-<directory> ][\-c, \fB\-\-policy\fR <policy> ][\-\-policysignature
-<policy_signature> ][\-p, \fB\-\-prefix\fR <prefix> ][\-\-kernel
-<kernel_id> ][\-\-ramdisk <ramdisk_id> ][\-\-product\-codes
-<product_codes> ][\-b, \fB\-\-block\-device\-mapping\fR
-<block_device_mapping> ][\-r, \fB\-\-arch\fR <target_arch> ][\-\-acl
-<acl> ]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-b\fR,\-\-bucket
-Name of the bucket to upload to.
-.TP
-\fB\-i\fR,\-\-image
-The path to the image file to bundle
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+[Eucalyptus NC internal] Bundle and upload an image on behalf of a
+user
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-b\fR BUCKET, \fB\-\-bucket\fR BUCKET
+bucket to upload the bundle to (required)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-i\fR IMAGE, \fB\-\-image\fR IMAGE
+file containing the image to bundle (required)
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-r\fR ARCH, \fB\-\-arch\fR ARCH
+image architecture (default: x86_64)
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-d\fR DIRECTORY, \fB\-\-directory\fR DIRECTORY
+location to place the working directory with temporary
+files
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-cert\fR FILE
+file containing the X.509 certificate to use when
+signing requests and bundling the image
 .TP
-\fB\-u\fR,\-\-user
-ID of the user doing the bundling
+\fB\-\-privatekey\fR FILE
+file containing the private key to use when signing
+requests and bundling the image
 .TP
-\fB\-d\fR,\-\-directory
-Working directory where bundle should be
-generated
+\fB\-\-spoof\-key\-id\fR KEY_ID
+run this command as if signed by a specific access key
 .TP
-\fB\-c\fR,\-\-policy
-Base64 encoded S3 upload policy
+\fB\-\-ec2cert\fR FILE
+file containing the cloud's X.509 certificate
 .TP
-\fB\-\-policysignature\fR
-Signature for the upload policy
+\fB\-\-user\fR ACCOUNT
+the user's account ID
 .TP
-\fB\-p\fR,\-\-prefix
-The prefix for the bundle image files.
-(default: image name).
+\fB\-c\fR POLICY, \fB\-\-upload\-policy\fR POLICY
+Base64\-encoded S3 upload policy
 .TP
-\fB\-\-kernel\fR
-ID of the kernel to be associated with the
-image.
+\fB\-\-upload\-policy\-signature\fR SIGNATURE, \fB\-\-policysignature\fR SIGNATURE
+signature for the upload policy given with \fB\-\-uploadpolicy\fR
 .TP
-\fB\-\-ramdisk\fR
-ID of the ramdisk to be associated with the
-image.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+storage service endpoint URL
 .TP
-\fB\-\-product\-codes\fR
-Product code to be associated with the image.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-b\fR,\-\-block\-device\-mapping
-Default block device mapping for the image
-(comma\-separated list of key=value pairs).
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-r\fR,\-\-arch
-Target architecture for the image.
-Valid Values: i386|x86_64|armhf
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-acl\fR
-Canned ACL policy
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-bundle-vol.1 b/man/euca-bundle-vol.1
index 5478b37..1196a35 100644
--- a/man/euca-bundle-vol.1
+++ b/man/euca-bundle-vol.1
@@ -1,122 +1,118 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-BUNDLE-VOL: "1" "May 2013" "euca2ools euca-bundle-vol: error: must be superuser" "User Commands"
 .SH NAME
-euca2ools \- Bundles an image for use with Eucalyptus or Amazon EC2.
+euca-bundle-vol: \- Display information about regions
+.SH SYNOPSIS
+euca\-bundle\-vol [\-s MB] [\-p PREFIX] [\-a] [\-\-no\-inherit | \fB\-\-inherit]\fR
+[\-i FILE1,FILE2,...] [\-e DIR1,DIR2,...] [\-\-volume PATH]
+[\-\-no\-filter] [\-\-fstab PATH | \fB\-\-generate\-fstab]\fR \fB\-r\fR
+{i386,x86_64,armhf} [\-c FILE] [\-k FILE] [\-u ACCOUNT]
+[\-\-region USER at REGION] [\-\-ec2cert FILE]
+[\-\-kernel IMAGE] [\-\-ramdisk IMAGE]
+[\-B VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,...] [\-d DIR]
+[\-\-productcodes CODE1,CODE2,...]
+[\-\-progress | \fB\-\-no\-progress]\fR [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-Bundles an image for use with Eucalyptus or Amazon EC2.
-.PP
-euca\-bundle\-vol  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-s, \fB\-\-size\fR <size> ][\-u, \fB\-\-user\fR <user> ][\-c,
-\fB\-\-cert\fR <cert_path> ][\-k, \fB\-\-privatekey\fR <private_key_path> ][\-a,
-\fB\-\-all][\-p\fR, \fB\-\-prefix\fR <prefix> ][\-\-no\-inherit][\-e, \fB\-\-exclude\fR
-<exclude> ][\-\-kernel <kernel_id> ][\-\-ramdisk <ramdisk_id>
-][\-\-product\-codes <product_codes> ][\-b, \fB\-\-block\-device\-mapping\fR
-<block_device_mapping> ][\-d, \fB\-\-destination\fR <destination_path>
-][\-\-ec2cert <ec2cert_path> ][\-r, \fB\-\-arch\fR <target_architecture>
-][\-\-volume <volume_path> ][\-\-fstab <fstab_path> ][\-\-generatefstab][\-\-batch]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Create a bundled iamge based on the running machine's filesystem
+.SH DESCRIPTION
+This command must be run as the superuser.
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-s\fR MB, \fB\-\-size\fR MB
+Size of the image in MB (default: 10240; recommended
+maximum: 10240).
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+the file name prefix to give the bundle's files
+(defaults to 'image').
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-a\fR, \fB\-\-all\fR
+Bundle all directories (including mounted
+filesystems).
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-no\-inherit\fR
+Do not add instance metadata to the bundled image
+(defaults to inheriting metadata).
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-inherit\fR
+Explicitly inherit instance metadata and add it to the
+bundled image (this is the default behavior)
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-i\fR FILE1,FILE2,..., \fB\-\-include\fR FILE1,FILE2,...
+Comma\-separated list of absolute file paths to
+include.
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-e\fR DIR1,DIR2,..., \fB\-\-exclude\fR DIR1,DIR2,...
+Comma\-separated list of directories to exclude.
 .TP
-\fB\-s\fR,\-\-size
-Size of the image in MB(max=10240).
+\fB\-\-volume\fR PATH
+Path to mounted volume to bundle (defaults to '/').
 .TP
-\fB\-u\fR,\-\-user
-User ID (12\-digit) of the user who is
-bundling the image
+\fB\-\-no\-filter\fR
+Do not use the default filtered files list.
 .TP
-\fB\-c\fR,\-\-cert
-Path the users PEM\-encoded certificate.
+\fB\-\-fstab\fR PATH
+Path to the fstab to be bundled with image.
 .TP
-\fB\-k\fR,\-\-privatekey
-Path to users PEM\-encoded private key.
+\fB\-\-generate\-fstab\fR
+Generate fstab to bundle in image.
 .TP
-\fB\-a\fR,\-\-all
-Bundle all directories (including
-mounted filesystems.
+\fB\-r\fR {i386,x86_64,armhf}, \fB\-\-arch\fR {i386,x86_64,armhf}
+the image's processor architecture (required)
 .TP
-\fB\-p\fR,\-\-prefix
-The prefix for the bundle image files.
-(default: image name).
+\fB\-c\fR FILE, \fB\-\-cert\fR FILE
+file containing your X.509 certificate.
 .TP
-\fB\-\-no\-inherit\fR
-Do not add instance metadata to the bundled
-image.
+\fB\-k\fR FILE, \fB\-\-privatekey\fR FILE
+file containing the private key to sign the bundle's
+manifest with. This private key will also be required
+to unbundle the image in the future.
 .TP
-\fB\-e\fR,\-\-exclude
-Comma\-separated list of directories to
-exclude.
+\fB\-u\fR ACCOUNT, \fB\-\-user\fR ACCOUNT
+your account ID
 .TP
-\fB\-\-kernel\fR
-ID of the kernel to be associated with the
-image.
+\fB\-\-region\fR USER at REGION
+use encryption keys and the account ID specified for a
+user and/or region in configuration files
 .TP
-\fB\-\-ramdisk\fR
-ID of the ramdisk to be associated with the
-image.
+\fB\-\-ec2cert\fR FILE
+file containing the cloud's X.509 certificate
 .TP
-\fB\-\-product\-codes\fR
-Product code to be associated with the image.
+\fB\-\-kernel\fR IMAGE
+ID of the kernel image to associate with the machine
+bundle
 .TP
-\fB\-b\fR,\-\-block\-device\-mapping
-Default block device mapping for the image
-(comma\-separated list of key=value pairs).
+\fB\-\-ramdisk\fR IMAGE
+ID of the ramdisk image to associate with the machine
+bundle
 .TP
-\fB\-d\fR,\-\-destination
-Directory to store the bundled image in.
-Defaults to /tmp.  Recommended.
+\fB\-B\fR VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,..., \fB\-\-block\-device\-mappings\fR VIRTUAL1=DEVICE1,VIRTUAL2=DEVICE2,...
+default block device mapping scheme with which to
+launch instances of this machine image
 .TP
-\fB\-\-ec2cert\fR
-Path to the Cloud's X509 public key
-certificate.
+\fB\-d\fR DIR, \fB\-\-destination\fR DIR
+location to place the bundle's files (default: dir
+named by TMPDIR, TEMP, or TMP environment variables,
+or otherwise /var/tmp)
 .TP
-\fB\-r\fR,\-\-arch
-Target architecture for the image
-Valid Values: i386|x86_64|armhf
+\fB\-\-productcodes\fR CODE1,CODE2,...
+comma\-separated list of product codes
 .TP
-\fB\-\-volume\fR
-Path to mounted volume to bundle.
+\fB\-\-progress\fR
+show progress (the default when run interactively)
 .TP
-\fB\-\-fstab\fR
-Path to the fstab to be bundled with image.
+\fB\-\-no\-progress\fR
+do not show progress (the default when run noninteractively)
 .TP
-\fB\-\-generate\-fstab\fR
-Generate fstab to bundle in image.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-batch\fR
-Run in batch mode.  For compatibility has no
-effect
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-cancel-bundle-task.1 b/man/euca-cancel-bundle-task.1
index 218a781..b20ca0b 100644
--- a/man/euca-cancel-bundle-task.1
+++ b/man/euca-cancel-bundle-task.1
@@ -1,51 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CANCEL-BUNDLE-TASK "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Cancels a previously submitted bundle task.
+euca-cancel-bundle-task \- Display information about regions
+.SH SYNOPSIS
+euca\-cancel\-bundle\-task [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+TASK\-ID
 .SH DESCRIPTION
-Cancels a previously submitted bundle task.
-.PP
-euca\-cancel\-bundle\-task  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] bundle_id
-.PP
-REQUIRED PARAMETERS
-.TP
-bundle_id
-Identifier of the bundle task to be cancelled.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Cancel an instance bundling operation
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+TASK\-ID
+ID of the bundle task to cancel (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-check-bucket.1 b/man/euca-check-bucket.1
index cce88b2..25e697b 100644
--- a/man/euca-check-bucket.1
+++ b/man/euca-check-bucket.1
@@ -1,51 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CHECK-BUCKET "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Checks to see if a bucket exists
+euca-check-bucket \- Display information about regions
+.SH SYNOPSIS
+euca\-check\-bucket [\-\-region USER at REGION | \fB\-U\fR URL] [\-\-cert FILE]
+[\-\-privatekey FILE] [\-\-spoof\-key\-id KEY_ID] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+bucket
 .SH DESCRIPTION
-Checks to see if a bucket exists
-.PP
-euca\-check\-bucket  \fB\-b\fR, \fB\-\-bucket\fR <bucket> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-b\fR,\-\-bucket
-The name of the bucket to check
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+[Eucalyptus NC internal] Return successfully if a bucket already
+exists
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+bucket
+name of the bucket to check
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+storage service endpoint URL
+.TP
+\fB\-\-cert\fR FILE
+file containing the X.509 certificate to use when
+signing requests
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-privatekey\fR FILE
+file containing the private key to sign requests with
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-spoof\-key\-id\fR KEY_ID
+run this command as if signed by a specific access key
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-confirm-product-instance.1 b/man/euca-confirm-product-instance.1
index 2b75662..7554053 100644
--- a/man/euca-confirm-product-instance.1
+++ b/man/euca-confirm-product-instance.1
@@ -1,56 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CONFIRM-PRODUCT-INSTANCE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Confirm if instance is running with product code attached.
+euca-confirm-product-instance \- Display information about regions
+.SH SYNOPSIS
+euca\-confirm\-product\-instance \fB\-i\fR INSTANCE [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+CODE
 .SH DESCRIPTION
-Confirm if instance is running with product code attached.
-.PP
-euca\-confirm\-product\-instance  \fB\-i\fR, \fB\-\-instance\fR <instance_id> [\-a, \fB\-\-access\-key\fR
-.IP
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth] product_code
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-i\fR,\-\-instance
-Unique identifier for a running instance
-.TP
-product_code
-The product code to verify
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Verify if a product code is associated with an instance
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+CODE
+product code to confirm (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-i\fR INSTANCE, \fB\-\-instance\fR INSTANCE
+ID of the instance to confirm (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-group.1 b/man/euca-create-group.1
index 0739002..c0af776 100644
--- a/man/euca-create-group.1
+++ b/man/euca-create-group.1
@@ -1,55 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates a new security group.
+euca-create-group \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-group \fB\-d\fR DESC [\-c VPC] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+GROUP
 .SH DESCRIPTION
-Creates a new security group.
-.PP
-euca\-create\-group  \fB\-d\fR, \fB\-\-description\fR <group_description> [\-a, \fB\-\-access\-key\fR
-.IP
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key> ][\-\-config
-<config_path> ][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth]
-group_name
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-d\fR,\-\-description
-Description for the group to be created
-.TP
-group_name
-unique name for the group to be created
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Create a new security group
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+GROUP
+name of the new group (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-d\fR DESC, \fB\-\-description\fR DESC
+description of the new group (required)
+.TP
+\fB\-c\fR VPC, \fB\-\-vpc\fR VPC
+[VPC only] ID of the VPC to create the group in
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-image.1 b/man/euca-create-image.1
index b9e71e3..87e8604 100644
--- a/man/euca-create-image.1
+++ b/man/euca-create-image.1
@@ -1,64 +1,59 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-IMAGE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates an AMI from an EBS-based instance
+euca-create-image \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-image \fB\-n\fR NAME [\-d DESC] [\-\-no\-reboot] [\-b DEVICE=MAPPED]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+INSTANCE
 .SH DESCRIPTION
-Creates an AMI from an EBS\-based instance
-.PP
-euca\-create\-image  \fB\-n\fR, \fB\-\-name\fR <name> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-d, \fB\-\-description\fR
-<description> ][\-\-no\-reboot] instance_id
-.PP
-REQUIRED PARAMETERS
+Create an EBS image from a running or stopped EBS instance
+.SS "positional arguments:"
 .TP
-\fB\-n\fR,\-\-name
-Name for the new image you are creating
+INSTANCE
+instance from which to create the image (required)
+.SS "optional arguments:"
 .TP
-instance_id
-ID of the instance
-.PP
-OPTIONAL PARAMETERS
+\fB\-n\fR NAME, \fB\-\-name\fR NAME
+name for the new image (required)
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-d\fR DESC, \fB\-\-description\fR DESC
+description for the new image
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-\-no\-reboot\fR
+do not shut down the instance before creating the
+image. Image integrity may be affected.
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-b\fR DEVICE=MAPPED, \fB\-\-block\-device\-mapping\fR DEVICE=MAPPED
+define a block device mapping for the image, in the
+form DEVICE=MAPPED, where "MAPPED" is "none",
+"ephemeral(0\-3)", or "[SNAP_ID]:[SIZE]:[true|false]:[s
+tandard|VOLTYPE[:IOPS]]"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+show the program's version and exit
 .TP
-\fB\-d\fR,\-\-description
-A description of the new image
-.TP
-\fB\-\-no\-reboot\fR
-When set to true, the instance is not shut
-down before creating the image. When this
-option is used, file system integrity on
-the created image cannot be guaranteed
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-keypair.1 b/man/euca-create-keypair.1
index 620e2a3..f743efa 100644
--- a/man/euca-create-keypair.1
+++ b/man/euca-create-keypair.1
@@ -1,56 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-KEYPAIR "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates a new key pair for use with instances
+euca-create-keypair \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-keypair [\-f FILE] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+KEYPAIR
 .SH DESCRIPTION
-Creates a new key pair for use with instances
-.PP
-euca\-create\-keypair  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-f, \fB\-\-filename\fR
-<filename> ] keypair_name
-.PP
-REQUIRED PARAMETERS
-.TP
-keypair_name
-unique name for a keypair to be created
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Create a new SSH key pair for use with instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+KEYPAIR
+name of the new key pair (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-f\fR FILE, \fB\-\-filename\fR FILE
+file name to save the private key to
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-f\fR,\-\-filename
-Filename to save the private key to. Default
-action is to overwite the file.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-snapshot.1 b/man/euca-create-snapshot.1
index 07ce618..ce7b99e 100644
--- a/man/euca-create-snapshot.1
+++ b/man/euca-create-snapshot.1
@@ -1,55 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-SNAPSHOT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates a snapshot from an existing volume.
+euca-create-snapshot \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-snapshot [\-d DESC] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+VOLUME
 .SH DESCRIPTION
-Creates a snapshot from an existing volume.
-.PP
-euca\-create\-snapshot  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-d,
-\fB\-\-description\fR <description> ] volume_id
-.PP
-REQUIRED PARAMETERS
-.TP
-volume_id
-unique name for a volume to snapshot.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Create a snapshot of a volume
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+VOLUME
+volume to create a snapshot of (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-d\fR DESC, \fB\-\-description\fR DESC
+snapshot description
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-d\fR,\-\-description
-A description of the new snapshot
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-tags.1 b/man/euca-create-tags.1
index 86b1b50..068902e 100644
--- a/man/euca-create-tags.1
+++ b/man/euca-create-tags.1
@@ -1,58 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-TAGS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Adds or overwrites one or more tags for the
-    specified resource or resources
+euca-create-tags \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-tags \fB\-\-tag\fR KEY[=VALUE] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+RESOURCE [RESOURCE ...]
 .SH DESCRIPTION
-Adds or overwrites one or more tags for the
-.IP
-specified resource or resources
-.PP
-euca\-create\-tags  \fB\-\-tag\fR <tag> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] resource_id
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-\-tag\fR
-The key and optional value, separated by =
-sign.
-.TP
-resource_id
-The resource you want to tag.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Add or overwrite tags for one or more resources
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+RESOURCE
+ID(s) of the resource(s) to tag (at least 1 required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-tag\fR KEY[=VALUE]
+key and optional value of the tag to create, separated
+by an "=" character. If no value is given the tag's
+value is set to an empty string. (at least 1 required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-create-volume.1 b/man/euca-create-volume.1
index 858361b..6fc0ee5 100644
--- a/man/euca-create-volume.1
+++ b/man/euca-create-volume.1
@@ -1,60 +1,55 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-CREATE-VOLUME "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates a volume in a specified availability zone.
+euca-create-volume \- Display information about regions
+.SH SYNOPSIS
+euca\-create\-volume \fB\-z\fR ZONE [\-s SIZE] [\-\-snapshot SNAPSHOT] [\-t VOLTYPE]
+[\-i IOPS] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Creates a volume in a specified availability zone.
-.PP
-euca\-create\-volume  \fB\-z\fR, \fB\-\-zone\fR <zone> [\-A, \fB\-\-access\-key\fR <access_key> ][\-S,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-s, \fB\-\-size\fR
-<size> ][\-\-snapshot <snapshot> ]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-z\fR,\-\-zone
-availability zone to create the volume in
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Create a new volume
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-z\fR ZONE, \fB\-\-zone\fR ZONE
+availability zone in which to create the new volume
+(required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-s\fR SIZE, \fB\-\-size\fR SIZE
+size of the new volume in GiB (required unless
+\fB\-\-snapshot\fR is used)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-snapshot\fR SNAPSHOT
+snapshot from which to create the new volume
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-t\fR VOLTYPE, \fB\-\-type\fR VOLTYPE
+volume type
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-i\fR IOPS, \fB\-\-iops\fR IOPS
+number of I/O operations per second
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-s\fR,\-\-size
-size of the volume (in GiB).
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-snapshot\fR
-snapshot id to create the volume from.
-Either size or snapshot can be specified (not
-both).
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-bundle.1 b/man/euca-delete-bundle.1
index 7e228a8..ec26bf9 100644
--- a/man/euca-delete-bundle.1
+++ b/man/euca-delete-bundle.1
@@ -1,72 +1,48 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-BUNDLE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Delete a previously-uploaded bundle.
+euca-delete-bundle \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-bundle \fB\-b\fR BUCKET[/PREFIX] (\fB\-m\fR MANIFEST | \fB\-p\fR PREFIX)
+[\-\-clear] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-Delete a previously\-uploaded bundle.
-.PP
-Use \fB\-\-manifest\fR to delete a specific bundle based on the contents of
-a locally\-available manifest file.
-.PP
-Use \fB\-\-prefix\fR to delete a specific bundle based on the contents of a
-manifest file in the bucket.
-.PP
-(Deprecated)  When neither \fB\-\-manifest\fR nor \fB\-\-prefix\fR is supplied, all
-bundles in the given bucket are deleted.
-.PP
-euca\-delete\-bundle  \fB\-b\fR, \fB\-\-bucket\fR <bucket> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-m, \fB\-\-manifest\fR
-<manifest_path> ][\-p, \fB\-\-prefix\fR <prefix> ][\-\-clear]
-.PP
-REQUIRED PARAMETERS
+Delete a previously\-uploaded bundle
+.SS "optional arguments:"
 .TP
-\fB\-b\fR,\-\-bucket
-Name of the bucket to delete from.
-.PP
-OPTIONAL PARAMETERS
+\fB\-b\fR BUCKET[/PREFIX], \fB\-\-bucket\fR BUCKET[/PREFIX]
+location of the bundle to delete (required)
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-m\fR MANIFEST, \fB\-\-manifest\fR MANIFEST
+use a local manifest file to figure out what to delete
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+delete the bundle that begins with a specific prefix
+(e.g. "fry" for "fry.manifest.xml")
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-\-clear\fR
+attempt to delete the bucket as well
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-U\fR URL, \fB\-\-url\fR URL
+storage service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-\fB\-m\fR,\-\-manifest
-Delete a bundle based on a local manifest file
+show the program's version and exit
 .TP
-\fB\-p\fR,\-\-prefix
-Delete a bundle with a manifest in the bucket
-that begins with a specific name  (e.g. "fry"
-for "fry.manifest.xml")
-.TP
-\fB\-\-clear\fR
-Delete the bucket if possible.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-group.1 b/man/euca-delete-group.1
index 26781d7..87d5188 100644
--- a/man/euca-delete-group.1
+++ b/man/euca-delete-group.1
@@ -1,48 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Deletes a security group.
+euca-delete-group \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-group [\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+GROUP
 .SH DESCRIPTION
-Deletes a security group.
-.PP
-euca\-delete\-group  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] group_name
-.PP
-REQUIRED PARAMETERS
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Delete a security group
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+GROUP
+name or ID of the security group to delete (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-keypair.1 b/man/euca-delete-keypair.1
index 2c104dd..b08bdae 100644
--- a/man/euca-delete-keypair.1
+++ b/man/euca-delete-keypair.1
@@ -1,51 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-KEYPAIR "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Delete an existing keypair
+euca-delete-keypair \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-keypair [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+KEYPAIR
 .SH DESCRIPTION
-Delete an existing keypair
-.PP
-euca\-delete\-keypair  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] keypair_name
-.PP
-REQUIRED PARAMETERS
-.TP
-keypair_name
-unique name of the keypair to delete
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Delete a key pair
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+KEYPAIR
+name of the key pair to delete (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-snapshot.1 b/man/euca-delete-snapshot.1
index 148a8d5..d9e898d 100644
--- a/man/euca-delete-snapshot.1
+++ b/man/euca-delete-snapshot.1
@@ -1,52 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-SNAPSHOT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Deletes a snapshot.
+euca-delete-snapshot \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-snapshot [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+SNAPSHOT
 .SH DESCRIPTION
-Deletes a snapshot.
-.PP
-euca\-delete\-snapshot  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] snapshot_id
-.PP
-REQUIRED PARAMETERS
-.TP
-snapshot_id
-unique identifier for the snapshot to be
-deleted.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Delete a snapshot
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+SNAPSHOT
+ID of the snapshot to delete (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-tags.1 b/man/euca-delete-tags.1
index 9fdb624..6469d00 100644
--- a/man/euca-delete-tags.1
+++ b/man/euca-delete-tags.1
@@ -1,58 +1,53 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-TAGS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Deletes the specified tags from the
-    specified resource or resources
+euca-delete-tags \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-tags \fB\-\-tag\fR KEY[=[VALUE]] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+RESOURCE [RESOURCE ...]
 .SH DESCRIPTION
-Deletes the specified tags from the
-.IP
-specified resource or resources
-.PP
-euca\-delete\-tags  \fB\-\-tag\fR <tag> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] resource_id
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-\-tag\fR
-The key and optional value, separated by =
-sign.
-.TP
-resource_id
-The resource you want to tag.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Delete tags from one or more resources
+.SS "positional arguments:"
+.TP
+RESOURCE
+ID(s) of the resource(s) to un\-tag (at least 1
+required)
+.SS "optional arguments:"
+.TP
+\fB\-\-tag\fR KEY[=[VALUE]]
+key and optional value of the tag to delete, separated
+by an "=" character. If you specify a value then the
+tag is deleted only if its value matches the one you
+specified. If you specify the empty string as the
+value (e.g. "\-\-tag foo=") then the tag is deleted only
+if its value is the empty string. If you do not
+specify a value (e.g. "\-\-tag foo") then the tag is
+deleted regardless of its value. (at least 1 required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
 \fB\-\-debug\fR
-Turn on debugging output.
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
-.TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-delete-volume.1 b/man/euca-delete-volume.1
index 4110435..5c4a661 100644
--- a/man/euca-delete-volume.1
+++ b/man/euca-delete-volume.1
@@ -1,51 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DELETE-VOLUME "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Creates a volume in a specified availability zone.
+euca-delete-volume \- Display information about regions
+.SH SYNOPSIS
+euca\-delete\-volume [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+VOLUME
 .SH DESCRIPTION
-Creates a volume in a specified availability zone.
-.PP
-euca\-delete\-volume  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] volume_id
-.PP
-REQUIRED PARAMETERS
-.TP
-volume_id
-unique identifier for volume to be deleted.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Delete a volume
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+VOLUME
+ID of the volume to delete (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-deregister.1 b/man/euca-deregister.1
index 2a1b015..eeb3c77 100644
--- a/man/euca-deregister.1
+++ b/man/euca-deregister.1
@@ -1,52 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DEREGISTER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Deregisters an image in the cloud.
+euca-deregister \- Display information about regions
+.SH SYNOPSIS
+euca\-deregister [\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+IMAGE
 .SH DESCRIPTION
-Deregisters an image in the cloud.
-.PP
-euca\-deregister  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth] image_id
-.PP
-REQUIRED PARAMETERS
-.TP
-image_id
-unique identifier for image to be
-deregistered.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+De\-register an image.  After you de\-register an image it cannot be
+used to launch new instances.
+.SH DESCRIPTION
+Note that in Eucalyptus 3 you may need to run this twice to completely
+remove an image's registration from the system.
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+IMAGE
+ID of the image to de\-register (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-describe-addresses.1 b/man/euca-describe-addresses.1
index 8f5dae7..48ad791 100644
--- a/man/euca-describe-addresses.1
+++ b/man/euca-describe-addresses.1
@@ -1,55 +1,74 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-ADDRESSES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about addresses.
+euca-describe-addresses \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-addresses [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[address [address ...]]
 .SH DESCRIPTION
-Shows information about addresses.
-.PP
-euca\-describe\-addresses  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] [\-\-filter name=value] [ ip ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Show information about elastic IP addresses
+.SS "positional arguments:"
+.TP
+address
+limit results to specific elastic IP addresses or VPC
+allocation IDs
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
 \fB\-\-debug\fR
-Turn on debugging output.
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
+launch interactive debugger on error
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+allocation\-id
+[VPC only] allocation ID
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+association\-id
+[VPC only] association ID
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.PP
-AVAILABLE FILTERS
+domain
+whether the address is a standard or VPC
+address
 .TP
 instance\-id
-Instance the address is associated with (if
-any).
+instance the address is associated with
+.TP
+network\-interface\-id
+[VPC only] network interface the address is
+associated with
+network\-interface\-owner\-id
+[VPC only] ID of the network interface's owner
+.TP
+private\-ip\-address
+[VPC only] private address associated with the
+public address
 .TP
 public\-ip
-The elastic IP address.
+the elastic IP address
diff --git a/man/euca-describe-availability-zones.1 b/man/euca-describe-availability-zones.1
index 00a4b9f..0f1d598 100644
--- a/man/euca-describe-availability-zones.1
+++ b/man/euca-describe-availability-zones.1
@@ -1,61 +1,61 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-AVAILABILITY-ZONES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about availability zones.
+euca-describe-availability-zones \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-availability\-zones [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[ZONE [ZONE ...]]
 .SH DESCRIPTION
-Shows information about availability zones.
-.PP
-euca\-describe\-availability\-zones  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secretkey\fR <secret_key> ][\-\-config <config_path>
-.IP
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth] [\-\-filter name=value] [ zone ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Display availability zones within the current region
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+ZONE
+limit results to specific availability zones
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 message
-Message giving information about the
-Availability Zone.
+message giving information about the
+\&'availability zone
 .TP
 region\-name
-Region the Availability Zone is in (e.g., useast\-1).
+region the availability zone is in
 .TP
 state
-State of the Availability Zone
+state of the availability zone
 .TP
 zone\-name
-Name of the zone.
+name of the availability zone
diff --git a/man/euca-describe-bundle-tasks.1 b/man/euca-describe-bundle-tasks.1
index f318a63..ead3a22 100644
--- a/man/euca-describe-bundle-tasks.1
+++ b/man/euca-describe-bundle-tasks.1
@@ -1,85 +1,77 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-BUNDLE-TASKS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Retrieves previously submitted bundle tasks.
+euca-describe-bundle-tasks \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-bundle\-tasks [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[BUNDLE [BUNDLE ...]]
 .SH DESCRIPTION
-Retrieves previously submitted bundle tasks.
-.PP
-euca\-describe\-bundle\-tasks  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] [\-\-filter name=value] [ bundle_id ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Describe current instance\-bundling tasks
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+BUNDLE
+limit results to specific bundle tasks
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-bundle_id
-Identifiers of bundle tasks to describe.
-If no bundle task ids are specified
-all bundle tasks are returned.
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 bundle\-id
-ID of the bundle task.
+bundle task ID
 .TP
 error\-code
-If the task failed, the error code returned
+if the task failed, the error code returned
 .TP
 error\-message
-If the task failed, the error message
-returned.
+if the task failed, the error message returned
 .TP
 instance\-id
-ID of the instance that was bundled.
+ID of the bundled instance
 .TP
 progress
-Level of task completion, in percent (e.g.,
-20%).
+level of task completion, in percent
 .TP
 s3\-bucket
-bucket where the AMI will be stored
+bucket where the image will be stored
 .TP
 s3\-prefix
-Beginning of the AMI name.
+beginning of the bundle name
 .TP
 start\-time
-Time the task started.
+task start time
 .TP
 state
-State of the task.
+task state
 .TP
 update\-time
-Time of the most recent update for the task.
+most recent task update time
diff --git a/man/euca-describe-group.1 b/man/euca-describe-group.1
index 4becbab..1e2d73d 100644
--- a/man/euca-describe-group.1
+++ b/man/euca-describe-group.1
@@ -1,91 +1,73 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about groups.
+euca-describe-group \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-group [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[GROUP [GROUP ...]]
 .SH DESCRIPTION
-Shows information about groups.
-.PP
-euca\-describe\-group  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] [\-\-filter
-name=value] [ group_name ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+Show information about security groups
+.SH DESCRIPTION
+Note that filters are matched on literal strings only, so "\-\-filter
+ip\-permission.from\-port=22" will *not* match a group with a port range
+of 20 to 30.
+.SS "positional arguments:"
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+GROUP
+limit results to specific security groups
+.SS "optional arguments:"
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-group_name
-group to describe
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 description
-Description of the security group.
-.TP
+group description
+group\-id
 group\-name
-Name of the security group.
-.TP
-ip\-permission.cidr
-CIDR range that has been granted the
-permission.
-.TP
+ip\-permission.cidr    CIDR IP range granted permission by the group
 ip\-permission.from\-port
-Start of port range for the TCP and UDP
-protocols,                      or an ICMP
-type number.  An ICMP type number of \fB\-1\fR
-indicates                      a wildcard
-(i.e., any ICMP type number).
-.TP
+start of TCP/UDP port range, or ICMP type
+number
 ip\-permission.group\-name
-Name of security group that has been granted
-the permission.
-.TP
+name of another group granted permission by
+this group
 ip\-permission.protocol
-IP protocol for the permission.
-Valid Values: tcp | udp | icmp
-.TP
+IP protocol for the permission
 ip\-permission.to\-port
-End of port range for the TCP and UDP
-protocols,                      or an ICMP
-code.  An ICMP type number of \fB\-1\fR indicates a
-wildcard (i.e., any ICMP type number).
-.TP
+end of TCP/UDP port range, or ICMP code
 ip\-permission.user\-id
-ID of AWS account that has been granted
-the permission.
-.TP
+ID of an account granted permission
 owner\-id
-AWS account ID of the owner of the security
-group.
+tag\-key               key of a tag assigned to the group
+tag\-value             value of a tag assigned to the group
+vpc\-id                [VPC only] ID of a VPC the group belongs to
diff --git a/man/euca-describe-groups.1 b/man/euca-describe-groups.1
new file mode 100644
index 0000000..c597c3f
--- /dev/null
+++ b/man/euca-describe-groups.1
@@ -0,0 +1,6 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-GROUPS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euca-describe-groups \- Display information about regions
+.SH SYNOPSIS
+sh: build/*/euca\-describe\-groups: No such file or directory
diff --git a/man/euca-describe-image-attribute.1 b/man/euca-describe-image-attribute.1
index a359583..a972cb9 100644
--- a/man/euca-describe-image-attribute.1
+++ b/man/euca-describe-image-attribute.1
@@ -1,70 +1,63 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-IMAGE-ATTRIBUTE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Show image attributes.
+euca-describe-image-attribute \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-image\-attribute
+(\fB\-l\fR | \fB\-p\fR | \fB\-B\fR | \fB\-\-kernel\fR | \fB\-\-ramdisk\fR | \fB\-\-description\fR)
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+IMAGE
 .SH DESCRIPTION
-Show image attributes.
-.PP
-euca\-describe\-image\-attribute  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-B, \fB\-\-block\-device\-mapping][\-l\fR,
-\fB\-\-launch\-permission][\-p\fR, \fB\-\-productcode][\-\-kernel][\-\-ramdisk]\fR image_id
-.PP
-REQUIRED PARAMETERS
+Show information about an attribute of an image
+.SS "positional arguments:"
 .TP
-image_id
-unique identifier for the image that you want
-to retrieve the attributes for.
-.PP
-OPTIONAL PARAMETERS
+IMAGE
+image to describe
+.SS "optional arguments:"
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-l\fR, \fB\-\-launch\-permission\fR
+display launch permissions
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-p\fR, \fB\-\-product\-codes\fR
+list associated product codes
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-B\fR, \fB\-\-block\-device\-mapping\fR
+describe block device mappings
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-kernel\fR
+show associated kernel image ID
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-ramdisk\fR
+show associated ramdisk image ID
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-description\fR
+show the image's description
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-B\fR,\-\-block\-device\-mapping
-show block device mapping.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-l\fR,\-\-launch\-permission
-show launch permissions.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-p\fR,\-\-product\-code
-show the product codes associated with the
-image.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-\-kernel\fR
-show the kernel id associated with the image.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-ramdisk\fR
-show the ramdisk id associated with the image.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-describe-images.1 b/man/euca-describe-images.1
index 98c1cee..d8dfea0 100644
--- a/man/euca-describe-images.1
+++ b/man/euca-describe-images.1
@@ -1,159 +1,115 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-IMAGES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about machine images.
+euca-describe-images \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-images [\-a] [\-o ACCOUNT] [\-x ACCOUNT]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[IMAGE [IMAGE ...]]
 .SH DESCRIPTION
-Shows information about machine images.
-.PP
-euca\-describe\-images  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-a, \fB\-\-all][\-o\fR,
-\fB\-\-owner\fR <owner> ][\-x, \fB\-\-executable\-by\fR <executable_by> ]
-[\-\-filter name=value] [ image ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Show information about images
+.SH DESCRIPTION
+By default, only images your account owns and images for which your
+account has explicit launch permissions are shown.
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+IMAGE
+limit results to specific images
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-a\fR, \fB\-\-all\fR
+describe all images
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-o\fR ACCOUNT, \fB\-\-owner\fR ACCOUNT
+describe images owned by the specified owner
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-x\fR ACCOUNT, \fB\-\-executable\-by\fR ACCOUNT
+describe images for which the specified account has
+explicit launch permissions
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-a\fR,\-\-all
-Show all images that the user has access to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-o\fR,\-\-owner
-Show only images owned by the user.
-Valid values: account ID|self|amazon
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-x\fR,\-\-executable\-by
-Show only images for which user has
-explicit launch permissions.
-Valid values: account ID|self|all
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 architecture
-Image architecture.  Valid values are i386 |
-x86_64 | armhf
-.IP
-block\-device\-mapping.delete\-on\-terminationWhether the Amazon EBS volume is deleted on
-.IP
-instance termination.
-.IP
-block\-device\-mapping.device\-nameDevice name (e.g., /dev/sdh) for an Amazon EBS
-.TP
-volume
-mapped to the
-.IP
-image.
-.IP
-block\-device\-mapping.snapshot\-idSnapshot ID for an Amazon EBS volume mapped
-.IP
-to the image.
-.IP
-block\-device\-mapping.volume\-sizeVolume size for an Amazon EBS volume mapped
-.IP
-to the image.
+CPU architecture
+block\-device\-mapping.delete\-on\-termination
+whether a volume is deleted upon instance
+termination
+block\-device\-mapping.device\-name
+device name for a volume mapped to the image
+block\-device\-mapping.snapshot\-id
+snapshot ID for a volume mapped to the image
+block\-device\-mapping.volume\-size
+volume size for a volume mapped to the image
+block\-device\-mapping.volume\-type
+volume type for a volume mapped to the image
 .TP
 description
-Description of the AMI
+image description
 .TP
 hypervisor
-Hypervisor type of the image.
-Valid values are ovm | xen.
-.TP
+image's hypervisor type
 image\-id
-ID of the imageID
-.TP
-image\-type
-Type of the image.                      Valid
-values are machine | kernel | ramdisk
-.TP
-is\-public
-Whether the image is public.
-.TP
+image\-type            image type ("machine", "kernel", or "ramdisk")
+is\-public             whether the image is public
 kernel\-id
-Kernel ID.
-.TP
 manifest\-location
-Location of the image manifest.
-.TP
 name
-Name of the AMI.
-.TP
-owner\-alias
-AWS account alias (e.g., amazon or self) or
-AWS account ID that owns the AMI.
-.TP
-owner\-id
-AWS account ID of the image owner.
-.TP
-platform
-Use windows if you have Windows based AMIs;
-otherwise leave blank.
-.TP
-product\-code
-Product code associated with the AMI.
-.TP
+owner\-alias           image owner's account alias
+owner\-id              image owner's account ID
+platform              "windows" for Windows images
+product\-code          product code associated with the image
+product\-code.type     type of product code associated with the image
 ramdisk\-id
-The ramdisk ID.
-.TP
 root\-device\-name
-Root device name of the AMI (e.g., /dev/sda1).
-.TP
-root\-device\-type
-Root device type the AMI uses.
-Valid Values: ebs | instance\-store.
-.TP
-state
-State of the image.                      Valid
-values: available | pending | failed.
+root\-device\-type      root device type ("ebs" or "instance\-store")
+state                 image state ("available", "pending", or
+"failed")
 .TP
 state\-reason\-code
-Reason code for the state change.
+reason code for the most recent state change
 .TP
 state\-reason\-message
-Message for the state change.
+message for the most recent state change
 .TP
 tag\-key
-Key of a tag assigned to the resource.
+key of a tag assigned to the image
 .TP
 tag\-value
-Value of a tag assigned to the resource.
+value of a tag assigned to the image
 .TP
-tag:key
-Filters the results based on a specific
-tag/value combination.
+tag:KEY
+specific tag key/value combination
 .TP
 virtualization\-type
-Virtualization type of the image.
-Valid values: paravirtual | hvm
+virtualization type ("paravirtual" or "hvm")
diff --git a/man/euca-describe-instance-attribute.1 b/man/euca-describe-instance-attribute.1
new file mode 100644
index 0000000..6190949
--- /dev/null
+++ b/man/euca-describe-instance-attribute.1
@@ -0,0 +1,88 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-INSTANCE-ATTRIBUTE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euca-describe-instance-attribute \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-instance\-attribute
+(\fB\-b\fR | \fB\-\-disable\-api\-termination\fR | \fB\-\-ebs\-optimized\fR | \fB\-g\fR | \fB\-p\fR | \fB\-\-instance\-initiated\-shutdown\-behavior\fR | \fB\-t\fR | \fB\-\-kernel\fR | \fB\-\-ramdisk\fR | \fB\-\-root\-device\-name\fR | \fB\-\-source\-dest\-check\fR | \fB\-\-user\-data\fR)
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+INSTANCE
+.SH DESCRIPTION
+Show one of an instance's attributes.
+.SH DESCRIPTION
+Note that exactly one attribute may be shown at a time.
+.SS "positional arguments:"
+.TP
+INSTANCE
+ID of the instance to show info for (required)
+.SS "optional arguments:"
+.TP
+\fB\-b\fR, \fB\-\-block\-device\-mapping\fR
+show block device mappings
+.TP
+\fB\-\-disable\-api\-termination\fR
+show whether termination is disabled
+.TP
+\fB\-\-ebs\-optimized\fR
+show whether the root volume is optimized for EBS I/O
+.TP
+\fB\-g\fR, \fB\-\-group\-id\fR
+show the security groups the instance belongs to
+.TP
+\fB\-p\fR, \fB\-\-product\-code\fR
+show any associated product codes
+.TP
+\fB\-\-instance\-initiated\-shutdown\-behavior\fR
+show whether the instance stops or terminates when
+shut down
+.TP
+\fB\-t\fR, \fB\-\-instance\-type\fR
+show the instance's type
+.TP
+\fB\-\-kernel\fR
+show the ID of the kernel image associated with the
+instance
+.TP
+\fB\-\-ramdisk\fR
+show the ID of the ramdisk image associated with the
+instance
+.TP
+\fB\-\-root\-device\-name\fR
+show the name of the instance's root device (e.g.
+\&'/dev/sda1')
+.TP
+\fB\-\-source\-dest\-check\fR
+[VPC only] show whether source/destination checking is
+enabled for the instance
+.TP
+\fB\-\-user\-data\fR
+show the instance's user\-data
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-describe-instance-types.1 b/man/euca-describe-instance-types.1
new file mode 100644
index 0000000..3fdef69
--- /dev/null
+++ b/man/euca-describe-instance-types.1
@@ -0,0 +1,50 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-INSTANCE-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euca-describe-instance-types \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-instance\-types [\-\-by\-zone] [\-\-show\-capacity]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[INSTANCETYPE [INSTANCETYPE ...]]
+.SH DESCRIPTION
+[Eucalyptus only] Show information about instance types
+.SS "positional arguments:"
+.TP
+INSTANCETYPE
+limit results to specific instance types
+.SS "optional arguments:"
+.TP
+\fB\-\-by\-zone\fR
+show info for each availability zone separately
+.TP
+\fB\-\-show\-capacity\fR
+show info about instance capacity
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-describe-instances.1 b/man/euca-describe-instances.1
index dae908c..1275c10 100644
--- a/man/euca-describe-instances.1
+++ b/man/euca-describe-instances.1
@@ -1,201 +1,220 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about instances.
+euca-describe-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[INSTANCE [INSTANCE ...]]
 .SH DESCRIPTION
-Shows information about instances.
-.PP
-euca\-describe\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] [\-\-filter name=value] [ instance ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Show information about instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+limit results to specific instances
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 architecture
-Instance architecture.
-Valid values are i386 | x86_64 | armhf
-.TP
+CPU architecture
+association.allocation\-id
+[VPC only] allocation ID bound to a network
+interface's elastic IP address
+association.association\-id
+[VPC only] association ID returned when an
+elastic IP was associated with a network
+interface
+association.ip\-owner\-id
+[VPC only] ID of the owner of the elastic IP
+address associated with a network interface
+association.public\-ip
+[VPC only] address of the elastic IP address
+bound to a network interface
 availability\-zone
-Instance's Availability Zone
-.IP
-block\-device\-mapping.attach\-timeAttach time for an Amazon EBS volume mapped
-.IP
-to the instance
-.IP
-block\-device\-mapping.delete\-on\-terminationWhether the Amazon EBS volume is deleted on
-.IP
-instance termination.
-.IP
-block\-device\-mapping.device\-nameDevice name (e.g., /dev/sdh) for an Amazon EBS
-.TP
-volume
-mapped to the
-.IP
-image.
-.TP
+block\-device\-mapping.attach\-time
+volume attachment time
+block\-device\-mapping.delete\-on\-termination
+whether a volume is deleted upon instance
+termination
+block\-device\-mapping.device\-name
+.TP
+volume device name (e.g.
+/dev/sdf)
 block\-device\-mapping.status
-Status for an Amazon EBS volume mapped to the
-instance.                      Valid Values:
-attaching | attached | detaching | detached
-.IP
-block\-device\-mapping.volume\-idID for an Amazon EBS volume mapped to the
-.IP
-instance.
+volume status
+block\-device\-mapping.volume\-id
+volume ID
 .TP
 client\-token
-Idempotency token you provided when you
-launched                      the instance.
+idempotency token provided at instance run
+time
 .TP
 dns\-name
-Public DNS name of the instance.
+public DNS name
 .TP
 group\-id
-A security group the instance is in.
+security group ID
+.TP
+group\-name
+security group name
 .TP
 hypervisor
-Hypervisor type of the instance.
-Valid values are ovm | xen.
+hypervisor type
 .TP
 image\-id
-ID of the imageID used to launch the instance
+machine image ID
 .TP
-instance\-id
-ID of the instance
-.TP
-instance\-lifecycle
-Whether this is a Spot Instance.
-.TP
-instance\-state\-code
-Code identifying the state of the instance
-.TP
-instance\-state\-name
-State of the instance.
+instance.group\-id
+security group ID
 .TP
+instance.group\-name
+security group name
+instance\-id
+instance\-lifecycle    whether this is a spot instance
+instance\-state\-code   numeric code identifying instance state
+instance\-state\-name   instance state
 instance\-type
-Type of the instance.
-.TP
-ip\-address
-Public IP address of the instance.
-.TP
-kernel\-id
-Kernel ID.
-.TP
-key\-name
-Name of the key pair used when the
-instance was launched.
-.TP
-launch\-index
-When launching multiple instances at once,
-this is the index for the instance in the
-launch group
-.TP
-launch\-time
-Time instance was launched
-.TP
-monitoring\-state
-Whether monitoring is enabled for the
-instance.
+ip\-address            public IP address
+kernel\-id             kernel image ID
+key\-name              key pair name provided at instance launch time
+launch\-index          launch index within a reservation
+launch\-time           instance launch time
+monitoring\-state      monitoring state ("enabled" or "disabled")
+network\-interface.addresses.association.ip\-owner\-id
+[VPC only] ID of the owner of the private IP
+address associated with a network interface
+network\-interface.addresses.association.public\-ip
+[VPC only] ID of the association of an elastic
+IP address with a network interface
+network\-interface.addresses.primary
+[VPC only] whether the IP address of the VPC
+network interface is the primary private IP
+address
+network\-interface.addresses.private\-ip\-address
+[VPC only] network interface's private IP
+address
+network\-interface.attachment.device\-index
+[VPC only] device index to which a network
+interface is attached
+network\-interface.attachment.attach\-time
+[VPC only] time a network interface was
+attached to an instance
+network\-interface.attachment.attachment\-id
+[VPC only] ID of a network interface's
+attachment
+network\-interface.attachment.delete\-on\-termination
+[VPC only] whether a network interface
+attachment is deleted when an instance is
+terminated
+network\-interface.attachment.instance\-owner\-id
+[VPC only] ID of the instance to which a
+network interface is attached
+network\-interface.attachment.status
+[VPC only] network interface's attachment
+status
+network\-interface.availability\-zone
+[VPC only] network interface's availability
+zone
+network\-interface.description
+[VPC only] description of a network interface
+network\-interface.group\-id
+[VPC only] network interface's security group
+ID
+network\-interface.group\-name
+[VPC only] network interface's security group
+name
+network\-interface.mac\-address
+[VPC only] network interface's hardware
+address
+network\-interface.network\-interface.id
+[VPC only] ID of a network interface
+network\-interface.owner\-id
+[VPC only] ID of a network interface's owner
+network\-interface.private\-dns\-name
+[VPC only] network interface's private DNS
+name
+network\-interface.requester\-id
+[VPC only] network interface's requester ID
+network\-interface.requester\-managed
+[VPC only] whether the network interface is
+managed by the service
+network\-interface.source\-destination\-check
+[VPC only] whether source/destination checking
+is enabled for a network interface
+network\-interface.status
+[VPC only] network interface's status
+network\-interface.subnet\-id
+[VPC only] ID of a network interface's subnet
+network\-interface.vpc\-id
+[VPC only] ID of a network interface's VPC
 .TP
 owner\-id
-AWS account ID of the image owner.
-.TP
+instance owner's account ID
 placement\-group\-name
-Name of the placement group the instance is in
-.TP
-platform
-Use windows if you have Windows based AMIs;
-otherwise leave blank.
-.TP
+platform              "windows" for Windows instances
 private\-dns\-name
-Private DNS name of the instance.
-.TP
 private\-ip\-address
-Private ip address of the instance.
-.TP
 product\-code
-Product code associated with the AMI.
+product\-code.type     type of product code ("devpay" or
+"marketplace")
 .TP
 ramdisk\-id
-The ramdisk ID.
+ramdisk image ID
 .TP
 reason
-Reason for the instance's current state.
+reason for the instance's current state
 .TP
 requestor\-id
-ID of the entity that launched the instance
-on your behalf.
-.TP
+ID of the entity that launched an instance
 reservation\-id
-ID of the instance's reservation.
-.TP
-root\-device\-name
-Root device name of the AMI (e.g., /dev/sda1).
-.TP
-root\-device\-type
-Root device type the AMI uses.
-Valid Values: ebs | instance\-store.
-.TP
+root\-device\-name      root device name (e.g.  /dev/sda1)
+root\-device\-type      root device type ("ebs" or "instance\-store")
 spot\-instance\-request\-id
-ID of the Spot Instance request.
-.TP
-state\-reason\-code
-Reason code for the state change.
-.TP
-state\-reason\-message
-Message for the state change.
+state\-reason\-code     reason code for the most recent state change
+state\-reason\-message  message describing the most recent state
+change
 .TP
 subnet\-id
-ID of the subnet the instance is in (VPC).
+[VPC only] ID of the subnet the instance is in
 .TP
 tag\-key
-Key of a tag assigned to the resource.
+name of any tag assigned to the instance
 .TP
 tag\-value
-Value of a tag assigned to the resource.
-.TP
-tag:key
-Filters the results based on a specific
-tag/value combination.
+value of any tag assigned to the instance
 .TP
+tag:KEY
+specific tag key/value combination
 virtualization\-type
-Virtualization type of the instance.
-Valid values: paravirtual | hvm
-.TP
-vpc\-id
-ID of the VPC the instance is in.
+vpc\-id                [VPC only] ID of the VPC the instance is in
diff --git a/man/euca-describe-keypairs.1 b/man/euca-describe-keypairs.1
index 0c1fd5d..cf00af6 100644
--- a/man/euca-describe-keypairs.1
+++ b/man/euca-describe-keypairs.1
@@ -1,54 +1,53 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-KEYPAIRS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about keypairs.
+euca-describe-keypairs \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-keypairs [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[KEYPAIR [KEYPAIR ...]]
 .SH DESCRIPTION
-Shows information about keypairs.
-.PP
-euca\-describe\-keypairs  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] [\-\-filter name=value] [ keypair ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Display information about available key pairs
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+KEYPAIR
+limit results to specific key pairs
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 fingerprint
-Fingerprint of the key pair.
+fingerprint of the key pair
 .TP
 key\-name
-Name of the keypair.
+name of the key pair
diff --git a/man/euca-describe-regions.1 b/man/euca-describe-regions.1
index 1fe90ab..78edea3 100644
--- a/man/euca-describe-regions.1
+++ b/man/euca-describe-regions.1
@@ -1,58 +1,49 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-REGIONS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about regions.
+euca-describe-regions \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-regions [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[REGION [REGION ...]]
 .SH DESCRIPTION
-Shows information about regions.
-.PP
-euca\-describe\-regions  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] [\-\-filter
-name=value] [ described_region_name ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Display information about regions
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+REGION
+limit results to specific regions
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-described_region_name
-name of the region to describe
-.PP
-AVAILABLE FILTERS
+\fB\-\-version\fR
+show the program's version and exit
 .TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 endpoint
-Endpoint of the region.
-.TP
 region\-name
-Name of the region.
diff --git a/man/euca-describe-snapshots.1 b/man/euca-describe-snapshots.1
index 3e06680..386168e 100644
--- a/man/euca-describe-snapshots.1
+++ b/man/euca-describe-snapshots.1
@@ -1,103 +1,81 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-SNAPSHOTS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about snapshots.
+euca-describe-snapshots \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-snapshots [\-a] [\-o ACCOUNT] [\-r ACCOUNT]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[SNAPSHOT [SNAPSHOT ...]]
 .SH DESCRIPTION
-Shows information about snapshots.
-.PP
-euca\-describe\-snapshots  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth][\-o, \fB\-\-owner\fR <owner> ][\-a, \fB\-\-all][\-r\fR,
-\fB\-\-restorable\-by\fR <restorable_by> ] [\-\-filter name=value]
-[ snapshot ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Show information about snapshots
+.SH DESCRIPTION
+By default, only snapshots your account owns and snapshots for which
+your account has explicit restore permissions are shown.
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+SNAPSHOT
+limit results to specific snapshots
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-a\fR, \fB\-\-all\fR
+describe all snapshots
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-o\fR ACCOUNT, \fB\-\-owner\fR ACCOUNT
+limit results to snapshots owned by specific accounts
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-r\fR ACCOUNT, \fB\-\-restorable\-by\fR ACCOUNT
+limit results to snapahots restorable by specific
+accounts
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-o\fR,\-\-owner
-ID of the user who owns the snapshot.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-a\fR,\-\-all
-Describe all snapshots, public, private or
-shared
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-r\fR,\-\-restorable\-by
-restorable by (user id of the user that can
-create volumes from the snapshot).
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-snapshot
-snapshots to describe
-.PP
-AVAILABLE FILTERS
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 .TP
 description
-Description of the snapshot
+snapshot description
 .TP
 owner\-alias
-AWS account alias (e.g., amazon or self) or
-AWS account ID that owns the snapshot.
+snapshot owner's account alias
 .TP
 owner\-id
-AWS account ID of the snapshot owner.
+snapshot owner's account ID
 .TP
 progress
-The progress of the snapshot, in percentage.
-.TP
+snapshot progress, in percentage
 snapshot\-id
-The ID of the snapshot.
-.TP
-start\-time
-Time stamp when the snapshot was initiated.
-.TP
+start\-time            snapshot initiation time
 status
-Status of the snapshost.
-Valid values: pending | completed | error.
-.TP
-tag\-key
-Key of a tag assigned to the resource.
-.TP
-tag\-value
-Value of a tag assigned to the resource.
-.TP
-tag:key
-Filters the results based on a specific
-tag/value combination.
-.TP
-volume\-id
-ID of the volume the snapshot is for
-.TP
+tag\-key               key of a tag assigned to the snapshot
+tag\-value             value of a tag assigned to the snapshot
+tag:KEY               specific tag key/value combination
+volume\-id             source volume ID
 volume\-size
-The size of the volume, in GiB.
diff --git a/man/euca-describe-tags.1 b/man/euca-describe-tags.1
index 74f38d2..b92ee46 100644
--- a/man/euca-describe-tags.1
+++ b/man/euca-describe-tags.1
@@ -1,66 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-TAGS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- List tags associated with your account.
+euca-describe-tags \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-tags [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-filter NAME=VALUE] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
 .SH DESCRIPTION
-List tags associated with your account.
-.PP
-euca\-describe\-tags  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] [\-\-filter
-name=value]
-.PP
-OPTIONAL PARAMETERS
+List tags associated with your account's resources
+.SS "optional arguments:"
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
 \fB\-\-debug\fR
-Turn on debugging output.
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
-.TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.PP
-AVAILABLE FILTERS
+show the program's version and exit
 .TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 key
-Tag key.
-.TP
 resource\-id
-Resource ID.
-.TP
 resource\-type
-Resource type.                      Valid
-Values: customer\-gateway | dhcp\-options |
-image |                      instance |
-reserved\-instances | snapshot |
-spot\-instances\-request | subnet | volume |
-vpc | vpn\-connection | vpn\-gateway
-.TP
 value
-Tag value.
diff --git a/man/euca-describe-volumes.1 b/man/euca-describe-volumes.1
index b89c016..0c71784 100644
--- a/man/euca-describe-volumes.1
+++ b/man/euca-describe-volumes.1
@@ -1,101 +1,70 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DESCRIBE-VOLUMES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Shows information about volumes.
+euca-describe-volumes \- Display information about regions
+.SH SYNOPSIS
+euca\-describe\-volumes [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-filter NAME=VALUE] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[VOLUME [VOLUME ...]]
 .SH DESCRIPTION
-Shows information about volumes.
-.PP
-euca\-describe\-volumes  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] [\-\-filter
-name=value] [ volume_id ]
-.PP
-OPTIONAL PARAMETERS
+Display information about volumes
+.SS "positional arguments:"
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+VOLUME
+limit results to specific volumes
+.SS "optional arguments:"
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-filter\fR NAME=VALUE
+restrict results to those that meet criteria
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-volume_id
-volumes to describe
-.PP
-AVAILABLE FILTERS
+show the program's version and exit
 .TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.SS "allowed filter names:"
 attachment.attach\-time
-Time stamp when the attachment initiated.
-.IP
-attachment.delete\-on\-terminationWhether the volume will be deleted on
-.IP
-instance termination.
+attachment start time
+attachment.delete\-on\-termination
+whether the volume will be deleted upon
+instance termination
 .TP
 attachment.device
-How the volume is exposed to the
-instance (e.g., /dev/sda1).
-.TP
+device node exposed to the instance
 attachment.instance\-id
-ID of the instance the volume is attached to.
+ID of the instance the volume is attached to
 .TP
 attachment.status
-Attachment state.                      Valid
-Values: attaching | attached | detaching |
-detached
-.TP
+attachment state
 availability\-zone
-Availability Zone in which the volume was
-created.
-.TP
-create\-time
-Time stamp when the volume was created.
-.TP
-size
-Size of the volume, in GiB (e.g., 20).
-.TP
-snapshot\-id
-Snapshot from which the volume was created.
-.TP
+create\-time           creation time
+size                  size in GiB
+snapshot\-id           snapshot from which the volume was created
 status
-Status of the volume.
-Valid values: pending | completed | error.
-.TP
-tag\-key
-Key of a tag assigned to the resource.
-.TP
-tag\-value
-Value of a tag assigned to the resource.
-.TP
-tag:key
-Filters the results based on a specific
-tag/value combination.
-.TP
+tag\-key               key of a tag assigned to the volume
+tag\-value             value of a tag assigned to the volume
+tag:KEY               specific tag key/value combination
 volume\-id
-ID of the volume the snapshot is for
+volume\-type
diff --git a/man/euca-detach-volume.1 b/man/euca-detach-volume.1
index 0fd6af6..7c284c4 100644
--- a/man/euca-detach-volume.1
+++ b/man/euca-detach-volume.1
@@ -1,65 +1,52 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DETACH-VOLUME "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Detaches a volume from an instance.
+euca-detach-volume \- Display information about regions
+.SH SYNOPSIS
+euca\-detach\-volume [\-i INSTANCE] [\-d DEVICE] [\-f] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+VOLUME
 .SH DESCRIPTION
-Detaches a volume from an instance.
-.PP
-euca\-detach\-volume  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-i, \fB\-\-instance\fR
-<instance_id> ][\-d, \fB\-\-device\fR <device> ][\-f, \fB\-\-force]\fR
-volume_id
-.PP
-REQUIRED PARAMETERS
+Detach a volume from an instance
+.SS "positional arguments:"
 .TP
-volume_id
-unique id for the volume to be detached
-.PP
-OPTIONAL PARAMETERS
+VOLUME
+ID of the volume to detach (required)
+.SS "optional arguments:"
 .TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-i\fR INSTANCE, \fB\-\-instance\fR INSTANCE
+instance to detach from
 .TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-d\fR DEVICE, \fB\-\-device\fR DEVICE
+device name
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-f\fR, \fB\-\-force\fR
+detach without waiting for the instance. Data may be
+lost.
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-\fB\-i\fR,\-\-instance
-unique id of a running instance to detach
-the volume from.
-.TP
-\fB\-d\fR,\-\-device
-local device name (inside the guest VM) to
-use.
+show the program's version and exit
 .TP
-\fB\-f\fR,\-\-force
-Forces detachment if the previous detachment
-attempt did not occur cleanly
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-disassociate-address.1 b/man/euca-disassociate-address.1
index dd8d1c8..af06b04 100644
--- a/man/euca-disassociate-address.1
+++ b/man/euca-disassociate-address.1
@@ -1,51 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DISASSOCIATE-ADDRESS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Disassociate a public IP address from an instance.
+euca-disassociate-address \- Display information about regions
+.SH SYNOPSIS
+euca\-disassociate\-address [\-a ASSOC] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+[ADDRESS]
 .SH DESCRIPTION
-Disassociate a public IP address from an instance.
-.PP
-euca\-disassociate\-address  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] ip
-.PP
-REQUIRED PARAMETERS
-.TP
-ip
-IP address to disassociate
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Disassociate an elastic IP address from an instance
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+ADDRESS
+[Non\-VPC only] elastic IP address to disassociate
+(required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-a\fR ASSOC, \fB\-\-association\-id\fR ASSOC
+[VPC only] address's association ID (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-download-bundle.1 b/man/euca-download-bundle.1
index aefa38f..76d460a 100644
--- a/man/euca-download-bundle.1
+++ b/man/euca-download-bundle.1
@@ -1,63 +1,51 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-DOWNLOAD-BUNDLE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Downloads a bundled image from a bucket.
+euca-download-bundle \- Display information about regions
+.SH SYNOPSIS
+euca\-download\-bundle \fB\-b\fR BUCKET [\-m FILE | \fB\-p\fR PREFIX] [\-d DIR]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Downloads a bundled image from a bucket.
-.PP
-euca\-download\-bundle  \fB\-b\fR, \fB\-\-bucket\fR <bucket> [\-a, \fB\-\-access\-key\fR <access_key> ][\-s,
-.IP
-\fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-m, \fB\-\-manifest\fR
-<manifest_path> ][\-p, \fB\-\-prefix\fR <prefix> ][\-d, \fB\-\-directory\fR
-<directory> ]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-b\fR,\-\-bucket
-Name of the bucket to upload to.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Download a bundled image from the cloud
+.SH DESCRIPTION
+You must run euca\-unbundle\-image on the bundle you download to obtain
+the original image.
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-b\fR BUCKET, \fB\-\-bucket\fR BUCKET
+bucket to download the bucket from (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-m\fR FILE, \fB\-\-manifest\fR FILE
+use a local manifest file to figure out what to
+download
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+download the bundle that begins with a specific prefix
+(e.g. "fry" for "fry.manifest.xml")
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-d\fR DIR, \fB\-\-directory\fR DIR
+The directory to download the parts to.
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+storage service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-m\fR,\-\-manifest
-Path to the manifest file for bundled image.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-p\fR,\-\-prefix
-Prefix used to identify the image in the
-bucket
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-d\fR,\-\-directory
-The directory to download the parts to.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-get-console-output.1 b/man/euca-get-console-output.1
index 683b60c..bba735e 100644
--- a/man/euca-get-console-output.1
+++ b/man/euca-get-console-output.1
@@ -1,52 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-GET-CONSOLE-OUTPUT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Prints console output from a running instance.
+euca-get-console-output \- Display information about regions
+.SH SYNOPSIS
+euca\-get\-console\-output [\-r] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+INSTANCE
 .SH DESCRIPTION
-Prints console output from a running instance.
-.PP
-euca\-get\-console\-output  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance
-to show the console output for.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Retrieve console output for the specified instance
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID of the instance to obtain console output from
+(required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-r\fR, \fB\-\-raw\-console\-output\fR
+Display raw output without escaping control characters
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-get-password-data.1 b/man/euca-get-password-data.1
index 41411d7..59870d5 100644
--- a/man/euca-get-password-data.1
+++ b/man/euca-get-password-data.1
@@ -1,54 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-GET-PASSWORD-DATA "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Retrieves the encrypted administrator password
-    for a Windows instance.
+euca-get-password-data \- Display information about regions
+.SH SYNOPSIS
+euca\-get\-password\-data [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE
 .SH DESCRIPTION
-Retrieves the encrypted administrator password
-.IP
-for a Windows instance.
-.PP
-euca\-get\-password\-data  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for the Windows instance
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Retrieve the encrypted administrator password for an instance running
+Windows.  The encrypted password may be decrypted using the private
+key of the key pair given when launching the instance.
+.SS "positional arguments:"
+.TP
+INSTANCE
+ID of the instance to obtain the initial password for
+(required)
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
 \fB\-\-debug\fR
-Turn on debugging output.
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
-.TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-get-password.1 b/man/euca-get-password.1
index 7fa9907..ad7be02 100644
--- a/man/euca-get-password.1
+++ b/man/euca-get-password.1
@@ -1,59 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-GET-PASSWORD "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Retrieves decrypts the administrator password
-    for a Windows instance.
+euca-get-password \- Display information about regions
+.SH SYNOPSIS
+euca\-get\-password \fB\-k\fR FILE [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE
 .SH DESCRIPTION
-Retrieves decrypts the administrator password
-.IP
-for a Windows instance.
-.PP
-euca\-get\-password  \fB\-k\fR, \fB\-\-priv\-launch\-key\fR <privatekey> [\-a, \fB\-\-access\-key\fR
-.IP
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key> ][\-\-config
-<config_path> ][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth]
-instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-k\fR,\-\-priv\-launch\-key
-The file that contains the private key
-used to launch the instance.
-.TP
-instance_id
-unique identifier for the Windows instance
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Retrieve the administrator password for an instance running Windows
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID of the instance to obtain the initial password for
+(required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-k\fR FILE, \fB\-\-priv\-launch\-key\fR FILE
+file containing the private key corresponding to the
+key pair supplied at instance launch time (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-import-keypair.1 b/man/euca-import-keypair.1
index 05a8619..88b9b7b 100644
--- a/man/euca-import-keypair.1
+++ b/man/euca-import-keypair.1
@@ -1,55 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-IMPORT-KEYPAIR "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Import a public key created with 3rd party tool
+euca-import-keypair \- Display information about regions
+.SH SYNOPSIS
+euca\-import\-keypair \fB\-f\fR FILE [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+KEYPAIR
 .SH DESCRIPTION
-Import a public key created with 3rd party tool
-.PP
-euca\-import\-keypair  \fB\-f\fR, \fB\-\-public\-key\-file\fR <file_name> [\-a, \fB\-\-access\-key\fR
-.IP
-<access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key> ][\-\-config
-<config_path> ][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth]
-key_name
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-f\fR,\-\-public\-key\-file
-Path to file containing the public key.
-.TP
-key_name
-A unique name for the key pair.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Import a public RSA key as a new key pair
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+KEYPAIR
+name for the new key pair (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-f\fR FILE, \fB\-\-public\-key\-file\fR FILE
+name of a file containing the public key to import
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-modify-image-attribute.1 b/man/euca-modify-image-attribute.1
index edc710e..cf99443 100644
--- a/man/euca-modify-image-attribute.1
+++ b/man/euca-modify-image-attribute.1
@@ -1,68 +1,62 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-MODIFY-IMAGE-ATTRIBUTE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Show image attributes.
+euca-modify-image-attribute \- Display information about regions
+.SH SYNOPSIS
+euca\-modify\-image\-attribute (\fB\-\-description\fR DESC | \fB\-p\fR CODE | \fB\-l\fR)
+[\-a ENTITY] [\-r ENTITY]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+IMAGE
 .SH DESCRIPTION
-Show image attributes.
-.PP
-euca\-modify\-image\-attribute  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-l, \fB\-\-launch\-permission][\-p\fR,
-\fB\-\-product\-code\fR <product_code> ][\-a, \fB\-\-add\fR <add>
-][\-r, \fB\-\-remove\fR <remove> ] image_id
-.PP
-REQUIRED PARAMETERS
+Modify an attribute of an image
+.SS "positional arguments:"
 .TP
-image_id
-unique identifier for the image that you want
-to modify the attributes of.
-.PP
-OPTIONAL PARAMETERS
+IMAGE
+image to modify
+.SS "optional arguments:"
 .TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-\-description\fR DESC
+change the image's description
 .TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-p\fR CODE, \fB\-\-product\-code\fR CODE
+product code to add to the given instance\-store image
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-l\fR, \fB\-\-launch\-permission\fR
+grant/revoke launch permissions with \fB\-a\fR/\-r
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-a\fR ENTITY, \fB\-\-add\fR ENTITY
+account to grant launch permission, or "all" for all
+accounts
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-r\fR ENTITY, \fB\-\-remove\fR ENTITY
+account to remove launch permission from, or "all" for
+all accounts
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-l\fR,\-\-launch\-permission
-show launch permissions.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-p\fR,\-\-product\-code
-show the product codes associated with the
-image.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-a\fR,\-\-add
-Entity (typically, user id) to add.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-r\fR,\-\-remove
-Entity (typically, user id) to remove.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-modify-instance-type.1 b/man/euca-modify-instance-type.1
new file mode 100644
index 0000000..6f79ea8
--- /dev/null
+++ b/man/euca-modify-instance-type.1
@@ -0,0 +1,56 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-MODIFY-INSTANCE-TYPE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euca-modify-instance-type \- Display information about regions
+.SH SYNOPSIS
+euca\-modify\-instance\-type [\-c COUNT] [\-d GB] [\-m MB] [\-\-reset]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+INSTANCETYPE
+.SH DESCRIPTION
+[Eucalyptus cloud admin only] Modify an instance type
+.SS "positional arguments:"
+.TP
+INSTANCETYPE
+name of the instance type to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-c\fR COUNT, \fB\-\-cpus\fR COUNT
+number of virtual CPUs to allocate to each instance
+.TP
+\fB\-d\fR GB, \fB\-\-disk\fR GB
+amount of instance storage to allow each instance
+.TP
+\fB\-m\fR MB, \fB\-\-memory\fR MB
+amount of RAM to allocate to each instance
+.TP
+\fB\-\-reset\fR
+reset the instance type to its default configuration
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-monitor-instances.1 b/man/euca-monitor-instances.1
index eb578dc..ec5aa05 100644
--- a/man/euca-monitor-instances.1
+++ b/man/euca-monitor-instances.1
@@ -1,51 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-MONITOR-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Enables monitoring for running instances.
+euca-monitor-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-monitor\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Enables monitoring for running instances.
-.PP
-euca\-monitor\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to monitor
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Enable monitoring for one or more instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) of the instance(s) to begin monitoring (at least
+1 required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-reboot-instances.1 b/man/euca-reboot-instances.1
index e72d3c0..d3a5868 100644
--- a/man/euca-reboot-instances.1
+++ b/man/euca-reboot-instances.1
@@ -1,51 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-REBOOT-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Reboots specified instances.
+euca-reboot-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-reboot\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Reboots specified instances.
-.PP
-euca\-reboot\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to reboot
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Reboot one or more instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) of the instance(s) to reboot (at least 1
+required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-register.1 b/man/euca-register.1
index 1aa5323..1ec13f5 100644
--- a/man/euca-register.1
+++ b/man/euca-register.1
@@ -1,83 +1,72 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-REGISTER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Registers a manifest for use with the cloud.
+euca-register \- Display information about regions
+.SH SYNOPSIS
+euca\-register \fB\-n\fR NAME [\-d DESCRIPTION] [\-a {i386,x86_64,armhf}]
+[\-\-kernel KERNEL] [\-\-ramdisk RAMDISK]
+[\-\-root\-device\-name DEVICE] [\-s SNAPSHOT]
+[\-b DEVICE=MAPPED] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+[MANIFEST]
 .SH DESCRIPTION
-Registers a manifest for use with the cloud.
-.PP
-euca\-register  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-b, \fB\-\-block\-device\-mapping\fR <block_device_mapping>
-][\-d, \fB\-\-description\fR <description> ][\-n, \fB\-\-name\fR <name> ][\-a,
-\fB\-\-architecture\fR <architecture> ][\-\-kernel <kernel> ][\-\-ramdisk
-<ramdisk> ][\-\-root\-device\-name <root_device_name> ][\-s,
-\fB\-\-snapshot\fR <snapshot> ] [ image_location ]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Register a new image
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+MANIFEST
+location of the image manifest in S3 storage (required
+for instance\-store images)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-n\fR NAME, \fB\-\-name\fR NAME
+name of the new image (required)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-d\fR DESCRIPTION, \fB\-\-description\fR DESCRIPTION
+description of the new image
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-a\fR {i386,x86_64,armhf}, \fB\-\-architecture\fR {i386,x86_64,armhf}
+CPU architecture of the new image
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-kernel\fR KERNEL
+ID of the kernel to associate with the new image
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-ramdisk\fR RAMDISK
+ID of the ramdisk to associate with the new image
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-root\-device\-name\fR DEVICE
+root device name (default: /dev/sda1)
 .TP
-\fB\-b\fR,\-\-block\-device\-mapping
-Block device mapping for the instance(s).
-Option may be used multiple times.
+\fB\-s\fR SNAPSHOT, \fB\-\-snapshot\fR SNAPSHOT
+snapshot to use for the root device
 .TP
-\fB\-d\fR,\-\-description
-Description of the image.
+\fB\-b\fR DEVICE=MAPPED, \fB\-\-block\-device\-mapping\fR DEVICE=MAPPED
+define a block device mapping for the image, in the
+form DEVICE=MAPPED, where "MAPPED" is "none",
+"ephemeral(0\-3)", or "[SNAPID]:[SIZE]:[true|false]:[standard|VOLTYPE[:IOPS]]"
 .TP
-\fB\-n\fR,\-\-name
-Name of the image.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-a\fR,\-\-architecture
-The architecture of the image.
-Valid Values: i386|x86_64|armhf
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-kernel\fR
-The ID of the kernel associated with the
-image.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-ramdisk\fR
-The ID of the ramdisk associated with the
-image.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-root\-device\-name\fR
-The root device name (e.g., /dev/sda1, or
-xvda).
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-s\fR,\-\-snapshot
-The snapshot ID to use as the root device.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-image_location
-Path to the uploaded image (bucket/manifest).
-Required if registering an S3\-based image
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-release-address.1 b/man/euca-release-address.1
index 3b764c8..d84c2b9 100644
--- a/man/euca-release-address.1
+++ b/man/euca-release-address.1
@@ -1,51 +1,46 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-RELEASE-ADDRESS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Releases a public IP address.
+euca-release-address \- Display information about regions
+.SH SYNOPSIS
+euca\-release\-address [\-a ALLOC] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+[ADDRESS]
 .SH DESCRIPTION
-Releases a public IP address.
-.PP
-euca\-release\-address  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] ip
-.PP
-REQUIRED PARAMETERS
-.TP
-ip
-The public IP address to release.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Release an elastic IP address
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+ADDRESS
+[Non\-VPC only] address to release (required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-a\fR ALLOC, \fB\-\-allocation\-id\fR ALLOC
+[VPC only] allocation ID for the address to release
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-reset-image-attribute.1 b/man/euca-reset-image-attribute.1
index 3cf6f83..774efa4 100644
--- a/man/euca-reset-image-attribute.1
+++ b/man/euca-reset-image-attribute.1
@@ -1,55 +1,47 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-RESET-IMAGE-ATTRIBUTE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Reset attributes of an image.
+euca-reset-image-attribute \- Display information about regions
+.SH SYNOPSIS
+euca\-reset\-image\-attribute \fB\-l\fR [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+IMAGE
 .SH DESCRIPTION
-Reset attributes of an image.
-.PP
-euca\-reset\-image\-attribute  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth][\-l, \fB\-\-launch\-permission]\fR image_id
-.PP
-REQUIRED PARAMETERS
-.TP
-image_id
-unique identifier for the image that you want
-to reset the attributes for.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Reset an attribute of an image to its default value
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+IMAGE
+ID of the image whose attribute should be reset
+(required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-l\fR, \fB\-\-launch\-permission\fR
+reset launch permissions
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-l\fR,\-\-launch\-permission
-show launch permissions.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-revoke.1 b/man/euca-revoke.1
index f4c5b02..f563474 100644
--- a/man/euca-revoke.1
+++ b/man/euca-revoke.1
@@ -1,77 +1,70 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-REVOKE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Revoke a rule for a security group.
+euca-revoke \- Display information about regions
+.SH SYNOPSIS
+euca\-revoke [\-\-egress] [\-P {tcp,udp,icmp,6,17,1}] [\-p RANGE]
+[\-t TYPE:CODE] [\-s CIDR | \fB\-o\fR GROUP] [\-u ACCOUNT]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+GROUP
 .SH DESCRIPTION
-Revoke a rule for a security group.
-.PP
-euca\-revoke  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-P, \fB\-\-protocol\fR <protocol> ][\-p, \fB\-\-port\-range\fR
-<port_range> ][\-t, \fB\-\-icmp\-type\-code\fR <icmp_type_code> ][\-o,
-\fB\-\-source\-group\fR <source_group> ][\-u, \fB\-\-source\-group\-user\fR
-<source_group_user> ][\-s, \fB\-\-source\-subnet\fR <source_subnet> ]
-group_name
-.PP
-REQUIRED PARAMETERS
+Remove a rule from a security group
+.SS "positional arguments:"
 .TP
-group_name
-Name of the group to remove the rule from.
-.PP
-OPTIONAL PARAMETERS
+GROUP
+name or ID of the security group to modify (required)
+.SS "optional arguments:"
 .TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-\-egress\fR
+[VPC only] manage an egress rule, which controls
+traffic leaving the group
 .TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-P\fR {tcp,udp,icmp,6,17,1}, \fB\-\-protocol\fR {tcp,udp,icmp,6,17,1}
+protocol to affect (default: tcp)
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-p\fR RANGE, \fB\-\-port\-range\fR RANGE
+range of ports (specified as "from\-to") or a single
+port number (required for tcp and udp)
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-t\fR TYPE:CODE, \fB\-\-icmp\-type\-code\fR TYPE:CODE
+ICMP type and code (specified as "type:code")
+(required for icmp)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-s\fR CIDR, \fB\-\-cidr\fR CIDR
+IP range (default: 0.0.0.0/0)
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-o\fR GROUP
+[Non\-VPC only] name of a security group with which to
+affect network communication
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-u\fR ACCOUNT
+ID of the account that owns the security group
+specified with \fB\-o\fR
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-P\fR,\-\-protocol
-The protocol.
-Valid Values: tcp|udp|icmp|6|17|1
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-p\fR,\-\-port\-range
-Range of ports for the rule (specified as
-"from\-to").
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-t\fR,\-\-icmp\-type\-code
-ICMP type and code specified as "type:code"
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-o\fR,\-\-source\-group
-Group from which traffic is authorized
-by the rule.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
-\fB\-u\fR,\-\-source\-group\-user
-User ID for the source group.
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-s\fR,\-\-source\-subnet
-The source subnet for the rule.
-Defaults to 0.0.0.0/0.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-run-instances.1 b/man/euca-run-instances.1
index 8664eaa..954f6b9 100644
--- a/man/euca-run-instances.1
+++ b/man/euca-run-instances.1
@@ -1,102 +1,164 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-RUN-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Starts instances.
+euca-run-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-run\-instances [\-n MIN[\-MAX]] [\-g GROUP] [\-k KEYPAIR]
+[\-d DATA | \fB\-\-user\-data\-force\fR DATA | \fB\-f\fR FILE]
+[\-\-addressing {public,private}] [\-t INSTANCETYPE]
+[\-z ZONE] [\-\-kernel KERNEL] [\-\-ramdisk RAMDISK]
+[\-b DEVICE=MAPPED] [\-m] [\-\-disable\-api\-termination]
+[\-\-instance\-initiated\-shutdown\-behavior {stop,terminate}]
+[\-\-placement\-group PLGROUP]
+[\-\-tenancy {default,dedicated}]
+[\-\-client\-token TOKEN] [\-s SUBNET]
+[\-\-private\-ip\-address ADDRESS]
+[\-\-secondary\-private\-ip\-address ADDRESS | \fB\-\-secondary\-private\-ip\-address\-count\fR COUNT]
+[\-a INTERFACE] [\-p IPROFILE] [\-\-ebs\-optimized]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+IMAGE
 .SH DESCRIPTION
-Starts instances.
-.PP
-euca\-run\-instances  [\-A, \fB\-\-access\-key\fR <access_key> ][\-S, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-n, \fB\-\-instancecount\fR <count> ][\-g, \fB\-\-group\fR <group_name> ][\-k, \fB\-\-key\fR
-<keyname> ][\-d, \fB\-\-user\-data\fR <user_data> ][\-\-user\-data\-force
-<user_data_force> ][\-f, \fB\-\-user\-data\-file\fR <user_data_file>
-][\-\-addressing <addressing> ][\-t, \fB\-\-instance\-type\fR
-<instance_type> ][\-\-kernel <kernel> ][\-\-ramdisk <ramdisk>
-][\-b, \fB\-\-block\-device\-mapping\fR <block_device_mapping>
-][\-\-monitor][\-s, \fB\-\-subnet\fR <subnet> ][\-z, \fB\-\-availability\-zone\fR
-<zone> ] image_id
-.PP
-REQUIRED PARAMETERS
-.TP
-image_id
-ID of the image to run.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Launch instances of a machine image
+.SS "positional arguments:"
+.TP
+IMAGE
+ID of the image to instantiate (required)
+.SS "optional arguments:"
+.TP
+\fB\-n\fR MIN[\-MAX], \fB\-\-instance\-count\fR MIN[\-MAX]
+number of instances to launch. If this number of
+instances cannot be launched, no instances will
+launch. If specified as a range (min\-max), the server
+will attempt to launch the maximum number, but no
+fewer than the minimum number.
+.TP
+\fB\-g\fR GROUP, \fB\-\-group\fR GROUP
+security group(s) in which to launch the instances
+.TP
+\fB\-k\fR KEYPAIR, \fB\-\-key\fR KEYPAIR
+name of the key pair to use
+.TP
+\fB\-d\fR DATA, \fB\-\-user\-data\fR DATA
+user data to make available to instances in this
+reservation
+.TP
+\fB\-\-user\-data\-force\fR DATA
+same as \fB\-d\fR/\-\-user\-data, but without checking if a file
+by that name exists first
+.TP
+\fB\-f\fR FILE, \fB\-\-user\-data\-file\fR FILE
+file containing user data to make available to the
+instances in this reservation
+.TP
+\fB\-\-addressing\fR {public,private}
+[Eucalyptus only] addressing scheme to launch the
+instance with. Use "private" to run an instance with
+no public address.
+.TP
+\fB\-t\fR INSTANCETYPE, \fB\-\-instance\-type\fR INSTANCETYPE
+type of instance to launch
+.HP
+\fB\-z\fR ZONE, \fB\-\-availability\-zone\fR ZONE
+.TP
+\fB\-\-kernel\fR KERNEL
+ID of the kernel to launch the instance(s) with
+.TP
+\fB\-\-ramdisk\fR RAMDISK
+ID of the ramdisk to launch the instance(s) with
+.TP
+\fB\-b\fR DEVICE=MAPPED, \fB\-\-block\-device\-mapping\fR DEVICE=MAPPED
+define a block device mapping for the instances, in
+the form DEVICE=MAPPED, where "MAPPED" is "none",
+"ephemeral(0\-3)", or "[SNAPID]:[SIZE]:[true|false]:[standard|VOLTYPE[:IOPS]]"
+.TP
+\fB\-m\fR, \fB\-\-monitor\fR
+enable detailed monitoring for the instance(s)
+.TP
+\fB\-\-disable\-api\-termination\fR
+prevent API users from terminating the instance(s)
+.TP
+\fB\-\-instance\-initiated\-shutdown\-behavior\fR {stop,terminate}
+whether to "stop" (default) or terminate EBS instances
+when they shut down
+.TP
+\fB\-\-placement\-group\fR PLGROUP
+name of a placement group to launch into
+.TP
+\fB\-\-tenancy\fR {default,dedicated}
+[VPC only] "dedicated" to run on single\-tenant
+hardware
+.TP
+\fB\-\-client\-token\fR TOKEN
+unique identifier to ensure request idempotency
+.TP
+\fB\-s\fR SUBNET, \fB\-\-subnet\fR SUBNET
+[VPC only] subnet to create the instance's network
+interface in
+.TP
+\fB\-\-private\-ip\-address\fR ADDRESS
+[VPC only] assign a specific primary private IP
+address to an instance's interface
+.TP
+\fB\-\-secondary\-private\-ip\-address\fR ADDRESS
+[VPC only] assign a specific secondary private IP
+address to an instance's network interface. Use this
+option multiple times to add additional addresses.
+.TP
+\fB\-\-secondary\-private\-ip\-address\-count\fR COUNT
+[VPC only] automatically assign a specific number of
+secondary private IP addresses to an instance's
+network interface
+.TP
+\fB\-a\fR INTERFACE, \fB\-\-network\-interface\fR INTERFACE
+[VPC only] add a network interface to the new
+instance. If the interface already exists, supply its
+ID and a numeric index for it, separated by ":", in
+the form "eni\-NNNNNNNN:INDEX". To create a new
+interface, supply a numeric index and subnet ID for
+it, along with (in order) an optional description, a
+primary private IP address, a list of security group
+IDs to associate with the interface, whether to delete
+the interface upon instance termination ("true" or
+"false"), a number of secondary private IP addresses
+to create automatically, and a list of secondary
+private IP addresses to assign to the interface,
+separated by ":", in the form ":INDEX:SUBNET:[DESCRIPT
+ION]:[PRIV_IP]:[GROUP1,GROUP2,...]:[true|false]:[SEC_I
+P_COUNT|:SEC_IP1,SEC_IP2,...]". You cannot specify
+both of the latter two. This option may be used
+multiple times. Each adds another network interface.
+.TP
+\fB\-p\fR IPROFILE, \fB\-\-iam\-profile\fR IPROFILE
+name or ARN of the IAM instance profile to associate
+with the new instance(s)
+.TP
+\fB\-\-ebs\-optimized\fR
+optimize the new instance(s) for EBS I/O
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
 \fB\-\-debug\fR
-Turn on debugging output.
+show debugging output
 .TP
 \fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
-.TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-\fB\-n\fR,\-\-instance\-count
-Number of instances to run.
-.TP
-\fB\-g\fR,\-\-group
-Security group to run the instance in.
-.TP
-\fB\-k\fR,\-\-key
-Name of a keypair.
-.TP
-\fB\-d\fR,\-\-user\-data
-User data to pass to the instance.
-.TP
-\fB\-\-user\-data\-force\fR
-Just like \fB\-\-user\-data\fR, but ignore any checks.
-.TP
-\fB\-f\fR,\-\-user\-data\-file
-File containing user data to pass to the
-instance.
-.TP
-\fB\-\-addressing\fR
-Deprecated.
-.TP
-\fB\-t\fR,\-\-instance\-type
-VM Image type to run the instance as.
-.TP
-\fB\-\-kernel\fR
-ID of the kernel to be used.
-.TP
-\fB\-\-ramdisk\fR
-ID of the ramdisk to be used.
-.TP
-\fB\-b\fR,\-\-block\-device\-mapping
-Block device mapping for the instance(s).
-Option may be used multiple times
-.TP
-\fB\-\-monitor\fR
-Enable monitoring for the instance.
-.TP
-\fB\-s\fR,\-\-subnet
-Amazon VPC subnet ID for the instance.
+show the program's version and exit
 .TP
-\fB\-z\fR,\-\-availability\-zone
-availability zone to run the instance in
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-start-instances.1 b/man/euca-start-instances.1
index 8481108..feee342 100644
--- a/man/euca-start-instances.1
+++ b/man/euca-start-instances.1
@@ -1,51 +1,42 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-START-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Starts the specified EBS-based instances.
+euca-start-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-start\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Starts the specified EBS\-based instances.
-.PP
-euca\-start\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to start
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Start one or more stopped instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) of the instance(s) to start
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-stop-instances.1 b/man/euca-stop-instances.1
index 168673d..c17f92a 100644
--- a/man/euca-stop-instances.1
+++ b/man/euca-stop-instances.1
@@ -1,55 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-STOP-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Stops the specified EBS-based instances.
+euca-stop-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-stop\-instances [\-f] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Stops the specified EBS\-based instances.
-.PP
-euca\-stop\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name>
-][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-f, \fB\-\-force]\fR
-instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to stop
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Stop one or more running instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) of the instance(s) to stop
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-f\fR, \fB\-\-force\fR
+immediately stop the instance(s). Data may be lost
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-f\fR,\-\-force
-Forces the instance to stop.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-terminate-instances.1 b/man/euca-terminate-instances.1
index a77ac4a..9b8ffb4 100644
--- a/man/euca-terminate-instances.1
+++ b/man/euca-terminate-instances.1
@@ -1,51 +1,43 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-TERMINATE-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Terminates the specified instances.
+euca-terminate-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-terminate\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Terminates the specified instances.
-.PP
-euca\-terminate\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to terminate
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Terminate one or more instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) of the instance(s) to terminate
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-unbundle.1 b/man/euca-unbundle.1
index 58aef84..398b1b5 100644
--- a/man/euca-unbundle.1
+++ b/man/euca-unbundle.1
@@ -1,64 +1,52 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-UNBUNDLE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Unbundles a previously uploaded bundle.
+euca-unbundle \- Display information about regions
+.SH SYNOPSIS
+euca\-unbundle \fB\-m\fR FILE [\-k FILE] [\-d DIR] [\-s DIR]
+[\-\-region USER at REGION] [\-\-progress | \fB\-\-no\-progress]\fR
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Unbundles a previously uploaded bundle.
-.PP
-euca\-unbundle  \fB\-m\fR, \fB\-\-manifest\fR <manifest_path> [\-A, \fB\-\-access\-key\fR <access_key>
-.IP
-][\-S, \fB\-\-secret\-key\fR <secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR <region_name> ][\-U,
-\fB\-\-url\fR <url> ][\-\-version][\-\-euca\-auth][\-k, \fB\-\-privatekey\fR
-<private_key_path> ][\-d, \fB\-\-destination\fR <destination_dir> ][\-s,
-\fB\-\-source\fR <source_dir> ]
-.PP
-REQUIRED PARAMETERS
+Recreate an image from its bundled parts
+.SH DESCRIPTION
+The key used to unbundle the image must match the certificate that was
+used to bundle it.
+.SS "optional arguments:"
 .TP
-\fB\-m\fR,\-\-manifest
-Path to the manifest file.
-.PP
-OPTIONAL PARAMETERS
+\fB\-m\fR FILE, \fB\-\-manifest\fR FILE
+the bundle's manifest file (required)
 .TP
-\fB\-A\fR,\-\-access\-key
-User's Access Key ID.
+\fB\-k\fR FILE, \fB\-\-privatekey\fR FILE
+file containing the private key to decrypt the bundle
+with. This must match the certificate used when
+bundling the image.
 .TP
-\fB\-S\fR,\-\-secret\-key
-User's Secret Key.
+\fB\-d\fR DIR, \fB\-\-destination\fR DIR
+where to place the unbundled image (default: current
+directory)
 .TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+\fB\-s\fR DIR, \fB\-\-source\fR DIR
+directory containing the bundled image parts (default:
+current directory)
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-\-region\fR USER at REGION
+use encryption keys specified for a user and/or region
+in configuration files
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-progress\fR
+show progress (the default when run interactively)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-no\-progress\fR
+do not show progress (the default when run noninteractively)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
-.TP
-\fB\-k\fR,\-\-privatekey
-Path to private key used to encrypt bundle.
-.TP
-\fB\-d\fR,\-\-destination
-Directory to store the image to.
-Defaults to the current directory.
+show the program's version and exit
 .TP
-\fB\-s\fR,\-\-source
-Source directory for the bundled image parts.
-Defaults to manifest directory.
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-unmonitor-instances.1 b/man/euca-unmonitor-instances.1
index 565b952..4345bac 100644
--- a/man/euca-unmonitor-instances.1
+++ b/man/euca-unmonitor-instances.1
@@ -1,52 +1,44 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-UNMONITOR-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Disables monitoring for running instances.
+euca-unmonitor-instances \- Display information about regions
+.SH SYNOPSIS
+euca\-unmonitor\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+INSTANCE [INSTANCE ...]
 .SH DESCRIPTION
-Disables monitoring for running instances.
-.PP
-euca\-unmonitor\-instances  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR
-.IP
-<secret_key> ][\-\-config <config_path>
-][\-\-debug][\-\-debugger][\-h, \fB\-\-help][\-\-region\fR
-<region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version][\-\-eucaauth] instance_id
-.PP
-REQUIRED PARAMETERS
-.TP
-instance_id
-unique identifier for instance to stop
-monitoring
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Disable monitoring for one or more instances
+.SS "positional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+INSTANCE
+ID(s) ofthe the instance(s) to stop monitoring (at
+least 1 required)
+.SS "optional arguments:"
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+compute service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display the version of this tool.
+show the program's version and exit
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-upload-bundle.1 b/man/euca-upload-bundle.1
index cb694ab..ad39caf 100644
--- a/man/euca-upload-bundle.1
+++ b/man/euca-upload-bundle.1
@@ -1,80 +1,73 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUCA-UPLOAD-BUNDLE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Upload a previously bundled image to the cloud.
+euca-upload-bundle \- Display information about regions
+.SH SYNOPSIS
+euca\-upload\-bundle \fB\-b\fR BUCKET[/PREFIX] \fB\-m\fR FILE
+[\-\-acl {public\-read,aws\-exec\-read,ec2\-bundle\-read}]
+[\-d DIR] [\-\-part INT] [\-\-location LOCATION]
+[\-\-retry] [\-\-skipmanifest]
+[\-\-progress | \fB\-\-no\-progress]\fR
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-Upload a previously bundled image to the cloud.
-.PP
-euca\-upload\-bundle  \fB\-b\fR, \fB\-\-bucket\fR <bucket> \fB\-m\fR, \fB\-\-manifest\fR <manifest_path> [\-a,
-.IP
-\fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth][\-\-acl <canned_acl> ][\-\-ec2cert <ec2cert_path>
-][\-d, \fB\-\-directory\fR <bundle_path> ][\-\-part <part>
-][\-\-skipmanifest][\-\-location <location> ]
-.PP
-REQUIRED PARAMETERS
-.TP
-\fB\-b\fR,\-\-bucket
-Name of the bucket to upload to.
-.TP
-\fB\-m\fR,\-\-manifest
-Path to the manifest file for bundled image.
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
+Upload a bundle prepared by euca\-bundle\-image to the cloud
+.SS "optional arguments:"
 .TP
-\fB\-\-debug\fR
-Turn on debugging output.
+\fB\-b\fR BUCKET[/PREFIX], \fB\-\-bucket\fR BUCKET[/PREFIX]
+bucket to upload the bundle to (required)
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-m\fR FILE, \fB\-\-manifest\fR FILE
+manifest for the bundle to upload (required)
 .TP
-\fB\-h\fR,\-\-help
-Display this help message.
+\fB\-\-acl\fR {public\-read,aws\-exec\-read,ec2\-bundle\-read}
+canned ACL policy to apply to the bundle (default:
+aws\-exec\-read)
 .TP
-\fB\-\-region\fR
-region to direct requests to
+\fB\-d\fR DIR, \fB\-\-directory\fR DIR
+directory that contains the bundle parts (default:
+directory that contains the manifest)
 .TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
+\fB\-\-part\fR INT
+begin uploading with a specific part number (default:
+0)
 .TP
-\fB\-\-version\fR
-Display the version of this tool.
+\fB\-\-location\fR LOCATION
+location constraint of the destination bucket
+(default: inferred from s3\-location\-constraint in
+configuration, or otherwise none)
 .TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+\fB\-\-retry\fR
+retry failed uploads up to 5 times
 .TP
-\fB\-\-acl\fR
-Canned access policy
+\fB\-\-skipmanifest\fR
+do not upload the manifest
 .TP
-\fB\-\-ec2cert\fR
-Path to the Cloud's X509 public key
-certificate.
+\fB\-\-progress\fR
+show progress (the default when run interactively)
 .TP
-\fB\-d\fR,\-\-directory
-The directory containing the bundled
-image to upload (defaults to the manifest
-directory).
+\fB\-\-no\-progress\fR
+do not show progress (the default when run noninteractively)
 .TP
-\fB\-\-part\fR
-Uploads specified part and all subsequent
-parts.
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-skipmanifest\fR
-Do not  upload the manifest.
+\fB\-U\fR URL, \fB\-\-url\fR URL
+storage service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
 .TP
-\fB\-\-location\fR
-The location of the destination S3 bucket
-Valid values: EU|us\-west\-1|ap\-southeast\-1|apnortheast\-1
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euca-version.1 b/man/euca-version.1
index f5b446c..2ce66ee 100644
--- a/man/euca-version.1
+++ b/man/euca-version.1
@@ -1,46 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.TH EUCA-VERSION "1" "May 2013" "euca-version 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- Base class
+euca-version \- Display the euca2ools suite's version
+.SH SYNOPSIS
+euca-version
 .SH DESCRIPTION
-Base class
-.PP
-euca\-version  [\-a, \fB\-\-access\-key\fR <access_key> ][\-s, \fB\-\-secret\-key\fR <secret_key>
-.IP
-][\-\-config <config_path> ][\-\-debug][\-\-debugger][\-h,
-\fB\-\-help][\-\-region\fR <region_name> ][\-U, \fB\-\-url\fR <url> ][\-\-version
-][\-\-euca\-auth]
-.PP
-OPTIONAL PARAMETERS
-.TP
-\fB\-a\fR,\-\-access\-key
-User's Access Key ID.
-.TP
-\fB\-s\fR,\-\-secret\-key
-User's Secret Key.
-.TP
-\fB\-\-config\fR
-Read credentials and cloud settings
-from the specified config file (defaults to
-$HOME/.eucarc or /etc/euca2ools/eucarc).
-.TP
-\fB\-\-debug\fR
-Turn on debugging output.
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
-.TP
-\fB\-h\fR,\-\-help
-Display this help message.
-.TP
-\fB\-\-region\fR
-region to direct requests to
-.TP
-\fB\-U\fR,\-\-url
-URL of the Cloud to connect to.
-.TP
-\fB\-\-version\fR
-Display the version of this tool.
-.TP
-\fB\-\-euca\-auth\fR
-Use NC authentication mode
+Display the euca2ools suite's version
diff --git a/man/eulb-apply-security-groups-to-lb.1 b/man/eulb-apply-security-groups-to-lb.1
new file mode 100644
index 0000000..b689b91
--- /dev/null
+++ b/man/eulb-apply-security-groups-to-lb.1
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-APPLY-SECURITY-GROUPS-TO-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-apply-security-groups-to-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-apply\-security\-groups\-to\-lb \fB\-g\fR GROUP1,GROUP2,...
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+[VPC only] Associate one or more security groups with a load balancer.
+All previous associations with security groups will be replaced.
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR GROUP1,GROUP2,..., \fB\-\-security\-groups\fR GROUP1,GROUP2,...
+security groups to associate the load balancer with
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-attach-lb-to-subnets.1 b/man/eulb-attach-lb-to-subnets.1
new file mode 100644
index 0000000..b76ff32
--- /dev/null
+++ b/man/eulb-attach-lb-to-subnets.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-ATTACH-LB-TO-SUBNETS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-attach-lb-to-subnets \- Display information about regions
+.SH SYNOPSIS
+eulb\-attach\-lb\-to\-subnets \fB\-s\fR SUBNET1,SUBNET2,... [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+[VPC only] Add a load balancer to one or more subnets
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-s\fR SUBNET1,SUBNET2,..., \fB\-\-subnets\fR SUBNET1,SUBNET2,...
+IDs of the subnets to add the load balancer to
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-configure-healthcheck.1 b/man/eulb-configure-healthcheck.1
new file mode 100644
index 0000000..7c1f998
--- /dev/null
+++ b/man/eulb-configure-healthcheck.1
@@ -0,0 +1,63 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CONFIGURE-HEALTHCHECK "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-configure-healthcheck \- Display information about regions
+.SH SYNOPSIS
+eulb\-configure\-healthcheck \fB\-\-healthy\-threshold\fR COUNT \fB\-\-interval\fR SECONDS
+\fB\-t\fR PROTOCOL:PORT[/PATH] \fB\-\-timeout\fR SECONDS
+\fB\-\-unhealthy\-threshold\fR COUNT
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+Configure health checking for instance registerd with a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-healthy\-threshold\fR COUNT
+number of consecutive successful health checks that
+will mark instances as Healthy (required)
+.TP
+\fB\-\-interval\fR SECONDS
+approximate interval between health checks (required)
+.TP
+\fB\-t\fR PROTOCOL:PORT[/PATH], \fB\-\-target\fR PROTOCOL:PORT[/PATH]
+connection target for health checks (required)
+.TP
+\fB\-\-timeout\fR SECONDS
+maximum health check duration (required)
+.TP
+\fB\-\-unhealthy\-threshold\fR COUNT
+number of consecutive failed health checks that will
+mark instances as Unhealthy (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-create-app-cookie-stickiness-policy.1 b/man/eulb-create-app-cookie-stickiness-policy.1
new file mode 100644
index 0000000..0a91e57
--- /dev/null
+++ b/man/eulb-create-app-cookie-stickiness-policy.1
@@ -0,0 +1,50 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CREATE-APP-COOKIE-STICKINESS-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-create-app-cookie-stickiness-policy \- Display information about regions
+.SH SYNOPSIS
+eulb\-create\-app\-cookie\-stickiness\-policy \fB\-c\fR COOKIENAME \fB\-p\fR POLICY
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Create a new stickiness policy for a load balancer, whereby the server
+application generates a cookie and adds it to its responses.  The load
+balancer will then use this cookie to route requests from each user to
+the same back end instance.  This type of policy can only be
+associated with HTTP or HTTPS listeners,
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-c\fR COOKIENAME, \fB\-\-cookie\-name\fR COOKIENAME
+name of the cookie used for stickiness (required)
+.TP
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the new policy (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-create-lb-cookie-stickiness-policy.1 b/man/eulb-create-lb-cookie-stickiness-policy.1
new file mode 100644
index 0000000..011c064
--- /dev/null
+++ b/man/eulb-create-lb-cookie-stickiness-policy.1
@@ -0,0 +1,50 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CREATE-LB-COOKIE-STICKINESS-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-create-lb-cookie-stickiness-policy \- Display information about regions
+.SH SYNOPSIS
+eulb\-create\-lb\-cookie\-stickiness\-policy \fB\-e\fR SECONDS \fB\-p\fR POLICY
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Create a new stickiness policy for a load balancer, whereby the load
+balancer automatically generates cookies that it uses to route
+requests from each user to the same back end instance.  This type of
+policy can only be associated with HTTP or HTTPS listeners.
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-e\fR SECONDS, \fB\-\-expiration\-period\fR SECONDS
+time period after which cookies should be considered
+stale (default: user's session length) (required)
+.TP
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the new policy (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-create-lb-listeners.1 b/man/eulb-create-lb-listeners.1
new file mode 100644
index 0000000..6092ca1
--- /dev/null
+++ b/man/eulb-create-lb-listeners.1
@@ -0,0 +1,54 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CREATE-LB-LISTENERS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-create-lb-listeners \- Display information about regions
+.SH SYNOPSIS
+eulb\-create\-lb\-listeners \fB\-l\fR "lb\-port=PORT,
+protocol={HTTP,HTTPS,SSL,TCP},
+instance\-port=PORT,
+instance\-protocol={HTTP,HTTPS,SSL,TCP},
+cert\-id=ARN" [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Add one or more listeners to a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-l\fR "lb\-port=PORT, protocol={HTTP,HTTPS,SSL,TCP}, instance\-port=PORT, instance\-protocol={HTTP,HTTPS,SSL,TCP}, cert\-id=ARN", \fB\-\-listener\fR "lb\-port=PORT, protocol={HTTP,HTTPS,SSL,TCP}, instance\-port=PORT, instance\-protocol={HTTP,HTTPS,SSL,TCP}, cert\-id=ARN"
+port/protocol settings for the load balancer, where
+lb\-port is the external port number, protocol is the
+external protocol, instance\-port is the back end
+server port number, instance\-protocol is the protocol
+to use for routing traffic to back end instances, and
+cert\-id is the ARN of the server certificate to use
+for encrypted connections. lb\-port, protocol, and
+instance\-port are required. This option may be used
+multiple times. (at least 1 required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-create-lb-policy.1 b/man/eulb-create-lb-policy.1
new file mode 100644
index 0000000..f3a32a8
--- /dev/null
+++ b/man/eulb-create-lb-policy.1
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CREATE-LB-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-create-lb-policy \- Display information about regions
+.SH SYNOPSIS
+eulb\-create\-lb\-policy \fB\-\-policy\-name\fR POLICY \fB\-\-policy\-type\fR POLTYPE
+[\-a "name=NAME, value=VALUE"]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Add a new policy to a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-policy\-name\fR POLICY
+name of the new policy (required)
+.TP
+\fB\-\-policy\-type\fR POLTYPE
+type of the new policy. For a list of policy types,
+use eulb\-describe\-lb\-policy\-types. (required)
+.TP
+\fB\-a\fR "name=NAME, value=VALUE", \fB\-\-attribute\fR "name=NAME, value=VALUE"
+name and value for each attribute associated with the
+new policy. Use this option multiple times to supply
+multiple attributes.
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-create-lb.1 b/man/eulb-create-lb.1
new file mode 100644
index 0000000..11aa959
--- /dev/null
+++ b/man/eulb-create-lb.1
@@ -0,0 +1,77 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-CREATE-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-create-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-create\-lb (\fB\-s\fR SUBNET1,SUBNET2,... | \fB\-z\fR ZONE1,ZONE2,...) \fB\-l\fR
+"lb\-port=PORT, protocol={HTTP,HTTPS,SSL,TCP},
+instance\-port=PORT,
+instance\-protocol={HTTP,HTTPS,SSL,TCP}, cert\-id=ARN"
+[\-i internal] [\-g GROUP1,GROUP2,...]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+Create a load balancer
+.SH DESCRIPTION
+After the load balancer is created, instances must be registered with
+it separately.
+.SS "positional arguments:"
+.TP
+ELB
+name of the new load balancer (required)
+.SS "optional arguments:"
+.TP
+\fB\-s\fR SUBNET1,SUBNET2,..., \fB\-\-subnets\fR SUBNET1,SUBNET2,...
+[VPC only] subnets the load balancer should run in
+(required)
+.TP
+\fB\-z\fR ZONE1,ZONE2,..., \fB\-\-availability\-zones\fR ZONE1,ZONE2,...
+[Non\-VPC only] availability zones the load balancer
+should run in (required)
+.TP
+\fB\-l\fR "lb\-port=PORT, protocol={HTTP,HTTPS,SSL,TCP}, instance\-port=PORT, instance\-protocol={HTTP,HTTPS,SSL,TCP}, cert\-id=ARN", \fB\-\-listener\fR "lb\-port=PORT, protocol={HTTP,HTTPS,SSL,TCP}, instance\-port=PORT, instance\-protocol={HTTP,HTTPS,SSL,TCP}, cert\-id=ARN"
+port/protocol settings for the load balancer, where
+lb\-port is the external port number, protocol is the
+external protocol, instance\-port is the back end
+server port number, instance\-protocol is the protocol
+to use for routing traffic to back end instances, and
+cert\-id is the ARN of the server certificate to use
+for encrypted connections. lb\-port, protocol, and
+instance\-port are required. This option may be used
+multiple times. (at least 1 required)
+.TP
+\fB\-i\fR internal, \fB\-\-scheme\fR internal
+[VPC only] "internal" to make the new load balancer
+private to a VPC
+.TP
+\fB\-g\fR GROUP1,GROUP2,..., \fB\-\-security\-groups\fR GROUP1,GROUP2,...
+[VPC only] IDs of the security groups to assign to the
+new load balancer
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-delete-lb-listeners.1 b/man/eulb-delete-lb-listeners.1
new file mode 100644
index 0000000..b38d671
--- /dev/null
+++ b/man/eulb-delete-lb-listeners.1
@@ -0,0 +1,46 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DELETE-LB-LISTENERS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-delete-lb-listeners \- Display information about regions
+.SH SYNOPSIS
+eulb\-delete\-lb\-listeners \fB\-l\fR PORT1,PORT2,...
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+Delete one or more listeners from a load balancer
+.SH DESCRIPTION
+If a listener named with \fB\-l\fR/\-\-lb\-ports does not exist, this command
+still succeeds.
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-l\fR PORT1,PORT2,..., \fB\-\-lb\-ports\fR PORT1,PORT2,...
+port numbers of the listeners to remove (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-delete-lb-policy.1 b/man/eulb-delete-lb-policy.1
new file mode 100644
index 0000000..cd4a553
--- /dev/null
+++ b/man/eulb-delete-lb-policy.1
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DELETE-LB-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-delete-lb-policy \- Display information about regions
+.SH SYNOPSIS
+eulb\-delete\-lb\-policy \fB\-p\fR POLICY [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Delete a policy from a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-p\fR POLICY, \fB\-\-policy\-name\fR POLICY
+name of the policy to delete (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-delete-lb.1 b/man/eulb-delete-lb.1
new file mode 100644
index 0000000..715a2b4
--- /dev/null
+++ b/man/eulb-delete-lb.1
@@ -0,0 +1,40 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DELETE-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-delete-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-delete\-lb [\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Delete a load balancer
+.SH DESCRIPTION
+If the load balancer does not exist, this command still succeeds.
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to delete (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-deregister-instances-from-lb.1 b/man/eulb-deregister-instances-from-lb.1
new file mode 100644
index 0000000..d83b160
--- /dev/null
+++ b/man/eulb-deregister-instances-from-lb.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DEREGISTER-INSTANCES-FROM-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-deregister-instances-from-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-deregister\-instances\-from\-lb \fB\-\-instances\fR INSTANCE1,INSTANCE2,...
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Remove one or more instances from a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-instances\fR INSTANCE1,INSTANCE2,...
+IDs of the instances to remove from the load balancer
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-describe-instance-health.1 b/man/eulb-describe-instance-health.1
new file mode 100644
index 0000000..5b7222d
--- /dev/null
+++ b/man/eulb-describe-instance-health.1
@@ -0,0 +1,51 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DESCRIBE-INSTANCE-HEALTH "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-describe-instance-health \- Display information about regions
+.SH SYNOPSIS
+eulb\-describe\-instance\-health [\-\-instances INSTANCE1,INSTANCE2,...]
+[\-\-show\-long] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Show the state of instances registered with a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to describe instances for
+(required)
+.SS "optional arguments:"
+.TP
+\fB\-\-instances\fR INSTANCE1,INSTANCE2,...
+limit results to specific instances
+.TP
+\fB\-\-show\-long\fR
+show all of the instances' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-describe-lb-policies.1 b/man/eulb-describe-lb-policies.1
new file mode 100644
index 0000000..eef1942
--- /dev/null
+++ b/man/eulb-describe-lb-policies.1
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DESCRIBE-LB-POLICIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-describe-lb-policies \- Display information about regions
+.SH SYNOPSIS
+eulb\-describe\-lb\-policies [\-p POLICY1,POLICY2,...] [\-\-show\-long]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+[ELB]
+.SH DESCRIPTION
+Show information about load balancer policies
+.SS "positional arguments:"
+.TP
+ELB
+show policies associated with a specific load balancer
+(default: only describe sample policies provided by
+the service)
+.SS "optional arguments:"
+.TP
+\fB\-p\fR POLICY1,POLICY2,..., \fB\-\-policy\-names\fR POLICY1,POLICY2,...
+limit results to specific policies
+.TP
+\fB\-\-show\-long\fR
+show all of the policies' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-describe-lb-policy-types.1 b/man/eulb-describe-lb-policy-types.1
new file mode 100644
index 0000000..f117ab3
--- /dev/null
+++ b/man/eulb-describe-lb-policy-types.1
@@ -0,0 +1,46 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DESCRIBE-LB-POLICY-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-describe-lb-policy-types \- Display information about regions
+.SH SYNOPSIS
+eulb\-describe\-lb\-policy\-types [\-\-show\-long] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[POLTYPE [POLTYPE ...]]
+.SH DESCRIPTION
+Show information about load balancer policy types
+.SS "positional arguments:"
+.TP
+POLTYPE
+limit results to specific policy types
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-long\fR
+show all of the policy types' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-describe-lbs.1 b/man/eulb-describe-lbs.1
new file mode 100644
index 0000000..3640169
--- /dev/null
+++ b/man/eulb-describe-lbs.1
@@ -0,0 +1,45 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DESCRIBE-LBS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-describe-lbs \- Display information about regions
+.SH SYNOPSIS
+eulb\-describe\-lbs [\-\-show\-long] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+[ELB [ELB ...]]
+.SH DESCRIPTION
+Show information about load balancers
+.SS "positional arguments:"
+.TP
+ELB
+limit results to specific load balancers
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-long\fR
+show all of the load balancers' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-detach-lb-from-subnets.1 b/man/eulb-detach-lb-from-subnets.1
new file mode 100644
index 0000000..dad76cb
--- /dev/null
+++ b/man/eulb-detach-lb-from-subnets.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DETACH-LB-FROM-SUBNETS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-detach-lb-from-subnets \- Display information about regions
+.SH SYNOPSIS
+eulb\-detach\-lb\-from\-subnets \fB\-s\fR SUBNET1,SUBNET2,...
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+[VPC only] Remove a load balancer from one or more subnets
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-s\fR SUBNET1,SUBNET2,..., \fB\-\-subnets\fR SUBNET1,SUBNET2,...
+IDs of the subnets to remove the load balancer from
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-disable-zones-for-lb.1 b/man/eulb-disable-zones-for-lb.1
new file mode 100644
index 0000000..47f0435
--- /dev/null
+++ b/man/eulb-disable-zones-for-lb.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-DISABLE-ZONES-FOR-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-disable-zones-for-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-disable\-zones\-for\-lb \fB\-z\fR ZONE1,ZONE2,... [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+Remove a load balancer from one or more availability zones
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-z\fR ZONE1,ZONE2,..., \fB\-\-availability\-zones\fR ZONE1,ZONE2,...
+availability zones to remove the load balancer from
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-enable-zones-for-lb.1 b/man/eulb-enable-zones-for-lb.1
new file mode 100644
index 0000000..3eef64a
--- /dev/null
+++ b/man/eulb-enable-zones-for-lb.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-ENABLE-ZONES-FOR-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-enable-zones-for-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-enable\-zones\-for\-lb \fB\-z\fR ZONE1,ZONE2,... [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ELB
+.SH DESCRIPTION
+Add a load balancer to one or more availability zones
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-z\fR ZONE1,ZONE2,..., \fB\-\-availability\-zones\fR ZONE1,ZONE2,...
+availability zones to add the load balancer to
+(required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-register-instances-with-lb.1 b/man/eulb-register-instances-with-lb.1
new file mode 100644
index 0000000..3091f9e
--- /dev/null
+++ b/man/eulb-register-instances-with-lb.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-REGISTER-INSTANCES-WITH-LB "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-register-instances-with-lb \- Display information about regions
+.SH SYNOPSIS
+eulb\-register\-instances\-with\-lb \fB\-\-instances\fR INSTANCE1,INSTANCE2,...
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Add one or more instances to a load balancer
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-instances\fR INSTANCE1,INSTANCE2,...
+IDs of the instances to register with the load
+balancer (required)
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-set-lb-listener-ssl-cert.1 b/man/eulb-set-lb-listener-ssl-cert.1
new file mode 100644
index 0000000..5c4da38
--- /dev/null
+++ b/man/eulb-set-lb-listener-ssl-cert.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-SET-LB-LISTENER-SSL-CERT "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-set-lb-listener-ssl-cert \- Display information about regions
+.SH SYNOPSIS
+eulb\-set\-lb\-listener\-ssl\-cert \fB\-l\fR PORT \fB\-c\fR ARN
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Change the certificate that terminates a load balancer'slistener's SSL
+connections
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-l\fR PORT, \fB\-\-lb\-port\fR PORT
+port that should use the certificate (required)
+.TP
+\fB\-c\fR ARN, \fB\-\-cert\-id\fR ARN
+ARN for the server certificate to use (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-set-lb-policies-for-backend-server.1 b/man/eulb-set-lb-policies-for-backend-server.1
new file mode 100644
index 0000000..c155f44
--- /dev/null
+++ b/man/eulb-set-lb-policies-for-backend-server.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-SET-LB-POLICIES-FOR-BACKEND-SERVER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-set-lb-policies-for-backend-server \- Display information about regions
+.SH SYNOPSIS
+eulb\-set\-lb\-policies\-for\-backend\-server \fB\-i\fR PORT \fB\-p\fR POLICY1,POLICY2,...
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Change the policies associated with a port on which load\-balanced back
+end servers listen.
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-i\fR PORT, \fB\-\-instance\-port\fR PORT
+port number of the back end server (required)
+.TP
+\fB\-p\fR POLICY1,POLICY2,..., \fB\-\-policy\-names\fR POLICY1,POLICY2,...
+list of policies to associate with the back end server
+(required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eulb-set-lb-policies-of-listener.1 b/man/eulb-set-lb-policies-of-listener.1
new file mode 100644
index 0000000..6009d81
--- /dev/null
+++ b/man/eulb-set-lb-policies-of-listener.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EULB-SET-LB-POLICIES-OF-LISTENER "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+eulb-set-lb-policies-of-listener \- Display information about regions
+.SH SYNOPSIS
+eulb\-set\-lb\-policies\-of\-listener \fB\-l\fR PORT \fB\-p\fR POLICY1,POLICY2,...
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ELB
+.SH DESCRIPTION
+Change the policy associated with a load balancer listener
+.SS "positional arguments:"
+.TP
+ELB
+name of the load balancer to modify (required)
+.SS "optional arguments:"
+.TP
+\fB\-l\fR PORT, \fB\-\-lb\-port\fR PORT
+port of the listener to modify (required)
+.TP
+\fB\-p\fR POLICY1,POLICY2,..., \fB\-\-policy\-names\fR POLICY1,POLICY2,...
+list of policies to associate with the listener
+(required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+load balancing service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-create-auto-scaling-group.1 b/man/euscale-create-auto-scaling-group.1
new file mode 100644
index 0000000..cc96327
--- /dev/null
+++ b/man/euscale-create-auto-scaling-group.1
@@ -0,0 +1,106 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-CREATE-AUTO-SCALING-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-create-auto-scaling-group \- Display information about regions
+.SH SYNOPSIS
+euscale\-create\-auto\-scaling\-group \fB\-l\fR LAUNCHCONFIG \fB\-M\fR COUNT \fB\-m\fR COUNT
+[\-\-default\-cooldown SECONDS]
+[\-\-desired\-capacity COUNT]
+[\-\-grace\-period SECONDS]
+[\-\-health\-check\-type {EC2,ELB}]
+[\-\-load\-balancers ELB1,ELB2,...]
+[\-\-placement\-group PLACEMENTGROUP]
+[\-\-tag "k=VALUE, id=VALUE, t=VALUE, v=VALUE, p={true,false}"]
+[\-\-termination\-policies POLICY1,POLICY2,...]
+[\-\-vpc\-zone\-identifier ZONE1,ZONE2,...]
+[\-z ZONE1,ZONE2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Create a new auto\-scaling group
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the new auto\-scaling group (required)
+.SS "optional arguments:"
+.TP
+\fB\-l\fR LAUNCHCONFIG, \fB\-\-launch\-configuration\fR LAUNCHCONFIG
+name of the launch configuration to use with the new
+group (required)
+.TP
+\fB\-M\fR COUNT, \fB\-\-max\-size\fR COUNT
+maximum group size (required)
+.TP
+\fB\-m\fR COUNT, \fB\-\-min\-size\fR COUNT
+minimum group size (required)
+.TP
+\fB\-\-default\-cooldown\fR SECONDS
+amount of time, in seconds, after a scaling activity
+completes before any further trigger\-related scaling
+activities may start
+.TP
+\fB\-\-desired\-capacity\fR COUNT
+number of running instances the group should contain
+.TP
+\fB\-\-grace\-period\fR SECONDS
+number of seconds to wait before starting health
+checks on newly\-created instances
+.TP
+\fB\-\-health\-check\-type\fR {EC2,ELB}
+service to obtain health check status from
+.TP
+\fB\-\-load\-balancers\fR ELB1,ELB2,...
+comma\-separated list of load balancers to use
+.TP
+\fB\-\-placement\-group\fR PLACEMENTGROUP
+placement group in which to launch new instances
+.TP
+\fB\-\-tag\fR "k=VALUE, id=VALUE, t=VALUE, v=VALUE, p={true,false}"
+attributes of a tag to affect. Tags follow the
+following format: "id=resource\-name, t=resource\-type,
+k=tag\-key, v=tag\-val, p=propagate\-at\-launch\-flag",
+where k is the tag's name, v is the tag's value, id is
+a resource ID, t is a resource type, and p is whether
+to propagate tags to instances created by the group. A
+value for 'k=' is required for each tag. The rest are
+optional. This argument may be used more than once.
+Each time affects a different tag.
+.TP
+\fB\-\-termination\-policies\fR POLICY1,POLICY2,...
+ordered list of termination policies. The first has
+the highest precedence.
+.TP
+\fB\-\-vpc\-zone\-identifier\fR ZONE1,ZONE2,...
+comma\-separated list of subnet identifiers. If you
+specify availability zones as well, ensure the
+subnets' availability zones match the ones you
+specified
+.TP
+\fB\-z\fR ZONE1,ZONE2,..., \fB\-\-availability\-zones\fR ZONE1,ZONE2,...
+comma\-separated list of availability zones for the new
+group (required unless subnets are supplied)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-create-launch-config.1 b/man/euscale-create-launch-config.1
new file mode 100644
index 0000000..b1e3672
--- /dev/null
+++ b/man/euscale-create-launch-config.1
@@ -0,0 +1,101 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-CREATE-LAUNCH-CONFIG "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-create-launch-config \- Display information about regions
+.SH SYNOPSIS
+euscale\-create\-launch\-config \fB\-i\fR IMAGE \fB\-t\fR TYPE
+[\-\-block\-device\-mapping DEVICE1=MAPPED1,DEVICE2=MAPPED2,...]
+[\-\-ebs\-optimized]
+[\-\-group GROUP1,GROUP2,...]
+[\-\-iam\-instance\-profile PROFILE]
+[\-\-kernel KERNEL] [\-\-key KEYPAIR]
+[\-\-monitoring\-enabled]
+[\-\-monitoring\-disabled]
+[\-\-ramdisk RAMDISK] [\-\-spot\-price PRICE]
+[\-d DATA | \fB\-\-user\-data\-force\fR DATA | \fB\-f\fR FILE]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+LAUNCHCONFIG
+.SH DESCRIPTION
+Create a new auto\-scaling instance launch configuration
+.SS "positional arguments:"
+.TP
+LAUNCHCONFIG
+name of the new launch configuration (required)
+.SS "optional arguments:"
+.TP
+\fB\-i\fR IMAGE, \fB\-\-image\-id\fR IMAGE
+machine image to use for instances (required)
+.TP
+\fB\-t\fR TYPE, \fB\-\-instance\-type\fR TYPE
+instance type for use for instances (required)
+.TP
+\fB\-\-block\-device\-mapping\fR DEVICE1=MAPPED1,DEVICE2=MAPPED2,...
+a comma\-separated list of block device mappings for
+the image, in the form DEVICE=MAPPED, where "MAPPED"
+is "none", "ephemeral(0\-3)", or "[SNAPID]:[SIZE]:[true|false]
+.TP
+\fB\-\-ebs\-optimized\fR
+whether the instance is optimized for EBS I/O
+.TP
+\fB\-\-group\fR GROUP1,GROUP2,...
+a comma\-separated list of security groups with which
+to associate instances. Either all group names or all
+group IDs are allowed, but not both.
+.TP
+\fB\-\-iam\-instance\-profile\fR PROFILE
+ARN of the instance profile associated with instances'
+IAM roles
+.TP
+\fB\-\-kernel\fR KERNEL
+kernel image to use for instances
+.TP
+\fB\-\-key\fR KEYPAIR
+name of the key pair to use for instances
+.TP
+\fB\-\-monitoring\-enabled\fR
+enable detailed monitoring (enabled by default)
+.TP
+\fB\-\-monitoring\-disabled\fR
+disable detailed monitoring (enabled by default)
+.TP
+\fB\-\-ramdisk\fR RAMDISK
+ramdisk image to use for instances
+.TP
+\fB\-\-spot\-price\fR PRICE
+maximum hourly price for any spot instances launched
+.TP
+\fB\-d\fR DATA, \fB\-\-user\-data\fR DATA
+user data to make available to instances
+.TP
+\fB\-\-user\-data\-force\fR DATA
+same as \fB\-d\fR/\-\-user\-data, but without checking if a file
+by that name exists first
+.TP
+\fB\-f\fR FILE, \fB\-\-user\-data\-file\fR FILE
+file containing user data to make available to
+instances
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-create-or-update-tags.1 b/man/euscale-create-or-update-tags.1
new file mode 100644
index 0000000..6329ec8
--- /dev/null
+++ b/man/euscale-create-or-update-tags.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-CREATE-OR-UPDATE-TAGS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-create-or-update-tags \- Display information about regions
+.SH SYNOPSIS
+euscale\-create\-or\-update\-tags \fB\-\-tag\fR "k=VALUE, id=VALUE, t=VALUE,
+v=VALUE, p={true,false}"
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+Create or update one or more resource tags
+.SS "optional arguments:"
+.TP
+\fB\-\-tag\fR "k=VALUE, id=VALUE, t=VALUE, v=VALUE, p={true,false}"
+attributes of a tag to affect. Tags follow the
+following format: "id=resource\-name, t=resource\-type,
+k=tag\-key, v=tag\-val, p=propagate\-at\-launch\-flag",
+where k is the tag's name, v is the tag's value, id is
+a resource ID, t is a resource type, and p is whether
+to propagate tags to instances created by the group. A
+value for 'k=' is required for each tag. The rest are
+optional. This argument may be used more than once.
+Each time affects a different tag. (at least 1
+required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-delete-auto-scaling-group.1 b/man/euscale-delete-auto-scaling-group.1
new file mode 100644
index 0000000..f35fb3c
--- /dev/null
+++ b/man/euscale-delete-auto-scaling-group.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DELETE-AUTO-SCALING-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-delete-auto-scaling-group \- Display information about regions
+.SH SYNOPSIS
+euscale\-delete\-auto\-scaling\-group [\-d] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Delete an auto\-scaling group
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to delete (required)
+.SS "optional arguments:"
+.TP
+\fB\-d\fR, \fB\-\-force\-delete\fR
+delete the group and all of its instances without
+waiting for all instances to terminate
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-delete-launch-config.1 b/man/euscale-delete-launch-config.1
new file mode 100644
index 0000000..3e71f28
--- /dev/null
+++ b/man/euscale-delete-launch-config.1
@@ -0,0 +1,39 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DELETE-LAUNCH-CONFIG "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-delete-launch-config \- Display information about regions
+.SH SYNOPSIS
+euscale\-delete\-launch\-config [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+LAUNCHCONFIG
+.SH DESCRIPTION
+Delete an auto\-scaling instance launch configuration
+.SS "positional arguments:"
+.TP
+LAUNCHCONFIG
+name of the launch configuration to delete (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-delete-notification-configuration.1 b/man/euscale-delete-notification-configuration.1
new file mode 100644
index 0000000..80c210d
--- /dev/null
+++ b/man/euscale-delete-notification-configuration.1
@@ -0,0 +1,45 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DELETE-NOTIFICATION-CONFIGURATION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-delete-notification-configuration \- Display information about regions
+.SH SYNOPSIS
+euscale\-delete\-notification\-configuration \fB\-t\fR TOPIC
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Delete an auto\-scaling group's notification configuration
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-t\fR TOPIC, \fB\-\-topic\-arn\fR TOPIC
+ARN of the SNS topic associated with the configuration
+to delete
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-delete-policy.1 b/man/euscale-delete-policy.1
new file mode 100644
index 0000000..832556b
--- /dev/null
+++ b/man/euscale-delete-policy.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DELETE-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-delete-policy \- Display information about regions
+.SH SYNOPSIS
+euscale\-delete\-policy \fB\-g\fR ASGROUP [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+POLICY
+.SH DESCRIPTION
+Delete a scaling policy
+.SS "positional arguments:"
+.TP
+POLICY
+name of the policy to delete (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+name of the auto\-scaling group the policy is
+associated with (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-delete-scheduled-action.1 b/man/euscale-delete-scheduled-action.1
new file mode 100644
index 0000000..fba6875
--- /dev/null
+++ b/man/euscale-delete-scheduled-action.1
@@ -0,0 +1,44 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DELETE-SCHEDULED-ACTION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-delete-scheduled-action \- Display information about regions
+.SH SYNOPSIS
+euscale\-delete\-scheduled\-action \fB\-g\fR ASGROUP
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ACTION
+.SH DESCRIPTION
+Delete a scheduled action
+.SS "positional arguments:"
+.TP
+ACTION
+name of the scheduled action to delete (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+name of the auto\-scaling group the scheduled action is
+associated with (required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-adjustment-types.1 b/man/euscale-describe-adjustment-types.1
new file mode 100644
index 0000000..271d195
--- /dev/null
+++ b/man/euscale-describe-adjustment-types.1
@@ -0,0 +1,38 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-ADJUSTMENT-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-adjustment-types \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-adjustment\-types [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+Describe policy adjustment types usable with scaling policies
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-auto-scaling-groups.1 b/man/euscale-describe-auto-scaling-groups.1
new file mode 100644
index 0000000..8b5426a
--- /dev/null
+++ b/man/euscale-describe-auto-scaling-groups.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-AUTO-SCALING-GROUPS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-auto-scaling-groups \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-auto\-scaling\-groups [\-\-show\-long]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[ASGROUP [ASGROUP ...]]
+.SH DESCRIPTION
+Describe auto\-scaling groups
+.SS "positional arguments:"
+.TP
+ASGROUP
+limit results to specific auto\-scaling groups
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-long\fR
+show all of the groups' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-auto-scaling-instances.1 b/man/euscale-describe-auto-scaling-instances.1
new file mode 100644
index 0000000..75b208a
--- /dev/null
+++ b/man/euscale-describe-auto-scaling-instances.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-AUTO-SCALING-INSTANCES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-auto-scaling-instances \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-auto\-scaling\-instances [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[INSTANCE [INSTANCE ...]]
+.SH DESCRIPTION
+Describe instances in auto\-scaling groups
+.SS "positional arguments:"
+.TP
+INSTANCE
+limit results to specific instances
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-auto-scaling-notification-types.1 b/man/euscale-describe-auto-scaling-notification-types.1
new file mode 100644
index 0000000..ad4a490
--- /dev/null
+++ b/man/euscale-describe-auto-scaling-notification-types.1
@@ -0,0 +1,39 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-AUTO-SCALING-NOTIFICATION-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-auto-scaling-notification-types \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-auto\-scaling\-notification\-types [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+.SH DESCRIPTION
+List all notification types supported by the service
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-launch-configs.1 b/man/euscale-describe-launch-configs.1
new file mode 100644
index 0000000..1441642
--- /dev/null
+++ b/man/euscale-describe-launch-configs.1
@@ -0,0 +1,46 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-LAUNCH-CONFIGS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-launch-configs \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-launch\-configs [\-\-show\-long] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[LAUNCHCONFIG [LAUNCHCONFIG ...]]
+.SH DESCRIPTION
+Describe auto\-scaling instance launch configurations
+.SS "positional arguments:"
+.TP
+LAUNCHCONFIG
+limit results to specific launch configurations
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-long\fR
+show all of the launch configurations' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-metric-collection-types.1 b/man/euscale-describe-metric-collection-types.1
new file mode 100644
index 0000000..5f8fad7
--- /dev/null
+++ b/man/euscale-describe-metric-collection-types.1
@@ -0,0 +1,38 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-METRIC-COLLECTION-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-metric-collection-types \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-metric\-collection\-types [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+Describe auto\-scaling metrics and granularities
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-notification-configurations.1 b/man/euscale-describe-notification-configurations.1
new file mode 100644
index 0000000..4a0581b
--- /dev/null
+++ b/man/euscale-describe-notification-configurations.1
@@ -0,0 +1,44 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-NOTIFICATION-CONFIGURATIONS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-notification-configurations \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-notification\-configurations [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+[ASGROUP [ASGROUP ...]]
+.SH DESCRIPTION
+Describe notification actions associated with auto\-scaling groups
+.SS "positional arguments:"
+.TP
+ASGROUP
+limit results to specific auto\-scaling groups
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-policies.1 b/man/euscale-describe-policies.1
new file mode 100644
index 0000000..0cf7f5a
--- /dev/null
+++ b/man/euscale-describe-policies.1
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-POLICIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-policies \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-policies [\-g ASGROUP] [\-\-show\-long]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+[POLICY [POLICY ...]]
+.SH DESCRIPTION
+Describe auto\-scaling policies
+.SS "positional arguments:"
+.TP
+POLICY
+limit results to specific auto\-scaling policies
+.SS "optional arguments:"
+.HP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+.TP
+\fB\-\-show\-long\fR
+show all of the policies' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-process-types.1 b/man/euscale-describe-process-types.1
new file mode 100644
index 0000000..1e32cb4
--- /dev/null
+++ b/man/euscale-describe-process-types.1
@@ -0,0 +1,38 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-PROCESS-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-process-types \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-process\-types [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+List all types of scaling processes
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-scaling-activities.1 b/man/euscale-describe-scaling-activities.1
new file mode 100644
index 0000000..8241850
--- /dev/null
+++ b/man/euscale-describe-scaling-activities.1
@@ -0,0 +1,51 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-SCALING-ACTIVITIES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-scaling-activities \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-scaling\-activities [\-g ASGROUP] [\-\-show\-long]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[ACTIVITY [ACTIVITY ...]]
+.SH DESCRIPTION
+Describe past and current auto\-scaling activities
+.SS "positional arguments:"
+.TP
+ACTIVITY
+limit results to specific auto\-scaling activities
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+name of an Auto Scaling group by which to filter the
+request
+.TP
+\fB\-\-show\-long\fR
+show all of the activities' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-scheduled-actions.1 b/man/euscale-describe-scheduled-actions.1
new file mode 100644
index 0000000..32ecaf0
--- /dev/null
+++ b/man/euscale-describe-scheduled-actions.1
@@ -0,0 +1,61 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-SCHEDULED-ACTIONS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-scheduled-actions \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-scheduled\-actions [\-g ASGROUP]
+[\-\-start\-time YYYY\-MM\-DDThh:mm:ssZ]
+[\-\-end\-time YYYY\-MM\-DDThh:mm:ssZ]
+[\-\-show\-long] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[ACTION [ACTION ...]]
+.SH DESCRIPTION
+Describe scheduled auto\-scaling group actions
+.SS "positional arguments:"
+.TP
+ACTION
+limit results to specific actions
+.SS "optional arguments:"
+.HP
+\fB\-g\fR ASGROUP, \fB\-\-group\fR ASGROUP
+.TP
+\fB\-\-start\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+earliest start time to return scheduled actions for.
+This is ignored when specific action names are
+provided.
+.TP
+\fB\-\-end\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+latest start time to return scheduled actions for.
+This is ignored when specific action names are
+provided.
+.TP
+\fB\-\-show\-long\fR
+show all of the scheduled actions' info
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-describe-termination-policy-types.1 b/man/euscale-describe-termination-policy-types.1
new file mode 100644
index 0000000..66d82da
--- /dev/null
+++ b/man/euscale-describe-termination-policy-types.1
@@ -0,0 +1,39 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DESCRIBE-TERMINATION-POLICY-TYPES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-describe-termination-policy-types \- Display information about regions
+.SH SYNOPSIS
+euscale\-describe\-termination\-policy\-types [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+.SH DESCRIPTION
+List all termination policies supported by the service
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-disable-metrics-collection.1 b/man/euscale-disable-metrics-collection.1
new file mode 100644
index 0000000..4053755
--- /dev/null
+++ b/man/euscale-disable-metrics-collection.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-DISABLE-METRICS-COLLECTION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-disable-metrics-collection \- Display information about regions
+.SH SYNOPSIS
+euscale\-disable\-metrics\-collection [\-m METRIC1,METRIC2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Disable monitoring of an auto\-scaling group's group metrics
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-m\fR METRIC1,METRIC2,..., \fB\-\-metrics\fR METRIC1,METRIC2,...
+list of metrics to disable (default: all metrics)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-enable-metrics-collection.1 b/man/euscale-enable-metrics-collection.1
new file mode 100644
index 0000000..9e5ba16
--- /dev/null
+++ b/man/euscale-enable-metrics-collection.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-ENABLE-METRICS-COLLECTION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-enable-metrics-collection \- Display information about regions
+.SH SYNOPSIS
+euscale\-enable\-metrics\-collection \fB\-g\fR GRANULARITY
+[\-m METRIC1,METRIC2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Enable monitoring of an auto\-scaling group's group metrics
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR GRANULARITY, \fB\-\-granularity\fR GRANULARITY
+granularity at which to collect metrics (required)
+.TP
+\fB\-m\fR METRIC1,METRIC2,..., \fB\-\-metrics\fR METRIC1,METRIC2,...
+list of metrics to collect (default: all metrics)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-execute-policy.1 b/man/euscale-execute-policy.1
new file mode 100644
index 0000000..90ba9da
--- /dev/null
+++ b/man/euscale-execute-policy.1
@@ -0,0 +1,50 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-EXECUTE-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-execute-policy \- Display information about regions
+.SH SYNOPSIS
+euscale\-execute\-policy [\-g ASGROUP] [\-h] [\-H]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-\-help]
+POLICY
+.SH DESCRIPTION
+Manually set an auto\-scaling instance's health status
+.SS "positional arguments:"
+.TP
+POLICY
+name or ARN of the policy to run (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+name or ARN of the auto\-scaling group
+.TP
+\fB\-h\fR, \fB\-\-honor\-cooldown\fR
+reject the request if the group is in cooldown
+(default: override any cooldown period)
+.TP
+\fB\-H\fR, \fB\-\-no\-honor\-cooldown\fR
+override any cooldown period (this is the default)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-put-notification-configuration.1 b/man/euscale-put-notification-configuration.1
new file mode 100644
index 0000000..1d0fcb8
--- /dev/null
+++ b/man/euscale-put-notification-configuration.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-PUT-NOTIFICATION-CONFIGURATION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-put-notification-configuration \- Display information about regions
+.SH SYNOPSIS
+euscale\-put\-notification\-configuration \fB\-n\fR TYPE1,TYPE2,... \fB\-t\fR TOPIC
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Create or replace an auto\-scaling group's notification configuration
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-n\fR TYPE1,TYPE2,..., \fB\-\-notification\-types\fR TYPE1,TYPE2,...
+comma\-separated list of event types that will trigger
+notification (required)
+.TP
+\fB\-t\fR TOPIC, \fB\-\-topic\-arn\fR TOPIC
+ARN of the SNS topic to publish notifications to
+(required)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-put-scaling-policy.1 b/man/euscale-put-scaling-policy.1
new file mode 100644
index 0000000..b68a03a
--- /dev/null
+++ b/man/euscale-put-scaling-policy.1
@@ -0,0 +1,67 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-PUT-SCALING-POLICY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-put-scaling-policy \- Display information about regions
+.SH SYNOPSIS
+euscale\-put\-scaling\-policy \fB\-g\fR ASGROUP \fB\-a\fR SCALE \fB\-t\fR
+{ChangeInCapacity,ExactCapacity,PercentChangeInCapacity}
+[\-\-cooldown SECONDS] [\-s PERCENT]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+POLICY
+.SH DESCRIPTION
+Create or update an auto\-scaling group's scaling policy
+.SS "positional arguments:"
+.TP
+POLICY
+name of the policy to create or update (required)
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+name of the auto\-scaling group the policy is
+associated with (required)
+.TP
+\fB\-a\fR SCALE, \fB\-\-adjustment\fR SCALE
+amount to scale the group's capacity of the group. Use
+a negative value, as in "\-\-adjustment=\-1", to decrease
+capacity. (required)
+.TP
+\fB\-t\fR {ChangeInCapacity,ExactCapacity,PercentChangeInCapacity}, \fB\-\-type\fR {ChangeInCapacity,ExactCapacity,PercentChangeInCapacity}
+whether the adjustment is the new desired size or an
+increment to the group's current capacity. An
+increment can either be a fixed number or a percentage
+of current capacity. (required)
+.TP
+\fB\-\-cooldown\fR SECONDS
+waiting period after successful auto\-scaling
+activities during which later auto\-scaling activities
+will not execute
+.TP
+\fB\-s\fR PERCENT, \fB\-\-min\-adjustment\-step\fR PERCENT
+for a PercentChangeInCapacity type policy, guarantee
+that this policy will change the group's desired
+capacity by at least this much
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-put-scheduled-update-group-action.1 b/man/euscale-put-scheduled-update-group-action.1
new file mode 100644
index 0000000..0c0a3f5
--- /dev/null
+++ b/man/euscale-put-scheduled-update-group-action.1
@@ -0,0 +1,70 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-PUT-SCHEDULED-UPDATE-GROUP-ACTION "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-put-scheduled-update-group-action \- Display information about regions
+.SH SYNOPSIS
+euscale\-put\-scheduled\-update\-group\-action \fB\-g\fR ASGROUP
+[\-b YYYY\-MM\-DDThh:mm:ssZ]
+[\-e YYYY\-MM\-DDThh:mm:ssZ]
+[\-r "MIN HOUR DATE MONTH DAY"]
+[\-\-desired\-capacity COUNT]
+[\-\-max\-size COUNT]
+[\-\-min\-size COUNT]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+ACTION
+.SH DESCRIPTION
+Schedule a scaling action for an auto\-scaling group
+.SS "positional arguments:"
+.TP
+ACTION
+name of the new scheduled action
+.SS "optional arguments:"
+.TP
+\fB\-g\fR ASGROUP, \fB\-\-auto\-scaling\-group\fR ASGROUP
+auto\-scaling group the new action should affect
+(required)
+.TP
+\fB\-b\fR YYYY\-MM\-DDThh:mm:ssZ, \fB\-\-start\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+time for this action to start
+.TP
+\fB\-e\fR YYYY\-MM\-DDThh:mm:ssZ, \fB\-\-end\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+time for this action to end
+.TP
+\fB\-r\fR "MIN HOUR DATE MONTH DAY", \fB\-\-recurrence\fR "MIN HOUR DATE MONTH DAY"
+time when recurring future actions will start, in
+crontab format
+.TP
+\fB\-\-desired\-capacity\fR COUNT
+new capacity setting for the group
+.TP
+\fB\-\-max\-size\fR COUNT
+maximum number of instances to allow in the group
+.TP
+\fB\-\-min\-size\fR COUNT
+minimum number of instances to allow in the group
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-resume-processes.1 b/man/euscale-resume-processes.1
new file mode 100644
index 0000000..61e6c7a
--- /dev/null
+++ b/man/euscale-resume-processes.1
@@ -0,0 +1,44 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-RESUME-PROCESSES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-resume-processes \- Display information about regions
+.SH SYNOPSIS
+euscale\-resume\-processes [\-\-processes PROCESS1,PROCESS2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ASGROUP
+.SH DESCRIPTION
+Resume an auto\-scaling group's auto\-scaling processes
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-processes\fR PROCESS1,PROCESS2,...
+comma\-separated list of auto\-scaling processes to
+resume (default: all processes)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-set-desired-capacity.1 b/man/euscale-set-desired-capacity.1
new file mode 100644
index 0000000..cd01d72
--- /dev/null
+++ b/man/euscale-set-desired-capacity.1
@@ -0,0 +1,50 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-SET-DESIRED-CAPACITY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-set-desired-capacity \- Display information about regions
+.SH SYNOPSIS
+euscale\-set\-desired\-capacity \fB\-c\fR DESIREDCAPACITY [\-h] [\-H]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-\-help]
+ASGROUP
+.SH DESCRIPTION
+Set an auto\-scaling group's desired capacity
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-c\fR DESIREDCAPACITY, \fB\-\-desired\-capacity\fR DESIREDCAPACITY
+new capacity setting for the group (required)
+.TP
+\fB\-h\fR, \fB\-\-honor\-cooldown\fR
+reject the request if the group is in cooldown
+(default: override any cooldown period)
+.TP
+\fB\-H\fR, \fB\-\-no\-honor\-cooldown\fR
+override any cooldown period (this is the default)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-set-instance-health.1 b/man/euscale-set-instance-health.1
new file mode 100644
index 0000000..b81def9
--- /dev/null
+++ b/man/euscale-set-instance-health.1
@@ -0,0 +1,53 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-SET-INSTANCE-HEALTH "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-set-instance-health \- Display information about regions
+.SH SYNOPSIS
+euscale\-set\-instance\-health \fB\-s\fR {Healthy,Unhealthy}
+[\-\-respect\-grace\-period]
+[\-\-no\-respect\-grace\-period]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+INSTANCE
+.SH DESCRIPTION
+Manually set an auto\-scaling instance's health status
+.SS "positional arguments:"
+.TP
+INSTANCE
+ID of the instance to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-s\fR {Healthy,Unhealthy}, \fB\-\-status\fR {Healthy,Unhealthy}
+new status (required)
+.TP
+\fB\-\-respect\-grace\-period\fR
+respect the associated auto\-scaling group's grace
+period (this is the default)
+.TP
+\fB\-\-no\-respect\-grace\-period\fR
+ignore the associated auto\-scaling group's grace
+period (default: respect the group's grace period)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-suspend-processes.1 b/man/euscale-suspend-processes.1
new file mode 100644
index 0000000..59bcb04
--- /dev/null
+++ b/man/euscale-suspend-processes.1
@@ -0,0 +1,44 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-SUSPEND-PROCESSES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-suspend-processes \- Display information about regions
+.SH SYNOPSIS
+euscale\-suspend\-processes [\-\-processes PROCESS1,PROCESS2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ASGROUP
+.SH DESCRIPTION
+Suspend an auto\-scaling group's auto\-scaling processes
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-processes\fR PROCESS1,PROCESS2,...
+comma\-separated list of auto\-scaling processes to
+suspend (default: all processes)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-terminate-instance-in-auto-scaling-group.1 b/man/euscale-terminate-instance-in-auto-scaling-group.1
new file mode 100644
index 0000000..50d8154
--- /dev/null
+++ b/man/euscale-terminate-instance-in-auto-scaling-group.1
@@ -0,0 +1,58 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-TERMINATE-INSTANCE-IN-AUTO-SCALING-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-terminate-instance-in-auto-scaling-group \- Display information about regions
+.SH SYNOPSIS
+euscale\-terminate\-instance\-in\-auto\-scaling\-group (\fB\-d\fR | \fB\-D\fR)
+[\-\-show\-long]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+INSTANCE
+.SH DESCRIPTION
+Manually terminate an auto\-scaling instance
+.SS "positional arguments:"
+.TP
+INSTANCE
+ID of the instance to terminate (required)
+.SS "optional arguments:"
+.TP
+\fB\-d\fR, \fB\-\-decrement\-desired\-capacity\fR
+also reduce the desired capacity of the auto\-scaling
+group by 1
+.TP
+\fB\-D\fR, \fB\-\-no\-decrement\-desired\-capacity\fR
+leave the auto\-scaling group's desired capacity as\-is.
+A new instance may be launched to compensate for the
+one being terminated.
+.TP
+\fB\-\-show\-long\fR
+show extra info about the instance being terminated
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euscale-update-auto-scaling-group.1 b/man/euscale-update-auto-scaling-group.1
new file mode 100644
index 0000000..47b4159
--- /dev/null
+++ b/man/euscale-update-auto-scaling-group.1
@@ -0,0 +1,91 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSCALE-UPDATE-AUTO-SCALING-GROUP "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euscale-update-auto-scaling-group \- Display information about regions
+.SH SYNOPSIS
+euscale\-update\-auto\-scaling\-group [\-\-default\-cooldown SECONDS]
+[\-\-desired\-capacity COUNT]
+[\-\-grace\-period SECONDS]
+[\-\-health\-check\-type {EC2,ELB}]
+[\-l LAUNCHCONFIG] [\-M COUNT]
+[\-m COUNT]
+[\-\-placement\-group PLACEMENTGROUP]
+[\-\-termination\-policies POLICY1,POLICY2,...]
+[\-\-vpc\-zone\-identifier ZONE1,ZONE2,...]
+[\-z ZONE1,ZONE2,...]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ASGROUP
+.SH DESCRIPTION
+Update an auto\-scaling group's parameters
+.SS "positional arguments:"
+.TP
+ASGROUP
+name of the auto\-scaling group to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-default\-cooldown\fR SECONDS
+amount of time, in seconds, after a scaling activity
+completes before any further trigger\-related scaling
+activities may start
+.TP
+\fB\-\-desired\-capacity\fR COUNT
+number of running instances the group should contain
+.TP
+\fB\-\-grace\-period\fR SECONDS
+number of seconds to wait before starting health
+checks on newly\-created instances
+.TP
+\fB\-\-health\-check\-type\fR {EC2,ELB}
+service to obtain health check status from
+.TP
+\fB\-l\fR LAUNCHCONFIG, \fB\-\-launch\-configuration\fR LAUNCHCONFIG
+name of the launch configuration to use with the new
+group (required)
+.TP
+\fB\-M\fR COUNT, \fB\-\-max\-size\fR COUNT
+maximum group size (required)
+.TP
+\fB\-m\fR COUNT, \fB\-\-min\-size\fR COUNT
+minimum group size (required)
+.TP
+\fB\-\-placement\-group\fR PLACEMENTGROUP
+placement group in which to launch new instances
+.TP
+\fB\-\-termination\-policies\fR POLICY1,POLICY2,...
+ordered list of termination policies. The first has
+the highest precedence.
+.TP
+\fB\-\-vpc\-zone\-identifier\fR ZONE1,ZONE2,...
+comma\-separated list of subnet identifiers. If you
+specify availability zones as well, ensure the
+subnets' availability zones match the ones you
+specified
+.TP
+\fB\-z\fR ZONE1,ZONE2,..., \fB\-\-availability\-zones\fR ZONE1,ZONE2,...
+comma\-separated list of availability zones for the new
+group (required unless subnets are supplied)
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+auto\-scaling service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eustore-describe-images.1 b/man/eustore-describe-images.1
index 83bfbc4..6bcadd6 100644
--- a/man/eustore-describe-images.1
+++ b/man/eustore-describe-images.1
@@ -1,39 +1,36 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSTORE-DESCRIBE-IMAGES "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- lists images from Eucalyptus.com
+eustore-describe-images \- List images available for installation from EuStore
 .SH SYNOPSIS
-.B eustore-describe-images
-[\fIoptions\fR]
+eustore\-describe\-images [\-v] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-lists images from Eucalyptus.com
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+List images available for installation from EuStore
+.SS "optional arguments:"
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-display more information about images
-.IP
-Standard Options:
+display more information about images than the default
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
-.TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-U\fR URL, \fB\-\-url\fR URL
+EuStore service URL
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-debug\fR
+show debugging output
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/eustore-install-image.1 b/man/eustore-install-image.1
index 5a74f9a..acbe521 100644
--- a/man/eustore-install-image.1
+++ b/man/eustore-install-image.1
@@ -1,70 +1,105 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
-.TH EUCA2OOLS "1" "September 2012" "euca2ools devel (Limbo)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUSTORE-INSTALL-IMAGE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
 .SH NAME
-euca2ools \- downloads and installs images from Eucalyptus.com
+eustore-install-image \- Download an image from EuStore and add it to your cloud
 .SH SYNOPSIS
-.B eustore-install-image
-[\fIoptions\fR]
+eustore\-install\-image (\fB\-i\fR EUIMAGE | \fB\-t\fR FILE) \fB\-b\fR BUCKET [\-s DESC]
+[\-a {i386,x86_64,armhf}] [\-p PREFIX]
+[\-\-hypervisor {xen,kvm,universal}] [\-d DIR]
+[\-\-kernel KERNEL] [\-\-ramdisk RAMDISK] [\-I KEY_ID]
+[\-S KEY] [\-c FILE] [\-\-privatekey FILE]
+[\-\-ec2cert FILE] [\-u ACCOUNT] [\-\-ec2\-url URL]
+[\-\-iam\-url URL] [\-\-s3\-url URL]
+[\-\-progress | \fB\-\-no\-progress]\fR
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
 .SH DESCRIPTION
-downloads and installs images from Eucalyptus.com
-.SH OPTIONS
+Download an image from EuStore and add it to your cloud
+.SS "optional arguments:"
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fB\-i\fR EUIMAGE, \fB\-\-image\-name\fR EUIMAGE
+name of the image to download and install
 .TP
-\fB\-i\fR IMAGE_NAME, \fB\-\-image_name\fR=\fIIMAGE_NAME\fR
-name of image to install
+\fB\-t\fR FILE, \fB\-\-tarball\fR FILE
+tarball to install the image from
 .TP
-\fB\-t\fR TARBALL, \fB\-\-tarball\fR=\fITARBALL\fR
-name local image tarball to install from
+\fB\-b\fR BUCKET, \fB\-\-bucket\fR BUCKET
+bucket to store the images in (required)
 .TP
-\fB\-s\fR DESCRIPTION, \fB\-\-description\fR=\fIDESCRIPTION\fR
-description of image, mostly used with \fB\-t\fR option
+\fB\-s\fR DESC, \fB\-\-description\fR DESC
+image description (required for \fB\-t\fR)
 .TP
-\fB\-a\fR ARCHITECTURE, \fB\-\-architecture\fR=\fIARCHITECTURE\fR
-i386 or x86_64, mostly used with \fB\-t\fR option
+\fB\-a\fR {i386,x86_64,armhf}, \fB\-\-architecture\fR {i386,x86_64,armhf}
+image architecture (required for \fB\-t\fR)
 .TP
-\fB\-p\fR PREFIX, \fB\-\-prefix\fR=\fIPREFIX\fR
-prefix to use when naming the image, mostly used with
-\fB\-t\fR option
+\fB\-p\fR PREFIX, \fB\-\-prefix\fR PREFIX
+prefix to use when naming the image
 .TP
-\fB\-b\fR BUCKET, \fB\-\-bucket\fR=\fIBUCKET\fR
-specify the bucket to store the images in
+\fB\-\-hypervisor\fR {xen,kvm,universal}
+hypervisor the kernel image is built for (required for
+images with hypervisor\-specific kernels
 .TP
-\fB\-k\fR KERNEL_TYPE, \fB\-\-kernel_type\fR=\fIKERNEL_TYPE\fR
-specify the type you're using [xen|kvm]
+\fB\-d\fR DIR, \fB\-\-directory\fR DIR
+location to place the image and other artifacts
+(default: dir named by TMPDIR, TEMP, or TMP
+environment variables, or otherwise /var/tmp)
 .TP
-\fB\-d\fR DIR, \fB\-\-dir\fR=\fIDIR\fR
-specify a temporary directory for large files
+\fB\-\-kernel\fR KERNEL
+ID of the kernel image to use instead of the one
+bundled with the image
 .TP
-\fB\-\-kernel\fR=\fIKERNEL\fR
-Override bundled kernel with one already installed
+\fB\-\-ramdisk\fR RAMDISK
+ID of the ramdisk image to use instead of the one
+bundled with the image
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
 .TP
-\fB\-\-ramdisk\fR=\fIRAMDISK\fR
-Override bundled ramdisk with one already installed
+\fB\-c\fR FILE, \fB\-\-cert\fR FILE
+file containing your signing certificate
 .TP
-\fB\-y\fR, \fB\-\-yes\fR
-Answer "yes" to questions during install
-.IP
-Standard Options:
+\fB\-\-privatekey\fR FILE
+file containing the private key to sign the bundle's
+manifest with. This private key will also be required
+to unbundle the image in the future.
 .TP
-\fB\-D\fR, \fB\-\-debug\fR
-Turn on all debugging output
+\fB\-\-ec2cert\fR FILE
+file containing the cloud's X.509 certificate
 .TP
-\fB\-\-debugger\fR
-Enable interactive debugger on error
+\fB\-u\fR ACCOUNT, \fB\-\-user\fR ACCOUNT
+your account ID
+.TP
+\fB\-\-ec2\-url\fR URL
+compute service endpoint URL
+.TP
+\fB\-\-iam\-url\fR URL
+identity service endpoint URL
+.TP
+\fB\-\-s3\-url\fR URL
+storage service endpoint URL
 .TP
-\fB\-U\fR URL, \fB\-\-url\fR=\fIURL\fR
-Override service URL with value provided
+\fB\-\-progress\fR
+show progress (the default when run interactively)
 .TP
-\fB\-\-region\fR=\fIREGION\fR
-Name of the region to connect to
+\fB\-\-no\-progress\fR
+do not show progress (the default when run noninteractively)
 .TP
-\fB\-I\fR ACCESS_KEY_ID, \fB\-\-access\-key\-id\fR=\fIACCESS_KEY_ID\fR
-Override access key value
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
 .TP
-\fB\-S\fR SECRET_KEY, \fB\-\-secret\-key\fR=\fISECRET_KEY\fR
-Override secret key value
+\fB\-U\fR URL, \fB\-\-url\fR URL
+EuStore service URL
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
 .TP
 \fB\-\-version\fR
-Display version string
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-delete-alarms.1 b/man/euwatch-delete-alarms.1
new file mode 100644
index 0000000..8c01295
--- /dev/null
+++ b/man/euwatch-delete-alarms.1
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-DELETE-ALARMS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-delete-alarms \- Display information about regions
+.SH SYNOPSIS
+euwatch\-delete\-alarms [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+ALARM [ALARM ...]
+.SH DESCRIPTION
+Delete alarms
+.SS "positional arguments:"
+.TP
+ALARM
+names of the alarms to delete
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-describe-alarm-history.1 b/man/euwatch-describe-alarm-history.1
new file mode 100644
index 0000000..989bf65
--- /dev/null
+++ b/man/euwatch-describe-alarm-history.1
@@ -0,0 +1,58 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-DESCRIBE-ALARM-HISTORY "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-describe-alarm-history \- Display information about regions
+.SH SYNOPSIS
+euwatch\-describe\-alarm\-history [\-\-end\-date DATE]
+[\-\-history\-item\-type {Action,ConfigurationUpdate,StateUpdate}]
+[\-\-show\-long] [\-\-start\-date DATE]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+[ALARM]
+.SH DESCRIPTION
+Retrieve history for one alarm or all alarms
+.SS "positional arguments:"
+.TP
+ALARM
+limit results to a specific alarm
+.SS "optional arguments:"
+.TP
+\fB\-\-end\-date\fR DATE
+limit results to history before a given point in time
+.TP
+\fB\-\-history\-item\-type\fR {Action,ConfigurationUpdate,StateUpdate}
+limit results to specific history item types
+.TP
+\fB\-\-show\-long\fR
+show detailed event data as machine\-readable JSON
+.TP
+\fB\-\-start\-date\fR DATE
+limit results to history after a given point in time
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-describe-alarms-for-metric.1 b/man/euwatch-describe-alarms-for-metric.1
new file mode 100644
index 0000000..2c1fb93
--- /dev/null
+++ b/man/euwatch-describe-alarms-for-metric.1
@@ -0,0 +1,67 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-DESCRIBE-ALARMS-FOR-METRIC "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-describe-alarms-for-metric \- Display information about regions
+.SH SYNOPSIS
+euwatch\-describe\-alarms\-for\-metric \fB\-\-metric\-name\fR METRIC \fB\-\-namespace\fR
+NAMESPACE
+[\-\-dimensions KEY1=VALUE1,KEY2=VALUE2,...]
+[\-\-period SECONDS] [\-\-show\-long]
+[\-\-statistic {Average,Maximum,Minimum,SampleCount,Sum}]
+[\-\-unit UNIT] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+Describe alarms for a single metric.
+.SH DESCRIPTION
+Note that all of an alarm's metrics must match exactly to obtain any
+results.
+.SS "optional arguments:"
+.TP
+\fB\-\-metric\-name\fR METRIC
+name of the metric (required)
+.TP
+\fB\-\-namespace\fR NAMESPACE
+namespace of the metric (required)
+.TP
+\fB\-\-dimensions\fR KEY1=VALUE1,KEY2=VALUE2,...
+dimensions of the metric
+.TP
+\fB\-\-period\fR SECONDS
+period over which statistics are applied
+.TP
+\fB\-\-show\-long\fR
+show all of the alarms' info
+.TP
+\fB\-\-statistic\fR {Average,Maximum,Minimum,SampleCount,Sum}
+statistic of the metric on which to trigger alarms
+.TP
+\fB\-\-unit\fR UNIT
+unit of measurement for statistics
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-describe-alarms.1 b/man/euwatch-describe-alarms.1
new file mode 100644
index 0000000..da4a5b0
--- /dev/null
+++ b/man/euwatch-describe-alarms.1
@@ -0,0 +1,60 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-DESCRIBE-ALARMS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-describe-alarms \- Display information about regions
+.SH SYNOPSIS
+euwatch\-describe\-alarms [\-\-action\-prefix PREFIX]
+[\-\-alarm\-name\-prefix PREFIX] [\-\-show\-long]
+[\-\-state\-value {OK,ALARM,INSUFFICIENT_DATA}]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+[ALARM [ALARM ...]]
+.SH DESCRIPTION
+Describe alarms
+.SS "positional arguments:"
+.TP
+ALARM
+limit results to specific alarms
+.SS "optional arguments:"
+.TP
+\fB\-\-action\-prefix\fR PREFIX
+limit results to alarms whose actions' ARNs begin with
+a specific string
+.TP
+\fB\-\-alarm\-name\-prefix\fR PREFIX
+limit results to alarms whose names begin with a
+specific string
+.TP
+\fB\-\-show\-long\fR
+show all of the alarms' info
+.TP
+\fB\-\-state\-value\fR {OK,ALARM,INSUFFICIENT_DATA}
+limit results to alarms in a specific state
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-disable-alarm-actions.1 b/man/euwatch-disable-alarm-actions.1
new file mode 100644
index 0000000..d71f285
--- /dev/null
+++ b/man/euwatch-disable-alarm-actions.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-DISABLE-ALARM-ACTIONS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-disable-alarm-actions \- Display information about regions
+.SH SYNOPSIS
+euwatch\-disable\-alarm\-actions [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ALARM [ALARM ...]
+.SH DESCRIPTION
+Disable all actions for one or more alarms
+.SS "positional arguments:"
+.TP
+ALARM
+names of the alarms to disable actions for
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-enable-alarm-actions.1 b/man/euwatch-enable-alarm-actions.1
new file mode 100644
index 0000000..f2925e3
--- /dev/null
+++ b/man/euwatch-enable-alarm-actions.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-ENABLE-ALARM-ACTIONS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-enable-alarm-actions \- Display information about regions
+.SH SYNOPSIS
+euwatch\-enable\-alarm\-actions [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug]
+[\-\-debugger] [\-\-version] [\-h]
+ALARM [ALARM ...]
+.SH DESCRIPTION
+Enable all actions for one or more alarms
+.SS "positional arguments:"
+.TP
+ALARM
+names of the alarms to enable actions for
+.SS "optional arguments:"
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-get-stats.1 b/man/euwatch-get-stats.1
new file mode 100644
index 0000000..6dfb25f
--- /dev/null
+++ b/man/euwatch-get-stats.1
@@ -0,0 +1,69 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-GET-STATS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-get-stats \- Display information about regions
+.SH SYNOPSIS
+euwatch\-get\-stats \fB\-n\fR NAMESPACE \fB\-s\fR STAT1,STAT2,...
+[\-\-dimensions KEY1=VALUE1,KEY2=VALUE2,...]
+[\-\-start\-time YYYY\-MM\-DDThh:mm:ssZ]
+[\-\-end\-time YYYY\-MM\-DDThh:mm:ssZ] [\-\-period SECONDS]
+[\-\-unit UNIT] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID] [\-S KEY]
+[\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+METRIC
+.SH DESCRIPTION
+Show a metric's statistics
+.SS "positional arguments:"
+.TP
+METRIC
+name of the metric to get statistics for (required)
+.SS "optional arguments:"
+.TP
+\fB\-n\fR NAMESPACE, \fB\-\-namespace\fR NAMESPACE
+the metric's namespace (required)
+.TP
+\fB\-s\fR STAT1,STAT2,..., \fB\-\-statistics\fR STAT1,STAT2,...
+the metric statistics to show (at least 1 required)
+.TP
+\fB\-\-dimensions\fR KEY1=VALUE1,KEY2=VALUE2,...
+the dimensions of the metric to show
+.TP
+\fB\-\-start\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+earliest time to retrieve data points for (default:
+one hour ago)
+.TP
+\fB\-\-end\-time\fR YYYY\-MM\-DDThh:mm:ssZ
+latest time to retrieve data points for (default: now)
+.TP
+\fB\-\-period\fR SECONDS
+granularity of the returned data points (must be a
+multiple of 60)
+.TP
+\fB\-\-unit\fR UNIT
+unit the metric is reported in
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-list-metrics.1 b/man/euwatch-list-metrics.1
new file mode 100644
index 0000000..17d0625
--- /dev/null
+++ b/man/euwatch-list-metrics.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-LIST-METRICS "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-list-metrics \- Display information about regions
+.SH SYNOPSIS
+euwatch\-list\-metrics [\-d KEY1=VALUE1,KEY2=VALUE2,...] [\-m METRIC]
+[\-n NAMESPACE] [\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version] [\-h]
+.SH DESCRIPTION
+Show a list of monitoring metrics
+.SS "optional arguments:"
+.TP
+\fB\-d\fR KEY1=VALUE1,KEY2=VALUE2,..., \fB\-\-dimensions\fR KEY1=VALUE1,KEY2=VALUE2,...
+limit results to metrics with specific dimensions
+.TP
+\fB\-m\fR METRIC, \fB\-\-metric\-name\fR METRIC
+limit results to a specific metric
+.TP
+\fB\-n\fR NAMESPACE, \fB\-\-namespace\fR NAMESPACE
+limit results to metrics in a specific namespace
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-put-data.1 b/man/euwatch-put-data.1
new file mode 100644
index 0000000..478c289
--- /dev/null
+++ b/man/euwatch-put-data.1
@@ -0,0 +1,63 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-PUT-DATA "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-put-data \- Display information about regions
+.SH SYNOPSIS
+euwatch\-put\-data \fB\-m\fR METRIC \fB\-n\fR NAMESPACE
+(\fB\-v\fR FLOAT | \fB\-s\fR Maximum=FLOAT,Minimum=FLOAT,SampleCount=FLOAT,Sum=FLOAT)
+[\-d KEY1=VALUE1,KEY2=VALUE2,...]
+[\-t YYYY\-MM\-DDThh:mm:ssZ] [\-u UNIT]
+[\-\-show\-empty\-fields] [\-\-region USER at REGION | \fB\-U\fR URL]
+[\-I KEY_ID] [\-S KEY] [\-\-debug] [\-\-debugger]
+[\-\-version] [\-h]
+.SH DESCRIPTION
+Add data points or statistics to a metric
+.SS "optional arguments:"
+.TP
+\fB\-m\fR METRIC, \fB\-\-metric\-name\fR METRIC
+name of the metric to add data points to (required)
+.TP
+\fB\-n\fR NAMESPACE, \fB\-\-namespace\fR NAMESPACE
+the metric's namespace (required)
+.TP
+\fB\-v\fR FLOAT, \fB\-\-value\fR FLOAT
+data value for the metric
+.TP
+\fB\-s\fR Maximum=FLOAT,Minimum=FLOAT,SampleCount=FLOAT,Sum=FLOAT, \fB\-\-statistic\-values\fR Maximum=FLOAT,Minimum=FLOAT,SampleCount=FLOAT,Sum=FLOAT, \fB\-\-statisticValues\fR Maximum=FLOAT,Minimum=FLOAT,SampleCount=FLOAT,Sum=FLOAT
+statistic values for the metric. Values for Maximum,
+Minimum, SampleCount, and Sum are all required.
+.TP
+\fB\-d\fR KEY1=VALUE1,KEY2=VALUE2,..., \fB\-\-dimensions\fR KEY1=VALUE1,KEY2=VALUE2,...
+the dimensions of the metric to add data points to
+.TP
+\fB\-t\fR YYYY\-MM\-DDThh:mm:ssZ, \fB\-\-timestamp\fR YYYY\-MM\-DDThh:mm:ssZ
+timestamp of the data point
+.TP
+\fB\-u\fR UNIT, \fB\-\-unit\fR UNIT
+unit the metric is being reported in
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-put-metric-alarm.1 b/man/euwatch-put-metric-alarm.1
new file mode 100644
index 0000000..9d748fd
--- /dev/null
+++ b/man/euwatch-put-metric-alarm.1
@@ -0,0 +1,106 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-PUT-METRIC-ALARM "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-put-metric-alarm \- Display information about regions
+.SH SYNOPSIS
+euwatch\-put\-metric\-alarm \fB\-\-comparison\-operator\fR
+{GreaterThanOrEqualToThreshold,GreaterThanThreshold,LessThanThreshold,LessThanOrEqualToThreshold}
+\fB\-\-evaluation\-periods\fR COUNT \fB\-\-metric\-name\fR
+METRIC \fB\-\-namespace\fR NAMESPACE \fB\-\-period\fR SECONDS
+\fB\-\-statistic\fR
+{Average,Maximum,Minimum,SampleCount,Sum}
+\fB\-\-threshold\fR FLOAT
+[\-\-actions\-enabled {true,false}]
+[\-\-alarm\-actions ARN1,ARN2,...]
+[\-\-alarm\-description DESCRIPTION]
+[\-d KEY1=VALUE1,KEY2=VALUE2,...]
+[\-\-insufficient\-data\-actions ARN1,ARN2,...]
+[\-\-ok\-actions ARN1,ARN2,...] [\-\-unit UNIT]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ALARM
+.SH DESCRIPTION
+Create or update an alarm
+.SS "positional arguments:"
+.TP
+ALARM
+name of the alarm (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-comparison\-operator\fR {GreaterThanOrEqualToThreshold,GreaterThanThreshold,LessThanThreshold,LessThanOrEqualToThreshold}
+arithmetic operator with which the comparison with the
+threshold will be made (required)
+.TP
+\fB\-\-evaluation\-periods\fR COUNT
+number of consecutive periods for which the value of
+the metric needs to be compared to the threshold
+(required)
+.TP
+\fB\-\-metric\-name\fR METRIC
+name for the alarm's associated metric (required)
+.TP
+\fB\-\-namespace\fR NAMESPACE
+namespace for the alarm's associated metric (required)
+.TP
+\fB\-\-period\fR SECONDS
+period over which the specified statistic is applied
+(required)
+.TP
+\fB\-\-statistic\fR {Average,Maximum,Minimum,SampleCount,Sum}
+statistic on which to alarm (required)
+.TP
+\fB\-\-threshold\fR FLOAT
+value to compare the statistic against (required)
+.TP
+\fB\-\-actions\-enabled\fR {true,false}
+whether this alarm's actions should be executed when
+it changes state
+.TP
+\fB\-\-alarm\-actions\fR ARN1,ARN2,...
+ARNs of SNS topics to publish to when the alarm
+changes to the ALARM state
+.TP
+\fB\-\-alarm\-description\fR DESCRIPTION
+description of the alarm
+.TP
+\fB\-d\fR KEY1=VALUE1,KEY2=VALUE2,..., \fB\-\-dimensions\fR KEY1=VALUE1,KEY2=VALUE2,...
+dimensions for the alarm's associated metric
+.TP
+\fB\-\-insufficient\-data\-actions\fR ARN1,ARN2,...
+ARNs of SNS topics to publish to when the alarm
+changes to the INSUFFICIENT_DATA state
+.TP
+\fB\-\-ok\-actions\fR ARN1,ARN2,...
+ARNs of SNS topics to publish to when the alarm
+changes to the OK state
+.TP
+\fB\-\-unit\fR UNIT
+unit for the alarm's associated metric
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/man/euwatch-set-alarm-state.1 b/man/euwatch-set-alarm-state.1
new file mode 100644
index 0000000..2d780f6
--- /dev/null
+++ b/man/euwatch-set-alarm-state.1
@@ -0,0 +1,57 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH EUWATCH-SET-ALARM-STATE "1" "May 2013" "euca2ools 3.0.0" "User Commands"
+.SH NAME
+euwatch-set-alarm-state \- Display information about regions
+.SH SYNOPSIS
+euwatch\-set\-alarm\-state \fB\-\-state\-value\fR {ALARM,INSUFFICIENT_DATA,OK}
+\fB\-\-state\-reason\fR REASON
+[\-\-state\-reason\-data JSON]
+[\-\-show\-empty\-fields]
+[\-\-region USER at REGION | \fB\-U\fR URL] [\-I KEY_ID]
+[\-S KEY] [\-\-debug] [\-\-debugger] [\-\-version]
+[\-h]
+ALARM
+.SH DESCRIPTION
+Temporarily set the state of an alarm
+.SS "positional arguments:"
+.TP
+ALARM
+name of the alarm to update (required)
+.SS "optional arguments:"
+.TP
+\fB\-\-state\-value\fR {ALARM,INSUFFICIENT_DATA,OK}
+state to set the alarm to (required)
+.TP
+\fB\-\-state\-reason\fR REASON
+human\-readable reason why the alarm was set to this
+state (required)
+.TP
+\fB\-\-state\-reason\-data\fR JSON
+JSON\-formatted reason why the alarm was set to this
+state
+.TP
+\fB\-\-show\-empty\-fields\fR
+show empty values as "(nil)"
+.TP
+\fB\-\-region\fR USER at REGION
+name of the region and/or user in config files to use
+to connect to the service
+.TP
+\fB\-U\fR URL, \fB\-\-url\fR URL
+instance monitoring service endpoint URL
+.HP
+\fB\-I\fR KEY_ID, \fB\-\-access\-key\-id\fR KEY_ID
+.HP
+\fB\-S\fR KEY, \fB\-\-secret\-key\fR KEY
+.TP
+\fB\-\-debug\fR
+show debugging output
+.TP
+\fB\-\-debugger\fR
+launch interactive debugger on error
+.TP
+\fB\-\-version\fR
+show the program's version and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
diff --git a/setup.py b/setup.py
index 024348f..ca6dd76 100644
--- a/setup.py
+++ b/setup.py
@@ -125,6 +125,7 @@ setup(name="euca2ools",
                    glob.glob('bin/eustore-*'),
                    glob.glob('bin/euwatch-*')),
                   []),
+      data_files=[('share/man/man1', glob.glob('man/*.1'))],
       packages=find_packages(),
       install_requires=['lxml',
                         'requestbuilder',

-- 
managing cloud instances for Eucalyptus

