dhis2-documenters team mailing list archive

Thread
Date
[dhis2/dhis2-docs] 0c5377: Merge branch 'master' into docinprogress

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Tue, 31 May 2016 23:31:12 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx
  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 0c5377a53ac9a1cdc6845f190b999f667e6701a0
      https://github.com/dhis2/dhis2-docs/commit/0c5377a53ac9a1cdc6845f190b999f667e6701a0
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

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


  Commit: 9bd50d50911e800595d2585224d23e9acf487383
      https://github.com/dhis2/dhis2-docs/commit/9bd50d50911e800595d2585224d23e9acf487383
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  add /24/ to api URLs, wip


  Commit: e77f435826c66039ff2498207843b1f1184b9455
      https://github.com/dhis2/dhis2-docs/commit/e77f435826c66039ff2498207843b1f1184b9455
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  add /24/ to api URLs, wip


  Commit: f0a60e47d667effd718f338b1aad5ec57e5686fb
      https://github.com/dhis2/dhis2-docs/commit/f0a60e47d667effd718f338b1aad5ec57e5686fb
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  add /24/ to api URLs, wip


  Commit: 5f16ac8b1d5fc664b6a62cefc4c5712f51d854c3
      https://github.com/dhis2/dhis2-docs/commit/5f16ac8b1d5fc664b6a62cefc4c5712f51d854c3
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

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


  Commit: b271adaf3733b71e061026996316fbba5836133b
      https://github.com/dhis2/dhis2-docs/commit/b271adaf3733b71e061026996316fbba5836133b
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  add /24/ to api URLs, wip


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

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

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


  Commit: 711fb911ce1b3196366af548f522a3aedb1afe40
      https://github.com/dhis2/dhis2-docs/commit/711fb911ce1b3196366af548f522a3aedb1afe40
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  add /24/ to api URLs, wip


  Commit: 30257498769a64349aea2fd75c63b83611fdb995
      https://github.com/dhis2/dhis2-docs/commit/30257498769a64349aea2fd75c63b83611fdb995
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  update URL for fred api, now located at /ohie/fred/v1


  Commit: c205c9da5c5f18d4fcbe2bc343d3931aeaa5a23b
      https://github.com/dhis2/dhis2-docs/commit/c205c9da5c5f18d4fcbe2bc343d3931aeaa5a23b
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

  Log Message:
  -----------
  change old apps.dhis2.org link to play.dhis2.org


  Commit: 1d754652e2d4c9d56c6dc0f1d861e9d03793012c
      https://github.com/dhis2/dhis2-docs/commit/1d754652e2d4c9d56c6dc0f1d861e9d03793012c
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-31 (Tue, 31 May 2016)

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

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


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

  Changed paths:
    M src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml

  Log Message:
  -----------
  Man app: metadata group editor - content created


  Commit: 5f09db7656d7904131a6428c51278039acb96642
      https://github.com/dhis2/dhis2-docs/commit/5f09db7656d7904131a6428c51278039acb96642
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_android_user_man_aggregate.xml
    M src/docbkx/en/dhis2_database.xml
    M src/docbkx/en/dhis2_database_schema.xml
    M src/docbkx/en/dhis2_developer_manual.xml
    M src/docbkx/en/dhis2_documentation_guide.xml
    M src/docbkx/en/dhis2_documentation_guide_book.xml
    M src/docbkx/en/dhis2_faq.xml
    M src/docbkx/en/dhis2_implementation_guide_data_quality.xml
    M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/en/dhis2_implementation_guide_indicators.xml
    M src/docbkx/en/dhis2_implementation_guide_installation.xml
    M src/docbkx/en/dhis2_implementation_guide_integration.xml
    M src/docbkx/en/dhis2_preface.xml
    M src/docbkx/en/dhis2_r.xml
    M src/docbkx/en/dhis2_technical_architechture_guide.xml
    M src/docbkx/en/dhis2_user_man_approving_data.xml
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_creating_data_quality.xml
    M src/docbkx/en/dhis2_user_man_creating_gis.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_dimensions.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_getting_started.xml
    M src/docbkx/en/dhis2_user_man_getting_started_enduser.xml
    M src/docbkx/en/dhis2_user_man_getting_started_enduser_ke.xml
    M src/docbkx/en/dhis2_user_man_import_export.xml
    M src/docbkx/en/dhis2_user_man_introduction.xml
    M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
    M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
    M src/docbkx/en/dhis2_user_man_profile.xml
    M src/docbkx/en/dhis2_user_man_settings.xml
    M src/docbkx/en/dhis2_user_man_sharing.xml
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_user_management.xml
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
    M src/docbkx/en/dhis2_user_man_using_reporting.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/glossary_en.xml
    M src/docbkx/en/resources/bookinfo/authorgroup.xml
    M src/docbkx/en/resources/bookinfo/bookinfo.xml
    M src/docbkx/en/resources/bookinfo/copyright.xml
    M src/docbkx/en/resources/bookinfo/keywordset.xml
    M src/docbkx/en/resources/xsl/fop-cust.xsl
    M src/docbkx/es/dhis2_documentation_guide_book_es.xml
    M src/docbkx/es/dhis2_documentation_guide_es.xml
    M src/docbkx/es/dhis2_implementation_guide_data_analysis_tools_overview.xml
    M src/docbkx/es/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
    M src/docbkx/es/dhis2_implementation_guide_data_quality.xml
    M src/docbkx/es/dhis2_implementation_guide_deployment_strategies.xml
    M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/es/dhis2_implementation_guide_es.xml
    M src/docbkx/es/dhis2_implementation_guide_indicators.xml
    M src/docbkx/es/dhis2_implementation_guide_installation.xml
    M src/docbkx/es/dhis2_implementation_guide_integration.xml
    M src/docbkx/es/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
    M src/docbkx/es/dhis2_implementation_guide_recommendations.xml
    M src/docbkx/es/dhis2_implementation_guide_setting_up_new_database.xml
    M src/docbkx/es/dhis2_implementation_guide_short.xml
    M src/docbkx/es/dhis2_localization_guide.xml
    M src/docbkx/es/dhis2_preface.xml
    M src/docbkx/es/dhis2_user_man_creating_data_quality.xml
    M src/docbkx/es/dhis2_user_man_creating_gis.xml
    M src/docbkx/es/dhis2_user_man_creating_reporting.xml
    M src/docbkx/es/dhis2_user_man_dashboard.xml
    M src/docbkx/es/dhis2_user_man_data_administration.xml
    M src/docbkx/es/dhis2_user_man_data_dimensions.xml
    M src/docbkx/es/dhis2_user_man_data_elements.xml
    M src/docbkx/es/dhis2_user_man_datasets_forms.xml
    M src/docbkx/es/dhis2_user_man_getting_started.xml
    M src/docbkx/es/dhis2_user_man_getting_started_enduser.xml
    M src/docbkx/es/dhis2_user_man_getting_started_enduser_ke.xml
    M src/docbkx/es/dhis2_user_man_import_export.xml
    M src/docbkx/es/dhis2_user_man_indicators.xml
    M src/docbkx/es/dhis2_user_man_integration.xml
    M src/docbkx/es/dhis2_user_man_introduction.xml
    M src/docbkx/es/dhis2_user_man_mobile.xml
    M src/docbkx/es/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
    M src/docbkx/es/dhis2_user_man_mobile_J2ME_sms_transport.xml
    M src/docbkx/es/dhis2_user_man_mobile_web_based.xml
    M src/docbkx/es/dhis2_user_man_orgunits.xml
    M src/docbkx/es/dhis2_user_man_persons_and_programs.xml
    M src/docbkx/es/dhis2_user_man_user_management.xml
    M src/docbkx/es/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/es/dhis2_user_man_using_gis.xml
    M src/docbkx/es/dhis2_user_man_using_reporting.xml
    M src/docbkx/es/dhis2_user_man_web_api.xml
    M src/docbkx/es/dhis2_user_manual_es.xml
    M src/docbkx/es/glossary_es.xml
    M src/docbkx/es/resources/bookinfo/authorgroup.xml
    M src/docbkx/es/resources/bookinfo/keywordset.xml
    M src/docbkx/es/resources/xsl/fop-cust.xsl
    M src/docbkx/fr/dhis2_documentation_guide.xml
    M src/docbkx/fr/dhis2_documentation_guide_book.xml
    M src/docbkx/fr/dhis2_implementation_guide.xml
    M src/docbkx/fr/dhis2_implementation_guide_as_a_platform.xml
    M src/docbkx/fr/dhis2_implementation_guide_conceptual_design_principles.xml
    M src/docbkx/fr/dhis2_implementation_guide_data_quality.xml
    M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/fr/dhis2_implementation_guide_indicators.xml
    M src/docbkx/fr/dhis2_implementation_guide_installation.xml
    M src/docbkx/fr/dhis2_implementation_guide_integration.xml
    M src/docbkx/fr/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
    M src/docbkx/fr/dhis2_implementation_guide_short.xml
    M src/docbkx/fr/dhis2_implementation_guide_support.xml
    M src/docbkx/fr/dhis2_preface.xml
    M src/docbkx/fr/dhis2_user_man_dashboard.xml
    M src/docbkx/fr/dhis2_user_man_data_elements.xml
    M src/docbkx/fr/dhis2_user_man_data_elements_and_indicators.xml
    M src/docbkx/fr/dhis2_user_man_excel_reports.xml
    M src/docbkx/fr/dhis2_user_man_getting_started.xml
    M src/docbkx/fr/dhis2_user_man_gis.xml
    M src/docbkx/fr/dhis2_user_man_introduction.xml
    M src/docbkx/fr/dhis2_user_man_orgunits.xml
    M src/docbkx/fr/dhis2_user_man_profile.xml
    M src/docbkx/fr/dhis2_user_man_reporting.xml
    M src/docbkx/fr/dhis2_user_man_using_gis.xml
    M src/docbkx/fr/dhis2_user_man_using_reporting.xml
    M src/docbkx/fr/dhis2_using_mydatamart_en.xml
    M src/docbkx/fr/glossary.xml
    M src/docbkx/fr/resources/bookinfo/authorgroup.xml
    M src/docbkx/fr/resources/bookinfo/keywordset.xml
    M src/docbkx/fr/resources/xsl/fop-cust.xsl
    M src/docbkx/fr/resources/xsl/fop-cust_ng.xsl
    M src/docbkx/fr/resources/xsl/fop-cust_zm.xsl
    M src/docbkx/pt/POSSIBLE_DUPLICATE_dhis2_user_man_indicators_intro.xml
    M src/docbkx/pt/dhis2_implementation_guide_data_quality.xml
    M src/docbkx/pt/dhis2_implementation_guide_indicators.xml
    M src/docbkx/pt/dhis2_implementation_guide_installation.xml
    M src/docbkx/pt/dhis2_implementation_guide_integration.xml
    M src/docbkx/pt/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
    M src/docbkx/pt/dhis2_implementation_guide_pt.xml
    M src/docbkx/pt/dhis2_implementation_guide_short.xml
    M src/docbkx/pt/dhis2_user_man_creating_data_quality.xml
    M src/docbkx/pt/dhis2_user_man_creating_gis.xml
    M src/docbkx/pt/dhis2_user_man_creating_reporting.xml
    M src/docbkx/pt/dhis2_user_man_dashboard.xml
    M src/docbkx/pt/dhis2_user_man_data_administration.xml
    M src/docbkx/pt/dhis2_user_man_data_elements.xml
    M src/docbkx/pt/dhis2_user_man_datasets_forms.xml
    M src/docbkx/pt/dhis2_user_man_getting_started.xml
    M src/docbkx/pt/dhis2_user_man_indicators.xml
    M src/docbkx/pt/dhis2_user_man_introduction.xml
    M src/docbkx/pt/dhis2_user_man_mobile.xml
    M src/docbkx/pt/dhis2_user_man_orgunits.xml
    M src/docbkx/pt/dhis2_user_man_persons_and_programs.xml
    M src/docbkx/pt/dhis2_user_man_user_management.xml
    M src/docbkx/pt/dhis2_user_man_using_gis.xml
    M src/docbkx/pt/dhis2_using_mydatamart_en.xml
    M src/docbkx/pt/help_content_pt.xml
    M src/docbkx/pt/resources/bookinfo/authorgroup.xml
    M src/docbkx/pt/resources/bookinfo/keywordset.xml
    M src/docbkx/pt/resources/xsl/fop-cust.xsl

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/docinprogress' into docinprogress


Compare: https://github.com/dhis2/dhis2-docs/compare/443cd113fea3...5f09db7656d7