You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/12/15 17:26:39 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1699] Commented out
one of the carousel pictures until there's a better version. Also changed
Apache>Status Page to Apache>Project Status.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 7a21d3956 -> 063694c5d
[TRAFODION-1699] Commented out one of the carousel pictures until there's
a better version. Also changed Apache>Status Page to Apache>Project
Status.
jenkins, skip step
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6cab930c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6cab930c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6cab930c
Branch: refs/heads/master
Commit: 6cab930c1e5167c06909f5f9f6d4c1975e68fe84
Parents: 52afc68
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Mon Dec 14 22:46:36 2015 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Mon Dec 14 22:46:36 2015 -0700
----------------------------------------------------------------------
docs/src/site/markdown/index.md | 3 ++-
docs/src/site/markdown/website.md | 19 +++++++++++++++++++
docs/src/site/site.xml | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cab930c/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index 973fea7..5a92fc6 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -11,12 +11,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!-- Need a better picture, removed for now
#### [Next Hadoop Wave][revolution]
[][revolution]
Trafodion brings enterprise-class operational workloads to Hadoop! You can now run all of your data workloads on a single platform based on Hadoop.
-
+-->
#### [Hadoop-Scale with SQL Access][scale]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cab930c/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md b/docs/src/site/markdown/website.md
index eda25d5..ba60ef4 100644
--- a/docs/src/site/markdown/website.md
+++ b/docs/src/site/markdown/website.md
@@ -68,6 +68,25 @@ Typically, you'll use Eclipse to develop and build the website pages. The config
The website files are located in **```docs/target```**. Open **```index.html```** from your browser and test your changes. For example, you want to validate the page layout, page navigation, links, and review the overall content on the pages you modified or added/deleted.
+## Tables
+markdown supports a simple format for tables. You can use markdown-style writing in such tables.
+
+ Table Header | Table Header
+ ---------------|---------------
+ Text | Text
+ Text | Text
+
+However, no special formatting can be done; for example, creating a bulleted list in a cell. If you need tables with such formatting, then you will need to define the table in raw HTML format. No markdown-style writing is supported for HTML tables; use pure HTML tagging instead.
+
+## Callout Boxes
+You can create a simple callout box using an HTML table. Example:
+
+ <table><tr><td><strong>NOTE</strong><br />Whatever you want to say here.</td></tr></table>
+
+Generates:
+
+<table><tr><td><strong>NOTE</strong><br />Whatever you want to say here.</td></tr></table>
+
----
# Publishing
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cab930c/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index f09afee..24d5632 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -318,7 +318,7 @@
<!-- item href="design-papers.html" name="Design Paper Template"/ -->
</menu>
<menu name="Apache">
- <item href="http://incubator.apache.org/projects/trafodion.html" name="Status Page" target="_blank"/>
+ <item href="http://incubator.apache.org/projects/trafodion.html" name="Project Status" target="_blank"/>
<item href="http://www.apache.org/foundation/how-it-works.html" name="Apache Foundation" target="_blank"/>
<item href="http://www.apache.org/licenses/" name="Apache License" target="_blank"/>
<item href="http://www.apache.org/security/" name="Apache Security" target="_blank"/>
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1699] PR 226
Commented out carousel pictures for now
Posted by db...@apache.org.
Merge [TRAFODION-1699] PR 226 Commented out carousel pictures for now
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/063694c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/063694c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/063694c5
Branch: refs/heads/master
Commit: 063694c5d71a1dbbfc879841a4c1caa21820120f
Parents: 7a21d39 6cab930
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Dec 15 16:25:46 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Dec 15 16:25:46 2015 +0000
----------------------------------------------------------------------
docs/src/site/markdown/index.md | 3 ++-
docs/src/site/markdown/website.md | 19 +++++++++++++++++++
docs/src/site/site.xml | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/063694c5/docs/src/site/site.xml
----------------------------------------------------------------------