[Dhis2-documenters] [dhis2/dhis2-docs] 64532e: Merge branch 'master' into docinprogress

2016-06-22 Thread Cecilia Persson
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
  
https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
  Author: Cecilia Persson 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M .travis.yml

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


  Commit: c696cd59c0cffecff0861ecfa2f1084592f824ed
  
https://github.com/dhis2/dhis2-docs/commit/c696cd59c0cffecff0861ecfa2f1084592f824ed
  Author: Jason P. Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Change query program messages API to a table.


  Commit: 9fbb4433b5270e60e530b7944fc2875f27538cb5
  
https://github.com/dhis2/dhis2-docs/commit/9fbb4433b5270e60e530b7944fc2875f27538cb5
  Author: Jason P. Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Minor.


  Commit: bddc95ac14d4c6155d469f02de12110c7378d163
  
https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml

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


  Commit: c2499248af8501164369452d645b53ddd1a3b75b
  
https://github.com/dhis2/dhis2-docs/commit/c2499248af8501164369452d645b53ddd1a3b75b
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
A src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/maintenance/test_book.xml
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
R src/docbkx/en/resources/maintenance/mtn_toc.xml
R src/docbkx/en/resources/maintenance/test_book.xml

  Log Message:
  ---
  Create new content folder and added Maintenance folder


  Commit: a42ad97344138fc3d686c8c5ee62cc606b283428
  
https://github.com/dhis2/dhis2-docs/commit/a42ad97344138fc3d686c8c5ee62cc606b283428
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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


  Commit: c57ad798aa5c378b346b45081e3f254c85837af1
  
https://github.com/dhis2/dhis2-docs/commit/c57ad798aa5c378b346b45081e3f254c85837af1
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Man app: Data sets - minor edits concept info


  Commit: 650731042ed000367889467231aee7be21e87302
  
https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png

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


  Commit: 401c006027df10942a74f4e5750fa95384c0d40a
  
https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

  Log Message:
  ---
  Man app: Further edits to data elements and org units

Screenshots updated.


  Commit: e7ec1b65d99a678cafe1a02a45897c7193a0ff91
  
https://github.com/dhis2/dhis2-docs/commit/e7ec1b65d99a678cafe1a02a45897c7193a0ff91
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_orgu

[Dhis2-documenters] [dhis2/dhis2-docs] cca590: Added info about changing priority and status of t...

2016-06-22 Thread Cecilia Persson
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: cca5907eb81f193a1b9a3ff674389002c44dd9f9
  
https://github.com/dhis2/dhis2-docs/commit/cca5907eb81f193a1b9a3ff674389002c44dd9f9
  Author: Stian Sandvold 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Added info about changing priority and status of tickets


  Commit: f87ae82cc0efa1818c833e32bc8219fd0ee0d56d
  
https://github.com/dhis2/dhis2-docs/commit/f87ae82cc0efa1818c833e32bc8219fd0ee0d56d
  Author: Stian Sandvold 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  More information about ticketing


  Commit: ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
  
https://github.com/dhis2/dhis2-docs/commit/ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
  Author: rachbrooke 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Update dhis2_user_man_dashboard.xml

Slightly modified the description  in places.


  Commit: 137d0354c7160ddda551e09709591e4d38ff083c
  
https://github.com/dhis2/dhis2-docs/commit/137d0354c7160ddda551e09709591e4d38ff083c
  Author: rachbrooke 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Update dhis2_user_man_web_api.xml

Added some minor changes to the description.


  Commit: d2980558aa7c18c2893edeb99b4f369c02599750
  
