Update to 8.0.2

Changelog:
Version 8.0.2 March 11th 2015
Prevent DB errors in certain high load situations
Fix installation and updating of apps from the app store
Fix documentation links
Fix file move/copy when out of storage space
Disable 3rd party apps during upgrade to prevent breaking ownCloud if incompatible apps are used
Fix compatibility with certain MariaDB versions
Print app upgrade information to console
Detect broken APC versions
Fix certain incompatibilities with older PHP 5.4 versions
Several smaller fixes

4 files changed, 229 insertions, 187 deletions

diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile
index 4f9e52f88ad..6d24d1d4d8b 100644
--- a/www/php-owncloud/Makefile
+++ b/www/php-owncloud/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2015/02/15 06:56:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2015/03/21 21:48:52 ryoon Exp $
 #
 
-DISTNAME=	owncloud-8.0.0
+DISTNAME=	owncloud-8.0.2
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://download.owncloud.org/community/
diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST
index d1a07e93fd0..996d27ea77b 100644
--- a/www/php-owncloud/PLIST
+++ b/www/php-owncloud/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2015/02/15 06:56:39 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.29 2015/03/21 21:48:52 ryoon Exp $
 share/owncloud/.htaccess
 share/owncloud/.user.ini
 share/owncloud/3rdparty/LICENSE INFO
@@ -491,6 +491,7 @@ share/owncloud/3rdparty/ircmaxell/random-lib/test/Mocks/Random/Generator.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Mocks/Random/Mixer.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Mocks/Random/Source.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Unit/RandomLib/FactoryTest.php
+share/owncloud/3rdparty/ircmaxell/random-lib/test/Unit/RandomLib/GeneratorStringTest.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Unit/RandomLib/GeneratorTest.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Unit/RandomLib/Mixer/HashTest.php
 share/owncloud/3rdparty/ircmaxell/random-lib/test/Unit/RandomLib/Source/CAPICOMTest.php
@@ -2823,128 +2824,81 @@ share/owncloud/apps/activity/img/delete-color.png
 share/owncloud/apps/activity/img/delete-color.svg
 share/owncloud/apps/activity/js/script.js
 share/owncloud/apps/activity/js/settings.js
-share/owncloud/apps/activity/l10n/ach.php
-share/owncloud/apps/activity/l10n/ady.php
-share/owncloud/apps/activity/l10n/af.php
-share/owncloud/apps/activity/l10n/af_ZA.php
-share/owncloud/apps/activity/l10n/ak.php
-share/owncloud/apps/activity/l10n/am_ET.php
 share/owncloud/apps/activity/l10n/ar.js
 share/owncloud/apps/activity/l10n/ar.json
 share/owncloud/apps/activity/l10n/ast.js
 share/owncloud/apps/activity/l10n/ast.json
 share/owncloud/apps/activity/l10n/az.js
 share/owncloud/apps/activity/l10n/az.json
-share/owncloud/apps/activity/l10n/be.php
 share/owncloud/apps/activity/l10n/bg_BG.js
 share/owncloud/apps/activity/l10n/bg_BG.json
 share/owncloud/apps/activity/l10n/bn_BD.js
 share/owncloud/apps/activity/l10n/bn_BD.json
 share/owncloud/apps/activity/l10n/bn_IN.js
 share/owncloud/apps/activity/l10n/bn_IN.json
-share/owncloud/apps/activity/l10n/bs.php
 share/owncloud/apps/activity/l10n/ca.js
 share/owncloud/apps/activity/l10n/ca.json
-share/owncloud/apps/activity/l10n/ca@valencia.php
 share/owncloud/apps/activity/l10n/cs_CZ.js
 share/owncloud/apps/activity/l10n/cs_CZ.json
-share/owncloud/apps/activity/l10n/cy_GB.php
 share/owncloud/apps/activity/l10n/da.js
 share/owncloud/apps/activity/l10n/da.json
 share/owncloud/apps/activity/l10n/de.js
 share/owncloud/apps/activity/l10n/de.json
-share/owncloud/apps/activity/l10n/de_AT.php
-share/owncloud/apps/activity/l10n/de_CH.php
 share/owncloud/apps/activity/l10n/de_DE.js
 share/owncloud/apps/activity/l10n/de_DE.json
 share/owncloud/apps/activity/l10n/el.js
 share/owncloud/apps/activity/l10n/el.json
-share/owncloud/apps/activity/l10n/en@pirate.php
 share/owncloud/apps/activity/l10n/en_GB.js
 share/owncloud/apps/activity/l10n/en_GB.json
-share/owncloud/apps/activity/l10n/en_NZ.php
-share/owncloud/apps/activity/l10n/eo.php
 share/owncloud/apps/activity/l10n/es.js
 share/owncloud/apps/activity/l10n/es.json
 share/owncloud/apps/activity/l10n/es_AR.js
 share/owncloud/apps/activity/l10n/es_AR.json
-share/owncloud/apps/activity/l10n/es_BO.php
 share/owncloud/apps/activity/l10n/es_CL.js
 share/owncloud/apps/activity/l10n/es_CL.json
-share/owncloud/apps/activity/l10n/es_CO.php
-share/owncloud/apps/activity/l10n/es_CR.php
-share/owncloud/apps/activity/l10n/es_EC.php
-share/owncloud/apps/activity/l10n/es_MX.php
-share/owncloud/apps/activity/l10n/es_PE.php
-share/owncloud/apps/activity/l10n/es_PY.php
-share/owncloud/apps/activity/l10n/es_US.php
-share/owncloud/apps/activity/l10n/es_UY.php
 share/owncloud/apps/activity/l10n/et_EE.js
 share/owncloud/apps/activity/l10n/et_EE.json
 share/owncloud/apps/activity/l10n/eu.js
 share/owncloud/apps/activity/l10n/eu.json
-share/owncloud/apps/activity/l10n/eu_ES.php
 share/owncloud/apps/activity/l10n/fa.js
 share/owncloud/apps/activity/l10n/fa.json
 share/owncloud/apps/activity/l10n/fi_FI.js
 share/owncloud/apps/activity/l10n/fi_FI.json
 share/owncloud/apps/activity/l10n/fr.js
 share/owncloud/apps/activity/l10n/fr.json
-share/owncloud/apps/activity/l10n/fr_CA.php
 share/owncloud/apps/activity/l10n/gl.js
 share/owncloud/apps/activity/l10n/gl.json
 share/owncloud/apps/activity/l10n/he.js
 share/owncloud/apps/activity/l10n/he.json
-share/owncloud/apps/activity/l10n/hi.php
-share/owncloud/apps/activity/l10n/hi_IN.php
 share/owncloud/apps/activity/l10n/hr.js
 share/owncloud/apps/activity/l10n/hr.json
 share/owncloud/apps/activity/l10n/hu_HU.js
 share/owncloud/apps/activity/l10n/hu_HU.json
