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/11 18:33:55 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1699] Update website
publishing instructions
Repository: incubator-trafodion
Updated Branches:
refs/heads/master d95f8ffb3 -> 52afc68e8
[TRAFODION-1699] Update website publishing instructions
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7e5761e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7e5761e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7e5761e6
Branch: refs/heads/master
Commit: 7e5761e6a60c6b02ce43685e78e8d9bb8932ed54
Parents: d61ac8a
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Dec 11 00:34:55 2015 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Dec 11 00:34:55 2015 +0000
----------------------------------------------------------------------
docs/src/site/markdown/website.md | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7e5761e6/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md b/docs/src/site/markdown/website.md
index 6d98b71..eda25d5 100644
--- a/docs/src/site/markdown/website.md
+++ b/docs/src/site/markdown/website.md
@@ -20,7 +20,7 @@ This page describes how to change the Trafodion web pages. Please refer to the [
**Publication:** https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
-You develop and test all changes in the Trafodion source tree. Once checked in and built, the content of ```docs/target``` plus different [documentation](document.html) are copied to https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git. The changes are then pushed out by Apache [svnpubsub](http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/), thereby populating http://incubator.trafodion.apache.org.
+You develop and test all changes in the Trafodion source tree. Once checked in and built, the content of ```docs/target``` plus different [documentation](document.html) are copied to https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git. The changes are then pushed out by Apache gitpubsub, thereby populating http://incubator.trafodion.apache.org.
# Making Changes
The following information helps you understand how to make changes to the web-site content.
@@ -78,11 +78,12 @@ The website files are located in **```docs/target```**. Open **```index.html```*
Do the following:
-1. Check in your changes to the Trafodion source tree.
-2. Build Trafodion.
+1. Wait for the changes to be committed to the Trafodion master branch.
+2. Build Trafodion site (mvn site).
3. If there are documentation changes: Follow the [documentation publishing](document.html#Publishing) instructions.
-3. ```svn checkout``` https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
-4. Copy content of ```docs/target``` into the svn ```asf-site``` directory.
-5. ```svn commit``` the changes.
+3. ```git clone``` https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
+4. Copy content of ```docs/target``` into the incubator-trafodion-site directory. Commit changes.
+5. Push them back to the apache origin repo to the ```asf-site``` branch.
-Once committed, Apache [svnpubsub](http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/) takes care of populating http://incubator.trafodion.apache.org with your new changes.
+Once pushed, Apache gitpubsub takes care of populating http://incubator.trafodion.apache.org with your new changes.
+If they don't show up, pushing another empty (or whitespace change) commit may work to trigger the automation.
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1699] PR 222
Update website publishing instructions
Posted by db...@apache.org.
Merge [TRAFODION-1699] PR 222 Update website publishing instructions
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/52afc68e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/52afc68e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/52afc68e
Branch: refs/heads/master
Commit: 52afc68e8e15d844447ddaf37869db67e659c481
Parents: d95f8ff 7e5761e
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Dec 11 17:33:04 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Dec 11 17:33:04 2015 +0000
----------------------------------------------------------------------
docs/src/site/markdown/website.md | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------