Minor tweaks to resolve a merge conflict

Author: timkay

README

@@ -0,0 +1,14 @@
+"aws" is a command line program that accesses Amazon Web Services:
+
+EC2
+S3
+SQS
+SDB
+ELB
+IAM
+
+To run "aws", all you need is a single file! Download http://github.com/timkay/aws/raw/master/aws, make it executable, create ~/.awssecrets or set EC2_ACCESS_KEY and EC2_SECRET_KEY, and you are done.
+
+For more documentation, see http://timkay.com/aws/
+
+If you can help improve the "aws" documentation, please let me know.

aws

@@ -166,7 +166,7 @@ <h2 style="background-color: #082466; color: #fff">&nbsp;aws - HowTo - simple ac
 <p>
 </li>
 <li>
-<b>How do I do such scripting when my file names have funny chacracters in them?</b>
+<b>How do I do such scripting when my file names have funny characters in them?</b>
 <p>
 If your files have funny characters in them, such as apostrophe (&apos;), then you should use Perl's system() function in a way that doesn't involve the shell.  Here are examples:
 <blockquote><xmp>$ perl -e 'do {print "putting $_\n"; system (qw(aws put test681), $_)} for @ARGV' ascii/*.txt
@@ -372,7 +372,9 @@ <h2 style="background-color: #082466; color: #fff">&nbsp;aws - HowTo - simple ac
 <li>
   <b>What if I have more than one AWS account?  How do I switch credentials?</b>
   <p>
-  "aws" looks at enviroment variables <code>AWS_ACCESS_KEY_ID</code>, <code>AWS_SECRET_ACCESS_KEY</code>, and <code>AWS_SIGN_URL</code> before it decides to read <code>~/.awssecret</code>.  If any of those variables is defined, then it will use those credentials and ignore <code>~/.awssecret</code>.  For example
+  "aws" looks at enviroment variables <code>AWS_ACCESS_KEY_ID</code>, <code>AWS_SECRET_ACCESS_KEY</code>, >code>AWS_SIGN_URL</code>,
+  <code>EC2_ACCESS_KEY</code>, and <code>EC2_SECRET_KEY</code>
+  before it decides to read <code>~/.awssecret</code>.  If any of those variables is defined, then it will use those credentials and ignore <code>~/.awssecret</code>.  For example
   <blockquote><code>AWS_ACCESS_KEY_ID=A3CJPJF87DHEJAAG2 AWS_SECRET_ACCESS_KEY=asDc5FD68d7JaIHEuhfLAziplY+ywNTkXq6/8UiO9 aws ls</code></blockquote>
   <p>
 </li>

download.html

@@ -27,13 +27,13 @@ <h2 style="background-color: #082466; color: #fff">&nbsp;aws - simple access to
 <li>
 SDB support - zikes! it was easy to add
 <p>
-"aws" now supports Amazon SDB. See <a href=https://docs.google.com/Doc?id=ah9n72fdwz78_192g79h46ft>the documenation</a>.
+"aws" now supports Amazon SDB. See <a href=https://docs.google.com/Doc?id=ah9n72fdwz78_192g79h46ft>the documentation</a>.
 <p>
 </li>
 <li>
 ELB support
 <p>
-"aws" now supports Amazon ELB. See <a href=https://docs.google.com/View?docid=ah9n72fdwz78_100d99gqkfc>the documenation</a>.
+"aws" now supports Amazon ELB. See <a href=https://docs.google.com/View?docid=ah9n72fdwz78_100d99gqkfc>the documentation</a>.
 <p>
 </li>
 <li>
@@ -94,6 +94,7 @@ <h3>Download</h3>
 <p>
 <li>Put your AWS credentials in <tt>~/.awssecret</tt>:  the Access Key
 ID on the first line and the Secret Access Key on the second line.  Example:  <blockquote><tt>1B5JYHPQCXW13GWKHAG2<br>2GAHKWG3+1wxcqyhpj5b1Ggqc0TIxj21DKkidjfz</tt></blockquote></li>
+<li>Alternately, set the EC2_ACCESS_KEY and EC2_SECRET_KEY environment variables.</li>
 </ol>
 <p>
 If you are logged in as root, aws will be installed in /usr/bin.
@@ -145,7 +146,7 @@ <h3>Windows Download and Configuration</h3>
 <li>Download ActivePerl from <a href=http://www.activestate.com/store/download.aspx?prdGUID=81fbce82-6bd5-49bc-a915-08d58c2648ca>ActiveState</a>.</li>
 <li>Download the latest <a href=https://raw.github.com/timkay/aws/master/aws>aws</a> to C:\Windows or your current directory, and rename to aws.pl.</li>
 <li>Put your AWS credentials in C:\Documents and Settings\&lt;YOUR
-NAME&gt;\.awssecret (see the example file in the above Download section).</li>
+NAME&gt;\.awssecret (see the example file in the above Download section) or set the EC2_ACCESS_KEY and EC2_SECRET_KEY environment variables.</li>
 <li>Try <tt>aws.pl --insecure-aws ls</tt> -- you should get a list of
 your S3 buckets.</li>
 </ol>
@@ -177,7 +178,7 @@ <h3>Overview</h3>
 <p>
 <blockquote><tt>aws ACTION [PARAMETERS]</tt></blockquote>
 <p>
-For example, you can start an EC3 server instance:
+For example, you can start an EC2 server instance:
 <p>
 <blockquote>aws run</blockquote>
 <p>
@@ -213,6 +214,8 @@ <h3>~/.awssecret File Format</h3>
 the .awssecret file.  For example,
 
 <blockquote><xmp>AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=XXX aws ls</xmp></blockquote>
+or 
+<blockquote><xmp>EC2_ACCESS_KEY=XXX EC2_SECRET_KEY=XXX aws ls</xmp></blockquote>
 
 Use of environment variables is not recommended because command lines and environment variables are visible to other users of the same host.
 <p>

howto.html

@@ -0,0 +1,3 @@
+<CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> 
+  <LocationConstraint>EU</LocationConstraint> 
+</CreateBucketConfiguration >

index.html

@@ -0,0 +1,3 @@
+<RequestPaymentConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+        <Payer>Requester</Payer>
+</RequestPaymentConfiguration>

location.xml

@@ -0,0 +1,3 @@
+<RequestPaymentConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+        <Payer>Requester</Payer>
+</RequestPaymentConfiguration>