rhodes 3.0.2 → 3.1.0.beta.1

data/doc/configuration.txt

@@ -86,6 +86,14 @@ Turn on local http server traces, off by default
 
 	net_trace = 0
 
+Skip http package body from log(for security reasons), off by default
+
+	log_skip_post = 1
+
+Define exclude parameters log filter(for security reasons) - parameter names separated by comma, empty by default. 
+
+	log_exclude_filter = 'login, password'
+
 Timeout of network requests in seconds (30 by default)
 	
 	net_timeout = 60
@@ -150,12 +158,15 @@ Turn on Full Browser mode for Blackberry 4.6.0 and higher
 Turn on Persistent Storage usage mode for Blackberry
 
 	use_persistent_storage = 1
-	
 
 To use only models from bulk database. If true, application will not create models and will use models from bulk sync database
 
 	use_bulk_model = true
-	
+
+Disable WebView to check SSL sertificate (Android). Used to allow proced with self signed sertificates. Use at your own risk. This configuration option works well for any Android version except 2.3.3/2.3.4 (due to Android WebView behavior).
+
+	no_ssl_verify_peer = 1
+
 ### Last Visited Page
 To save/restore last visited page use WebView.current_location in on_ui_created/on_ui_destroyed of [AppAplication class](application#appapplication-class).
 

data/doc/device-caps.txt

@@ -7,7 +7,7 @@ Rhodes provide access to device specific capabilities such as GPS, PIM, camera,
 <table class="device-caps">
 	<tr>
 		<th>Capability</th>
-		<th>iPhone</th>
+		<th>iOS</th>
 		<th>Windows Mobile</th>
 		<th>Windows Phone</th>
 		<th>BlackBerry</th>
@@ -54,6 +54,7 @@ Properties:
 * has_network - is device connected to the network
 * phone_number - device phone number
 * device_id - returns device ID which may be used to receive push messages. This is not phone device id, this is PUSH device id - you should register you phone for PUSH before get this parameter. Read [Push Notification documentation](device-caps#push-notifications) about it. On iPhone it may be empty right after application started while Rhodes registers to receive PUSH notifications; you should wait till it become non-empty.
+* phone_id - returns hardware based id. It depends on capabilities configured for an application and has to remain same even across application uninstall/install.
 * full_browser -  is full browser in the WebView control on Blackberry (see [here](#blackberry-browser-support) for more details)
 * device_name - name of device application running on. Examples: '9000' (BB), 'iPhone', 'dream' (Android)
 * os_version - version of OS of device. Examples: '4.6.0.192' (BB), '3.0' (iPhone), '1.6' (Android)
@@ -75,13 +76,16 @@ Enable\disable phone sleep by timeout, return previous state
 	:::ruby
 	System.set_sleeping
 
-Open application associated with url; behavior may be different on different platforms and depend on installed software. 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.
+Open application associated with url; behavior may be different on different platforms and depend on installed software. 
 	:::ruby
 	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
 	:::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')
+
 
 Install application from specified url
 	:::ruby
@@ -90,6 +94,7 @@ Install application from specified url
 Is specified application installed on device?
 	:::ruby
 	System.app_installed?(appname)
+**NOTE: On iPhone, appname is the same with registered application URL scheme.
 	
 Uninstall specified application	
 	:::ruby
@@ -242,6 +247,12 @@ See controller and view in the /app/GeoLocation folder of the [ System API Sampl
 
 Rhodes provides access to the device's local phone book and stored contacts via the Ruby class RhoContact.
 
+To allow read/modify personal information and contacts enable the pim capability. This is done by adding the following lines to build.yml:
+
+	:::yaml
+	capabilities:
+	  - pim
+
 The following methods are available in the RhoContact class:
 
 Return hash of hashes of all contacts stored in the phonebook (index):
@@ -299,11 +310,17 @@ For examples on how to use the API provided by this class, see the view and cont
 ## PIM Calendar/Events
 Rhodes provides access to the device's local calendar and stored events via the Ruby class RhoEvent.
 
+To allow read/modify calendar information enable the calendar capability. This is done by adding the following lines to build.yml:
+
+	:::yaml
+	capabilities:
+	  - calendar
+
 Check if the device has a calendar:
 	:::ruby
 	System::get_property('has_calendar')
 
-The following methods are available in the RhoContact class:
+The following methods are available in the RhoEvent class:
 
 Return hash of hashes of all events stored in the calendar (index):
 	:::ruby
@@ -356,6 +373,14 @@ For examples on how to use the API provided by this class, see the view and cont
 
 ## Camera
 
+You need to enable the Camera capability. This is done by adding the following lines to build.yml:
+
+	:::yaml
+	capabilities:
+	  - camera
+
+### Main API
+
 Check if the device has a camera:
 	:::ruby
 	System::get_property('has_camera')
@@ -375,6 +400,38 @@ Once the user has taken/chosen a picture, the callback URL you specified will be
 * Status is 'ok', 'cancel', or 'error'
 * image_uri points to the taken/chosen image stored in the /public/db-files folder; the image file will have auto-generated name.
 
+### Extended API (only on iOS and Android)
+
+Take a picture:
+	:::ruby
+	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)!
+
+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
+* "image_width" - image width
+* "image_height" - image height
+* "image_format" - "png", "jpg"
+
+Get camera info:
+	:::ruby
+	Camera::get_camera_info(camera_type)
+
+camera_type - "default"(is the same with "main"), "main", "front"
+return Hash with camera info for selected camera type or NIL if this type is not supported.
+In returned hash :
+* "max_resolution" - hash with "width" and "height" numeric values.
+
+
 ### 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.
 
@@ -386,11 +443,21 @@ The Barcode API allows to try recognize barcode on an image:
 
 Barcode recognition functionality realized as Rhode Native extension. You should add "Barcode" to extension list in build.yml located in your application folder. `Barcode.barcode_recognize(image_file_full_path)` return string with recognized code or emty string if not any recognized barcodes on the image. You can combine Camera for get picture with Barcode recognition for process barcode data - see sample below.
 
-For barcode recognition we use Zbar library (iPhone, Android and Windows Mobile platforms) and ZXing library (BlackBerry platform). In this case we support next barcode types :
+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
 
+**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.)
+
+On Android now supported real-time barcode recognizing:
+	:::ruby
+	Barcode.take_barcode(url_for :action => :take_callback)
+This code open special UI for real-time barcode recognizing from camera. If any barcode found recognizing stopped and user can select - confirm recognizing barcode or continue recognizig. If user confirmed or cancelled the callback will be called.
+In callback:
+* "status" - "ok" or "cancel"
+* "barcode" - recognized barcode string
+
 ### Sample
 See controller and view in the /app/BarcodeRecognizer folder of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/BarcodeRecognizer/controller.rb) for more information.
 
@@ -413,6 +480,12 @@ See controller and view in the /app/SignatureUtil folder of the [System API Samp
 
 Bluetooth API provide access to Bluetooth serial port connection between phone and another phone, phone and PC, phone and external Bluetooth device (for example external Bluetooth GPS device).
 
+To allow Bluetooth enable the bluetooth capability. This is done by adding the following lines to build.yml:
+
+	:::yaml
+	capabilities:
+	  - bluetooth
+
 Currently Bluetooth support have following limitations:
 
 * on Apple device (iPhone, iPad etc.) you can connect only to another Apple device
@@ -423,13 +496,14 @@ Currently Bluetooth support have following limitations:
 * only one connection session can created and using on any device in this time. You should close current session before make another session.
 * one-to-few peers connection scheme is unsupported now.
 
-Do not forget add special "bluetooth" capability into your application's build.yml config - it critical for Android.
-
 There are two steps to make connection and start using of Bluetooth :
 
 * Make connection session: execute `Rho::BluetoothManager.create_session` and setup callback where you receive result of connection. That callback will get events related to making connection(connect ok, canceled by user, error). Connection provided by platform specific UI.
+* For make connection without UI, you should execute `Rho::BluetoothManager.create_server_and_wait_for_connection` on server and `Rho::BluetoothManager.create_client_connection_to_device` on client. On client you should specify server name(display name - not Bluetooth ID!) for connect. Specify callback - callback have the same parameters with `Rho::BluetoothManager.create_session`.  You can cancel connection process by `Rho::BluetoothManager.stop_current_connection_process`
 * After receiving successful result and name of connected device in create_session_callback you should setup session_callback by `Rho::BluetoothSession.set_callback` to process incoming session events from connected device (data received) or event related to this session connection(disconnect, errors).
 
+**NOTE: Connection without UI worked only on iOS and Android platforms only !
+
 ### Bluetooth API
 
 #### BluetoothManager
@@ -465,6 +539,27 @@ Creates Bluetooth session. Return OK/ERROR:
 	* status - OK / ERROR / CANCEL
 	* connected_device_name - name of the connected device
 
+Connect without UI: make current device discoverable for other,  wait for client connection from other device
+	:::ruby
+	Rho::BluetoothManager.create_server_and_wait_for_connection(callback_url)
+
+* callback_url - this url will be called after session was created or canceled. Parameters received in the callback:
+	* status - OK / ERROR / CANCEL
+	* connected_device_name - name of the connected device
+
+Connect without UI: make client connection to device:
+	:::ruby
+	Rho::BluetoothManager.create_client_connection_to_device(server_name, callback_url)
+
+* server_name - name of other device. If you make connect with UI, you receive that name as connected_device_name
+* callback_url - this url will be called after session was created or canceled. Parameters received in the callback:
+	* status - OK / ERROR / CANCEL
+	* connected_device_name - name of the connected device
+
+Connect without UI: cancel current connection:
+	:::ruby
+	Rho::BluetoothManager.stop_current_connection_process
+
 
 #### BluetoothSession
 
@@ -809,8 +904,15 @@ alert - bring app upfront and show specified message
 	alert = "Some message"
 
 vibrate - vibrate for the specified number of milliseconds, up to 25500; if 0 or no duration is specified, it will vibrate for 2500 millisecond.
-	:::ruby
-	vibrate = 2000 #=> duration in milliseconds
+
+    To enable vibrate in your rhodes application in build.yml:
+
+	    capabilities:
+	      - vibrate
+    	  
+    Example of vibrate call:
+     
+	    vibrate = 2000 #=> duration in milliseconds
 
 sound - play specified file if media type supported by the phone. iPhone will ignore media-type parameter.
 	:::ruby
@@ -901,19 +1003,19 @@ For example you can use Alert.show_status in sync notification callback:
 
 ## Timer
 
-In your controller, you may start timer using Rho::RhoTimer class:
+In your controller, you may start timer using Rho::Timer class:
 
-** start_timer ** - start timer and call callback after some interval
+** start ** - start timer and call callback after some interval
 	:::ruby
-	Rho::RhoTimer.start_timer(interval_milliseconds, callback_url, callback_data)
+	Rho::Timer.start(interval_milliseconds, callback_url, callback_data)
 
 For example:
     :::ruby
-	Rho::RhoTimer.start_timer(5000, (url_for :action => :timer_callback), "test")
+	Rho::Timer.start(5000, (url_for :action => :timer_callback), "test")
 	
-** stop_timer ** - stop timer by callback
+** stop ** - stop timer by callback
 	:::ruby
-	Rho::RhoTimer.stop_timer(callback_url)
+	Rho::Timer.stop(callback_url)
 		
 ## Screen rotation
 When user rotate device, Rhodes update view corresponding to new orientation. To get notification about rotation use callback:
@@ -938,20 +1040,70 @@ Use rho_open_target=_blank in html link. Note that jqtouch or other javascript l
 See CustomUri of [system API sample application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/CustomUri/controller.rb) for example.
 
 ## Run rhodes application from browser
-On Android it is possible to start rhodes app by http link from browser. It is also possible to register custom URI scheme for the app.
-By default the http://com.vendor.appname URI format is used. If custom URI scheme is set up in build.yml then this scheme is used followed by any string.
+
+### Android
+On Android it is possible to start rhodes app from browser by http link or redirect response. It is also possible to register custom URI scheme for the app.
+At Android the URI must strictly follow standard URI rules. Additionally Android Chrome browser makes additional restriction: the host part of the URI must be resolvable.
+By default the http://rhomobile.com/com.vendor.appname URI format is used by Rhodes. You can add additional path and query parameters to the URI and handle it by application code.
+It is possible to customize the URI with build.yml settings. Default Rhodes URI contains four parts:
+- scheme
+- host name
+- path prefix
+- optional path and query
+You can customize sheme and host name parts with following build.yml parameters:
+    :::ruby
+    android:
+        URIScheme: myapp
+        URIHost: www.myhost.com
+In case if URIHost is specified no path prefix will be used. If no custom URIHost then default one is used (rhomobile.com) and path prefix must contain java package name of your application.
+Optional path and query just passed to your application for further processing.
+
+NOTE: Google recommends to always use common scheme such as 'http', 'https', 'ftp', etc.
 
 http scheme example:
     :::html
-    <a href="http://com.rhomobile.rhodessystemapisamples">Open System API Samples</a>
+    <a href="http://rhomobile.com/com.rhomobile.rhodessystemapisamples">Open System API Samples</a>
 
-Custom scheme example:
+Custom scheme examples:
     :::ruby
     android:
-        BundleURLScheme: rhodes
+        URLScheme: rho
 
     :::html
-    <a href="rhodes://any_string_here">Open System API Samples</a>
+    <a href="rho://rhomobile.com/com.rhomobile.rhodessystemapisamples">Open System API Samples</a>
+
+
+    :::ruby
+    android:
+        URLScheme: rho-sas
+        URLHost: rhomobile.com
+
+    :::html
+    <a href="rho-sas://rhomobile.com">Open System API Samples</a>
+
+### iPhone
+On iOS devices it is possible to start rhodes app by link with special registered URI scheme from browser. You should register custom URI scheme for the app.
+Custom URI scheme is set up in build.yml then this scheme is used followed by any string.
+
+Custom scheme example:
+    :::ruby
+    iphone:
+        BundleURLScheme: myapp
+
+    :::html
+    <a href="myapp:string_with_params">Open MyApp application</a>
+
+In application you can get start params by 
+    :::ruby
+    System.get_start_params()
+
+For previous example start params will be "string_with_params".
+
+For execute you rhodes based application from enother rhodes based application use next code:
+	:::ruby
+	System.open_url('myapp:string_with_params')
+
+
 
 
 ## MapView
@@ -980,7 +1132,7 @@ There are two providers supported now - 'Google' and 'ESRI'. 'Google supported o
 
 For use ESRI maps in your projects on iPhone:
 
-* Install [http://resources.arcgis.com/content/arcgis-iphone/api  ESRI iOS SDK] - use default folders during installations !
+* Install [ESRI iOS SDK](http://resources.arcgis.com/content/arcgis-iphone/api) - use default folders during installations !
 * Add "esri" to your applications extensions list in build.yml file.
 
 Map settings:
@@ -997,7 +1149,7 @@ Map settings:
 * zoom_enabled - true if zoom of the map is enabled
 * scroll_enabled - true if scrool of the map is enabled
 * shows_user_location - true if current user location is displayed on the map 
-* api_key - Google Maps API Key (sign up for it here: http://code.google.com/apis/maps/signup.html). Note that this parameter is ignored on Android! For Android you should get another key and specify it in the app's build.yml as described [[Building_Rhodes_on_Supported_Platforms#Prerequisites_5|here]]
+* api_key - Maps JavaScript API Key ([sign up for it here](http://code.google.com/apis/maps/signup.html)). Note that this parameter is ignored on Android! For Android you should get another key and specify it in the app's build.yml as described [here](build#Prerequisites_5)
 
 Annotations - array of map annotation objects (list of pins on the map). Annotation:
 
@@ -1091,6 +1243,12 @@ See app\Media of [System API Sample application](http://github.com/rhomobile/rho
 
 You can allow your users to send email messages, call phone numbers and send SMS messages using the hyperlink (`<a href="...">`) syntax. Please note not all of these examples could work on simulators! Use real devices for test. Examples are shown below. 
 
+To make phone calls enable the phone capability. This is done by adding the following lines to build.yml:
+
+	:::yaml
+	capabilities:
+	  - phone
+
 **mailto**
 	:::html
 	<a href="mailto:test@host.com?subject=testing123">Mailto</a>
@@ -1217,9 +1375,9 @@ Links with style display:block:
 	</a>
 Solution: remove display:block from a element
 
-### Blackberry 5.0 full browser
+### Blackberry 5.0 and above full browser
 
-Blackberry 5.0 has new BrowserField class, which support javascript, ajax and extended css. To use it set in [rhoconfig.txt](configuration#run-time-configuration):
+Blackberry 5.0 and above has new BrowserField class, which support javascript, ajax and extended css. To use it set in [rhoconfig.txt](configuration#run-time-configuration):
 
 	# use full browser only on BB 5.0 and above
 	use_bb_full_browser=5 
@@ -1227,6 +1385,8 @@ Blackberry 5.0 has new BrowserField class, which support javascript, ajax and ex
 	# use full browser only on touch devices including 5.0
 	use_bb_full_browser=touch 
 
+WebView.execute_js is also supported in this mode.
+
 NOTE: on Blackberry 5.0 non-touch device full browser has problems with fields navigation - it does not move from one focus field to another like usual browser field does, it just move from one symbol to another. This issue make full browser usable only on touch screen devices.
 
 ### Blackberry full browser

data/doc/extensions.txt

@@ -43,7 +43,7 @@ In case of several extensions, insert space after extension name and comma:
 
 Create utf-8 encoded file in app `<app_folder>/app/lang/lang_<lang_id>_<country_id>.rb` or `<app_folder>/app/lang/lang_<lang_id>.rb`. This file will be automatically loaded by rhodes based on current locale.
 
-For Example create lang_en.eb:
+For Example create lang_en.rb:
 	:::ruby
 	module Localization
 		Views = {
@@ -351,9 +351,27 @@ Special for BB build :
 
 Android notes:
 
+In your "ext.yml" file add new parameters :
+
+	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"]
+
+Used real ext.yml from Nfc extension (located in [Rhodes root]/lib/extensions/Nfc)
+* 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.
+
+Also if you want use any resources in your code - use com.rhomobile.rhodes.R instead of just R - all resources (include your additonal) will accessible from this R file.
+
 * If you need to call JNI functions from native code, `JNIEnv *env` variable need to be retrieved. To get it, include file `RHO_ROOT/platform/android/Rhodes/jni/include/rhodes.h` somewhere to the C/C++ files. Global function `JNIEnv *jnienv()` defined there so use it anywhere when `JNIEnv *` needed.
 
 * If native extension use Java code, build script should create file ext_build.files in the TARGET_TEMP_DIR. This file should contain java source file names (full names, with path) - one by line. Rhodes will include all of them to the final build.
+**NOTE: We recommend use new android_additional_sources_list parameter from ext.yml config - just prepare file with list of your java files for build and setup that parameter.
 
 * If native extension use prebuilt libraries (jars), build script should copy all such jars to the TARGET_TEMP_DIR. They must have extension '.jar'. Rhodes will include these files to the final build.
 

data/doc/generator.txt

@@ -2,22 +2,22 @@
 
 Rhodes utility is a generator which the user uses to create Rhodes applications, models, and tests (specs). 
 
-## Generate application
+## Generating an Application
 
-App name is passed in as a parameter. Utility will generate default directory structure for your application, with reasonable defaults.
+You pass your application name to the rhodes app command as a parameter. The Rhodes utility will generate a default directory structure for your application, with default code for the generated files.
 
-	Usage: rhodes app [options] [args]
+	Usage: rhodes app name [options] [args]
 
 	Generate a new rhodes application.
 
 	Required:
 	  name        - application name
-  
-	Optional:
+
+	args (optional):
 	  syncserver  - url to the source adapter (i.e. "" or "http://myacct.rhohub.com/apps/myapp/sources/")
 	  zip_url     - optional url to zipfile download of bundle (this can be your RhoHub Bundle URL)
 
-	General options:
+	options:
 	    -p, --pretend                    Run, but do not make any changes.
 	    -f, --force                      Overwrite files that already exist.
 	    -s, --skip                       Skip files that already exist.
@@ -26,12 +26,12 @@ App name is passed in as a parameter. Utility will generate default directory st
 	    -h, --help                       Show this message
 	        --debug                      Do not catch errors
 
-For example:
+For example, the following command generates an application named myspace.
 
 	:::term
 	$ rhodes app myspace
 
-generates:
+The generated application has the following directory structure and files.
 
 	myspace/
 		Rakefile
@@ -70,19 +70,19 @@ generates:
 	./public/js:
 	   	<default js libraries>
 
-## Add new model
+## Adding a Model to Your Application
 
-Generate a new model:
+Once you have generated your application, you can add a model to it, and the model can have attributes. For example, if you have a store application, you can add a model named product, and attributes like brand, name, price, and quantity.
 
 	Usage: rhodes model [options] [args]
 
 	Generate a new model for a rhodes application.
 
-	Required:
+	args:
 	  name        - model name
-	  attributes  - list of one or more string attributes (i.e. name,industry,progress), NO spaces between attributes
+	  attributes  - list of one or more attributes (i.e. name,industry,progress), NO spaces between attributes
   
-	General options:
+	options:
 	    -p, --pretend                    Run, but do not make any changes.
 	    -f, --force                      Overwrite files that already exist.
 	    -s, --skip                       Skip files that already exist.
@@ -91,13 +91,13 @@ Generate a new model:
 	    -h, --help                       Show this message
 	        --debug                      Do not catch errors
 
-For example:
+For example, here is the command to generate a model named account, with the attributes name and industry.
 
 	:::term
 	$ cd myspace
 	$ rhodes model account name,industry
 
-This will generate the following files in  the folder app/Account:
+This will generate the following files in the folder app/Account:
 
 * app/Account/index.erb - the template to display the list of objects
 * app/Account/edit.erb - the template to edit an object
@@ -110,13 +110,13 @@ This will generate the following files in  the folder app/Account:
 * app/Account/account_controller.rb - contains the basic CRUD actions: index, new, create, edit, update and delete.
 * app/Account/account.rb - contains Account model definition
 
-Placeholder for Account test specs will be generated in the app/test folder:
+A placeholder for Account test specs will be generated in the app/test folder:
 
 * app/test/account_spec.rb - placeholder for Account test specs
 
 ## Add test framework
 
-Add test framework to the app:
+To add a test framework to the application:
 
 	Usage: rhodes spec
 
@@ -136,6 +136,6 @@ This will generate the following files in the app folder:
 * mspec.rb - contain all mspec required files
 * spec_runner.rb - contain spec framework initialization and generate list of spec files
 
-If you are going to use mspec then add mspec and fileutils extensions to build.yml:
+If you are going to use mspec, then add mspec and fileutils extensions to your application's build.yml file:
 
 	extensions: ["mspec", "fileutils"]