merge in anne's changes

4 files changed, 74 insertions, 16 deletions

diff --git a/doc/source/_ga/layout.html b/doc/source/_ga/layout.html
index 0b72a77ac..f29e90968 100644
--- a/doc/source/_ga/layout.html
+++ b/doc/source/_ga/layout.html
@@ -8,7 +8,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.
 </script>
 <script type="text/javascript">
 try {
-var pageTracker = _gat._getTracker("UA-17511903-1");
+var pageTracker = _gat._getTracker("UA-17511903-3");
 pageTracker._setDomainName("none");
 pageTracker._setAllowLinker(true);
 pageTracker._trackPageview();
diff --git a/doc/source/_static/tweaks.css b/doc/source/_static/tweaks.css
index ea2ed3cf5..b21c7a644 100644
--- a/doc/source/_static/tweaks.css
+++ b/doc/source/_static/tweaks.css
@@ -27,12 +27,29 @@ ul.todo_list li {
 }
 
 div.admonition {
-    border: 1px solid #FF6666;
+    border: 1px solid #E2ECEF;
 }
 
 div.admonition p.admonition-title {
-    background-color: #FF6666;
-    border-bottom: 1px solid #FF6666;
+    background-color: #E2ECEF;
+    border-bottom: 1px solid #E2ECEF;
+}
+
+a {
+	color: #CF2F19;
+}
+
+div.related ul li a {
+	color: #CF2F19;
+}
+
+div.sphinxsidebar h4 {
+	background-color:#8E8E8E;
+	border:1px solid #255E6E;
+	color:white;
+	font-size:1em;
+	margin:1em 0 0.5em;
+	padding:0.1em 0 0.1em 0.5em;
 }
 
 em {
diff --git a/doc/source/cloud101.rst b/doc/source/cloud101.rst
index 3fc2ce111..075159702 100644
--- a/doc/source/cloud101.rst
+++ b/doc/source/cloud101.rst
@@ -19,3 +19,28 @@ Cloud Computing 101
 ===================
 
 .. todo:: add in a brief tour of cloud computing concepts
+
+
+Overview of Cloud Computing
+===========================
+
+
+Why Cloud?
+==========
+
+
+Attributes of a Cloud
+=====================
+
+Types of Cloud Services
+
+
+Work in the Clouds
+==================
+What people have done/sample projects
+
+
+Types of Clouds 
+===============
+public/private/hybrid/etc
+Use definitions from http://csrc.nist.gov/groups/SNS/cloud-computing/
\ No newline at end of file
diff --git a/doc/source/community.rst b/doc/source/community.rst
index 2f2c4cd4a..dd41e9b14 100644
--- a/doc/source/community.rst
+++ b/doc/source/community.rst
@@ -18,33 +18,48 @@
 Getting Involved
 ================
 
-.. todo:: Talk about contributing code back to the project
+The Nova community is a very friendly group and there are places online to join in with the 
+community. Feel free to ask questions. This document points you to some of the places where you can
+communicate with people.
 
-The Nova community is a very friendly place.  Feel free to ask questions.
-This document points you to some of the places you may want to communicate
-with people at.
+How to Join the OpenStack Community
+-----------------------------------
 
+Our community welcomes all people interested in open source cloud computing, and there are no formal
+membership requirements. The best way to join the community is to talk with others online or at a meetup
+and offer contributions through Launchpad, the wiki, or blogs. We welcome all types of contributions, 
+from blueprint designs to documentation to testing to deployment scripts. 
+
+Contributing Code
+-----------------
+
+To contribute code, sign up for a Launchpad account and sign a contributor license agreement,
+available on the `OpenStack Wiki <http://wiki.openstack.org/CLA>`_. Once the CLA is signed you 
+can contribute code through the Bazaar version control system which is related to your Launchpad account.
 
 #openstack on Freenode IRC Network
 ----------------------------------
 
 There is a very active chat channel at `<irc://freenode.net/#openstack>`_.  This
-is usually the best place to ask questions and find your way around.
+is usually the best place to ask questions and find your way around. IRC stands for Internet Relay
+Chat and it is a way to chat online in real time. You can also ask a question and come back to the 
+log files to read the answer later. Logs for the #openstack IRC channel are stored at 
+<http://eavesdrop.openstack.org/irclogs/>`_.
 
 OpenStack Wiki
 --------------
 
 The wiki is a living source of knowledge.  It is edited by the community, and
-has collections of links and other sources of information.
+has collections of links and other sources of information. Typically the pages are a good place
+to write drafts for specs or documentation, describe a blueprint, or collaborate with others.
 
 `OpenStack Wiki <http://wiki.openstack.org/>`_
 
 Nova on Launchpad
 -----------------
 
-Launchapd is a code hosting service that hosts the Nova source code.  From
-launchpad you can report bugs, ask questions, and register blueprints (feature
-requests).
+Launchpad is a code hosting service that hosts the Nova source code. From
+Launchpad you can report bugs, ask questions, and register blueprints (feature requests). 
 
 `Launchpad Nova Page <http://launchpad.net/nova>`_
 
@@ -58,10 +73,11 @@ events and posts from OpenStack contributors.
 `OpenStack Blog <http://openstack.org/blog>`_
 
 See also: `Planet OpenStack <http://planet.openstack.org/>`_, aggregating blogs
-about OpenStack from around the internet into a single feed.
+about OpenStack from around the internet into a single feed. If you'd like to contribute to this blog
+aggregation with your blog posts, there are instructions for `adding your blog <http://wiki.openstack.org/AddingYourBlog>`_.
 
 Twitter
 -------
 
-Because all the cool kids do it: `@openstack <http://twitter.com/openstack>`_.
-
+Because all the cool kids do it: `@openstack <http://twitter.com/openstack>`_. Also follow the 
+`#openstack <http://search.twitter.com/search?q=%23openstack>`_ tag for relevant tweets.