incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chip Childers <chip.child...@sungard.com>
Subject Re: git commit: refs/heads/master - CLOUDSTACK-1420 - updating publican brand files with text notice of trademarks
Date Wed, 27 Feb 2013 15:20:39 GMT
Should this be cherry picked over to 4.0 and 4.1 branches?  That way,
any releases in-flight will have the updates as well.

On Wed, Feb 27, 2013 at 01:50:33AM +0000, ke4qqq@apache.org wrote:
> Updated Branches:
>   refs/heads/master cf06861c9 -> 3902f505e
> 
> 
> CLOUDSTACK-1420 - updating publican brand files with text notice of trademarks
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3902f505
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3902f505
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3902f505
> 
> Branch: refs/heads/master
> Commit: 3902f505ee8dbf11047687718a7299b31ee7d998
> Parents: cf06861
> Author: David Nalley <david@gnsa.us>
> Authored: Tue Feb 26 20:50:10 2013 -0500
> Committer: David Nalley <david@gnsa.us>
> Committed: Tue Feb 26 20:50:10 2013 -0500
> 
> ----------------------------------------------------------------------
>  docs/publican-cloudstack/defaults.cfg             |    2 +-
>  docs/publican-cloudstack/en-US/Legal_Notice.xml   |    9 +++++++++
>  docs/publican-cloudstack/publican-cloudstack.spec |    6 ++++--
>  tools/apidoc/generateadmincommands.xsl            |    8 ++++++++
>  4 files changed, 22 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3902f505/docs/publican-cloudstack/defaults.cfg
> ----------------------------------------------------------------------
> diff --git a/docs/publican-cloudstack/defaults.cfg b/docs/publican-cloudstack/defaults.cfg
> index 6aebaee..9e27bdd 100644
> --- a/docs/publican-cloudstack/defaults.cfg
> +++ b/docs/publican-cloudstack/defaults.cfg
> @@ -16,6 +16,6 @@
>  # specific language governing permissions and limitations
>  # under the License.
>  
> -doc_url: "http://docs.cloudstack.org"
> +doc_url: "http://incubator.apache.org/cloudstack/docs"
>  prod_url: "http://cloudstack.org"
>  
> 
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3902f505/docs/publican-cloudstack/en-US/Legal_Notice.xml
> ----------------------------------------------------------------------
> diff --git a/docs/publican-cloudstack/en-US/Legal_Notice.xml b/docs/publican-cloudstack/en-US/Legal_Notice.xml
> index 0e4be5b..5e30efb 100644
> --- a/docs/publican-cloudstack/en-US/Legal_Notice.xml
> +++ b/docs/publican-cloudstack/en-US/Legal_Notice.xml
> @@ -53,6 +53,15 @@
>      completeness or stability of the code, it does indicate that the project 
>      has yet to be fully endorsed by the ASF.
>    </para>
> +
> +  <para>
> +    CloudStack?? is a registered trademark of the Apache Software Foundation. 
> +  </para>
> +
> +  <para>
> +    Apache CloudStack, the CloudStack word design, the Apache CloudStack word design,
and the cloud monkey logo are trademarks of the
> +    Apache Software Foundation. 
> +  </para>
>  </legalnotice>
>  
>  
> 
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3902f505/docs/publican-cloudstack/publican-cloudstack.spec
> ----------------------------------------------------------------------
> diff --git a/docs/publican-cloudstack/publican-cloudstack.spec b/docs/publican-cloudstack/publican-cloudstack.spec
> index 1e70765..9ec15d0 100644
> --- a/docs/publican-cloudstack/publican-cloudstack.spec
> +++ b/docs/publican-cloudstack/publican-cloudstack.spec
> @@ -18,7 +18,7 @@
>  
>  Name:		publican-cloudstack
>  Summary:	Common documentation files for Apache %{brand}
> -Version:	0.4
> +Version:	0.5
>  Release:	1%{?dist}
>  License:	ASLv2
>  Group:		Applications/Text
> @@ -49,12 +49,14 @@ rm -rf $RPM_BUILD_ROOT
>  
>  %files
>  %defattr(-,root,root,-)
> -%doc README
>  %doc LICENSE
>  %doc NOTICE
>  %{_datadir}/publican/Common_Content/%{brand}
>  
>  %changelog
> +* Tue Feb 29 2013 David Nalley <david@gnsa.us> 0.5-1
> +- adding trademark information
> +
>  * Sun Sep 22 2012 David Nalley <david@gnsa.us> 0.4-1
>  - added 'Apache' to the description
>  - moved the issue tracker url to the ASF jira instance
> 
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3902f505/tools/apidoc/generateadmincommands.xsl
> ----------------------------------------------------------------------
> diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl
> index 3e9c6c5..a33e7ba 100644
> --- a/tools/apidoc/generateadmincommands.xsl
> +++ b/tools/apidoc/generateadmincommands.xsl
> @@ -138,8 +138,16 @@ version="1.0">
>                    
>       
>              </div>
> +
>          </div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
>  <div id="footer">
> +<div id="comments_thread">
> +    <script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=test"
async="true">
> +    </script>
> +    <noscript>
> +    <iframe width="930" height="500" src="https://comments.apache.org/iframe.lua?site=test&amp;page=4.2.0/rootadmin"></iframe>
> +    </noscript>
> +  </div>
>  
>          	<div id="footer_mainmaster">
>                  <p>Copyright ?? 2012 The Apache Software Foundation, Licensed
under the
> 
> 

Mime
View raw message