--- wikisrc/amazon_ec2.mdwn	2011/03/13 02:43:33	1.48
+++ wikisrc/amazon_ec2.mdwn	2019/10/08 17:24:55	1.52
@@ -1,15 +1,9 @@
-[[!toc]]
+[[!meta title="Amazon EC2"]]
 
-# Introduction
+Welcome to NetBSD's Amazon EC2 page. You will find below all the resources that will help you understanding, building, starting and managing NetBSD instances under Amazon cloud platform.
 
-This tutorial aims at showing how you can build, setup, upload and launch NetBSD under the [Amazon EC2](http://aws.amazon.com/ec2/) service. We will first give some brief explanations on how you can obtain an AWS account, and what you will need to run NetBSD under EC2. Then, at your convenience, you will be able to start with pre-made images, or roll-out your own.
-
-# Subscribe to AWS (Amazon Web Services)
-
-If you already have an account for [Amazon Web Services](http://aws.amazon.com/), and you are a registered user for EC2 service, you can directly jump to section [What do you need to know](#index2h2). If not, keep reading.
-
-[[!inline pages="amazon_ec2/first_steps" raw="yes"]]
-
-[[!inline pages="amazon_ec2/AMIs" raw="yes"]]
-
-[[!inline pages="amazon_ec2/build_your_own_AMI" raw="yes"]]
+* [Subscribe to Amazon EC2, and understand its vocabulary](first_steps)
+* [Launching your first NetBSD instance in 5 minutes](netbsd_in_5_min)
+* [Building your own NetBSD AMI](build_your_own_ami)
+* [NetBSD AMIs identifiers, by region](amis)
+* [How to build NetBSD AMI for c5 instance with ENA](http://www.netbsd.org/~ryoon/ena/how-to-create-ami-for-aws-c5.txt)