Index: trunk/Nebulous/bin/neb-addvol
===================================================================
--- trunk/Nebulous/bin/neb-addvol	(revision 14410)
+++ trunk/Nebulous/bin/neb-addvol	(revision 16179)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2005-2007  Joshua Hoblitt
+# Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-addvol,v 1.5 2007-04-28 01:19:59 jhoblitt Exp $
+# $Id: neb-addvol,v 1.6 2008-01-22 21:14:55 jhoblitt Exp $
 
 use strict;
@@ -18,5 +18,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbuser, $dbpass, $name, $uri);
+my ($db, $dbuser, $dbpass, $volume, $uri);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -28,5 +28,5 @@
     'user=s'    => \$dbuser,
     'pass=s'    => \$dbpass,
-    'name=s'    => \$name,
+    'volume=s'  => \$volume,
     'uri=s'     => \$uri,
 ) || pod2usage( 2 );
@@ -34,5 +34,5 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
-    unless $db && $dbuser && $dbpass && $name && $uri;
+    unless $db && $dbuser && $dbpass && $volume && $uri;
 
 my $dbh = DBI->connect(
@@ -61,5 +61,5 @@
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $name, $path );
+$query->execute( $volume, $path );
 
 print " OK\n";
@@ -75,5 +75,6 @@
 =head1 SYNOPSIS
 
-    neb-addvol --name <volume name> --uri <volume uri> [--db <database>] [--user <username>] [--pass <password>]
+    neb-addvol --volume <volume name> --uri <volume uri>
+        [--db <database>] [--user <username>] [--pass <password>]
 
 =head1 DESCRIPTION
@@ -87,5 +88,5 @@
 =over 4
 
-=item * --name|-n <volume name>
+=item * --volume|-n <volume name>
 
 Symbolic name of volume being added.
@@ -151,5 +152,5 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2005-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under
Index: trunk/Nebulous/bin/neb-cp
===================================================================
--- trunk/Nebulous/bin/neb-cp	(revision 14410)
+++ trunk/Nebulous/bin/neb-cp	(revision 16179)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2007  Joshua Hoblitt
+# Copyright (C) 2007-2008  Joshua Hoblitt
 #
-# $Id: neb-cp,v 1.3 2007-04-28 01:24:26 jhoblitt Exp $
+# $Id: neb-cp,v 1.4 2008-01-22 21:14:55 jhoblitt Exp $
 
 use strict;
@@ -16,10 +16,10 @@
 use Pod::Usage qw( pod2usage );
 
-my ($node, $server);
+my ($volume, $server);
 
 $server = $ENV{'NEB_SERVER'} unless $server;
 
 GetOptions(
-    'node|n=s'      => \$node,
+    'volume|v=s'    => \$volume,
     'server|s=s'    => \$server,
 ) || pod2usage( 2 );
@@ -41,6 +41,6 @@
 
 my $status;
-if ($node) {
-    $status = $neb->copy( $src, $dst, $node);
+if ($volume) {
+    $status = $neb->copy( $src, $dst, $volume);
 } else {
     $status = $neb->copy( $src, $dst);
@@ -59,11 +59,9 @@
 =head1 SYNOPSIS
 
-    neb-cp [--server <URL>] [--node <dst volume>] <src key> <dst key>
+    neb-cp [--server <URL>] [--volume <dst volume name>] <src key> <dst key>
 
 =head1 DESCRIPTION
 
-This program list Nebulous keys matched by C<<pattern>>.  Call it with no
-arguments is equivalanet to searching with the pattern C<.*>.  Where
-C<<pattern>> is a POSIX 1003.2 compatable regular repression.
+Copy a Nebulous storage key
 
 =head1 OPTIONS
@@ -76,4 +74,10 @@
 
 Optional if the appropriate environment variable is set.
+
+=item * -volume|-v <volume name>
+
+The volume to place the new key's first storage instance on.
+
+Optional.
 
 =back
@@ -107,5 +111,5 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under
Index: trunk/Nebulous/bin/neb-locate
===================================================================
--- trunk/Nebulous/bin/neb-locate	(revision 14410)
+++ trunk/Nebulous/bin/neb-locate	(revision 16179)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2007  Joshua Hoblitt
+# Copyright (C) 2007-2008  Joshua Hoblitt
 #
-# $Id: neb-locate,v 1.2 2007-05-05 00:29:43 jhoblitt Exp $
+# $Id: neb-locate,v 1.3 2008-01-22 21:14:55 jhoblitt Exp $
 
 use strict;
@@ -82,5 +82,5 @@
 =head1 SYNOPSIS
 
-    neb-locate [--server <URL>] [--volume <name>] [--all] [--path] <key>
+    neb-locate [--server <URL>] [--volume <volume name>] [--all] [--path] <key>
 
 =head1 DESCRIPTION
@@ -111,5 +111,5 @@
 Optional if the appropriate environment variable is set.
 
-=item * --volume <name>
+=item * --volume <volume name>
 
 Restrict search for instances to this Nebulous volume.
@@ -147,5 +147,5 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under
Index: trunk/Nebulous/bin/neb-touch
===================================================================
--- trunk/Nebulous/bin/neb-touch	(revision 14410)
+++ trunk/Nebulous/bin/neb-touch	(revision 16179)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2007  Joshua Hoblitt
+# Copyright (C) 2007-2008  Joshua Hoblitt
 #
-# $Id: neb-touch,v 1.2 2007-04-28 01:19:59 jhoblitt Exp $
+# $Id: neb-touch,v 1.3 2008-01-22 21:14:55 jhoblitt Exp $
 
 use strict;
@@ -16,10 +16,11 @@
 use Pod::Usage qw( pod2usage );
 
-my ($server);
+my ($server, $volume);
 
 $server = $ENV{'NEB_SERVER'} unless $server;
 
 GetOptions(
-    'server|s=s'     => \$server,
+    'server|s=s'    => \$server,
+    'volume=s'      => \$volume,
 ) || pod2usage( 2 );
 
@@ -40,5 +41,6 @@
 
 unless ($neb->find($file)) {
-    $neb->create($file) or die "failed to create Nebulous key $file";
+    $neb->create($file, 0, $volume)
+        or die "failed to create Nebulous key $file";
 }
 
@@ -53,9 +55,11 @@
 =head1 SYNOPSIS
 
-    neb-touch [--server <URL>] <key>
+    neb-touch [--server <URL>] [--volume <volume name>] <key>
 
 =head1 DESCRIPTION
 
-This program creates an empty file with the Nebulous key of C<<key>>.  At some point in the future it almost be used to adjust the timestamp of storage instances assosiated with a Nebulous key similar to C<touch(1)>.
+This program creates an empty file with the Nebulous key of C<<key>>.  At some
+point in the future it will be able to adjust the timestamp of storage
+instances assosiated with a Nebulous key similar to C<touch(1)>.
 
 =head1 OPTIONS
@@ -68,4 +72,10 @@
 
 Optional if the appropriate environment variable is set.
+
+=item * --volume|-n <volume name>
+
+Symbolic name of the volume to create the first instance on.
+
+Optional.
 
 =back
@@ -99,5 +109,5 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2007-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under