[Pkg-owncloud-commits] [owncloud-doc] 91/95: Merge remote-tracking branch 'upstream/stable6' into upstream
David Prévot
taffit at moszumanska.debian.org
Fri Apr 18 21:41:46 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 2174bbacda179e6f9714834df552f0f1ce5c3825
Merge: 475cb04 65c4b7b
Author: David Prévot <taffit at debian.org>
Date: Thu Apr 17 10:16:46 2014 -0400
Merge remote-tracking branch 'upstream/stable6' into upstream
.gitignore | 3 +
README.rst | 51 +-
admin_manual/apps/activity/Configuration.rst | 15 -
admin_manual/apps/activity/Introduction.rst | 22 -
admin_manual/apps/activity/RSS_Feed.rst | 33 -
admin_manual/apps/activity/Table_of_Contents.rst | 4 -
admin_manual/apps/activity/Utilization.rst | 136 ----
admin_manual/apps/activity/index.rst | 176 ++++-
.../apps/admin_dependencies_chk/Configuration.rst | 12 -
.../apps/admin_dependencies_chk/Introduction.rst | 6 -
.../admin_dependencies_chk/Table_of_Contents.rst | 4 -
.../apps/admin_dependencies_chk/Utilization.rst | 17 -
admin_manual/apps/admin_dependencies_chk/index.rst | 39 +-
.../apps/files_antivirus/Configuration.rst | 127 ---
admin_manual/apps/files_antivirus/Introduction.rst | 34 -
.../apps/files_antivirus/Table_of_Contents.rst | 4 -
admin_manual/apps/files_antivirus/index.rst | 149 +++-
.../apps/files_encryption/Configuration.rst | 88 ---
.../apps/files_encryption/File_Systems.rst | 65 --
.../apps/files_encryption/Introduction.rst | 57 --
.../apps/files_encryption/Table_of_Contents.rst | 4 -
.../images/100000000000024400000027BEE1E4A9.png | Bin 37305 -> 0 bytes
.../images/100000000000026E0000003672ADCB6E.png | Bin 59136 -> 0 bytes
.../images/100000000000029F000000B8A83D0275.png | Bin 131939 -> 0 bytes
.../images/10000000000002B30000003A5B960711.png | Bin 76501 -> 0 bytes
.../images/10000000000002C700000048F3729BAA.png | Bin 67393 -> 0 bytes
.../images/edit_encrypted_file.png | Bin 0 -> 4317 bytes
admin_manual/apps/files_encryption/index.rst | 172 +++-
admin_manual/apps/files_external/Configuration.rst | 875 ---------------------
admin_manual/apps/files_external/Introduction.rst | 54 --
.../apps/files_external/Table_of_Contents.rst | 4 -
admin_manual/apps/files_external/index.rst | 647 ++++++++++++++-
admin_manual/apps/files_sharing/Configuration.rst | 32 -
admin_manual/apps/files_sharing/Introduction.rst | 7 -
.../apps/files_sharing/Retrieving_shared_data.rst | 46 --
.../apps/files_sharing/Table_of_Contents.rst | 4 -
admin_manual/apps/files_sharing/Utilization.rst | 96 ---
admin_manual/apps/files_sharing/index.rst | 187 ++++-
.../files_trashbin/Configuration_and_storage_.rst | 33 -
admin_manual/apps/files_trashbin/Introduction.rst | 25 -
.../apps/files_trashbin/Table_of_Contents.rst | 8 -
admin_manual/apps/files_trashbin/Utilization.rst | 146 ----
admin_manual/apps/files_trashbin/index.rst | 203 ++++-
.../files_versions/Configuration_and_storage.rst | 52 --
admin_manual/apps/files_versions/Introduction.rst | 39 -
admin_manual/apps/files_versions/Utilization.rst | 114 ---
admin_manual/apps/files_versions/index.rst | 195 ++++-
admin_manual/apps/firstrunwizard/Configuration.rst | 12 -
admin_manual/apps/firstrunwizard/Introduction.rst | 4 -
admin_manual/apps/firstrunwizard/Links.rst | 54 --
.../apps/firstrunwizard/Table_of_Contents.rst | 4 -
admin_manual/apps/firstrunwizard/Usage.rst | 21 -
admin_manual/apps/firstrunwizard/index.rst | 99 ++-
admin_manual/apps/index.rst | 19 +
admin_manual/apps/user_ldap/CONFIGURATION.rst | 485 ------------
admin_manual/apps/user_ldap/Introduction.rst | 21 -
admin_manual/apps/user_ldap/Table_of_Contents.rst | 4 -
admin_manual/apps/user_ldap/index.rst | 507 +++++++++++-
admin_manual/apps/viewers/Configuration.rst | 28 -
admin_manual/apps/viewers/Introduction.rst | 5 -
admin_manual/apps/viewers/Utilization.rst | 23 -
admin_manual/apps/viewers/index.rst | 62 +-
admin_manual/config/Introduction.rst | 10 -
admin_manual/config/Table_of_Contents.rst | 5 -
admin_manual/config/User_Experience.rst | 35 -
admin_manual/config/{APPS.rst => apps.rst} | 2 +-
.../{Code_Locations.rst => code_locations.rst} | 0
...fault_Parameters.rst => default_parameters.rst} | 11 +
.../{Deleted_Items.rst => deleted_items.rst} | 0
admin_manual/config/index.rst | 43 +-
admin_manual/config/{Logging.rst => logging.rst} | 0
.../{Mail_Parameters.rst => mail_parameters.rst} | 9 +-
.../config/{Maintenance.rst => maintenance.rst} | 0
.../{Miscellaneous.rst => miscellaneous.rst} | 2 +-
admin_manual/config/{Previews.rst => previews.rst} | 0
...ations.rst => reverse_proxy_configurations.rst} | 3 +-
.../config/{Session_Info.rst => session_info.rst} | 0
admin_manual/config/user_experience.rst | 35 +
.../config/{Verification.rst => verification.rst} | 3 +-
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/contents.rst | 2 +
admin_manual/cron/Introduction.rst | 5 -
admin_manual/cron/Usage.rst | 24 -
admin_manual/cron/index.rst | 40 +-
admin_manual/index.rst | 19 +
.../installation/images/untrusted-domain.png | Bin 0 -> 168746 bytes
admin_manual/installation/installation_linux.rst | 2 +-
admin_manual/installation/installation_source.rst | 409 ++++++----
admin_manual/issues/index.rst | 4 +-
admin_manual/maintenance/update.rst | 6 +-
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} | 17 +-
.../{Delete_Share.rst => delete_share.rst} | 8 +-
.../{Get_All_Shares.rst => get_all_shares.rst} | 12 +-
...rst => get_information_about_a_known_share.rst} | 7 +-
... get_shares_from_a_specific_file_or_folder.rst} | 23 +-
admin_manual/sharing_api/index.rst | 67 +-
admin_manual/sync_client/Advanced_Usage.rst | 114 ---
admin_manual/sync_client/Introduction.rst | 9 -
admin_manual/sync_client/Obtaining_the_Client.rst | 29 -
admin_manual/sync_client/Setting_up_an_Account.rst | 54 --
admin_manual/sync_client/Table_of_Contents.rst | 7 -
admin_manual/sync_client/Visual_Tour.rst | 257 ------
.../images/100000000000001D0000001E5C455170.png | Bin 1301 -> 0 bytes
.../images/10000000000000D2000000F553818155.png | Bin 40563 -> 0 bytes
.../images/10000000000000F20000003BAA849B42.png | Bin 12296 -> 0 bytes
.../images/10000000000001E50000018C3AD09A21.png | Bin 107117 -> 0 bytes
.../images/10000000000001EE00000164642CCA08.png | Bin 73614 -> 0 bytes
.../images/10000000000001F40000016609A0CFCC.png | Bin 55791 -> 0 bytes
.../images/10000000000002650000018CA6A1BE66.png | Bin 74341 -> 0 bytes
.../images/10000000000002650000018E4285E964.png | Bin 92661 -> 0 bytes
.../images/10000000000002690000018D3A8C9F17.png | Bin 75305 -> 0 bytes
.../images/100000000000026A000001DCAF8778F2.png | Bin 126167 -> 0 bytes
.../images/10000000000002BB000001EABD7E6DF0.png | Bin 336801 -> 0 bytes
.../images/10000000000002BF000001E5B544E7E7.png | Bin 97877 -> 0 bytes
.../images/10000000000002C1000001ED5CECCC6D.png | Bin 134744 -> 0 bytes
.../images/10000000000002C3000001EBBD39E47A.png | Bin 113591 -> 0 bytes
admin_manual/sync_client/index.rst | 11 -
admin_manual/web_guide/Adding_Data.rst | 117 ---
admin_manual/web_guide/Initial_Log_In.rst | 29 -
admin_manual/web_guide/Introduction.rst | 6 -
admin_manual/web_guide/Main_ownCloud_screen.rst | 32 -
admin_manual/web_guide/Navigation.rst | 75 --
admin_manual/web_guide/Personal_Configurations.rst | 84 --
admin_manual/web_guide/Table_of_Contents.rst | 5 -
admin_manual/web_guide/index.rst | 12 -
developer_manual/app/app/externalapi.rst | 4 +-
developer_manual/app/app/index.rst | 2 +-
developer_manual/app/appframework/index.rst | 2 +-
developer_manual/app/index.rst | 4 +-
developer_manual/app/intro/index.rst | 2 +-
developer_manual/bugtracker/index.rst | 4 +-
developer_manual/commun/index.rst | 2 +-
developer_manual/core/index.rst | 2 +-
developer_manual/core/theming.rst | 80 +-
developer_manual/devenv/index.rst | 2 +-
developer_manual/ios_library/examples.rst | 54 +-
user_manual/files/encryption.rst | 41 +-
user_manual/files/files.rst | 2 +-
user_manual/files/filesweb.rst | 2 +-
user_manual/files/sync.rst | 2 +-
user_manual/pim/troubleshooting.rst | 2 +-
.../images/1000000000000163000000E9CDA84C92.png | Bin
.../images/1000000000000175000000FAB2A2B294.png | Bin
.../images/1000000000000195000000EF7E44082C.png | Bin
.../images/10000000000001CE000000F2E2084BA1.png | Bin
.../images/100000000000041D0000003D52225C0D.png | Bin
.../images/1000000000000453000001BFFCF48776.png | Bin
.../images/1000000000000467000002B63162E59B.png | Bin
.../images/10000000000004690000026615360BEB.png | Bin
.../images/100000000000046D0000015F4B5494A9.png | Bin
.../images/100000000000046F000000DEA2BFCD9B.png | Bin
.../images/1000000000000470000001B68AE60DD3.png | Bin
.../images/10000000000004710000014BBC34499D.png | Bin
.../images/100000000000047200000129CB014025.png | Bin
.../images/100000000000047700000219A3013A92.png | Bin
.../images/1000000000000479000002887E7F48EA.png | Bin
.../images/100000000000047A000000B727198874.png | Bin
.../images/100000000000047A000000FB86FF2A9A.png | Bin
.../images/100000000000047A0000011C6682A254.png | Bin
.../images/100000000000048100000245268CDB7A.png | Bin
user_manual/web_guide/index.rst | 344 ++++++++
181 files changed, 3509 insertions(+), 4391 deletions(-)
--
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