[Pkg-owncloud-commits] [owncloud-doc] 12/71: Merge pull request #651 from owncloud/alphabeta

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 6c111c75dd4f443cdc162b647f347637e1ef34ec
Merge: 8b131b5 7bd4fb8
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Nov 17 19:33:31 2014 -0800

    Merge pull request #651 from owncloud/alphabeta
    
    reorganize and clean up CE admin manual

 ...n-antivirus.rst => antivirus_configuration.rst} |   0
 ..._automation.rst => automatic_configuration.rst} |  21 +++--
 ..._jobs.rst => background_jobs_configuration.rst} |   0
 ...pload.rst => big_file_upload_configuration.rst} |   2 +-
 ...t => collaborative_documents_configuration.rst} |   0
 ...le_php.rst => config_sample_php_parameters.rst} |   0
 ...clients.rst => custom_client_configuration.rst} |   0
 ...ion_database.rst => database_configuration.rst} |   0
 ...figuration_mail.rst => email_configuration.rst} |   4 +-
 ...nfig.rst => external_storage_configuration.rst} |   2 +-
 ....rst => external_storage_configuration_gui.rst} |   2 +-
 ..._sharing.rst => file_sharing_configuration.rst} |   0
 ...iles_locking.rst => files_locking_enabling.rst} |   4 +-
 admin_manual/configuration/index.rst               |  54 +++++------
 ...t => js_css_asset_management_configuration.rst} |   4 +-
 ...dgebase.rst => knowledgebase_configuration.rst} |   0
 ...ion_language.rst => language_configuration.rst} |   0
 ...ation_logging.rst => logging_configuration.rst} |   0
 ...tion_preview.rst => previews_configuration.rst} |   4 +-
 ...seproxy.rst => reverse_proxy_configuration.rst} |   0
 ...iguring_search.rst => search_configuration.rst} |   0
 ...st => server_side_encryption_configuration.rst} |   4 +-
 ...ging.rst => server_to_server_configuration.rst} |   0
 ....rst => serving_static_files_configuration.rst} |   5 +-
 ...dparty.rst => thirdparty_php_configuration.rst} |   4 +-
 ...user_backend.rst => user_auth_ftp_smb_imap.rst} |   8 +-
 .../{auth_ldap.rst => user_auth_ldap.rst}          |   0
 ...figuration_users.rst => user_configuration.rst} |   2 +-
 admin_manual/contents.rst                          |   5 -
 admin_manual/index.rst                             | 105 ++++++++++++---------
 ...on_appliance.rst => appliance_installation.rst} |   4 +-
 .../apps_management_installation.rst}              |   0
 ...ion_hiawatha.rst => hiawatha_configuration.rst} |   0
 admin_manual/installation/index.rst                |  23 ++---
 admin_manual/installation/installation_wizard.rst  |   2 +-
 ...ion_lighttpd.rst => lighttpd_configuration.rst} |   0
 ...stallation_linux.rst => linux_installation.rst} |   2 +-
 ...stallation_macos.rst => macos_installation.rst} |   0
 ...iguration_nginx.rst => nginx_configuration.rst} |   0
 ...allation_others.rst => others_installation.rst} |   0
 ...allation_source.rst => source_installation.rst} |  14 +--
 .../{installation_ucs.rst => ucs_installation.rst} |   0
 ...lation_windows.rst => windows_installation.rst} |   2 +-
 ...nfiguration_yaws.rst => yaws_configuration.rst} |   0
 admin_manual/issues/index.rst                      |   4 +-
 admin_manual/maintenance/upgrade.rst               |   2 +-
 46 files changed, 151 insertions(+), 132 deletions(-)

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