[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs

Andrea Pescetti pescetti at apache.org
Sun May 19 11:07:14 PDT 2013


 readlicense_oo/docs/readme/readme.xrm |   39 ++++++++++++----------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

New commits:
commit 3fd31812d4ce3e50566da1aa9ac6813fcfc87b9d
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Sun May 19 16:13:12 2013 +0000

    Update the English README file as per i#122300, proofreading still needed.

diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index 0ce60b7..4616b793 100644
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -39,13 +39,13 @@
 			<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
 			<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p>
 			<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
-			<p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
+			<p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} community site with helpful information at <a href="http://openoffice.apache.org">http://openoffice.apache.org</a></p>
 			<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the Apache OpenOffice project.</p>
 			<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
 			<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p>
 			<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
 			<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
-			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
+			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> for details on contributing time and <a href="http://www.apache.org/foundation/contributing.html">http://www.apache.org/foundation/contributing.html</a> for details on donations. Everyone has a contribution to make.</p>
 		</div>
 
 		<div id="Installation">
@@ -78,11 +78,11 @@
 			<div class="WIN" id="SystemRequirements_WIN">
 				<ul>
 					<li>
-						<p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7</p>
+						<p id="s2s3sdf2" xml:lang="en-US">Microsoft Windows XP, Vista, Windows 7 or Windows 8</p>
 					</li>
 
 					<li>
-						<p id="utzu6" xml:lang="en-US">Pentium compatible PC (Pentium III or Athlon recommended)</p>
+						<p id="utzu6" xml:lang="en-US">Pentium III or later processor</p>
 					</li>
 
 					<li>
@@ -108,7 +108,7 @@
 						<p id="MSOReg3" xml:lang="en-US"><tt>/msoreg=0</tt> will suppress registration of ${PRODUCTNAME} as default application for Microsoft Office formats.</p>
 					</li>
 				</ul>
-				<p id="DLLA1" xml:lang="en-US">If you perform an administrative installation using setup /a, you need to make sure that the file msvc90.dll is installed on the system. This file is required for ${PRODUCTNAME} to start after an administrative installation. You can get the file from <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF">http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF</a></p>
+				<p id="DLLA1" xml:lang="en-US">If you perform an administrative installation using setup /a, you need to make sure that the file msvcr100.dll is installed on the system. This file is required for ${PRODUCTNAME} to start after an administrative installation. You can get the file from <a href="http://www.microsoft.com/en-us/download/details.aspx?id=5555">http://www.microsoft.com/en-us/download/details.aspx?id=5555</a></p>
 				<p class="note" id="AdminNeeded" xml:lang="en-US">Please be aware that administrator rights are needed for the installation process.</p>
 			</div>
 			<div class="SOLSPARC" id="Sols2">
@@ -180,7 +180,7 @@
 					</li>
 
 					<li>
-						<p id="s2etfseg" xml:lang="en-US">Pentium compatible PC (Pentium III or Athlon recommended)</p>
+						<p id="s2etfseg" xml:lang="en-US">Pentium III or later processor</p>
 					</li>
 
 					<li>
@@ -209,13 +209,6 @@
 			<p id="Precautions" xml:lang="en-US">Please make sure you have enough free memory in the temporary directory on your system and that read, write and run access rights have been granted. Close all other programs before starting the installation.</p>
 		</div>
 
-		<div id="BerkeleyDB">
-			<h2 id="BDB11" xml:lang="en-US">Extension Database Incompatibility</h2>
-			<p id="BDB2a" xml:lang="en-US">The Berkeley database engine has been upgraded in this version of ${PRODUCTNAME}. The database engine upgrade introduces an incompatibility with user data for installed extensions for ${PRODUCTNAME} versions prior to 3.2 that may require your action if you downgrade your version of ${PRODUCTNAME}.</p>
-			<p id="BDB3a" xml:lang="en-US">This version of ${PRODUCTNAME} will convert your extension database to the new Berkeley database format when extensions are installed or removed. After this conversion, the database can no longer be read by earlier versions of ${PRODUCTNAME}. Downgrading to an earlier version may result in a dysfunctional installation.</p>
-			<p id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user data directory <tt>{user data}/uno_packages</tt>, for example <tt>~/.openoffice.org/3/user/uno_packages</tt>, and reinstall all extensions.</p>
-		</div>
-
 		<div class="LINUX WIN" id="StartupProblems">
 			<h2 id="naso01" xml:lang="en-US">Problems During Program Startup</h2>
 			<div class="LINUX" id="GnomeStartupProblems">
@@ -266,13 +259,13 @@
 
 		<div id="UserSupport">
 			<h2 id="support" xml:lang="en-US">User Support</h2>
-			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users at openoffice.apache.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users at openoffice.apache.org">users at openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
-			<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p>
+			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://forum.openoffice.org">http://forum.openoffice.org</a> or search the archives of the 'users at openoffice.apache.org' mailing list at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a>. Alternatively, you can send in your questions to <a href="mailto:users at openoffice.apache.org">users at openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a>.</p>
+			<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.openoffice.org/wiki/Documentation/FAQ">http://wiki.openoffice.org/wiki/Documentation/FAQ</a>.</p>
 		</div>
 
 		<div id="ReportBugsIssues">
 			<h2 id="reportbugs" xml:lang="en-US">Reporting Bugs & Issues</h2>
-			<p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts IssueZilla, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
+			<p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts <a href="https://issues.apache.org/ooo/">BugZilla</a>, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
 		</div>
 
 		<div id="GettingInvolved">
@@ -280,30 +273,26 @@
 			<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p>
 			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the user page at <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a></p>
 			<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
-			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://development.openoffice.org/todo.html">http://development.openoffice.org/todo.html</a>.</p>
+			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in.</p>
 			<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
 			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists to which you can subscribe at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a></p>
 			<ul>
 				<li>
-					<p id="subscribelist1" xml:lang="en-US">News: ooo-announce at incubator.apache.org *recommended to all users* (light traffic)</p>
-				</li>
-
-				<li>
-					<p id="subscribelist2" xml:lang="en-US">Main user forum: ooo-users at incubator.apache.org *easy way to lurk on discussions* (heavy traffic)</p>
+					<p id="subscribelist1" xml:lang="en-US">News: announce at openoffice.apache.org *recommended to all users* (light traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist3" xml:lang="en-US">Marketing project: ooo-marketing at incubator.apache.org *beyond development* (getting heavy)</p>
+					<p id="subscribelist2" xml:lang="en-US">Main user forum: users at openoffice.apache.org *easy way to lurk on discussions* (heavy traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist4" xml:lang="en-US">General code contributor list: ooo-dev at incubator.apache.org (moderate/heavy)</p>
+					<p id="subscribelist4" xml:lang="en-US">General project development and discussion list: dev at openoffice.apache.org (heavy traffic)</p>
 				</li>
 			</ul>
 			<h3 xml:lang="en-US">Joining the Project</h3>
 			<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
 			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
-			<p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing at incubator.apache.org or visit the Marketing Communications & Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
+			<p id="joining3" xml:lang="en-US">You can help by joining the marketing mailing list marketing at openoffice.apache.org where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
 		</div>
 
 		<div id="Credits">


More information about the Libreoffice-commits mailing list