rhodes 3.1.1 → 3.2.0.beta.1

data/CHANGELOG

@@ -1,5 +1,8 @@
-## 3.1.1
-* Fix RhoSimulator for Mac
+## 3.2
+* Migrate to Ruby 1.9.2
+* Support reset selected models
+* Support native JQueryMobile css-styles
+* Support latest Android NDK
 
 ## 3.1
 * Symbian support(Beta)

data/doc/alert-api.txt

@@ -0,0 +1,51 @@
+# Alert API - Popup, Vibrate, Play for System Alerts
+
+The [Alert Class API](http://docs.rhomobile.com/rhodes/device-caps#alerts) lets you call system alert methods for popup, vibrate, or playing audio files.
+
+## Alert.hide_popup
+
+Closes the current popup window.
+
+## Alert.play_file(file_name.ext, media_type)
+
+Play the file if the media type is supported by the phone. The file must in the application; for example, /apps/public/test-file.mp3.
+
+file_name.ext - The path to the file name, ending in the file name and extension.  
+media_type - Media type can be specified explicitly, or can be recognized from the file extension. Known file extensions are:  
+ * .mp3 – audio/mpeg
+ * .wav – audio/x-wav
+
+## Alert.show_popup( { :message, :title, :icon, :buttons, :callback } )
+
+Bring the application up front and show a popup message.
+
+:message – text displayed in the popup window.  
+:title – title of the popup window.  
+:icon – path to an image, or :alert for ! icon, :question for ? icon, :info for information icon.
+:buttons – array of buttons defined by id and title. Specify either by hash with :id and :title keys, or by string.  
+:callback – url called when button is clicked. @params hash containing three keys: :button_id, :button_title and :button_index.
+
+Example:
+
+	:::ruby
+	Alert.show_popup( {
+	  :message => 'Some message', 
+	  :title => 'Custom title', 
+	  :icon => '/public/images/icon.png',
+	  :buttons => ["Yes", "No", 
+	    {:id => 'cancel', :title => 'Cancel all'}],
+	    :callback => url_for(:action => :on_dissmiss_popup) } )
+
+## Alert.vibrate(duration_in_milliseconds)
+
+Vibrate the device.
+
+`duration_in_milliseconds` - vibrate for the number of milliseconds, up to 25500; if 0 or no duration is specified, vibrate for 2500 milliseconds.
+
+## Alert.show_status(title, status_text, hide_button_label)
+
+Show status messages. The status window will close after clicking on hide button.
+
+status_text – text displayed in status window  
+hide_button_label – label of hide button
+

data/doc/build.txt

@@ -318,6 +318,11 @@ Disable Android title in application :
 	android:
 	  android_title: 0
 
+Setup fixed screen orientation for application (writed to Manifest, possible values: "portrait", "landscape") :
+
+	android:
+	  orientation: portrait
+
 If the rake command gets stuck you can kill the command window, open another window, run:
 
   	:::term
@@ -365,11 +370,11 @@ If you want to build production version, edit your application's build.yml as be
 
 	android:
 	  production:
-	    certificate: /full/path/to/your/developer/certificate
+	    certificate: path/to/your/developer/certificate
 	    password: "password-of-the-certificate"
 	    alias: "keystore.alias"
 
-This will use specified certificate to sign application. If certificate is not found, it will be auto-generated. In this case you'll be prompted with several questions like your name, organization etc. If you don't want to use auto-generated certificate, refer to the [these instructions](http://developer.android.com/guide/publishing/app-signing.html) on how to create it manually.
+This will use specified certificate to sign application. If certificate is not found, it will be auto-generated. In this case you'll be prompted with several questions like your name, organization etc. The path to certificate may be absolute or relative to your app directory. If you don't want to use auto-generated certificate, refer to the [these instructions](http://developer.android.com/guide/publishing/app-signing.html) on how to create it manually.
 
 After that run:
 
@@ -724,73 +729,79 @@ Note that Windows Mobile versions of your Rhodes app must be built in a Windows
 * Follow [All Platforms Prerequisites](#all-platforms-prerequisites)
 * .NET Compact Framework
 * Windows Mobile 6 Professional SDK(s) 
-* Microsoft Active Sync 4.5
+* Microsoft Active Sync 4.5 for Windows XP; Windows Mobile Device Center for Windows Vista or higher
+* Microsoft Device Emulator 3.0 for Windows Vista or higher
 * Visual Studio 2005 Service Pack 1 installed or Visual Studio 2008. 
 * [7-zip](http://www.7-zip.org/)
 
-Open ActiveSync main window, go to the File -> Connection Settings, select checkbox "Allow connections to one of the following" and select "DMA" from the list box. It is required to work with emulator.
+NOTE: It is a good idea to install Windows Mobile 6 Professional last, since it needs to be installed after Visual Studio, and since the Windows Mobile 6 Professional install process will tell you if you forgot to install any of the other prerequisites.
 
-### Build application from the command line
+On Windows XP, open ActiveSync main window and open the File menu; on Windows Vista and above, open Windows Mobile Device Center and click Mobile Device Settings. Select Connection Settings, select checkbox "Allow connections to one of the following" and select "DMA" from the list box. It is required to work with emulator.
 
-Add path to vcbuild.exe and CabWiz.exe to rhobuild.yml in the Rhodes folder:
+### Add Paths
+
+Add path to vcbuild.exe and CabWiz.exe to rhobuild.yml in the Rhodes folder (example location: `C:/InstantRhodes/ruby/lib/ruby/gems/1.8/gems/rhodes-3.0.2`).
 
 	env:
 	  paths:
-	    vcbuild: 'C:/Program Files/Microsoft Visual Studio 8/VC/vcpackages/vcbuild.exe'
-	    cabwiz: 'C:/Program Files/Windows Mobile 6 SDK/Tools/CabWiz'
+	    vcbuild: `C:/Program Files/Microsoft Visual Studio 8/VC/vcpackages/vcbuild.exe`
+	    cabwiz: `C:/Program Files/Windows Mobile 6 SDK/Tools/CabWiz`
 
-### To run application on device or emulator(Visual Studio 2008 only) :
+On 64-bit installations:
 
-To build and run application on emulator, run (fastest way):
-	
-	:::term
-	$ rake run:wm
+	env:
+	  paths:
+	    vcbuild: `C:/Program Files (x86)/Microsoft Visual Studio 8/VC/vcpackages/vcbuild.exe`
+	    cabwiz: `C:/Program Files (x86)/Windows Mobile 6 SDK/Tools/CabWiz`
+
+### Build and Run application on device or emulator (Visual Studio 2008 only):
 
-To build cab-file, install it and run application on emulator, run:
+To build cab-file, install it, and run application on emulator, run:
 
 	:::term
 	$ rake run:wm:cab 
 
-To build and run application on device, run (fastest way):
-
-	:::term
-	$ rake run:wm:device
+Before you install the application on your Windows Mobile device, first connect your device via USB cable. Then check that your device is connected with ActiveSync on Windows XP or with Windows Mobile Device Center on Windows Vista or above.
 
-To build cab-file, install it and run application on device, run:
+To build cab-file, install it, and run application on device, run:
 
 	:::term 
 	$ rake run:wm:device:cab 
 
-### To build application cab-file for the device, run:
+After the build process completes, the device will ask you to install the app. Disconnect the USB cable from the device before you install.
+
+### Build application cab-file for the device
 
 	:::term
 	$ rake device:wm:production 
 
-If you want the application to be signed automaticly during the build process, please add the 'wmsign' key with full path to your code signing certificate to the 'build' section of rhobuild.yml file:
+If you want the application to be signed automatically during the build process, please add the 'wmsign' key with full path to your code signing certificate to the 'build' section of rhobuild.yml file:
 
 	wmsign: <disk:/path/MySign.pfx>
 
-More information about  Windows Mobile code signing you could find at:
-http://msdn.microsoft.com/en-us/windowsmobile/dd569132.aspx
+You can find more information about Windows Mobile code signing at:
+[http://msdn.microsoft.com/en-us/windowsmobile/dd569132.aspx](http://msdn.microsoft.com/en-us/windowsmobile/dd569132.aspx)
+
+### Deploy application on device
 
-### To deploy application on device
-First connect your device to computer. You can use USB-cable, bluetooth or any other method. To use computer internet you have to start ActiveSync.
+First, connect your device to your computer. You can use USB-cable, bluetooth or any other method. To use computer internet, start ActiveSync or Windows Mobile Device Center.
 
-* You can use rake tasks. See 'Build application from the command line' section. Device should be connected via USB-cable. 
-* You can manually copy .cab file to device, for example to Temp folder and click on cab-file on the device using File Explorer. Installation process will be started. After finish you should see app icon on the device
+You can use rake tasks to deploy the application. See the previous section, 'Build application from the command line.' The device should be connected via USB-cable.
+
+Manually copy the .cab file to the device. For example, you can use the device File Explorer to display the .cab file that is on the computer. Click on that .cab file and the installation process will be started; after it is finished, you should see the app icon on your device in Programs.
 
 ### Build from IDE
 
-Checkout rhodes source code from github 
+Checkout the rhodes source code from github (you have this source code already if you installed Instant Rhodes).
 
-Open `<source-code-root>\platform\wm\rhodes.sln` in Visual Studio.
+Open `<source-code-root>\platform\wm\rhodes.sln` in Visual Studio (example location for <source-code-root>: `C:/InstantRhodes/ruby/lib/ruby/gems/1.8/gems/rhodes-3.0.2`).
 
-Select Windows Mobile 6 Professional and build Release configuration.
+In Visual Studio, select Windows Mobile 6 Professional and build Release configuration.
 
-Open the file `rhobuild.yml` using a text editor:
+Edit the file `rhobuild.yml` in the Rhodes folder:
 
-* define the path to CabWiz tool
-* define the path to your application
+* Check that the path to Cabwiz is defined, for example, `C:/Program Files/Windows Mobile 6 SDK/Tools/CabWiz`.
+* Define the path to your application folder.
 
 Run
 
@@ -799,28 +810,26 @@ Run
 
 Make sure you cradle your emulator (menu Tools/Device Emulator Manager/Select Running Emulator/Actions/Cradle)
 
-Copy `rhodes.exe` and `rhobundle` (located `<source-code-root>\platform\wm\bin\Win32\rhodes\Debug\rho`) created at the previous step to the device: `My Computer\Mobile Device` and folder on that device `\Program Files\rhodes`. You may delete content of `\Program Files\rhodes\rho` folder first to ensure there is no old files left.
+Copy `rhodes.exe` and `rhobundle` (located at `<source-code-root>\platform\wm\bin\Win32\rhodes\Debug\rho`) created at the previous step to the device: `My Computer\Mobile Device` and folder in Program Files on that device (for example, `\Program Files\rhodes`). You can first delete the contents of `\Program Files\rhodes\rho` folder on your device if you want to ensure there are no old files left over.
 
-If you changed your application, then to compile your application code run:
+If you changed your application, then recompile your application code by running the following command again, and copying `rhobundle` and `rhodes.exe` again:
 
 	:::term
 	$ rake build:wm:devrhobundle
-	
-After that copy bundle from  `<source-code-root>\platform\wm\bin\Win32\rhodes\Debug\rho` folder to the device or emulator folder `\Program Files\rhodes\rho` to see you changes.
 
-If you changed your application and built it using rake tasks to compile your application:
+If you changed your application and built it using rake tasks, then to compile your application:
 
 	:::term 
 	$ rake device:wm
 
-Copy '<appdir>\bin\target\rhodes.cab' content to device or emulator in `\My Documents\`, execute that .cab to install the app and then run your app to se the changes.
+Copy `<your_app_directory>\bin\target\rhodes.cab` content to `\My Documents\` on your device or the emulator, execute that .cab to install the app, and then run the installed app to see the changes.
 
 ### Logging
-To get log from emulator or device:
+To read the log file from the emulator or your device:
 
-* connect device or emulator using ActiveSync
-* press explore on ActiveSync window
-* navigate to `My Device\Program Files\<app_name>\rholog.txt`
+* Connect to the device or emulator using ActiveSync or Windows Mobile Device Center.
+* Press explore on ActiveSync window, File Management on Windows Mobile Device Center.
+* Navigate to `My Device\Program Files\<your_app_name>\rho\rholog.txt`
 
 ## Build for Windows
 

data/doc/configuration.txt

@@ -16,7 +16,7 @@ To enable specific device capabilities, edit application's build.yml as below:
 
 Rhodes support common plus platform-specific capabilities. They are merged into a single list at build time.
 
-** NOTE: Right now only Android recognizes these configuration options. However, we are planning to enable these options across all platforms. **
+** NOTE: Right now only Android recognizes these platform specific configuration options. However, we are planning to enable these options across all platforms. **
 
 List of supported capabilities:
 
@@ -78,9 +78,9 @@ What log categories to exclude
 
 	ExcludeLogCategories = 
 
-Max log file size in KB, set 0 to unlimited size; when limit is reached, log wraps to beginning of file
+Max log file size in Bytes, set 0 to unlimited size; when limit is reached, log wraps to beginning of file
 
-	MaxLogFileSize=50
+	MaxLogFileSize=50000
 
 Turn on local http server traces, off by default
 
@@ -110,9 +110,13 @@ Sync server url, typically this will look like 'http://<hostname>:<port>/applica
 
 	syncserver = 'http://localhost:9292/application'
 
-Geo location inactivity timeout (in seconds)
+Geo location update period (in seconds). Used as default value for third parameter of GeoLocation.set_notification method. This value is passed to OS API and behaviour is OS dependent (it should be used by system as a tip how often call notification back).
+
+    gps_ping_timeout_sec = 30
+
+Geo location inactivity timeout (in seconds). This parameter controls the time after that location service is switched off in case no calls to the service. It also used as time period to drop cached location value.
 	
-	geo_location_inactivity_timeout = 30
+	geo_location_inactivity_timeout = gps_ping_timeout_sec * 10
 
 Set this option to 1 in order to open Rhodes app in full screen mode. Default 1 for Android up to Rhodes 2.2.5. On all other platforms and on Android from Rhodes > 2.2.5 default is 0
 	

data/doc/connect-to-web-services.txt

@@ -25,7 +25,7 @@ Below is the list of available `AsyncHttp` methods you can use to asyncrhonously
 * `:ssl_verify_peer` - (optional) Verify SSL certificates, `true` by default.
 
 ### `get(:url, :headers, :callback, :callback_param)`
-Perform HTTP GET request to the specified `:url`.  You can also provide an optional hash of `:headers` and `:callback_param`.
+Perform HTTP GET request to the specified <code>:url</code>.  You can also provide an optional hash of <code>:headers</code> and <code>:callback_param</code>.<a id="asynchttp-get-ex" />
 
 	:::ruby
 	Rho::AsyncHttp.get(
@@ -60,7 +60,7 @@ Example of synchronous call:
 
 
 ### `post(:url, :headers, :body, :callback, :callback_param)`
-Perform HTTP POST request to the specified `:url`.  As with `get`, you can specify optional arguments:
+Perform HTTP POST request to the specified <code>:url</code>.  As with get, you can specify optional arguments.<a id="asynchttp-post-ex" />
 
 	:::ruby
 	# :post				HTTP POST body to send with request.
@@ -75,7 +75,7 @@ Perform HTTP POST request to the specified `:url`.  As with `get`, you can speci
 	)
 	
 ### `download_file(:url, :headers, :filename, :callback, :callback_param)`
-Download a file to the specified filename.
+Download a file to the specified filename.<a id="asynchttp-download_file-ex" />
 
 	:::ruby
 	file_name = File.join(Rho::RhoApplication::get_base_app_path, "test.jpg")
@@ -89,7 +89,7 @@ Download a file to the specified filename.
 	)
 	
 ### `upload_file(:url, :headers, :filename, :body, :callback, :callback_param)`
-Upload the specified file using HTTP POST:
+Upload the specified file using HTTP POST:<a id="asynchttp-upload_file-ex" />
 
 	:::ruby	
   	file_name = File.join(Rho::RhoApplication::get_base_app_path, "myfile.txt")

data/doc/device-caps.txt

@@ -47,8 +47,10 @@ Properties:
 
 * platform - APPLE, Blackberry, WINDOWS, ANDROID, SYMBIAN
 * has_camera - is camera available on the device
-* screen_width - screen width in pixels
-* screen_height - screen height in pixels
+* screen_width - screen width in logical pixels (used for set coordinates)
+* screen_height - screen height in logical pixels (used for set coordinates)
+* real_screen_width - screen width in real pixels
+* real_screen_height - screen height in real pixels
 * screen_orientation - screen orientation 'portrait', 'landscape'
 * ppi_x - horizontal PPI (Pixels Per Inch)
 * ppi_y - vertical PPI (Pixels Per Inch)
@@ -109,6 +111,10 @@ Return command line parameters as a string. Worked only on iPhone now. Resetting
 	:::ruby
 	System.get_start_params() 
 
+Set application icon badge (number) - only for iPhone. set badge to 0 (zero) for remove badge.
+	:::ruby
+	System.set_application_icon_badge(badge_number)
+
 ### 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.
 
@@ -124,13 +130,24 @@ You need to enable the GPS capability to use GeoLocaiton. This is done by adding
 
 See the [Configuration](configuration#build-time-configuration) section for more details.
 
-The GPS receiver consumes a significant amount of energy, and should be switched off most of the time in order to preserve the device's battery life. Any call to get location information will power up the GPS receiver. Also note that it usually takes a while to acquire the device's current position; in some cases, it may take several minutes and may not work at all indoors.
+The GPS receiver consumes a significant amount of energy, and should be switched off most of the time in order to preserve the device's battery life.
+Any call to GeoLocation method or notification call back will power up the GPS receiver.
+The GPS receiver will be switched off authomatically after some time (see [Configuration](configuration#run-time-configuration) for parameters) or explicitly by GeoLocation.turnoff.
+Also note that it usually takes a while to acquire the device's current position; in some cases, it may take several minutes and may not work at all indoors.
 
 Note that in old rhodes versions (up to 2.3.1) this feature uses only GPS location provider;
 however, in new rhodes it also use network based location determination. Network based location
 is not so precise as GPS but in most cases it consume less power and return results faster than GPS.
-Rhodes will update location using network data until GPS has started; then only GPS will be used
-as more precise data.
+Rhodes will update location using network data until GPS signal has received; then only GPS will be used as more precise data.
+
+It is two ways to use GeoLocation:
+* Syncronous call to GeoLocation module for particular value.
+* Set GeoLocation notification and track location by call back. In this case all location values passed to notification as parameters.
+
+Note that GeoLocation is switched off authomatically when application goes background and switched on as application is back to foreground.
+However it is possible to switch on location services as usual while the application is in background.
+
+See rhodes-system-api-samples application for GeoLocation usage example.
 
 ### Asynchronous Ajax calls
 
@@ -343,7 +360,7 @@ Return hash of all properties of the events found by specified parameters (index
 	* 'occurring' searches for events that have any part of the event occurring during the period specified by start_date and end_date. 
 * include_repeating -  if false then only search based on an Event's START and END values and do not calculate repeating occurrences of the event; if true then repeating occurrences of an Event are included during the search. 
  
-Create new event in the calendar, set properties of the event from passed as parameter hash, and save created calendar event (create), also return hash of all properties of the created event(include 'id' property):
+Create new event in the calendar, set properties of the event(excluding 'id', which is generated) from passed as parameter hash, and save created calendar event (create), also return hash of all properties of the created event(include 'id' property):
 	:::ruby
 	created_event = Rho::RhoEvent.create!(@params['event'])
 
@@ -408,14 +425,17 @@ Take a picture:
 	Camera::take_picture('/app/model/camera_callback', options_hash)
 
 options_has - 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
 * "desired_height" - number, desired height in pixels. Default value = max camera height
 * "color_model" "RGB", "Grayscale". Default value = "RGB"
 * "format" "jpg", "png". Default value = "jpg"
 * "enable_editing" - boolean, enable post photo capture image customize (supported only on iPhone !). Default value = true. If you enable this, image will captured reduced to screen size (not full size)!
+* "flash_mode" - string, supported only on Android ! Values : "off", "on", "auto", "red-eye", "torch".
 
 Additional parameters in camera callback :
+
 * "status" - "ok", "cancel", "error"
 * "message" - if status == error, then in this value contain message about error
 * "image_uri" - uri of saved image file
@@ -446,8 +466,9 @@ Barcode recognition functionality realized as Rhode Native extension. You should
 
 For barcode recognition we use Zbar library (iPhone, and Windows Mobile platforms) and ZXing library (Android and BlackBerry platforms). In this case we support next barcode types :
 
-* iPhone, Android and WM platforms: UPC-A, UPC-E, EAN-8, EAN-13, Code 39, Code 128, .
-* BlackBerry platform: UPC-A, UPC-E, EAN-8, EAN-13, Code 39, Code 128, Code 93, QR Code, ITF, Codabar
+* WM platform: UPC-A, UPC-E, EAN-8, EAN-13, Code 39, Code 128 .
+* iPhone platform: UPC-A, UPC-E, EAN-8, EAN-13, Code 39, Code 128, QR Code .
+* Android and BlackBerry platforms: UPC-A, UPC-E, EAN-8, EAN-13, Code 39, Code 128, Code 93, QR Code, ITF, Codabar
 
 **NOTE: We are very sorry, but we are removed ZBar source code from our project by ZBar license requirements. For build Barcode extension for WM, you should download ZBar sources from http://zbar.sourceforge.net/ and copy to [rhodes root]/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/ folder "include" and "zbar" folders from ZBar sources. Also you should fix ZBar sources for building by Microsoft Visual Studio (move define of inner function variables to begin of functions, etc.)
 
@@ -613,7 +634,8 @@ Write string
 
 ### Example of Controller with using Bluetooth API
 
-It is not complete example (link to complete example see below). This code just show how you can make connection and send/receive strings. 
+This is not a complete example (for a link to a complete example, see the link below this example). This code just shows how you can make a connection and send/receive strings.<a id="bluetooth-ex" />
+
 	:::ruby
 	require 'rho/rhocontroller'
 	require 'rho/rhobluetooth'
@@ -700,7 +722,7 @@ See controller and view in the /app/Ringtones folder of the [System API Samples
 ## PUSH Notifications
 Push notification support is currently available for Android, Blackberry and iPhone. 
 
-Testing push is a little more involved than some other features because it requires additional setup on both the RhoSync application and Rhodes application. Please refer to [RhoSync Device Push](/rhosync/push) for more information.
+Testing push is a little more involved than some other features because it requires additional setup on both the RhoConnect application and Rhodes application. Please refer to [RhoConnect Device Push](/rhoconnect/push) for more information.
 
 ### Setup
 
@@ -711,7 +733,7 @@ First, enable push in your rhodes application in build.yml:
 	  - push
 	  - vibrate #=> if you want to enable vibrate in your push messages
 
-Next, your RhoSync application should be running on a network that is accessible to your device. For example, you might have your RhoSync application running on a LAN with IP 192.168.1.10, PORT 9292. Then make sure your device is connected to the same LAN and setup your application [rhoconfig.txt](configuration#run-time-configuration) syncserver as follows:
+Next, your RhoConnect application should be running on a network that is accessible to your device. For example, you might have your RhoConnect application running on a LAN with IP 192.168.1.10, PORT 9292. Then make sure your device is connected to the same LAN and setup your application [rhoconfig.txt](configuration#run-time-configuration) syncserver as follows:
 
 	syncserver = 'http://192.168.1.10:9292/application'
 
@@ -750,7 +772,7 @@ Automatic push message parameters handling takes its place in case no custom pus
 
 
 ### iPhone
-iPhone PUSH support uses the Apple Push Notification Service (APNS) introduced in iPhone SDK 3.0.  In order to use the service, you will need to obtain a push-enabled provisioning profile and a server-side push certificate used for encrypting RhoSync->APNS traffic.
+iPhone PUSH support uses the Apple Push Notification Service (APNS) introduced in iPhone SDK 3.0.  In order to use the service, you will need to obtain a push-enabled provisioning profile and a server-side push certificate used for encrypting RhoConnect->APNS traffic.
 
 NOTE: For testing push, you will need to build and deploy your application to a physical iPhone (or iPad) device. Apple does not support testing push on simulators.
 
@@ -758,15 +780,15 @@ NOTE: For testing push, you will need to build and deploy your application to a
 The first step to setting up your environment is to create an APNS push certificate. To create the SSL certificate, follow the "Creating the SSL Certificate and Keys" section on the 
 [developer site](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW4).
 
-Once you have the certificate, you will need to export it to a .pem format using [these instructions](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW6). Make sure to name the output file 'apple_push_cert.pem' file from these instructions, since this is what we configured in our RhoSync application.
+Once you have the certificate, you will need to export it to a .pem format using [these instructions](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW6). Make sure to name the output file 'apple_push_cert.pem' file from these instructions, since this is what we configured in our RhoConnect application.
 
-Once you have this file, copy it to your RhoSync application directory under the settings folder:
+Once you have this file, copy it to your RhoConnect application directory under the settings folder:
 
 	:::term
-	$ cd myrhosyncapp
+	$ cd myrhoconnectapp
 	$ cp /path/to/apple_push_cert.pem settings/apple_push_cert.pem
 
-Now your RhoSync application is ready to send APNS messages.
+Now your RhoConnect application is ready to send APNS messages.
 
 #### Setup Provisioning Profile
 Next, you can setup your Apple Push Provisioning Profile using Apple's [developer site instructions](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW5).  Once you have the profile installed in XCode and on your test device, you are ready to test push.
@@ -776,7 +798,7 @@ Setting up the device is the same process as [building any normal Rhodes applica
 
 	2010-08-19 10:14:22.627 rhorunner[1486:307] Device token is <10fd92ab fa8ee481 55d9af6e 73290863 22b323fd 0d18fdbd 19e92d03 c0fef7c8>
 
-This confirms that your application is running with push enabled. Once you login to the RhoSync application and sync, you will see the device registered on the RhoSync console under the user id you used to login. Now you are ready to [test push from your RhoSync application](/rhosync/push#testing-push-in-the-web-console).
+This confirms that your application is running with push enabled. Once you login to the RhoConnect application and sync, you will see the device registered on the RhoConnect console under the user id you used to login. Now you are ready to [test push from your RhoConnect application](/rhoconnect/push#testing-push-in-the-web-console).
 
 ### Android
 Android PUSH support uses the Android Cloud to Device Messaging (AC2DM) system introduced in Android 2.2 (Froyo). In order to use the service, you will need to register your role-based google account (or use existing one) and then register this account in [Google C2DM program](http://code.google.com/android/c2dm/signup.html).
@@ -799,15 +821,15 @@ Then modify your application's build.yml and specify there google account used t
 	    sender: push-app@gmail.com
         
 
-This is the same address used by RhoSync to retrieve authtoken. See [here](/rhosync/push#android) for more information.
+This is the same address used by RhoConnect to retrieve authtoken. See [here](/rhoconnect/push#android) for more information.
 
 NOTE: **WARNING** This e-mail address MUST NOT be the same as origin of google account on phone! This mean that google account registered on your phone/emulator MUST NOT be push-app@gmail.com; it MUST be another one. This is known bug in Android C2DM implementation - if sender and receiver are the same, underlying android service crash and lose message. More details [here](http://groups.google.com/group/android-c2dm/browse_thread/thread/128790789c4e9d6a/67aca1e1764724d4). This is actual not for all Android versions.
 
 At Android it is possible to set up status bar notifications for PUSH messages. In this case push message is handled by application only after user has opened the notification.
-There is two modes available for push notifications:
+There are two modes available for push notifications:
  - <i>always</i> - push notification is shown always
  - <i>background</i> - push notification is shown only if application is backgrounded (not started)
-If no push notification mode is specified in build.yml then no any notifications are shown at all.
+If no push notification mode is specified in build.yml then no notifications are shown at all.
 
 	:::yaml
 	android:
@@ -838,7 +860,7 @@ To listen for incoming messages on BlackBerry, the Rhodes application will start
 
 NOTE: For testing push, the BlackBerry simulator requires a 'kickstart' process.  When the simulator starts, open the web browser on the simulator and navigate to any web page (i.e. http://m.google.com/).  Now your simulator is ready to receive push messages.
 
-Now you are ready to [testing Push in the RhoSync Web Console](/rhosync/push#testing-push-in-the-web-console).
+Now you are ready to [testing Push in the RhoConnect Web Console](/rhoconnect/push#testing-push-in-the-web-console).
 
 #### Setup BlackBerry Device
 To test push on a BlackBerry device, you will need to use a device that is configured with a BES server. Then, all you need to do is [build your Rhodes application for the device](build#build-for-blackberry).
@@ -858,7 +880,7 @@ These parameters from [PushApplicationDescriptor](http://www.blackberry.com/deve
 	push_service_type = 'BPAS'
 
 ### Push Callback
-Rhodes applications can also handle PUSH notifications that didn't come from a RhoSync application. 
+Rhodes applications can also handle PUSH notifications that didn't come from a RhoConnect application. 
 
 In this example, we will get the device ID so we can register the device with some push server:
 	:::ruby
@@ -941,7 +963,7 @@ You can also customize popup window's title, icon, buttons and specify callback
 		:icon => '/public/images/icon.png',
 	    :buttons => ["Yes", "No", 
 			{:id => 'cancel', :title => 'Cancel all'}],
-	    :callback => url_for(:action => :on_dissmiss_popup) } )
+	    :callback => url_for(:action => :on_dismiss_popup) } )
 
 Popup window always close after clicking on any button.
 
@@ -992,7 +1014,7 @@ Status window will close after clicking on hide button.
 * status_text - text to be displayed in status window
 * hide_button_label - label of hide button
 
-For example you can use Alert.show_status in sync notification callback:
+For example you can use Alert.show_status in sync notification callback:<a id="alert-show-status-ex" />
 	:::ruby
 	def sync_notify
 	  status = @params['status'] ? @params['status'] : ""
@@ -1068,7 +1090,7 @@ http scheme example:
 Custom scheme examples:
     :::ruby
     android:
-        URLScheme: rho
+        URIScheme: rho
 
     :::html
     <a href="rho://rhomobile.com/com.rhomobile.rhodessystemapisamples">Open System API Samples</a>
@@ -1076,8 +1098,8 @@ Custom scheme examples:
 
     :::ruby
     android:
-        URLScheme: rho-sas
-        URLHost: rhomobile.com
+        URIScheme: rho-sas
+        URIHost: rhomobile.com
 
     :::html
     <a href="rho-sas://rhomobile.com">Open System API Samples</a>
@@ -1129,7 +1151,12 @@ NOTE: in order to use it on Android, you need to install Google Add-on API and r
 
 Provider:
 
-There are two providers supported now - 'Google' and 'ESRI'. 'Google supported on iPhone, Android and BB. 'ESRI' supported on iPhone, Android, BB and WM. 
+There are two providers supported now - 'Google', 'ESRI', "RhoGoogle" and "OSM". 
+
+* 'Google' supported on iPhone, Android and BB. 
+* 'ESRI' supported on iPhone, Android, BB and WM. 
+* 'RhoGoogle' own GoogleMap provider based on Google Static Map API. Have additional features (offline caching for example).  Supported on Android and WM
+* 'OSM' - Open Street Map, support only 'roadmap' map type.   Supported on Android and WM
 
 For use ESRI maps in your projects on iPhone:
 
@@ -1159,6 +1186,31 @@ Annotations - array of map annotation objects (list of pins on the map). Annotat
 * title - title of the annotation callout
 * subtitle - subtitle of the annotation callout
 * url - url to follow when user click on the callout button
+* image - image file name
+* image_x_offset - int horizontal coordinate of image anchor (ancor point placed to annotation point on map) . Set to image width/2 for center
+* image_y_offset - int vertical coordinate of image anchor (ancor point placed to annotation point on map). Set image height/2 for center
+
+Enable file caching for map tiles - file cache can use for offline map browsing:
+	:::ruby
+	MapView.set_file_caching_enable(1)
+
+Preload map tiles for region (0<=zoom<=18):
+	:::ruby
+	  def preload_callback
+	       puts '@@@@@@@@@      Preload Callback       STATUS['+@params['status']+']   PROGRESS['+@params['progress']+']'
+	  end
+	
+	  def preload_map
+	      min_zoom = 3
+	      max_zoom = 13
+	      top_latitude = 60.1
+	      left_longitude = 30.0
+	      bottom_latitude = 59.7
+	      right_longitude = 30.6
+	      total_tiles_for_preload_count = MapView.preload_map_tiles('OSM', 'roadmap', top_latitude, left_longitude, bottom_latitude, right_longitude, min_zoom, max_zoom, url_for(:action => :preload_callback))    
+	      redirect :action => :index
+	  end
+
 
 ### Sample
 See GeoLocation/controller.rb of [system API sample application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/GeoLocation/controller.rb) for some of the examples of how to use MapView class.