-share/owncloud/apps/activity/l10n/hy.php
 share/owncloud/apps/activity/l10n/ia.js
 share/owncloud/apps/activity/l10n/ia.json
 share/owncloud/apps/activity/l10n/id.js
 share/owncloud/apps/activity/l10n/id.json
-share/owncloud/apps/activity/l10n/io.php
-share/owncloud/apps/activity/l10n/is.php
 share/owncloud/apps/activity/l10n/it.js
 share/owncloud/apps/activity/l10n/it.json
 share/owncloud/apps/activity/l10n/ja.js
 share/owncloud/apps/activity/l10n/ja.json
-share/owncloud/apps/activity/l10n/jv.php
-share/owncloud/apps/activity/l10n/ka_GE.php
 share/owncloud/apps/activity/l10n/km.js
 share/owncloud/apps/activity/l10n/km.json
-share/owncloud/apps/activity/l10n/kn.php
 share/owncloud/apps/activity/l10n/ko.js
 share/owncloud/apps/activity/l10n/ko.json
-share/owncloud/apps/activity/l10n/ku_IQ.php
-share/owncloud/apps/activity/l10n/lb.php
 share/owncloud/apps/activity/l10n/lt_LT.js
 share/owncloud/apps/activity/l10n/lt_LT.json
 share/owncloud/apps/activity/l10n/lv.js
 share/owncloud/apps/activity/l10n/lv.json
-share/owncloud/apps/activity/l10n/mk.php
-share/owncloud/apps/activity/l10n/ml.php
 share/owncloud/apps/activity/l10n/ml_IN.js
 share/owncloud/apps/activity/l10n/ml_IN.json
-share/owncloud/apps/activity/l10n/mn.php
-share/owncloud/apps/activity/l10n/ms_MY.php
-share/owncloud/apps/activity/l10n/my_MM.php
 share/owncloud/apps/activity/l10n/nb_NO.js
 share/owncloud/apps/activity/l10n/nb_NO.json
-share/owncloud/apps/activity/l10n/nds.php
-share/owncloud/apps/activity/l10n/ne.php
 share/owncloud/apps/activity/l10n/nl.js
 share/owncloud/apps/activity/l10n/nl.json
 share/owncloud/apps/activity/l10n/nn_NO.js
 share/owncloud/apps/activity/l10n/nn_NO.json
 share/owncloud/apps/activity/l10n/no-php
-share/owncloud/apps/activity/l10n/nqo.php
-share/owncloud/apps/activity/l10n/oc.php
-share/owncloud/apps/activity/l10n/or_IN.php
-share/owncloud/apps/activity/l10n/pa.php
 share/owncloud/apps/activity/l10n/pl.js
 share/owncloud/apps/activity/l10n/pl.json
 share/owncloud/apps/activity/l10n/pt_BR.js
@@ -2955,39 +2909,24 @@ share/owncloud/apps/activity/l10n/ro.js
 share/owncloud/apps/activity/l10n/ro.json
 share/owncloud/apps/activity/l10n/ru.js
 share/owncloud/apps/activity/l10n/ru.json
-share/owncloud/apps/activity/l10n/si_LK.php
-share/owncloud/apps/activity/l10n/sk.php
 share/owncloud/apps/activity/l10n/sk_SK.js
 share/owncloud/apps/activity/l10n/sk_SK.json
 share/owncloud/apps/activity/l10n/sl.js
 share/owncloud/apps/activity/l10n/sl.json
 share/owncloud/apps/activity/l10n/sq.js
 share/owncloud/apps/activity/l10n/sq.json
-share/owncloud/apps/activity/l10n/sr.php
 share/owncloud/apps/activity/l10n/sr@latin.js
 share/owncloud/apps/activity/l10n/sr@latin.json
-share/owncloud/apps/activity/l10n/su.php
 share/owncloud/apps/activity/l10n/sv.js
 share/owncloud/apps/activity/l10n/sv.json
-share/owncloud/apps/activity/l10n/sw_KE.php
 share/owncloud/apps/activity/l10n/ta_IN.js
 share/owncloud/apps/activity/l10n/ta_IN.json
-share/owncloud/apps/activity/l10n/ta_LK.php
-share/owncloud/apps/activity/l10n/te.php
-share/owncloud/apps/activity/l10n/th_TH.php
 share/owncloud/apps/activity/l10n/tr.js
 share/owncloud/apps/activity/l10n/tr.json
-share/owncloud/apps/activity/l10n/tzm.php
-share/owncloud/apps/activity/l10n/ug.php
 share/owncloud/apps/activity/l10n/uk.js
 share/owncloud/apps/activity/l10n/uk.json
-share/owncloud/apps/activity/l10n/ur.php
-share/owncloud/apps/activity/l10n/ur_PK.php
-share/owncloud/apps/activity/l10n/uz.php
-share/owncloud/apps/activity/l10n/vi.php
 share/owncloud/apps/activity/l10n/zh_CN.js
 share/owncloud/apps/activity/l10n/zh_CN.json
-share/owncloud/apps/activity/l10n/zh_HK.php
 share/owncloud/apps/activity/l10n/zh_TW.js
 share/owncloud/apps/activity/l10n/zh_TW.json
 share/owncloud/apps/activity/lib/api.php
@@ -4293,6 +4232,7 @@ share/owncloud/apps/files/templates/index.php
 share/owncloud/apps/files/templates/list.php
 share/owncloud/apps/files/templates/simplelist.php
 share/owncloud/apps/files/tests/ajax_rename.php
+share/owncloud/apps/files/tests/controller/apicontrollertest.php
 share/owncloud/apps/files/tests/helper.php
 share/owncloud/apps/files/tests/js/appSpec.js
 share/owncloud/apps/files/tests/js/breadcrumbSpec.js
@@ -4340,7 +4280,6 @@ share/owncloud/apps/files_encryption/l10n/bn_BD.js
 share/owncloud/apps/files_encryption/l10n/bn_BD.json
 share/owncloud/apps/files_encryption/l10n/bs.js
 share/owncloud/apps/files_encryption/l10n/bs.json
-share/owncloud/apps/files_encryption/l10n/bs.php
 share/owncloud/apps/files_encryption/l10n/ca.js
 share/owncloud/apps/files_encryption/l10n/ca.json
 share/owncloud/apps/files_encryption/l10n/cs_CZ.js
@@ -4415,14 +4354,12 @@ share/owncloud/apps/files_encryption/l10n/lv.js
 share/owncloud/apps/files_encryption/l10n/lv.json
 share/owncloud/apps/files_encryption/l10n/mk.js
 share/owncloud/apps/files_encryption/l10n/mk.json
