You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Dave Fisher <da...@comcast.net> on 2011/12/13 03:02:04 UTC
Re: svn commit: r1213538 - in /incubator/ooo/ooo-site/trunk: content/license.html templates/skeleton.html
Following Dennis's suggestion I added a link to "/license.html" to the footer in the skeleton.html and updated the license text.
Those interest please feel free to discuss and make necessary changes to license.html.
(Now to see if the build needs "nudging")
Regards,
Dave
On Dec 12, 2011, at 5:58 PM, wave@apache.org wrote:
> Author: wave
> Date: Tue Dec 13 01:58:43 2011
> New Revision: 1213538
>
> URL: http://svn.apache.org/viewvc?rev=1213538&view=rev
> Log:
> Footer changes and provisional update to /license.html
>
> Modified:
> incubator/ooo/ooo-site/trunk/content/license.html
> incubator/ooo/ooo-site/trunk/templates/skeleton.html
>
> Modified: incubator/ooo/ooo-site/trunk/content/license.html
> URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/license.html?rev=1213538&r1=1213537&r2=1213538&view=diff
> ==============================================================================
> --- incubator/ooo/ooo-site/trunk/content/license.html (original)
> +++ incubator/ooo/ooo-site/trunk/content/license.html Tue Dec 13 01:58:43 2011
> @@ -7,7 +7,17 @@
>
> <body>
>
> -<h2>Licenses</h2>
> +<h2>Licenses & Copyrights of www.openoffice.org at the Apache Software Foundation</h2>
> +
> +<p>Portions of OpenOffice.org are Copyright 1999, 2010 by contributing authors and Oracle and/or its affiliates.</p>
> +
> +<p>Sections or single pages are covered by certain licenses. If a license notice is displayed, you may use the content of that page according to that license.</p>
> +
> +<p>In all other cases, the page is licensed under the Apache License, Version 2.0 <a href="http://www.apache.org/licenses/LICENSE-2.0.html">(ALv2)</a>.</p>
> +
> +
> +
> +<h2>Licenses of current Releases of the OpenOffice.org Suite</h2>
>
> <p>OpenOffice.org uses a single open-source license for the source code and a separate documentation license for most documents published on the website
> without the intention of being included in the product. The source-code license is the GNU Lesser General Public License. Effective OpenOffice.org 3.0
>
> Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
> URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1213538&r1=1213537&r2=1213538&view=diff
> ==============================================================================
> --- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
> +++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Tue Dec 13 01:58:43 2011
> @@ -32,7 +32,7 @@
>
> <div id="footera">
> <div id="poweredbya">
> - <p><img src="/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
> + <p><img src="/images/feather-small.gif"/></p>
> </div>
> <div id="copyrighta">
> <p>
> @@ -42,11 +42,10 @@
> not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
> yet to be fully endorsed by the ASF.</p>
> <p>
> - <a href="/contact.html">Contact Us</a> |
> - <a href="/terms.html">Terms of Use</a>
> + <a href="/license.html">Copyright & License</a>
> <br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
> - <br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
> - <br />Other names appearing on the site may be trademarks of their respective owners.
> + OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
> + Other names appearing on the site may be trademarks of their respective owners.
> </p>
> </div>
> </div>
>
>
Re: svn commit: r1213538 - in /incubator/ooo/ooo-site/trunk: content/license.html templates/skeleton.html
Posted by Dave Fisher <da...@comcast.net>.
The buildbot is busy.
You can watch here: http://ci.apache.org/builders/ooo-site-site-staging/builds/171
Regards,
Dave
On Dec 12, 2011, at 6:02 PM, Dave Fisher wrote:
> Following Dennis's suggestion I added a link to "/license.html" to the footer in the skeleton.html and updated the license text.
>
> Those interest please feel free to discuss and make necessary changes to license.html.
>
> (Now to see if the build needs "nudging")
>
> Regards,
> Dave
>
> On Dec 12, 2011, at 5:58 PM, wave@apache.org wrote:
>
>> Author: wave
>> Date: Tue Dec 13 01:58:43 2011
>> New Revision: 1213538
>>
>> URL: http://svn.apache.org/viewvc?rev=1213538&view=rev
>> Log:
>> Footer changes and provisional update to /license.html
>>
>> Modified:
>> incubator/ooo/ooo-site/trunk/content/license.html
>> incubator/ooo/ooo-site/trunk/templates/skeleton.html
>>
>> Modified: incubator/ooo/ooo-site/trunk/content/license.html
>> URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/license.html?rev=1213538&r1=1213537&r2=1213538&view=diff
>> ==============================================================================
>> --- incubator/ooo/ooo-site/trunk/content/license.html (original)
>> +++ incubator/ooo/ooo-site/trunk/content/license.html Tue Dec 13 01:58:43 2011
>> @@ -7,7 +7,17 @@
>>
>> <body>
>>
>> -<h2>Licenses</h2>
>> +<h2>Licenses & Copyrights of www.openoffice.org at the Apache Software Foundation</h2>
>> +
>> +<p>Portions of OpenOffice.org are Copyright 1999, 2010 by contributing authors and Oracle and/or its affiliates.</p>
>> +
>> +<p>Sections or single pages are covered by certain licenses. If a license notice is displayed, you may use the content of that page according to that license.</p>
>> +
>> +<p>In all other cases, the page is licensed under the Apache License, Version 2.0 <a href="http://www.apache.org/licenses/LICENSE-2.0.html">(ALv2)</a>.</p>
>> +
>> +
>> +
>> +<h2>Licenses of current Releases of the OpenOffice.org Suite</h2>
>>
>> <p>OpenOffice.org uses a single open-source license for the source code and a separate documentation license for most documents published on the website
>> without the intention of being included in the product. The source-code license is the GNU Lesser General Public License. Effective OpenOffice.org 3.0
>>
>> Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
>> URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1213538&r1=1213537&r2=1213538&view=diff
>> ==============================================================================
>> --- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
>> +++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Tue Dec 13 01:58:43 2011
>> @@ -32,7 +32,7 @@
>>
>> <div id="footera">
>> <div id="poweredbya">
>> - <p><img src="/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
>> + <p><img src="/images/feather-small.gif"/></p>
>> </div>
>> <div id="copyrighta">
>> <p>
>> @@ -42,11 +42,10 @@
>> not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
>> yet to be fully endorsed by the ASF.</p>
>> <p>
>> - <a href="/contact.html">Contact Us</a> |
>> - <a href="/terms.html">Terms of Use</a>
>> + <a href="/license.html">Copyright & License</a>
>> <br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
>> - <br />OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
>> - <br />Other names appearing on the site may be trademarks of their respective owners.
>> + OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
>> + Other names appearing on the site may be trademarks of their respective owners.
>> </p>
>> </div>
>> </div>
>>
>>
>