[Pkg-owncloud-commits] [owncloud-doc] branch upstream updated (a6c13a2 -> 3631805)

[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  a6c13a2   Merge commit 'c0fceef' into upstream
       new  da8757d   template for config.sample.php documentation
       new  84d45df   generate documentation from config.sample.php
       new  e76c232   Merge pull request #602 from owncloud/config-sample-preparation
       new  d57c7cd   Rewrite of user quota page, removing admin sections
       new  dba82da   Merge pull request #615 from owncloud/quota-fix
       new  12f2b5c   generate documentation from config.sample.php
       new  af81c9f   remove duplicate entry
       new  6480bb4   Merge pull request #620 from owncloud/remdup
       new  6de76cc   better handling of custom certificates
       new  aa84d65   Merge pull request #608 from adorableGNU/patch-1
       new  48ec052   add archlinux instructions
       new  b5a6ad0   Merge pull request #621 from owncloud/archinst
       new  aece1c2   Rewrite admin Encryption manual page
       new  f4f415f   added section on files not encrypted
       new  7f2faf3   add information about system wide mount points
       new  2175ab0   Added section on re-sharing after encryption, files not encrypted
       new  4893d07   Merge pull request #616 from owncloud/encryption
       new  17d8835   Rewrite of Encryption page in user manual
       new  a057b2a   added section on re-sharing after encryption is enabled, clarified which files are encrypted
       new  48e2ffc   Merge pull request #619 from owncloud/encryption-user
       new  b1ca220   Emphasize not skipping major upgrades, no update app in oC EE.
       new  07909c7   correct typo
       new  af561f3   Update update.rst
       new  6e33086   Merge pull request #622 from owncloud/upgrade-major-release
       new  cc42c77   Add notes re: no expiration date on local shares
       new  4b1276f   correct markup
       new  b35747a   Merge pull request #623 from owncloud/expiring-shares
       new  7f902d0   Document the Files Locking app
       new  43594c3   Small tweak to command example, to suppress command output
       new  c7b1328   Merge pull request #624 from owncloud/cron
       new  540f7f3   small correction; remove misleading instruction on un-sharing
       new  c2f6830   Update whats_new_admin.rst
       new  4912b48   Merge pull request #625 from owncloud/whatsnew
       new  4e59c6c   Route calls to index.php via try_files with nginx
       new  d1b853f   Merge pull request #462 from owncloud/nginx_routes_to_index.php
       new  3631805   Merge remote-tracking branch 'upstream/master' into upstream

The 36 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:
 README.rst                                         |  14 +-
 admin_manual/configuration/background_jobs.rst     |   2 +-
 .../configuration_config_sample_php.rst            | 937 +++++++++++++++++++++
 .../configuration/configuration_encryption.rst     | 197 +++--
 .../configuration/configuration_file_sharing.rst   |   6 +
 .../configuration/configuration_files_locking.rst  |  18 +
 admin_manual/configuration/index.rst               |   1 +
 admin_manual/images/encryption1.png                | Bin 0 -> 15491 bytes
 admin_manual/images/encryption2.png                | Bin 0 -> 4095 bytes
 admin_manual/images/encryption3.png                | Bin 0 -> 9018 bytes
 admin_manual/images/encryption4.png                | Bin 0 -> 4498 bytes
 admin_manual/images/encryption5.png                | Bin 0 -> 18907 bytes
 admin_manual/images/encryption6.png                | Bin 0 -> 14219 bytes
 admin_manual/images/encryption7.png                | Bin 0 -> 12526 bytes
 admin_manual/images/encryption8.png                | Bin 0 -> 15038 bytes
 admin_manual/images/encryption9.png                | Bin 0 -> 12567 bytes
 admin_manual/images/encryption_enabling.png        | Bin 30317 -> 0 bytes
 admin_manual/index.rst                             |   1 +
 admin_manual/installation/configuration_nginx.rst  |   2 +-
 admin_manual/maintenance/update.rst                |   9 +-
 admin_manual/maintenance/upgrade.rst               |  10 +-
 admin_manual/whats_new_admin.rst                   |   4 +
 developer_manual/app/index.rst                     |   1 -
 user_manual/files/encryption.rst                   | 134 ++-
 user_manual/files/files.rst                        |   7 +-
 user_manual/files/filesweb.rst                     |  13 +-
 user_manual/files/quota.rst                        | 140 +--
 user_manual/html.txt                               |   0
 user_manual/images/encryption1.png                 | Bin 0 -> 4095 bytes
 user_manual/images/encryption2.png                 | Bin 0 -> 8914 bytes
 user_manual/images/encryption3.png                 | Bin 0 -> 14219 bytes
 user_manual/images/encryption4.png                 | Bin 0 -> 18907 bytes
 user_manual/images/quota1.png                      | Bin 0 -> 3730 bytes
 user_manual/whats_new.rst                          |   7 +
 34 files changed, 1267 insertions(+), 236 deletions(-)
 create mode 100644 admin_manual/configuration/configuration_config_sample_php.rst
 create mode 100644 admin_manual/configuration/configuration_files_locking.rst
 create mode 100644 admin_manual/images/encryption1.png
 create mode 100644 admin_manual/images/encryption2.png
 create mode 100644 admin_manual/images/encryption3.png
 create mode 100644 admin_manual/images/encryption4.png
 create mode 100644 admin_manual/images/encryption5.png
 create mode 100644 admin_manual/images/encryption6.png
 create mode 100644 admin_manual/images/encryption7.png
 create mode 100644 admin_manual/images/encryption8.png
 create mode 100644 admin_manual/images/encryption9.png
 delete mode 100644 admin_manual/images/encryption_enabling.png
 delete mode 100644 user_manual/html.txt
 create mode 100644 user_manual/images/encryption1.png
 create mode 100644 user_manual/images/encryption2.png
 create mode 100644 user_manual/images/encryption3.png
 create mode 100644 user_manual/images/encryption4.png
 create mode 100644 user_manual/images/quota1.png

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