-share/owncloud/apps/files_encryption/l10n/ms_MY.php
 share/owncloud/apps/files_encryption/l10n/nb_NO.js
 share/owncloud/apps/files_encryption/l10n/nb_NO.json
 share/owncloud/apps/files_encryption/l10n/nl.js
 share/owncloud/apps/files_encryption/l10n/nl.json
 share/owncloud/apps/files_encryption/l10n/nn_NO.js
 share/owncloud/apps/files_encryption/l10n/nn_NO.json
-share/owncloud/apps/files_encryption/l10n/oc.php
 share/owncloud/apps/files_encryption/l10n/pa.js
 share/owncloud/apps/files_encryption/l10n/pa.json
 share/owncloud/apps/files_encryption/l10n/pl.js
@@ -4451,7 +4388,6 @@ share/owncloud/apps/files_encryption/l10n/sv.js
 share/owncloud/apps/files_encryption/l10n/sv.json
 share/owncloud/apps/files_encryption/l10n/ta_LK.js
 share/owncloud/apps/files_encryption/l10n/ta_LK.json
-share/owncloud/apps/files_encryption/l10n/te.php
 share/owncloud/apps/files_encryption/l10n/th_TH.js
 share/owncloud/apps/files_encryption/l10n/th_TH.json
 share/owncloud/apps/files_encryption/l10n/tr.js
@@ -6369,11 +6305,8 @@ share/owncloud/apps/files_trashbin/css/trash.css
 share/owncloud/apps/files_trashbin/img/app.svg
 share/owncloud/apps/files_trashbin/js/app.js
 share/owncloud/apps/files_trashbin/js/filelist.js
-share/owncloud/apps/files_trashbin/l10n/ach.php
-share/owncloud/apps/files_trashbin/l10n/ady.php
 share/owncloud/apps/files_trashbin/l10n/af_ZA.js
 share/owncloud/apps/files_trashbin/l10n/af_ZA.json
-share/owncloud/apps/files_trashbin/l10n/af_ZA.php
 share/owncloud/apps/files_trashbin/l10n/ar.js
 share/owncloud/apps/files_trashbin/l10n/ar.json
 share/owncloud/apps/files_trashbin/l10n/ast.js
@@ -6408,7 +6341,6 @@ share/owncloud/apps/files_trashbin/l10n/de_DE.js
 share/owncloud/apps/files_trashbin/l10n/de_DE.json
 share/owncloud/apps/files_trashbin/l10n/el.js
 share/owncloud/apps/files_trashbin/l10n/el.json
-share/owncloud/apps/files_trashbin/l10n/en@pirate.php
 share/owncloud/apps/files_trashbin/l10n/en_GB.js
 share/owncloud/apps/files_trashbin/l10n/en_GB.json
 share/owncloud/apps/files_trashbin/l10n/eo.js
@@ -6463,7 +6395,6 @@ share/owncloud/apps/files_trashbin/l10n/km.js
 share/owncloud/apps/files_trashbin/l10n/km.json
 share/owncloud/apps/files_trashbin/l10n/kn.js
 share/owncloud/apps/files_trashbin/l10n/kn.json
-share/owncloud/apps/files_trashbin/l10n/kn.php
 share/owncloud/apps/files_trashbin/l10n/ko.js
 share/owncloud/apps/files_trashbin/l10n/ko.json
 share/owncloud/apps/files_trashbin/l10n/ku_IQ.js
@@ -6476,18 +6407,14 @@ share/owncloud/apps/files_trashbin/l10n/lv.js
 share/owncloud/apps/files_trashbin/l10n/lv.json
 share/owncloud/apps/files_trashbin/l10n/mk.js
 share/owncloud/apps/files_trashbin/l10n/mk.json
-share/owncloud/apps/files_trashbin/l10n/ml_IN.php
 share/owncloud/apps/files_trashbin/l10n/ms_MY.js
 share/owncloud/apps/files_trashbin/l10n/ms_MY.json
-share/owncloud/apps/files_trashbin/l10n/my_MM.php
 share/owncloud/apps/files_trashbin/l10n/nb_NO.js
 share/owncloud/apps/files_trashbin/l10n/nb_NO.json
-share/owncloud/apps/files_trashbin/l10n/ne.php
 share/owncloud/apps/files_trashbin/l10n/nl.js
 share/owncloud/apps/files_trashbin/l10n/nl.json
 share/owncloud/apps/files_trashbin/l10n/nn_NO.js
 share/owncloud/apps/files_trashbin/l10n/nn_NO.json
-share/owncloud/apps/files_trashbin/l10n/nqo.php
 share/owncloud/apps/files_trashbin/l10n/oc.js
 share/owncloud/apps/files_trashbin/l10n/oc.json
 share/owncloud/apps/files_trashbin/l10n/pa.js
@@ -6518,7 +6445,6 @@ share/owncloud/apps/files_trashbin/l10n/sr@latin.js
 share/owncloud/apps/files_trashbin/l10n/sr@latin.json
 share/owncloud/apps/files_trashbin/l10n/sv.js
 share/owncloud/apps/files_trashbin/l10n/sv.json
-share/owncloud/apps/files_trashbin/l10n/sw_KE.php
 share/owncloud/apps/files_trashbin/l10n/ta_LK.js
 share/owncloud/apps/files_trashbin/l10n/ta_LK.json
 share/owncloud/apps/files_trashbin/l10n/te.js
@@ -6643,7 +6569,6 @@ share/owncloud/apps/files_versions/l10n/ko.js
 share/owncloud/apps/files_versions/l10n/ko.json
 share/owncloud/apps/files_versions/l10n/ku_IQ.js
 share/owncloud/apps/files_versions/l10n/ku_IQ.json
-share/owncloud/apps/files_versions/l10n/lb.php
 share/owncloud/apps/files_versions/l10n/lt_LT.js
 share/owncloud/apps/files_versions/l10n/lt_LT.json
 share/owncloud/apps/files_versions/l10n/lv.js
@@ -6711,6 +6636,8 @@ share/owncloud/apps/files_videoviewer/appinfo/info.xml
 share/owncloud/apps/files_videoviewer/appinfo/version
 share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css
 share/owncloud/apps/files_videoviewer/css/style.css
+share/owncloud/apps/files_videoviewer/img/app.png
+share/owncloud/apps/files_videoviewer/img/app.svg
 share/owncloud/apps/files_videoviewer/img/close.png
 share/owncloud/apps/files_videoviewer/img/skin/background.png
 share/owncloud/apps/files_videoviewer/img/skin/bigplay.png
@@ -7465,6 +7392,7 @@ share/owncloud/apps/user_external/appinfo/app.php
 share/owncloud/apps/user_external/appinfo/database.xml
 share/owncloud/apps/user_external/appinfo/info.xml
 share/owncloud/apps/user_external/appinfo/version
+share/owncloud/apps/user_external/img/app.svg
 share/owncloud/apps/user_external/lib/base.php
 share/owncloud/apps/user_external/lib/ftp.php
 share/owncloud/apps/user_external/lib/imap.php
