← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 3d4b53: Added more information about reserving namespaces, ...

 

  Branch: refs/heads/SmsDocs
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 3d4b535fcf4c64edbe226466576d9ce953513e86
      https://github.com/dhis2/dhis2-docs/commit/3d4b535fcf4c64edbe226466576d9ce953513e86
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Added more information about reserving namespaces, and altered the information about dataStore to clarify some misconception about the feature


  Commit: a6f17347a855bcc5233f8720265a88ad7742bcd7
      https://github.com/dhis2/dhis2-docs/commit/a6f17347a855bcc5233f8720265a88ad7742bcd7
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_toc.xml
    A src/docbkx/en/content/maintenance/test_book.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
    R src/docbkx/en/resources/maintenance/mtn_toc.xml
    R src/docbkx/en/resources/maintenance/test_book.xml

  Log Message:
  -----------
  Merge branch 'master' into dataStore


  Commit: 943b0d3ada3d4ca50f89c8981a328dc72cbab865
      https://github.com/dhis2/dhis2-docs/commit/943b0d3ada3d4ca50f89c8981a328dc72cbab865
  Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M .travis.yml
    M .utility/deploy.sh

  Log Message:
  -----------
  Merge branch 'master' into dataStore


  Commit: 1b6e9fec8a291e1b48af48c94e0f57996a86be39
      https://github.com/dhis2/dhis2-docs/commit/1b6e9fec8a291e1b48af48c94e0f57996a86be39
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 68c3d879d0525315362b6b397d9398c7083a9ddc
      https://github.com/dhis2/dhis2-docs/commit/68c3d879d0525315362b6b397d9398c7083a9ddc
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml

  Log Message:
  -----------
  Man app: data sets - added changes from corrupt commit

Commits
679575beef75514fd682eca150d889814eb95a33
6bc9fc74e68a20a920553e37bcd056c11af9c01a


  Commit: 73ff48621a3bba7249fdbe6dacbf79c1be6aed44
      https://github.com/dhis2/dhis2-docs/commit/73ff48621a3bba7249fdbe6dacbf79c1be6aed44
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png
    A src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/gis/gis_place_search.png
    A src/docbkx/en/resources/images/maintainence/create_data_element.png
    R src/docbkx/en/resources/images/maintainence/data_element_main2.png
    A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
    A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
    R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
    A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

  Log Message:
  -----------
  Merge branch 'master' into dataStore


  Commit: bfcb4434fca492654c73c51e2f010233c7f7d6e6
      https://github.com/dhis2/dhis2-docs/commit/bfcb4434fca492654c73c51e2f010233c7f7d6e6
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Man app: Data sets - more updates; Org units and Data elements - minor edits.


  Commit: b87e24de08d87201227675b2f0bfa58822cef6df
      https://github.com/dhis2/dhis2-docs/commit/b87e24de08d87201227675b2f0bfa58822cef6df
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge pull request #49 from dhis2/SmsDocs

Sms docs


  Commit: 7c77f673de060c1c40198ac7363daebddd800dcd
      https://github.com/dhis2/dhis2-docs/commit/7c77f673de060c1c40198ac7363daebddd800dcd
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into dataStore


  Commit: 01836d79888462a85336414e1a0540e00ac9a908
      https://github.com/dhis2/dhis2-docs/commit/01836d79888462a85336414e1a0540e00ac9a908
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png

  Log Message:
  -----------
  Image


  Commit: 8f06dbf1168fe1bf33b06eed9680f73bd9d47d87
      https://github.com/dhis2/dhis2-docs/commit/8f06dbf1168fe1bf33b06eed9680f73bd9d47d87
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png

  Log Message:
  -----------
  Show warning and error on completion action types


  Commit: 15d4a798b6a1d9f33f3a484bd57d48216fd82362
      https://github.com/dhis2/dhis2-docs/commit/15d4a798b6a1d9f33f3a484bd57d48216fd82362
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png

  Log Message:
  -----------
  Program Rules: Code for option set


  Commit: bcde6b4fbda88a73d404625a28f36dea890ae051
      https://github.com/dhis2/dhis2-docs/commit/bcde6b4fbda88a73d404625a28f36dea890ae051
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    A src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/gis/gis_place_search.png

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 6427968041d9a6dce0454bc8fb07c40715a4c4f7
      https://github.com/dhis2/dhis2-docs/commit/6427968041d9a6dce0454bc8fb07c40715a4c4f7
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 512232d949938e1a90dff14a8fc86275dc14ab78
      https://github.com/dhis2/dhis2-docs/commit/512232d949938e1a90dff14a8fc86275dc14ab78
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png

  Log Message:
  -----------
  Merge branch 'master' into dataStore


  Commit: 6a97c83ce8e86fc495ba7b87d4900614dcb60400
      https://github.com/dhis2/dhis2-docs/commit/6a97c83ce8e86fc495ba7b87d4900614dcb60400
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge pull request #45 from dhis2/dataStore

