Merge pull request #39 from oskopek/openshift-merge

Openshift Merge

.openshift/README.md

@@ -0,0 +1,3 @@
+For information about .openshift directory, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory

.openshift/action_hooks/README.md

@@ -1,3 +1,3 @@
-For information about action hooks supported by OpenShift, consult the documentation:
+For information about action hooks, consult the documentation:
 
-https://github.com/openshift/origin-server/tree/master/node/README.writing_applications.md#action-hooks
+http://openshift.github.io/documentation/oo_user_guide.html#action-hooks

.openshift/config/modules/README

@@ -15,4 +15,4 @@ Unless one of the above scenarios is required there is no need to modify the
 modules directory.
 
 NOTE: Replacing default modules as in scenario 1 can cause conflicts between modules so
-should be done with caution and adequate testing.
+should be done with caution and adequate testing.

.openshift/cron/README.cron

@@ -20,4 +20,8 @@ and cron.allow and are described in detail at:
 See: man crontab or above link for more details and see the the weekly/
      directory for an example.
 
-PLEASE NOTE: The Cron cartridge must be installed in order to run the configured jobs.
+PLEASE NOTE: The Cron cartridge must be installed in order to run the configured jobs.
+
+For more information about cron, consult the documentation:
+http://openshift.github.io/documentation/oo_cartridge_guide.html#cron
+http://openshift.github.io/documentation/oo_user_guide.html#cron

.openshift/cron/weekly/README

@@ -12,4 +12,4 @@ executed on a weekly basis (due to white-listing it in jobs.allow). And the
 README and chrono.dat file are ignored either as a result of being black-listed
 in jobs.deny or because they are NOT white-listed in the jobs.allow file.
 
-For more details, please see ../README.cron file.
+For more details, please see ../README.cron file.

.openshift/cron/weekly/chrono.dat

@@ -1 +1 @@
-Time And Relative D...n In Execution (Open)Shift!
+Time And Relative D...n In Execution (Open)Shift!

.openshift/cron/weekly/chronograph

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo "$(date): $(cat $(dirname \"$0\")/chrono.dat)"
+echo "$(date): $(cat $(dirname \"$0\")/chrono.dat)"

.openshift/cron/weekly/jobs.allow

@@ -2,10 +2,10 @@
 #  Script or job files listed in here (one entry per line) will be
 #  executed on a weekly-basis.
 #
-#  Example: The chronograph script will be executed weekly but the README
+#  Example: The chronograph script will be executed weekly but the README 
 #           and chrono.dat files in this directory will be ignored.
 #
 #           The README file is actually ignored due to the entry in the
 #           jobs.deny which is checked before jobs.allow (this file).
 #
-chronograph
+chronograph

.openshift/cron/weekly/jobs.deny

@@ -3,4 +3,4 @@
 #  executed (read as ignored by run-parts).
 #
 
-README
+README

.openshift/markers/README.md

@@ -0,0 +1,3 @@
+For information about markers, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#markers