@@ -7506,7 +7434,6 @@ share/owncloud/apps/user_ldap/l10n/ach.js
 share/owncloud/apps/user_ldap/l10n/ach.json
 share/owncloud/apps/user_ldap/l10n/ady.js
 share/owncloud/apps/user_ldap/l10n/ady.json
-share/owncloud/apps/user_ldap/l10n/af.php
 share/owncloud/apps/user_ldap/l10n/af_ZA.js
 share/owncloud/apps/user_ldap/l10n/af_ZA.json
 share/owncloud/apps/user_ldap/l10n/ak.js
@@ -8011,8 +7938,11 @@ share/owncloud/core/doc/admin/_images/antivirus-config.png
 share/owncloud/core/doc/admin/_images/antivirus-daemon-socket.png
 share/owncloud/core/doc/admin/_images/antivirus-executable.png
 share/owncloud/core/doc/admin/_images/antivirus-logging.png
+share/owncloud/core/doc/admin/_images/app-sharepoint-enable.png
+share/owncloud/core/doc/admin/_images/build-a-cloud-of-servers-320.png
 share/owncloud/core/doc/admin/_images/create_public_share.png
 share/owncloud/core/doc/admin/_images/documents_app_enable.png
+share/owncloud/core/doc/admin/_images/documents_apply_test.png
 share/owncloud/core/doc/admin/_images/encryption1.png
 share/owncloud/core/doc/admin/_images/encryption2.png
 share/owncloud/core/doc/admin/_images/encryption3.png
@@ -8044,8 +7974,11 @@ share/owncloud/core/doc/admin/_images/external-storage-google-drive7.png
 share/owncloud/core/doc/admin/_images/external-storage-google-drive8.png
 share/owncloud/core/doc/admin/_images/external-storage-smb.png
 share/owncloud/core/doc/admin/_images/external-storage-webdav.png
+share/owncloud/core/doc/admin/_images/files_locking_app.png
 share/owncloud/core/doc/admin/_images/install-wizard-advanced.png
 share/owncloud/core/doc/admin/_images/install-wizard.png
+share/owncloud/core/doc/admin/_images/jive_2.png
+share/owncloud/core/doc/admin/_images/jive_config.png
 share/owncloud/core/doc/admin/_images/ldap-advanced-1-connection.png
 share/owncloud/core/doc/admin/_images/ldap-advanced-2-directory.png
 share/owncloud/core/doc/admin/_images/ldap-advanced-3-attributes.png
@@ -8057,19 +7990,69 @@ share/owncloud/core/doc/admin/_images/ldap-wizard-1-server.png
 share/owncloud/core/doc/admin/_images/ldap-wizard-2-user.png
 share/owncloud/core/doc/admin/_images/ldap-wizard-3-login.png
 share/owncloud/core/doc/admin/_images/ldap-wizard-4-group.png
+share/owncloud/core/doc/admin/_images/ldaphome-1.png
+share/owncloud/core/doc/admin/_images/ldaphome-2.png
+share/owncloud/core/doc/admin/_images/ldaphome-3.png
+share/owncloud/core/doc/admin/_images/ldaphome-4.png
+share/owncloud/core/doc/admin/_images/ldaphome-5.png
+share/owncloud/core/doc/admin/_images/ldaphome-6.png
 share/owncloud/core/doc/admin/_images/lucene-search-enable.png
 share/owncloud/core/doc/admin/_images/lucene-search-user.png
+share/owncloud/core/doc/admin/_images/mswpi-1.png
+share/owncloud/core/doc/admin/_images/mswpi-2.png
+share/owncloud/core/doc/admin/_images/mswpi-3.png
+share/owncloud/core/doc/admin/_images/mswpi-4.png
+share/owncloud/core/doc/admin/_images/mswpi-5.png
+share/owncloud/core/doc/admin/_images/mswpi-6.png
+share/owncloud/core/doc/admin/_images/mswpi-7.png
+share/owncloud/core/doc/admin/_images/mswpi-8.png
+share/owncloud/core/doc/admin/_images/mswpi-9.png
 share/owncloud/core/doc/admin/_images/oc-video-1.png
 share/owncloud/core/doc/admin/_images/oc-video-2.png
 share/owncloud/core/doc/admin/_images/oc_admin_app_page.png
+share/owncloud/core/doc/admin/_images/oc_admin_app_page1.png
+share/owncloud/core/doc/admin/_images/oracle-1.png
+share/owncloud/core/doc/admin/_images/ownbrander-1.png
+share/owncloud/core/doc/admin/_images/ownbrander-10.png
+share/owncloud/core/doc/admin/_images/ownbrander-11.png
+share/owncloud/core/doc/admin/_images/ownbrander-12.png
+share/owncloud/core/doc/admin/_images/ownbrander-2.png
+share/owncloud/core/doc/admin/_images/ownbrander-3.png
+share/owncloud/core/doc/admin/_images/ownbrander-4.png
+share/owncloud/core/doc/admin/_images/ownbrander-5.png
+share/owncloud/core/doc/admin/_images/ownbrander-6.png
+share/owncloud/core/doc/admin/_images/ownbrander-7.png
+share/owncloud/core/doc/admin/_images/ownbrander-8.png
+share/owncloud/core/doc/admin/_images/ownbrander-9.png
 share/owncloud/core/doc/admin/_images/preview_images.png
 share/owncloud/core/doc/admin/_images/remote_shares.png
+share/owncloud/core/doc/admin/_images/scaling-1.png
+share/owncloud/core/doc/admin/_images/scaling-2.png
+share/owncloud/core/doc/admin/_images/scaling-3.png
+share/owncloud/core/doc/admin/_images/scaling-4.png
+share/owncloud/core/doc/admin/_images/scaling-5.png
+share/owncloud/core/doc/admin/_images/sharepoint-drive-config.png
 share/owncloud/core/doc/admin/_images/sharing-admin.png
 share/owncloud/core/doc/admin/_images/sharing-user-local.png
 share/owncloud/core/doc/admin/_images/sharing-user.png
+share/owncloud/core/doc/admin/_images/shibboleth-personal.png
+share/owncloud/core/doc/admin/_images/skeleton-files.png
+share/owncloud/core/doc/admin/_images/skeleton-files1.png
+share/owncloud/core/doc/admin/_images/smb-create-share.png
+share/owncloud/core/doc/admin/_images/smb-files-view.png
+share/owncloud/core/doc/admin/_images/smb-user-share.png
 share/owncloud/core/doc/admin/_images/smtp-config-php-sendmail.png
 share/owncloud/core/doc/admin/_images/smtp-config-smtp.png
 share/owncloud/core/doc/admin/_images/smtp-config-wizard.png
