dhis2-documenters team mailing list archive

[Cecilia Persson <cecilia@xxxxxxxxx>]

  Branch: refs/heads/v2-use-cases
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 213fb552c97b7b14d136de99b27b64d52291476e
      https://github.com/dhis2/dhis2-docs/commit/213fb552c97b7b14d136de99b27b64d52291476e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

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


  Commit: 1a03757c69e3783cab475c6cc2885297d8d77fb8
      https://github.com/dhis2/dhis2-docs/commit/1a03757c69e3783cab475c6cc2885297d8d77fb8
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_import_export.xml
    A src/docbkx/en/dhis2_user_man_metadata_synchronization.xml
    M src/docbkx/en/dhis2_user_man_settings.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/maintainence/metadata_synchronization.png
    A src/docbkx/en/resources/images/maintainence/scheduling_management.png
    A src/docbkx/en/resources/images/metadata_synchronization/Metadata_sync.png
    A src/docbkx/en/resources/images/metadata_synchronization/dhis2_architecture.png
    A src/docbkx/en/resources/images/metadata_synchronization/metadata_synchronization.png
    A src/docbkx/en/resources/images/metadata_synchronization/metadata_versioning.png
    A src/docbkx/en/resources/images/settings/metadata_versioning_table.png
    A src/docbkx/en/resources/images/settings/metadata_versioning_table_failure_case.png

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


  Commit: 11a8a3c03b00e01e2926c66d4dd1ce069bbfd936
      https://github.com/dhis2/dhis2-docs/commit/11a8a3c03b00e01e2926c66d4dd1ce069bbfd936
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M pom.xml
    R src/docbkx/en/content/use_cases/akros.xml
    R src/docbkx/en/content/use_cases/psi.xml
    R src/docbkx/en/content/use_cases/udsm.xml
    R src/docbkx/en/content/use_cases/use_cases_book.xml
    A src/docbkx/en/content/user_stories/akros.xml
    A src/docbkx/en/content/user_stories/psi.xml
    A src/docbkx/en/content/user_stories/udsm.xml
    A src/docbkx/en/content/user_stories/user_stories_book.xml

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


  Commit: 0a51320d5f03b633512d3f68f0373b93bccb9c11
      https://github.com/dhis2/dhis2-docs/commit/0a51320d5f03b633512d3f68f0373b93bccb9c11
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_metadata_synchronization.xml
    M src/docbkx/en/dhis2_user_man_settings.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Synch doc: quick review of PR 79, fixed DocBook 5 format issues

Also updated default link to help setting


  Commit: 8eaff32e12369cc1a5cba85b01da2de6bc2ed1e0
      https://github.com/dhis2/dhis2-docs/commit/8eaff32e12369cc1a5cba85b01da2de6bc2ed1e0
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml

  Log Message:
  -----------
  Data adm: minor edits, fixed DocBook 5 format issues


  Commit: 0c568fa35563f29879a8737c06477525ec5a7074
      https://github.com/dhis2/dhis2-docs/commit/0c568fa35563f29879a8737c06477525ec5a7074
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_metadata_synchronization.xml
    M src/docbkx/en/dhis2_user_man_settings.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge pull request #89 from dhis2/docinprogress - Quick review of PR 79, fixed DocBook 5 format issues 

Quick review of PR 79, fixed DocBook 5 format issues


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_metadata_synchronization.xml
    M src/docbkx/en/dhis2_user_man_settings.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into v2-use-cases


Compare: https://github.com/dhis2/dhis2-docs/compare/a1a64c7adacf...f2b48530573a