[Pkg-owncloud-commits] [owncloud-doc] 79/110: Merge pull request #766 from owncloud/ios

[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 68a0c8808cd1c6d0f046b7511360c66ab67b6338
Merge: 074c9c9 6063c5d
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Jan 19 09:49:37 2015 -0800

    Merge pull request #766 from owncloud/ios
    
    Create new iOS manual page

 user_manual/contents.rst              |   1 +
 user_manual/images/ios-app.png        | Bin 0 -> 61504 bytes
 user_manual/images/ios-betsyross.png  | Bin 0 -> 196238 bytes
 user_manual/images/ios-downloaded.png | Bin 0 -> 76589 bytes
 user_manual/images/ios-files.png      | Bin 0 -> 47798 bytes
 user_manual/images/ios-settings.png   | Bin 0 -> 45296 bytes
 user_manual/images/ios-slider.png     | Bin 0 -> 43761 bytes
 user_manual/index.rst                 |  10 ++--
 user_manual/ios/ios_app.rst           |  93 ++++++++++++++++++++++++++++++++++
 9 files changed, 100 insertions(+), 4 deletions(-)

diff --cc user_manual/index.rst
index 9f3adab,97b186e..c3f2996
--- a/user_manual/index.rst
+++ b/user_manual/index.rst
@@@ -27,19 -27,15 +27,21 @@@ provides the ability to put the right f
  time on any device with one simple-to-use, secure, private and controlled
  solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
  
- Web Interface
- =============
- The following topic contains a general overview how to access ownCloud from a
- web browser like Firefox, Chrome, or Internet Explorer:
+ Web Interface and Mobile Apps
+ =============================
+ How to access ownCloud from a web browser and from the ownCloud Android and iOS 
+ apps.
  
  * :doc:`webinterface`
+ * :doc:`android/android_app`
+ * :doc:`ios/ios_app`
  
 +Mobile Apps
 +===========
 +How to access ownCloud from a Android device.
 +
 +* :doc:`android/android_app`
 +
  File Access and Management
  ==========================
  The following topics contain information about file access and management.

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