dhis2-documenters team mailing list archive

Thread
Date
[dhis2/dhis2-docs] e62df0: Merge remote-tracking branch 'refs/remotes/origin/...

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: Mon, 25 Apr 2016 04:53:22 -0700
Reply-to: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Sender: jason.p.pickering=gmail.com@xxxxxxxxxx
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: e62df089cd6941de64c2580235de3ada504adbf0
      https://github.com/dhis2/dhis2-docs/commit/e62df089cd6941de64c2580235de3ada504adbf0
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-20 (Wed, 20 Apr 2016)

  Changed paths:
    M .gitignore
    M src/docbkx/en/dhis2_implementation_guide_setting_up_new_database.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into doc-in-progress


  Commit: e91a48f8dd702af40fa8e86117997bcefb219904
      https://github.com/dhis2/dhis2-docs/commit/e91a48f8dd702af40fa8e86117997bcefb219904
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    R src/docbkx/en/dhis2_user_man_excel_reports.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_tracker_capture.xml
    A src/docbkx/en/resources/images/gis/gis_eventlayer_eventinfopopup.png
    R src/docbkx/es/dhis2_user_man_excel_reports.xml
    M src/docbkx/es/dhis2_user_manual_es.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into doc-in-progress


  Commit: bf222735c4a0184ab95606db94b70041e762d3c6
      https://github.com/dhis2/dhis2-docs/commit/bf222735c4a0184ab95606db94b70041e762d3c6
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into doc-in-progress


  Commit: ad44ad71106821349ef1b4ff6736c8d04d299df4
      https://github.com/dhis2/dhis2-docs/commit/ad44ad71106821349ef1b4ff6736c8d04d299df4
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into doc-in-progress


  Commit: 1c3707b4fdcb26339125e8f1ca83cf24d3067007
      https://github.com/dhis2/dhis2-docs/commit/1c3707b4fdcb26339125e8f1ca83cf24d3067007
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_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/resources/images/visualizer/chart_favorites.png

  Log Message:
  -----------
  Review of Data Visualizer, small edits to GIS and Pivot Table apps.


  Commit: 91c2c26a3863a950acddc6091d759524c691107f
      https://github.com/dhis2/dhis2-docs/commit/91c2c26a3863a950acddc6091d759524c691107f
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M pom.xml
    M src/docbkx/en/ccei_user_man_introduction.xml
    M src/docbkx/en/ccei_user_manual_en.xml
    M src/docbkx/en/dhis2_android_user_man.xml
    M src/docbkx/en/dhis2_android_user_man_aggregate.xml
    M src/docbkx/en/dhis2_android_user_man_event_capture.xml
    M src/docbkx/en/dhis2_android_user_man_tracker_capture.xml
    M src/docbkx/en/dhis2_bibliography.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_developer_manual_infrastructure.xml
    M src/docbkx/en/dhis2_documentation_guide.xml
    M src/docbkx/en/dhis2_documentation_guide_book.xml
    M src/docbkx/en/dhis2_end_user_manual.xml
    M src/docbkx/en/dhis2_faq.xml
    M src/docbkx/en/dhis2_implementation_guide_as_a_platform.xml
    M src/docbkx/en/dhis2_implementation_guide_conceptual_design_principles.xml
    M src/docbkx/en/dhis2_implementation_guide_data_analysis_tools_overview.xml
    M src/docbkx/en/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
    M src/docbkx/en/dhis2_implementation_guide_data_quality.xml
    M src/docbkx/en/dhis2_implementation_guide_data_sets_and_forms.xml
    M src/docbkx/en/dhis2_implementation_guide_data_warehouse.xml
    M src/docbkx/en/dhis2_implementation_guide_deployment_strategies.xml
    M src/docbkx/en/dhis2_implementation_guide_en.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_implementation_guide_organisation_units.xml
    M src/docbkx/en/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
    M src/docbkx/en/dhis2_implementation_guide_recommendations.xml
    M src/docbkx/en/dhis2_implementation_guide_setting_up_new_database.xml
    M src/docbkx/en/dhis2_implementation_guide_support.xml
    M src/docbkx/en/dhis2_implementation_guide_users_and_user_roles.xml
    M src/docbkx/en/dhis2_localization_guide.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_creating_reporting.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_data_elements.xml
    M src/docbkx/en/dhis2_user_man_data_entry.xml
    M src/docbkx/en/dhis2_user_man_dataset_design_example.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_indicators.xml
    M src/docbkx/en/dhis2_user_man_introduction.xml
    M src/docbkx/en/dhis2_user_man_mobile.xml
    M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
    M src/docbkx/en/dhis2_user_man_mobile_intro.xml
    M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_profile.xml
    M src/docbkx/en/dhis2_user_man_program_indicators.xml
    M src/docbkx/en/dhis2_user_man_program_rules.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_quality.xml
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_event_capture.xml
    M src/docbkx/en/dhis2_user_man_using_event_reports.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_using_tracker_capture.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    M src/docbkx/en/dhis2tools
    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/legalnotice.xml
    M src/docbkx/en/resources/xsl/fop-cust.xsl
    M src/docbkx/en/user_authorities_table.xml
    M src/docbkx/es/dhis2_documentation_guide_es.xml
    M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/es/dhis2_implementation_guide_installation.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_data_entry.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_indicators_intro.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_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_settings.xml
    M src/docbkx/es/dhis2_user_man_user_management.xml
    M src/docbkx/es/dhis2_user_man_using_data_quality.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/glossary_es.xml
    M src/docbkx/es/resources/bookinfo/legalnotice.xml
    M src/docbkx/fr/dhis2_documentation_guide.xml
    M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/fr/dhis2_implementation_guide_installation.xml
    M src/docbkx/fr/dhis2_implementation_guide_short.xml
    M src/docbkx/fr/dhis2_implementation_guide_support.xml
    M src/docbkx/fr/dhis2_localization_guide.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_data_entry.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_getting_started_enduser.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_reporting.xml
    M src/docbkx/fr/dhis2_user_man_using_data_quality.xml
    M src/docbkx/fr/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/fr/dhis2_user_man_using_gis.xml
    M src/docbkx/fr/dhis2_user_man_using_pivot_table.xml
    M src/docbkx/fr/dhis2_user_man_using_reporting.xml
    M src/docbkx/fr/dhis2_using_mydatamart_en.xml
    M src/docbkx/fr/resources/bookinfo/legalnotice.xml
    M src/docbkx/pt/dhis2_implementation_guide_installation.xml
    M src/docbkx/pt/dhis2_implementation_guide_short.xml
    M src/docbkx/pt/dhis2_implementation_guide_support.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_data_entry.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_import_export.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_orgunits.xml
    M src/docbkx/pt/dhis2_user_man_persons_and_programs.xml
    M src/docbkx/pt/dhis2_user_man_settings.xml
    M src/docbkx/pt/dhis2_user_man_user_management.xml
    M src/docbkx/pt/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/pt/dhis2_user_man_using_gis.xml
    M src/docbkx/pt/dhis2_user_man_using_reporting.xml
    M src/docbkx/pt/dhis2_using_mydatamart_en.xml
    M src/docbkx/pt/help_content_pt.xml
    M src/docbkx/pt/resources/bookinfo/legalnotice.xml

  Log Message:
  -----------
  Merge with master


  Commit: f948fd151f32a28d490d798f7a8c0c265d0c139c
      https://github.com/dhis2/dhis2-docs/commit/f948fd151f32a28d490d798f7a8c0c265d0c139c
  Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_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/resources/images/visualizer/chart_favorites.png

  Log Message:
  -----------
  Merge pull request #29 from dhis2/doc-in-progress

Merge in changes from doc-in-progress branch.


Compare: https://github.com/dhis2/dhis2-docs/compare/6c2777ed7a0c...f948fd151f32