← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 857243: Merge branch 'master' into docinprogress

 

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  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


Compare: https://github.com/dhis2/dhis2-docs/compare/232e18455318...587987c1a570