Remove 'incubat(ing, ion, or) designation and disclaimer (#307)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e009e84..93c3110 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,7 +55,7 @@
### Discussion
Please use the project's developer email list to engage our community:
-[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org)
+[dev@openwhisk.apache.org](dev@openwhisk.apache.org)
In addition, we provide a "dev" Slack team channel for conversations at:
https://openwhisk-team.slack.com/messages/dev/
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index 5ade662..0000000
--- a/DISCLAIMER.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache OpenWhisk Catalog is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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.
diff --git a/README.md b/README.md
index d241457..ca5e2ec 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
# Openwhisk Catalog
-[](https://travis-ci.org/apache/incubator-openwhisk-catalog)
+[](https://travis-ci.org/apache/openwhisk-catalog)
[](http://www.apache.org/licenses/LICENSE-2.0)
This openwhisk-catalog maintains the package catalogs of openwhisk. In OpenWhisk, the catalog
@@ -51,6 +51,8 @@
## Existing packages in catalog
+For more details about how to use packages in the catalog, you can go to the README.md under each package subfolder.
+
| Package | Description |
| --- | --- |
| [/whisk.system/github](./packages/github/README.md) | offers a convenient way to use the [GitHub APIs](https://developer.github.com/). |
@@ -67,13 +69,6 @@
| [/whisk.system/utils](./packages/utils/README.md) | offers utilities actions such as cat, echo, and etc. |
-->
-## How to create packages
+## How to create top-level packages
-If you want to create your own packages, [openwhisk-package-template](https://github.com/openwhisk/openwhisk-package-template)
-is a good package creation template to help you build, test and integrate new packages.
-
-For more details about how to use these packages, you can go to the README.md under each package folder.
-
-## Disclaimer
-
-Apache OpenWhisk Catalog is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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.
+If your package is more involved you may want to create your own top-level packages repository using the [openwhisk-package-template](https://github.com/openwhisk/openwhisk-package-template). It will provide a good example on what a good template template should include (i.e., sufficient help build, test and integrate into OpenWhisk).
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index fac9299..24daec3 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -23,7 +23,7 @@
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../.."
WHISKDIR="$ROOTDIR/../openwhisk"
-UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
+UTILDIR="$ROOTDIR/../openwhisk-utilities"
# run scancode
cd $UTILDIR
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 79353f5..4dfa3aa 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -26,10 +26,10 @@
# clone utilties repo. in order to run scanCode.py
cd $HOMEDIR
-git clone https://github.com/apache/incubator-openwhisk-utilities.git
+git clone https://github.com/apache/openwhisk-utilities.git
# shallow clone OpenWhisk repo.
-git clone --depth 1 https://github.com/apache/incubator-openwhisk.git openwhisk
+git clone --depth 1 https://github.com/apache/openwhisk.git openwhisk
cd openwhisk
./tools/travis/setup.sh