Improved documentation for reserving namespace in dataStore and added some clarification


  Commit: 18807445065896c7ed38964a5e2e673efe8bf66e
      https://github.com/dhis2/dhis2-docs/commit/18807445065896c7ed38964a5e2e673efe8bf66e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 3fe553fe0cfddc7de2be9b59f1027304a811e8f1
      https://github.com/dhis2/dhis2-docs/commit/3fe553fe0cfddc7de2be9b59f1027304a811e8f1
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Web Api: update data usage analytics section


  Commit: 000c33ef0079604256aa5eb19f35cc7b299c28ff
      https://github.com/dhis2/dhis2-docs/commit/000c33ef0079604256aa5eb19f35cc7b299c28ff
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge pull request #58 from dhis2/docinprogress

Merge latest updates on docinprogress with master


  Commit: ec252a655fe89d77054e699214af79f183525bb6
      https://github.com/dhis2/dhis2-docs/commit/ec252a655fe89d77054e699214af79f183525bb6
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 8bcd78c0d2c700d70fb4747cb30cf0c7b99e61f3
      https://github.com/dhis2/dhis2-docs/commit/8bcd78c0d2c700d70fb4747cb30cf0c7b99e61f3
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml

  Log Message:
  -----------
  App section: Review of new content


  Commit: 43f23838b0469b9374c289ecf755ed1ce0ff004f
      https://github.com/dhis2/dhis2-docs/commit/43f23838b0469b9374c289ecf755ed1ce0ff004f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml

  Log Message:
  -----------
  Merge pull request #59 from dhis2/docinprogress

