diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index 5fd118fbc..7c2bd21ec 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -5,17 +5,15 @@ ownCloud documentation contents =============================== .. toctree:: - - index .. toctree:: - :maxdepth: 3 + :maxdepth: 2 - videos release_notes whats_new_admin installation/index configuration/index maintenance/index issues/index + videos/index diff --git a/admin_manual/index.rst b/admin_manual/index.rst index 3018d76a4..d5293affc 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -25,9 +25,9 @@ user interface or how to install clients on the server, refer to the following: ownCloud Videos --------------- -See :doc:`videos` +See :doc:`videos/index` for howtos, demos, news, and Webinars for both the -Community and Enterprise versions of ownCloud. +Server and Enterprise versions of ownCloud. Document Structure ------------------ @@ -58,8 +58,7 @@ different scenarios. It contains the following topics: * :doc:`installation/selinux_configuration` .. note:: If you just want to try out ownCloud in a virtual machine, without any - configuration, refer to :doc:`installation/appliance_installation`. For your - convenience, this topic contains ready-to-use images. + configuration, refer to :doc:`installation/appliance_installation`. Configuration ============= diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 5195b930b..1e9c68775 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -92,9 +92,9 @@ on your ownCloud server. .. https://github.com/owncloud/core/issues/10657 -================= -Enterprise 8 Only -================= + +**-- Enterprise 8 Only --** +--------------------------- Direct Uploads to SWIFT do not Appear in ownCloud ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -121,10 +121,8 @@ App Store is Back The ownCloud App Store has been re-enabled in oC 8. Note that third-party apps are not supported. -======================== -ownCloud 7 Release Notes -======================== - +**-- ownCloud 7 Release Notes --** +---------------------------------- LDAP Search Performance Improved ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -220,9 +218,8 @@ Setting a user's storage quota should be the equivalent of read-only, however, users can still create empty files. -================= -Enterprise 7 Only -================= +**-- Enterprise 7 Only --** +--------------------------- Windows Network Drive ^^^^^^^^^^^^^^^^^^^^^ diff --git a/admin_manual/images/build-a-cloud-of-servers-320.png b/admin_manual/videos/build-a-cloud-of-servers-320.png similarity index 100% rename from admin_manual/images/build-a-cloud-of-servers-320.png rename to admin_manual/videos/build-a-cloud-of-servers-320.png diff --git a/admin_manual/videos.rst b/admin_manual/videos/index.rst similarity index 80% rename from admin_manual/videos.rst rename to admin_manual/videos/index.rst index 5a08dd5bc..19843ba24 100644 --- a/admin_manual/videos.rst +++ b/admin_manual/videos/index.rst @@ -2,10 +2,9 @@ ownCloud Videos =============== -Please visit our `YouTube channel -`_ -for howtos, demos, news, and Webinars for both the -Community and Enterprise versions of ownCloud. +Please visit our `YouTube channel +`_ for howtos, demos, news, and +Webinars for both the Server and Enterprise versions of ownCloud. Server to Server Sharing on ownCloud 7 -------------------------------------- @@ -13,8 +12,8 @@ Server to Server Sharing on ownCloud 7 `Build a Cloud of ownCloud Servers with Server to Server Sharing `_ -.. .. figure:: images/build-a-cloud-of-servers-320.png -.. :target: https://www.youtube.com/watch?v=h09ppkkYDNk +.. figure:: build-a-cloud-of-servers-320.png +.. :target: https://www.youtube.com/watch?v=h09ppkkYDNk Create your own cloud of ownCloud servers with server-to-server sharing. Link specific shares to other ownCloud servers and have two-way synchronization. @@ -25,7 +24,7 @@ Introducing ownCloud 7 Enterprise Edition `ownCloud 7 Enterprise Edition Enterprise File Sync and Share Software `_ -.. figure:: images/oc-video-2.png +.. figure:: oc-video-2.png :target: https://www.youtube.com/watch?v=SBn_8uVibLc ownCloud 7 Enterprise Edition introduces Universal File Access, which provides @@ -39,7 +38,7 @@ ownCloud for Enterprise File Sync and Share `ownCloud for Enterprise File Sync and Share `_ -.. figure:: images/oc-video-1.png +.. figure:: oc-video-1.png :target: https://www.youtube.com/watch?v=2HTQcf1zccU ownCloud is an enterprise-grade file sync and share solution that is hosted in your data diff --git a/admin_manual/images/oc-video-1.png b/admin_manual/videos/oc-video-1.png similarity index 100% rename from admin_manual/images/oc-video-1.png rename to admin_manual/videos/oc-video-1.png diff --git a/admin_manual/images/oc-video-2.png b/admin_manual/videos/oc-video-2.png similarity index 100% rename from admin_manual/images/oc-video-2.png rename to admin_manual/videos/oc-video-2.png diff --git a/index/index.rst b/index/index.rst index 4eea74651..d7c7c8854 100644 --- a/index/index.rst +++ b/index/index.rst @@ -2,6 +2,14 @@ Documentation Overview ====================== +--------------- +ownCloud Videos +--------------- + +`Howtos, demos, news, and Webinars +`_ for both the +Server and Enterprise versions of ownCloud. + -------------------- ownCloud Server 8.0 -------------------- @@ -30,10 +38,24 @@ This documents the *previous* ownCloud release, suitable for production use. ownCloud Server 6.0 ------------------- -This documents the *deprecated* ownCloud release. +This documents the *older* ownCloud release. ownCloud 6 receives security +fixes, and users are encouraged to upgrade to the latest production release. * `User Manual `_ (`Download PDF `_) -* `Administrator Manual `_ (`Download PDF `_) +* `Administrator Manual `_ +(`Download PDF `_) + +------------------- +ownCloud Server 5.0 +------------------- + +This documents the *deprecated* ownCloud release. Users are encouraged to +upgrade to the latest production release. + +* `User Manual `_ (`Download +PDF `_) +* `Administrator Manual `_ +(`Download PDF `_) --------------------------- ownCloud Desktop Client 1.8