← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 11fe11: Merge branch 'master' into toc-chapter-restructure

 

  Branch: refs/heads/toc-chapter-restructure
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 11fe1104c144fb55516cd8b6285612f6d2f98c54
      https://github.com/dhis2/dhis2-docs/commit/11fe1104c144fb55516cd8b6285612f6d2f98c54
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Log Message:
  -----------
  Merge branch 'master' into toc-chapter-restructure


  Commit: eeb7293c58b78884169558541cdeeef9b726c411
      https://github.com/dhis2/dhis2-docs/commit/eeb7293c58b78884169558541cdeeef9b726c411
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/docbkx/en/content/approvals/approvals.xml
    M src/docbkx/en/content/intro/ug_overview.xml
    M src/docbkx/en/content/settings/settings.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  More edits to overview topic and system settings


  Commit: 69a78c8694a4393825f70c48d93496611f069e1b
      https://github.com/dhis2/dhis2-docs/commit/69a78c8694a4393825f70c48d93496611f069e1b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/toc-chapter-restructure' into toc-chapter-restructure


Compare: https://github.com/dhis2/dhis2-docs/compare/afca219494a7...69a78c8694a4