Merge app section changes to master


  Commit: bd37bb93e0c79078f8cbe80e11a752325b3fc202
      https://github.com/dhis2/dhis2-docs/commit/bd37bb93e0c79078f8cbe80e11a752325b3fc202
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: a2b1253e0d493a7ede70826f3ee98d0cd61b4d17
      https://github.com/dhis2/dhis2-docs/commit/a2b1253e0d493a7ede70826f3ee98d0cd61b4d17
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_indicators.xml

  Log Message:
  -----------
  Man app: Indicators - major edits and restructure


  Commit: ee090c05b49345722cafa2b3231dbc0b8d10ece0
      https://github.com/dhis2/dhis2-docs/commit/ee090c05b49345722cafa2b3231dbc0b8d10ece0
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2016-06-25 (Sat, 25 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Generated ids (#61)

* Tracker user manual entry

* new chapters in web api

* More details on the generateAndReserve endpoint

* minor

* Reverted unintentional style "Fixes"

* Re-added updates to user manual tracker


  Commit: 7c917aa1d2e8974ed6a92139fce856b0252e168e
      https://github.com/dhis2/dhis2-docs/commit/7c917aa1d2e8974ed6a92139fce856b0252e168e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 681acc8435d1bab3de375ef78fd8d8e2cf4e2c47
      https://github.com/dhis2/dhis2-docs/commit/681acc8435d1bab3de375ef78fd8d8e2cf4e2c47
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_gis.xml

  Log Message:
  -----------
  GIS: review of PR #57 and #55


  Commit: 232e1845531899a585234d2b6caca06b2bee8f4b
      https://github.com/dhis2/dhis2-docs/commit/232e1845531899a585234d2b6caca06b2bee8f4b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml

  Log Message:
  -----------
  Merge pull request #62 from dhis2/docinprogress

Merge review of PR #55 and #57 with master


  Commit: 8572433cbc67de913286549ab02ff4220a57e169
      https://github.com/dhis2/dhis2-docs/commit/8572433cbc67de913286549ab02ff4220a57e169
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 2d02d42f0ab736e70ca7dcb19029c01287c1ec45
      https://github.com/dhis2/dhis2-docs/commit/2d02d42f0ab736e70ca7dcb19029c01287c1ec45
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml

  Log Message:
  -----------
  Mtn app: Indicators - Major review and update; Batchgroup - minor edits


  Commit: e5efcdcd91a541a92f279a2bf54a74e08d3593c7
      https://github.com/dhis2/dhis2-docs/commit/e5efcdcd91a541a92f279a2bf54a74e08d3593c7
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png

  Log Message:
  -----------
  Man app: Constant, Attribute and Options set - major edits; Indicators - minor edits

New screenshots


  Commit: 587987c1a570b54c6536f5c7b8170b0fad23cc7a
      https://github.com/dhis2/dhis2-docs/commit/587987c1a570b54c6536f5c7b8170b0fad23cc7a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png

  Log Message:
  -----------
  Merge pull request #63 from dhis2/docinprogress

Merge latest updates on docinprogress with master


  Commit: d75d07a2344a7cd1348daccfac918030c56beadd
      https://github.com/dhis2/dhis2-docs/commit/d75d07a2344a7cd1348daccfac918030c56beadd
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Man app: Misc edits and updates to multiple sections

Data admin
Data elements
Data sets and data forms
Indicator
Organisation units


  Commit: 6dcb5355fdb776d386490861f4b5b2b5ea9ca5ef
      https://github.com/dhis2/dhis2-docs/commit/6dcb5355fdb776d386490861f4b5b2b5ea9ca5ef
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: a5553fcc082f3739fe5ec221591aef94a5186509
      https://github.com/dhis2/dhis2-docs/commit/a5553fcc082f3739fe5ec221591aef94a5186509
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Usage analytics


  Commit: 8b8fc00c5bd7468c1e99b98164770d50c8411f9a
      https://github.com/dhis2/dhis2-docs/commit/8b8fc00c5bd7468c1e99b98164770d50c8411f9a
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png

  Log Message:
  -----------
  Merge branch 'master' into lars-docs


  Commit: 55173e81d457bcc2c91b50463e65f631dba9e606
      https://github.com/dhis2/dhis2-docs/commit/55173e81d457bcc2c91b50463e65f631dba9e606
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png

  Log Message:
  -----------
  Merge branch 'master' into lars-docs


  Commit: a47e4539c2a68455e34d3d6362fbbd782a046ba3
      https://github.com/dhis2/dhis2-docs/commit/a47e4539c2a68455e34d3d6362fbbd782a046ba3
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Merge pull request #64 from dhis2/lars-docs

Usage analytics


  Commit: 67da2fdca476f36522166bd80ee841d2f7474b36
      https://github.com/dhis2/dhis2-docs/commit/67da2fdca476f36522166bd80ee841d2f7474b36
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 4d436ae2cfc06cfddea33a617f6da5bc169235f4
      https://github.com/dhis2/dhis2-docs/commit/4d436ae2cfc06cfddea33a617f6da5bc169235f4
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png

  Log Message:
  -----------
  Man app: Misc changes; Web AP: add changes from PR 54

Changes to: Data elements, Data sets, Org units and Data sets,


  Commit: f79059dcb418fd2c3085a947a0ec217d4ac17223
      https://github.com/dhis2/dhis2-docs/commit/f79059dcb418fd2c3085a947a0ec217d4ac17223
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png

  Log Message:
  -----------
  Merge pull request #65 from dhis2/docinprogress

Merge latest updates on docinprogress with master


  Commit: 035c7a08e37f6c36f62fae1a8b7b17995b6f8e7c
      https://github.com/dhis2/dhis2-docs/commit/035c7a08e37f6c36f62fae1a8b7b17995b6f8e7c
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 20d43b8bec6c14dad4d51907a70e4ff5b0fadb82
      https://github.com/dhis2/dhis2-docs/commit/20d43b8bec6c14dad4d51907a70e4ff5b0fadb82
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Mtn app: misc edits; Indicators - major edits


  Commit: af194f89a0c3bc8c0fe2a54778a6d1f73eff2469
      https://github.com/dhis2/dhis2-docs/commit/af194f89a0c3bc8c0fe2a54778a6d1f73eff2469
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Merge pull request #66 from dhis2/docinprogress

Merge latest updates on docinprogress with master


  Commit: 41ffc55464a0453e61f542ebada8c8b6c2171941
      https://github.com/dhis2/dhis2-docs/commit/41ffc55464a0453e61f542ebada8c8b6c2171941
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 8e662dd91594c150f9516f758b6607db9b8a089a
      https://github.com/dhis2/dhis2-docs/commit/8e662dd91594c150f9516f758b6607db9b8a089a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Mtn app: new TOC cont.


  Commit: bb1255ff9cbfd382958b2e532c6650394282f344
      https://github.com/dhis2/dhis2-docs/commit/bb1255ff9cbfd382958b2e532c6650394282f344
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Merge pull request #67 from dhis2/docinprogress

Merge latest updates on docinprogress with master


  Commit: 500db50a685b54e124807be829b8ca85c6e690a6
      https://github.com/dhis2/dhis2-docs/commit/500db50a685b54e124807be829b8ca85c6e690a6
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: b0d665f9ee59794837060a56cb6750ffc8354107
      https://github.com/dhis2/dhis2-docs/commit/b0d665f9ee59794837060a56cb6750ffc8354107
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml

  Log Message:
  -----------
  Mtn app: data sets and forms - major edits; Dashboard: Messages - major edits.


  Commit: a6929f47190c7b41c158fc8c399e58d4bb93b762
      https://github.com/dhis2/dhis2-docs/commit/a6929f47190c7b41c158fc8c399e58d4bb93b762
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml

  Log Message:
  -----------
  Merge pull request #68 from dhis2/docinprogress

Merge latest updates on docinprogress into master


  Commit: dc1fa29c5e2294a52fc83a046f72e782c21847e6
      https://github.com/dhis2/dhis2-docs/commit/dc1fa29c5e2294a52fc83a046f72e782c21847e6
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Predictors


  Commit: b3d3f60945082e06ebec7aef6209696702ed74fc
      https://github.com/dhis2/dhis2-docs/commit/b3d3f60945082e06ebec7aef6209696702ed74fc
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png

  Log Message:
  -----------
  Merge branch 'master' into lars-docs


  Commit: 09bd8f846129eeb186e668f9d05b350840c3ee6d
      https://github.com/dhis2/dhis2-docs/commit/09bd8f846129eeb186e668f9d05b350840c3ee6d
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge pull request #69 from dhis2/lars-docs

Predictors


  Commit: 7caedfc6badb48582d3f6a517deaef8568da0f6d
      https://github.com/dhis2/dhis2-docs/commit/7caedfc6badb48582d3f6a517deaef8568da0f6d
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  translation API docs, wip


  Commit: 4feca59c2a5a6222a830ddc1154a2f52311616cf
      https://github.com/dhis2/dhis2-docs/commit/4feca59c2a5a6222a830ddc1154a2f52311616cf
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Merge branch 'master' into SmsDocs


Compare: https://github.com/dhis2/dhis2-docs/compare/c43f1328946a...4feca59c2a5a