+share/owncloud/core/doc/admin/_images/theming-1.png
+share/owncloud/core/doc/admin/_images/theming-10.png
+share/owncloud/core/doc/admin/_images/theming-2.png
+share/owncloud/core/doc/admin/_images/theming-3.png
+share/owncloud/core/doc/admin/_images/theming-4.jpg
+share/owncloud/core/doc/admin/_images/theming-5.png
+share/owncloud/core/doc/admin/_images/theming-6.png
+share/owncloud/core/doc/admin/_images/theming-7.png
+share/owncloud/core/doc/admin/_images/theming-8.png
 share/owncloud/core/doc/admin/_images/ucs-app-center-install.png
 share/owncloud/core/doc/admin/_images/ucs-app-center-module.png
 share/owncloud/core/doc/admin/_images/ucsint.png
@@ -8087,52 +8070,82 @@ share/owncloud/core/doc/admin/_images/users-config.png
 share/owncloud/core/doc/admin/_images/users-create.png
 share/owncloud/core/doc/admin/_images/users-groups.png
 share/owncloud/core/doc/admin/_images/win7features.jpg
+share/owncloud/core/doc/admin/_images/windows-install-1.png
+share/owncloud/core/doc/admin/_images/windows-install-2.png
+share/owncloud/core/doc/admin/_images/windows-install-3.png
+share/owncloud/core/doc/admin/_images/windows-install-4.png
+share/owncloud/core/doc/admin/_images/windows-install-5.png
+share/owncloud/core/doc/admin/_images/windows-install-6.png
+share/owncloud/core/doc/admin/_images/windows-install-7.png
+share/owncloud/core/doc/admin/_images/windows-install-8.png
 share/owncloud/core/doc/admin/_images/winserverroles.jpg
-share/owncloud/core/doc/admin/_sources/configuration/antivirus_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/automatic_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/background_jobs_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/big_file_upload_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/collaborative_documents_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/config_sample_php_parameters.txt
-share/owncloud/core/doc/admin/_sources/configuration/custom_client_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/database_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/email_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/encryption_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/external_storage_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/external_storage_configuration_gui.txt
-share/owncloud/core/doc/admin/_sources/configuration/file_sharing_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/files_locking_enabling.txt
-share/owncloud/core/doc/admin/_sources/configuration/index.txt
-share/owncloud/core/doc/admin/_sources/configuration/js_css_asset_management_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/knowledgebase_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/language_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/logging_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/occ_command.txt
-share/owncloud/core/doc/admin/_sources/configuration/performance_tips.txt
-share/owncloud/core/doc/admin/_sources/configuration/previews_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/reset_admin_password.txt
-share/owncloud/core/doc/admin/_sources/configuration/reverse_proxy_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/search_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/server_to_server_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/serving_static_files_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/thirdparty_php_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/user_auth_ftp_smb_imap.txt
-share/owncloud/core/doc/admin/_sources/configuration/user_auth_ldap.txt
-share/owncloud/core/doc/admin/_sources/configuration/user_auth_ldap_cleanup.txt
-share/owncloud/core/doc/admin/_sources/configuration/user_configuration.txt
-share/owncloud/core/doc/admin/_sources/configuration/user_provisioning_api.txt
+share/owncloud/core/doc/admin/_sources/configuration_database/db_conversion.txt
+share/owncloud/core/doc/admin/_sources/configuration_database/index.txt
+share/owncloud/core/doc/admin/_sources/configuration_database/linux_database_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_database/oracle_db_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_database/windows_database_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/big_file_upload_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/collaborative_documents_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/default_files_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/encryption_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/external_storage_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/external_storage_configuration_gui.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/federated_cloud_sharing_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/file_sharing_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/files_locking_enabling.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/index.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/previews_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_files/serving_static_files_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/antivirus_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/automatic_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/background_jobs_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/config_sample_php_parameters.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/email_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/index.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/js_css_asset_management_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/knowledgebase_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/language_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/logging_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/occ_command.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/performance_tips.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/performance_tuning.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/reverse_proxy_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/search_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_server/thirdparty_php_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/index.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/reset_admin_password.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ftp_smb_imap.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ldap.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ldap_cleanup.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/user_configuration.txt
+share/owncloud/core/doc/admin/_sources/configuration_user/user_provisioning_api.txt
 share/owncloud/core/doc/admin/_sources/contents.txt
+share/owncloud/core/doc/admin/_sources/enterprise_clients/creating_branded_apps.txt
+share/owncloud/core/doc/admin/_sources/enterprise_clients/custom_client_repos.txt
+share/owncloud/core/doc/admin/_sources/enterprise_clients/index.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/index.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/jive_configuration.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/ldap_home_connector_configuration.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/sharepoint-integration_configuration.txt
+share/owncloud/core/doc/admin/_sources/enterprise_external_storage/windows-network-drive_configuration.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/apps_management_installation.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/index.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/license_keys_installation.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/linux_installation.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/supported_apps_installation.txt
+share/owncloud/core/doc/admin/_sources/enterprise_installation/windows2_installation.txt
+share/owncloud/core/doc/admin/_sources/enterprise_user_management/index.txt
+share/owncloud/core/doc/admin/_sources/enterprise_user_management/user_auth_shibboleth.txt
 share/owncloud/core/doc/admin/_sources/index.txt
 share/owncloud/core/doc/admin/_sources/installation/appliance_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/apps_management_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/hiawatha_configuration.txt
 share/owncloud/core/doc/admin/_sources/installation/index.txt
 share/owncloud/core/doc/admin/_sources/installation/installation_wizard.txt
-share/owncloud/core/doc/admin/_sources/installation/lighttpd_configuration.txt
 share/owncloud/core/doc/admin/_sources/installation/linux_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/macos_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/nginx_configuration.txt
-share/owncloud/core/doc/admin/_sources/installation/others_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/selinux_configuration.txt
 share/owncloud/core/doc/admin/_sources/installation/source_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/ucs_installation.txt
@@ -8140,15 +8153,18 @@ share/owncloud/core/doc/admin/_sources/installation/windows_installation.txt
 share/owncloud/core/doc/admin/_sources/installation/yaws_configuration.txt
 share/owncloud/core/doc/admin/_sources/issues/index.txt
 share/owncloud/core/doc/admin/_sources/maintenance/backup.txt
-share/owncloud/core/doc/admin/_sources/maintenance/convert_db.txt
 share/owncloud/core/doc/admin/_sources/maintenance/enable_maintenance.txt
 share/owncloud/core/doc/admin/_sources/maintenance/index.txt
 share/owncloud/core/doc/admin/_sources/maintenance/migrating.txt
 share/owncloud/core/doc/admin/_sources/maintenance/restore.txt
 share/owncloud/core/doc/admin/_sources/maintenance/update.txt
 share/owncloud/core/doc/admin/_sources/maintenance/upgrade.txt