https://github.com/dhis2/dhis2-docs/commit/d2980558aa7c18c2893edeb99b4f369c02599750
  Author: Jason Pickering 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Try and shut Travis up. (#48)


  Commit: f50fd0e149163f9cbcaa925734323de3ef54c2cd
  
https://github.com/dhis2/dhis2-docs/commit/f50fd0e149163f9cbcaa925734323de3ef54c2cd
  Author: Jason Pickering 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
A src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/maintenance/test_book.xml
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
R src/docbkx/en/resources/maintenance/mtn_toc.xml
R src/docbkx/en/resources/maintenance/test_book.xml

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


  Commit: 943efd44016f048e90679c5ad47ef1dd34688336
  
https://github.com/dhis2/dhis2-docs/commit/943efd44016f048e90679c5ad47ef1dd34688336
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

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


  Commit: ef81a4c11a46d60e28e99d8bf9438e7d0c7656d1
  
https://github.com/dhis2/dhis2-docs/commit/ef81a4c11a46d60e28e99d8bf9438e7d0c7656d1
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #44 from dhis2/ticketing

Added information about the new features regarding message conversation 
"tickets"


Compare: https://github.com/dhis2/dhis2-docs/compare/e7ec1b65d99a...ef81a4c11a46___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] 64532e: Merge branch 'master' into docinprogress

2016-06-22 Thread Cecilia Persson
  Branch: refs/heads/ticketing
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
  
https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
  Author: Cecilia Persson 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M .travis.yml

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


  Commit: c696cd59c0cffecff0861ecfa2f1084592f824ed
  
https://github.com/dhis2/dhis2-docs/commit/c696cd59c0cffecff0861ecfa2f1084592f824ed
  Author: Jason P. Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Change query program messages API to a table.


  Commit: 9fbb4433b5270e60e530b7944fc2875f27538cb5
  
https://github.com/dhis2/dhis2-docs/commit/9fbb4433b5270e60e530b7944fc2875f27538cb5
  Author: Jason P. Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Minor.


  Commit: bddc95ac14d4c6155d469f02de12110c7378d163
  
https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml

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


  Commit: c2499248af8501164369452d645b53ddd1a3b75b
  
https://github.com/dhis2/dhis2-docs/commit/c2499248af8501164369452d645b53ddd1a3b75b
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
A src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/maintenance/test_book.xml
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
R src/docbkx/en/resources/maintenance/mtn_toc.xml
R src/docbkx/en/resources/maintenance/test_book.xml

  Log Message:
  ---
  Create new content folder and added Maintenance folder


  Commit: a42ad97344138fc3d686c8c5ee62cc606b283428
  
https://github.com/dhis2/dhis2-docs/commit/a42ad97344138fc3d686c8c5ee62cc606b283428
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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


  Commit: c57ad798aa5c378b346b45081e3f254c85837af1
  
https://github.com/dhis2/dhis2-docs/commit/c57ad798aa5c378b346b45081e3f254c85837af1
  Author: Cecilia Persson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Man app: Data sets - minor edits concept info


  Commit: 650731042ed000367889467231aee7be21e87302
  
https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png

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


  Commit: 401c006027df10942a74f4e5750fa95384c0d40a
  
https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

  Log Message:
  ---
  Man app: Further edits to data elements and org units

Screenshots updated.


  Commit: e7ec1b65d99a678cafe1a02a45897c7193a0ff91
  
https://github.com/dhis2/dhis2-docs/commit/e7ec1b65d99a678cafe1a02a45897c7193a0ff91
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_o

[Dhis2-documenters] [dhis2/dhis2-docs] 176cf0: Try and shut Travis up. (#48)

2016-06-22 Thread Cecilia Persson
  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
  
https://github.com/dhis2/dhis2-docs/commit/176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
  Author: Jason Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Try and shut Travis up. (#48)


  Commit: 8ea8e4e7ee4646a3459767314db1f58c46b2f023
  
https://github.com/dhis2/dhis2-docs/commit/8ea8e4e7ee4646a3459767314db1f58c46b2f023
  Author: zubaira 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png

  Log Message:
  ---
  Sms docs (#46)

* Event Registration Parser docs

* Event Registration Parser docs

* API docs for SMSCommand

* API docs for SMSCommands


  Commit: 650731042ed000367889467231aee7be21e87302
  
https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png

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


  Commit: 401c006027df10942a74f4e5750fa95384c0d40a
  
https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a
  Author: Cecilia Persson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
A src/docbkx/en/resources/images/maintainence/create_data_element.png
R src/docbkx/en/resources/images/maintainence/data_element_main2.png
A 
src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

  Log Message:
  ---
  Man app: Further edits to data elements and org units

Screenshots updated.


Compare: https://github.com/dhis2/dhis2-docs/compare/c57ad798aa5c...401c006027df___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] dc822e: Changes to program query API docs (#43)

2016-06-22 Thread Jason Pickering
  Branch: refs/heads/ticketing
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: dc822efa9132bdd8803af7be17d882a47f8d5be9
  
https://github.com/dhis2/dhis2-docs/commit/dc822efa9132bdd8803af7be17d882a47f8d5be9
  Author: Jason Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
A src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/maintenance/test_book.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
R src/docbkx/en/resources/maintenance/mtn_toc.xml
R src/docbkx/en/resources/maintenance/test_book.xml

  Log Message:
  ---
  Changes to program query API docs (#43)

* Change query program messages API to a table.

* Minor.

* Create new content folder and added Maintenance folder


  Commit: 176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
  
https://github.com/dhis2/dhis2-docs/commit/176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
  Author: Jason Pickering 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Try and shut Travis up. (#48)


  Commit: 8ea8e4e7ee4646a3459767314db1f58c46b2f023
  
https://github.com/dhis2/dhis2-docs/commit/8ea8e4e7ee4646a3459767314db1f58c46b2f023
  Author: zubaira 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png

  Log Message:
  ---
  Sms docs (#46)

* Event Registration Parser docs

* Event Registration Parser docs

* API docs for SMSCommand

* API docs for SMSCommands


  Commit: f50fd0e149163f9cbcaa925734323de3ef54c2cd
  
https://github.com/dhis2/dhis2-docs/commit/f50fd0e149163f9cbcaa925734323de3ef54c2cd
  Author: Jason Pickering 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
A src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/maintenance/test_book.xml
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A 
src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
R src/docbkx/en/resources/maintenance/mtn_toc.xml
R src/docbkx/en/resources/maintenance/test_book.xml

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


Compare: https://github.com/dhis2/dhis2-docs/compare/d2980558aa7c...f50fd0e14916___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] dd8733: Try and shut Travis up. (#48)

2016-06-22 Thread Jason Pickering
  Branch: refs/heads/lars-docs
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: dd87336122312b127c07fddd75d4d1365b37b11c
  
https://github.com/dhis2/dhis2-docs/commit/dd87336122312b127c07fddd75d4d1365b37b11c
  Author: Jason Pickering 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Try and shut Travis up. (#48)


___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] d29805: Try and shut Travis up. (#48)

2016-06-22 Thread Jason Pickering
  Branch: refs/heads/ticketing
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: d2980558aa7c18c2893edeb99b4f369c02599750
  
https://github.com/dhis2/dhis2-docs/commit/d2980558aa7c18c2893edeb99b4f369c02599750
  Author: Jason Pickering 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Try and shut Travis up. (#48)


___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] 8a7f09: Modified ProgramMessage documentation

2016-06-22 Thread zubaira
  Branch: refs/heads/SmsDocs
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 8a7f09c5abb5b37061cb87aa6af9713989fcf25e
  
https://github.com/dhis2/dhis2-docs/commit/8a7f09c5abb5b37061cb87aa6af9713989fcf25e
  Author: zubaira 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Modified ProgramMessage documentation


  Commit: 5e7fd434918e5b2499d74411f82bd385b14f1992
  
https://github.com/dhis2/dhis2-docs/commit/5e7fd434918e5b2499d74411f82bd385b14f1992
  Author: zubaira 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M .travis.yml
M .utility/deploy.sh

  Log Message:
  ---
  Merge branch 'SmsDocs' of github.com:dhis2/dhis2-docs into SmsDocs


Compare: https://github.com/dhis2/dhis2-docs/compare/d2c1f74ef2d1...5e7fd434918e___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] 137d03: Update dhis2_user_man_web_api.xml

2016-06-22 Thread rachbrooke
  Branch: refs/heads/ticketing
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 137d0354c7160ddda551e09709591e4d38ff083c
  
https://github.com/dhis2/dhis2-docs/commit/137d0354c7160ddda551e09709591e4d38ff083c
  Author: rachbrooke 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Update dhis2_user_man_web_api.xml

Added some minor changes to the description.


___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp


[Dhis2-documenters] [dhis2/dhis2-docs] ae823f: Update dhis2_user_man_dashboard.xml

2016-06-22 Thread rachbrooke
  Branch: refs/heads/ticketing
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
  
https://github.com/dhis2/dhis2-docs/commit/ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
  Author: rachbrooke 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  Update dhis2_user_man_dashboard.xml

Slightly modified the description  in places.


___
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help   : https://help.launchpad.net/ListHelp