From e9eb08486af832afc650df016cb17347858dd671 Mon Sep 17 00:00:00 2001 From: Jukka Zitting Date: Thu, 5 Jan 2012 21:33:26 +0100 Subject: [PATCH 1/2] README.md: Replace "PhoneGap" with "Cordova" and add incubation disclaimer (This is a test commit to for checking the git push problem by Bryce) --- README.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 59431ec0..15e0ae27 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,16 @@ -PhoneGap Android +Cordova Android === -PhoneGap Android is an Android application library that allows for PhoneGap based projects to be built for the Android Platform. PhoneGap based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript. +Cordova Android is an Android application library that allows for Cordova based projects to be built for the Android Platform. Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript. + +Apache Cordova is an effort undergoing incubation at The Apache +Software Foundation (ASF), sponsored by the name of 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. Requires --- @@ -10,21 +19,21 @@ Requires - Apache ANT - Android SDK [http://developer.android.com](http://developer.android.com) -PhoneGap Android Developer Tools +Cordova Android Developer Tools --- -The PhoneGap developer tooling is split between general tooling and project level tooling. +The Cordova developer tooling is split between general tooling and project level tooling. General Commands - ./bin/create [path package activity] ... create the ./example app or a phonegap android project + ./bin/create [path package activity] ... create the ./example app or a cordova android project ./bin/bench ............................ generate a bench proj ./bin/autotest ......................... test the cli tools ./bin/test ............................. run mobile-spec Project Commands -These commands live in a generated PhoneGap Android project. +These commands live in a generated Cordova Android project. ./phonegap/debug [path] ..................... install to first device ./phonegap/emulate .......................... start avd (emulator) named default @@ -52,12 +61,12 @@ Running the [callback/callback-test](http://github.com/callback/callback-test) t ./bin/test -Creating a new PhoneGap Android Project +Creating a new Cordova Android Project --- ./bin/create ~/Desktop/myapp com.phonegap.special MyApp -Importing a PhoneGap Android Project into Eclipse +Importing a Cordova Android Project into Eclipse ---- 1. File > New > Project... From 4bba9ac5a00aa313ada3bc27bb35c01c3685808d Mon Sep 17 00:00:00 2001 From: Jukka Zitting Date: Thu, 5 Jan 2012 21:39:18 +0100 Subject: [PATCH 2/2] Minor incubation disclaimer fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15e0ae27..1f615532 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Cordova Android Cordova Android is an Android application library that allows for Cordova based projects to be built for the Android Platform. Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript. Apache Cordova is an effort undergoing incubation at The Apache -Software Foundation (ASF), sponsored by the name of Apache Incubator. +Software Foundation (ASF), sponsored by the Apache Incubator project. 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