Merging in latest boto.

docs/source/index.rst

Index: docs/source/index.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2ecd1d6c79e2b5e42bd6f115db9ee988ab6740f5..bb76ff43c1ae83ea154aad8369b92be25fe9c6d7 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -9,24 +9,56 @@ offered by Amazon Web Services.
 
 Currently, this includes:
 
-- Simple Storage Service (S3)
-- Simple Queue Service (SQS)
-- Elastic Compute Cloud (EC2)
+* Compute
 
- - Elastic Load Balancer (ELB)
- - CloudWatch
- - AutoScale
- 
-- Mechanical Turk
-- SimpleDB (SDB) - See SimpleDbPage for details
-- CloudFront
-- Virtual Private Cloud (VPC)
-- Relational Data Services (RDS)
-- Elastic Map Reduce (EMR)
-- Flexible Payment Service (FPS)
-- Identity and Access Management (IAM)
+  * Elastic Compute Cloud (EC2)
+  * Elastic MapReduce (EMR)
+  * Auto Scaling
 
-The boto project page is at http://boto.googlecode.com/
+* Content Delivery
+
+  * CloudFront
+
+* Database
+
+  * SimpleDB
+  * Relational Data Services (RDS)
+
+* Deployment and Management
+
+  * CloudFormation
+
+* Identity & Access
+
+  * Identity and Access Management (IAM)
+
+* Messaging
+
+  * Simple Queue Service (SQS)
+  * Simple Notificaiton Service (SNS)
+  * Simple Email Service (SES)
+
+* Monitoring
+
+  * CloudWatch
+
+* Networking
+
+  * Route 53
+  * Virtual Private Cloud (VPC)
+  * Elastic Load Balancing (ELB)
+
+* Payments & Billing
+
+  * Flexible Payments Service (FPS)
+
+* Storage
+
+  * Simple Storage Service (S3)
+
+* Workforce
+
+  * Mechanical Turk
 
 The boto source repository is at http://github.com/boto