dhis2-documenters team mailing list archive

Thread
Date
[dhis2/dhis2-docs] 61df97: Test commit (exclude dhis2tools file)

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Sun, 04 Dec 2016 11:39:41 -0800
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx
  Branch: refs/heads/config-andorid-app
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 61df97b22d9d8730bceb5965319d5b29061d9eef
      https://github.com/dhis2/dhis2-docs/commit/61df97b22d9d8730bceb5965319d5b29061d9eef
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/aggregate.xml
    A src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/dhis2_android_user_man.xml

  Log Message:
  -----------
  Test commit (exclude dhis2tools file)


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

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    A src/docbkx/en/content/user_management/c_user_mgt.xml
    A src/docbkx/en/content/user_management/t_mgt_user.xml
    A src/docbkx/en/content/user_management/t_mgt_user_role.xml
    A src/docbkx/en/content/user_management/t_open_id.xml
    A src/docbkx/en/content/user_management/toc_user_mgt.xml
    R src/docbkx/en/content/user_management/user_management.xml
    M src/docbkx/en/dhis2_android_user_man.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  User app: updates to clarify tasks

So that these tasks can be linked into the program config for Android
apps task


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

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 5cb0b821842b8871b7fb1404339c976a91b7a7c2
      https://github.com/dhis2/dhis2-docs/commit/5cb0b821842b8871b7fb1404339c976a91b7a7c2
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/t_mgt_user.xml
    R src/docbkx/en/content/user_management/t_mgt_user_role.xml
    A src/docbkx/en/content/user_management/t_mgt_usergroup.xml
    A src/docbkx/en/content/user_management/t_mgt_userrole.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml

  Log Message:
  -----------
  User app: more restructure and rework


  Commit: 8406d40e74a093b418011395fa1c4df5bd9fe679
      https://github.com/dhis2/dhis2-docs/commit/8406d40e74a093b418011395fa1c4df5bd9fe679
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    A src/docbkx/en/content/user_management/common/user_clone.xml
    A src/docbkx/en/content/user_management/common/user_delete.xml
    A src/docbkx/en/content/user_management/common/user_display.xml
    A src/docbkx/en/content/user_management/common/user_edit.xml
    A src/docbkx/en/content/user_management/common/user_share.xml
    A src/docbkx/en/content/user_management/common/user_translate.xml
    R src/docbkx/en/content/user_management/t_mgt_user.xml
    R src/docbkx/en/content/user_management/t_mgt_usergroup.xml
    R src/docbkx/en/content/user_management/t_mgt_userrole.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/content/user_management/user/toc_user.xml
    A src/docbkx/en/content/user_management/user_group/toc_user_group.xml
    A src/docbkx/en/content/user_management/user_role/toc_user_role.xml

  Log Message:
  -----------
  Users app: structure changes


  Commit: 1736f8e33890f9f41db4177efbaa13416ba5677f
      https://github.com/dhis2/dhis2-docs/commit/1736f8e33890f9f41db4177efbaa13416ba5677f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/content/user_management/user/t_user_create.xml
    A src/docbkx/en/content/user_management/user_group/t_usergroup_create.xml
    A src/docbkx/en/content/user_management/user_group/t_usergroup_join.xml
    A src/docbkx/en/content/user_management/user_group/t_usergroup_leave.xml
    R src/docbkx/en/content/user_management/user_group/toc_user_group.xml
    A src/docbkx/en/content/user_management/user_group/toc_usergroup.xml
    A src/docbkx/en/content/user_management/user_role/t_userrole_create.xml
    R src/docbkx/en/content/user_management/user_role/toc_user_role.xml
    A src/docbkx/en/content/user_management/user_role/toc_userrole.xml

  Log Message:
  -----------
  User app: more structure changes.


  Commit: 2e51755963c3cab1bb45b4e8e4bef6f8d846abe2
      https://github.com/dhis2/dhis2-docs/commit/2e51755963c3cab1bb45b4e8e4bef6f8d846abe2
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/common/user_clone.xml
    A src/docbkx/en/content/user_management/t_mgt_other_users.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/content/user_management/user/t_user_assign_orgunit.xml
    M src/docbkx/en/content/user_management/user/t_user_create.xml
    A src/docbkx/en/content/user_management/user/t_user_delete_current.xml
    A src/docbkx/en/content/user_management/user/t_user_disable.xml
    A src/docbkx/en/content/user_management/user/t_user_display_orgunit.xml
    A src/docbkx/en/content/user_management/user/t_user_display_profile.xml
    M src/docbkx/en/content/user_management/user/toc_user.xml
    M src/docbkx/en/content/user_management/user_role/t_userrole_create.xml
    M src/docbkx/en/content/user_management/user_role/toc_userrole.xml

  Log Message:
  -----------
  User app: more restructure and single sorucing


  Commit: 950e788f1e2e8abfaf8394fb2e83c4d73efeee81
      https://github.com/dhis2/dhis2-docs/commit/950e788f1e2e8abfaf8394fb2e83c4d73efeee81
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml

  Log Message:
  -----------
  User app: minor edit


  Commit: 152304b9f449e36dabec54d32082e93956491733
      https://github.com/dhis2/dhis2-docs/commit/152304b9f449e36dabec54d32082e93956491733
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml

  Log Message:
  -----------
  User app: more changes


  Commit: efe361f9f561383afbefdc16b05534d6974d542a
      https://github.com/dhis2/dhis2-docs/commit/efe361f9f561383afbefdc16b05534d6974d542a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/option_set/t_option_set_create.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    R src/docbkx/en/content/user_management/common/user_clone.xml
    M src/docbkx/en/content/user_management/common/user_delete.xml
    M src/docbkx/en/content/user_management/common/user_display.xml
    M src/docbkx/en/content/user_management/common/user_edit.xml
    M src/docbkx/en/content/user_management/common/user_share.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/content/user_management/user/t_user_clone.xml
    M src/docbkx/en/content/user_management/user/toc_user.xml
    M src/docbkx/en/content/user_management/user_group/t_usergroup_create.xml
    M src/docbkx/en/content/user_management/user_group/t_usergroup_join.xml
    M src/docbkx/en/content/user_management/user_group/t_usergroup_leave.xml

  Log Message:
  -----------
  User app: more changes


  Commit: 10c0a48831f5d76b29c70cd2205678b3f7f0fd8b
      https://github.com/dhis2/dhis2-docs/commit/10c0a48831f5d76b29c70cd2205678b3f7f0fd8b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    A src/docbkx/en/content/user_management/c_user_mgt_wf.xml
    R src/docbkx/en/content/user_management/common/user_translate.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    M src/docbkx/en/content/user_management/user_role/t_userrole_create.xml

  Log Message:
  -----------
  Users app: more content added and restructure


  Commit: 59b40d046eeb22cd47ae9ba2686656281f32453f
      https://github.com/dhis2/dhis2-docs/commit/59b40d046eeb22cd47ae9ba2686656281f32453f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    A src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    M src/docbkx/en/content/user_management/user/t_user_assign_orgunit.xml
    M src/docbkx/en/content/user_management/user/t_user_clone.xml
    M src/docbkx/en/content/user_management/user/t_user_delete_current.xml
    M src/docbkx/en/content/user_management/user/t_user_disable.xml
    M src/docbkx/en/content/user_management/user/t_user_display_orgunit.xml
    M src/docbkx/en/content/user_management/user/t_user_display_profile.xml

  Log Message:
  -----------
  Users app: more content added


  Commit: d1d86e3fda257a6bf71c4c2a913a5b603e86c26c
      https://github.com/dhis2/dhis2-docs/commit/d1d86e3fda257a6bf71c4c2a913a5b603e86c26c
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/c_user_mgt_wf.xml
    M src/docbkx/en/content/user_management/user/t_user_create.xml

  Log Message:
  -----------
  Users app: more changes


  Commit: b075c6e64d78f290904fdfacf31fc8f2b4c02da1
      https://github.com/dhis2/dhis2-docs/commit/b075c6e64d78f290904fdfacf31fc8f2b4c02da1
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 1aa5d280d375590301b80a6b094d37f0109ce228
      https://github.com/dhis2/dhis2-docs/commit/1aa5d280d375590301b80a6b094d37f0109ce228
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/bookinfo/build.properties
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 619d588735b5ed1965fd198c316f9cc59dd7d766
      https://github.com/dhis2/dhis2-docs/commit/619d588735b5ed1965fd198c316f9cc59dd7d766
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/c_user_mgt_wf.xml

  Log Message:
  -----------
  Users app: more updates and content


  Commit: 2fb6187a6f461b0291ea9e75f73fb5fbdd78b718
      https://github.com/dhis2/dhis2-docs/commit/2fb6187a6f461b0291ea9e75f73fb5fbdd78b718
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/implementer/users_and_user_roles.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/c_user_mgt_wf.xml

  Log Message:
  -----------
  Users app: remove xml:id and add concept to implementer guide


  Commit: 39147f8b565a042bdf87b2ff9df652e517c773c3
      https://github.com/dhis2/dhis2-docs/commit/39147f8b565a042bdf87b2ff9df652e517c773c3
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    A src/docbkx/en/resources/images/android/common/config_error_program.png

  Log Message:
  -----------
  Android: program config on web for android


  Commit: fd361c31cbf290ca68b56703a7b0cf02ff9665f0
      https://github.com/dhis2/dhis2-docs/commit/fd361c31cbf290ca68b56703a7b0cf02ff9665f0
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 43efb25c674a778dce07dbeac71c31037023e2a3
      https://github.com/dhis2/dhis2-docs/commit/43efb25c674a778dce07dbeac71c31037023e2a3
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml

  Log Message:
  -----------
  Android user guide: config program - more updates


  Commit: 7ab1a83f6ac1e21e3ae4bfbe82513983243f4dee
      https://github.com/dhis2/dhis2-docs/commit/7ab1a83f6ac1e21e3ae4bfbe82513983243f4dee
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 4de82b07e21664a281f8ffa35ec389af048e7554
      https://github.com/dhis2/dhis2-docs/commit/4de82b07e21664a281f8ffa35ec389af048e7554
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_management/c_user_mgt.xml

  Log Message:
  -----------
  Users app: add comment


  Commit: a4e0d22a2a931199684bc2fb282d097ba823181f
      https://github.com/dhis2/dhis2-docs/commit/a4e0d22a2a931199684bc2fb282d097ba823181f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: e183b49f68cd755d0b9cc94fdad64151f3017790
      https://github.com/dhis2/dhis2-docs/commit/e183b49f68cd755d0b9cc94fdad64151f3017790
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: d393e8e27b103f0fa6d381560cacb95f9d199fcf
      https://github.com/dhis2/dhis2-docs/commit/d393e8e27b103f0fa6d381560cacb95f9d199fcf
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/apps.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: b335545ad98c0707eb2fa833708bb4661a120b94
      https://github.com/dhis2/dhis2-docs/commit/b335545ad98c0707eb2fa833708bb4661a120b94
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 760972580a29f3cb288f4f897c38746ad63fc909
      https://github.com/dhis2/dhis2-docs/commit/760972580a29f3cb288f4f897c38746ad63fc909
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: ba33f0288a8e0f1d84fee6a18495a2f76972506d
      https://github.com/dhis2/dhis2-docs/commit/ba33f0288a8e0f1d84fee6a18495a2f76972506d
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml

  Log Message:
  -----------
  Android manual: minor edits


  Commit: b921156e76fcdeaebe85b08fd2f228fc8e34a32b
      https://github.com/dhis2/dhis2-docs/commit/b921156e76fcdeaebe85b08fd2f228fc8e34a32b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 8c10e26719a41d8459e10170dcb36bbb6c1a0cf9
      https://github.com/dhis2/dhis2-docs/commit/8c10e26719a41d8459e10170dcb36bbb6c1a0cf9
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml

  Log Message:
  -----------
  Android user manual: more edits; Users app; more edits


  Commit: d59ffc0380d9e39738c01bc49dc2404642e93761
      https://github.com/dhis2/dhis2-docs/commit/d59ffc0380d9e39738c01bc49dc2404642e93761
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/implementer/localization.xml
    R src/docbkx/en/resources/images/i18n/i18n_web_portal_translate.PNG
    A src/docbkx/en/resources/images/i18n/i18n_web_portal_translate.png
    A src/docbkx/en/resources/images/i18n/translations_app.png

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 86936f031700acdd43807676b495eb9a8f19bd07
      https://github.com/dhis2/dhis2-docs/commit/86936f031700acdd43807676b495eb9a8f19bd07
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 6596555f62d5cc2cd43c6b397b145a849f6cb6d1
      https://github.com/dhis2/dhis2-docs/commit/6596555f62d5cc2cd43c6b397b145a849f6cb6d1
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/implementer/localization.xml
    R src/docbkx/en/resources/images/i18n/i18n_web_portal_translate.PNG
    A src/docbkx/en/resources/images/i18n/i18n_web_portal_translate.png
    A src/docbkx/en/resources/images/i18n/translations_app.png

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 18f6f86f3615843b61cd80f125ba239fc6970a9a
      https://github.com/dhis2/dhis2-docs/commit/18f6f86f3615843b61cd80f125ba239fc6970a9a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: e334d40fedd778c04f826d290acd54f5ab888b66
      https://github.com/dhis2/dhis2-docs/commit/e334d40fedd778c04f826d290acd54f5ab888b66
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M .travis.yml
    M src/docbkx/en/content/analysis/using_gis.xml
    A src/docbkx/en/content/implementer/dhis2tools/manual.xml
    M src/docbkx/en/dhis2_implementation_guide.xml
    R src/docbkx/en/dhis2tools
    A src/docbkx/en/resources/images/dhis2tools/architecture.svg
    M src/docbkx/en/resources/images/gis/gis_boundary_layers.PNG
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer.PNG

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 897f9234e0f82b03ac146fdedb3708c057ef5806
      https://github.com/dhis2/dhis2-docs/commit/897f9234e0f82b03ac146fdedb3708c057ef5806
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/datim.xml
    A src/docbkx/en/resources/images/use_cases/PEPFAR_logo.png
    A src/docbkx/en/resources/images/use_cases/ohie.png
    A src/docbkx/en/resources/images/use_cases/pepfar_datim_GIS.png

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 1fef763c2082a95fea5ad34e83eee0d0d0a991d4
      https://github.com/dhis2/dhis2-docs/commit/1fef763c2082a95fea5ad34e83eee0d0d0a991d4
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/config-andorid-app' into config-andorid-app


  Commit: e4510cc609328d7325c583202a8deb70405f3ba7
      https://github.com/dhis2/dhis2-docs/commit/e4510cc609328d7325c583202a8deb70405f3ba7
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/sharing/sharing.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/common/user_share.xml
    M src/docbkx/en/content/user_management/t_mgt_other_users.xml
    M src/docbkx/en/content/user_management/t_open_id.xml
    M src/docbkx/en/content/user_management/user/t_user_create.xml
    M src/docbkx/en/content/user_management/user/toc_user.xml
    M src/docbkx/en/content/user_management/user_role/t_userrole_create.xml

  Log Message:
  -----------
  Sharing: add xmlid; Android: further edits; Users: further edits


  Commit: 3346b4eb21c0d117d64c5d7c4b280bec8eb43739
      https://github.com/dhis2/dhis2-docs/commit/3346b4eb21c0d117d64c5d7c4b280bec8eb43739
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 80949a80c97132c997523cb5d674441b17eb3176
      https://github.com/dhis2/dhis2-docs/commit/80949a80c97132c997523cb5d674441b17eb3176
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/user_management/common/user_share.xml

  Log Message:
  -----------
  Android: minor edit; Users: minor edit


  Commit: 2f3edef578984cdff4ef9224d6e8dc519125fd66
      https://github.com/dhis2/dhis2-docs/commit/2f3edef578984cdff4ef9224d6e8dc519125fd66
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    A Jenkinsfile
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 5a76241b17cc21d85f39ba30847445f72f37ec33
      https://github.com/dhis2/dhis2-docs/commit/5a76241b17cc21d85f39ba30847445f72f37ec33
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M .utility/sitemap.xml
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: ed5304bbe4730f6797942b0ddf48b1534e239048
      https://github.com/dhis2/dhis2-docs/commit/ed5304bbe4730f6797942b0ddf48b1534e239048
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M .travis.yml
    M src/docbkx/en/content/maintenance/common/mtn_clone.xml
    M src/docbkx/en/content/maintenance/common/mtn_delete.xml
    M src/docbkx/en/content/maintenance/common/mtn_edit.xml
    M src/docbkx/en/content/maintenance/common/mtn_translate.xml
    A src/docbkx/en/content/maintenance/data_element/c_datael.xml
    A src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    A src/docbkx/en/content/maintenance/data_element/t_dataelgroup_create.xml
    A src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    A src/docbkx/en/content/maintenance/data_element/toc_datael.xml
    A src/docbkx/en/content/maintenance/data_element/wf_datael.xml
    R src/docbkx/en/content/maintenance/mtn_data_element.xml
    R src/docbkx/en/content/maintenance/mtn_org_unit.xml
    R src/docbkx/en/content/maintenance/mtn_program.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    A src/docbkx/en/content/maintenance/org_unit/c_orgunit.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_create.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_level_name.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_move.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunitgroup_create.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunitgroupset_create.xml
    A src/docbkx/en/content/maintenance/org_unit/toc_orgunit.xml
    A src/docbkx/en/content/maintenance/org_unit/wf_orgunit.xml
    M src/docbkx/en/content/user_stories/user_stories_book.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 04075e4177e424585840e9a25d2b2416df40e7e0
      https://github.com/dhis2/dhis2-docs/commit/04075e4177e424585840e9a25d2b2416df40e7e0
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    A src/docbkx/en/content/maintenance/data_set/c_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_create.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_task.xml
    A src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/wf_dataset.xml
    A src/docbkx/en/content/maintenance/indicator/c_indicator.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicator_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatorgroup_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatorgroupset_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatortype_create.xml
    A src/docbkx/en/content/maintenance/indicator/toc_indicator.xml
    A src/docbkx/en/content/maintenance/indicator/wf_indicator.xml
    R src/docbkx/en/content/maintenance/mtn_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 86198e18da7385d4a4dacaf0cab834869df8d1d0
      https://github.com/dhis2/dhis2-docs/commit/86198e18da7385d4a4dacaf0cab834869df8d1d0
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M pom.xml
    M src/docbkx/en/content/developer/web_api.xml
    A src/docbkx/en/content/implementer/jira_gettingstarted.xml
    M src/docbkx/en/content/maintenance/common/mtn_delete.xml
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/maintenance/common/mtn_translate.xml
    M src/docbkx/en/content/maintenance/data_set/c_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/t_customform_manage.xml
    M src/docbkx/en/content/maintenance/data_set/t_dataset_create.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_editcomp_de.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_override_catcombo.xml
    R src/docbkx/en/content/maintenance/data_set/t_dataset_task.xml
    A src/docbkx/en/content/maintenance/data_set/t_defaultform_download.xml
    A src/docbkx/en/content/maintenance/data_set/t_sectionform_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/data_set/wf_dataset.xml
    R src/docbkx/en/content/maintenance/mtn_data_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    A src/docbkx/en/content/user_stories/kurdistan.xml
    M src/docbkx/en/dhis2_implementation_guide.xml
    A src/docbkx/en/resources/images/implementation_guide/jira_create_issue.png
    A src/docbkx/en/resources/images/implementation_guide/jira_favorite_filters.png
    A src/docbkx/en/resources/images/implementation_guide/jira_manage_filters.png
    A src/docbkx/en/resources/images/implementation_guide/jira_remove_filters.png
    A src/docbkx/en/resources/images/implementation_guide/jira_save.png
    A src/docbkx/en/resources/images/implementation_guide/jira_search_issues.png
    A src/docbkx/en/resources/images/use_cases/regions.png

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 880c058fa21f63fd85da40211be42087e951c300
      https://github.com/dhis2/dhis2-docs/commit/880c058fa21f63fd85da40211be42087e951c300
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/resources/images/android/common/config_program_orgunit_setting.png
    A src/docbkx/en/resources/images/android/common/config_program_user_setting.png
    A src/docbkx/en/resources/images/android/common/config_program_userrole_setting.png

  Log Message:
  -----------
  Android config program: added content and screen grabs; Users app: minor edits

