rhodes 3.3.5 → 3.4.2

data/doc/configuration.txt

@@ -151,6 +151,8 @@ Show status bar on windows mobile. Default is 1 (show)
 	
 	wm_show_statusbar = 1
 
+**NOTE: This parameter works only with Internet Explorer Browser. When you use Motorola WebKit browser, statusbar is not available **
+
 Disable screen rotation. By default set to 0 (enabled). This option available on ANDROID and iPhone ONLY
 	
 	disable_screen_rotation = 1

data/doc/device-caps.txt

@@ -14,29 +14,32 @@ Rhodes provide access to device specific capabilities such as GPS, PIM, camera,
 		<th>Android</th>
 		<th>RhoSimulator</th>
 		<th>Symbian</th>
+		<th>Windows Desktop</th>
 	</tr>
-	<tr><td class='cap'>GeoLocation</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>PIM Contacts</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td>3.1</td></tr>
-	<tr><td class='cap'>PIM Calendar</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Camera</td><td>1.0</td><td>1.0</td><td class='tbd'>TBD</td><td>1.0</td><td>1.0</td><td>3.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Barcode</td><td>2.1</td><td>2.1</td><td class='tbd'>TBD</td><td>2.1</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Date/Time picker</td><td>1.2.2</td><td>2.0</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Menu</td><td>1.2.2</td><td>2.0</td><td>3.0</td><td>1.2</td><td>1.5</td><td>3.0</td><td>3.1</td></tr>
-	<tr><td class='cap'>Toolbar</td><td>1.2.2</td><td>2.3</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.0</td><td>3.1</td></tr>
-	<tr><td class='cap'>Tab Bar</td><td>1.2.2</td><td class='tbd'>3.5</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.1</td><td>3.1</td></tr>
-	<tr><td class='cap'>Nav Bar</td><td>2.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>2.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr class='tbd'><td class='cap'>Audio/Video capture</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td>4.0</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Bluetooth</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>NFC</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td>3.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Push</td><td>1.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td>1.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Screen rotation</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>2.0</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Native Maps</td><td>1.4</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>1.4</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Alerts/Audio File Playback</td><td>1.2</td><td>1.5</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.1</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Ringtones</td><td>3.5</td><td>1.5</td><td class='tbd'>TBD</td><td>1.5</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
-	<tr><td class='cap'>Printing</td><td>3.4</td><td>3.4</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>GeoLocation</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>PIM Contacts</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td>3.1</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>PIM Calendar</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Camera</td><td>1.0</td><td>1.0</td><td class='tbd'>TBD</td><td>1.0</td><td>1.0</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Barcode</td><td>2.1</td><td>2.1</td><td class='tbd'>TBD</td><td>2.1</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Date/Time picker</td><td>1.2.2</td><td>2.0</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.0</td><td class='tbd'>TBD</td><td>3.0</td></tr>
+	<tr><td class='cap'>Menu</td><td>1.2.2</td><td>2.0</td><td>3.0</td><td>1.2</td><td>1.5</td><td>3.0</td><td>3.1</td><td>3.0</td></tr>
+	<tr><td class='cap'>Toolbar</td><td>1.2.2</td><td>2.3</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.0</td><td>3.1</td><td>3.0</td></tr>
+	<tr><td class='cap'>Tab Bar</td><td>1.2.2</td><td class='tbd'>3.5</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.1</td><td>3.1</td><td class='tbd'>3.4</td></tr>
+	<tr><td class='cap'>Nav Bar</td><td>2.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>2.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr class='tbd'><td class='cap'>Audio/Video capture</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td>4.0</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Bluetooth</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>NFC</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td>3.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Push</td><td>1.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td>1.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Screen rotation</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>2.0</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Native Maps</td><td>1.4</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>1.4</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Alerts/Audio File Playback</td><td>1.2</td><td>1.5</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.1</td><td class='tbd'>TBD</td><td>3.1</td></tr>
+	<tr><td class='cap'>Ringtones</td><td>3.5</td><td>1.5</td><td class='tbd'>TBD</td><td>1.5</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Printing</td><td>3.4</td><td>3.4</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td></tr>
 </table>	
 
