You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mw...@apache.org on 2013/09/13 20:10:51 UTC
[07/17] docs commit: rewrite global icon config content
rewrite global icon config content
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/ac90b226
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/ac90b226
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/ac90b226
Branch: refs/heads/master
Commit: ac90b22612ca42916b22c3cfecf43b2cf08b0740
Parents: 5c7fc60
Author: Mike Sierra <ms...@adobe.com>
Authored: Thu Sep 12 18:40:24 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Fri Sep 13 11:10:31 2013 -0700
----------------------------------------------------------------------
docs/en/edge/config_ref/index.md | 31 +++++++++++++++-----
docs/en/edge/guide/platforms/android/config.md | 2 +-
.../edge/guide/platforms/blackberry10/config.md | 4 +--
docs/en/edge/guide/platforms/ios/config.md | 2 +-
4 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac90b226/docs/en/edge/config_ref/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/config_ref/index.md b/docs/en/edge/config_ref/index.md
index bba41db..b410467 100644
--- a/docs/en/edge/config_ref/index.md
+++ b/docs/en/edge/config_ref/index.md
@@ -154,11 +154,32 @@ Here is how the element appears for iOS projects:
<param name="ios-package" value="CDVDevice" />
</feature>
-See the API Reference for details on how to access each feature. See
-the Plugin Development Guide for more information about plugins.
+See the API Reference for details on how to specify each feature. See
+the Plugin Development Guide for more information on plugins.
## Icons and Splash Screens
+By default, Cordova generates icons based on the root application
+directory's `icon.png` file. Otherwise, adding the `<icon>` tag to the
+`config.xml` file allows you to specify a different filename:
+
+ <icon src="app.png" />
+
+To define platform-specific icons, consult each platform's
+configuration options:
+
+- iOS Configuration
+- Android Configuration
+- BlackBerry Configuration
+
+
+Icon files should be the file formats specified in the examples below,
+other file types are not guaranteed to work across platforms.
+
+<!-- QUERY: fishes for icon.png by default? Or is cordova icon the default? -->
+
+Add the `<icon> element`
+
<!-- !!!
### Icon Support
@@ -176,12 +197,6 @@ the Plugin Development Guide for more information about plugins.
#### Usage and Additional Information:
-Unless otherwise specified in a config.xml, each platform will try to
-use the default `icon.png` during compilation. To define platform
-specific icons please use the guide provided below.
-
-Icon files should be the file formats specified in the examples below,
-other file types are not guaranteed to work across platforms.
#### Default
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac90b226/docs/en/edge/guide/platforms/android/config.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/config.md b/docs/en/edge/guide/platforms/android/config.md
index ebf96bf..e9d06ec 100644
--- a/docs/en/edge/guide/platforms/android/config.md
+++ b/docs/en/edge/guide/platforms/android/config.md
@@ -22,7 +22,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
The `config.xml` file controls an app's basic settings that apply
across each application and CordovaWebView instance. This section
details preferences that only apply to Android builds. See The
-config.xml File for information about global configuration options.
+config.xml File for information on global configuration options.
## Icons and Splash Screens
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac90b226/docs/en/edge/guide/platforms/blackberry10/config.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/config.md b/docs/en/edge/guide/platforms/blackberry10/config.md
index 5bb4d87..e9855de 100644
--- a/docs/en/edge/guide/platforms/blackberry10/config.md
+++ b/docs/en/edge/guide/platforms/blackberry10/config.md
@@ -17,12 +17,12 @@ license: Licensed to the Apache Software Foundation (ASF) under one
under the License.
---
-# BlackBerry 10 Configuration
+# BlackBerry Configuration
The `config.xml` file controls an app's basic settings that apply
across each application and CordovaWebView instance. This section
details preferences that only apply to BlackBerry 10 builds. See The
-config.xml File for information about global configuration options.
+config.xml File for information on global configuration options.
## Icons and Splash Screens
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac90b226/docs/en/edge/guide/platforms/ios/config.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/config.md b/docs/en/edge/guide/platforms/ios/config.md
index 259447e..7b4dd49 100644
--- a/docs/en/edge/guide/platforms/ios/config.md
+++ b/docs/en/edge/guide/platforms/ios/config.md
@@ -22,7 +22,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
The `config.xml` file controls an app's basic settings that apply
across each application and CordovaWebView instance. This section
details preferences that only apply to iOS builds. See The config.xml
-File for information about global configuration options.
+File for information on global configuration options.
## Icons and Splash Screens