diff options
Diffstat (limited to 'readlicense_oo')
| -rwxr-xr-x | readlicense_oo/docs/readme/makefile.mk | 6 | ||||
| -rwxr-xr-x | readlicense_oo/docs/readme/readme.xrm | 14 | ||||
| -rw-r--r-- | readlicense_oo/html/makefile.mk | 6 | ||||
| -rwxr-xr-x | readlicense_oo/util/makefile.pmk | 4 |
4 files changed, 6 insertions, 24 deletions
diff --git a/readlicense_oo/docs/readme/makefile.mk b/readlicense_oo/docs/readme/makefile.mk index d55f1cbdc108..efe349d4ba6b 100755 --- a/readlicense_oo/docs/readme/makefile.mk +++ b/readlicense_oo/docs/readme/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm index 60c1267482e4..2a8a409b4eff 100755 --- a/readlicense_oo/docs/readme/readme.xrm +++ b/readlicense_oo/docs/readme/readme.xrm @@ -165,23 +165,15 @@ </Section> <Paragraph id="BDB2"> - <Text 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}. - </Text> + <Text 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}.</Text> </Paragraph> <Paragraph id="BDB3"> - <Text 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. - </Text> + <Text 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.</Text> </Paragraph> <Paragraph id="BDB4"> - <Text id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user - data directory {user data}/uno_packages, for example ~/.openoffice.org/3/user/uno_packages, and reinstall all extensions. - </Text> + <Text id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user data directory {user data}/uno_packages, for example ~/.openoffice.org/3/user/uno_packages, and reinstall all extensions.</Text> </Paragraph> diff --git a/readlicense_oo/html/makefile.mk b/readlicense_oo/html/makefile.mk index 795f912514aa..332d23dec8ab 100644 --- a/readlicense_oo/html/makefile.mk +++ b/readlicense_oo/html/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk index 1b2e1de5130f..88974113e612 100755 --- a/readlicense_oo/util/makefile.pmk +++ b/readlicense_oo/util/makefile.pmk @@ -2,12 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |