[Pkg-owncloud-commits] [owncloud-doc] 08/14: Merge pull request #368 from RandolfCarter/stable6_installwizard_db

[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 0acd0a99791ba1d7928828e16f979ded72b54c7a
Merge: e48452d 03e20a8
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Jun 2 21:31:57 2014 +0200

    Merge pull request #368 from RandolfCarter/stable6_installwizard_db
    
    Installation wizard / database hint consolidation & fixes

 .../configuration/configuration_database.rst       |  98 ++++++++++++-----
 .../images/install-wizard-advanced.png             | Bin 0 -> 107639 bytes
 .../installation/images/install-wizard.png         | Bin 0 -> 86115 bytes
 admin_manual/installation/index.rst                |   3 +-
 admin_manual/installation/installation_linux.rst   |   3 +-
 admin_manual/installation/installation_source.rst  | 108 ++++---------------
 admin_manual/installation/installation_windows.rst |  21 ++--
 admin_manual/installation/installation_wizard.rst  | 119 +++++++++++++++++++++
 8 files changed, 217 insertions(+), 135 deletions(-)

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