cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [1/2] git commit: refs/heads/4.0 - CLOUDSTACK-1420 - deal with trademark-ifying
Date Fri, 01 Mar 2013 18:31:06 GMT
CLOUDSTACK-1420 - deal with trademark-ifying


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/904f677a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/904f677a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/904f677a

Branch: refs/heads/4.0
Commit: 904f677ab1521fe43e5499d3ee2f8da99f5d7f2d
Parents: 97925a5
Author: David Nalley <david@gnsa.us>
Authored: Tue Feb 26 20:50:10 2013 -0500
Committer: David Nalley <david@gnsa.us>
Committed: Fri Mar 1 13:27:03 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            |  164 ++++++++++++++++
 4 files changed, 178 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/904f677a/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/904f677a/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/904f677a/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/904f677a/tools/apidoc/generateadmincommands.xsl
----------------------------------------------------------------------
diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl
new file mode 100644
index 0000000..a33e7ba
--- /dev/null
+++ b/tools/apidoc/generateadmincommands.xsl
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+version="1.0">
+<xsl:output method="html" doctype-public="-//W3C//DTD HTML 1.0 Transitional//EN"/>
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel= "stylesheet" href="../includes/main.css" type="text/css" />
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+	<div class="uppermenu_panel">
+            <div class="uppermenu_box">       
+</div>
+        </div>
+        
+        <div id="main_master">
+            <div id="inside_header">
+
+                <div class="header_top">
+                    <a class="cloud_logo" href="http://cloudstack.org"></a>
+                    <div class="mainemenu_panel">
+                        
+                    </div>
+                </div>            
+            </div>
+
+            <div id="main_content">
+             	
+                <div class="inside_apileftpanel">
+                	<div class="inside_contentpanel" style="width:930px;">
+                    	<div class="api_titlebox">
+                        	<div class="api_titlebox_left">
+				<xsl:for-each select="command/command">
+                           		<!-- Modify this line for the release version -->
+                           		<span>
+									Apache CloudStack v4.2.0 Root Admin API Reference
+								</span>
+								<p></p>
+                                <h1><xsl:value-of select="name"/></h1>
+                                <p><xsl:value-of select="description"/></p>
+				</xsl:for-each>
+                            </div>
+
+                            
+                            <div class="api_titlebox_right">
+                            	<a class="api_backbutton" href="../TOC_Root_Admin.html"></a>
+                            </div>
+                        </div>
+                    	<div class="api_tablepanel">     
+                         	<h2>Request parameters</h2>
+                        	<table class="apitable">
+                            	<tr class="hed">
+                                	<td style="width:200px;"><strong>Parameter Name</strong></td>
+
+                                    <td style="width:500px;">Description</td>
+                                    <td style="width:180px;">Required</td>
+                                </tr>
+				<xsl:for-each select="command/command/request/arg">
+                                <tr>
+				    <xsl:if test="required='true'">
+                                    <td style="width:200px;"><strong><xsl:value-of
select="name"/></strong></td>
+				    <td style="width:500px;"><strong><xsl:value-of select="description"/></strong></td>
+                                    <td style="width:180px;"><strong><xsl:value-of
select="required"/></strong></td>
+				    </xsl:if>
+				    <xsl:if test="required='false'">
+                			<td style="width:200px;"><i><xsl:value-of select="name"/></i></td>
+                                    <td style="width:500px;"><i><xsl:value-of
select="description"/></i></td>
+                                    <td style="width:180px;"><i><xsl:value-of
select="required"/></i></td>
+				    </xsl:if>
+                                </tr>
+				</xsl:for-each>
+                            </table>
+                        </div>
+                         
+                         
+                         <div class="api_tablepanel">     
+                         	<h2>Response Tags</h2>
+                        	<table class="apitable">
+                            	<tr class="hed">
+                                	<td style="width:200px;"><strong>Response Name</strong></td>
+                                    <td style="width:500px;">Description</td>
+                                </tr>
+                                
+				<xsl:for-each select="command/command/response/arg">
+                                <tr>
+					<td style="width:200px;"><strong><xsl:value-of select="name"/></strong></td>
+                                    <td style="width:500px;"><xsl:value-of select="description"/></td>
+					<xsl:for-each select="./arguments/arg">
+					<tr>
+					<td style="width:180px; padding-left:25px;"><strong><xsl:value-of select="name"/></strong></td>
+                                    	<td style="width:500px;"><xsl:value-of select="description"/></td>
+					</tr>
+						<xsl:for-each select="./arguments/arg">
+						<tr>
+						<td style="width:165px; padding-left:40px;"><xsl:value-of select="name"/></td>
+		                            	<td style="width:500px;"><xsl:value-of select="description"/></td>
+						</tr>
+					</xsl:for-each>					
+					</xsl:for-each>					
+                                </tr>
+				</xsl:for-each>
+                                
+                         
+                                
+                              
+                            
+                            </table>
+
+                        </div>
+                        
+                        
+                </div> 
+                </div>
+                  
+     
+            </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
+                   <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
Version 2.0.</a> <br />
+                Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.</p>
+            </div>
+        </div>
+  </div>
+ </div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
+


Mime
View raw message