dhis2-documenters team mailing list archive

Thread
Date

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

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Fri, 01 Jul 2016 06:42:00 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 50866bf1e81236e01c68c97cb4f4b8c2d96f036e
      https://github.com/dhis2/dhis2-docs/commit/50866bf1e81236e01c68c97cb4f4b8c2d96f036e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

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


  Commit: 2029de28b5796bf2d9e526ff25c1943ac29a5c8f
      https://github.com/dhis2/dhis2-docs/commit/2029de28b5796bf2d9e526ff25c1943ac29a5c8f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_data_element.xml
    M src/docbkx/en/content/maintenance/mtn_data_set.xml
    M src/docbkx/en/content/maintenance/mtn_features_not_included.xml
    M src/docbkx/en/content/maintenance/mtn_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_org_unit.xml
    M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
    M src/docbkx/en/resources/images/maintainence/indicator_type_create.png

  Log Message:
  -----------
  Misc updates for 2.24


  Commit: c1425c998e6e733b13f660c141a5160e67458420
      https://github.com/dhis2/dhis2-docs/commit/c1425c998e6e733b13f660c141a5160e67458420
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_data_element.xml
    M src/docbkx/en/content/maintenance/mtn_data_set.xml
    M src/docbkx/en/content/maintenance/mtn_features_not_included.xml
    M src/docbkx/en/content/maintenance/mtn_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_org_unit.xml
    M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
    M src/docbkx/en/resources/images/maintainence/indicator_type_create.png

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

Misc updates for 2.24


Compare: https://github.com/dhis2/dhis2-docs/compare/25ff5fa83a5f...c1425c998e6e