docs commit: Adding note about config.xml

[bo...@apache.org]

Updated Branches:
  refs/heads/master 76664bfc1 -> 363833558


Adding note about config.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/commit/36383355
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/tree/36383355
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/diff/36383355

Branch: refs/heads/master
Commit: 36383355859c4db3a70e9fcbe5ab281e9950ac81
Parents: 76664bf
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jul 16 09:25:06 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jul 16 09:25:06 2012 -0700

----------------------------------------------------------------------
 docs/en/edge/guide/upgrading/android/index.md |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/36383355/docs/en/edge/guide/upgrading/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/upgrading/android/index.md b/docs/en/edge/guide/upgrading/android/index.md
index a755dce..1c8f6de 100644
--- a/docs/en/edge/guide/upgrading/android/index.md
+++ b/docs/en/edge/guide/upgrading/android/index.md
@@ -30,7 +30,11 @@ This document is for people who need to upgrade their Cordova versions from an o
 3. If you are using Eclipse, please refresh your eclipse project and do a clean
 4. Copy the new cordova-2.0.0.js into your project
 5. Update your HTML to use the new cordova-2.0.0.js file
-6. Update the res/xml/plugins.xml to be the same as the one found in framework/res/xml/plugins.xml
+6. Copy the res/xml/config.xml to be the same as the one found in framework/res/xml/config.xmll
+
+### Notes about 2.0.0 release
+config.xml will be replacing cordova.xml and plugins.xml.  This new file is a combination of the previous two.  However, the
+old files are deprecated, and and while currently still work, will cease working in a future release.
 
 ## Upgrade to 1.9.0 from 1.8.1 ##