Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-docs
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/b085f1cb Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/b085f1cb Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/b085f1cb Branch: refs/heads/master Commit: b085f1cbc4d96ee69e95c430ca57fcbef538c051 Parents: 633ec66 a00e174 Author: Joe Bowser <[email protected]> Authored: Tue Jun 18 15:59:32 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Tue Jun 18 15:59:32 2013 -0700 ---------------------------------------------------------------------- docs/en/2.8.0/guide/upgrading/ios/index.md | 8 + docs/en/edge/guide/cli/index.md | 287 +++++++++++ docs/en/edge/guide/overview/apis.md | 25 - docs/en/edge/guide/overview/index.md | 475 ++++++++++++++++++- docs/en/edge/guide/overview/primer.md | 22 - docs/en/edge/guide/overview/support.md | 324 ------------- .../en/edge/guide/upgrading/blackberry/index.md | 25 +- docs/en/edge/guide/upgrading/ios/index.md | 8 + .../img/guide/cli/android_emulate_init.png | Bin 0 -> 221847 bytes .../img/guide/cli/android_emulate_install.png | Bin 0 -> 279414 bytes 10 files changed, 786 insertions(+), 388 deletions(-) ----------------------------------------------------------------------
