Return-Path: 
 <ooo-commits-return-15417-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D49BED2EA
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Fri, 26 Oct 2012 01:15:33 +0000 (UTC)
Received: (qmail 31827 invoked by uid 500); 26 Oct 2012 01:15:33 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 31796 invoked by uid 500); 26 Oct 2012 01:15:33 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 31788 invoked by uid 99); 26 Oct 2012 01:15:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2012 01:15:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2012 01:15:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4CA13238890D
	for <ooo-commits@incubator.apache.org>; Fri, 26 Oct 2012 01:14:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r836197 - in
 /websites/staging/openofficeorg/trunk/content: ./
 openofficeorg/orientation/infrastructure.html
Date: Fri, 26 Oct 2012 01:14:46 -0000
To: ooo-commits@incubator.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121026011446.4CA13238890D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: buildbot
Date: Fri Oct 26 01:14:45 2012
New Revision: 836197

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct 26 01:14:45 2012
@@ -1 +1 @@
-1402356
+1402364

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/orientation/infrastructure.html Fri Oct 26 01:14:45 2012
@@ -21,7 +21,7 @@
 <meta name="google-site-verification" content="wIHUbgA-JO5PaJHpR5jeI8N9E2y2iF94o4oUwpaAdk8" />
 <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Infrastructure
</title>
+<title>Infrastructure</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <script type="text/javascript">
@@ -94,25 +94,55 @@
   </div>
   <div id="contenta">
   
-    <h1 class="title">Infrastructure
</h1>
-    <p>In this Orientation Module you will learn about tools and servers that are part of the daily operations of the project.  You will interact with many of these on a regular basis, so
-it is important to know what they are for, and where to go if you run into problems.</p>
+    <h1 class="title">Infrastructure</h1>
+    <p>In this Orientation Module you will learn about tools and servers that are part of the daily operations of the project.  You will interact with many of these on a regular basis, 
+or at least hear them discussed on the lists, so it is important to know what they are, and where to go if you 
+need more information or run into problems.</p>
 <ol>
 <li>
-<p>Please send an email to <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting Infrastructure Module">ooo-dev@incubator.apache.org</a> to let us know you are working on this module.</p>
+<p>First, Please send an email to <a href="mailto:ooo-dev@incubator.apache.org?subject=Starting Infrastructure Module">ooo-dev@incubator.apache.org</a> 
+to let us know you are working on this module.</p>
 </li>
 <li>
 <p>List of tools and services we use</p>
 <ul>
-<li>ezmlm</li>
-<li>MediaWiki</li>
-<li>Confluence Wiki</li>
-<li>Pootle</li>
-<li>Apache CMS</li>
-<li>Subversion</li>
-<li>phpBB</li>
-<li>Bugzilla</li>
-<li>JIRA</li>
+<li>
+<p>ezmlm:  This is the time-tested EZ Mailing List Manager application that manages our mailing lists.  You 
+control ezmlm by sending commands to a list address.  For example, if the list address is ooo-dev@incubator.apache.org
+then you subscribe to the list with the command ooo-dev-<strong>subscribe</strong>@incubator.apache.org.  Some other popular commands 
+are listed <a href="http://www.apache.org/foundation/mailinglists.html">here</a>.  You can get a full list of commands 
+available to you by sending the <em>help</em> command, as in ooo-dev-<strong>help</strong>@incubator.apache.org.  Each list has moderators
+who have additional capabilities.  You can find the moderators for our lists <a href="http://incubator.apache.org/openofficeorg/pmc-faqs.html#mailing-lists">here</a>.</p>
+</li>
+<li>
+<p>MediaWiki (also called MWiki) is used for the wiki on the <a href="http://wiki.openoffice.org/wiki/Main_Page">wiki.openoffice.org</a> website.
+We use MWiki for many of the user-facing pages on the website, especially in the areas of documentation and support.  If you are familiar with Wikipedia and 
+the syntax used for authoring articles there, then you will find our MediaWiki very easy to use, since Wikipedia
+also uses MediaWiki.  If you are new to MediaWiki please read over this <a href="http://meta.wikimedia.org/wiki/Help:Editing">introduction to the basics</a>.</p>
+</li>
+<li>
+<p>Confluence Wiki</p>
+</li>
+<li>
+<p>Pootle is our translation management server, an online service used by translators to translate the UI 
+and help files of OpenOffice into various languages.  Unless you are involved with translations or builds you
+probably will never use Pootle.</p>
+</li>
+<li>
+<p>Apache CMS</p>
+</li>
+<li>
+<p>Subversion</p>
+</li>
+<li>
+<p>phpBB is the software that runs our Community Forums, used for technical support of our users.</p>
+</li>
+<li>
+<p>Bugzilla</p>
+</li>
+<li>
+<p>JIRA</p>
+</li>
 </ul>
 </li>
 <li>