+share/owncloud/core/doc/admin/_sources/operations/considerations_on_monitoring.txt
+share/owncloud/core/doc/admin/_sources/operations/index.txt
+share/owncloud/core/doc/admin/_sources/operations/scaling_multiple_machines.txt
+share/owncloud/core/doc/admin/_sources/operations/theming.txt
 share/owncloud/core/doc/admin/_sources/release_notes.txt
-share/owncloud/core/doc/admin/_sources/videos.txt
+share/owncloud/core/doc/admin/_sources/videos/index.txt
 share/owncloud/core/doc/admin/_sources/whats_new_admin.txt
 share/owncloud/core/doc/admin/_static/ajax-loader.gif
 share/owncloud/core/doc/admin/_static/basic.css
@@ -8179,40 +8195,64 @@ share/owncloud/core/doc/admin/_static/underscore.js
 share/owncloud/core/doc/admin/_static/up-pressed.png
 share/owncloud/core/doc/admin/_static/up.png
 share/owncloud/core/doc/admin/_static/websupport.js
-share/owncloud/core/doc/admin/configuration/antivirus_configuration.html
-share/owncloud/core/doc/admin/configuration/automatic_configuration.html
-share/owncloud/core/doc/admin/configuration/background_jobs_configuration.html
-share/owncloud/core/doc/admin/configuration/big_file_upload_configuration.html
-share/owncloud/core/doc/admin/configuration/collaborative_documents_configuration.html
-share/owncloud/core/doc/admin/configuration/config_sample_php_parameters.html
-share/owncloud/core/doc/admin/configuration/custom_client_configuration.html
-share/owncloud/core/doc/admin/configuration/database_configuration.html
-share/owncloud/core/doc/admin/configuration/email_configuration.html
-share/owncloud/core/doc/admin/configuration/encryption_configuration.html
-share/owncloud/core/doc/admin/configuration/external_storage_configuration.html
-share/owncloud/core/doc/admin/configuration/external_storage_configuration_gui.html
-share/owncloud/core/doc/admin/configuration/file_sharing_configuration.html
-share/owncloud/core/doc/admin/configuration/files_locking_enabling.html
-share/owncloud/core/doc/admin/configuration/index.html
-share/owncloud/core/doc/admin/configuration/js_css_asset_management_configuration.html
-share/owncloud/core/doc/admin/configuration/knowledgebase_configuration.html
-share/owncloud/core/doc/admin/configuration/language_configuration.html
-share/owncloud/core/doc/admin/configuration/logging_configuration.html
-share/owncloud/core/doc/admin/configuration/occ_command.html
-share/owncloud/core/doc/admin/configuration/performance_tips.html
-share/owncloud/core/doc/admin/configuration/previews_configuration.html
-share/owncloud/core/doc/admin/configuration/reset_admin_password.html
-share/owncloud/core/doc/admin/configuration/reverse_proxy_configuration.html
-share/owncloud/core/doc/admin/configuration/search_configuration.html
-share/owncloud/core/doc/admin/configuration/server_to_server_configuration.html
-share/owncloud/core/doc/admin/configuration/serving_static_files_configuration.html
-share/owncloud/core/doc/admin/configuration/thirdparty_php_configuration.html
-share/owncloud/core/doc/admin/configuration/user_auth_ftp_smb_imap.html
-share/owncloud/core/doc/admin/configuration/user_auth_ldap.html
-share/owncloud/core/doc/admin/configuration/user_auth_ldap_cleanup.html
-share/owncloud/core/doc/admin/configuration/user_configuration.html
-share/owncloud/core/doc/admin/configuration/user_provisioning_api.html
+share/owncloud/core/doc/admin/configuration_database/db_conversion.html
+share/owncloud/core/doc/admin/configuration_database/index.html
+share/owncloud/core/doc/admin/configuration_database/linux_database_configuration.html
+share/owncloud/core/doc/admin/configuration_database/oracle_db_configuration.html
+share/owncloud/core/doc/admin/configuration_database/windows_database_configuration.html
+share/owncloud/core/doc/admin/configuration_files/big_file_upload_configuration.html
+share/owncloud/core/doc/admin/configuration_files/collaborative_documents_configuration.html
+share/owncloud/core/doc/admin/configuration_files/default_files_configuration.html
+share/owncloud/core/doc/admin/configuration_files/encryption_configuration.html
+share/owncloud/core/doc/admin/configuration_files/external_storage_configuration.html
+share/owncloud/core/doc/admin/configuration_files/external_storage_configuration_gui.html
+share/owncloud/core/doc/admin/configuration_files/federated_cloud_sharing_configuration.html
+share/owncloud/core/doc/admin/configuration_files/file_sharing_configuration.html
+share/owncloud/core/doc/admin/configuration_files/files_locking_enabling.html
+share/owncloud/core/doc/admin/configuration_files/index.html
+share/owncloud/core/doc/admin/configuration_files/previews_configuration.html
+share/owncloud/core/doc/admin/configuration_files/serving_static_files_configuration.html
+share/owncloud/core/doc/admin/configuration_server/antivirus_configuration.html
+share/owncloud/core/doc/admin/configuration_server/automatic_configuration.html
+share/owncloud/core/doc/admin/configuration_server/background_jobs_configuration.html
+share/owncloud/core/doc/admin/configuration_server/config_sample_php_parameters.html
+share/owncloud/core/doc/admin/configuration_server/email_configuration.html
+share/owncloud/core/doc/admin/configuration_server/index.html
+share/owncloud/core/doc/admin/configuration_server/js_css_asset_management_configuration.html
+share/owncloud/core/doc/admin/configuration_server/knowledgebase_configuration.html
+share/owncloud/core/doc/admin/configuration_server/language_configuration.html
+share/owncloud/core/doc/admin/configuration_server/logging_configuration.html
+share/owncloud/core/doc/admin/configuration_server/occ_command.html
+share/owncloud/core/doc/admin/configuration_server/performance_tips.html
+share/owncloud/core/doc/admin/configuration_server/performance_tuning.html
+share/owncloud/core/doc/admin/configuration_server/reverse_proxy_configuration.html
+share/owncloud/core/doc/admin/configuration_server/search_configuration.html
+share/owncloud/core/doc/admin/configuration_server/thirdparty_php_configuration.html
+share/owncloud/core/doc/admin/configuration_user/index.html
+share/owncloud/core/doc/admin/configuration_user/reset_admin_password.html
+share/owncloud/core/doc/admin/configuration_user/user_auth_ftp_smb_imap.html
+share/owncloud/core/doc/admin/configuration_user/user_auth_ldap.html
+share/owncloud/core/doc/admin/configuration_user/user_auth_ldap_cleanup.html
+share/owncloud/core/doc/admin/configuration_user/user_configuration.html
+share/owncloud/core/doc/admin/configuration_user/user_provisioning_api.html
 share/owncloud/core/doc/admin/contents.html
