You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2016/07/06 22:45:37 UTC

[1/2] incubator-trafodion git commit: Modified website

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 1c2fec4ec -> 67c16776f


Modified website

- Updated branding per recommendations from a discussion in the general
  list.
- Updated news section for 2.0.1 release.
- Updated revisions for 2.0.1 release.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0553eee1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0553eee1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0553eee1

Branch: refs/heads/master
Commit: 0553eee1832ec3f83c3c0d0febf9f75de0e5fe6f
Parents: 160ac1c
Author: Gunnar Tapper <ta...@gmail.com>
Authored: Wed Jul 6 12:43:26 2016 -0600
Committer: Gunnar Tapper <ta...@gmail.com>
Committed: Wed Jul 6 12:43:26 2016 -0600

----------------------------------------------------------------------
 docs/shared/license.txt              |  5 +++++
 docs/shared/revisions.txt            |  4 ++--
 docs/src/site/markdown/index.md      |  8 +++++---
 docs/src/site/resources/css/site.css |  1 +
 docs/src/site/site.xml               | 12 ++++--------
 5 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0553eee1/docs/shared/license.txt
----------------------------------------------------------------------
diff --git a/docs/shared/license.txt b/docs/shared/license.txt
index 3dd96d1..5808b25 100644
--- a/docs/shared/license.txt
+++ b/docs/shared/license.txt
@@ -9,3 +9,8 @@ Unless required by applicable law or agreed to in writing, software distributed
 "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.
 
+*Disclaimer:* _Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by 
+the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that 
+the infrastructure, communications, and decision making process have stabilized in a manner consistent with other 
+successful ASF projects. While incubation status is 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._

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0553eee1/docs/shared/revisions.txt
----------------------------------------------------------------------
diff --git a/docs/shared/revisions.txt b/docs/shared/revisions.txt
index 2dd93b5..6afa98d 100644
--- a/docs/shared/revisions.txt
+++ b/docs/shared/revisions.txt
@@ -26,8 +26,8 @@
 [cols="2",options="header"]
 |===
 | Version    | Date
-| 2.0.1      | To be announced
-| 2.0.0      | June, 6, 2016
+| 2.0.1      | July 7, 2016
+| 2.0.0      | June 6, 2016
 | 1.3.0      | January, 2016  
 |===
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0553eee1/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index 68b55a4..6aaa287 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -43,12 +43,12 @@ Trafodion provides SQL access to structured, semi-structured, and unstructured d
 
 
 <table><tr><td>
-  <p><h5>The Apache Trafodion team is happy to announce the first Apache release &#8212; version 1.3.0-incubating!</h5></p>
+  <p><h5>The Apache Trafodion team is happy to announce the third Apache release &#8212; version 2.0.1-incubating!</h5></p>
   <p><strong>How to get started with Apache Trafodion:</strong>
      <ul>
        <li><a href="http://trafodion.incubator.apache.org/documentation.html">Release Documentation</a></li>
-       <li><a href="http://trafodion.incubator.apache.org/release-notes-1-3-0.html">Release Notes</a></li>
-       <li><a href="https://trafodion.incubator.apache.org/download.html">Download</a></li>
+       <li><a href="http://trafodion.incubator.apache.org/release-notes-2-0-1.html">Release Notes</a></li>
+       <li><a href="http://trafodion.incubator.apache.org/download.html">Download</a></li>
        <li><a href="https://github.com/apache/incubator-trafodion">git Site</a></li>
        <li><a href="http://trafodion.incubator.apache.org/contributing-redirect.html">Build Instructions</a></li>
      </ul>
@@ -83,6 +83,8 @@ The name &quot;Trafodion&quot; (the Welsh word for transactions, pronounced &quo
 
 Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data applications to run on Hadoop. 
 
+<em>Disclaimer: Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is 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.</em>
+
 ---
 
 ## Key Features

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0553eee1/docs/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/css/site.css b/docs/src/site/resources/css/site.css
index c57a29b..c21f821 100644
--- a/docs/src/site/resources/css/site.css
+++ b/docs/src/site/resources/css/site.css
@@ -36,6 +36,7 @@
 
 .logo-right {
     position: absolute;
+    top: 20%;
     right: 150px;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0553eee1/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 50071d1..e06a9b2 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -35,7 +35,7 @@
     <!-- Apache Trafodion, but with "Trafodion" highlighted -->
     <name>
        <![CDATA[
-       <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383"><span class="logo-right"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></span>
+       <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383"> <a href="http://incubator.apache.org" target="_blank"><span class="logo-right"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></span></a>
        ]]>
     </name>
     <href>index.html</href>
@@ -57,7 +57,7 @@
       <brand>
         <!-- Brand text in top-left part of the site -->
         <name>
-          <![CDATA[<span class="brand-apache">Apache</span> <span class="brand-trafodion">Trafodion</span> <span class="brand-apache">(incubating)</span> ]]>
+          <![CDATA[<span class="brand-apache">Apache </span><span class="brand-trafodion">Trafodion</span> <span class="brand-apache">(incubating)</span> ]]>
         </name>
         <href>index.html</href>
       </brand>
@@ -259,14 +259,10 @@
     <footer>
       <hr />
       <div class="row span16">
-        <span>Disclaimer: Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
-        Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making 
-        process have stabilized in a manner consistent with other successful ASF projects. While incubation status is 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.</span><br /><br />
         <span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, the Apache Maven project logo and the Apache Incubator project logo 
-        are trademarks of The Apache Software Foundation.</span><br /><br />
+        are trademarks of the Apache Software Foundation.</span><br /><br />
         <span>
-          <a href="http://incubator.apache.org/" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></a>
+          <a href="http://incubator.apache.org" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></a>
         </span>
       </div>
     </footer>


[2/2] incubator-trafodion git commit: Merge pull #579 Modified website

Posted by rm...@apache.org.
Merge pull #579 Modified website


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/67c16776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/67c16776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/67c16776

Branch: refs/heads/master
Commit: 67c16776fbd8af619a1d8f6bf8c857dddaf82e2c
Parents: 1c2fec4 0553eee
Author: Roberta Marton <ro...@apache.org>
Authored: Wed Jul 6 22:45:09 2016 +0000
Committer: Roberta Marton <ro...@apache.org>
Committed: Wed Jul 6 22:45:09 2016 +0000

----------------------------------------------------------------------
 docs/shared/license.txt              |  5 +++++
 docs/shared/revisions.txt            |  4 ++--
 docs/src/site/markdown/index.md      |  8 +++++---
 docs/src/site/resources/css/site.css |  1 +
 docs/src/site/site.xml               | 12 ++++--------
 5 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------