[Pkg-owncloud-commits] [owncloud-doc] 56/95: Fix imported chapters, improve headings
David Prévot
taffit at moszumanska.debian.org
Fri Apr 18 21:41:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 7198a344ddd78dbc9fe2edeec7459bdb1216c119
Author: Daniel Molkentin <daniel at molkentin.de>
Date: Mon Mar 10 22:06:35 2014 +0100
Fix imported chapters, improve headings
---
admin_manual/apps/admin_dependencies_chk/index.rst | 6 +-
admin_manual/apps/files_antivirus/index.rst | 6 +-
admin_manual/apps/viewers/index.rst | 6 +-
admin_manual/configuration/auth_ldap.rst | 4 +-
.../configuration/configuration_3rdparty.rst | 4 +-
admin_manual/configuration/configuration_apps.rst | 5 +-
.../configuration/configuration_custom_clients.rst | 4 +-
.../configuration/configuration_database.rst | 4 +-
.../configuration/configuration_encryption.rst | 4 +-
.../configuration/configuration_knowledgebase.rst | 10 +-
.../configuration/configuration_language.rst | 4 +-
.../configuration/configuration_logging.rst | 5 +-
admin_manual/configuration/configuration_mail.rst | 5 +-
.../configuration/configuration_maintenance.rst | 7 +-
.../configuration/configuration_preview.rst | 8 +-
.../configuration/configuring_big_file_upload.rst | 24 +++--
admin_manual/cron/Introduction.rst | 5 -
admin_manual/cron/Usage.rst | 24 -----
admin_manual/cron/index.rst | 40 ++++++-
admin_manual/quota/Checking_available_space.rst | 22 ----
admin_manual/quota/Excluded_from_quota.rst | 40 -------
admin_manual/quota/Introduction.rst | 21 ----
admin_manual/quota/Sharing.rst | 26 -----
admin_manual/quota/Table_of_Contents.rst | 4 -
admin_manual/quota/index.rst | 119 +++++++++++++++++++--
admin_manual/sharing_api/Contents.rst | 4 -
admin_manual/sharing_api/Introduction.rst | 48 ---------
...eate_a_new_Share.rst => create_a_new_share.rst} | 1 -
.../{Delete_Share.rst => delete_share.rst} | 1 -
.../{Get_All_Shares.rst => get_all_shares.rst} | 1 -
...rst => get_information_about_a_known_share.rst} | 1 -
... get_shares_from_a_specific_file_or_folder.rst} | 1 -
admin_manual/sharing_api/index.rst | 67 ++++++++++--
33 files changed, 259 insertions(+), 272 deletions(-)
diff --git a/admin_manual/apps/admin_dependencies_chk/index.rst b/admin_manual/apps/admin_dependencies_chk/index.rst
index 8b778fd..0233927 100644
--- a/admin_manual/apps/admin_dependencies_chk/index.rst
+++ b/admin_manual/apps/admin_dependencies_chk/index.rst
@@ -1,6 +1,6 @@
-==========================
-ownCloud dependencies info
-==========================
+===============================
+Finding Deployment Dependencies
+===============================
The ownCloud Dependencies App provides a list of modules required to run the current setup of ownCloud.
All of the modules listed should be installed on the base operating system prior to using ownCloud.
diff --git a/admin_manual/apps/files_antivirus/index.rst b/admin_manual/apps/files_antivirus/index.rst
index 673caf2..3f533a6 100644
--- a/admin_manual/apps/files_antivirus/index.rst
+++ b/admin_manual/apps/files_antivirus/index.rst
@@ -1,6 +1,6 @@
-=======================
-Antivirus App for files
-=======================
+=====================
+File Antivirus Engine
+=====================
ownCloud integrates with ClamAV, an open source (GPL) antivirus engine, to provide an antivirus solution for files which are uploaded to the ownCloud server.
Via this method, ownCloud/ClamAV can detect Trojans, viruses, malware and other malicious threats.
diff --git a/admin_manual/apps/viewers/index.rst b/admin_manual/apps/viewers/index.rst
index fb78fff..e19c3cd 100644
--- a/admin_manual/apps/viewers/index.rst
+++ b/admin_manual/apps/viewers/index.rst
@@ -1,6 +1,6 @@
-=======
-Viewers
-=======
+============
+File Viewers
+============
ownCloud provides apps which allow users to view/edit
text files and view images which exist on the ownCloud server.
diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst
index d4c54e7..06af732 100644
--- a/admin_manual/configuration/auth_ldap.rst
+++ b/admin_manual/configuration/auth_ldap.rst
@@ -1,5 +1,5 @@
-User Authentication with LDAP
-=============================
+LDAP Authentication
+===================
ownCloud ships an LDAP backend, which allows full use of ownCloud for user
logging in with LDAP credentials including:
diff --git a/admin_manual/configuration/configuration_3rdparty.rst b/admin_manual/configuration/configuration_3rdparty.rst
index a2bceac..b7dc68b 100644
--- a/admin_manual/configuration/configuration_3rdparty.rst
+++ b/admin_manual/configuration/configuration_3rdparty.rst
@@ -1,5 +1,5 @@
-3rd-Party Configuration
-=======================
+Find Third-Party Libraries
+==========================
ownCloud resorts to some 3rd-party PHP components to provide its functionality.
These components are part of the software package and are usually shipped in
diff --git a/admin_manual/configuration/configuration_apps.rst b/admin_manual/configuration/configuration_apps.rst
index 09c1649..3383938 100644
--- a/admin_manual/configuration/configuration_apps.rst
+++ b/admin_manual/configuration/configuration_apps.rst
@@ -1,5 +1,6 @@
-Apps Configuration
-==================
+Managing Apps
+=============
+
After you have installed ownCloud, you might realize that it would be nice to
provide an additional function on top of the core functionality in your ownCloud installation.
diff --git a/admin_manual/configuration/configuration_custom_clients.rst b/admin_manual/configuration/configuration_custom_clients.rst
index 88df77e..f2390fe 100644
--- a/admin_manual/configuration/configuration_custom_clients.rst
+++ b/admin_manual/configuration/configuration_custom_clients.rst
@@ -1,5 +1,5 @@
-Custom Client Configuration
-===========================
+Customizing Client Download Links
+=================================
If you want to access your ownCloud, you can choose between the standard Web-GUI
and different client sync applications. Download links which point to these
diff --git a/admin_manual/configuration/configuration_database.rst b/admin_manual/configuration/configuration_database.rst
index 3e4c247..ad42756 100644
--- a/admin_manual/configuration/configuration_database.rst
+++ b/admin_manual/configuration/configuration_database.rst
@@ -1,5 +1,5 @@
-Database Configuration
-======================
+MySQL/Postgres/SQLite Support
+=============================
ownCloud requires a database where administrative data will be held. Four different database types are currently
supported, `MySQL <http://www.mysql.com/>`_, `MariaDB <https://mariadb.org/>`_, `SQLite <http://www.sqlite.org/>`_,
diff --git a/admin_manual/configuration/configuration_encryption.rst b/admin_manual/configuration/configuration_encryption.rst
index 754dcce..7ea3fcf 100644
--- a/admin_manual/configuration/configuration_encryption.rst
+++ b/admin_manual/configuration/configuration_encryption.rst
@@ -1,5 +1,5 @@
-Use Server-Side Encryption
-==========================
+Using Server-Side Encryption
+============================
ownCloud ships a encryption app, which allows to encrypt all files stored in
your ownCloud. Encryption and decryption always happens server-side. This
diff --git a/admin_manual/configuration/configuration_knowledgebase.rst b/admin_manual/configuration/configuration_knowledgebase.rst
index 420cc15..9ae6d97 100644
--- a/admin_manual/configuration/configuration_knowledgebase.rst
+++ b/admin_manual/configuration/configuration_knowledgebase.rst
@@ -1,8 +1,10 @@
-Knowledge Base Configuration
-============================
+Disable Knowledge Base
+======================
+
The usage of ownCloud is more or less self explaining but nevertheless a user
-might run into a problem where he needs to consult the documentation or knowledge base. To ease access to the ownCloud
-documentation and knowledge base, a help menu item is shown in the settings menu by default.
+might run into a problem where he needs to consult the documentation or
+knowledge base. To ease access to the ownCloud documentation and knowledge
+base, a help menu item is shown in the settings menu by default.
Parameters
----------
diff --git a/admin_manual/configuration/configuration_language.rst b/admin_manual/configuration/configuration_language.rst
index 386d7d8..0329141 100644
--- a/admin_manual/configuration/configuration_language.rst
+++ b/admin_manual/configuration/configuration_language.rst
@@ -1,5 +1,5 @@
-Language Configuration
-======================
+Setting the Default Language
+============================
In normal cases ownCloud will automatically detect the language of the Web-GUI.
If this doesn't work properly or you want to make sure that ownCloud always
diff --git a/admin_manual/configuration/configuration_logging.rst b/admin_manual/configuration/configuration_logging.rst
index effe2e0..004b73a 100644
--- a/admin_manual/configuration/configuration_logging.rst
+++ b/admin_manual/configuration/configuration_logging.rst
@@ -1,5 +1,6 @@
-Logging Configuration
-=====================
+Configure Logging
+=================
+
To get an idea of how the current status of an ownCloud system is or to
solve issues log information is a good point to start with. ownCloud allows
to configure the way how and which depth of information should be logged.
diff --git a/admin_manual/configuration/configuration_mail.rst b/admin_manual/configuration/configuration_mail.rst
index 3ff6b62..3e7d444 100644
--- a/admin_manual/configuration/configuration_mail.rst
+++ b/admin_manual/configuration/configuration_mail.rst
@@ -1,5 +1,6 @@
-Mail Configuration
-==================
+Sending Mail Notifications
+==========================
+
ownCloud does not contain a full email program but contains some parameters to
allow to send e.g. password reset email to the users. This function relies on
the `PHPMailer library <http://sourceforge.net/projects/phpmailer/>`_. To
diff --git a/admin_manual/configuration/configuration_maintenance.rst b/admin_manual/configuration/configuration_maintenance.rst
index 7d4ff82..c5de3d1 100644
--- a/admin_manual/configuration/configuration_maintenance.rst
+++ b/admin_manual/configuration/configuration_maintenance.rst
@@ -1,14 +1,11 @@
-Maintenance Mode Configuration
-==============================
+Enable Maintenance Mode
+=======================
If you want to prevent users to login to ownCloud before you start doing
some maintenance work, you need to set the value of the **maintenance**
parameter to *true*. Please keep in mind that users who are already logged-in
are kicked out of ownCloud instantly.
-
-
-
Parameters
----------
diff --git a/admin_manual/configuration/configuration_preview.rst b/admin_manual/configuration/configuration_preview.rst
index b217109..2211fdd 100644
--- a/admin_manual/configuration/configuration_preview.rst
+++ b/admin_manual/configuration/configuration_preview.rst
@@ -1,8 +1,8 @@
-Preview Configuration
-=====================
+Enabling File Previews
+======================
+
ownCloud 6 introduced the new thumbnail system. It is used to generate
-thumbnails from various file types.
-By default, it can generate previews for:
+thumbnails from various file types. By default, it can generate previews for:
* Images
* Movies
diff --git a/admin_manual/configuration/configuring_big_file_upload.rst b/admin_manual/configuration/configuring_big_file_upload.rst
index 05e5d03..9c68670 100644
--- a/admin_manual/configuration/configuring_big_file_upload.rst
+++ b/admin_manual/configuration/configuring_big_file_upload.rst
@@ -1,6 +1,7 @@
-Uploading big files > 512MB (as set by default)
-===============================================
-It's usefull to know limiting factors, that make it impossible to exceed the values given by the ownCloud-system:
+Dealing with Big File Uploads
+=============================
+
+It's useful to know limiting factors, that make it impossible to exceed the values given by the ownCloud-system:
Not outnumberable upload limits:
--------------------------------
@@ -12,13 +13,14 @@ Not outnumberable upload limits:
Other recommendable preconditions:
----------------------------------
-* Make sure, that the latest version of php (at least 5.4.9) is installed
+* Make sure, that the latest version of POP (at least 5.4.9) is installed
* Disable user quota. This means: set the user quota of the account, you are currently logged in, to "unlimited".
This is important, because you possibly could not watch otherwise, whether the desired changes take effect.
Enabling uploading big files
-============================
-Note: The order of the following steps is important! If you swap steps described below, the settings may fail.
+----------------------------
+
+.. note:: The order of the following steps is important! If you swap steps described below, the settings may fail.
**Go to the admin section in the ownCloud-WebUI and do the following:**
@@ -27,15 +29,15 @@ Note: The order of the following steps is important! If you swap steps described
**Open the php.ini - file**
-* Under Debian or SUSE and their derivatives this file lies at /etc/php5/apache2/php.ini
-* On Windows, you can find this file within C:/Program Files (x86)/PHP/PHP.ini
+* Under Debian or SUSE and their derivatives this file resides at ``/etc/php5/apache2/php.ini``
+* On Windows, you can find this file within ``C:\Program Files (x86)\PHP\PHP.ini``
**Do the following:**
* Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:
-* upload_max_filesize = 16G (e.g., to stay consistent with the example value above)
-* post_max_size = 16G (e.g., to stay consistent with the example value above)
-* output_buffering = 16384 (e.g., to stay consistent with the example value above)
+* ``upload_max_filesize = 16G`` (e.g., to stay consistent with the example value above)
+* ``post_max_size = 16G`` (e.g., to stay consistent with the example value above)
+* ``output_buffering = 16384`` (e.g., to stay consistent with the example value above)
whereas the "output_buffering" has to be given in MegaBytes but as a plain figure (without size-units as 'M' or 'G')
diff --git a/admin_manual/cron/Introduction.rst b/admin_manual/cron/Introduction.rst
deleted file mode 100644
index 488ab08..0000000
--- a/admin_manual/cron/Introduction.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Introduction
-============
-
-ownCloud is written in PHP, and because PHP is a request driven language – in other words it runs only when a client takes an action and calls php, and then it executes and ends – it does not have a built in CRON process. Instead, ownCloud provides Cron.php, which is called by the server’s CRON daemon. Cron.php is an ownCloud internal process that runs various background jobs on demand.
-It is called by the server cron, and can be set by the administrator. ownCloud plug-in applications register actions with cron.php automatically to take care of typical housekeeping operations, such as garbage collecting of temporary files or checking for newly updated files using filescan() for externally mounted file systems.
diff --git a/admin_manual/cron/Usage.rst b/admin_manual/cron/Usage.rst
deleted file mode 100644
index 446da99..0000000
--- a/admin_manual/cron/Usage.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-Usage
-=====
-
-The interval at which this script is executed, and thus the ownCloud registered actions, can depend on the size of the installation and the load of the system.
-Recommended intervals are 15 or 30 minutes.
-
-Cron.php needs to be called by the system’s cron daemon and run as the same user the web server runs as.
-
-As an example, on an ordinary Linux distribution, place the following in the webserver’s user’s crontab:
-
-\*/15
-*
-*
-*
-* /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1
-
-
-This will run cron.php every 15 minutes and suppress any warnings or output which may be generated.
-
-
-
-
-
-
diff --git a/admin_manual/cron/index.rst b/admin_manual/cron/index.rst
index 1472d8f..7c2a94e 100644
--- a/admin_manual/cron/index.rst
+++ b/admin_manual/cron/index.rst
@@ -1,7 +1,37 @@
-**ownCloud cron.php**
+========================
+Driving Events with Cron
+========================
-.. toctree::
- :maxdepth: 2
+Introduction
+============
- Introduction
- Usage
+ownCloud is written in PHP, and because PHP is a request driven language – in
+other words it runs only when a client takes an action and calls php, and then
+it executes and ends – it does not have a built in CRON process. Instead,
+ownCloud provides ``cron.php``, which is called by the server’s CRON daemon.
+``cron.php`` is an ownCloud internal process that runs various background jobs
+on demand. It is called by the server cron, and can be set by the
+administrator.
+
+ownCloud plug-in applications register actions with ``cron.php`` automatically to
+take care of typical housekeeping operations, such as garbage collecting of
+temporary files or checking for newly updated files using ``filescan()`` for
+externally mounted file systems.
+
+Usage
+=====
+
+The interval at which this script is executed, and thus the ownCloud registered
+actions, can depend on the size of the installation and the load of the system.
+Recommended intervals are 15 or 30 minutes.
+
+Cron.php needs to be called by the system’s cron daemon and run as the same
+user the web server runs as.
+
+As an example, on an ordinary Linux distribution, place the following in the
+webserver’s user’s crontab::
+
+ */15 * * * * /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1
+
+This will run ``cron.php`` every 15 minutes and suppress any warnings or output
+which may be generated.
diff --git a/admin_manual/quota/Checking_available_space.rst b/admin_manual/quota/Checking_available_space.rst
deleted file mode 100644
index 5699fdf..0000000
--- a/admin_manual/quota/Checking_available_space.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-Checking available space
-========================
-
-A user can check their available space on the Personal page.
-
-|10000000000003A800000039364066E4_png|
-
-The available space for a given user is calculated using the following formula:
-
-|10000000000002BB000000266DB6AD1A_png|
-
-Where disk_free_space is the space available on the partition where the user’s home storage is located on the server.
-
-.. |10000000000003A800000039364066E4_png| image:: images/10000000000003A800000039364066E4.png
- :width: 6.5in
- :height: 0.3957in
-
-
-.. |10000000000002BB000000266DB6AD1A_png| image:: images/10000000000002BB000000266DB6AD1A.png
- :width: 6.5in
- :height: 0.3535in
-
diff --git a/admin_manual/quota/Excluded_from_quota.rst b/admin_manual/quota/Excluded_from_quota.rst
deleted file mode 100644
index f9870b5..0000000
--- a/admin_manual/quota/Excluded_from_quota.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-Excluded from quota
-===================
-
-The following sections describe information which is not counted in a user’s quota.
-
-Metadata and cache
-------------------
-
-Application metadata and cached information are excluded from total used space.
-Examples of such data are thumbnails (icon previews, pictures app), temporary files, and encryption keys.
-
-Deleted Files
--------------
-
-Files which have been moved to the trash bin do not count against a user’s quota.
-Deleted items are permanently deleted, oldest to newest, should the user run out of space to make room for new files.
-
-For example, if the user has a 10GB quota, and has used 4GB of space and 5GB in the trash bin, the user will still have 6GB available space.
-If, however, the user uploads 6GB, ownCloud will permanently delete files from the trash bin in order to make room for the new files.
-
-Version Control
----------------
-
-Older versions do not count against the user’s quota.
-The versions app will delete old versions, oldest to newest, should the user run out of space to make room for new files.
-
-For example, if the user has a 10GB quota, and has used 4GB and 5GB is used on older versions, the user will still have 6GB available space.
-If, however, the user uploads 6GB, ownCloud will discard older versions to make room for the new files.
-
-Encryption
-----------
-
-Encrypted files are slightly larger than their unencrypted equivalents.
-The unencrypted file size is used to determine the quota.
-
-External Storage
-----------------
-
-External storage, mounted by either a user or the admin, is not taken into consideration when calculating the user’s storage.
-
diff --git a/admin_manual/quota/Introduction.rst b/admin_manual/quota/Introduction.rst
deleted file mode 100644
index 1bfc377..0000000
--- a/admin_manual/quota/Introduction.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-Introduction
-============
-
-ownCloud allows the admin to specify a storage quota for users.
-This quota is the maximum space a user is allowed to utilize for files located in their home storage.
-
-The users quota is set in the Users page within ownCloud when creating a user.
-
-|10000000000003DF000000D953A456B6_png|
-
-Each user can have a different quota (shown above in the Storage column).
-In addition, there is a default quota should a user not have a quota specified.
-
-It is important to note that when setting a quota, the administrator needs to be aware that it applies only to the actual files and not the metadata.
-This means when allocating a quota, the admin should make sure at least 10% more space is available for each user.
-
-
-.. |10000000000003DF000000D953A456B6_png| image:: images/10000000000003DF000000D953A456B6.png
- :width: 6.5in
- :height: 1.4228in
-
diff --git a/admin_manual/quota/Sharing.rst b/admin_manual/quota/Sharing.rst
deleted file mode 100644
index 5eb5d9f..0000000
--- a/admin_manual/quota/Sharing.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Sharing
-=======
-
-Shared files or directories are counted against the owner’s quota and not the “shared-to” user’s quota.
-
-Shared Files
-------------
-
-When user A shares a file with user B, the size of the file will be counted against user A’s quota.
-This is the case even if the file is modified by user B or if user B increases the file size.
-
-Shared Directories
-------------------
-
-When user A shares a directory with User B, all files uploaded to that directory by user B will count against user A’s quota.
-Likewise, files within that directory which are modified by user B will count against user A’s quota.
-
-Resharing
----------
-
-If user A shares a file with user B who then reshares a file to user C, the space occupied by that file is counted against user A’s quota.
-
-Public sharing with upload permission
--------------------------------------
-
-If user A publicly shares a directory via a link and enables “public upload” permission, files uploaded to that directory from the outside are counted against user A’s quota.
diff --git a/admin_manual/quota/Table_of_Contents.rst b/admin_manual/quota/Table_of_Contents.rst
deleted file mode 100644
index 522ac71..0000000
--- a/admin_manual/quota/Table_of_Contents.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Table of Contents
-=================
-
-` <#_Toc374966628>`_
diff --git a/admin_manual/quota/index.rst b/admin_manual/quota/index.rst
index a7501a8..95cffd5 100644
--- a/admin_manual/quota/index.rst
+++ b/admin_manual/quota/index.rst
@@ -1,10 +1,113 @@
-**ownCloud Quota Calculations**
+=================
+Quota Calculation
+=================
-.. toctree::
- :maxdepth: 2
+Introduction
+============
+
+ownCloud allows the admin to specify a storage quota for users.
+This quota is the maximum space a user is allowed to utilize for files located in their home storage.
+
+The users quota is set in the Users page within ownCloud when creating a user.
+
+|10000000000003DF000000D953A456B6_png|
+
+Each user can have a different quota (shown above in the Storage column).
+In addition, there is a default quota should a user not have a quota specified.
+
+It is important to note that when setting a quota, the administrator needs to be aware that it applies only to the actual files and not the metadata.
+This means when allocating a quota, the admin should make sure at least 10% more space is available for each user.
+
+
+.. |10000000000003DF000000D953A456B6_png| image:: images/10000000000003DF000000D953A456B6.png
+ :width: 6.5in
+ :height: 1.4228in
+
+Checking available space
+========================
+
+A user can check their available space on the Personal page.
+
+|10000000000003A800000039364066E4_png|
+
+The available space for a given user is calculated using the following formula:
+
+|10000000000002BB000000266DB6AD1A_png|
+
+Where disk_free_space is the space available on the partition where the user’s home storage is located on the server.
+
+.. |10000000000003A800000039364066E4_png| image:: images/10000000000003A800000039364066E4.png
+ :width: 6.5in
+ :height: 0.3957in
+
+
+.. |10000000000002BB000000266DB6AD1A_png| image:: images/10000000000002BB000000266DB6AD1A.png
+ :width: 6.5in
+ :height: 0.3535in
+
+Sharing
+=======
+
+Shared files or directories are counted against the owner’s quota and not the “shared-to” user’s quota.
+
+Shared Files
+------------
+
+When user A shares a file with user B, the size of the file will be counted against user A’s quota.
+This is the case even if the file is modified by user B or if user B increases the file size.
+
+Shared Directories
+------------------
+
+When user A shares a directory with User B, all files uploaded to that directory by user B will count against user A’s quota.
+Likewise, files within that directory which are modified by user B will count against user A’s quota.
+
+Resharing
+---------
+
+If user A shares a file with user B who then reshares a file to user C, the space occupied by that file is counted against user A’s quota.
+
+Public sharing with upload permission
+-------------------------------------
+
+If user A publicly shares a directory via a link and enables “public upload” permission, files uploaded to that directory from the outside are counted against user A’s quota.
+Excluded from quota
+===================
+
+The following sections describe information which is not counted in a user’s quota.
+
+Metadata and cache
+------------------
+
+Application metadata and cached information are excluded from total used space.
+Examples of such data are thumbnails (icon previews, pictures app), temporary files, and encryption keys.
+
+Deleted Files
+-------------
+
+Files which have been moved to the trash bin do not count against a user’s quota.
+Deleted items are permanently deleted, oldest to newest, should the user run out of space to make room for new files.
+
+For example, if the user has a 10GB quota, and has used 4GB of space and 5GB in the trash bin, the user will still have 6GB available space.
+If, however, the user uploads 6GB, ownCloud will permanently delete files from the trash bin in order to make room for the new files.
+
+Version Control
+---------------
+
+Older versions do not count against the user’s quota.
+The versions app will delete old versions, oldest to newest, should the user run out of space to make room for new files.
+
+For example, if the user has a 10GB quota, and has used 4GB and 5GB is used on older versions, the user will still have 6GB available space.
+If, however, the user uploads 6GB, ownCloud will discard older versions to make room for the new files.
+
+Encryption
+----------
+
+Encrypted files are slightly larger than their unencrypted equivalents.
+The unencrypted file size is used to determine the quota.
+
+External Storage
+----------------
+
+External storage, mounted by either a user or the admin, is not taken into consideration when calculating the user’s storage.
- Table_of_Contents
- Introduction
- Checking_available_space
- Sharing
- Excluded_from_quota
diff --git a/admin_manual/sharing_api/Contents.rst b/admin_manual/sharing_api/Contents.rst
deleted file mode 100644
index 2d1b186..0000000
--- a/admin_manual/sharing_api/Contents.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Contents
-========
-
-` <file:///C:/Users/ser72/Desktop/S3_parent/Support/DOCUMENTS/Community/HYPERLINK#_Toc378743796>`_
diff --git a/admin_manual/sharing_api/Introduction.rst b/admin_manual/sharing_api/Introduction.rst
deleted file mode 100644
index a391920..0000000
--- a/admin_manual/sharing_api/Introduction.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-Introduction
-============
-
-This document will describe how to use the ownCloud Sharing API.
-The sharing API allows for the creation of new shares, obtaining a list of shares, and deleting shares.
-In addition, information such a lists of files shared to users can be obtained.
-
-In order to utilize this API, all user ID’s involved in the share, as well as full path names of files is required to be known.
-
-Two methods will be shown:
-Firefox Plugin “Poster” and Curl via the command line.
-
-The base URL for all calls to the share API is:
-owncloud_base_url>/ocs/v1.php/apps/files_sharing/api/v1/shares
-
-Permissions
------------
-
-The following table describes the Permissions of a share.
-The Permissions are contained in the XML code output of the command.
-
-+--------+------------------------------------------+
-| Value | Permissions |
-| | |
-+--------+------------------------------------------+
-| **1** | Read only – Default for “public” shares |
-| | |
-+--------+------------------------------------------+
-| **2** | Update |
-| | |
-+--------+------------------------------------------+
-| **4** | Create |
-| | |
-+--------+------------------------------------------+
-| **8** | Delete |
-| | |
-+--------+------------------------------------------+
-| **16** | Re-share |
-| | |
-+--------+------------------------------------------+
-| **31** | All above – Default for “private” shares |
-| | |
-+--------+------------------------------------------+
-
-
-To obtain combinations, add the desired values together.
-For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27.
-
diff --git a/admin_manual/sharing_api/Create_a_new_Share.rst b/admin_manual/sharing_api/create_a_new_share.rst
similarity index 99%
rename from admin_manual/sharing_api/Create_a_new_Share.rst
rename to admin_manual/sharing_api/create_a_new_share.rst
index e8882c6..7426475 100644
--- a/admin_manual/sharing_api/Create_a_new_Share.rst
+++ b/admin_manual/sharing_api/create_a_new_share.rst
@@ -248,4 +248,3 @@ Output
.. |1000000000000298000001870B0581FA_png| image:: images/1000000000000298000001870B0581FA.png
:width: 6.5in
:height: 3.828in
-
diff --git a/admin_manual/sharing_api/Delete_Share.rst b/admin_manual/sharing_api/delete_share.rst
similarity index 99%
rename from admin_manual/sharing_api/Delete_Share.rst
rename to admin_manual/sharing_api/delete_share.rst
index 267e3ef..7d6d97d 100644
--- a/admin_manual/sharing_api/Delete_Share.rst
+++ b/admin_manual/sharing_api/delete_share.rst
@@ -83,4 +83,3 @@ Output
.. |10000000000002910000018B31D51F03_png| image:: images/10000000000002910000018B31D51F03.png
:width: 6.5in
:height: 3.9075in
-
diff --git a/admin_manual/sharing_api/Get_All_Shares.rst b/admin_manual/sharing_api/get_all_shares.rst
similarity index 99%
rename from admin_manual/sharing_api/Get_All_Shares.rst
rename to admin_manual/sharing_api/get_all_shares.rst
index 6504fb8..1b2a3ea 100644
--- a/admin_manual/sharing_api/Get_All_Shares.rst
+++ b/admin_manual/sharing_api/get_all_shares.rst
@@ -149,4 +149,3 @@ Output
+--------------------------------------------------------+---------------------------------------------+
.. |10000201000002FC000001DC2DDAD2F1_png| image:: images/10000201000002FC000001DC2DDAD2F1.png
-
diff --git a/admin_manual/sharing_api/Get_Information_about_a_known_share.rst b/admin_manual/sharing_api/get_information_about_a_known_share.rst
similarity index 99%
rename from admin_manual/sharing_api/Get_Information_about_a_known_share.rst
rename to admin_manual/sharing_api/get_information_about_a_known_share.rst
index 3683f4b..a8f7d6f 100644
--- a/admin_manual/sharing_api/Get_Information_about_a_known_share.rst
+++ b/admin_manual/sharing_api/get_information_about_a_known_share.rst
@@ -155,4 +155,3 @@ Output
.. |1000000000000288000001A1D5BE4881_png| image:: images/1000000000000288000001A1D5BE4881.png
:width: 6.5in
:height: 4.1819in
-
diff --git a/admin_manual/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.rst b/admin_manual/sharing_api/get_shares_from_a_specific_file_or_folder.rst
similarity index 99%
rename from admin_manual/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.rst
rename to admin_manual/sharing_api/get_shares_from_a_specific_file_or_folder.rst
index 4251c91..fa35b6f 100644
--- a/admin_manual/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.rst
+++ b/admin_manual/sharing_api/get_shares_from_a_specific_file_or_folder.rst
@@ -357,4 +357,3 @@ Output
.. |1000000000000291000001951B69B9A6_png| image:: images/1000000000000291000001951B69B9A6.png
:width: 6.5in
:height: 4.0071in
-
diff --git a/admin_manual/sharing_api/index.rst b/admin_manual/sharing_api/index.rst
index 9e01679..c9870e6 100644
--- a/admin_manual/sharing_api/index.rst
+++ b/admin_manual/sharing_api/index.rst
@@ -1,13 +1,62 @@
-**ownCloud Sharing API**
-
+===========
+Sharing API
+===========
.. toctree::
:maxdepth: 2
+ :hidden:
+
+ get_all_shares
+ get_shares_from_a_specific_file_or_folder
+ get_information_about_a_known_share
+ create_a_new_share
+ delete_share
+
+Introduction
+============
+
+This document will describe how to use the ownCloud Sharing API.
+The sharing API allows for the creation of new shares, obtaining a list of shares, and deleting shares.
+In addition, information such a lists of files shared to users can be obtained.
+
+In order to utilize this API, all user ID’s involved in the share, as well as full path names of files is required to be known.
+
+Two methods will be shown:
+Firefox Plugin “Poster” and Curl via the command line.
+
+The base URL for all calls to the share API is:
+owncloud_base_url>/ocs/v1.php/apps/files_sharing/api/v1/shares
+
+Permissions
+-----------
+
+The following table describes the Permissions of a share.
+The Permissions are contained in the XML code output of the command.
+
++--------+------------------------------------------+
+| Value | Permissions |
+| | |
++--------+------------------------------------------+
+| **1** | Read only – Default for “public” shares |
+| | |
++--------+------------------------------------------+
+| **2** | Update |
+| | |
++--------+------------------------------------------+
+| **4** | Create |
+| | |
++--------+------------------------------------------+
+| **8** | Delete |
+| | |
++--------+------------------------------------------+
+| **16** | Re-share |
+| | |
++--------+------------------------------------------+
+| **31** | All above – Default for “private” shares |
+| | |
++--------+------------------------------------------+
+
+
+To obtain combinations, add the desired values together.
+For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27.
- Contents
- Introduction
- Get_All_Shares
- Get_Shares_from_a_Specific_File_or_Folder
- Get_Information_about_a_known_share
- Create_a_new_Share
- Delete_Share
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list