+share/owncloud/core/doc/admin/enterprise_clients/creating_branded_apps.html
+share/owncloud/core/doc/admin/enterprise_clients/custom_client_repos.html
+share/owncloud/core/doc/admin/enterprise_clients/index.html
+share/owncloud/core/doc/admin/enterprise_external_storage/index.html
+share/owncloud/core/doc/admin/enterprise_external_storage/jive_configuration.html
+share/owncloud/core/doc/admin/enterprise_external_storage/ldap_home_connector_configuration.html
+share/owncloud/core/doc/admin/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.html
+share/owncloud/core/doc/admin/enterprise_external_storage/sharepoint-integration_configuration.html
+share/owncloud/core/doc/admin/enterprise_external_storage/windows-network-drive_configuration.html
+share/owncloud/core/doc/admin/enterprise_installation/apps_management_installation.html
+share/owncloud/core/doc/admin/enterprise_installation/index.html
+share/owncloud/core/doc/admin/enterprise_installation/license_keys_installation.html
+share/owncloud/core/doc/admin/enterprise_installation/linux_installation.html
+share/owncloud/core/doc/admin/enterprise_installation/supported_apps_installation.html
+share/owncloud/core/doc/admin/enterprise_installation/windows2_installation.html
+share/owncloud/core/doc/admin/enterprise_user_management/index.html
+share/owncloud/core/doc/admin/enterprise_user_management/user_auth_shibboleth.html
 share/owncloud/core/doc/admin/genindex.html
 share/owncloud/core/doc/admin/index.html
 share/owncloud/core/doc/admin/installation/appliance_installation.html
@@ -8220,11 +8260,9 @@ share/owncloud/core/doc/admin/installation/apps_management_installation.html
 share/owncloud/core/doc/admin/installation/hiawatha_configuration.html
 share/owncloud/core/doc/admin/installation/index.html
 share/owncloud/core/doc/admin/installation/installation_wizard.html
-share/owncloud/core/doc/admin/installation/lighttpd_configuration.html
 share/owncloud/core/doc/admin/installation/linux_installation.html
 share/owncloud/core/doc/admin/installation/macos_installation.html
 share/owncloud/core/doc/admin/installation/nginx_configuration.html
-share/owncloud/core/doc/admin/installation/others_installation.html
 share/owncloud/core/doc/admin/installation/selinux_configuration.html
 share/owncloud/core/doc/admin/installation/source_installation.html
 share/owncloud/core/doc/admin/installation/ucs_installation.html
@@ -8232,7 +8270,6 @@ share/owncloud/core/doc/admin/installation/windows_installation.html
 share/owncloud/core/doc/admin/installation/yaws_configuration.html
 share/owncloud/core/doc/admin/issues/index.html
 share/owncloud/core/doc/admin/maintenance/backup.html
-share/owncloud/core/doc/admin/maintenance/convert_db.html
 share/owncloud/core/doc/admin/maintenance/enable_maintenance.html
 share/owncloud/core/doc/admin/maintenance/index.html
 share/owncloud/core/doc/admin/maintenance/migrating.html
@@ -8240,10 +8277,14 @@ share/owncloud/core/doc/admin/maintenance/restore.html
 share/owncloud/core/doc/admin/maintenance/update.html
 share/owncloud/core/doc/admin/maintenance/upgrade.html
 share/owncloud/core/doc/admin/objects.inv
+share/owncloud/core/doc/admin/operations/considerations_on_monitoring.html
+share/owncloud/core/doc/admin/operations/index.html
+share/owncloud/core/doc/admin/operations/scaling_multiple_machines.html
+share/owncloud/core/doc/admin/operations/theming.html
 share/owncloud/core/doc/admin/release_notes.html
 share/owncloud/core/doc/admin/search.html
 share/owncloud/core/doc/admin/searchindex.js
-share/owncloud/core/doc/admin/videos.html
+share/owncloud/core/doc/admin/videos/index.html
 share/owncloud/core/doc/admin/whats_new_admin.html
 share/owncloud/core/doc/user/_images/bookmark_addurl.png
 share/owncloud/core/doc/user/_images/bookmark_setting.png
@@ -8301,7 +8342,6 @@ share/owncloud/core/doc/user/_images/oc_documents_edit.png
 share/owncloud/core/doc/user/_images/oc_documents_share.png
 share/owncloud/core/doc/user/_images/oc_filesweb_navigate.png
 share/owncloud/core/doc/user/_images/oc_filesweb_new.png
-share/owncloud/core/doc/user/_images/oc_main_web.png
 share/owncloud/core/doc/user/_images/oc_main_web_labelled.png
 share/owncloud/core/doc/user/_images/oc_personal_settings_dropdown.png
 share/owncloud/core/doc/user/_images/osx_webdav1.png
@@ -8314,6 +8354,7 @@ share/owncloud/core/doc/user/_images/s2s-add-remote-share.png
 share/owncloud/core/doc/user/_images/s2s-connect-to-remote-share.png
 share/owncloud/core/doc/user/_images/s2s-create_public_share.png
 share/owncloud/core/doc/user/_images/s2s-remote-share-labeled.png
+share/owncloud/core/doc/user/_images/sharepoint-drive-config-user.png
 share/owncloud/core/doc/user/_images/usage_indicator.png
 share/owncloud/core/doc/user/_images/users-files.png
 share/owncloud/core/doc/user/_images/users-overlays-sharepoint.png
@@ -8327,17 +8368,19 @@ share/owncloud/core/doc/user/_images/webdav_gnome3_nautilus.png
 share/owncloud/core/doc/user/_sources/bookmarks.txt
 share/owncloud/core/doc/user/_sources/contents.txt
 share/owncloud/core/doc/user/_sources/documents.txt
-share/owncloud/core/doc/user/_sources/external_storage/google_drive.txt
-share/owncloud/core/doc/user/_sources/files/configuring_big_file_upload.txt
-share/owncloud/core/doc/user/_sources/files/deletedfiles.txt
-share/owncloud/core/doc/user/_sources/files/encryption.txt
-share/owncloud/core/doc/user/_sources/files/files.txt
-share/owncloud/core/doc/user/_sources/files/filesweb.txt
+share/owncloud/core/doc/user/_sources/external_storage/external_storage.txt
+share/owncloud/core/doc/user/_sources/external_storage/index.txt
+share/owncloud/core/doc/user/_sources/external_storage/sharepoint_connecting.txt
+share/owncloud/core/doc/user/_sources/files/access_webdav.txt
+share/owncloud/core/doc/user/_sources/files/access_webgui.txt
+share/owncloud/core/doc/user/_sources/files/deleted_file_management.txt
+share/owncloud/core/doc/user/_sources/files/desktop_mobile_sync.txt
+share/owncloud/core/doc/user/_sources/files/encrypting_files.txt
+share/owncloud/core/doc/user/_sources/files/federated_cloud_sharing.txt
 share/owncloud/core/doc/user/_sources/files/index.txt
