Author: marcus
Date: Mon Sep 12 12:40:18 2011
New Revision: 795631
Log:
Publishing merge to openofficeorg site by marcus
Added:
websites/production/openofficeorg/content/openofficeorg/aa/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/aa/
websites/production/openofficeorg/content/openofficeorg/aa/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/aa/index.html
websites/production/openofficeorg/content/openofficeorg/aa/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/aa/robots.txt
websites/production/openofficeorg/content/openofficeorg/af/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/af/
websites/production/openofficeorg/content/openofficeorg/af/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/af/index.html
websites/production/openofficeorg/content/openofficeorg/af/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/af/robots.txt
websites/production/openofficeorg/content/openofficeorg/am/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/am/
websites/production/openofficeorg/content/openofficeorg/am/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/am/index.html
websites/production/openofficeorg/content/openofficeorg/am/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/am/robots.txt
websites/production/openofficeorg/content/openofficeorg/ar/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/
websites/production/openofficeorg/content/openofficeorg/ar/about-cdrom.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-cdrom.html
websites/production/openofficeorg/content/openofficeorg/ar/about-documentation.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-documentation.html
websites/production/openofficeorg/content/openofficeorg/ar/about-downloads.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-downloads.html
websites/production/openofficeorg/content/openofficeorg/ar/about-helping.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-helping.html
websites/production/openofficeorg/content/openofficeorg/ar/about-issuezilla.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-issuezilla.html
websites/production/openofficeorg/content/openofficeorg/ar/about-legal.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-legal.html
websites/production/openofficeorg/content/openofficeorg/ar/about-mailinglist.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-mailinglist.html
websites/production/openofficeorg/content/openofficeorg/ar/about-product.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-product.html
websites/production/openofficeorg/content/openofficeorg/ar/about-spellcheck.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/about-spellcheck.html
websites/production/openofficeorg/content/openofficeorg/ar/addresses.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/addresses.html
websites/production/openofficeorg/content/openofficeorg/ar/back.gif
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/back.gif
websites/production/openofficeorg/content/openofficeorg/ar/background.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/background.html
websites/production/openofficeorg/content/openofficeorg/ar/banner_join_ar.png
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/banner_join_ar.png
websites/production/openofficeorg/content/openofficeorg/ar/credits.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/credits.html
websites/production/openofficeorg/content/openofficeorg/ar/faq.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/faq.html
websites/production/openofficeorg/content/openofficeorg/ar/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/index.html
websites/production/openofficeorg/content/openofficeorg/ar/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/robots.txt
websites/production/openofficeorg/content/openofficeorg/ar/style.css
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/style.css
websites/production/openofficeorg/content/openofficeorg/ar/valid_css.png
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/valid_css.png
websites/production/openofficeorg/content/openofficeorg/ar/valid_html.png
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/valid_html.png
websites/production/openofficeorg/content/openofficeorg/ar/work_in_progress.gif
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/ar/work_in_progress.gif
websites/production/openofficeorg/content/openofficeorg/dz/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/dz/
websites/production/openofficeorg/content/openofficeorg/dz/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/dz/index.html
websites/production/openofficeorg/content/openofficeorg/dz/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/dz/robots.txt
websites/production/openofficeorg/content/openofficeorg/lt/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/
websites/production/openofficeorg/content/openofficeorg/lt/about-cdrom.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-cdrom.html
websites/production/openofficeorg/content/openofficeorg/lt/about-documentation.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-documentation.html
websites/production/openofficeorg/content/openofficeorg/lt/about-downloads.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-downloads.html
websites/production/openofficeorg/content/openofficeorg/lt/about-helping.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-helping.html
websites/production/openofficeorg/content/openofficeorg/lt/about-issuezilla.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-issuezilla.html
websites/production/openofficeorg/content/openofficeorg/lt/about-legal.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-legal.html
websites/production/openofficeorg/content/openofficeorg/lt/about-mailinglist.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-mailinglist.html
websites/production/openofficeorg/content/openofficeorg/lt/about-product.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-product.html
websites/production/openofficeorg/content/openofficeorg/lt/about-spellcheck.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/about-spellcheck.html
websites/production/openofficeorg/content/openofficeorg/lt/adresses.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/adresses.html
websites/production/openofficeorg/content/openofficeorg/lt/background.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/background.html
websites/production/openofficeorg/content/openofficeorg/lt/credits.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/credits.html
websites/production/openofficeorg/content/openofficeorg/lt/faq.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/faq.html
websites/production/openofficeorg/content/openofficeorg/lt/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/index.html
websites/production/openofficeorg/content/openofficeorg/lt/links.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/links.html
websites/production/openofficeorg/content/openofficeorg/lt/menu.js
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/menu.js
websites/production/openofficeorg/content/openofficeorg/lt/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/lt/robots.txt
websites/production/openofficeorg/content/openofficeorg/my/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/my/
websites/production/openofficeorg/content/openofficeorg/my/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/my/index.html
websites/production/openofficeorg/content/openofficeorg/my/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/my/robots.txt
websites/production/openofficeorg/content/openofficeorg/sq/
- copied from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/
websites/production/openofficeorg/content/openofficeorg/sq/adresa.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/adresa.html
websites/production/openofficeorg/content/openofficeorg/sq/base.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/base.html
websites/production/openofficeorg/content/openofficeorg/sq/calc.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/calc.html
websites/production/openofficeorg/content/openofficeorg/sq/draw.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/draw.html
websites/production/openofficeorg/content/openofficeorg/sq/emx_nav_right.css
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/emx_nav_right.css
websites/production/openofficeorg/content/openofficeorg/sq/historia.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/historia.html
websites/production/openofficeorg/content/openofficeorg/sq/impress.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/impress.html
websites/production/openofficeorg/content/openofficeorg/sq/index.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/index.html
websites/production/openofficeorg/content/openofficeorg/sq/index2.1
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/index2.1
websites/production/openofficeorg/content/openofficeorg/sq/index2.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/index2.html
websites/production/openofficeorg/content/openofficeorg/sq/index3.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/index3.html
websites/production/openofficeorg/content/openofficeorg/sq/kontributi.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/kontributi.html
websites/production/openofficeorg/content/openofficeorg/sq/mail_lista.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/mail_lista.html
websites/production/openofficeorg/content/openofficeorg/sq/math.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/math.html
websites/production/openofficeorg/content/openofficeorg/sq/pershkrimi.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/pershkrimi.html
websites/production/openofficeorg/content/openofficeorg/sq/robots.txt
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/robots.txt
websites/production/openofficeorg/content/openofficeorg/sq/shablloni.htm
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/shablloni.htm
websites/production/openofficeorg/content/openofficeorg/sq/shkarko.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/shkarko.html
websites/production/openofficeorg/content/openofficeorg/sq/sinergjia.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/sinergjia.html
websites/production/openofficeorg/content/openofficeorg/sq/writer.html
- copied unchanged from r795630, websites/staging/openofficeorg/trunk/content/openofficeorg/sq/writer.html
Modified:
websites/production/openofficeorg/ (props changed)
websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 12:40:18 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-795462
+/websites/staging/openofficeorg/trunk:791146-795630
Modified: websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
(original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/governance/lazyConsensus.html
Mon Sep 12 12:40:18 2011
@@ -107,7 +107,10 @@ lazy consensus model. In these circumsta
operation.</p>
<p>What this means is that they make a proposal and state that they will start
implementing it in 72 hours unless someone objects. 72 hours is chosen because
-it accounts for different timezones and non-apache commitments.</p>
+it accounts for different timezones and non-apache commitments. If the 72 hours are
+touching a weekend it would be wise to extend the timeframe a bit. This will ensure
+that people can participate in the proposal even when they were offline over the
+weekend.</p>
<p>In this approach the original proposal is not insisting that there is a discussion
around their proposal, nor are they requesting that the community explicitly
supports their actions. However, this differs from assuming lazy consensus
|