[Libreoffice-commits] .: Branch 'tdf-website' - 13 commits - contact/index.php contribution/index.php develop/index.php download/index.php foundation/index.php .htaccess index.php supporters/index.php
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Nov 19 09:28:07 PST 2010
.htaccess | 4 ++--
contact/index.php | 7 ++-----
contribution/index.php | 7 +++++++
develop/index.php | 6 +++---
download/index.php | 4 ++--
foundation/index.php | 21 +++++++++++----------
index.php | 5 ++++-
supporters/index.php | 28 ++++++++++++++++++++++++++++
8 files changed, 59 insertions(+), 23 deletions(-)
New commits:
commit 9b4feebf1f9c1b9b35074d0ebd1df6e8c18151c0
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Nov 18 12:55:23 2010 +0100
Slightly improved blog announcement verbiage
diff --git a/index.php b/index.php
index f3ab1f6..b80a5a6 100644
--- a/index.php
+++ b/index.php
@@ -30,7 +30,7 @@ $rightnavigation
<h3>News</h3>
-<p>2010-11-17 <b>Blog</b><br>
+<p>2010-11-17 <b>Official TDF blog opens</b><br>
The official Document Foundation blog is <a href="http://blog.documentfoundation.org">here</a>.</p>
<p>2010-11-10 <b>Preview of future product and technology developments</b><br>
commit 600bd4f205282ef393d780cb6245d85587bf18c9
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Nov 11 10:30:07 2010 +0100
spokespeople note added
diff --git a/.htaccess b/.htaccess
index 9615830..d2e1734 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,8 +3,8 @@ Redirect /foundingmembers http://www.documentfoundation.org/foundation
Redirect /foundingmembers/ http://www.documentfoundation.org/foundation/
Redirect /contact/tdf_release.html http://www.documentfoundation.org/contact/tdf_release.xml
-Redirect /en http://www.documentfoundation.org
-Redirect /en/ http://www.documentfoundation.org/
+RedirectMatch /..$ http://www.documentfoundation.org
+RedirectMatch /../$ http://www.documentfoundation.org
<Files *.php>
order deny,allow
diff --git a/foundation/index.php b/foundation/index.php
index 38e95ee..27773a4 100644
--- a/foundation/index.php
+++ b/foundation/index.php
@@ -19,7 +19,8 @@ activity across the Community.
<h3>Our Team</h3>
<p>Here is a (still incomplete) list of those deeply involved in the creation
-of the Document Foundation, and its steering committee.
+of the Document Foundation, and its steering committee. <b>For a list of official spokespeople and,
+please see our <a href="/contact">contact page</a>.</b>
</p>
<style type="text/css">
commit cbc6f9c066a788dc3facedb8a59f2dfcd6f73555
Author: Website Admin <webmaster at documentfoundation.org>
Date: Wed Nov 10 16:28:25 2010 +0100
typo fix
diff --git a/index.php b/index.php
index e09822f..f3ab1f6 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@ $rightnavigation
<p>2010-11-17 <b>Blog</b><br>
The official Document Foundation blog is <a href="http://blog.documentfoundation.org">here</a>.</p>
-<p>2010-11-10 <b>TDF offers preview of future product and technology developments</b><br>
+<p>2010-11-10 <b>Preview of future product and technology developments</b><br>
Read the press release <a href="http://www.documentfoundation.org/lists/announce/msg00016.html">here.</a></p>
<p>2010-10-13 <b>The Next Decade Manifesto</b><br>
commit 6e9bee222f236906b66ff8b01058e5329cbdc68f
Author: Website Admin <webmaster at documentfoundation.org>
Date: Wed Nov 10 16:27:13 2010 +0100
PR added
diff --git a/index.php b/index.php
index dbb9316..e09822f 100644
--- a/index.php
+++ b/index.php
@@ -33,6 +33,9 @@ $rightnavigation
<p>2010-11-17 <b>Blog</b><br>
The official Document Foundation blog is <a href="http://blog.documentfoundation.org">here</a>.</p>
+<p>2010-11-10 <b>TDF offers preview of future product and technology developments</b><br>
+Read the press release <a href="http://www.documentfoundation.org/lists/announce/msg00016.html">here.</a></p>
+
<p>2010-10-13 <b>The Next Decade Manifesto</b><br>
The announcement of the next decade manifesto is available <a href="/pdf/tdf_nextdecade.pdf">here</a>.<br>
The manifesto itself is <a href="/pdf/tdf_manifesto.pdf">available as PDF</a> and <a href="http://wiki.documentfoundation.org/TDF/Next_Decade_Manifesto">in our wiki</a>.</p>
commit 7efd94304625153aa50e86a0acb68c473f83c835
Author: Website Admin <webmaster at documentfoundation.org>
Date: Wed Nov 10 16:22:19 2010 +0100
blogosphere only once
diff --git a/contact/index.php b/contact/index.php
index 8e90967..9a9e639 100644
--- a/contact/index.php
+++ b/contact/index.php
@@ -41,10 +41,6 @@ info at documentfoundation.org</a>, which will be distributed to all contacts below
<p>To reach our security team, please drop an e-mail to <a href="mailto:security at documentfoundation.org">
security at documentfoundation.org</a>.
-<h3>Blogosphere</h3>
-
-<p>Read what bloggers say on our <a href="http://planet.documentfoundation.org">The Document Foundation Planet</a>.</p>
-
<h3>Social Networks and IRC</h3>
<p>The Document Foundation also provides communication channels on IRC and various social networks.</p>
<ul>
diff --git a/download/index.php b/download/index.php
index b17071d..1161591 100644
--- a/download/index.php
+++ b/download/index.php
@@ -44,7 +44,7 @@ This beta release is not intended for production use!
</ul>
<p>You can also <a href="http://tracker.documentfoundation.org:6969">download using BitTorrent</a>,
- or <a href="$urlbase/3.3.0-beta3">browse all the Beta3 installation packages</a> to get inofficial
+ or <a href="$urlbase/3.3.0-beta3">browse all the Beta3 installation packages</a> to get unofficial
Debian packages (<a href="$urlbase/3.3.0-beta3/deb/x86/LibO_3.3.0_Linux_x86_install-deb_en-US.tar.gz">32-bit .debs</a>
or <a href="$urlbase/3.3.0-beta3/deb/x86_64/LibO_3.3.0_Linux_x86-64_install-deb_en-US.tar.gz">64-bit .debs</a>), or language packs.</p>
</div>
diff --git a/supporters/index.php b/supporters/index.php
index 25a72cb..ad516cb 100644
--- a/supporters/index.php
+++ b/supporters/index.php
@@ -98,6 +98,22 @@ formed Foundation continued success</i>", says <b>Mark Lee</b>, CEO & President
</tr>
<tr>
+ <td><b><a name="eoffice">eOffice Network</a></b></td>
+ <td>
+ <b>Tom Gordon</b>, founder and CEO of eOffice® Network, the
+Original Online Office Network(TM), says: <i>"In the open-source world of
+Office Productivity, freedom hails from three absolutely essential
+camps: Operating Systems, Office Suites, and now Online Office Networks.
+The Document Foundation has stepped forward as THE ring bearer of
+freedom for the Office Suite group – what a courageous move! Our support
+for their success plays an important role in our own nascent effort to
+unify these three camps under one Constitutional Flag with something we
+call the eOffice® Group, a Constitutional Community Enterprise. Rock On
+Guys! . . . rock on."</i>.
+ </td>
+</tr>
+
+<tr>
<td><b><a name="france">French community</a></b></td>
<td>
Speaking for the group of volunteers, <strong>Sophie
@@ -385,6 +401,18 @@ software commons, in the spirit of the best of open source software.</i>"
</tr>
<tr>
+ <td><b><a name="tlm">The Learning Machine</a></b></td>
+ <td>
+ The Learning Machine is an awarding organisation accredited by the UK
+government that supports learning about and with Open Systems and Free
+Software. Chief Assessor <b>Ian Lynch</b> who was instrumental in setting up
+the Open Document Fellowship to provide early independent support for
+ISO 26300 said: <i>"We are committed to social and digital inclusion and we
+will do all we can to help make The Document Foundation successful.</i>"
+ </td>
+</tr>
+
+<tr>
<td><b><a name="norwegian">The Norwegian foundation</a></b></td>
<td>
The Norwegian foundation "Åpne kontorprogram på norsk"
commit 36f93d9fc793de0e9999f7222f42b9cc79ec0b6b
Author: Website Admin <webmaster at documentfoundation.org>
Date: Fri Nov 5 15:10:59 2010 +0100
link to our 'How to build' wiki page
diff --git a/develop/index.php b/develop/index.php
index 84ccdf9..2c0759b 100644
--- a/develop/index.php
+++ b/develop/index.php
@@ -44,7 +44,7 @@ way to do this is something like this:</p>
<br>
<p>If you have problems with the build - don't be put off, get in touch
with us on IRC, and/or read the wiki page <a
-href="http://www.freedesktop.org/wiki/Software/LibreOffice/HowToBuild">How
+href="http://wiki.documentfoundation.org/Development/How_to_build">How
To Build</a>. To <b>run</b> it do:</p>
<code>cd <<i>/path/to/scratch/dir/</i>>/program</code><br>
<code>. ./ooenv</code><br>
commit 554413572f8a93defd0e02f3c603c17269088553
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Nov 4 14:26:19 2010 +0100
remove note that the current beta uninstalls OOo installations
diff --git a/download/index.php b/download/index.php
index 023558c..b17071d 100644
--- a/download/index.php
+++ b/download/index.php
@@ -31,7 +31,7 @@ the incomplete language packaging situation.
</p>
<p>
-This beta release is not intended for production use! <b>Be advised that the current beta might replace your OpenOffice.org installation.</b>
+This beta release is not intended for production use!
</p>
<div id="download-nav">
commit d3ce6abfa1ba39b5716a76404c7762fd3cf33128
Author: Website Admin <webmaster at documentfoundation.org>
Date: Tue Nov 2 13:56:16 2010 +0100
Add a link to the LO credits page.
Also remove the unnecessary blurb that git is easy to use :-)).
diff --git a/develop/index.php b/develop/index.php
index 1b762b3..84ccdf9 100644
--- a/develop/index.php
+++ b/develop/index.php
@@ -6,7 +6,7 @@ $content = <<<"EOT"
<h3 id="code">The Code</h3>
<br>
-All our source code is hosted in git, which is easy to use:
+All our source code is hosted in git:
<br>
<b>Clone:</b> <tt>\$ git clone git://anongit.freedesktop.org/git/libreoffice/build</tt>
# <a href="$freedesktop_cgit">(browse)</a> <a
@@ -22,7 +22,7 @@ under the <a href="/lgpl">LGPLv3</a>. We intend to make new code
modules available under a dual LGPLv3(or later) / MPL license to
allow the license to be upgraded - there is no requirement to
assign your copyright to anyone in order to get your code contributed
-- all contributions are welcome.</p>
+- all contributions are welcome. You can see a list of past and present contributors <a href="http://libreoffice.org/credits.html">here</a>.</p>
<h3 id="building">Building And Running It</h3>
commit aad732213730328fe99c81e1f4a5b5a795017c9c
Author: Website Admin <webmaster at documentfoundation.org>
Date: Sun Oct 31 14:55:52 2010 +0100
GMANE for steering-discuss list
diff --git a/contribution/index.php b/contribution/index.php
index c024ce9..3344412 100644
--- a/contribution/index.php
+++ b/contribution/index.php
@@ -113,7 +113,7 @@ Subscription: <a href="mailto:steering-discuss+subscribe at documentfoundation.org"
Digest subscription: <a href="mailto:steering-discuss+subscribe-digest at documentfoundation.org">steering-discuss+subscribe-digest at documentfoundation.org</a><br>
Archives: <a href="http://www.documentfoundation.org/lists/steering-discuss/">http://www.documentfoundation.org/lists/steering-discuss/</a><br>
Mail-Archive.com: <a href="http://www.mail-archive.com/steering-discuss@documentfoundation.org/">http://www.mail-archive.com/steering-discuss@documentfoundation.org/</a><br>
-GMANE: pending</li>
+GMANE: <a href="http://dir.gmane.org/gmane.comp.documentfoundation.steering-discuss">http://dir.gmane.org/gmane.comp.documentfoundation.steering-discuss</a></li>
<hr>
<li><b>l10n at libreoffice.org:</b> Mailing list for people in charge of LibreOffice localization<br>
Subscription: <a href="mailto:l10n+subscribe at libreoffice.org">l10n+subscribe at libreoffice.org</a><br>
commit f6d9420ba35d3871a5932937b67d90ce3c113adc
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Oct 28 12:50:03 2010 +0200
nabble link changed
diff --git a/contribution/index.php b/contribution/index.php
index b1da002..c024ce9 100644
--- a/contribution/index.php
+++ b/contribution/index.php
@@ -148,7 +148,7 @@ GMANE: <a href="http://dir.gmane.org/gmane.comp.documentfoundation.libreoffice.m
<hr>
<li>There is also a <a href="http://lists.freedesktop.org/mailman/listinfo/libreoffice">development mailing list</a> available for those interested
in code contributions. This list is hosted by FreeDesktop.org.</li>
-<li>If you are more comfortable with using forums, you can use our <a href="http://nabble.documentfoundation.org">Nabble gateway</a>.</li>
+<li>If you are more comfortable with using forums, you can use our <a href="http://www.documentfoundation.org/nabble/">Nabble gateway</a>.</li>
</ul>
<h3>Local and Regional Mailing Lists</h3>
commit ed1141cdec75f6bf5f52ee444015c547b56ddb2c
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Oct 28 11:34:58 2010 +0200
added no support tag (as if anyone would read it... :)
added Nabble link
diff --git a/contact/index.php b/contact/index.php
index 35b0a33..8e90967 100644
--- a/contact/index.php
+++ b/contact/index.php
@@ -6,7 +6,8 @@ $content = <<<"EOT"
<h3>General Inquiries</h3>
<p>For general inquiries, please contact us directly at <a href="mailto:info at documentfoundation.org">
-info at documentfoundation.org</a>.
+info at documentfoundation.org</a>. This is <b><u>NOT A SUPPORT ADDRESS!</u></b> For support, please
+refer to our <a href="/contribution/#lists">mailing lists</a>.
<h3>Press and Media Contacts</h3>
diff --git a/contribution/index.php b/contribution/index.php
index 78216b9..b1da002 100644
--- a/contribution/index.php
+++ b/contribution/index.php
@@ -148,6 +148,7 @@ GMANE: <a href="http://dir.gmane.org/gmane.comp.documentfoundation.libreoffice.m
<hr>
<li>There is also a <a href="http://lists.freedesktop.org/mailman/listinfo/libreoffice">development mailing list</a> available for those interested
in code contributions. This list is hosted by FreeDesktop.org.</li>
+<li>If you are more comfortable with using forums, you can use our <a href="http://nabble.documentfoundation.org">Nabble gateway</a>.</li>
</ul>
<h3>Local and Regional Mailing Lists</h3>
commit 13a4b5ce16c1cddc79acaaebfa4cd14066ac8c7c
Author: Website Admin <webmaster at documentfoundation.org>
Date: Thu Oct 28 00:18:48 2010 +0200
steering-discuss created
diff --git a/contribution/index.php b/contribution/index.php
index 974d38f..78216b9 100644
--- a/contribution/index.php
+++ b/contribution/index.php
@@ -108,6 +108,12 @@ Digest subscription: <a href="mailto:mirrors+subscribe-digest at documentfoundation
Archives: <a href="http://www.documentfoundation.org/lists/mirrors/">http://www.documentfoundation.org/lists/mirrors/</a><br>
Mail-Archive.com: <a href="http://www.mail-archive.com/mirrors@documentfoundation.org/">http://www.mail-archive.com/mirrors@documentfoundation.org/</a><br>
GMANE: <a href="http://dir.gmane.org/gmane.comp.documentfoundation.mirrors">http://dir.gmane.org/gmane.comp.documentfoundation.mirrors</a></li>
+<li><b>steering-discuss at documentfoundation.org:</b> Discussions of the Steering Committee<br>
+Subscription: <a href="mailto:steering-discuss+subscribe at documentfoundation.org">steering-discuss+subscribe at documentfoundation.org</a><br>
+Digest subscription: <a href="mailto:steering-discuss+subscribe-digest at documentfoundation.org">steering-discuss+subscribe-digest at documentfoundation.org</a><br>
+Archives: <a href="http://www.documentfoundation.org/lists/steering-discuss/">http://www.documentfoundation.org/lists/steering-discuss/</a><br>
+Mail-Archive.com: <a href="http://www.mail-archive.com/steering-discuss@documentfoundation.org/">http://www.mail-archive.com/steering-discuss@documentfoundation.org/</a><br>
+GMANE: pending</li>
<hr>
<li><b>l10n at libreoffice.org:</b> Mailing list for people in charge of LibreOffice localization<br>
Subscription: <a href="mailto:l10n+subscribe at libreoffice.org">l10n+subscribe at libreoffice.org</a><br>
commit fb5c70dc19cfbf4ea1704bf633c1e25d0fdeabf3
Author: Website Admin <webmaster at documentfoundation.org>
Date: Wed Oct 27 13:02:35 2010 +0200
updated floeff's CV
diff --git a/foundation/index.php b/foundation/index.php
index 2fda755..38e95ee 100644
--- a/foundation/index.php
+++ b/foundation/index.php
@@ -162,16 +162,16 @@ $vspacer
<td style="padding-left: 14px">
<b>Florian Effenberger</b>
<p class="roles">
- Former OpenOffice.org Marketing Project Lead and German MarCon, Board of Directors OpenOffice.org Deutschland e.V.
+ Board of Directors OpenOffice.org Deutschland e.V., Former OpenOffice.org Marketing Project Lead and German MarCon
</p><p>
- Florian Effenberger has been an open source evangelist for many years. He is
- lead of the international OpenOffice.org marketing project as well as a member
- of the management board of the non-profit organization OpenOffice.org
- Deutschland e.V. He has ten years of experience in designing computer
- networks in enterprises and educational settings. This includes software
- deployment based on free software. He is also a frequent contributor to a
- variety of professional magazines worldwide on topics such as free software,
- open standards and legal matters.
+ Florian Effenberger has been an open source evangelist for many years.
+ He is founding member and part of the Steering Committee at
+ The Document Foundation. He has previously been active in the OpenOffice.org
+ project for seven years, most recently as Marketing Project Lead.
+ Florian has ten years' experience in designing enterprise and educational
+ computer networks, including software deployment based on free software.
+ He is also a frequent contributor to a variety of professional magazines
+ worldwide on topics such as free software, open standards and legal matters.
</p>
</td>
</tr>
More information about the Libreoffice-commits
mailing list