← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] bb1255: Merge pull request #67 from dhis2/docinprogress

 

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


Compare: https://github.com/dhis2/dhis2-docs/compare/8e662dd91594...b0d665f9ee59