Updated links to point to Jenkins doc server.


  Commit: f4e12022b68c98d41f12d5c682460ae48c768b92
      https://github.com/dhis2/dhis2-docs/commit/f4e12022b68c98d41f12d5c682460ae48c768b92
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: 06303e1fd70eab1b46fb8b517482ac338b07f829
      https://github.com/dhis2/dhis2-docs/commit/06303e1fd70eab1b46fb8b517482ac338b07f829
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M src/docbkx/en/content/android/config_program.xml

  Log Message:
  -----------
  Android program config: graphics and list edits


  Commit: 18605cf8b9f05aff8383cc400755629d1486a894
      https://github.com/dhis2/dhis2-docs/commit/18605cf8b9f05aff8383cc400755629d1486a894
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


  Commit: c421f6c97f31d0896a18edc30e074681e4dabbf5
      https://github.com/dhis2/dhis2-docs/commit/c421f6c97f31d0896a18edc30e074681e4dabbf5
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-12-04 (Sun, 04 Dec 2016)

  Changed paths:
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/attribute/toc_attribute.xml
    M src/docbkx/en/content/maintenance/category/c_category.xml
    M src/docbkx/en/content/maintenance/category/t_cat_combo_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_combo_for_datasets.xml
    M src/docbkx/en/content/maintenance/category/t_cat_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_combo_assigncode.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_gr_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_gr_set_create.xml
    M src/docbkx/en/content/maintenance/category/wf_category.xml
    M src/docbkx/en/content/maintenance/constant/toc_constant.xml
    M src/docbkx/en/content/maintenance/data_element/c_datael.xml
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroup_create.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    M src/docbkx/en/content/maintenance/data_element/toc_datael.xml
    M src/docbkx/en/content/maintenance/data_element/wf_datael.xml
    M src/docbkx/en/content/maintenance/data_set/wf_dataset.xml
    M src/docbkx/en/content/maintenance/legend/toc_legend.xml
    M src/docbkx/en/content/maintenance/option_set/toc_option_set.xml
    M src/docbkx/en/content/maintenance/predictor/toc_predictor.xml
    M src/docbkx/en/content/maintenance/push_analysis/c_push_analysis.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_create.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_preview.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_run.xml
    M src/docbkx/en/content/maintenance/push_analysis/toc_push_analysis.xml
    M src/docbkx/en/content/maintenance/tracker/c_mtn_tracker.xml
    M src/docbkx/en/content/maintenance/tracker/t_reltype_create.xml
    M src/docbkx/en/content/maintenance/tracker/t_te_attribute_create.xml
    M src/docbkx/en/content/maintenance/tracker/t_te_attributegr_create.xml
    A src/docbkx/en/resources/images/dashboard/dashboard_messages_manage.png
    M src/docbkx/en/resources/images/dashboard/dashboard_messages_queue.png
    A src/docbkx/en/resources/images/dashboard/dashboard_messages_queue_old.png

  Log Message:
  -----------
  Merge branch 'master' into config-andorid-app


Compare: https://github.com/dhis2/dhis2-docs/compare/61df97b22d9d^...c421f6c97f31