Return-Path: 
 <ooo-commits-return-323-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 7A7196EE6
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Mon,  4 Jul 2011 14:11:39 +0000 (UTC)
Received: (qmail 58302 invoked by uid 500); 4 Jul 2011 14:11:39 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 58231 invoked by uid 500); 4 Jul 2011 14:11:39 -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 58223 invoked by uid 99); 4 Jul 2011 14:11:39 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 14:11:39 +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; Mon, 04 Jul 2011 14:11:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 29FB4238896F
	for <ooo-commits@incubator.apache.org>; Mon,  4 Jul 2011 14:11:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r792151 - in /websites/production/openofficeorg: ./
 content/openofficeorg/docs/edit-cms.html
Date: Mon, 04 Jul 2011 14:11:16 -0000
To: ooo-commits@incubator.apache.org
From: joes@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110704141116.29FB4238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: joes
Date: Mon Jul  4 14:11:15 2011
New Revision: 792151

Log:
Publishing merge to openofficeorg site by joes

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  4 14:11:15 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-792147
+/websites/staging/openofficeorg/trunk:791146-792150

Modified: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html Mon Jul  4 14:11:15 2011
@@ -76,7 +76,7 @@ and sub-directories.</p>
 <p>The website is hosted in a Content Management System (CMS). When you edit a web page
 there are potentially four different versions of it to think about:</p>
 <ol>
-<li>There is latest version of the page source stored in subversion.</li>
+<li>There is the latest version of the page source stored in subversion.</li>
 <li>There is your working copy of that page source, which you are editing.</li>
 <li>There is the generated HTML from that source, in the staging directory.</li>
 <li>There is the production version of the HTML, which is what the public sees.</li>