--- wikisrc/amazon_ec2.mdwn	2011/02/18 02:14:27	1.10
+++ wikisrc/amazon_ec2.mdwn	2011/02/18 02:44:22	1.13
@@ -210,11 +210,14 @@ rsync -aPv -e "ssh -i $EC2_SSH_KEY" NetB
         ec2-user@ec2-67-202-24-108.compute-1.amazonaws.com:
 """]]
 
-Connect to the instance, through its name. We will format and mount the Grub partition, create the *menu.lst* file, then copy files to their respective partitions.
+Before connecting to the instance, we have to allow connection on SSH port (22) through firewall. Then, log in to the instance, through its name. We will format and mount the Grub partition, create the *menu.lst* file, then copy files to their respective partitions.
 
 [[!template id=programlisting text="""
 $ ec2-describe-instances i-5babe737
 INSTANCE        i-5babe737      ami-74f0061d    <strong>ec2-67-202-24-108.compute-1.amazonaws.com</strong>       ip-10-99-86-193.ec2.internal    running &lt;your_ssh_key_pair_name&gt;  0               t1.micro        2011-02-17T23:22:37+0000        us-east-1c      aki-427d952b                    monitoring-disabled     67.202.24.108   10.99.86.193                    ebs
+$ ec2-authorize default -p 22
+GROUP           default 
+PERMISSION              default ALLOWS  tcp     22      22      FROM    CIDR    0.0.0.0/0
 $ ssh -i "$EC2_SSH_KEY" ec2-user@ec2-67-202-24-108.compute-1.amazonaws.com
 [...]
 [ec2-user@ip-10-99-86-193 ~]$ sudo su
@@ -224,13 +227,13 @@ $ ssh -i "$EC2_SSH_KEY" ec2-user@ec2-67-
 [root@ip-10-99-86-193 ec2-user]# mount /dev/sdg /mnt/grub/
 [root@ip-10-99-86-193 ec2-user]# mkdir -p /mnt/grub/boot/grub/
 [root@ip-10-99-86-193 ec2-user]# cat > /mnt/grub/boot/grub/menu.lst << EOF
-        default=0
-        timeout=0
-        hiddenmenu
-
-        title NetBSD AMI
-            root (hd0)
-            kernel /boot/netbsd root=xbd1
+default=0
+timeout=0
+hiddenmenu
+
+title NetBSD AMI
+root (hd0)
+kernel /boot/netbsd root=xbd1
 EOF
 [root@ip-10-99-86-193 ec2-user]# mv netbsd /mnt/grub/boot/
 [root@ip-10-99-86-193 ec2-user]# umount /dev/sdg
@@ -272,7 +275,9 @@ IMAGE   aki-4c7d9525    ec2-public-image
 <strong>IMAGE   aki-4e7d9527    ec2-public-images/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml     amazon  available       public          x86_64  kernel                          instance-store  paravirtual     xen</strong>
 """]]
 
-We pick the one with the correct architecture (x86_64). Its ID is **aki-4e7d9527**. Then we can proceed to the creation of our AMI, with:
+We pick the one with the correct architecture (x86_64). **hd00** are for EBS backed images, while **hd0** are for S3 backed ones. Chose **hd00** AKIs. In our case, its ID is **aki-4e7d9527**.
+
+We can proceed to the creation of our AMI, with:
 
 1. */dev/sda1* as Grub partition (*/dev/sdg*, snapshot *snap-8aef2be6* of volume *vol-24f88d4c*)
 1. */dev/sda2* as root file-system (*/dev/sdf*, snapshot *snap-deef2bb2* of volume *vol-36f88d5e*)
@@ -281,7 +286,7 @@ We pick the one with the correct archite
 $ ec2-register -a x86_64 --kernel aki-4e7d9527 --region us-east-1 \
     -b "/dev/sda1=snap-8aef2be6" -b "/dev/sda2=snap-deef2bb2" -n "NetBSD-x86_64-current" \
     -d "&lt;add your own description here&gt;
-IMAGE   ami-74d0231d
+IMAGE   <strong>ami-74d0231d</strong>
 """]]
 
 # Play with your first NetBSD instance
@@ -292,13 +297,12 @@ You can now start your own NetBSD instan
 $ ec2-run-instances ami-74d0231d -t t1.micro -z us-east-1c     
 RESERVATION     r-08218465      983624114127    default
 INSTANCE        <strong>i-953d72f9</strong>      ami-74d0231d                    pending         0               t1.micro        2011-02-18T02:05:46+0000        us-east-1c      aki-4e7d9527                    monitoring-disabled
+*** Wait a few minutes, micro instances take time to start ***
+# Query console output for your new instance
 $ ec2-get-console-output i-953d72f9
 [...]
-
 """]]
 
-## Create the instance
-
 ## Connect to it
 
 ## And now?