[Pkg-owncloud-commits] [owncloud-doc] branch upstream updated (1127e33 -> 4f14190)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a change to branch upstream
in repository owncloud-doc.

      from  1127e33   Merge remote-tracking branch 'upstream/master' into upstream
       new  11eca7b   keeping multi-repo up to date with commands
       new  6cd4596   typo
       new  61b7431   add rebase option
       new  3f1cb8b   Merge pull request #461 from owncloud/code-update
       new  ba1d5b2   remove expressive language
       new  225d513   Update update.rst
       new  1550421   This brings all OC7 images back
       new  072d51c   Merge pull request #472 from owncloud/bringback-new-images
       new  df6f631   Expanded server_to_server_managing.rst, and added screenshot create_public_share.png
       new  33d463c   This has edits per pull request discussion: line wrap at 80, and added missing markup
       new  d8d9857   Expanded server_to_server_managing.rst, and added screenshot create_public_share.png
       new  632c274   Set line wrap to 80, added missing markup Merge branch 'carla' of https://github.com/owncloud/documentation into carla
       new  a90d008   Removed git HEAD tag
       new  1fc12b0   Merge pull request #475 from owncloud/carla
       new  f66cf5d   Update encryption.rst
       new  e0f52cb   Update configuration_encryption.rst
       new  4f66d0a   Update sync_thunderbird.rst
       new  9318511   Merge pull request #477 from luopa/master
       new  3f91081   Update index.rst
       new  8463f37   Create performance.rst
       new  7c807ec   Update performance.rst
       new  d9d8d1a   add caching tip, than vs. then vs. that
       new  64dc719   fix mysqldump syntax - fixes #453
       new  d74c72e   Merge pull request #454 from owncloud/fix-mysqldump
       new  5a00717   fix mysql syntax
       new  6aa1021   fix typo - fixes #486
       new  9c67f39   Fix typo - ref #486
       new  08ac0c6   PostgreSQL with the peer authentication method.
       new  91718a6   More information on how the parameters must be chosen.
       new  1378679   using .. note:: instead of IMPORTANT:
       new  12de1f7   Merge pull request #482 from owncloud/psql-peer-auth
       new  f42d337   Update devenv.rst
       new  2b36feb   Merge remote-tracking branch 'upstream/master' into upstream
       new  4f14190   Strip away copyrighted ICC profiles

The 34 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../configuration/configuration_database.rst       |  36 ++++++++++
 .../configuration/configuration_encryption.rst     |  11 ++-
 .../configuration/server_to_server_managing.rst    |  76 ++++++++++++++-------
 admin_manual/images/create_public_share.png        | Bin 0 -> 24377 bytes
 admin_manual/maintenance/backup.rst                |   2 +-
 admin_manual/maintenance/restore.rst               |   2 +-
 admin_manual/maintenance/update.rst                |   2 +
 developer_manual/app/hooks.rst                     |   2 +-
 developer_manual/app/middleware.rst                |   4 +-
 developer_manual/general/devenv.rst                |  22 +++++-
 developer_manual/general/index.rst                 |   1 +
 developer_manual/general/performance.rst           |  64 +++++++++++++++++
 user_manual/files/encryption.rst                   |  14 ++--
 user_manual/files/server_to_server_using.rst       |   2 +-
 user_manual/images/calendar_caldav.png             | Bin 17883 -> 0 bytes
 user_manual/images/calendar_createevent.png        | Bin 17972 -> 13663 bytes
 user_manual/images/calendar_export.png             | Bin 18885 -> 9835 bytes
 user_manual/images/calendar_import.png             | Bin 8250 -> 9074 bytes
 user_manual/images/calendar_manage-calendars.png   | Bin 39313 -> 34730 bytes
 user_manual/images/calendar_newtimezone1.png       | Bin 5253 -> 4868 bytes
 user_manual/images/contact_crop.jpg                | Bin 50676 -> 22353 bytes
 user_manual/images/contact_emptycontact.png        | Bin 21414 -> 11879 bytes
 user_manual/images/contact_import.jpg              | Bin 20281 -> 0 bytes
 user_manual/images/contact_picture.jpg             | Bin 7128 -> 5766 bytes
 user_manual/images/files_versioning.png            | Bin 9333 -> 8557 bytes
 user_manual/images/oc_connect.png                  | Bin 107250 -> 63833 bytes
 user_manual/images/oc_filesweb.png                 | Bin 28666 -> 17316 bytes
 user_manual/images/oc_main_web.png                 | Bin 115762 -> 41092 bytes
 user_manual/images/oc_main_web_labelled.png        | Bin 150798 -> 75961 bytes
 user_manual/images/oc_personal_settings_window.png | Bin 119355 -> 42959 bytes
 user_manual/images/oc_ui.png                       | Bin 138410 -> 45125 bytes
 user_manual/images/oc_user_preferences.png         | Bin 24304 -> 0 bytes
 user_manual/images/owncloud_webinterface_map.png   | Bin 13854 -> 11897 bytes
 user_manual/images/share_link_adding.png           | Bin 32097 -> 18257 bytes
 user_manual/pim/sync_thunderbird.rst               |   3 +-
 user_manual/userpreferences.rst                    |   2 +-
 36 files changed, 203 insertions(+), 40 deletions(-)
 create mode 100644 admin_manual/images/create_public_share.png
 create mode 100644 developer_manual/general/performance.rst
 delete mode 100644 user_manual/images/calendar_caldav.png
 delete mode 100644 user_manual/images/contact_import.jpg
 delete mode 100644 user_manual/images/oc_user_preferences.png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git