[Pkg-owncloud-commits] [owncloud-doc] 69/110: Merge pull request #754 from owncloud/occ

[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 d9515983641494609d67dbf9f170d8023af23019
Merge: baf03cd 7ced273
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Jan 13 19:43:25 2015 -0800

    Merge pull request #754 from owncloud/occ
    
    New manual page documenting occ commands-- stable7 only. Master will get its own unique occ page.

 admin_manual/configuration/index.rst               |   1 +
 admin_manual/configuration/occ_command.rst         | 262 +++++++++++++++++++++
 .../configuration/reset_admin_password.rst         |   2 +-
 admin_manual/maintenance/convert_db.rst            |  58 +++--
 admin_manual/maintenance/enable_maintenance.rst    |  24 +-
 admin_manual/maintenance/update.rst                |  16 +-
 admin_manual/maintenance/upgrade.rst               |  38 ++-
 7 files changed, 352 insertions(+), 49 deletions(-)

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