+share/owncloud/core/doc/user/_sources/files/large_file_upload.txt
 share/owncloud/core/doc/user/_sources/files/quota.txt
-share/owncloud/core/doc/user/_sources/files/server_to_server_using.txt
-share/owncloud/core/doc/user/_sources/files/sync.txt
-share/owncloud/core/doc/user/_sources/files/versioncontrol.txt
+share/owncloud/core/doc/user/_sources/files/version_control.txt
 share/owncloud/core/doc/user/_sources/index.txt
 share/owncloud/core/doc/user/_sources/pim/calendar.txt
 share/owncloud/core/doc/user/_sources/pim/contacts.txt
@@ -8382,17 +8425,19 @@ share/owncloud/core/doc/user/_static/websupport.js
 share/owncloud/core/doc/user/bookmarks.html
 share/owncloud/core/doc/user/contents.html
 share/owncloud/core/doc/user/documents.html
-share/owncloud/core/doc/user/external_storage/google_drive.html
-share/owncloud/core/doc/user/files/configuring_big_file_upload.html
-share/owncloud/core/doc/user/files/deletedfiles.html
-share/owncloud/core/doc/user/files/encryption.html
-share/owncloud/core/doc/user/files/files.html
-share/owncloud/core/doc/user/files/filesweb.html
+share/owncloud/core/doc/user/external_storage/external_storage.html
+share/owncloud/core/doc/user/external_storage/index.html
+share/owncloud/core/doc/user/external_storage/sharepoint_connecting.html
+share/owncloud/core/doc/user/files/access_webdav.html
+share/owncloud/core/doc/user/files/access_webgui.html
+share/owncloud/core/doc/user/files/deleted_file_management.html
+share/owncloud/core/doc/user/files/desktop_mobile_sync.html
+share/owncloud/core/doc/user/files/encrypting_files.html
+share/owncloud/core/doc/user/files/federated_cloud_sharing.html
 share/owncloud/core/doc/user/files/index.html
+share/owncloud/core/doc/user/files/large_file_upload.html
 share/owncloud/core/doc/user/files/quota.html
-share/owncloud/core/doc/user/files/server_to_server_using.html
-share/owncloud/core/doc/user/files/sync.html
-share/owncloud/core/doc/user/files/versioncontrol.html
+share/owncloud/core/doc/user/files/version_control.html
 share/owncloud/core/doc/user/genindex.html
 share/owncloud/core/doc/user/index.html
 share/owncloud/core/doc/user/objects.inv
@@ -8666,7 +8711,6 @@ share/owncloud/core/l10n/ach.js
 share/owncloud/core/l10n/ach.json
 share/owncloud/core/l10n/ady.js
 share/owncloud/core/l10n/ady.json
-share/owncloud/core/l10n/af.php
 share/owncloud/core/l10n/af_ZA.js
 share/owncloud/core/l10n/af_ZA.json
 share/owncloud/core/l10n/ak.js
@@ -9011,7 +9055,6 @@ share/owncloud/lib/l10n/ach.js
 share/owncloud/lib/l10n/ach.json
 share/owncloud/lib/l10n/ady.js
 share/owncloud/lib/l10n/ady.json
-share/owncloud/lib/l10n/af.php
 share/owncloud/lib/l10n/af_ZA.js
 share/owncloud/lib/l10n/af_ZA.json
 share/owncloud/lib/l10n/ak.js
diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo
index d48a470cbd6..331dc402a95 100644
--- a/www/php-owncloud/distinfo
+++ b/www/php-owncloud/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2015/02/15 06:56:39 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2015/03/21 21:48:52 ryoon Exp $
 
 SHA1 (168707-calendar.zip) = 521fb58ad898529f9a10d94c165bc978010defd3
 RMD160 (168707-calendar.zip) = fdb7c3cddc0cd9e0338328d5cf246bd774f28803
@@ -6,6 +6,6 @@ Size (168707-calendar.zip) = 905909 bytes
 SHA1 (168708-contacts.zip) = abbb3ae9f966a80ec3dc7590c0906ad10b7e340e
 RMD160 (168708-contacts.zip) = 4d351166cfca85957d72fcbdcc454b21b0965ce7
 Size (168708-contacts.zip) = 1442129 bytes
-SHA1 (owncloud-8.0.0.tar.bz2) = 607e504ba76d746c9ece2cc9d7f8577bc06a6eb4
-RMD160 (owncloud-8.0.0.tar.bz2) = 704f81104a0d0a5447a702cae9cf7921a605958b
-Size (owncloud-8.0.0.tar.bz2) = 17200380 bytes
+SHA1 (owncloud-8.0.2.tar.bz2) = e0ed7e3bc0dd3f352d2bcdf46a827029c3c7f5e1
+RMD160 (owncloud-8.0.2.tar.bz2) = 63637732658e2e869bd3d15b992d2377b77be776
+Size (owncloud-8.0.2.tar.bz2) = 20422855 bytes
diff --git a/www/php-owncloud/options.mk b/www/php-owncloud/options.mk
index 62b7d538710..48ab1b927c4 100644
--- a/www/php-owncloud/options.mk
+++ b/www/php-owncloud/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2013/01/25 20:02:24 ryoon Exp $
+# $NetBSD: options.mk,v 1.5 2015/03/21 21:48:52 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.php-owncloud
 
 PKG_OPTIONS_REQUIRED_GROUPS=	db
-PKG_OPTIONS_GROUP.db=		mysql sqlite pgsql
+PKG_OPTIONS_GROUP.db=		mysql sqlite3 pgsql
 
-PKG_SUGGESTED_OPTIONS=	sqlite
+PKG_SUGGESTED_OPTIONS=	sqlite3
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,16 +13,15 @@ PKG_SUGGESTED_OPTIONS=	sqlite
 ### Use mysql, pgsql, or sqlite backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql>=5.2.0:../../databases/php-pdo_mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
-.elif !empty(PKG_OPTIONS:Msqlite)
-
-# php-sqlite provides sqlite2
-#DEPENDS+=	${PHP_PKG_PREFIX}-sqlite>=5.2.0:../../databases/php-sqlite
+.elif !empty(PKG_OPTIONS:Msqlite3)
 
 # php-pdo_sqlite provides sqlite3.  An owncloud instance that was
 # installed as version 2 and upgraded to 3 and then 4
 # complained/failed that PDO was not present.
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_sqlite>=5.2.0:../../databases/php-pdo_sqlite
 .elif !empty(PKG_OPTIONS:Mpgsql)
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_pgsql>=5.2.0:../../databases/php-pdo_pgsql
 DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=5.2.0:../../databases/php-pgsql
 .endif