dhis2-documenters team mailing list archive

Thread
Date

[dhis2/dhis2-docs] f79059: Merge pull request #65 from dhis2/docinprogress

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Tue, 28 Jun 2016 07:17:36 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx

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


Compare: https://github.com/dhis2/dhis2-docs/compare/4d436ae2cfc0...20d43b8bec6c