+**NOTE: As of Rhodes version 3.3.3, the [Barcode](/rhodes/device-caps#barcode), [NFC](/rhodes/device-caps#nfc), and [Inline Signature Capture](/rhodes/device-caps#signature-capture) APIs, as well as [Rhom data encryption](/rhodes/rhom#database-encryption) are removed from Rhodes. These features are only supported in Motorola RhoMobile Suite. If you wish to use these features, you will need to [upgrade to RhoMobile Suite](/rhoelements/rhoelements-install). Your application's build.yml will also need to be modified to [indicate the application type is 'Rhoelements']( /rhoelements/rhoelements2-native#enabling-motorola-device-capabilities). Additionally, a [RhoElements license](/rhoelements/licensing) is required.**
+
 ## System class
 The System Ruby class provides access to the system specific information.
 
@@ -46,7 +49,7 @@ To get value of a named system property:
 
 Properties:
 
-* platform - APPLE, Blackberry, WINDOWS, ANDROID, SYMBIAN
+* platform - APPLE, Blackberry, WINDOWS, ANDROID, WINDOWS_DESKTOP, SYMBIAN
 * has_camera - is camera available on the device
 * screen_width - screen width in logical pixels (used for set coordinates)
 * screen_height - screen height in logical pixels (used for set coordinates)
@@ -89,26 +92,62 @@ Open application associated with url; behavior may be different on different pla
 	System.open_url(url)
 **NOTE: On iPhone, if you post path of local file, then the specific iOS control (UIDocumentInteractionController) where file will previewed and user will be able open this file by selected application wich supported this filetype.**
 
-Run specified application. Note: appname is platform dependent
+Run specified application. Note: 
 	:::ruby
 	System.run_app(appname, params)
-**NOTE: On iPhone, appname is the same with registered application URL scheme. Params just string. Example : System.run_app('myapp', 'someparams'). Also this the same with : System.open_url('myapp:someparams')**
+	
+appname is platform dependent:
+
+* iPhone: appname is the same with registered application URL scheme. Params just string. Example : 
+
+    System.run_app('myapp', 'someparams'). 
+        
+  Also this the same with : 
+  
+    System.open_url('myapp:someparams')
+    
+* Android: appname is package name : com.<vendor>.<app_name> . For example:
+
+    System.run_app('com.rhomobile.store', 'someparams')
+
+* Windows Mobile, Windows CE: appname is path in registry: <vendor> <app_name>/<app_name>.exe . For example:
 
+    System.run_app('rhomobile store/store.exe', 'someparams')
 
+* Windows Desktop: appname is path in registry: <vendor>/<app_name>/<app_name>.exe . For example:
+
+    System.run_app('rhomobile/store/store.exe', 'someparams')
+
+* Blackberry: appname is <app_name> . For example:
+
+    System.run_app('store', 'someparams')
+        
 Install application from specified url
 	:::ruby
 	System.app_install(url) 
 
 Is specified application installed on device?
+
 	:::ruby
 	System.app_installed?(appname)
 
-**NOTE: On iPhone, appname is the same with registered application URL scheme.**
+**NOTE: see System.run_app for appname information **
+
 	
 Uninstall specified application	
 	:::ruby
 	System.app_uninstall(appname)
 
+**NOTE: see System.run_app for appname information **
+
+Zip one file to specified zip
+	:::ruby
+	System.zip_file(local_path_to_zip, local_path_to_file, password)
+
+Zip several files to specified zip
+	:::ruby
+	System.zip_files(local_path_to_zip, base_path, array_of_files_to_be_zipped, password)
+
 Unzip file to the same folder where zip file is	
 	:::ruby
 	System.unzip_file(local_path_to_zip)
@@ -131,6 +170,13 @@ To get current application Locale:
 	:::ruby
     LocalizationSimplified::get_cur_locale #get current application locale
 
+To modify application window position and size:
+    :::ruby
+    System.set_window_frame(x,y,width,height) #change application window position and size
+    System.set_window_position(x,y) #change application window position
+    System.set_window_size(width,height) #change application window size
+
+**NOTE: These methods implemented only for Windows Desktop  **
 
 ### Sample
 See layout.erb of [System API Sample application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/layout.erb)  for some of the examples of how to use System class. There is also [system test](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/SystemTest/controller.rb) which demonstrate System class usage.
@@ -649,7 +695,7 @@ Choose a picture from Image Gallery (currently supported only on iPhone):
 	Camera::choose_picture('/app/model/camera_callback', options_hash)
 
 
-options_has - hash contain additional parameters :
+options_hash - hash contain additional parameters :
 
 * "camera_type" - "default"(is the same with "main"), "main", "front". Default value = "default"
 * "desired_width" - number, desired width in pixels. Default value = max camera width
@@ -679,12 +725,26 @@ In returned hash:
 
  * "max_resolution" - hash with "width" and "height" numeric values.
 
+### Extended API for Motorola devices (RhoElements applications)
+
+Take a picture:
+	:::ruby
+	Camera::take_picture('/app/model/camera_callback', options_hash)
+
+options_hash - hash contain additional parameters :
+
+* "left" - number, camera left position in pixels. Default value = 0
+* "top" - number, camera top position in pixels. Default value = 0
+* "desired_width" - number, desired width in pixels. Default value = max camera width
+* "desired_height" - number, desired height in pixels. Default value = max camera height
 
 ### Sample
 See controller and view in the /app/Image folder of the [ System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/Image/controller.rb) for more information.
 
 ## Barcode
 
+**NOTE: As of Rhodes version 3.3.3, the [Barcode](/rhodes/device-caps#barcode) API is removed from Rhodes. This feature is only supported in Motorola RhoMobile Suite. If you wish to use this feature, you will need to [upgrade to RhoMobile Suite](/ rhoelements/rhoelements-install). Your application's build.yml will also need to be modified to [indicate the application type is 'Rhoelements'](/rhoelements/rhoelements2-native#enabling-motorola-device-capabilities). Additionally, a [RhoElements license](/rhoelements/licensing) is required.**
+
 The Barcode API allows to try recognize barcode on an image:
 	:::ruby
 	Barcode.barcode_recognize(image_file_full_path)
@@ -746,6 +806,8 @@ After user entered signature (or canceled) provided callback url will be called.
  * signature_uri - path to the image with signature   
 
 ### Inline signature capture
+**NOTE: As of Rhodes version 3.3.3, the Inline Signature Capture API is removed from Rhodes. This feature is only supported in Motorola RhoMobile Suite. If you wish to use this feature, you will need to [upgrade to RhoMobile Suite](/ rhoelements/rhoelements-install). Your application's build.yml will also need to be modified to [indicate the application type is 'Rhoelements'](/rhoelements/rhoelements2-native#enabling-motorola-device-capabilities). Additionally, a [RhoElements license](/rhoelements/licensing) is required.**
+
 Windows Mobile and Windows CE devices support signature capture started in window, which you can show over current page(scrolling is not supported in this case).
 
 To display window hand writing, where user draw his signature call:
@@ -759,6 +821,13 @@ Example :
 	:::ruby
 	Rho::SignatureCapture.visible(true, { :imageFormat => "jpg", :penColor => 0xff0000, :penWidth=>3, :bgColor => 0x00ff00 })
 
+`visible` uses the same hash parameters as `take`, with the following additional parameters.
+
+* left - Sets the top left horizontal position of the rectangular capture area in pixels
+* top - Sets the top left vertical position of the rectangular capture area in pixels
+* width - Sets the width of the rectangular capture area in pixels
+* height - Sets the height of the rectangular capture area in pixels
+
 To save Signature to an image file and call callback:
 	:::ruby
 	Rho::SignatureCapture.capture(callback_url)
@@ -974,8 +1043,9 @@ You can find complete example of using Bluetooth API in [Rhodes-System-Api-Sampl
 ## NFC
 
 NFC (Near Field Communication). NFC API provide access to NFC functionality. You can check NFC availability on current device and register callback for listen event when NFC tag near of device. Currently NFC supported only on Android. And also Android version must be 2.3.3 or later.
-NFC API implemented in native extension. You should add "nfc" to extension list in your nuild.yml before start using NFC in your application. Please see detailed doc : [Rhodes NFC extension](nfc)
+NFC API implemented in native extension. You should add "nfc" to extension list in your nuild.yml before start using NFC in your application. Please see detailed doc: [Rhodes NFC extension](/rhodes/nfc).
 
+**NOTE: As of Rhodes version 3.3.3, the [NFC](/rhodes/nfc) API is removed from Rhodes. This feature is only supported in Motorola RhoMobile Suite. If you wish to use this feature, you will need to [upgrade to RhoMobile Suite](/rhoelements/rhoelements-install). Your application's build.yml will also need to be modified to [indicate the application type is 'Rhoelements'](/rhoelements/rhoelements2-native#enabling-motorola-device-capabilities). Additionally, a [RhoElements license](/rhoelements/licensing) is required.**
 
 ## Ringtone manager
 
@@ -1360,7 +1430,13 @@ When user rotate device, Rhodes update view corresponding to new orientation. To
 	:::ruby
 	System.set_screen_rotation_notification(callback, params) 
 
-Callback will be called when screen rotate (available since Rhodes 2.0). Callback parameters will be: width, height, degrees
+Callback will be called when screen has rotated (available since Rhodes 2.0).
+Callback parameters are:
+- width - new screen width
+- height - new screen height
+- degrees - screen rotation relative to portrait position
+
+NOTE: On tablet devices with default landscape form factor degrees value in normal position will be 90
 
 ### Sample
 See controller and view in the /app/ScreenRotation folder of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/ScreenRotation/controller.rb) for more information.

data/doc/extensions.txt

@@ -276,6 +276,33 @@ You can now use the added library to access additional functionality not provide
 
 NOTE: Once again, it should be mentioned that not all libraries are guaranteed to work with Rhodes.
 
+## Encryption libraries
+### digest - based extensions
+
+digest, digest-sha1, digest-md5
+
+Add to build.yml:
+	
+	extensions: ["digest", "digest-sha1", "digest-md5"]
+
+NOTE: digest should be included in extensions list to use digest-base libraries
+
+### OpenSSL - based libraries
+
+openssl, ezcrypto
+
+Add to build.yml:
+	
+	extensions: ["openssl.so", "openssl", "digest-sha2", "ezcrypto"]
+
+digest-sha2
+
+Add to build.yml:
+	
+	extensions: ["openssl.so", "openssl", "digest", "digest-sha2" ]
+
+NOTE: openssl.so is native c-library and should be included in extensions list to use openssl-base libraries
+
 ## Native Extensions 
 
 Starting from 2.0, Rhodes supports native extensions for Android, iPhone, WM and BlackBerry platforms. Native extensions are extensions written in the native language for the platform (C/C++/ObjC for iPhone, C/C++/Java for Android, C/C++ for WM, Java for Blackberry).
@@ -757,7 +784,7 @@ In your Rhodes application folder, create a folder called "extensions". This is
 
 ### Create Your Extensions Configuration File
 
-In the folder named for your extension, such as `accel/extensions/accelerometer`, create a file named ext.yml.
+In the folder named according to your extension name, such as `accel/extensions/accelerometer`, create `ext.yml` file.
 
 In this file, you have two lines to define your initialization function and your libraries. Here is an example for an accelerometer extension.
 
@@ -773,40 +800,22 @@ You can have more that one library, in which case you would separate the librari
 
 	libraries: [ "extension1", "extension2" ]
 
-For Android, add the following parameters to your ext.yml file.
+For Android you may add additional extension parameters within android section:
 
-* android_rhodes_activity_listener - Java class name implemented interface com.rhomobile.rhodes.RhodesActivityListener (used for attach to main Rhodes application activity)
-* android_manifest_changes - filename with Android manifest items (in format of Android manifest) 0 this file will join to main AndroidManifest.xml of application
-* android_resources_addons - folder with any additional files for add to main application build folder (can contain any resources, layouts, etc.)
-* android_additional_sources_list - filename with list of *.java files for building with main Rhodes application package.
-
-<table border="1">
-<tr>
-	<td><code>android_rhodes_activity_listener</code></td>
-	<td>Java class name implemented interface com.rhomobile.rhodes.RhodesActivityListener (used for attach to main Rhodes application activity)</td>	
-</tr>
-<tr>
-	<td><code>android_manifest_changes</code></td>
-	<td>filename with Android manifest items (in format of Android manifest) 0 this file will join to main AndroidManifest.xml of application</td>	
-</tr>
-<tr>
-	<td><code>android_resources_addons</code></td>
-	<td>folder with any additional files for add to main application build folder (can contain any resources, layouts, etc.)</td>	
-</tr>
-<tr>
-	<td><code>android_additional_sources_list</code></td>
-	<td>filename with list of *.java files for building with main Rhodes application package</td>	
-</tr>
-</table>
+* rhodes_listener - Java class name which implements com.rhomobile.rhodes.extmanager.IRhoListener interface (used to handle Rhodes application UI events)
+* manifest_changes - filename with Android manifest items (in form of common AndroidManifest.xml), this file will be joined with main AndroidManifest.xml
+* adds - folder with any additional files for add to main application build folder (may contain resources, assets and shared libraries)
+* source_list - filename with list of *.java files to build with main Rhodes application package.
 
 Here is an example of an ext.yml file for an NFC extension. This example is taken from the Rhodes installation, located at [Rhodes root]/lib/extensions/Nfc.
 
 	entry: Init_Nfc
-	android_rhodes_activity_listener: com.rhomobile.nfc.Nfc
-	android_manifest_changes: ext/nfc/platform/android/AndroidManifest.xml
-	android_resources_addons: ext/nfc/platform/android/additional_files
-	android_additional_sources_list: ext/nfc/platform/android/ext_build.files
 	libraries: ["Nfc"]
+	android:
+	  rhodes_listener: com.rhomobile.nfc.Nfc
+	  manifest_changes: ext/nfc/platform/android/AndroidManifest.xml
+	  adds: ext/nfc/platform/android/additional_files
+	  source_list: ext/nfc/platform/android/ext_build.files
 
 ### Create Your Build Script
 
@@ -814,8 +823,6 @@ In the "ext" folder, such as `accel/extensions/accelerometer/ext`, you will crea
 
 Create a build script file. Name this file `build` for Macintosh and `build.bat` for Windows. This file executes a rake file that contains all your compiling commands for your extension. (You can instead put your compiling commands in the build file, but this chapter uses the Rakefile method.)
 
-When running on Linux and Macintosh, make sure the build files are executable.
-
 For the Macintosh, the build file contains:
 
 	#!/bin/sh
@@ -843,7 +850,7 @@ The following environment variables are used by all the platforms.
 </tr>
 <tr>
 	<td><code>RHO_PLATFORM</code></td>
-	<td>mobile platform fot this application build. Possible values are 'iphone', 'android' and 'wm'</td>	
+	<td>mobile platform for this application build. Possible values are 'iphone', 'android' and 'wm'</td>	
 </tr>
 <tr>
 	<td><code>RHO_ROOT</code></td>
@@ -851,7 +858,7 @@ The following environment variables are used by all the platforms.
 </tr>
 <tr>
 	<td><code>TEMP_FILES_DIR</code></td>
-	<td>used for temporay files</td>	
+	<td>used for temporary files like object files</td>	
 </tr>
 </table>
 
@@ -946,6 +953,12 @@ The sections that you write specifically for your platform are:
  * Compile code specific for your platform (such as objective C for iphone).
  * Build the linking command for your platform.
 
+For Android build you may use next android build helpers:
+
+ * setup_ndk(NDK_path, android_API_level) - in order to use cc_compile and cc_ar
+ * cc_compile(filename, objdir, params) - compile source file
+ * cc_ar(libname, objects) - create archive library
+
 For other platforms, you can use the Rakefile in the digest extension, which is located in your Rhodes folder: `<rhodes>/lib/extensions/digest/ext/Rakefile`.
 
 	:::term
@@ -978,6 +991,9 @@ For other platforms, you can use the Rakefile in the digest extension, which is
 	    args << "-I#{$rootdir}/platform/shared"
 
 	    if ENV['RHO_PLATFORM'] == 'android'
+          require File.join($rootdir, 'platform/android/build/androidcommon.rb')
+          setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'])
+          # ...
 	    
 	    # *** IPHONE SPECIFIC: set arguments (and execute the compile command)
 	    elsif ENV['RHO_PLATFORM'] == 'iphone'

data/doc/install.txt

@@ -1,23 +1,20 @@
 # Install Rhodes
 
-## Important note!
-
-Don't mix standalone ruby installation with ruby installation under rvm control. If you need just only version of ruby, then feel free to install it as standalone. If you need to install additional version of ruby, then uninstall standalone ruby and install all needed ruby versions under control of rvm.
-In case you have mixed standalone and rvm-controlled ruby installation they may conflict and produce runtime issues in Rhodes applications.
-
 ## Mac OS
 
 If you're running Mac OS, download the latest [Motorola RhoMobile Suite Installer for Macintosh](http://rhomobile.com/rhostudio-mac). This contains [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
 
-Mac OS has [Ruby](http://www.ruby-lang.org/en/) installed. It is recommended that you install [Ruby Version Manager](https://rvm.io//) and install Ruby version 1.9.3.
+Although Mac OS has [Ruby](http://www.ruby-lang.org/en/) installed, the official way to install Ruby for RhoStudio is to install [Ruby Version Manager](https://rvm.io//) and then install Ruby version 1.9.3.
 
-Click on the RhoMobileSuiteInstaller for Mac download file to open it. You will get a window similar to this:
+Click on the Motorola RhoMobile Suite Installer for Mac download file to open it. You will get a window similar to this:
 
 <img src="http://rhodocs.s3.amazonaws.com/rhodes-devel/rhostudio-mac-install.png" alt="RhoStudioInstaller Mac" />
 
-Run the install gems script appropriate for you. If you have Ruby Version Manager, you can run "Install gems on rvm." A terminal window will open; wait for the gems install process to complete.
+Run "Install gems" (this requires that you have installed Ruby Version Manager). A terminal window will open; wait for the gems install process to complete.
+
+Then drag Motorola RhoStudio to the Applications folder.
 
-Then drag Motorola RhoStudio to the Applications folder. 
+**NOTE: Installing Ruby into the System folder is not supported by RhoMobile; the official RhoMobile way to install and use Ruby on the Macintosh is with Ruby Version Manager.**
 
 ## Windows
 
@@ -43,7 +40,7 @@ NOTE: To build for Android it is required JDK 1.6 (JDK 1.7 is not supported)
 
 ### Setting the JDK Path
 
-On Windows installs for RhoMobile, go to RhoStudio Preferences (Windows -> Preferences) and set the JDK path in the rhobuild.yml file. On Windows 64-bit installations, you must set this path to the 32-bit version of the JDK, such as `C:/Program Files (x86)/Java/jdk1.7.0_01/bin`.
+On Windows installs for RhoMobile, go to RhoStudio Preferences (Windows -> Preferences) and set the JDK path in the rhobuild.yml file. On Windows 64-bit installations, you must set this path to the 32-bit version of the JDK, such as `C:/Program Files (x86)/Java/jdk<version number>/bin`.
 
 On Mac OS, the path to the JDK is automatically set once Java is installed.
 
@@ -55,7 +52,9 @@ To install Rhodes on Linux, and to install Rhodes on Windows or Mac OS using the
 
 1. [Ruby v1.9.3](http://www.ruby-lang.org/en/downloads/) (On Windows, [RubyInstaller](http://rubyinstaller.org) is a convenient way to install Ruby; you should check "Add Ruby executables to your PATH" and "Associate .rb and .rbw files with this Ruby installation".)
 
-2. Install the Rhodes Gem. Run this command to install.
+2. Install the Rhodes Gem. 
+
+Run this command to install the Rhodes Gem.
 
 	:::term
   	$ [sudo] gem install rhodes
@@ -64,7 +63,7 @@ NOTE: If you get any `no such file to load -- something` messages while running
 
 NOTE: Windows doesn't come with the necessary build tools to install gems ('make', for example). There are various ways to get these tools, but the GnuWin32 project at http://gnuwin32.sourceforge.net/ provides the tools, and can be installed via the GetGnuWin32 installer at http://sourceforge.net/projects/getgnuwin32/files/. You should follow the GetGnuWin32 instructions carefully.
 
-You can [install RhoStudio as a plugin for Eclipse](rhostudio-eclipse).
+**NOTE: Installing RhoStudio as a plugin for Eclipse is currently disabled.**
 
 RhoSimulator, which comes with RhoStudio for Mac and Windows, does not work with Linux.
 
@@ -84,3 +83,7 @@ If you are using RhoStudio, you can either run rhodes-setup, or you can set the
 ## Setting the Location of the RhoStudio Workspace Directory
 
 When you start RhoStudio, you can set the location of the workspace directory. The path to the workspace directory should not contain space symbols: if the path has spaces, a RhoConnect application created with RhoStudio will not work properly.
+
+## Standalone Ruby Installation and Ruby Version Manager
+
+Do not install Ruby as a standalone if you also use Ruby Version Manager (rvm) to install Ruby. If you need only one version of Ruby, you can install Ruby as a standalone. If you need more than one version of Ruby, you should uninstall standalone Ruby and then install Ruby with Ruby Version Manager. Mixed standalone Ruby and rvm-controlled Ruby installations can conflict and cause runtime issues in Rhodes applications.

data/doc/introduction.txt

@@ -13,7 +13,7 @@ BlackBerry 4.6, 4.7, 5.0, 6.0, 7.0
 NOTE: 4.2 and 4.5 are supported but database access is very slow on these devices.
 
 ### Windows Mobile
-Windows Mobile 6.x Professional, 6.0 Standard
+**NOTE: As of Rhodes 3.3.3 Windows Mobile/CE are only supported under [RhoElements](/rhoelements/rhoelements-introduction)**
 
 ### Android
 Android 2.1 and greater

data/doc/nfc.txt

@@ -2,6 +2,8 @@
 
 The Near Field Communications (NFC) API allows you to use NFC functionality in your Rhodes application. With the NFC API, you can check to see if the mobile device supports NFC, and if so, have it listen for an NFC tag and register a callback if it finds one. You can also have your device push out an NFC tag. 
 
+**NOTE: As of Rhodes version 3.3.3, the NFC API is removed from Rhodes. This feature is only supported in Motorola RhoMobile Suite. If you wish to use this feature, you will need to [upgrade to RhoMobile Suite](/rhoelements/rhoelements-install). Your application's build.yml will also need to be modified to [indicate the application type is 'Rhoelements']( /rhoelements/rhoelements2-native#enabling-motorola-device-capabilities). Additionally, a [RhoElements license](/rhoelements/licensing) is required.**
+
 Example Code
 -----------
 Example code for NFC is located here.
@@ -23,11 +25,10 @@ To create a Rhodes NFC application, you generate a Rhodes application, then you
 
 ## Setting up build.yml
 
-NFC is currently supported only on the Android platform, OS version 2.3.3 or later. You must edit the Android section in your build.yml file for NFC. The version must be 2.3.3 or later, and NFC must be in the extension list.
+NFC is supported only on Android devices with Android 2.3.3 or later. You must edit the Android section in your build.yml file for NFC: 'nfc' extension must be in the extension list.
 
 	:::text
 	android:
-	  version: 2.3.3
 	  extensions:
 	  - nfc