From c3e77ac69eb5ff8ec05ed1548f86d53059dcb773 Mon Sep 17 00:00:00 2001 From: Ankita Saxena Date: Tue, 12 Sep 2017 22:52:54 +0530 Subject: [PATCH 1/3] fix1 --- form-widgets.rst | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/form-widgets.rst b/form-widgets.rst index 83deef9dd..e5e8fb276 100644 --- a/form-widgets.rst +++ b/form-widgets.rst @@ -297,26 +297,26 @@ GeoTrace A line or polygon of GPS coordinates tracking actual device movement. The user can specify one of two location-recording modes: - Manual Mode — The user taps the device to place a marker as desired, while moving. -- Automatic Mode — The app creates a marker on a regular time interval (default: 20 second) as the user moves. +- Automatic Mode — The app creates a marker on a regular time interval (default: 20 seconds) as the user moves. .. image:: /img/form-widgets/geotrace-start.* :alt: A geotrace form widget displayed in the ODK Collect app on an Android phone. The question text is "Where have you been?" and below that is a button with the label "Start GeoTrace." .. image:: /img/form-widgets/geotrace1.* - :alt: A modal popup over a map. The modal headline is "Zoom to..." Below that are two options: "Zoom to current location" (selected) and "Zoom to saved feature". In the bottom-right of the modal is a Cancel button. + :alt: A modal popup over a map. The modal headine is "Zoom to..." Below that are two options: "Zoom to current location" (selected) and "Zoom to saved feature". In the bottom-right of the modal is a Cancel button. .. image:: /img/form-widgets/geotrace2.* :alt: A map displayed in the ODK Collect App on an Android phone. Above the map is the instruction: Wait for lock, then tap add marker button start. On the right side are five icon buttons stacked vertically: Add marker, Zoom, Layers, Trash, Save. .. image:: /img/form-widgets/geotrace3.* - :alt: The same map as displayed in the previous image. Over the map is a modal popup. The modal headine is "Select GeoTrace Mode," followed by two radio-button (single select) options: Manual Mode (selected) and Automatic Mode. In the bottom-right are buttons for Cancel and Start. + :alt: The same map as displayed in the previous image. Over the map is a modal popup. The modal headline is "Select GeoTrace Mode," followed by two radio-button (single select) options: Manual Mode (selected) and Automatic Mode. In the bottom-right are buttons for Cancel and Start. .. image:: /img/form-widgets/geotrace4.* :alt: The same modal popup as in the previous image, but the Automatic Mode radio button is not selected. Below it are two drop-down select boxes. Their values are "20" and "seconds." .. image:: /img/form-widgets/geotrace5.* - :alt: The same map as displayed previosuly, but now a series of red markers form a line across the map. + :alt: The same map as displayed previously, but now a series of red markers form a line across the map. .. image:: /img/form-widgets/geotrace6.* :alt: The same map as previously, with a new modal popup. The headlines of the modal is "Save GeoTrace as" followed by two options: Save as Polygon and Save as Polyline. In the bottom-right is a Cancel button. @@ -361,7 +361,7 @@ A user-entered series of GPS coordinates, forming a polygon. :alt: A map displayed in the ODK Collect App on an Android phone. Above the map is the instruction: "Long press to place marks." On the right side are five icon buttons stacked vertically: Add marker, Zoom, Layers, Trash, Save. .. image:: /img/form-widgets/geoshape3.* - :alt: The same map as displayed previosuly, but now a series of red markers form a polygon across the map. + :alt: The same map as displayed previously, but now a series of red markers form a polygon across the map. .. image:: /img/form-widgets/geoshape4.* :alt: The GeoShape form widget shown previously. The question text is "Select an Area." The button label is now "View or Change GeoShape." Below the button is a list of lat/long GPS coordinates. @@ -817,7 +817,7 @@ XForm XML External App String Widget ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Launches an external app and recieves a string input back from the external app. If the specified external app is not available, a manual input is prompted. +Launches an external app and receives a string input back from the external app. If the specified external app is not available, a manual input is prompted. The external app widget is displayed when the :th:`appearance` attribute begins with :tc:`ex:`. The rest of the :th:`appearance` string specifies the application to launch. @@ -858,7 +858,7 @@ Connects to an external printer. See `printing widget Date: Tue, 12 Sep 2017 22:55:09 +0530 Subject: [PATCH 2/3] fix2 --- getting-started.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started.rst b/getting-started.rst index 42f1e25db..225699159 100644 --- a/getting-started.rst +++ b/getting-started.rst @@ -27,7 +27,7 @@ This requires: - Forms can be created using tools other than Build or XLSForm - Forms can be uploaded directly to Collect, without using Aggregate - ODK is a very flexible set of tools, and orgnizations will find their own best practices for adopting it. + ODK is a very flexible set of tools, and organizations will find their own best practices for adopting it. .. _install-collect: @@ -85,4 +85,4 @@ Load, Complete, and Upload a Form with ODK Collect - Select :guilabel:`Send Finalized Form` to upload your completed survey to ODK Aggregate. -Now, you should be able to log back in to your ODK Aggregate instance and see your completed survey results. +Now, you should be able to log back into your ODK Aggregate instance and see your completed survey results. From 0063983d1aebc8852e199cce63948d666e08e027 Mon Sep 17 00:00:00 2001 From: Ankita Saxena Date: Tue, 12 Sep 2017 23:02:04 +0530 Subject: [PATCH 3/3] fix3 --- form-widgets.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/form-widgets.rst b/form-widgets.rst index e5e8fb276..4f8c4b8c1 100644 --- a/form-widgets.rst +++ b/form-widgets.rst @@ -304,7 +304,7 @@ A line or polygon of GPS coordinates tracking actual device movement. The user c :alt: A geotrace form widget displayed in the ODK Collect app on an Android phone. The question text is "Where have you been?" and below that is a button with the label "Start GeoTrace." .. image:: /img/form-widgets/geotrace1.* - :alt: A modal popup over a map. The modal headine is "Zoom to..." Below that are two options: "Zoom to current location" (selected) and "Zoom to saved feature". In the bottom-right of the modal is a Cancel button. + :alt: A modal popup over a map. The modal headline is "Zoom to..." Below that are two options: "Zoom to current location" (selected) and "Zoom to saved feature". In the bottom-right of the modal is a Cancel button. .. image:: /img/form-widgets/geotrace2.* :alt: A map displayed in the ODK Collect App on an Android phone. Above the map is the instruction: Wait for lock, then tap add marker button start. On the right side are five icon buttons stacked vertically: Add marker, Zoom, Layers, Trash, Save.