--- wikisrc/amazon_ec2/amis.mdwn	2014/11/05 18:44:37	1.42
+++ wikisrc/amazon_ec2/amis.mdwn	2015/11/22 01:18:54	1.48
@@ -4,6 +4,12 @@ The following AMIs are publicly availabl
 
 They come with [src](http://www.netbsd.org/docs/guide/en/chap-fetch.html) and [pkgsrc](http://www.netbsd.org/docs/pkgsrc/) bundled under */usr/src/* and */usr/pkgsrc/* respectively, or a bootstrap script to help fetch them when necessary.  The bootstrap script can also be used to set up binary packages support using pkgin(1).
 
+Starting with the NetBSD 7.0 AMIs, the images have a very small disk
+by default.  If you launch it with a larger disk, it will resize the
+root file system on initial boot, expanding it to the full size of
+your primary disk.  The 6.x AMIs default to a 5GB root file system,
+and do not currently auto-expand.
+
 Note: these AMIs send an email to the maintainer on first launch, to
 help gauge usage.  
 
@@ -25,54 +31,6 @@ The following AMIs are for 64 bit instan
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.4</th>
-  <td>ami-738eb31a</td><!-- us-east-1 -->
-  <td>ami-8cc5f7c9</td><!-- us-west-1 -->
-  <td>ami-6e16765e</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-226e9a55</td><!-- eu-west-1 -->
-  <td>ami-4e31671c</td><!-- ap-southeast-1 -->
-  <td>ami-815ec0bb</td><!-- ap-southeast-2 -->
-  <td>ami-75c8a174</td><!-- ap-northeast-1 -->
-  <td>ami-c96dcdd4</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.2</th>
-  <td>ami-198cb170</td><!-- us-east-1 -->
-  <td>ami-20c5f765</td><!-- us-west-1 -->
-  <td>ami-841575b4</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-106d9967</td><!-- eu-west-1 -->
-  <td>ami-643f6936</td><!-- ap-southeast-1 -->
-  <td>ami-b15ec08b</td><!-- ap-southeast-2 -->
-  <td>ami-d1f79ed0</td><!-- ap-northeast-1 -->
-  <td>ami-876dcd9a</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.4</th>
-  <td>ami-e192af88</td><!-- us-east-1 -->
-  <td>ami-5cc5f719</td><!-- us-west-1 -->
-  <td>ami-48157578</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-6c6d991b</td><!-- eu-west-1 -->
-  <td>ami-0830665a</td><!-- ap-southeast-1 -->
-  <td>ami-695ec053</td><!-- ap-southeast-2 -->
-  <td>ami-81f59c80</td><!-- ap-northeast-1 -->
-  <td>ami-936dcd8e</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.5</th>
-  <td>ami-45465e2c</td><!-- us-east-1 -->
-  <td>ami-22300867</td><!-- us-west-1 -->
-  <td>ami-883643b8</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-154bb162</td><!-- eu-west-1 -->
-  <td>ami-c47f2c96</td><!-- ap-southeast-1 -->
-  <td>ami-3108900b</td><!-- ap-southeast-2 -->
-  <td>ami-b52853b4</td><!-- ap-northeast-1 -->
-  <td>ami-5119bb4c</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.0.6</th>
   <td>ami-ee229a86</td><!-- us-east-1 -->
   <td>ami-ab5a4fee</td><!-- us-west-1 -->
@@ -85,30 +43,6 @@ The following AMIs are for 64 bit instan
   <td>ami-5fa61242</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.1.3</th>
-  <td>ami-1d90ad74</td><!-- us-east-1 -->
-  <td>ami-aea092eb</td><!-- us-west-1 -->
-  <td>ami-30076700</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-6a7d891d</td><!-- eu-west-1 -->
-  <td>ami-dc34628e</td><!-- ap-southeast-1 -->
-  <td>ami-a1a33d9b</td><!-- ap-southeast-2 -->
-  <td>ami-93e68f92</td><!-- ap-northeast-1 -->
-  <td>ami-6b6dcd76</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.4</th>
-  <td>ami-87435bee</td><!-- us-east-1 -->
-  <td>ami-223e0667</td><!-- us-west-1 -->
-  <td>ami-26344116</td><!-- us-west-2 -->
-  <td>-</td><!-- eu-central-1 -->
-  <td>ami-6b55af1c</td><!-- eu-west-1 -->
-  <td>ami-7e7f2c2c</td><!-- ap-southeast-1 -->
-  <td>ami-fb178fc1</td><!-- ap-southeast-2 -->
-  <td>ami-ab2a51aa</td><!-- ap-northeast-1 -->
-  <td>ami-2f19bb32</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.1.5</th>
   <td>ami-bc2c94d4</td><!-- us-east-1 -->
   <td>ami-415a4f04</td><!-- us-west-1 -->
@@ -121,16 +55,16 @@ The following AMIs are for 64 bit instan
   <td>ami-f1a511ec</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 7.0_BETA_201411041110Z</th>
-  <td>ami-848a04ec</td><!-- us-east-1 -->
-  <td>ami-25e4f360</td><!-- us-west-1 -->
-  <td>ami-f586cec5</td><!-- us-west-2 -->
-  <td>ami-72cdfb6f</td><!-- eu-central-1 -->
-  <td>ami-f44fe583</td><!-- eu-west-1 -->
-  <td>ami-945271c6</td><!-- ap-southeast-1 -->
-  <td>ami-996d02a3</td><!-- ap-southeast-2 -->
-  <td>ami-61a59a60</td><!-- ap-northeast-1 -->
-  <td>ami-c301b6de</td><!-- sa-east-1 -->
+  <th>NetBSD 7.0</th>
+  <td>ami-bc8fc8d6</td><!-- us-east-1 -->
+  <td>ami-7b0b621b</td><!-- us-west-1 -->
+  <td>ami-9c9f8ffd</td><!-- us-west-2 -->
+  <td>ami-32e6f45e</td><!-- eu-central-1 -->
+  <td>ami-ac983ddf</td><!-- eu-west-1 -->
+  <td>ami-c8ea2bab</td><!-- ap-southeast-1 -->
+  <td>ami-8a89d0e9</td><!-- ap-southeast-2 -->
+  <td>ami-d7eeccb9</td><!-- ap-northeast-1 -->
+  <td>ami-51d0553d</td><!-- sa-east-1 -->
 </tr>
 </table>
 
@@ -138,7 +72,7 @@ The following AMIs are for 64 bit instan
 
 The following AMIs are for 32-bit instances.
 
-### Note: eu-central-1 (Frankfurt) does not have instances capable of running 32-bit PV AMIs.
+*Note: eu-central-1 (Frankfurt) does not have instances capable of running 32-bit PV AMIs.*
 
 <table class="center">
 <tr>
@@ -153,50 +87,6 @@ The following AMIs are for 32-bit instan
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.4</th>
-  <td>ami-0d82bf64</td><!-- us-east-1 -->
-  <td>ami-50c8fa15</td><!-- us-west-1 -->
-  <td>ami-7e1a7a4e</td><!-- us-west-2 -->
-  <td>ami-206a9e57</td><!-- eu-west-1 -->
-  <td>ami-223e6870</td><!-- ap-southeast-1 -->
-  <td>ami-b95fc183</td><!-- ap-southeast-2 -->
-  <td>ami-bbd9b0ba</td><!-- ap-northeast-1 -->
-  <td>ami-776ece6a</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.2</th>
-  <td>ami-3583be5c</td><!-- us-east-1 -->
-  <td>ami-cccefc89</td><!-- us-west-1 -->
-  <td>ami-fa1979ca</td><!-- us-west-2 -->
-  <td>ami-ca699dbd</td><!-- eu-west-1 -->
-  <td>ami-1a3e6848</td><!-- ap-southeast-1 -->
-  <td>ami-4f5fc175</td><!-- ap-southeast-2 -->
-  <td>ami-03d9b002</td><!-- ap-northeast-1 -->
-  <td>ami-476ece5a</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.4</th>
-  <td>ami-8b87bae2</td><!-- us-east-1 -->
-  <td>ami-30cbf975</td><!-- us-west-1 -->
-  <td>ami-7c19794c</td><!-- us-west-2 -->
-  <td>ami-14689c63</td><!-- eu-west-1 -->
-  <td>ami-ac3167fe</td><!-- ap-southeast-1 -->
-  <td>ami-6f5fc155</td><!-- ap-southeast-2 -->
-  <td>ami-f1c4adf0</td><!-- ap-northeast-1 -->
-  <td>ami-236ece3e</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.5</th>
-  <td>ami-fd2f3794</td><!-- us-east-1 -->
-  <td>ami-da2b139f</td><!-- us-west-1 -->
-  <td>ami-e42d58d4</td><!-- us-west-2 -->
-  <td>ami-ad9550da</td><!-- eu-west-1 -->
-  <td>ami-02613250</td><!-- ap-southeast-1 -->
-  <td>ami-450b937f</td><!-- ap-southeast-2 -->
-  <td>ami-11146f10</td><!-- ap-northeast-1 -->
-  <td>ami-a7ef42ba</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.0.6</th>
   <td>ami-62249c0a</td><!-- us-east-1 -->
   <td>ami-7945503c</td><!-- us-west-1 -->
@@ -208,28 +98,6 @@ The following AMIs are for 32-bit instan
   <td>ami-73a6126e</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.1.3</th>
-  <td>ami-a185b8c8</td><!-- us-east-1 -->
-  <td>ami-e4cefca1</td><!-- us-west-1 -->
-  <td>ami-50187860</td><!-- us-west-2 -->
-  <td>ami-7e689c09</td><!-- eu-west-1 -->
-  <td>ami-fa3167a8</td><!-- ap-southeast-1 -->
-  <td>ami-1f5fc125</td><!-- ap-southeast-2 -->
-  <td>ami-13c2ab12</td><!-- ap-northeast-1 -->
-  <td>ami-016ece1c</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.4</th>
-  <td>ami-cd2b33a4</td><!-- us-east-1 -->
-  <td>ami-6c2b1329</td><!-- us-west-1 -->
-  <td>ami-fc2257cc</td><!-- us-west-2 -->
-  <td>ami-294fb55e</td><!-- eu-west-1 -->
-  <td>ami-be7e2dec</td><!-- ap-southeast-1 -->
-  <td>ami-7d089047</td><!-- ap-southeast-2 -->
-  <td>ami-a52e55a4</td><!-- ap-northeast-1 -->
-  <td>ami-4b1ebc56</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.1.5</th>
   <td>ami-b618a0de</td><!-- us-east-1 -->
   <td>ami-3d5a4f78</td><!-- us-west-1 -->
@@ -241,14 +109,14 @@ The following AMIs are for 32-bit instan
   <td>ami-07a6121a</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 7.0_BETA_201411041110Z</th>
-  <td>ami-a28d03ca</td><!-- us-east-1 -->
-  <td>ami-73e4f336</td><!-- us-west-1 -->
-  <td>ami-5587cf65</td><!-- us-west-2 -->
-  <td>ami-184ee46f</td><!-- eu-west-1 -->
-  <td>ami-24527176</td><!-- ap-southeast-1 -->
-  <td>ami-5f6d0265</td><!-- ap-southeast-2 -->
-  <td>ami-efa699ee</td><!-- ap-northeast-1 -->
-  <td>ami-3101b62c</td><!-- sa-east-1 -->
+  <th>NetBSD 7.0</th>
+  <td>ami-569ed93c</td><!-- us-east-1 -->
+  <td>ami-fa0e679a</td><!-- us-west-1 -->
+  <td>ami-9f8090fe</td><!-- us-west-2 -->
+  <td>ami-a460c5d7</td><!-- eu-west-1 -->
+  <td>ami-4af33229</td><!-- ap-southeast-1 -->
+  <td>ami-f98bd29a</td><!-- ap-southeast-2 -->
+  <td>ami-c5f8daab</td><!-- ap-northeast-1 -->
+  <td>ami-2bd15447</td><!-- sa-east-1 -->
 </tr>
 </table>