Restructure form widgets

odk1-src/collect-filling-forms.rst

@@ -161,7 +161,7 @@ The arrow icon (|arrow|) in the top right corner opens the jump menu. From the j
 Autoadvance Questions
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Some questions will :ref:`auto-advance <autoadvance-widget>` after being answered.
+Some questions will :ref:`automatically advance to the next question <autoadvance>` after being answered.
 
 .. video:: /vid/form-widgets/auto-advance.mp4
 

odk1-src/collect-forms.rst

@@ -83,6 +83,8 @@ You can load forms directly from a computer to your device via USB, using :doc:`
 
   $ adb push path/to/form.xml /sdcard/odk/forms/form.xml
 
+.. _loading-forms-from-device-storage:
+
 Loading forms from device storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -102,6 +104,8 @@ You can also download forms to your device via a web browser, and move them to t
 
      The :guilabel:`Explore` option opens a file manager that you can use to move forms into Collect.
 
+.. _loading-form-media:
+
 Loading form media
 ----------------------
 

odk1-src/collect-offline-maps.rst

@@ -8,7 +8,7 @@
 Using Offline Maps
 ====================
 
-Collect's :ref:`geoshape`, :ref:`geotrace` and :ref:`geopoint` question types can be configured to display different maps. To use online maps, :ref:`set the mapping engine and basemap <mapping-settings>` in :ref:`interface-settings`. Users will need to be online to load questions with maps.
+Collect's :ref:`location-widgets` can be configured to display different maps. To use online maps, :ref:`set the mapping engine and basemap <mapping-settings>` in :ref:`interface-settings`. Users will need to be online to load questions with maps.
 
 Offline maps are useful for low-connectivity environments or to present custom geospatial data. Use them to display high-resolution imagery, annotated maps, heatmaps, and more. ODK Collect can display any map layer saved as a set of tiles in the `MBTiles format <https://github.com/mapbox/mbtiles-spec)>`_. Tiles are images that represent a subset of a map. The only limitation is that tile data in Mapbox's pbf format are not supported.
 
@@ -19,7 +19,7 @@ Offline maps quick start
 #. From :ref:`Collect's settings <mapping-settings>`, change the Mapping SDK to Google Maps SDK
 #. :ref:`Get or create your MBTiles file <getting-map-tiles>` with `TileMill <https://tilemill-project.github.io/tilemill/>`_ or other software.
 #. :ref:`Transfer tiles to devices <transferring-offline-tiles>`. The MBTiles file must be placed in a sub-folder on your device in the :file:`/sdcard/odk/layers` folder.
-#. Open a question that displays a map (types :ref:`geoshape`, :ref:`geotrace`, :ref:`geopoint` with certain appearances)
+#. Open a :ref:`question that displays a map <location-widgets>`.
 #. Tap the layers icon and select your map
 
 .. _getting-map-tiles:

odk1-src/collect-settings.rst

@@ -110,7 +110,7 @@ To access User Interface settings:
   - Google Maps (default)
   - OpenStreetMap
 
-  .. seealso:: :ref:`geopoint`, :ref:`geoshape`, :ref:`geotrace`, :doc:`offline maps <collect-offline-maps>`
+  .. seealso:: :ref:`geopoint-widget`, :ref:`geoshape-widget`, :ref:`geotrace-widget`, :doc:`offline maps <collect-offline-maps>`
 
 
 :guilabel:`Basemap`