--- wikisrc/amazon_ec2.mdwn	2011/02/07 04:09:20	1.1
+++ wikisrc/amazon_ec2.mdwn	2011/03/13 02:42:31	1.47
@@ -2,54 +2,14 @@
 
 # Introduction
 
-First draft of a tutorial on getting NetBSD running in Amazon's cloud system, know as [EC2](aws.amazon.com/ec2/).
-
-TOC first :) Content will come along.
-
+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)
 
-## Quick overview
-
-## What do you need to know
-
-### Keep your credentials!
-
-### EC2 vocabulary
-
-
-# Building up your first AMI (Amazon Image)
-
-## Pre-built AMIs
-
-(For the future)
-
-## Fetch and build the operating system
-
-## Customizations
-
-### For EC2
-
-### For your own needs
-
-
-# Upload your OS
-
-## Create an Amazon Linux AMI instance
-
-## Upload your files
-
-## Snapshots!
-
-## Create your customized AMI
-
-## Shutdown the instance
-
-
-# Play with your first NetBSD instance
+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.
 
-## Create the instance
+[[!inline pages="amazon_ec2/first_steps" raw="yes"]]
 
-## Connect to it
+[[!inline pages="amazon_ec2/AMIs" raw="yes"]]
 
-## And now?
+[[!inline pages="amazon_ec2/_your_own_AMI" raw="yes"]]