dhis2-documenters team mailing list archive

Thread
Date

[dhis2/dhis2-docs] d9b594: Merge branch 'master' into mtn-restructure

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Thu, 30 Jun 2016 06:44:10 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: d9b5945c1d591f6f7b51e0ad4adce79b065d5983
      https://github.com/dhis2/dhis2-docs/commit/d9b5945c1d591f6f7b51e0ad4adce79b065d5983
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


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

  Changed paths:
    R src/docbkx/en/dhis2_user_man_data_elements.xml
    R src/docbkx/en/dhis2_user_man_datasets_forms.xml
    R src/docbkx/en/dhis2_user_man_indicators.xml
    R src/docbkx/en/dhis2_user_man_orgunits.xml
    A src/docbkx/en/obsolete_dhis2_user_man_data_elements.xml
    A src/docbkx/en/obsolete_dhis2_user_man_datasets_forms.xml
    A src/docbkx/en/obsolete_dhis2_user_man_indicators.xml
    A src/docbkx/en/obsolete_dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Mtn app: restructure - change file names


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

  Changed paths:
    R src/docbkx/en/dhis2_user_man_data_elements.xml
    R src/docbkx/en/dhis2_user_man_datasets_forms.xml
    R src/docbkx/en/dhis2_user_man_indicators.xml
    R src/docbkx/en/dhis2_user_man_orgunits.xml
    A src/docbkx/en/obsolete_dhis2_user_man_data_elements.xml
    A src/docbkx/en/obsolete_dhis2_user_man_datasets_forms.xml
    A src/docbkx/en/obsolete_dhis2_user_man_indicators.xml
    A src/docbkx/en/obsolete_dhis2_user_man_orgunits.xml

  Log Message:
  -----------
  Merge pull request #77 from dhis2/mtn-restructure

Mtn app: restructure - change file names


Compare: https://github.com/dhis2/dhis2-docs/compare/a164f49a63ef...c4aa7e78b740