[Pkg-owncloud-commits] [owncloud] 66/69: Imported Upstream version 8.2.1~~rc2~dfsg
David Prévot
taffit at moszumanska.debian.org
Wed Nov 11 02:04:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit 519f9e248160c27ecf4609ad837e3b553b0a970d
Merge: 02edceb d7aadcb
Author: David Prévot <taffit at debian.org>
Date: Tue Nov 10 20:28:05 2015 -0400
Imported Upstream version 8.2.1~~rc2~dfsg
apps/activity/templates/stream.app.navigation.php | 2 +-
apps/encryption/l10n/cs_CZ.js | 4 +-
apps/encryption/l10n/cs_CZ.json | 4 +-
apps/encryption/l10n/da.js | 4 +-
apps/encryption/l10n/da.json | 4 +-
apps/encryption/l10n/el.js | 4 +-
apps/encryption/l10n/el.json | 4 +-
apps/encryption/l10n/es.js | 4 +-
apps/encryption/l10n/es.json | 4 +-
apps/encryption/l10n/fr.js | 4 +-
apps/encryption/l10n/fr.json | 4 +-
apps/encryption/l10n/id.js | 4 +-
apps/encryption/l10n/id.json | 4 +-
apps/encryption/l10n/it.js | 4 +-
apps/encryption/l10n/it.json | 4 +-
apps/encryption/l10n/ja.js | 4 +-
apps/encryption/l10n/ja.json | 4 +-
apps/encryption/l10n/ko.js | 4 +-
apps/encryption/l10n/ko.json | 4 +-
apps/encryption/l10n/lt_LT.js | 5 +-
apps/encryption/l10n/lt_LT.json | 5 +-
apps/encryption/l10n/nb_NO.js | 4 +-
apps/encryption/l10n/nb_NO.json | 4 +-
apps/encryption/l10n/nl.js | 4 +-
apps/encryption/l10n/nl.json | 4 +-
apps/encryption/l10n/oc.js | 4 +-
apps/encryption/l10n/oc.json | 4 +-
apps/encryption/l10n/pt_BR.js | 4 +-
apps/encryption/l10n/pt_BR.json | 4 +-
apps/encryption/l10n/ru.js | 4 +-
apps/encryption/l10n/ru.json | 4 +-
apps/encryption/l10n/sq.js | 6 +-
apps/encryption/l10n/sq.json | 6 +-
apps/encryption/l10n/th_TH.js | 4 +-
apps/encryption/l10n/th_TH.json | 4 +-
apps/encryption/l10n/tr.js | 4 +-
apps/encryption/l10n/tr.json | 4 +-
apps/encryption/l10n/zh_TW.js | 6 +-
apps/encryption/l10n/zh_TW.json | 6 +-
apps/files/js/filelist.js | 5 +-
apps/files/l10n/bn_BD.js | 3 +-
apps/files/l10n/bn_BD.json | 3 +-
apps/files/l10n/cy_GB.js | 3 +-
apps/files/l10n/cy_GB.json | 3 +-
apps/files/l10n/de.js | 3 +-
apps/files/l10n/de.json | 3 +-
apps/files/l10n/de_DE.js | 3 +-
apps/files/l10n/de_DE.json | 3 +-
apps/files/l10n/he.js | 3 +-
apps/files/l10n/he.json | 3 +-
apps/files/l10n/is.js | 3 +-
apps/files/l10n/is.json | 3 +-
apps/files/l10n/ka_GE.js | 3 +-
apps/files/l10n/ka_GE.json | 3 +-
apps/files/l10n/km.js | 3 +-
apps/files/l10n/km.json | 3 +-
apps/files/l10n/kn.js | 3 +-
apps/files/l10n/kn.json | 3 +-
apps/files/l10n/lb.js | 3 +-
apps/files/l10n/lb.json | 3 +-
apps/files/l10n/ms_MY.js | 3 +-
apps/files/l10n/ms_MY.json | 3 +-
apps/files/l10n/si_LK.js | 3 +-
apps/files/l10n/si_LK.json | 3 +-
apps/files/l10n/ta_LK.js | 3 +-
apps/files/l10n/ta_LK.json | 3 +-
apps/files/l10n/ug.js | 3 +-
apps/files/l10n/ug.json | 3 +-
apps/files_external/ajax/oauth2.php | 1 +
apps/files_external/l10n/ja.js | 3 +-
apps/files_external/l10n/ja.json | 3 +-
apps/files_external/l10n/oc.js | 4 +-
apps/files_external/l10n/oc.json | 4 +-
apps/files_external/l10n/sq.js | 6 +-
apps/files_external/l10n/sq.json | 6 +-
apps/files_external/service/backendservice.php | 5 +
apps/files_sharing/l10n/lt_LT.js | 6 +-
apps/files_sharing/l10n/lt_LT.json | 6 +-
apps/files_sharing/l10n/sq.js | 5 +-
apps/files_sharing/l10n/sq.json | 5 +-
apps/files_sharing/lib/watcher.php | 52 ++++-----
apps/files_texteditor/js/editor.js | 47 +++++---
apps/firstrunwizard/css/firstrunwizard.css | 2 +
apps/user_ldap/css/settings.css | 6 +-
apps/user_ldap/group_ldap.php | 5 +-
apps/user_ldap/js/wizard/view.js | 3 +-
apps/user_ldap/js/wizard/wizardTabGeneric.js | 13 ++-
apps/user_ldap/js/wizard/wizardTabLoginFilter.js | 6 +-
apps/user_ldap/l10n/ast.js | 4 +-
apps/user_ldap/l10n/ast.json | 4 +-
apps/user_ldap/l10n/bg_BG.js | 4 +-
apps/user_ldap/l10n/bg_BG.json | 4 +-
apps/user_ldap/l10n/bn_BD.js | 4 +-
apps/user_ldap/l10n/bn_BD.json | 4 +-
apps/user_ldap/l10n/ca.js | 4 +-
apps/user_ldap/l10n/ca.json | 4 +-
apps/user_ldap/l10n/cs_CZ.js | 4 +-
apps/user_ldap/l10n/cs_CZ.json | 4 +-
apps/user_ldap/l10n/da.js | 4 +-
apps/user_ldap/l10n/da.json | 4 +-
apps/user_ldap/l10n/de.js | 4 +-
apps/user_ldap/l10n/de.json | 4 +-
apps/user_ldap/l10n/de_DE.js | 4 +-
apps/user_ldap/l10n/de_DE.json | 4 +-
apps/user_ldap/l10n/el.js | 4 +-
apps/user_ldap/l10n/el.json | 4 +-
apps/user_ldap/l10n/en_GB.js | 4 +-
apps/user_ldap/l10n/en_GB.json | 4 +-
apps/user_ldap/l10n/es.js | 4 +-
apps/user_ldap/l10n/es.json | 4 +-
apps/user_ldap/l10n/es_AR.js | 4 +-
apps/user_ldap/l10n/es_AR.json | 4 +-
apps/user_ldap/l10n/es_MX.js | 4 +-
apps/user_ldap/l10n/es_MX.json | 4 +-
apps/user_ldap/l10n/et_EE.js | 4 +-
apps/user_ldap/l10n/et_EE.json | 4 +-
apps/user_ldap/l10n/eu.js | 4 +-
apps/user_ldap/l10n/eu.json | 4 +-
apps/user_ldap/l10n/fa.js | 4 +-
apps/user_ldap/l10n/fa.json | 4 +-
apps/user_ldap/l10n/fi_FI.js | 4 +-
apps/user_ldap/l10n/fi_FI.json | 4 +-
apps/user_ldap/l10n/fr.js | 4 +-
apps/user_ldap/l10n/fr.json | 4 +-
apps/user_ldap/l10n/gl.js | 4 +-
apps/user_ldap/l10n/gl.json | 4 +-
apps/user_ldap/l10n/hu_HU.js | 4 +-
apps/user_ldap/l10n/hu_HU.json | 4 +-
apps/user_ldap/l10n/id.js | 4 +-
apps/user_ldap/l10n/id.json | 4 +-
apps/user_ldap/l10n/it.js | 4 +-
apps/user_ldap/l10n/it.json | 4 +-
apps/user_ldap/l10n/ja.js | 4 +-
apps/user_ldap/l10n/ja.json | 4 +-
apps/user_ldap/l10n/ka_GE.js | 4 +-
apps/user_ldap/l10n/ka_GE.json | 4 +-
apps/user_ldap/l10n/ko.js | 4 +-
apps/user_ldap/l10n/ko.json | 4 +-
apps/user_ldap/l10n/lt_LT.js | 4 +-
apps/user_ldap/l10n/lt_LT.json | 4 +-
apps/user_ldap/l10n/lv.js | 4 +-
apps/user_ldap/l10n/lv.json | 4 +-
apps/user_ldap/l10n/nb_NO.js | 4 +-
apps/user_ldap/l10n/nb_NO.json | 4 +-
apps/user_ldap/l10n/nl.js | 4 +-
apps/user_ldap/l10n/nl.json | 4 +-
apps/user_ldap/l10n/oc.js | 4 +-
apps/user_ldap/l10n/oc.json | 4 +-
apps/user_ldap/l10n/pl.js | 4 +-
apps/user_ldap/l10n/pl.json | 4 +-
apps/user_ldap/l10n/pt_BR.js | 4 +-
apps/user_ldap/l10n/pt_BR.json | 4 +-
apps/user_ldap/l10n/pt_PT.js | 4 +-
apps/user_ldap/l10n/pt_PT.json | 4 +-
apps/user_ldap/l10n/ru.js | 4 +-
apps/user_ldap/l10n/ru.json | 4 +-
apps/user_ldap/l10n/sk_SK.js | 4 +-
apps/user_ldap/l10n/sk_SK.json | 4 +-
apps/user_ldap/l10n/sl.js | 4 +-
apps/user_ldap/l10n/sl.json | 4 +-
apps/user_ldap/l10n/sq.js | 5 +-
apps/user_ldap/l10n/sq.json | 5 +-
apps/user_ldap/l10n/sr.js | 4 +-
apps/user_ldap/l10n/sr.json | 4 +-
apps/user_ldap/l10n/sv.js | 4 +-
apps/user_ldap/l10n/sv.json | 4 +-
apps/user_ldap/l10n/th_TH.js | 4 +-
apps/user_ldap/l10n/th_TH.json | 4 +-
apps/user_ldap/l10n/tr.js | 4 +-
apps/user_ldap/l10n/tr.json | 4 +-
apps/user_ldap/l10n/uk.js | 4 +-
apps/user_ldap/l10n/uk.json | 4 +-
apps/user_ldap/l10n/vi.js | 3 +-
apps/user_ldap/l10n/vi.json | 3 +-
apps/user_ldap/l10n/zh_CN.js | 4 +-
apps/user_ldap/l10n/zh_CN.json | 4 +-
apps/user_ldap/l10n/zh_TW.js | 5 +-
apps/user_ldap/l10n/zh_TW.json | 5 +-
apps/user_ldap/lib/access.php | 7 +-
apps/user_ldap/lib/connection.php | 51 +++++----
apps/user_ldap/lib/user/offlineuser.php | 7 ++
apps/user_ldap/lib/user/user.php | 6 +-
apps/user_ldap/lib/wizard.php | 10 +-
.../templates/part.wizard-groupfilter.php | 2 +-
apps/user_ldap/templates/part.wizard-server.php | 6 +-
.../user_ldap/templates/part.wizard-userfilter.php | 2 +-
apps/user_ldap/tests/access.php | 16 ++-
.../lib/integrationtestbackupserver.php | 118 +++++++++++++++++++++
apps/user_ldap/tests/user/user.php | 39 +++++++
core/css/apps.css | 11 +-
core/css/fonts.css | 10 ++
core/css/header.css | 9 ++
core/css/mobile.css | 8 --
core/css/styles.css | 9 +-
.../configuration_server/caching_configuration.txt | 3 +
.../security_setup_warnings.txt | 12 +++
.../user_auth_shibboleth.txt | 4 +
.../_sources/installation/nginx_configuration.txt | 4 +
core/doc/admin/_sources/maintenance/restore.txt | 12 ++-
.../caching_configuration.html | 1 +
core/doc/admin/configuration_server/index.html | 1 +
.../security_setup_warnings.html | 10 ++
core/doc/admin/contents.html | 1 +
.../user_auth_shibboleth.html | 6 ++
.../admin/installation/nginx_configuration.html | 4 +
core/doc/admin/maintenance/restore.html | 14 ++-
core/fonts/OpenSans-Regular.woff | Bin 0 -> 20544 bytes
core/js/js.js | 29 ++---
core/js/tests/specs/coreSpec.js | 3 +-
core/shipped.json | 1 +
core/templates/layout.user.php | 2 +-
lib/l10n/sq.js | 3 +-
lib/l10n/sq.json | 3 +-
lib/private/archive.php | 18 ++--
lib/private/db/adapteroci8.php | 1 +
lib/private/db/adaptersqlite.php | 1 +
lib/private/files/cache/cache.php | 11 +-
lib/private/files/cache/watcher.php | 59 +++++++----
lib/private/files/storage/wrapper/encryption.php | 14 ++-
lib/private/files/view.php | 42 ++++----
lib/private/group/manager.php | 4 +-
lib/private/share/share.php | 4 +-
lib/public/files/storagenotavailableexception.php | 17 ++-
settings/ajax/geteveryonecount.php | 50 ---------
settings/controller/userscontroller.php | 41 +++++++
settings/css/settings.css | 3 +-
settings/js/admin.js | 64 ++++++-----
settings/js/users/groups.js | 6 +-
settings/l10n/lv.js | 4 +-
settings/l10n/lv.json | 4 +-
settings/l10n/sq.js | 4 +-
settings/l10n/sq.json | 4 +-
settings/l10n/zh_TW.js | 3 +-
settings/l10n/zh_TW.json | 3 +-
settings/personal.php | 8 ++
settings/routes.php | 3 +-
settings/templates/apps.php | 2 +-
version.php | 6 +-
238 files changed, 1154 insertions(+), 449 deletions(-)
diff --cc apps/activity/templates/stream.app.navigation.php
index 4ffc453,0000000..5fee031
mode 100644,000000..100644
--- a/apps/activity/templates/stream.app.navigation.php
+++ b/apps/activity/templates/stream.app.navigation.php
@@@ -1,35 -1,0 +1,35 @@@
+<?php
+/* Copyright (c) 2014, Joas Schilling nickvergessen at owncloud.com
+ * This file is licensed under the Affero General Public License version 3
+ * or later. See the COPYING-README file. */
+
+/** @var $l OC_L10N */
+/** @var $_ array */
+?>
+<div id="app-navigation">
+ <?php foreach ($_['navigations'] as $navigationGroup => $navigationEntries) { ?>
+ <?php if ($navigationGroup !== 'apps'): ?><ul><?php endif; ?>
+
+ <?php foreach ($navigationEntries as $navigation) { ?>
+ <li<?php if ($_['activeNavigation'] === $navigation['id']): ?> class="active"<?php endif; ?>>
+ <a data-navigation="<?php p($navigation['id']) ?>" href="<?php p($navigation['url']) ?>">
+ <?php p($navigation['name']) ?>
+ </a>
+ </li>
+ <?php } ?>
+
+ <?php if ($navigationGroup !== 'top'): ?></ul><?php endif; ?>
+ <?php } ?>
+
+ <div id="app-settings">
+ <div id="app-settings-header">
+ <button class="settings-button" data-apps-slide-toggle="#app-settings-content"></button>
+ </div>
+
+ <div id="app-settings-content">
- <input type="checkbox"<?php if ($_['rssLink']): ?> checked="checked"<?php endif; ?> id="enable_rss" />
++ <input type="checkbox"<?php if ($_['rssLink']): ?> checked="checked"<?php endif; ?> id="enable_rss" class="checkbox" />
+ <label for="enable_rss"><?php p($l->t('Enable RSS feed'));?></label>
+ <input id="rssurl"<?php if (!$_['rssLink']): ?> class="hidden"<?php endif; ?> type="text" readonly="readonly" value="<?php p($_['rssLink']); ?>" />
+ </div>
+ </div>
+</div>
diff --cc apps/files_texteditor/js/editor.js
index 7d4baef,0000000..341357b
mode 100644,000000..100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@@ -1,554 -1,0 +1,569 @@@
+/**
+ * ownCloud - Files_Texteditor
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Tom Needham <tom at owncloud.com>
+ * @copyright Tom Needham 2015
+ */
+
+var Files_Texteditor = {
+
+ /**
+ * Holds the editor container
+ */
+ $container: null,
+
+ /**
+ * Holds the editor element ID
+ */
+ editor: 'editor',
+
+ /**
+ * Stores info on the file being edited
+ */
+ file: {
+ edited: false,
+ mtime: null,
+ dir: null,
+ name: null,
+ writeable: null,
- mime: null
++ mime: null,
++ size: null
+ },
+
+ /**
+ * Stored the saving state
+ */
+ saving: false,
+
+ /**
+ * Current files app context
+ */
+ currentContext: null,
+
+ /**
+ * Stores the autosave timer
+ */
+ saveTimer: null,
+
+ /**
++ * Stores the old page title
++ */
++ oldTitle: null,
++
++ /**
++ * Stores the timeout for the saving message
++ */
++ saveMessageTimeout: null,
++
++ /**
+ * preview plugins by mimetype
+ */
+ previewPlugins: {},
+
+ registerPreviewPlugin: function(mimeType, plugin) {
+ this.previewPlugins[mimeType] = plugin;
+ },
+
+ /**
+ * preview element
+ */
+ preview: null,
+
+ previewPluginOnChange: null,
+
+ /**
+ * Save handler, triggered by the button, or keyboard
+ */
+ _onSaveTrigger: function() {
+ // Don't save if not edited
+ if(!OCA.Files_Texteditor.file.edited) {
+ return;
+ }
+ // Don't try to save twice
+ if(OCA.Files_Texteditor.saving) {
+ return;
+ } else {
+ OCA.Files_Texteditor.saving = true;
- OCA.Files_Texteditor.edited = false;
++ OCA.Files_Texteditor.file.edited = false;
+ }
+
++ // Can any fade outs on the saving message
++ clearTimeout(OCA.Files_Texteditor.saveMessageTimeout);
++
+ // Set the saving status
+ $('#editor_controls small.saving-message')
+ .text(t('files_texteditor', 'saving...'))
+ .show();
+ // Send to server
+ OCA.Files_Texteditor.saveFile(
+ window.aceEditor.getSession().getValue(),
+ OCA.Files_Texteditor.file,
+ function(data){
- newmtime = data.mtime;
+ // Yay
- // TODO only reset edited value if not editing during saving
- document.title = document.title.slice(2);
- $('small.unsaved-star').css('display', 'none');
- OCA.Files_Texteditor.file.mtime = newmtime;
- OCA.Files_Texteditor.file.edited = false;
++ if(OCA.Files_Texteditor.file.edited == false) {
++ document.title = OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
++ $('small.unsaved-star').css('display', 'none');
++ }
++ OCA.Files_Texteditor.file.mtime = data.mtime;
++ OCA.Files_Texteditor.file.size = data.size;
++
+ $('#editor_controls small.saving-message')
+ .text(t('files_texteditor', 'saved!'));
- setTimeout(function() {
++ OCA.Files_Texteditor.saveMessageTimeout = setTimeout(function() {
+ $('small.saving-message').fadeOut(200);
+ }, 2000);
+ },
+ function(message){
+ // Boo
+ $('small.saving-message').text(t('files_texteditor', 'failed!'));
- setTimeout(function() {
++ OCA.Files_Texteditor.saveMessageTimeout = setTimeout(function() {
+ $('small.saving-message').fadeOut(200);
+ }, 5000);
- OCA.Files_Texteditor.edited = true;
++ OCA.Files_Texteditor.file.edited = true;
+ }
+ );
+ OCA.Files_Texteditor.saving = false;
+ window.aceEditor.focus();
+ },
+
+ /**
+ * Handles on close button click
+ */
+ _onCloseTrigger: function() {
+ // Hide or close?
+ if(!OCA.Files_Texteditor.file.edited) {
+ OCA.Files_Texteditor.closeEditor();
+ } else {
+ // Trick the autosave attempt into thinking we have no changes
+ OCA.Files_Texteditor.file.edited = false;
+ // Hide the editor
+ OCA.Files_Texteditor.hideEditor();
+ // Try to save
+ OCA.Files_Texteditor.saveFile(
+ window.aceEditor.getSession().getValue(),
+ OCA.Files_Texteditor.file,
+ function(data){
+ OC.Notification.showTemporary(t(
+ 'files_texteditor',
+ 'Saved'
+ )
- );
++ )
+ // Remove the editor
+ OCA.Files_Texteditor.closeEditor();
+ },
+ function(message){
+ OC.Notification.showTemporary(t(
+ 'files_texteditor',
+ 'There was a problem saving your changes. Click to resume editing.'
+ )
+ );
+ $('#notification').data('reopeneditor', true).on(
+ 'click',
+ OCA.Files_Texteditor._onReOpenTrigger
+ );
+ OCA.Files_Texteditor.file.edited = true;
+ }
+ );
+ }
+ },
+
+ /**
+ * Handles the trigger or re open editor
+ */
+ _onReOpenTrigger: function() {
+ if($('#notification').data('reopeneditor') == true) {
- document.title = OCA.Files_Texteditor.file.name + ' - ' + document.title;
++ document.title = OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
+ OCA.Files_Texteditor.$container.show();
+ }
+ },
+
+ /**
+ * Handles the FileAction click event
+ */
+ _onEditorTrigger: function(filename, context) {
+ this.currentContext = context;
+ this.file.name = filename;
+ this.file.dir = context.dir;
+ this.fileInfoModel = context.fileList.getModelForFile(filename);
+ this.loadEditor(
+ OCA.Files_Texteditor.$container,
+ OCA.Files_Texteditor.file
+ );
+ if(!$('html').hasClass('ie8')) {
+ history.pushState({file:filename, dir:context.dir}, 'Editor', '#editor');
+ }
+ },
+
+ /**
+ * Handler for edits detected
+ */
+ _onEdit: function () {
+ if(!OCA.Files_Texteditor.file.edited) {
+ OCA.Files_Texteditor.file.edited = true;
+ if(!OCA.Files_Texteditor.saving) {
+ OCA.Files_Texteditor._onUnsaved();
+ }
+ }
+ if (this.previewPluginOnChange) {
+ var text = window.aceEditor.getSession().getValue();
+ this.previewPluginOnChange(text, this.preview);
+ }
+ },
+
+ /**
+ * Handler when unsaved work is detected
+ */
+ _onUnsaved: function() {
- document.title = '* '+document.title;
++ document.title = '* '+ OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
+ $('small.unsaved-star').css('display', 'inline-block');
+ },
+
+ /**
+ * Setup on page load
+ */
+ initialize: function(container) {
+ // Don't load if not in the files app TODO: Fix for sharing
+ if(!$('#content.app-files').length) { return; }
+ this.$container = container;
+ this.registerFileActions();
+ this.oldTitle = document.title;
+ $.each(this.previewPlugins, function(mime, plugin) {
+ plugin.init();
+ });
+ },
+
+ /**
+ * Registers the file actions
+ */
+ registerFileActions: function() {
+ var mimes = Array(
+ 'text',
+ 'application/xml',
+ 'application/x-empty',
+ 'application/x-php',
+ 'application/javascript',
+ 'application/x-pearl',
+ 'application/x-text',
+ 'application/yaml'
+ );
+
+ _self = this;
+
+ $.each(mimes, function(key, value) {
+ OCA.Files.fileActions.registerAction({
+ name: 'Edit',
+ mime: value,
+ actionHandler: _.bind(_self._onEditorTrigger, _self),
+ permissions: OC.PERMISSION_READ,
+ icon: function () {
+ return OC.imagePath('core', 'actions/edit');
+ }
+ });
+ OCA.Files.fileActions.setDefault(value, 'Edit');
+ });
+
+ },
+
+ /**
+ * Actually fire up the editor in a container
+ */
+ loadEditor: function(container, file) {
+ var _self = this;
+ // Insert the editor into the container
+ container.html(
+ '<div id="editor_overlay"></div>'
+ +'<div id="editor_container" class="icon-loading">'
+ +'<div id="editor_wrap"><div id="editor"></div>'
+ +'<div id="preview_wrap"><div id="preview"></div></div></div></div>');
+ $('#app-content').append(container);
+
+
+ // Get the file data
+ this.loadFile(
+ file.dir,
+ file.name,
+ function(file, data){
+ // Success!
+ // Sort the title
- document.title = file.name + ' - ' + document.title;
++ document.title = file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
+ // Load ace
+ $('#'+_self.editor).text(data);
+ // Configure ace
+ _self.configureACE(file);
+ // Show the controls
+ _self.loadControlBar(file, _self.currentContext);
+ window.aceEditor.getSession().on('change', _self.setupAutosave);
+ window.aceEditor.focus();
+
+ if (_self.previewPlugins[file.mime]){
+ _self.preview = container.find('#preview');
+ _self.preview.addClass(file.mime.replace('/','-'));
+ container.find('#editor_container').addClass('hasPreview');
+ _self.previewPluginOnChange = _.debounce(_self.previewPlugins[file.mime].preview, 200);
+ var text = window.aceEditor.getSession().getValue();
+ _self.previewPluginOnChange(text, _self.preview);
+ window.aceEditor.resize();
+ } else {
+ _self.previewPluginOnChange = null;
+ }
+
+ // IE8 support
+ if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that dont support svg
+ OC.Util.replaceSVG();
+ }
+ },
+ function(message){
+ // Oh dear
+ OC.dialogs.alert(message, t('files_texteditor', 'An error occurred!'));
+ _self.closeEditor();
+ });
+ },
+
+ /**
+ * Load the editor control bar
+ */
+ loadControlBar: function(file, context) {
+ var html =
+ '<small class="filename">'+escapeHTML(file.name)+'</small>'
+ +'<small class="unsaved-star" style="display: none">*</small>'
+ +'<small class="saving-message">'
+ +'</small>'
+ +'<button id="editor_close" class="icon-close svg"></button>';
+ var controlBar = $('<div id="editor_controls"></div>').html(html);
+ $('#editor_wrap').before(controlBar);
+ this.setFilenameMaxLength();
+ this.bindControlBar();
+
+ },
+
+ /**
+ * Removes the control bar
+ */
+ unloadControlBar: function() {
+ $('#editor_controls').remove();
+ },
+
+ /**
+ * Set the max width of the filename to prevent wrapping
+ */
+ setFilenameMaxLength: function() {
+ // Get the width of the control bar
+ var controlBar = $('#editor_controls').width();
+ // Get the width of all of the other controls
+ var controls = $('small.saving-message').outerWidth(true);
+ controls += $('small.unsaved-star').outerWidth(true);
+ controls += $('#editor_close').outerWidth(true);
+ // Set the max width
+ $('small.filename').css('max-width', controlBar-controls-28);
+ },
+
+ /**
+ * Binds the control events on the control bar
+ */
+ bindControlBar: function() {
+ var self = this;
+ $('#editor_close').on('click', _.bind(this._onCloseTrigger, this));
+ $(window).resize(OCA.Files_Texteditor.setFilenameMaxLength);
+ if(!$('html').hasClass('ie8')) {
+ window.onpopstate = function (e) {
+ self._onCloseTrigger();
+ }
+ }
+ },
+
+ /**
+ * Configure the ACE editor
+ */
+ configureACE: function(file) {
+ window.aceEditor = ace.edit(this.editor);
+ aceEditor.setShowPrintMargin(false);
+ aceEditor.getSession().setUseWrapMode(true);
+ if (!file.writeable) { aceEditor.setReadOnly(true); }
+ if (file.mime && file.mime === 'text/html') {
+ this.setEditorSyntaxMode('html');
+ } else {
+ // Set the syntax mode based on the file extension
+ this.setEditorSyntaxMode(
+ file.name.split('.')[file.name.split('.').length - 1]
+ );
+ }
+ // Set the theme
+ OC.addScript(
+ 'files_texteditor',
+ 'vendor/ace/src-noconflict/theme-clouds',
+ function () {
+ window.aceEditor.setTheme("ace/theme/clouds");
+ }
+ );
+ // Bind the edit event
+ window.aceEditor.getSession().on('change', this._onEdit.bind(this));
+ // Bind save trigger
+ window.aceEditor.commands.addCommand({
+ name: "save",
+ bindKey: {
+ win: "Ctrl-S",
+ mac: "Command-S",
+ sender: "editor"
+ },
+ exec: OCA.Files_Texteditor._onSaveTrigger
+ });
+
+ // disable Ctrl-T shortcut in ace to allow new tab feature in browser
+ window.aceEditor.commands.removeCommand(window.aceEditor.commands.byName.transposeletters);
+ },
+
+ /**
+ * Sets the syntax highlighting for the editor based on the file extension
+ */
+ setEditorSyntaxMode: function(extension) {
+ // Loads the syntax mode files and tells the editor
+ var filetype = new Array();
+ // add file extensions like this: filetype["extension"] = "filetype":
+ filetype["h"] = "c_cpp";
+ filetype["c"] = "c_cpp";
+ filetype["clj"] = "clojure";
+ filetype["coffee"] = "coffee"; // coffescript can be compiled to javascript
+ filetype["coldfusion"] = "cfc";
+ filetype["cpp"] = "c_cpp";
+ filetype["cs"] = "csharp";
+ filetype["css"] = "css";
+ filetype["groovy"] = "groovy";
+ filetype["haxe"] = "hx";
+ filetype["htm"] = "html";
+ filetype["html"] = "html";
+ filetype["tt"] = "html";
+ filetype["java"] = "java";
+ filetype["js"] = "javascript";
+ filetype["jsm"] = "javascript";
+ filetype["json"] = "json";
+ filetype["latex"] = "latex";
+ filetype["tex"] = "latex";
+ filetype["less"] = "less";
+ filetype["ly"] = "latex";
+ filetype["ily"] = "latex";
+ filetype["lua"] = "lua";
+ filetype["markdown"] = "markdown";
+ filetype["md"] = "markdown";
+ filetype["mdown"] = "markdown";
+ filetype["mdwn"] = "markdown";
+ filetype["mkd"] = "markdown";
+ filetype["ml"] = "ocaml";
+ filetype["mli"] = "ocaml";
+ filetype["pl"] = "perl";
+ filetype["php"] = "php";
+ filetype["powershell"] = "ps1";
+ filetype["py"] = "python";
+ filetype["rb"] = "ruby";
+ filetype["scad"] = "scad"; // seems to be something like 3d model files printed with e.g. reprap
+ filetype["scala"] = "scala";
+ filetype["scss"] = "scss"; // "sassy css"
+ filetype["sh"] = "sh";
+ filetype["sql"] = "sql";
+ filetype["svg"] = "svg";
+ filetype["textile"] = "textile"; // related to markdown
+ filetype["xml"] = "xml";
+
+ if (filetype[extension] != null) {
+ // Then it must be in the array, so load the custom syntax mode
+ // Set the syntax mode
+ OC.addScript(
+ 'files_texteditor',
+ 'vendor/ace/src-noconflict/mode-'+filetype[extension],
+ function () {
+ var SyntaxMode = ace.require("ace/mode/" + filetype[extension]).Mode;
+ window.aceEditor.getSession().setMode(new SyntaxMode());
+ }
+ );
+ }
+ },
+
+ /**
+ * Loads the data through AJAX
+ */
+ loadFile: function(dir, filename, success, failure) {
+ $.get(
+ OC.generateUrl('/apps/files_texteditor/ajax/loadfile'),
+ {
+ filename: filename,
+ dir: dir
+ }
+ ).done(function(data) {
+ // Call success callback
+ OCA.Files_Texteditor.file.writeable = data.writeable;
+ OCA.Files_Texteditor.file.mime = data.mime;
+ OCA.Files_Texteditor.file.mtime = data.mtime;
+ success(OCA.Files_Texteditor.file, data.filecontents);
+ }).fail(function(jqXHR) {
+ failure(JSON.parse(jqXHR.responseText).message);
+ });
+ },
+
+ /**
+ * Send the new file data back to the server
+ */
+ saveFile: function(data, file, success, failure) {
+ // Send the post request
+ if(file.dir == '/') {
+ var path = file.dir + file.name;
+ } else {
+ var path = file.dir + '/' + file.name;
+ }
+ $.ajax({
+ type: 'PUT',
+ url: OC.generateUrl('/apps/files_texteditor/ajax/savefile'),
+ data: {
+ filecontents: data,
+ path: path,
+ mtime: file.mtime
+ }
+ })
+ .done(success)
+ .fail(function(jqXHR) {
+ failure(JSON.parse(jqXHR.responseText).message);
+ });
+ },
+
+ /**
+ * Close the editor for good
+ */
+ closeEditor: function() {
+ this.$container.html('').show();
+ this.unloadControlBar();
+ if (this.fileInfoModel) {
+ this.fileInfoModel.set({
+ // temp dummy, until we can do a PROPFIND
+ etag: this.fileInfoModel.get('id') + this.file.mtime,
+ mtime: this.file.mtime * 1000,
- // TODO: set size if there is a way to know
++ size: this.file.size
+ });
+ }
+ document.title = this.oldTitle;
+ },
+
+ /**
+ * Hide the editor (unsaved changes)
+ */
+ hideEditor: function() {
+ this.$container.hide();
+ document.title = this.oldTitle;
+ },
+
+ /**
+ * Configure the autosave timer
+ */
+ setupAutosave: function() {
+ clearTimeout(this.saveTimer);
+ this.saveTimer = setTimeout(OCA.Files_Texteditor._onSaveTrigger, 3000);
+ }
+
+};
+
+OCA.Files_Texteditor = Files_Texteditor;
+
+$(document).ready(function () {
+ $('#editor').remove();
+ OCA.Files_Texteditor.initialize($('<div id="app-content-texteditor"></div>'));
+});
diff --cc apps/firstrunwizard/css/firstrunwizard.css
index e83e2ff,0000000..bb7b696
mode 100644,000000..100644
--- a/apps/firstrunwizard/css/firstrunwizard.css
+++ b/apps/firstrunwizard/css/firstrunwizard.css
@@@ -1,49 -1,0 +1,51 @@@
+#firstrunwizard {
+ margin: 12px;
+ text-align: center;
+}
+
+#firstrunwizard h1 {
+ font-size: 40px;
++ font-weight: 300;
+ line-height: 130%;
+ margin: 50px 0 20px;
+}
+
+#firstrunwizard h2 {
+ font-size: 20px;
++ font-weight: 300;
+ margin: 35px 0 10px;
+}
+
+#firstrunwizard .appsmall {
+ height: 16px;
+ width: 16px;
+ position: relative;
+}
+#firstrunwizard .appsmall-calendar,
+#firstrunwizard .appsmall-contacts {
+ -ms-filter: "progid: DXImageTransform.Microsoft.Alpha(Opacity=65)";
+ filter: alpha(opacity=65);
+ opacity: .65;
+}
+
+#firstrunwizard .button {
+ display: inline-block;
+}
+
+#firstrunwizard p a {
+ font-weight: bold;
+}
+#firstrunwizard p a:hover,
+#firstrunwizard p a:focus {
+ color: #444;
+}
+#firstrunwizard .footnote {
+ margin-top: 40px;
+}
+
+#firstrunwizard .close {
+ position: absolute;
+ top: 0;
+ right: 0;
+ padding: 20px;
+}
diff --cc core/doc/admin/_sources/configuration_server/caching_configuration.txt
index 1196010,0000000..1c8f09c
mode 100644,000000..100644
--- a/core/doc/admin/_sources/configuration_server/caching_configuration.txt
+++ b/core/doc/admin/_sources/configuration_server/caching_configuration.txt
@@@ -1,202 -1,0 +1,205 @@@
+==========================
+Configuring Memory Caching
+==========================
+
+You can significantly improve your ownCloud server performance with memory
+caching, where frequently-requested objects are stored in memory for faster
+retrieval. There are two types of caches to use: a PHP opcode cache, which is
+commonly called *opcache*, and data caching for your Web server. If you do not
+install and enable a local memcache you will see a warning on your ownCloud
+admin page. A memcache is not required and you may ignore the warning if you
+prefer.
+
+.. note:: If you enable only a distributed cache in
+ your ``config.php`` (``memcache.distributed``) and not a
+ local cache (``memcache.local``) you will still see the cache warning.
+
+A PHP opcache stores compiled PHP scripts so they don't need to be re-compiled
+every time they are called. PHP bundles the Zend OPcache in core since version
+5.5, so you don't need to install an opcache.
+
+If you are using PHP 5.4, which is the oldest supported PHP version for
+ownCloud, you may install the Alternative PHP Cache (APC). This is both an
+opcache and data cache. APC has not been updated since 2012 and is essentially
+dead, and PHP 5.4 is old and lags behind later releases. If it is possible
+to upgrade to a later PHP release that is the best option.
+
+Data caching is supplied by the Alternative PHP Cache, user (APCu) in PHP
+5.5+, Memcached, or Redis.
+
+ownCloud supports multiple memory caching backends, so you can choose the type
+of memcache that best fits your needs. The supported caching backends are:
+
+* `APC <http://php.net/manual/en/book.apc.php>`_
+ A local cache for systems running PHP 5.4.
+* `APCu <https://pecl.php.net/package/APCu>`_, APCu 4.06 and up required.
+ A local cache for systems running PHP 5.5 and up.
+* `Memcached <http://www.memcached.org/>`_
+ Distributed cache for multi-server ownCloud installations.
+* `Redis <http://redis.io/>`_, PHP module 2.2.5 and up required.
+ For distributed caching, and required for Transactional File Locking.
+
+These are supported but not recommended:
+
+* `XCache <http://xcache.lighttpd.net/>`_
+* `ArrayCache <http://www.arbylon.net/projects/knowceans-tools/doc/org/knowceans/util/ArrayCache.html>`_
+
+Memcaches must be explicitly configured in ownCloud 8.1 and up by installing
+and enabling your desired cache, and then adding the appropriate entry to
+``config.php`` (See :doc:`config_sample_php_parameters` for an overview of
+all possible config parameters).
+
+You may use both a local and a distributed cache. Recommended caches are APCu
+and Redis. After installing and enabling your chosen memcache, verify that it is
+active by running :ref:`label-phpinfo`.
+
+APC
+---
+
+APC is only for systems running PHP 5.4 and older. The oldest supported PHP
+version in ownCloud is 5.4.
+
+.. note:: RHEL 6 and CentOS 6 ship with PHP 5.3 and must be upgraded to PHP
+ 5.4 to run ownCloud. See :doc:`../installation/php_54_installation`.
+
+On Red Hat/CentOS/Fedora systems running PHP 5.4, install ``php-pecl-apc``. On
+Debian/Ubuntu/Mint systems install ``php-apc``. Then restart your Web server.
+
+After restarting your Web server, add this line to your ``config.php`` file::
+
+ 'memcache.local' => '\OC\Memcache\APC',
+
+Refresh your ownCloud admin page, and the cache warning should disappear.
+
+APCu
+----
+
+PHP 5.5 and up includes the Zend OPcache in core, and on most Linux
+distributions it is enabled by default. However, it does
+not bundle a data cache. APCu is a data cache, and it is available in most
+Linux distributions. On Red Hat/CentOS/Fedora systems running PHP 5.5 and up
+install ``php-pecl-apcu``. On Debian/Ubuntu/Mint systems install ``php5-apcu``.
+Then restart your Web server.
+
+The version of APCu must be 4.0.6 and up.
+
+After restarting your Web server, add this line to your ``config.php`` file::
+
+ 'memcache.local' => '\OC\Memcache\APCu',
+
+Refresh your ownCloud admin page, and the cache warning should disappear.
+
+.. finish this later. too vexing to bother with now.
+.. Enabling PHP opcache
+.. ^^^^^^^^^^^^^^^^^^^^
+..
+.. Use :ref:`label-phpinfo` to see if your PHP opcache is already enabled by
+.. searching for ``opcache.enable``. If it says ``on`` then it is enabled and
+.. you don't need to do anything. Figure 1 is from Linux Mint 17; the Zend
+.. OPcache is enabled by default and ``phpinfo`` displays status and statistics.
+..
+.. .. figure:: images/cache-1.png
+.. :alt: The Zend OPcache section displays opcode cache status and statistics.
+..
+.. *Figure 1: Zend OPcache status in phpinfo*
+..
+.. If it is not enabled, then go into
+
+Memcached
+---------
+
+Memcached is a reliable oldtimer for shared caching on distributed servers,
+and performs well with ownCloud with one exception: it is not suitable to use
+with :doc:`Transactional File Locking <../configuration_files/files_locking_transactional>`
+because it does not store locks, and data can disappear from the cache at any time
+(Redis is the best for this).
+
+.. note:: Be sure to install the **memcached** PHP module, and not memcache, as
+ in the following examples. ownCloud supports only the **memcached** PHP
+ module.
+
+Setting up Memcached is easy. On Debian/Ubuntu/Mint install ``memcached`` and
+``php5-memcached``. The installer will automatically start ``memcached`` and
+configure it to launch at startup.
+
+On Red Hat/CentOS/Fedora install ``memcached`` and
+``php-pecl-memcached``. It will not start automatically, so you must use
+your service manager to start ``memcached``, and to launch it at boot as a
+daemon.
+
+You can verify that the Memcached daemon is running with ``ps ax``::
+
+ ps ax | grep memcached
+ 19563 ? Sl 0:02 /usr/bin/memcached -m 64 -p 11211 -u memcache -l
+ 127.0.0.1
+
+Restart your Web server, add the appropriate entries to your
+``config.php``, and refresh your ownCloud admin page. This example uses APCu
+for the local cache, Memcached as the distributed memcache, and lists all the
+servers in the shared cache pool with their port numbers::
+
+ 'memcache.local' => '\OC\Memcache\APCu',
+ 'memcache.distributed' => '\OC\Memcache\Memcached',
+ 'memcached_servers' => array(
+ array('localhost', 11211),
+ array('server1.example.com', 11211),
+ array('server2.example.com', 11211),
+ ),
+
+Redis
+-----
+
+Redis is an excellent modern memcache to use for both distributed caching, and
+as a local cache with :doc:`Transactional File Locking
+<../configuration_files/files_locking_transactional>` because it guarantees
+that cached objects are available for as long as they are needed.
+
+The Redis PHP module must be version 2.2.5 and up.
+
+On Debian/Ubuntu/Mint install ``redis-server`` and ``php5-redis``. The installer
+will automatically launch ``redis-server`` and configure it to launch at
+startup.
+
+On Red Hat/CentOS/Fedora install ``redis`` and ``php-pecl-redis``. It will not
+start automatically, so you must use your service manager to start
+``memcached``, and to launch it at boot as a daemon.
+
+You can verify that the Redis daemon is running with ``ps ax``::
+
+ ps ax | grep redis
+ 22203 ? Ssl 0:00 /usr/bin/redis-server 127.0.0.1:6379
+
+Restart your Web server, add the appropriate entries to your ``config.php``, and
+refresh your ownCloud admin page. This example ``config.php`` configuration uses
+Redis for the local server cache::
+
+ 'memcache.local' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => 'localhost',
+ 'port' => 6379,
+ 'timeout' => 0.0,
+ ),
+
+If you want to connect to Redis configured to listen on an unix socket (which is
+recommended if Redis is running on the same system as ownCloud) use this example
+``config.php`` configuration::
+
+ 'memcache.local' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => '/var/run/redis/redis.sock',
+ 'port' => 0,
+ 'timeout' => 0.0,
+ ),
+
+Redis is very configurable; consult `the Redis documentation
+<http://redis.io/documentation>`_ to learn more.
+
++If you are on Ubuntu you can follow `this guide
++<https://www.en0ch.se/how-to-configure-redis-cache-in-ubuntu-14-04-with-owncloud/>`_ for a complete installation from scratch.
++
+Cache Directory Location
+------------------------
+
+The cache directory defaults to ``data/$user/cache`` where ``$user`` is the
+current user. You may use the ``'cache_path'`` directive in ``config.php``
+(See :doc:`config_sample_php_parameters`) to select a different location.
diff --cc core/doc/admin/_sources/configuration_server/security_setup_warnings.txt
index aa8124a,0000000..e8ab5e5
mode 100644,000000..100644
--- a/core/doc/admin/_sources/configuration_server/security_setup_warnings.txt
+++ b/core/doc/admin/_sources/configuration_server/security_setup_warnings.txt
@@@ -1,99 -1,0 +1,111 @@@
+======================
+Warnings on Admin Page
+======================
+
+Your ownCloud server has a built-in configuration checker, and it reports its
+findings at the top of your Admin page. These are some of the warnings you
+might see, and what to do about them.
+
+.. figure:: ../images/security-setup-warning-1.png
+
+Cache Warnings
+--------------
+
+"No memory cache has been configured. To enhance your performance please
+configure a memcache if available." ownCloud supports multiple php caching
+extentions:
+
+* APC (PHP 5.4 only)
+* APCu (PHP 5.5+, minimum required PHP extension version 4.0.6)
+* Memcached
+* Redis (minimum required php extension version: 2.2.5)
+
+You will see this warning if you have no caches installed and enabled, or if
+your cache does not have the required minimum version installed; older versions
+are disabled because of performance problems.
+
+If you see "*{Cache}* below version *{Version}* is installed. for stability and
+performance reasons we recommend to update to a newer *{Cache}* version" then
+you need to upgrade, or, if you're not using it, remove it.
+
+You are not required to use any caches, but caches improve server performance.
+See :doc:`caching_configuration`.
+
++Transactional file locking
++--------------------------
++
++"Transactional file locking is disabled, this might lead to issues with race
++conditions."
++
++"Transactional file locking is using the database as locking backend, for best
++performance it's advised to configure a memcache for locking."
++
++Please see :doc:`../configuration_files/files_locking_transactional` on how
++to correctly configure your environment for transactional file locking.
++
+You are accessing this site via HTTP
+------------------------------------
+
+"You are accessing this site via HTTP. We strongly suggest you configure your
+server to require using HTTPS instead." Please take this warning seriously;
+using HTTPS is a fundamental security measure. You must configure your Web
+server to support it, and then there are some settings in the **Security**
+section of your ownCloud Admin page to enable. The following manual pages
+describe how to enable HTTPS on the Apache and Nginx Web servers.
+
+:ref:`enabling-ssl-label` (on Apache)
+
+:ref:`use-https-label`
+
+:ref:`nginx_configuration_example`
+
+The test with getenv(\"PATH\") only returns an empty response
+-------------------------------------------------------------
+
+Some environments are not passing a valid PATH variable to ownCloud. The
+:ref:`using_php-fpm` provides the information about how to configure your environment.
+
+The "Strict-Transport-Security" HTTP header is not configured
+-------------------------------------------------------------
+
+"The "Strict-Transport-Security" HTTP header is not configured to least "15768000" seconds.
+For enhanced security we recommend enabling HSTS as described in our security tips."
+
+The HSTS header needs to be configured within your webserver by following the
+:ref:`enable-hsts-label` documentation
+
+/dev/urandom is not readable by PHP
+-----------------------------------
+
+"/dev/urandom is not readable by PHP which is highly discouraged for security reasons.
+Further information can be found in our documentation."
+
+This message is another one which needs to be taken seriously. Please have a look
+at the :ref:`dev-urandom-label` documentation.
+
+Your web server is not yet set up properly to allow file synchronization
+------------------------------------------------------------------------
+
+"Your web server is not yet set up properly to allow file synchronization because
+the WebDAV interface seems to be broken."
+
+At the ownCloud community forums a larger `FAQ <https://forum.owncloud.org/viewtopic.php?f=17&t=7536>`_
+is maintained containing various information and debugging hints.
+
+Outdated NSS / OpenSSL version
+------------------------------
+
+"cURL is using an outdated OpenSSL version (OpenSSL/$version). Please update your
+operating system or features such as installing and updating apps via the app store
+or Federated Cloud Sharing will not work reliably."
+
+"cURL is using an outdated NSS version (NSS/$version). Please update your operating
+system or features such as installing and updating apps via the app store or Federated
+Cloud Sharing will not work reliably."
+
+There are known bugs in older OpenSSL and NSS versions leading to misbehaviour in
+combination with remote hosts using SNI. A technology used by most of the HTTPS
+websites. To ensure that ownCloud will work properly you need to update OpenSSL
+to at least 1.0.2b or 1.0.1d. For NSS the patch version depends on your distribution
+and an heuristic is running the test which actually reproduces the bug. There
+are distributions such as RHEL/CentOS which have this backport still `pending <https://bugzilla.redhat.com/show_bug.cgi?id=1241172>`_.
diff --cc core/doc/admin/_sources/enterprise_user_management/user_auth_shibboleth.txt
index 637c44d,0000000..1535c3e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/enterprise_user_management/user_auth_shibboleth.txt
+++ b/core/doc/admin/_sources/enterprise_user_management/user_auth_shibboleth.txt
@@@ -1,338 -1,0 +1,342 @@@
+=====================================================
+Shibboleth Integration (Enterprise Subscription only)
+=====================================================
+
+Introduction
+------------
+
+The ownCloud Shibboleth user backend application integrates ownCloud with a
+Shibboleth Service Provider (SP) and allows operations in federated and
+single-sign-on infrastructures. Setting up Shibboleth has three steps:
+
+1. Create the appropriate Apache configuration
+2. Enable the Shibboleth app
+3. Enable Shibboleth on your ownCloud admin page
+
+Currently supported installations are based on the `native Apache integration`_
+. The individual configuration of the service provider is highly dependent on
+the operating system, as well as on the integration with the Identity
+Providers (IdP), and require case-by-case analysis and installation.
+
+The ownCloud Desktop Client and mobile clients can interact with an
+ownCloud instance running inside a Shibboleth Service Provider by using built-in
+browser components for authentication against the IdP.
+
+The ownCloud desktop sync client and mobile apps store users' logins, so
+your users only need to enter their logins the first time they set up their
+accounts. These screenshots show what the user sees at account setup. Figure 1
+shows a test Shibboleth login screen from
+`Testshib.org <https://www.testshib.org/index.html>`_ on the ownCloud desktop
+sync client.
+
+.. figure:: ../images/shib-gui1.png
+
+ *figure 1: First login screen*
+
+Then after going through the setup wizard, the desktop sync client displays the
+server and login information just like it does for any other ownCloud server
+connections.
+
+.. figure:: ../images/shib-gui4.png
+
+ *figure 2: ownCloud client displays server information*
+
+To your users, it doesn't look or behave differently on the desktop sync
+client, Android app, or iOS app from an ordinary ownCloud account setup. The
+only difference is the initial setup screen where they enter their account
+login.
+
+Apache Configuration
+--------------------
+
+This is an example configuration as installed and operated on a Linux server
+running the Apache Web server. These configurations are highly operating system
+specific and require a high degree of customization.
+
+The ownCloud instance itself is installed in ``/var/www/owncloud/``. The
+following aliases are defined in an Apache virtual host directive:
+
+.. code-block:: apache
+
+ # non-Shibboleth access
+ Alias /owncloud /var/www/owncloud/
+ # for Shibboleth access
+ Alias /oc-shib /var/www/owncloud/
+
+Further Shibboleth specific configuration as defined in
+``/etc/apache2/conf.d/shib.conf``:
+
+.. code-block:: apache
+
+ #
+ # Load the Shibboleth module.
+ #
+ LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_22.so
+
+ #
+ # Ensures handler will be accessible.
+ #
+ <Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+ </Location>
+
+ #
+ # Configure the module for content.
+ #
+ # Shibboleth is disabled for the following location to allow non
+ # shibboleth webdav access
+ <Location ~ "/oc-shib/remote.php/nonshib-webdav">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~
+ "/oc-shib/(status.php$
+ |index.php/s/
+ |public.php$
+ |cron.php$
+ |core/img/
+ |index.php/apps/files_sharing/ajax/publicpreview.php$
+ |index.php/apps/files/ajax/upload.php$
+ |apps/files/templates/fileexists.html$
+ |index.php/apps/files/ajax/mimeicon.php$)">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public gallery
+ # sharing
+ <Location ~
+ "/oc-shib/(apps/gallery/templates/slideshow.html$
+ |index.php/apps/gallery/ajax/getimages.php
+ |index.php/apps/gallery/ajax/thumbnail.php
+ |index.php/apps/gallery/ajax/image.php)">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.css">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.js">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.woff ">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Besides the exceptions above this location is now under control of
+ # Shibboleth
+ <Location /oc-shib>
+ AuthType shibboleth
+ ShibRequireSession On
+ ShibUseHeaders Off
+ ShibExportAssertion On
+ require valid-user
+ </Location>
+
+Application Configuration
+-------------------------
+
+After installing and enabling the Shibboleth application there are three
+configuration variables to set up, depending on the data sent back by the
+IdP. The configuration is stored in ``apps/user_shibboleth``.
+
+.. code-block:: php
+
+ namespace OCA\user_shibboleth {
+ const SHIB_SESSION_ID = 'Shib-Session-ID';
+ const SHIB_EPPN = 'eppn';
+ const SHIB_EMAIL = 'eppn';
+ const SHIB_DISPLAY_NAME = 'eppn';
+ }
+
+
++---------------------+--------------------------------------------------------+
+| Parameter | Description |
++---------------------+--------------------------------------------------------+
+| SHIB_SESSION_ID | This constant defines the name of the environment |
+| | variable holding the Shibboleth session id. |
++---------------------+--------------------------------------------------------+
+| SHIB_EPPN | This constant defines the name of the environment |
+| | variable which holds the EPPN (eduPersonPrincipalName).|
+| | This is the unique user identifier. |
++---------------------+--------------------------------------------------------+
+| SHIB_EMAIL | The environment variable with this given name holds the|
+| | email address of the logged-in user. |
++---------------------+--------------------------------------------------------+
+| SHIB_DISPLAY_NAME | This constant defines the name of the environment |
+| | variable holding the user's display name. |
++---------------------+--------------------------------------------------------+
+
+Enabling the Shibboleth App
+---------------------------
+
+You must enable the Shibboleth app on your Apps page, and then check **Activate
+Shibboleth** and click the **Save** button on your ownCloud Admin page. The
+system information displayed on your Admin page may be useful for
+troubleshooting; for example you can copy and include it on a support ticket.
+
+.. figure:: ../images/shib-gui5.png
+
+ *figure 3: Enabling Shibboleth on the Admin page*
+
+WebDAV Support
+--------------
+
+Users of standard WebDAV clients can use an alternative
+WebDAV Url, for example ``https://cloud.example.com/remote.php/nonshib-webdav/``
+to log in with their username and password. The password is generated on the
+Personal settings page.
+
+.. image:: ../images/shibboleth-personal.png
+
++.. note:: In pure SSO mode the WebDAV password feature will not work, as we
++ have no way to store the WebDAV password. It does work in auto-provision
++ mode.
++
+For provisioning purpose an OCS API has been added to revoke a generated
+password for a user:
+
+Syntax: ``/v1/cloud/users/{userid}/non_shib_password``
+
+* HTTP method: DELETE
+
+Status codes:
+
+* 100 - successful
+* 998 - user unknown
+
+Example:
+
+.. code-block:: bash
+
+ $ curl -X DELETE "https://cloud.example.com/ocs/v1.php/cloud/users/myself@testshib.org/non_shib_password" -u admin:admin
+ <?xml version="1.0"?>
+ <ocs>
+ <meta>
+ <status>ok</status>
+ <statuscode>100</statuscode>
+ <message/>
+ </meta>
+ <data/>
+ </ocs>
+
+
+Known Limitations
+-----------------
+
+Encryption
+----------
+
+File encryption can not be used together with Shibboleth because the encryption
+requires the user's password to unlock the private encryption key. Due to the
+nature of Shibboleth the user's password is not known to the service provider.
+Currently, we have no solution to this limitation.
+
+Other Login Mechanisms
+----------------------
+
+Shibboleth is not compatible with any other ownCloud user backend because the
+login process is handled outside of ownCloud.
+
+You can allow other login mechanisms (e.g. LDAP or ownCloud native) by creating
+a second Apache virtual host configuration. This second location is not
+protected by Shibboleth, and you can use your other ownCloud login mechanisms.
+
+Session Timeout
+---------------
+
+Session timeout on Shibboleth is controlled by the IdP. It is not possible to
+have a session length longer than the length controlled by the IdP. In extreme
+cases this could result in re-login on mobile clients and desktop clients every
+hour.
+
+The session timeout can be overridden in the service provider, but this
+requires a source code change of the Apache Shibboleth module. A patch can be
+provided by the ownCloud support team.
+
+UID Considerations and Windows Network Drive compatability
+----------------------------------------------------------
+
+When using ``user_shibboleth`` in single-sign on (SSO) only mode, together with
+``user_ldap``, both apps need to resolve to the same ``uid``.
+``user_shibboleth`` will do the authentication, and ``user_ldap`` will provide
+user details such as ``email`` and ``displayname``. In the case of Active
+Directory, multiple attributes can be used as the ``uid``. But they all have
+different implications to take into account.
+
+Attributes
+^^^^^^^^^^
+
+**sAMAccountName**
+
+* *Example:* jfd
+* *Uniqueness:* Domain local, might change e.g. marriage
+* *Other implications:* Works with ``windows_network_drive`` app
+
+**userPrincipalName**
+
+* *Example:* jfd at owncloud.com
+* *Uniqueness:* Forest local, might change on eg. marriage
+* *Other implications:* TODO check WND compatability
+
+**objectSid**
+
+* *Example:* S-1-5-21-2611707862-2219215769-354220275-1137
+* *Uniqueness:* Domain local, changes when the user is moved to a new domain
+* *Other implications:* Incompatible with ``windows_network_drive`` app
+
+**sIDHistory**
+
+* *Example:* Multi-value
+* *Uniqueness:* Contains previous objectSIDs
+* *Other implications:* Incompatible with ``windows_network_drive`` app
+
+**objectGUID**
+
+* *Example:* 47AB881D-0655-414D-982F-02998C905A28
+* *Uniqueness:* Globally unique
+* *Other implications:* Incompatible with ``windows_network_drive`` app
+
+Keep in mind that ownCloud will derive the home folder from the ``uid``, unless
+a home folder naming rule is in place. The only truly stable attribute is the
+``objectGUID``, so that should be used. If not for the ``uid`` then at least as
+the home folder naming rule. The tradeoff here is that if you want to use
+``windows_network_drive`` you are bound to the ``sAMAccountName``, as that is
+used as the login.
+
+Also be aware that using ``user_shibboleth`` in Autoprovisioning mode will not
+allow you to use SSO for your ``user_ldap`` users, because ``uid`` collisions
+will be detected by ``user_ldap``.
+
+.. _native Apache integration:
+ https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
+.. _WebDAV and Shibboleth:
+ https://wiki.shibboleth.net/confluence/display/SHIB2/WebDAV
diff --cc core/doc/admin/_sources/installation/nginx_configuration.txt
index 9314fbf,0000000..72da6fd
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/nginx_configuration.txt
+++ b/core/doc/admin/_sources/installation/nginx_configuration.txt
@@@ -1,163 -1,0 +1,167 @@@
+.. _nginx_configuration_example:
+
+===================
+Nginx Configuration
+===================
+
+- You need to insert the following code into **your nginx config file.**
+- The config assumes that ownCloud is installed in /var/www/owncloud and
+ that it is accessed via http(s)://cloud.example.com.
+- Adjust **server_name**, **root**, **ssl_certificate** and
+ **ssl_certificate_key** to suit your needs.
+- Make sure your SSL certificates are readable by the server (see `Nginx HTTP
+ SSL Module documentation <http://wiki.nginx.org/HttpSslModule>`_).
++- ``add_header`` statements are only taken from the current level and are not cascaded
++ from or to a different level. All necessary ``add_header`` statements must be defined
++ in each level needed. For better readability is is possible to move *common* add
++ header statements into a separate file and include that file wherever necessary.
+
+.. note:: The following example assumes that your ownCloud is installed in
+ your webroot. If you're using a subfolder you need to adjust the configuration
+ accordingly.
+
+.. code-block:: python
+
+ upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
+ }
+
+ server {
+ listen 80;
+ server_name cloud.example.com;
+ # enforce https
+ return 301 https://$server_name$request_uri;
+ }
+
+ server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Add headers to serve security related headers
+ add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
+ add_header X-Content-Type-Options nosniff;
+ add_header X-Frame-Options "SAMEORIGIN";
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+
+ # Path to the root of your installation
+ root /var/www/owncloud/;
+ # set max upload size
+ client_max_body_size 10G;
+ fastcgi_buffers 64 4K;
+
+ # Disable gzip to avoid the removal of the ETag header
+ gzip off;
+
+ # Uncomment if your server is build with the ngx_pagespeed module
+ # This module is currently not supported.
+ #pagespeed off;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+ location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
+ deny all;
+ }
+
+ location / {
+ # The following 2 rules are only needed with webfinger
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+
+ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
+ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
+
+ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
+ try_files $uri $uri/ /index.php;
+ }
+
+ location ~ \.php(?:$|/) {
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param HTTPS on;
+ fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
+ fastcgi_pass php-handler;
+ fastcgi_intercept_errors on;
+ }
+
+ # Adding the cache control header for js and css files
+ # Make sure it is BELOW the location ~ \.php(?:$|/) { block
+ location ~* \.(?:css|js)$ {
+ add_header Cache-Control "public, max-age=7200";
+ # Add headers to serve security related headers
+ add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
+ add_header X-Content-Type-Options nosniff;
+ add_header X-Frame-Options "SAMEORIGIN";
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+ # Optional: Don't log access to assets
+ access_log off;
+ }
+
+ # Optional: Don't log access to other assets
+ location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|swf)$ {
+ access_log off;
+ }
+ }
+
+.. note:: You can use ownCloud over plain http, but we strongly encourage you to
+ use SSL/TLS to encrypt all of your server traffic, and to protect
+ user's logins and data in transit.
+
+- Remove the server block containing the redirect
+- Change **listen 443 ssl** to **listen 80;**
+- Remove **ssl_certificate** and **ssl_certificate_key**.
+- Remove **fastcgi_params HTTPS on;**
+
+.. note:: If you are using php-fpm please read :ref:`using_php-fpm`
+
+Suppressing Log Messages
+------------------------
+
+If you're seeing meaningless messages in your logfile, for example `client
+denied by server configuration: /var/www/data/htaccesstest.txt
+<https://forum.owncloud.org/viewtopic.php?f=17&t=20217>`_, add this section to
+your Nginx configuration to suppress them::
+
+ location = /data/htaccesstest.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+JavaScript (.js) or CSS (.css) files not served properly
+--------------------------------------------------------
+
+A common issue with custom nginx configs is that JavaScript (.js)
+or CSS (.css) files are not served properly leading to a 404 (File not found)
+error on those files and a broken webinterface.
+
+This could be caused by the::
+
+ location ~* \.(?:css|js)$ {
+
+block shown above not located **below** the::
+
+ location ~ \.php(?:$|/) {
+
+block. Other custom configurations like caching JavaScript (.js)
+or CSS (.css) files via gzip could also cause such issues.
diff --cc core/doc/admin/_sources/maintenance/restore.txt
index f50a13f,0000000..c70bd46
mode 100644,000000..100644
--- a/core/doc/admin/_sources/maintenance/restore.txt
+++ b/core/doc/admin/_sources/maintenance/restore.txt
@@@ -1,51 -1,0 +1,55 @@@
+==================
+Restoring ownCloud
+==================
+
+To restore an ownCloud installation there are three main things you need to
+restore:
+
- #. The config folder
- #. The data folder
++#. The configuration directory
++#. The data directory
+#. The database
+
++.. note:: You must have both the database and data directory. You cannot
++ complete restoration unless you have both of these.
++
+When you have completed your restoration, see the ``Setting Strong Directory
+Permissions`` section of :doc:`../installation/installation_wizard`.
+
+Restore Folders
+---------------
+
+.. note:: This guide assumes that your previous backup is called
- owncloud-dirbkp"
++ "owncloud-dirbkp"
+
- Simply copy your config and data folder (or even your whole ownCloud install and
++Simply copy your configuration and data folder (or even your whole ownCloud
++install and
+data folder) to your ownCloud environment. You could use this command::
+
+ rsync -Aax owncloud-dirbkp/ owncloud/
+
+Restore Database
+----------------
+
+.. note:: This guide assumes that your previous backup is called
+ "owncloud-sqlbkp.bak"
+
+MySQL
+^^^^^
+
+MySQL is the recommended database engine. To restore MySQL::
+
+ mysql -h [server] -u [username] -p[password] [db_name] < owncloud-sqlbkp.bak
+
+SQLite
+^^^^^^
+::
+
+ rm data/owncloud.db
+ sqlite3 data/owncloud.db < owncloud-sqlbkp.bak
+
+PostgreSQL
+^^^^^^^^^^
+::
+
+ PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username]
+ owncloud-sqlbkp.bak
diff --cc core/doc/admin/configuration_server/caching_configuration.html
index 8496a14,0000000..c7728ba
mode 100644,000000..100644
--- a/core/doc/admin/configuration_server/caching_configuration.html
+++ b/core/doc/admin/configuration_server/caching_configuration.html
@@@ -1,364 -1,0 +1,365 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuring Memory Caching — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="ownCloud Server Configuration" href="index.html" />
+ <link rel="next" title="Defining Background Jobs" href="background_jobs_configuration.html" />
+ <link rel="prev" title="Configuring the ClamAV Antivirus Scanner" href="antivirus_configuration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">ownCloud Server Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html">Warnings on Admin Page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Configuring Memory Caching</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">APC</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">APCu</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Memcached</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Redis</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#cache-directory-location">Cache Directory Location</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/index.html">Server Tuning & Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuring-memory-caching">
+<h1>Configuring Memory Caching<a class="headerlink" href="#configuring-memory-caching" title="Permalink to this headline">¶</a></h1>
+<p>You can significantly improve your ownCloud server performance with memory
+caching, where frequently-requested objects are stored in memory for faster
+retrieval. There are two types of caches to use: a PHP opcode cache, which is
+commonly called <em>opcache</em>, and data caching for your Web server. If you do not
+install and enable a local memcache you will see a warning on your ownCloud
+admin page. A memcache is not required and you may ignore the warning if you
+prefer.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you enable only a distributed cache in
+your <tt class="docutils literal"><span class="pre">config.php</span></tt> (<tt class="docutils literal"><span class="pre">memcache.distributed</span></tt>) and not a
+local cache (<tt class="docutils literal"><span class="pre">memcache.local</span></tt>) you will still see the cache warning.</p>
+</div>
+<p>A PHP opcache stores compiled PHP scripts so they don’t need to be re-compiled
+every time they are called. PHP bundles the Zend OPcache in core since version
+5.5, so you don’t need to install an opcache.</p>
+<p>If you are using PHP 5.4, which is the oldest supported PHP version for
+ownCloud, you may install the Alternative PHP Cache (APC). This is both an
+opcache and data cache. APC has not been updated since 2012 and is essentially
+dead, and PHP 5.4 is old and lags behind later releases. If it is possible
+to upgrade to a later PHP release that is the best option.</p>
+<p>Data caching is supplied by the Alternative PHP Cache, user (APCu) in PHP
+5.5+, Memcached, or Redis.</p>
+<p>ownCloud supports multiple memory caching backends, so you can choose the type
+of memcache that best fits your needs. The supported caching backends are:</p>
+<ul>
+<li><dl class="first docutils">
+<dt><a class="reference external" href="http://php.net/manual/en/book.apc.php">APC</a></dt>
+<dd><p class="first last">A local cache for systems running PHP 5.4.</p>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt><a class="reference external" href="https://pecl.php.net/package/APCu">APCu</a>, APCu 4.06 and up required.</dt>
+<dd><p class="first last">A local cache for systems running PHP 5.5 and up.</p>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt><a class="reference external" href="http://www.memcached.org/">Memcached</a></dt>
+<dd><p class="first last">Distributed cache for multi-server ownCloud installations.</p>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt><a class="reference external" href="http://redis.io/">Redis</a>, PHP module 2.2.5 and up required.</dt>
+<dd><p class="first last">For distributed caching, and required for Transactional File Locking.</p>
+</dd>
+</dl>
+</li>
+</ul>
+<p>These are supported but not recommended:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://xcache.lighttpd.net/">XCache</a></li>
+<li><a class="reference external" href="http://www.arbylon.net/projects/knowceans-tools/doc/org/knowceans/util/ArrayCache.html">ArrayCache</a></li>
+</ul>
+<p>Memcaches must be explicitly configured in ownCloud 8.1 and up by installing
+and enabling your desired cache, and then adding the appropriate entry to
+<tt class="docutils literal"><span class="pre">config.php</span></tt> (See <a class="reference internal" href="config_sample_php_parameters.html"><em>Config.php Parameters</em></a> for an overview of
+all possible config parameters).</p>
+<p>You may use both a local and a distributed cache. Recommended caches are APCu
+and Redis. After installing and enabling your chosen memcache, verify that it is
+active by running <a class="reference internal" href="../issues/index.html#label-phpinfo"><em>PHP Version and Information</em></a>.</p>
+<div class="section" id="id1">
+<h2>APC<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<p>APC is only for systems running PHP 5.4 and older. The oldest supported PHP
+version in ownCloud is 5.4.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">RHEL 6 and CentOS 6 ship with PHP 5.3 and must be upgraded to PHP
+5.4 to run ownCloud. See <a class="reference internal" href="../installation/php_54_installation.html"><em>Installing PHP 5.4 on RHEL 6 and CentOS 6</em></a>.</p>
+</div>
+<p>On Red Hat/CentOS/Fedora systems running PHP 5.4, install <tt class="docutils literal"><span class="pre">php-pecl-apc</span></tt>. On
+Debian/Ubuntu/Mint systems install <tt class="docutils literal"><span class="pre">php-apc</span></tt>. Then restart your Web server.</p>
+<p>After restarting your Web server, add this line to your <tt class="docutils literal"><span class="pre">config.php</span></tt> file:</p>
+<div class="highlight-python"><pre>'memcache.local' => '\OC\Memcache\APC',</pre>
+</div>
+<p>Refresh your ownCloud admin page, and the cache warning should disappear.</p>
+</div>
+<div class="section" id="id2">
+<h2>APCu<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<p>PHP 5.5 and up includes the Zend OPcache in core, and on most Linux
+distributions it is enabled by default. However, it does
+not bundle a data cache. APCu is a data cache, and it is available in most
+Linux distributions. On Red Hat/CentOS/Fedora systems running PHP 5.5 and up
+install <tt class="docutils literal"><span class="pre">php-pecl-apcu</span></tt>. On Debian/Ubuntu/Mint systems install <tt class="docutils literal"><span class="pre">php5-apcu</span></tt>.
+Then restart your Web server.</p>
+<p>The version of APCu must be 4.0.6 and up.</p>
+<p>After restarting your Web server, add this line to your <tt class="docutils literal"><span class="pre">config.php</span></tt> file:</p>
+<div class="highlight-python"><pre>'memcache.local' => '\OC\Memcache\APCu',</pre>
+</div>
+<p>Refresh your ownCloud admin page, and the cache warning should disappear.</p>
+</div>
+<div class="section" id="id3">
+<h2>Memcached<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2>
+<p>Memcached is a reliable oldtimer for shared caching on distributed servers,
+and performs well with ownCloud with one exception: it is not suitable to use
+with <a class="reference internal" href="../configuration_files/files_locking_transactional.html"><em>Transactional File Locking</em></a>
+because it does not store locks, and data can disappear from the cache at any time
+(Redis is the best for this).</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Be sure to install the <strong>memcached</strong> PHP module, and not memcache, as
+in the following examples. ownCloud supports only the <strong>memcached</strong> PHP
+module.</p>
+</div>
+<p>Setting up Memcached is easy. On Debian/Ubuntu/Mint install <tt class="docutils literal"><span class="pre">memcached</span></tt> and
+<tt class="docutils literal"><span class="pre">php5-memcached</span></tt>. The installer will automatically start <tt class="docutils literal"><span class="pre">memcached</span></tt> and
+configure it to launch at startup.</p>
+<p>On Red Hat/CentOS/Fedora install <tt class="docutils literal"><span class="pre">memcached</span></tt> and
+<tt class="docutils literal"><span class="pre">php-pecl-memcached</span></tt>. It will not start automatically, so you must use
+your service manager to start <tt class="docutils literal"><span class="pre">memcached</span></tt>, and to launch it at boot as a
+daemon.</p>
+<p>You can verify that the Memcached daemon is running with <tt class="docutils literal"><span class="pre">ps</span> <span class="pre">ax</span></tt>:</p>
+<div class="highlight-python"><pre>ps ax | grep memcached
+19563 ? Sl 0:02 /usr/bin/memcached -m 64 -p 11211 -u memcache -l
+127.0.0.1</pre>
+</div>
+<p>Restart your Web server, add the appropriate entries to your
+<tt class="docutils literal"><span class="pre">config.php</span></tt>, and refresh your ownCloud admin page. This example uses APCu
+for the local cache, Memcached as the distributed memcache, and lists all the
+servers in the shared cache pool with their port numbers:</p>
+<div class="highlight-python"><pre>'memcache.local' => '\OC\Memcache\APCu',
+'memcache.distributed' => '\OC\Memcache\Memcached',
+'memcached_servers' => array(
+ array('localhost', 11211),
+ array('server1.example.com', 11211),
+ array('server2.example.com', 11211),
+ ),</pre>
+</div>
+</div>
+<div class="section" id="id4">
+<h2>Redis<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h2>
+<p>Redis is an excellent modern memcache to use for both distributed caching, and
+as a local cache with <a class="reference internal" href="../configuration_files/files_locking_transactional.html"><em>Transactional File Locking</em></a> because it guarantees
+that cached objects are available for as long as they are needed.</p>
+<p>The Redis PHP module must be version 2.2.5 and up.</p>
+<p>On Debian/Ubuntu/Mint install <tt class="docutils literal"><span class="pre">redis-server</span></tt> and <tt class="docutils literal"><span class="pre">php5-redis</span></tt>. The installer
+will automatically launch <tt class="docutils literal"><span class="pre">redis-server</span></tt> and configure it to launch at
+startup.</p>
+<p>On Red Hat/CentOS/Fedora install <tt class="docutils literal"><span class="pre">redis</span></tt> and <tt class="docutils literal"><span class="pre">php-pecl-redis</span></tt>. It will not
+start automatically, so you must use your service manager to start
+<tt class="docutils literal"><span class="pre">memcached</span></tt>, and to launch it at boot as a daemon.</p>
+<p>You can verify that the Redis daemon is running with <tt class="docutils literal"><span class="pre">ps</span> <span class="pre">ax</span></tt>:</p>
+<div class="highlight-python"><pre>ps ax | grep redis
+22203 ? Ssl 0:00 /usr/bin/redis-server 127.0.0.1:6379</pre>
+</div>
+<p>Restart your Web server, add the appropriate entries to your <tt class="docutils literal"><span class="pre">config.php</span></tt>, and
+refresh your ownCloud admin page. This example <tt class="docutils literal"><span class="pre">config.php</span></tt> configuration uses
+Redis for the local server cache:</p>
+<div class="highlight-python"><pre>'memcache.local' => '\OC\Memcache\Redis',
+'redis' => array(
+ 'host' => 'localhost',
+ 'port' => 6379,
+ 'timeout' => 0.0,
+ ),</pre>
+</div>
+<p>If you want to connect to Redis configured to listen on an unix socket (which is
+recommended if Redis is running on the same system as ownCloud) use this example
+<tt class="docutils literal"><span class="pre">config.php</span></tt> configuration:</p>
+<div class="highlight-python"><pre>'memcache.local' => '\OC\Memcache\Redis',
+'redis' => array(
+ 'host' => '/var/run/redis/redis.sock',
+ 'port' => 0,
+ 'timeout' => 0.0,
+ ),</pre>
+</div>
+<p>Redis is very configurable; consult <a class="reference external" href="http://redis.io/documentation">the Redis documentation</a> to learn more.</p>
++<p>If you are on Ubuntu you can follow <a class="reference external" href="https://www.en0ch.se/how-to-configure-redis-cache-in-ubuntu-14-04-with-owncloud/">this guide</a> for a complete installation from scratch.</p>
+</div>
+<div class="section" id="cache-directory-location">
+<h2>Cache Directory Location<a class="headerlink" href="#cache-directory-location" title="Permalink to this headline">¶</a></h2>
+<p>The cache directory defaults to <tt class="docutils literal"><span class="pre">data/$user/cache</span></tt> where <tt class="docutils literal"><span class="pre">$user</span></tt> is the
+current user. You may use the <tt class="docutils literal"><span class="pre">'cache_path'</span></tt> directive in <tt class="docutils literal"><span class="pre">config.php</span></tt>
+(See <a class="reference internal" href="config_sample_php_parameters.html"><em>Config.php Parameters</em></a>) to select a different location.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration_server/index.html
index 04fea25,0000000..5a32ca7
mode 100644,000000..100644
--- a/core/doc/admin/configuration_server/index.html
+++ b/core/doc/admin/configuration_server/index.html
@@@ -1,318 -1,0 +1,319 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud Server Configuration — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="next" title="Warnings on Admin Page" href="security_setup_warnings.html" />
+ <link rel="prev" title="Mac OS X" href="../installation/macos_installation.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">ownCloud Server Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html">Warnings on Admin Page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html">Configuring Memory Caching</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/index.html">Server Tuning & Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-server-configuration">
+<h1>ownCloud Server Configuration<a class="headerlink" href="#owncloud-server-configuration" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security_setup_warnings.html">Warnings on Admin Page</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#cache-warnings">Cache Warnings</a></li>
++<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#transactional-file-locking">Transactional file locking</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#you-are-accessing-this-site-via-http">You are accessing this site via HTTP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#the-test-with-getenv-path-only-returns-an-empty-response">The test with getenv(“PATH”) only returns an empty response</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#the-strict-transport-security-http-header-is-not-configured">The “Strict-Transport-Security” HTTP header is not configured</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#dev-urandom-is-not-readable-by-php">/dev/urandom is not readable by PHP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#your-web-server-is-not-yet-set-up-properly-to-allow-file-synchronization">Your web server is not yet set up properly to allow file synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security_setup_warnings.html#outdated-nss-openssl-version">Outdated NSS / OpenSSL version</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="occ_command.html">Using the occ Command</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#occ-command-directory">occ Command Directory</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#run-occ-as-your-http-user">Run occ As Your HTTP User</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#apps-commands">Apps Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#background-jobs-selector">Background Jobs Selector</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#config-commands">Config Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#database-conversion">Database Conversion</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#encryption">Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#file-operations">File Operations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#l10n-create-javascript-translation-files-for-apps">l10n, Create Javascript Translation Files for Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#ldap-commands">LDAP Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#logging-commands">Logging Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#maintenance-commands">Maintenance Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#user-commands">User Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#command-line-installation">Command Line Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html#command-line-upgrade">Command Line Upgrade</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html#enabling-the-activity-app">Enabling the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html#configuring-your-owncloud-for-the-activity-app">Configuring your ownCloud for the Activity App</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html#installing-clamav">Installing ClamAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html#enabling-the-antivirus-app-for-files">Enabling the Antivirus App for Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html#configuring-clamav-on-owncloud">Configuring ClamAV on ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="caching_configuration.html">Configuring Memory Caching</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html#id1">APC</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html#id2">APCu</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html#id3">Memcached</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html#id4">Redis</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html#cache-directory-location">Cache Directory Location</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html#cron-jobs">Cron Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#default-parameters">Default Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#default-config-php-examples">Default config.php Examples</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#user-experience">User Experience</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#mail-parameters">Mail Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#proxy-configurations">Proxy Configurations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#deleted-items-trash-bin">Deleted Items (trash bin)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#owncloud-verifications">ownCloud Verifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#logging">Logging</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#alternate-code-locations">Alternate Code Locations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#apps">Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#previews">Previews</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#ldap">LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#maintenance">Maintenance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#ssl">SSL</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#memory-caching-backend-configuration">Memory caching backend configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#using-object-store-with-owncloud">Using Object Store with ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#all-other-config-options">All other config options</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html#app-config-options">App config options</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="email_configuration.html">Email Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#configuring-an-smtp-server">Configuring an SMTP Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#configuring-php-and-sendmail">Configuring PHP and Sendmail</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#using-email-templates">Using Email Templates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#setting-mail-server-parameters-in-config-php">Setting Mail Server Parameters in config.php</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#troubleshooting">Troubleshooting</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html#enabling-debug-mode">Enabling Debug Mode</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l1"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="language_configuration.html">Language Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#limit-on-password-length">Limit on Password Length</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#operating-system">Operating system</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#deployment">Deployment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#use-https">Use HTTPS</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#use-a-dedicated-domain-for-owncloud">Use a dedicated domain for ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#ensure-that-your-owncloud-instance-is-installed-in-a-dmz">Ensure that your ownCloud instance is installed in a DMZ</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html#serve-security-related-headers-by-the-web-server">Serve security related Headers by the web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html#defining-trusted-proxies">Defining Trusted Proxies</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html#overwrite-parameters">Overwrite Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l1"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html#managing-third-party-parameters">Managing Third Party Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="performance_tuning/index.html">Server Tuning & Performance Tips</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/oc_server_tuning.html">ownCloud Server Tuning</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/database_best_practice.html">Database Best Practice</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/webserver_tips.html">Webserver Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/ssl_encryption_app.html">SSL / Encryption App</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html#automatic-configurations-examples">Automatic Configurations Examples</a></li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration_server/security_setup_warnings.html
index 9dec75a,0000000..737baed
mode 100644,000000..100644
--- a/core/doc/admin/configuration_server/security_setup_warnings.html
+++ b/core/doc/admin/configuration_server/security_setup_warnings.html
@@@ -1,270 -1,0 +1,280 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Warnings on Admin Page — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="ownCloud Server Configuration" href="index.html" />
+ <link rel="next" title="Using the occ Command" href="occ_command.html" />
+ <link rel="prev" title="ownCloud Server Configuration" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">ownCloud Server Configuration</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Warnings on Admin Page</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#cache-warnings">Cache Warnings</a></li>
++<li class="toctree-l3"><a class="reference internal" href="#transactional-file-locking">Transactional file locking</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#you-are-accessing-this-site-via-http">You are accessing this site via HTTP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#the-test-with-getenv-path-only-returns-an-empty-response">The test with getenv(“PATH”) only returns an empty response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#the-strict-transport-security-http-header-is-not-configured">The “Strict-Transport-Security” HTTP header is not configured</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#dev-urandom-is-not-readable-by-php">/dev/urandom is not readable by PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#your-web-server-is-not-yet-set-up-properly-to-allow-file-synchronization">Your web server is not yet set up properly to allow file synchronization</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#outdated-nss-openssl-version">Outdated NSS / OpenSSL version</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="occ_command.html">Using the occ Command</a></li>
+<li class="toctree-l2"><a class="reference internal" href="activity_configuration.html">Configuring the Activity App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching_configuration.html">Configuring Memory Caching</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs_configuration.html">Defining Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="config_sample_php_parameters.html">Config.php Parameters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="email_configuration.html">Email Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="knowledgebase_configuration.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="language_configuration.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="logging_configuration.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="harden_server.html">Hardening and Security Guidance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reverse_proxy_configuration.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="thirdparty_php_configuration.html">Using Third Party PHP Components</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance_tuning/index.html">Server Tuning & Performance Tips</a></li>
+<li class="toctree-l2"><a class="reference internal" href="js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="automatic_configuration.html">Automatic Configuration Setup</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="warnings-on-admin-page">
+<h1>Warnings on Admin Page<a class="headerlink" href="#warnings-on-admin-page" title="Permalink to this headline">¶</a></h1>
+<p>Your ownCloud server has a built-in configuration checker, and it reports its
+findings at the top of your Admin page. These are some of the warnings you
+might see, and what to do about them.</p>
+<div class="figure">
+<img alt="../_images/security-setup-warning-1.png" src="../_images/security-setup-warning-1.png" />
+</div>
+<div class="section" id="cache-warnings">
+<h2>Cache Warnings<a class="headerlink" href="#cache-warnings" title="Permalink to this headline">¶</a></h2>
+<p>“No memory cache has been configured. To enhance your performance please
+configure a memcache if available.” ownCloud supports multiple php caching
+extentions:</p>
+<ul class="simple">
+<li>APC (PHP 5.4 only)</li>
+<li>APCu (PHP 5.5+, minimum required PHP extension version 4.0.6)</li>
+<li>Memcached</li>
+<li>Redis (minimum required php extension version: 2.2.5)</li>
+</ul>
+<p>You will see this warning if you have no caches installed and enabled, or if
+your cache does not have the required minimum version installed; older versions
+are disabled because of performance problems.</p>
+<p>If you see “<em>{Cache}</em> below version <em>{Version}</em> is installed. for stability and
+performance reasons we recommend to update to a newer <em>{Cache}</em> version” then
+you need to upgrade, or, if you’re not using it, remove it.</p>
+<p>You are not required to use any caches, but caches improve server performance.
+See <a class="reference internal" href="caching_configuration.html"><em>Configuring Memory Caching</em></a>.</p>
+</div>
++<div class="section" id="transactional-file-locking">
++<h2>Transactional file locking<a class="headerlink" href="#transactional-file-locking" title="Permalink to this headline">¶</a></h2>
++<p>“Transactional file locking is disabled, this might lead to issues with race
++conditions.”</p>
++<p>“Transactional file locking is using the database as locking backend, for best
++performance it’s advised to configure a memcache for locking.”</p>
++<p>Please see <a class="reference internal" href="../configuration_files/files_locking_transactional.html"><em>Transactional File Locking</em></a> on how
++to correctly configure your environment for transactional file locking.</p>
++</div>
+<div class="section" id="you-are-accessing-this-site-via-http">
+<h2>You are accessing this site via HTTP<a class="headerlink" href="#you-are-accessing-this-site-via-http" title="Permalink to this headline">¶</a></h2>
+<p>“You are accessing this site via HTTP. We strongly suggest you configure your
+server to require using HTTPS instead.” Please take this warning seriously;
+using HTTPS is a fundamental security measure. You must configure your Web
+server to support it, and then there are some settings in the <strong>Security</strong>
+section of your ownCloud Admin page to enable. The following manual pages
+describe how to enable HTTPS on the Apache and Nginx Web servers.</p>
+<p><a class="reference internal" href="../installation/source_installation.html#enabling-ssl-label"><em>Enabling SSL</em></a> (on Apache)</p>
+<p><a class="reference internal" href="harden_server.html#use-https-label"><em>Use HTTPS</em></a></p>
+<p><a class="reference internal" href="../installation/nginx_configuration.html#nginx-configuration-example"><em>Nginx Configuration</em></a></p>
+</div>
+<div class="section" id="the-test-with-getenv-path-only-returns-an-empty-response">
+<h2>The test with getenv(“PATH”) only returns an empty response<a class="headerlink" href="#the-test-with-getenv-path-only-returns-an-empty-response" title="Permalink to this headline">¶</a></h2>
+<p>Some environments are not passing a valid PATH variable to ownCloud. The
+<a class="reference internal" href="../installation/source_installation.html#using-php-fpm"><em>Configuration notes to php-fpm</em></a> provides the information about how to configure your environment.</p>
+</div>
+<div class="section" id="the-strict-transport-security-http-header-is-not-configured">
+<h2>The “Strict-Transport-Security” HTTP header is not configured<a class="headerlink" href="#the-strict-transport-security-http-header-is-not-configured" title="Permalink to this headline">¶</a></h2>
+<p>“The “Strict-Transport-Security” HTTP header is not configured to least “15768000” seconds.
+For enhanced security we recommend enabling HSTS as described in our security tips.”</p>
+<p>The HSTS header needs to be configured within your webserver by following the
+<a class="reference internal" href="harden_server.html#enable-hsts-label"><em>Enable HTTP Strict Transport Security</em></a> documentation</p>
+</div>
+<div class="section" id="dev-urandom-is-not-readable-by-php">
+<h2>/dev/urandom is not readable by PHP<a class="headerlink" href="#dev-urandom-is-not-readable-by-php" title="Permalink to this headline">¶</a></h2>
+<p>“/dev/urandom is not readable by PHP which is highly discouraged for security reasons.
+Further information can be found in our documentation.”</p>
+<p>This message is another one which needs to be taken seriously. Please have a look
+at the <a class="reference internal" href="harden_server.html#dev-urandom-label"><em>Give PHP read accesss to /dev/urandom</em></a> documentation.</p>
+</div>
+<div class="section" id="your-web-server-is-not-yet-set-up-properly-to-allow-file-synchronization">
+<h2>Your web server is not yet set up properly to allow file synchronization<a class="headerlink" href="#your-web-server-is-not-yet-set-up-properly-to-allow-file-synchronization" title="Permalink to this headline">¶</a></h2>
+<p>“Your web server is not yet set up properly to allow file synchronization because
+the WebDAV interface seems to be broken.”</p>
+<p>At the ownCloud community forums a larger <a class="reference external" href="https://forum.owncloud.org/viewtopic.php?f=17&t=7536">FAQ</a>
+is maintained containing various information and debugging hints.</p>
+</div>
+<div class="section" id="outdated-nss-openssl-version">
+<h2>Outdated NSS / OpenSSL version<a class="headerlink" href="#outdated-nss-openssl-version" title="Permalink to this headline">¶</a></h2>
+<p>“cURL is using an outdated OpenSSL version (OpenSSL/$version). Please update your
+operating system or features such as installing and updating apps via the app store
+or Federated Cloud Sharing will not work reliably.”</p>
+<p>“cURL is using an outdated NSS version (NSS/$version). Please update your operating
+system or features such as installing and updating apps via the app store or Federated
+Cloud Sharing will not work reliably.”</p>
+<p>There are known bugs in older OpenSSL and NSS versions leading to misbehaviour in
+combination with remote hosts using SNI. A technology used by most of the HTTPS
+websites. To ensure that ownCloud will work properly you need to update OpenSSL
+to at least 1.0.2b or 1.0.1d. For NSS the patch version depends on your distribution
+and an heuristic is running the test which actually reproduces the bug. There
+are distributions such as RHEL/CentOS which have this backport still <a class="reference external" href="https://bugzilla.redhat.com/show_bug.cgi?id=1241172">pending</a>.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/contents.html
index 95edbc6,0000000..069bd77
mode 100644,000000..100644
--- a/core/doc/admin/contents.html
+++ b/core/doc/admin/contents.html
@@@ -1,793 -1,0 +1,794 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="index.html" />
+ <link rel="next" title="ownCloud 8.2 Server Administration Manual Introduction" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="#">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_server/index.html">ownCloud Server Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 8.2 Server Administration Manual Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="index.html#introduction">Introduction</a></li>
+<li class="toctree-l2"><a class="reference internal" href="index.html#owncloud-videos-and-blogs">ownCloud Videos and Blogs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="index.html#target-audience">Target Audience</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="release_notes.html">ownCloud 8.2 Release Notes</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#changes-in-8-2">Changes in 8.2</a></li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#changes-in-8-1">Changes in 8.1</a></li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#enterprise-8-1-only">Enterprise 8.1 Only</a></li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#owncloud-8-0">ownCloud 8.0</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#manual-ldap-port-configuration">Manual LDAP Port Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-preview-icon-on-text-files">No Preview Icon on Text Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#remote-federated-cloud-share-cannot-be-reshared-with-local-users">Remote Federated Cloud Share Cannot be Reshared With Local Users</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#manually-migrate-encryption-keys-after-upgrade">Manually Migrate Encryption Keys after Upgrade</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#windows-server-not-supported">Windows Server Not Supported</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#php-5-3-support-dropped">PHP 5.3 Support Dropped</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#disable-apache-multiviews">Disable Apache Multiviews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#owncloud-does-not-follow-symlinks">ownCloud Does Not Follow Symlinks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-commas-in-group-names">No Commas in Group Names</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#hebrew-file-names-too-large-on-windows">Hebrew File Names Too Large on Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#google-drive-large-files-fail-with-500-error">Google Drive Large Files Fail with 500 Error</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#encrypting-large-numbers-of-files">Encrypting Large Numbers of Files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#enterprise-8-0-only">Enterprise 8.0 Only</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#sharepoint-drive-ssl-not-verified">Sharepoint Drive SSL Not Verified</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-federated-cloud-sharing-with-shibboleth">No Federated Cloud Sharing with Shibboleth</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#direct-uploads-to-swift-do-not-appear-in-owncloud">Direct Uploads to SWIFT do not Appear in ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#swift-objectstore-incompatible-with-encryption-app">SWIFT Objectstore Incompatible with Encryption App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#app-store-is-back">App Store is Back</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#owncloud-7-release-notes">ownCloud 7 Release Notes</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#id1">Manual LDAP Port Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#ldap-search-performance-improved">LDAP Search Performance Improved</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#protecting-owncloud-on-iis-from-data-loss">Protecting ownCloud on IIS from Data Loss</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#antivirus-app-modes">Antivirus App Modes</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#enable-only-for-specific-groups-fails">“Enable Only for Specific Groups” Fails</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#changes-to-file-previews">Changes to File Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#gb-limit-on-sftp-transfers">4GB Limit on SFTP Transfers</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#not-enough-space-available-on-file-upload">“Not Enough Space Available” on File Upload</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-more-expiration-date-on-local-shares">No More Expiration Date On Local Shares</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#zero-quota-not-read-only">Zero Quota Not Read-Only</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="release_notes.html#enterprise-7-only">Enterprise 7 Only</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#id2">No Federated Cloud Sharing with Shibboleth</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#windows-network-drive">Windows Network Drive</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#sharepoint-drive-ssl">Sharepoint Drive SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#shibboleth-and-webdav-incompatible">Shibboleth and WebDAV Incompatible</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-sqlite">No SQLite</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#no-app-store">No App Store</a></li>
+<li class="toctree-l3"><a class="reference internal" href="release_notes.html#ldap-home-connector-linux-only">LDAP Home Connector Linux Only</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/system_requirements.html">System Requirements</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/system_requirements.html#memory">Memory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/system_requirements.html#recommended-setup-for-running-owncloud">Recommended Setup for Running ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/system_requirements.html#supported-platforms">Supported Platforms</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/linux_installation.html">Preferred Linux Installation Method</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#installation-quick-start">Installation Quick Start</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#installing-owncloud-enterprise-subscription">Installing ownCloud Enterprise Subscription</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#downgrading-not-supported">Downgrading Not Supported</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/linux_installation.html#additional-installation-guides-and-notes">Additional Installation Guides and Notes</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_wizard.html">Installation Wizard</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#quick-start">Quick Start</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#data-directory-location">Data Directory Location</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#database-choice">Database Choice</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#trusted-domains">Trusted Domains</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_wizard.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/command_line_installation.html">Installing ownCloud From the Command Line</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/apps_management_installation.html">Installing and Managing Apps</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#enterprise-subscription-supported-apps">Enterprise Subscription Supported Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#viewing-enabled-apps">Viewing Enabled Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#re-enabling-contacts-and-calendar-apps">Re-enabling Contacts and Calendar Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#managing-apps">Managing Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#adding-third-party-apps">Adding Third Party Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#using-custom-app-directories">Using Custom App Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/apps_management_installation.html#using-your-own-appstore">Using Your Own Appstore</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/source_installation.html">Manual Installation on Linux</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#example-installation-on-ubuntu-14-04-lts-server">Example installation on Ubuntu 14.04 LTS Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#apache-web-server-configuration">Apache Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#additional-apache-configurations">Additional Apache Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#enabling-ssl">Enabling SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#installation-wizard">Installation Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#setting-strong-directory-permissions">Setting Strong Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#selinux">SELinux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#configuration-notes-to-php-ini-files">Configuration notes to php.ini files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#configuration-notes-to-php-fpm">Configuration notes to php-fpm</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/source_installation.html#other-web-servers">Other Web Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/appliance_installation.html">ownCloud Community Appliance</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/appliance_installation.html#instructions-for-virtualbox-and-ova">Instructions for VirtualBox and OVA</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/appliance_installation.html#software-appliances">Software Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/php_54_installation.html">Installing PHP 5.4 on RHEL 6 and CentOS 6</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/php_54_installation.html#rhel-6">RHEL 6</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/php_54_installation.html#centos-6">CentOS 6</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/selinux_configuration.html">SELinux Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-a-remote-database">Allow access to a remote database</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-ldap-server">Allow access to LDAP server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-remote-network">Allow access to remote network</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/selinux_configuration.html#allow-access-to-smtp-sendmail">Allow access to SMTP/sendmail</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/nginx_configuration.html">Nginx Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/nginx_configuration.html#suppressing-log-messages">Suppressing Log Messages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/nginx_configuration.html#javascript-js-or-css-css-files-not-served-properly">JavaScript (.js) or CSS (.css) files not served properly</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ucs_installation.html">Univention Corporate Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/ucs_installation.html#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/macos_installation.html">Mac OS X</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_server/index.html">ownCloud Server Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/security_setup_warnings.html">Warnings on Admin Page</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#cache-warnings">Cache Warnings</a></li>
++<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#transactional-file-locking">Transactional file locking</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#you-are-accessing-this-site-via-http">You are accessing this site via HTTP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#the-test-with-getenv-path-only-returns-an-empty-response">The test with getenv(“PATH”) only returns an empty response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#the-strict-transport-security-http-header-is-not-configured">The “Strict-Transport-Security” HTTP header is not configured</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#dev-urandom-is-not-readable-by-php">/dev/urandom is not readable by PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#your-web-server-is-not-yet-set-up-properly-to-allow-file-synchronization">Your web server is not yet set up properly to allow file synchronization</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/security_setup_warnings.html#outdated-nss-openssl-version">Outdated NSS / OpenSSL version</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/occ_command.html">Using the occ Command</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#occ-command-directory">occ Command Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#run-occ-as-your-http-user">Run occ As Your HTTP User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#apps-commands">Apps Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#background-jobs-selector">Background Jobs Selector</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#config-commands">Config Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#database-conversion">Database Conversion</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#encryption">Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#file-operations">File Operations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#l10n-create-javascript-translation-files-for-apps">l10n, Create Javascript Translation Files for Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#ldap-commands">LDAP Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#logging-commands">Logging Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#maintenance-commands">Maintenance Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#user-commands">User Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#command-line-installation">Command Line Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/occ_command.html#command-line-upgrade">Command Line Upgrade</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/activity_configuration.html">Configuring the Activity App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/activity_configuration.html#enabling-the-activity-app">Enabling the Activity App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/activity_configuration.html#configuring-your-owncloud-for-the-activity-app">Configuring your ownCloud for the Activity App</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/antivirus_configuration.html">Configuring the ClamAV Antivirus Scanner</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/antivirus_configuration.html#installing-clamav">Installing ClamAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/antivirus_configuration.html#enabling-the-antivirus-app-for-files">Enabling the Antivirus App for Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/antivirus_configuration.html#configuring-clamav-on-owncloud">Configuring ClamAV on ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/caching_configuration.html">Configuring Memory Caching</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/caching_configuration.html#id1">APC</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/caching_configuration.html#id2">APCu</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/caching_configuration.html#id3">Memcached</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/caching_configuration.html#id4">Redis</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/caching_configuration.html#cache-directory-location">Cache Directory Location</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/background_jobs_configuration.html">Defining Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/background_jobs_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/background_jobs_configuration.html#cron-jobs">Cron Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html">Config.php Parameters</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#default-parameters">Default Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#default-config-php-examples">Default config.php Examples</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#user-experience">User Experience</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#mail-parameters">Mail Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#proxy-configurations">Proxy Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin">Deleted Items (trash bin)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#owncloud-verifications">ownCloud Verifications</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#logging">Logging</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#alternate-code-locations">Alternate Code Locations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#apps">Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#previews">Previews</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#ldap">LDAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#maintenance">Maintenance</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#ssl">SSL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#memory-caching-backend-configuration">Memory caching backend configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#using-object-store-with-owncloud">Using Object Store with ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#all-other-config-options">All other config options</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/config_sample_php_parameters.html#app-config-options">App config options</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/email_configuration.html">Email Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#configuring-an-smtp-server">Configuring an SMTP Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#configuring-php-and-sendmail">Configuring PHP and Sendmail</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#using-email-templates">Using Email Templates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#setting-mail-server-parameters-in-config-php">Setting Mail Server Parameters in config.php</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#troubleshooting">Troubleshooting</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/email_configuration.html#enabling-debug-mode">Enabling Debug Mode</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/external_sites.html">Linking External Sites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/knowledgebase_configuration.html">Knowledge Base Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/knowledgebase_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/language_configuration.html">Language Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/language_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/logging_configuration.html">Logging Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/logging_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/harden_server.html">Hardening and Security Guidance</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#limit-on-password-length">Limit on Password Length</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#operating-system">Operating system</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#deployment">Deployment</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#use-https">Use HTTPS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#use-a-dedicated-domain-for-owncloud">Use a dedicated domain for ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#ensure-that-your-owncloud-instance-is-installed-in-a-dmz">Ensure that your ownCloud instance is installed in a DMZ</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/harden_server.html#serve-security-related-headers-by-the-web-server">Serve security related Headers by the web server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/reverse_proxy_configuration.html">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/reverse_proxy_configuration.html#defining-trusted-proxies">Defining Trusted Proxies</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/reverse_proxy_configuration.html#overwrite-parameters">Overwrite Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/reverse_proxy_configuration.html#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/search_configuration.html">Enabling Full-Text Search</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/thirdparty_php_configuration.html">Using Third Party PHP Components</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/thirdparty_php_configuration.html#managing-third-party-parameters">Managing Third Party Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/performance_tuning/index.html">Server Tuning & Performance Tips</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/performance_tuning/oc_server_tuning.html">ownCloud Server Tuning</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/performance_tuning/database_best_practice.html">Database Best Practice</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/performance_tuning/webserver_tips.html">Webserver Tips</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/performance_tuning/ssl_encryption_app.html">SSL / Encryption App</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/js_css_asset_management_configuration.html">JavaScript and CSS Asset Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/js_css_asset_management_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_server/automatic_configuration.html">Automatic Configuration Setup</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/automatic_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_server/automatic_configuration.html#automatic-configurations-examples">Automatic Configurations Examples</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_user/index.html">User Management</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/user_configuration.html">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#creating-a-new-user">Creating a New User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#reset-a-user-s-password">Reset a User’s Password</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#renaming-a-user">Renaming a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#granting-administrator-privileges-to-a-user">Granting Administrator Privileges to a User</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#managing-groups">Managing Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#setting-storage-quotas">Setting Storage Quotas</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_configuration.html#deleting-users">Deleting users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/reset_admin_password.html">Resetting a Lost Admin Password</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/user_auth_ftp_smb_imap.html">User Authentication with IMAP, SMB, and FTP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ftp_smb_imap.html#imap">IMAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ftp_smb_imap.html#smb">SMB</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ftp_smb_imap.html#ftp">FTP</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/user_auth_ldap.html">User Authentication with LDAP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#advanced-settings">Advanced Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#expert-settings">Expert Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#testing-the-configuration">Testing the configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#microsoft-active-directory">Microsoft Active Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#memberof-read-memberof-permissions">memberOf / Read MemberOf permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#duplicating-server-configurations">Duplicating Server Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap.html#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/user_auth_ldap_cleanup.html">LDAP User Cleanup</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_auth_ldap_cleanup.html#deleting-local-owncloud-users">Deleting Local ownCloud Users</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_user/user_provisioning_api.html">User Provisioning API</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#instruction-set">Instruction set</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-adduser">users / adduser</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-getusers">users / getusers</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-getuser">users / getuser</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-edituser">users / edituser</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-deleteuser">users / deleteuser</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-getgroups">users / getgroups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-addtogroup">users / addtogroup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-removefromgroup">users / removefromgroup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-createsubadmin">users / createsubadmin</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-removesubadmin">users / removesubadmin</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#users-getsubadmingroups">users / getsubadmingroups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#groups-getgroups">groups / getgroups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#groups-addgroup">groups / addgroup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#groups-getgroup">groups / getgroup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#groups-getsubadmins">groups / getsubadmins</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#groups-deletegroup">groups / deletegroup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#apps-getapps">apps / getapps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#apps-getappinfo">apps / getappinfo</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#apps-enable">apps / enable</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_user/user_provisioning_api.html#apps-disable">apps / disable</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_files/index.html">File Sharing and Management</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/file_sharing_configuration.html">File Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/file_sharing_configuration.html#creating-persistent-file-shares">Creating Persistent File Shares</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/federated_cloud_sharing_configuration.html">Configuring Federated Cloud Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/federated_cloud_sharing_configuration.html#sharing-with-owncloud-7">Sharing With ownCloud 7</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/federated_cloud_sharing_configuration.html#creating-a-direct-share-link">Creating a Direct Share Link</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/federated_cloud_sharing_configuration.html#creating-federated-cloud-shares-via-public-link-share">Creating Federated Cloud Shares via Public Link Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/federated_cloud_sharing_configuration.html#configuration-tips">Configuration Tips</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/big_file_upload_configuration.html">Uploading big files > 512MB</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/big_file_upload_configuration.html#system-configuration">System Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/big_file_upload_configuration.html#configuring-your-webserver">Configuring Your Webserver</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/big_file_upload_configuration.html#configuring-php">Configuring PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/big_file_upload_configuration.html#configuring-owncloud">Configuring ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/collaborative_documents_configuration.html">Configuring the Collaborative Documents App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/collaborative_documents_configuration.html#enabling-the-documents-app">Enabling the Documents App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/collaborative_documents_configuration.html#enabling-and-testing-ms-word-support">Enabling and testing MS Word support</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/default_files_configuration.html">Providing Default Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html">Configuring External Storage (GUI)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#enabling-external-storage-support">Enabling External Storage Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#storage-configuration">Storage Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#user-and-group-permissions">User and Group Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#mount-options">Mount Options</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#using-self-signed-certificates">Using Self-Signed Certificates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#available-storage-backends">Available storage backends</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#allow-users-to-mount-external-storage">Allow Users to Mount External Storage</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#adding-files-to-external-storages">Adding Files to External Storages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration_gui.html#configuration-file">Configuration File</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/external_storage_configuration.html">Configuring External Storage (Configuration File)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#using-self-signed-certificates">Using self-signed certificates</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#adding-files-to-external-storages">Adding files to external storages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#priorities">Priorities</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#configuring-temporary-disk-space-needs">Configuring Temporary Disk Space Needs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#backends">Backends</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage_configuration.html#external-storage-password-management">External Storage Password Management</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/external_storage/auth_mechanisms.html">External Storage Authentication mechanisms</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage/auth_mechanisms.html#special-mechanisms">Special Mechanisms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage/auth_mechanisms.html#password-based-mechanisms">Password-based Mechanisms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage/auth_mechanisms.html#public-key-mechanisms">Public-key Mechanisms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/external_storage/auth_mechanisms.html#oauth">OAuth</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/encryption_configuration.html">Encryption Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#before-enabling-encryption">Before Enabling Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#enabling-encryption">Enabling Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#sharing-encrypted-files">Sharing Encrypted Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#encrypting-external-mountpoints">Encrypting External Mountpoints</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#enabling-users-file-recovery-key">Enabling Users’ File Recovery Key</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#occ-encryption-commands">occ Encryption Commands</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#files-not-encrypted">Files Not Encrypted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#ldap-and-other-external-user-back-ends">LDAP and Other External User Back-ends</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#upgrading-from-owncloud-8-0">Upgrading From ownCloud 8.0</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/encryption_configuration.html#where-keys-are-stored">Where Keys are Stored</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/files_locking_enabling.html">Using the Files Locking App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/files_locking_transactional.html">Transactional File Locking</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_files/previews_configuration.html">Previews Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_files/previews_configuration.html#parameters">Parameters</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_database/index.html">Database Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database/db_conversion.html">Converting Database Type</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/db_conversion.html#run-the-conversion">Run the conversion</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/db_conversion.html#unconvertible-tables">Unconvertible Tables</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database/linux_database_configuration.html">Database Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/linux_database_configuration.html#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/linux_database_configuration.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/linux_database_configuration.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database/oracle_db_configuration.html">Oracle Database Setup</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/oracle_db_configuration.html#outline-of-steps">Outline of Steps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/oracle_db_configuration.html#configuring-oracle">Configuring Oracle</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration_database/oracle_db_configuration.html#configure-owncloud">Configure ownCloud</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_mimetypes/index.html">Mimetypes Management</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mimetypes/mimetype_aliases.html">Mimetype aliases</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration_mimetypes/mimetype_aliases.html#adding-custom-aliases">Adding custom aliases</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mimetypes/mimetype_mapping.html">Mimetype mapping</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mimetypes/index.html#icon-retrieval">Icon retrieval</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/enable_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/backup.html">Backing up ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-folders">Backup Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-database">Backup Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/upgrade.html">Upgrading Your ownCloud Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#upgrade-quickstart">Upgrade Quickstart</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#upgrading-with-your-linux-package-manager">Upgrading With Your Linux Package Manager</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#upgrade-wizard">Upgrade Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#manual-upgrade-procedure">Manual Upgrade Procedure</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#reverse-upgrade">Reverse Upgrade</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/upgrade.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/update.html">Upgrading ownCloud with the Updater App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#can-t-login-without-updating">Can’t Login Without Updating</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#setting-strong-permissions">Setting Strong Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/restore.html">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/migrating.html">Migrating to a Different Server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="operations/index.html">Operations</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="operations/considerations_on_monitoring.html">Considerations on Monitoring</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="operations/considerations_on_monitoring.html#owncloud-deployment-architecture">ownCloud Deployment Architecture</a></li>
+<li class="toctree-l3"><a class="reference internal" href="operations/considerations_on_monitoring.html#the-important-components-of-owncloud">The Important Components of ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="operations/scaling_multiple_machines.html">Scaling Across Multiple Machines</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="operations/scaling_multiple_machines.html#application-layer">Application Layer</a></li>
+<li class="toctree-l3"><a class="reference internal" href="operations/scaling_multiple_machines.html#database-layer">Database Layer</a></li>
+<li class="toctree-l3"><a class="reference internal" href="operations/scaling_multiple_machines.html#storage-layer">Storage Layer</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="operations/theming.html">Theming ownCloud</a><ul>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues and Troubleshooting</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#bugs">Bugs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#general-troubleshooting">General Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#disable-3rdparty-non-shipped-apps">Disable 3rdparty / non-shipped apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#owncloud-logfiles">ownCloud Logfiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#php-version-and-information">PHP Version and Information</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#debugging-sync-issues">Debugging Sync Issues</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#common-problems-error-messages">Common problems / error messages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-webserver-and-php-problems">Troubleshooting Webserver and PHP problems</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#logfiles">Logfiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#webserver-and-php-modules">Webserver and PHP modules</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-webdav">Troubleshooting WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#troubleshooting-contacts-calendar">Troubleshooting Contacts & Calendar</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="issues/index.html#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="issues/index.html#other-issues">Other issues</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="enterprise-subscription-only">
+<h2>Enterprise Subscription Only<a class="headerlink" href="#enterprise-subscription-only" title="Permalink to this headline">¶</a></h2>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_installation/linux_installation.html">Installing & Upgrading ownCloud Enterprise Subscription</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_installation/linux_installation.html#selinux">SELinux</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_installation/supported_apps_installation.html">Supported ownCloud Enterprise Subscription Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_installation/license_keys_installation.html">License Keys</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_installation/license_keys_installation.html#introduction">Introduction</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_installation/license_keys_installation.html#configuration">Configuration</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html">Creating Branded Client Apps (Enterprise Only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#overview">Overview</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#building-a-branded-ios-app">Building a Branded iOS App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#run-branded-and-un-branded-desktop-sync-clients">Run Branded and Un-branded Desktop Sync Clients</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#building-an-android-app-or-desktop-sync-client">Building an Android App or Desktop Sync Client</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#using-the-wizard">Using the Wizard</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/creating_branded_apps.html#signing-android-client">Signing Android Client</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_clients/custom_client_repos.html">Custom Client Download Repositories</a></li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_clients/publishing_android_app.html">Distributing Your Branded Android App (Enterprise Only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/publishing_android_app.html#digitally-signing-android-apps">Digitally Signing Android Apps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/publishing_android_app.html#distribution-via-email">Distribution via Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/publishing_android_app.html#publish-on-your-owncloud-server">Publish On Your ownCloud Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/publishing_android_app.html#publish-to-the-google-play-store">Publish to the Google Play Store</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_clients/publishing_android_app.html#resources">Resources</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_ios_app/index.html">Creating Branded iOS Apps (ES only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app.html">Building and Distributing Your Branded iOS App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_2.html">Create Certificate Signing Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_3.html">Create Bundle IDs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_4.html">Setting up Testing Devices</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_5.html">Create Provisioning Profiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_6.html">Creating a P12 Certificate</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_7.html">Building Your iOS App With ownBrander</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_8.html">Testing Your New Branded iOS App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_ios_app/publishing_ios_app_9.html">Publishing Your New Branded iOS App</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_server_branding/enterprise_server_branding.html">Custom Theming ownCloud (ES only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_server_branding/enterprise_server_branding.html#overview">Overview</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_external_storage/index.html">External Storage (ES only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_external_storage/jive_configuration.html">Jive Integration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/jive_configuration.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/jive_configuration.html#use-cases">Use Cases</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/jive_configuration.html#configuring-the-jive-app">Configuring the Jive app</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_external_storage/ldap_home_connector_configuration.html">LDAP Home Connector</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/ldap_home_connector_configuration.html#mount-home-directory-in-ubuntu">Mount home directory in Ubuntu</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/ldap_home_connector_configuration.html#configure-owncloud">Configure ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/ldap_home_connector_configuration.html#configure-the-ldap-server">Configure the LDAP server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_external_storage/s3_swift_as_primary_object_store_configuration.html">Configuring S3 and OpenStack Swift Objects as Primary Storage</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/s3_swift_as_primary_object_store_configuration.html#implications">Implications</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/s3_swift_as_primary_object_store_configuration.html#configuration">Configuration</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_external_storage/sharepoint-integration_configuration.html">Configuring SharePoint Integration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/sharepoint-integration_configuration.html#enabling-the-sharepoint-plugin">Enabling the SharePoint Plugin</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/sharepoint-integration_configuration.html#note">Note</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/sharepoint-integration_configuration.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_external_storage/windows-network-drive_configuration.html">Installing and Configuring the Windows Network Drive App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/windows-network-drive_configuration.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/windows-network-drive_configuration.html#additional-installation-steps">Additional Installation Steps</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/windows-network-drive_configuration.html#creating-a-new-share">Creating a New Share</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_external_storage/windows-network-drive_configuration.html#personal-smb-mounts">Personal SMB Mounts</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_user_management/index.html">User Management (ES only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html">Shibboleth Integration (Enterprise Subscription only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#introduction">Introduction</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#apache-configuration">Apache Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#application-configuration">Application Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#enabling-the-shibboleth-app">Enabling the Shibboleth App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#webdav-support">WebDAV Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#known-limitations">Known Limitations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#encryption">Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#other-login-mechanisms">Other Login Mechanisms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#session-timeout">Session Timeout</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_user_management/user_auth_shibboleth.html#uid-considerations-and-windows-network-drive-compatability">UID Considerations and Windows Network Drive compatability</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="enterprise_files_drop/files_drop.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_files_drop/files_drop.html#setting-up-the-files-drop-app">Setting Up the Files Drop App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="enterprise_files_drop/files_drop.html#using-the-files-drop-app">Using the Files Drop App</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/enterprise_user_management/user_auth_shibboleth.html
index a6c82b1,0000000..fa06a2d
mode 100644,000000..100644
--- a/core/doc/admin/enterprise_user_management/user_auth_shibboleth.html
+++ b/core/doc/admin/enterprise_user_management/user_auth_shibboleth.html
@@@ -1,488 -1,0 +1,494 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Shibboleth Integration (Enterprise Subscription only) — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="User Management (ES only)" href="index.html" />
+ <link rel="next" title="Enabling Anonymous Uploads with Files Drop (ES Only)" href="../enterprise_files_drop/index.html" />
+ <link rel="prev" title="User Management (ES only)" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_server/index.html">ownCloud Server Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">User Management (ES only)</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Shibboleth Integration (Enterprise Subscription only)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#introduction">Introduction</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apache-configuration">Apache Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#application-configuration">Application Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#enabling-the-shibboleth-app">Enabling the Shibboleth App</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#webdav-support">WebDAV Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#known-limitations">Known Limitations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#encryption">Encryption</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#other-login-mechanisms">Other Login Mechanisms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#session-timeout">Session Timeout</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#uid-considerations-and-windows-network-drive-compatability">UID Considerations and Windows Network Drive compatability</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="shibboleth-integration-enterprise-subscription-only">
+<h1>Shibboleth Integration (Enterprise Subscription only)<a class="headerlink" href="#shibboleth-integration-enterprise-subscription-only" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="introduction">
+<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
+<p>The ownCloud Shibboleth user backend application integrates ownCloud with a
+Shibboleth Service Provider (SP) and allows operations in federated and
+single-sign-on infrastructures. Setting up Shibboleth has three steps:</p>
+<ol class="arabic simple">
+<li>Create the appropriate Apache configuration</li>
+<li>Enable the Shibboleth app</li>
+<li>Enable Shibboleth on your ownCloud admin page</li>
+</ol>
+<p>Currently supported installations are based on the <a class="reference external" href="https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig">native Apache integration</a>
+. The individual configuration of the service provider is highly dependent on
+the operating system, as well as on the integration with the Identity
+Providers (IdP), and require case-by-case analysis and installation.</p>
+<p>The ownCloud Desktop Client and mobile clients can interact with an
+ownCloud instance running inside a Shibboleth Service Provider by using built-in
+browser components for authentication against the IdP.</p>
+<p>The ownCloud desktop sync client and mobile apps store users’ logins, so
+your users only need to enter their logins the first time they set up their
+accounts. These screenshots show what the user sees at account setup. Figure 1
+shows a test Shibboleth login screen from
+<a class="reference external" href="https://www.testshib.org/index.html">Testshib.org</a> on the ownCloud desktop
+sync client.</p>
+<div class="figure">
+<img alt="../_images/shib-gui1.png" src="../_images/shib-gui1.png" />
+<p class="caption"><em>figure 1: First login screen</em></p>
+</div>
+<p>Then after going through the setup wizard, the desktop sync client displays the
+server and login information just like it does for any other ownCloud server
+connections.</p>
+<div class="figure">
+<img alt="../_images/shib-gui4.png" src="../_images/shib-gui4.png" />
+<p class="caption"><em>figure 2: ownCloud client displays server information</em></p>
+</div>
+<p>To your users, it doesn’t look or behave differently on the desktop sync
+client, Android app, or iOS app from an ordinary ownCloud account setup. The
+only difference is the initial setup screen where they enter their account
+login.</p>
+</div>
+<div class="section" id="apache-configuration">
+<h2>Apache Configuration<a class="headerlink" href="#apache-configuration" title="Permalink to this headline">¶</a></h2>
+<p>This is an example configuration as installed and operated on a Linux server
+running the Apache Web server. These configurations are highly operating system
+specific and require a high degree of customization.</p>
+<p>The ownCloud instance itself is installed in <tt class="docutils literal"><span class="pre">/var/www/owncloud/</span></tt>. The
+following aliases are defined in an Apache virtual host directive:</p>
+<div class="highlight-apache"><div class="highlight"><pre><span class="c"># non-Shibboleth access</span>
+<span class="nb">Alias</span> <span class="sx">/owncloud</span> <span class="sx">/var/www/owncloud/</span>
+<span class="c"># for Shibboleth access</span>
+<span class="nb">Alias</span> <span class="sx">/oc-shib</span> <span class="sx">/var/www/owncloud/</span>
+</pre></div>
+</div>
+<p>Further Shibboleth specific configuration as defined in
+<tt class="docutils literal"><span class="pre">/etc/apache2/conf.d/shib.conf</span></tt>:</p>
+<div class="highlight-apache"><pre> #
+ # Load the Shibboleth module.
+ #
+ LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_22.so
+
+ #
+ # Ensures handler will be accessible.
+ #
+ <Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+ </Location>
+
+ #
+ # Configure the module for content.
+ #
+ # Shibboleth is disabled for the following location to allow non
+ # shibboleth webdav access
+ <Location ~ "/oc-shib/remote.php/nonshib-webdav">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~
+ "/oc-shib/(status.php$
+ |index.php/s/
+ |public.php$
+ |cron.php$
+ |core/img/
+ |index.php/apps/files_sharing/ajax/publicpreview.php$
+ |index.php/apps/files/ajax/upload.php$
+ |apps/files/templates/fileexists.html$
+ |index.php/apps/files/ajax/mimeicon.php$)">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public gallery
+# sharing
+ <Location ~
+ "/oc-shib/(apps/gallery/templates/slideshow.html$
+ |index.php/apps/gallery/ajax/getimages.php
+ |index.php/apps/gallery/ajax/thumbnail.php
+ |index.php/apps/gallery/ajax/image.php)">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.css">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.js">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Shibboleth is disabled for the following location to allow public link
+ # sharing
+ <Location ~ "/oc-shib/.*\.woff ">
+ Satisfy Any
+ Allow from all
+ AuthType None
+ Require all granted
+ </Location>
+
+ # Besides the exceptions above this location is now under control of
+ # Shibboleth
+ <Location /oc-shib>
+ AuthType shibboleth
+ ShibRequireSession On
+ ShibUseHeaders Off
+ ShibExportAssertion On
+ require valid-user
+ </Location></pre>
+</div>
+</div>
+<div class="section" id="application-configuration">
+<h2>Application Configuration<a class="headerlink" href="#application-configuration" title="Permalink to this headline">¶</a></h2>
+<p>After installing and enabling the Shibboleth application there are three
+configuration variables to set up, depending on the data sent back by the
+IdP. The configuration is stored in <tt class="docutils literal"><span class="pre">apps/user_shibboleth</span></tt>.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="x">namespace OCA\user_shibboleth {</span>
+<span class="x"> const SHIB_SESSION_ID = 'Shib-Session-ID';</span>
+<span class="x"> const SHIB_EPPN = 'eppn';</span>
+<span class="x"> const SHIB_EMAIL = 'eppn';</span>
+<span class="x"> const SHIB_DISPLAY_NAME = 'eppn';</span>
+<span class="x">}</span>
+</pre></div>
+</div>
+<table border="1" class="docutils">
+<colgroup>
+<col width="27%" />
+<col width="73%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Parameter</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>SHIB_SESSION_ID</td>
+<td>This constant defines the name of the environment
+variable holding the Shibboleth session id.</td>
+</tr>
+<tr class="row-odd"><td>SHIB_EPPN</td>
+<td>This constant defines the name of the environment
+variable which holds the EPPN (eduPersonPrincipalName).
+This is the unique user identifier.</td>
+</tr>
+<tr class="row-even"><td>SHIB_EMAIL</td>
+<td>The environment variable with this given name holds the
+email address of the logged-in user.</td>
+</tr>
+<tr class="row-odd"><td>SHIB_DISPLAY_NAME</td>
+<td>This constant defines the name of the environment
+variable holding the user’s display name.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="enabling-the-shibboleth-app">
+<h2>Enabling the Shibboleth App<a class="headerlink" href="#enabling-the-shibboleth-app" title="Permalink to this headline">¶</a></h2>
+<p>You must enable the Shibboleth app on your Apps page, and then check <strong>Activate
+Shibboleth</strong> and click the <strong>Save</strong> button on your ownCloud Admin page. The
+system information displayed on your Admin page may be useful for
+troubleshooting; for example you can copy and include it on a support ticket.</p>
+<div class="figure">
+<img alt="../_images/shib-gui5.png" src="../_images/shib-gui5.png" />
+<p class="caption"><em>figure 3: Enabling Shibboleth on the Admin page</em></p>
+</div>
+</div>
+<div class="section" id="webdav-support">
+<h2>WebDAV Support<a class="headerlink" href="#webdav-support" title="Permalink to this headline">¶</a></h2>
+<p>Users of standard WebDAV clients can use an alternative
+WebDAV Url, for example <tt class="docutils literal"><span class="pre">https://cloud.example.com/remote.php/nonshib-webdav/</span></tt>
+to log in with their username and password. The password is generated on the
+Personal settings page.</p>
+<img alt="../_images/shibboleth-personal.png" src="../_images/shibboleth-personal.png" />
++<div class="admonition note">
++<p class="first admonition-title">Note</p>
++<p class="last">In pure SSO mode the WebDAV password feature will not work, as we
++have no way to store the WebDAV password. It does work in auto-provision
++mode.</p>
++</div>
+<p>For provisioning purpose an OCS API has been added to revoke a generated
+password for a user:</p>
+<p>Syntax: <tt class="docutils literal"><span class="pre">/v1/cloud/users/{userid}/non_shib_password</span></tt></p>
+<ul class="simple">
+<li>HTTP method: DELETE</li>
+</ul>
+<p>Status codes:</p>
+<ul class="simple">
+<li>100 - successful</li>
+<li>998 - user unknown</li>
+</ul>
+<p>Example:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>curl -X DELETE <span class="s2">"https://cloud.example.com/ocs/v1.php/cloud/users/myself@testshib.org/non_shib_password"</span> -u admin:admin
+<?xml <span class="nv">version</span><span class="o">=</span><span class="s2">"1.0"</span>?>
+<ocs>
+ <meta>
+ <status>ok</status>
+ <statuscode>100</statuscode>
+ <message/>
+ </meta>
+ <data/>
+</ocs>
+</pre></div>
+</div>
+</div>
+<div class="section" id="known-limitations">
+<h2>Known Limitations<a class="headerlink" href="#known-limitations" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="encryption">
+<h2>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h2>
+<p>File encryption can not be used together with Shibboleth because the encryption
+requires the user’s password to unlock the private encryption key. Due to the
+nature of Shibboleth the user’s password is not known to the service provider.
+Currently, we have no solution to this limitation.</p>
+</div>
+<div class="section" id="other-login-mechanisms">
+<h2>Other Login Mechanisms<a class="headerlink" href="#other-login-mechanisms" title="Permalink to this headline">¶</a></h2>
+<p>Shibboleth is not compatible with any other ownCloud user backend because the
+login process is handled outside of ownCloud.</p>
+<p>You can allow other login mechanisms (e.g. LDAP or ownCloud native) by creating
+a second Apache virtual host configuration. This second location is not
+protected by Shibboleth, and you can use your other ownCloud login mechanisms.</p>
+</div>
+<div class="section" id="session-timeout">
+<h2>Session Timeout<a class="headerlink" href="#session-timeout" title="Permalink to this headline">¶</a></h2>
+<p>Session timeout on Shibboleth is controlled by the IdP. It is not possible to
+have a session length longer than the length controlled by the IdP. In extreme
+cases this could result in re-login on mobile clients and desktop clients every
+hour.</p>
+<p>The session timeout can be overridden in the service provider, but this
+requires a source code change of the Apache Shibboleth module. A patch can be
+provided by the ownCloud support team.</p>
+</div>
+<div class="section" id="uid-considerations-and-windows-network-drive-compatability">
+<h2>UID Considerations and Windows Network Drive compatability<a class="headerlink" href="#uid-considerations-and-windows-network-drive-compatability" title="Permalink to this headline">¶</a></h2>
+<p>When using <tt class="docutils literal"><span class="pre">user_shibboleth</span></tt> in single-sign on (SSO) only mode, together with
+<tt class="docutils literal"><span class="pre">user_ldap</span></tt>, both apps need to resolve to the same <tt class="docutils literal"><span class="pre">uid</span></tt>.
+<tt class="docutils literal"><span class="pre">user_shibboleth</span></tt> will do the authentication, and <tt class="docutils literal"><span class="pre">user_ldap</span></tt> will provide
+user details such as <tt class="docutils literal"><span class="pre">email</span></tt> and <tt class="docutils literal"><span class="pre">displayname</span></tt>. In the case of Active
+Directory, multiple attributes can be used as the <tt class="docutils literal"><span class="pre">uid</span></tt>. But they all have
+different implications to take into account.</p>
+<div class="section" id="attributes">
+<h3>Attributes<a class="headerlink" href="#attributes" title="Permalink to this headline">¶</a></h3>
+<p><strong>sAMAccountName</strong></p>
+<ul class="simple">
+<li><em>Example:</em> jfd</li>
+<li><em>Uniqueness:</em> Domain local, might change e.g. marriage</li>
+<li><em>Other implications:</em> Works with <tt class="docutils literal"><span class="pre">windows_network_drive</span></tt> app</li>
+</ul>
+<p><strong>userPrincipalName</strong></p>
+<ul class="simple">
+<li><em>Example:</em> <a class="reference external" href="mailto:jfd%40owncloud.com">jfd<span>@</span>owncloud<span>.</span>com</a></li>
+<li><em>Uniqueness:</em> Forest local, might change on eg. marriage</li>
+<li><em>Other implications:</em> TODO check WND compatability</li>
+</ul>
+<p><strong>objectSid</strong></p>
+<ul class="simple">
+<li><em>Example:</em> S-1-5-21-2611707862-2219215769-354220275-1137</li>
+<li><em>Uniqueness:</em> Domain local, changes when the user is moved to a new domain</li>
+<li><em>Other implications:</em> Incompatible with <tt class="docutils literal"><span class="pre">windows_network_drive</span></tt> app</li>
+</ul>
+<p><strong>sIDHistory</strong></p>
+<ul class="simple">
+<li><em>Example:</em> Multi-value</li>
+<li><em>Uniqueness:</em> Contains previous objectSIDs</li>
+<li><em>Other implications:</em> Incompatible with <tt class="docutils literal"><span class="pre">windows_network_drive</span></tt> app</li>
+</ul>
+<p><strong>objectGUID</strong></p>
+<ul class="simple">
+<li><em>Example:</em> 47AB881D-0655-414D-982F-02998C905A28</li>
+<li><em>Uniqueness:</em> Globally unique</li>
+<li><em>Other implications:</em> Incompatible with <tt class="docutils literal"><span class="pre">windows_network_drive</span></tt> app</li>
+</ul>
+<p>Keep in mind that ownCloud will derive the home folder from the <tt class="docutils literal"><span class="pre">uid</span></tt>, unless
+a home folder naming rule is in place. The only truly stable attribute is the
+<tt class="docutils literal"><span class="pre">objectGUID</span></tt>, so that should be used. If not for the <tt class="docutils literal"><span class="pre">uid</span></tt> then at least as
+the home folder naming rule. The tradeoff here is that if you want to use
+<tt class="docutils literal"><span class="pre">windows_network_drive</span></tt> you are bound to the <tt class="docutils literal"><span class="pre">sAMAccountName</span></tt>, as that is
+used as the login.</p>
+<p>Also be aware that using <tt class="docutils literal"><span class="pre">user_shibboleth</span></tt> in Autoprovisioning mode will not
+allow you to use SSO for your <tt class="docutils literal"><span class="pre">user_ldap</span></tt> users, because <tt class="docutils literal"><span class="pre">uid</span></tt> collisions
+will be detected by <tt class="docutils literal"><span class="pre">user_ldap</span></tt>.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/nginx_configuration.html
index e8869b5,0000000..fa2ac52
mode 100644,000000..100644
--- a/core/doc/admin/installation/nginx_configuration.html
+++ b/core/doc/admin/installation/nginx_configuration.html
@@@ -1,339 -1,0 +1,343 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Nginx Configuration — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Univention Corporate Server" href="ucs_installation.html" />
+ <link rel="prev" title="SELinux Configuration" href="selinux_configuration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="system_requirements.html">System Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="linux_installation.html">Preferred Linux Installation Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_wizard.html">Installation Wizard</a></li>
+<li class="toctree-l2"><a class="reference internal" href="command_line_installation.html">Installing ownCloud From the Command Line</a></li>
+<li class="toctree-l2"><a class="reference internal" href="apps_management_installation.html">Installing and Managing Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="source_installation.html">Manual Installation on Linux</a></li>
+<li class="toctree-l2"><a class="reference internal" href="appliance_installation.html">ownCloud Community Appliance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="php_54_installation.html">Installing PHP 5.4 on RHEL 6 and CentOS 6</a></li>
+<li class="toctree-l2"><a class="reference internal" href="selinux_configuration.html">SELinux Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Nginx Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#suppressing-log-messages">Suppressing Log Messages</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#javascript-js-or-css-css-files-not-served-properly">JavaScript (.js) or CSS (.css) files not served properly</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="ucs_installation.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="hiawatha_configuration.html">Hiawatha Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yaws_configuration.html">Yaws Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="macos_installation.html">Mac OS X</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_server/index.html">ownCloud Server Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="nginx-configuration">
+<span id="nginx-configuration-example"></span><h1>Nginx Configuration<a class="headerlink" href="#nginx-configuration" title="Permalink to this headline">¶</a></h1>
+<ul class="simple">
+<li>You need to insert the following code into <strong>your nginx config file.</strong></li>
+<li>The config assumes that ownCloud is installed in /var/www/owncloud and
+that it is accessed via http(s)://cloud.example.com.</li>
+<li>Adjust <strong>server_name</strong>, <strong>root</strong>, <strong>ssl_certificate</strong> and
+<strong>ssl_certificate_key</strong> to suit your needs.</li>
+<li>Make sure your SSL certificates are readable by the server (see <a class="reference external" href="http://wiki.nginx.org/HttpSslModule">Nginx HTTP
+SSL Module documentation</a>).</li>
++<li><tt class="docutils literal"><span class="pre">add_header</span></tt> statements are only taken from the current level and are not cascaded
++from or to a different level. All necessary <tt class="docutils literal"><span class="pre">add_header</span></tt> statements must be defined
++in each level needed. For better readability is is possible to move <em>common</em> add
++header statements into a separate file and include that file wherever necessary.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The following example assumes that your ownCloud is installed in
+your webroot. If you’re using a subfolder you need to adjust the configuration
+accordingly.</p>
+</div>
+<div class="highlight-python"><pre>upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
+}
+
+server {
+ listen 80;
+ server_name cloud.example.com;
+ # enforce https
+ return 301 https://$server_name$request_uri;
+}
+
+server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Add headers to serve security related headers
+ add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
+ add_header X-Content-Type-Options nosniff;
+ add_header X-Frame-Options "SAMEORIGIN";
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+
+ # Path to the root of your installation
+ root /var/www/owncloud/;
+ # set max upload size
+ client_max_body_size 10G;
+ fastcgi_buffers 64 4K;
+
+ # Disable gzip to avoid the removal of the ETag header
+ gzip off;
+
+ # Uncomment if your server is build with the ngx_pagespeed module
+ # This module is currently not supported.
+ #pagespeed off;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+ location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
+ deny all;
+ }
+
+ location / {
+ # The following 2 rules are only needed with webfinger
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+
+ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
+ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
+
+ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
+ try_files $uri $uri/ /index.php;
+ }
+
+ location ~ \.php(?:$|/) {
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param HTTPS on;
+ fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
+ fastcgi_pass php-handler;
+ fastcgi_intercept_errors on;
+ }
+
+ # Adding the cache control header for js and css files
+ # Make sure it is BELOW the location ~ \.php(?:$|/) { block
+ location ~* \.(?:css|js)$ {
+ add_header Cache-Control "public, max-age=7200";
+ # Add headers to serve security related headers
+ add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
+ add_header X-Content-Type-Options nosniff;
+ add_header X-Frame-Options "SAMEORIGIN";
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+ # Optional: Don't log access to assets
+ access_log off;
+ }
+
+ # Optional: Don't log access to other assets
+ location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|swf)$ {
+ access_log off;
+ }
+}</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
+use SSL/TLS to encrypt all of your server traffic, and to protect
+user’s logins and data in transit.</p>
+</div>
+<ul class="simple">
+<li>Remove the server block containing the redirect</li>
+<li>Change <strong>listen 443 ssl</strong> to <strong>listen 80;</strong></li>
+<li>Remove <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong>.</li>
+<li>Remove <strong>fastcgi_params HTTPS on;</strong></li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are using php-fpm please read <a class="reference internal" href="source_installation.html#using-php-fpm"><em>Configuration notes to php-fpm</em></a></p>
+</div>
+<div class="section" id="suppressing-log-messages">
+<h2>Suppressing Log Messages<a class="headerlink" href="#suppressing-log-messages" title="Permalink to this headline">¶</a></h2>
+<p>If you’re seeing meaningless messages in your logfile, for example <a class="reference external" href="https://forum.owncloud.org/viewtopic.php?f=17&t=20217">client
+denied by server configuration: /var/www/data/htaccesstest.txt</a>, add this section to
+your Nginx configuration to suppress them:</p>
+<div class="highlight-python"><pre>location = /data/htaccesstest.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+}</pre>
+</div>
+</div>
+<div class="section" id="javascript-js-or-css-css-files-not-served-properly">
+<h2>JavaScript (.js) or CSS (.css) files not served properly<a class="headerlink" href="#javascript-js-or-css-css-files-not-served-properly" title="Permalink to this headline">¶</a></h2>
+<p>A common issue with custom nginx configs is that JavaScript (.js)
+or CSS (.css) files are not served properly leading to a 404 (File not found)
+error on those files and a broken webinterface.</p>
+<p>This could be caused by the:</p>
+<div class="highlight-python"><pre>location ~* \.(?:css|js)$ {</pre>
+</div>
+<p>block shown above not located <strong>below</strong> the:</p>
+<div class="highlight-python"><pre>location ~ \.php(?:$|/) {</pre>
+</div>
+<p>block. Other custom configurations like caching JavaScript (.js)
+or CSS (.css) files via gzip could also cause such issues.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/restore.html
index 3fd7698,0000000..b1e3c20
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/restore.html
+++ b/core/doc/admin/maintenance/restore.html
@@@ -1,221 -1,0 +1,227 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Restoring ownCloud — ownCloud Server Administration Manual 8.2 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '8.2',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Server Administration Manual 8.2 documentation" href="../index.html" />
+ <link rel="up" title="Maintenance" href="index.html" />
+ <link rel="next" title="Migrating to a Different Server" href="migrating.html" />
+ <link rel="prev" title="Upgrading ownCloud with the Updater App" href="update.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Server Administration Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+
+<li><a href="../contents.html">Table of Contents</a></li>
+ </ul>
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 8.2 Server Administration Manual Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../release_notes.html">ownCloud 8.2 Release Notes</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../whats_new_admin.html">What’s New for Admins in ownCloud 8.2</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_server/index.html">ownCloud Server Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_user/index.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_files/index.html">File Sharing and Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_database/index.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration_mimetypes/index.html">Mimetypes Management</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="enable_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="upgrade.html">Upgrading Your ownCloud Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="update.html">Upgrading ownCloud with the Updater App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating to a Different Server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../operations/index.html">Operations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues and Troubleshooting</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_installation/index.html">Enterprise Subscription Installation (ES Only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_clients/index.html">Creating Branded ownCloud Clients (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_server_branding/index.html">Enterprise Server Branding (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_external_storage/index.html">External Storage (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_user_management/index.html">User Management (ES only)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../enterprise_files_drop/index.html">Enabling Anonymous Uploads with Files Drop (ES Only)</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="restoring-owncloud">
+<h1>Restoring ownCloud<a class="headerlink" href="#restoring-owncloud" title="Permalink to this headline">¶</a></h1>
+<p>To restore an ownCloud installation there are three main things you need to
+restore:</p>
+<ol class="arabic simple">
- <li>The config folder</li>
- <li>The data folder</li>
++<li>The configuration directory</li>
++<li>The data directory</li>
+<li>The database</li>
+</ol>
++<div class="admonition note">
++<p class="first admonition-title">Note</p>
++<p class="last">You must have both the database and data directory. You cannot
++complete restoration unless you have both of these.</p>
++</div>
+<p>When you have completed your restoration, see the <tt class="docutils literal"><span class="pre">Setting</span> <span class="pre">Strong</span> <span class="pre">Directory</span>
+<span class="pre">Permissions</span></tt> section of <a class="reference internal" href="../installation/installation_wizard.html"><em>Installation Wizard</em></a>.</p>
+<div class="section" id="restore-folders">
+<h2>Restore Folders<a class="headerlink" href="#restore-folders" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This guide assumes that your previous backup is called
- owncloud-dirbkp”</p>
++“owncloud-dirbkp”</p>
+</div>
- <p>Simply copy your config and data folder (or even your whole ownCloud install and
++<p>Simply copy your configuration and data folder (or even your whole ownCloud
++install and
+data folder) to your ownCloud environment. You could use this command:</p>
+<div class="highlight-python"><pre>rsync -Aax owncloud-dirbkp/ owncloud/</pre>
+</div>
+</div>
+<div class="section" id="restore-database">
+<h2>Restore Database<a class="headerlink" href="#restore-database" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This guide assumes that your previous backup is called
+“owncloud-sqlbkp.bak”</p>
+</div>
+<div class="section" id="mysql">
+<h3>MySQL<a class="headerlink" href="#mysql" title="Permalink to this headline">¶</a></h3>
+<p>MySQL is the recommended database engine. To restore MySQL:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">h</span> <span class="p">[</span><span class="n">server</span><span class="p">]</span> <span class="o">-</span><span class="n">u</span> <span class="p">[</span><span class="n">username</span><span class="p">]</span> <span class="o">-</span><span class="n">p</span><span class="p">[</span><span class="n">password</span><span class="p">]</span> <span class="p">[</s [...]
+</pre></div>
+</div>
+</div>
+<div class="section" id="sqlite">
+<h3>SQLite<a class="headerlink" href="#sqlite" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>rm data/owncloud.db
+sqlite3 data/owncloud.db < owncloud-sqlbkp.bak</pre>
+</div>
+</div>
+<div class="section" id="postgresql">
+<h3>PostgreSQL<a class="headerlink" href="#postgresql" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username]
+owncloud-sqlbkp.bak</pre>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index d567277,390d177..34c21dc
--- a/version.php
+++ b/version.php
@@@ -1,7 -1,40 +1,7 @@@
-<?php
-/**
- * @author C Montero-Luque <cml at owncloud.com>
- * @author Frank Karlitschek <frank at owncloud.org>
- * @author Lukas Reschke <lukas at owncloud.com>
- * @author Roeland Jago Douma <roeland at famdouma.nl>
- * @author Vincent Petry <pvince81 at owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
-// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
-// when updating major/minor version number.
-$OC_Version = array(8, 2, 1, 1);
-
-// The human readable string
+<?php
- $OC_Version = array(8,2,1,0);
- $OC_VersionString = '8.2.1 RC1';
++$OC_Version = array(8,2,1,1);
+ $OC_VersionString = '8.2.1 RC2';
-
-$OC_VersionCanBeUpgradedFrom = array(8, 1);
-
-// The ownCloud channel
-$OC_Channel = 'git';
-
-// The build number
-$OC_Build = '';
-
+$OC_Edition = '';
+$OC_Channel = 'testing';
+$OC_VersionCanBeUpgradedFrom = array(8,1);
- $OC_Build = '2015-11-03T23:04:14+00:00 af1077637deb814dc9f82a9c35117225247b9757';
++$OC_Build = '2015-11-10T22:08:29+00:00 d7aadcb5dfa3649285f5efdca6843c0c1aa910bf';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list