[Pkg-owncloud-commits] [owncloud-doc] 07/10: Merge remote-tracking branch 'upstream/stable6' into upstream
David Prévot
taffit at moszumanska.debian.org
Wed Mar 5 20:26:55 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 475cb04d66f2996cf816b4792ed531a052e804ec
Merge: 44935de 57bb29f
Author: David Prévot <taffit at debian.org>
Date: Wed Mar 5 08:46:07 2014 -0300
Merge remote-tracking branch 'upstream/stable6' into upstream
Conflicts:
admin_manual/apps/files_sharing/images/10000000000004CA000002B52116BE0C.png
admin_manual/apps/viewers/images/100000000000044C000002B0B421E27E.png
CONTRIBUTING.rst | 8 +++----
admin_manual/{ => apps}/activity/Configuration.rst | 0
admin_manual/{ => apps}/activity/Introduction.rst | 0
admin_manual/{ => apps}/activity/RSS_Feed.rst | 0
.../{ => apps}/activity/Table_of_Contents.rst | 0
admin_manual/{ => apps}/activity/Utilization.rst | 0
.../images/1000000000000050000000DB83B8FA5B.png | Bin
.../images/10000000000000F1000000F56125BDBA.png | Bin
.../images/10000000000000F1000000F6704F46D3.png | Bin
.../images/10000000000000F300000068AF0ECD53.png | Bin
.../images/10000000000000F40000019A110DD159.png | Bin
.../images/10000000000000F5000000675DC5F68C.png | Bin
.../images/10000000000000F500000067A8845EF8.png | Bin
.../images/10000000000000F60000006754ED2A1E.png | Bin
.../images/10000000000000F6000000685DFB3767.png | Bin
.../images/10000000000001440000005A2989832F.png | Bin
.../images/10000000000002B1000002258C08D304.png | Bin
.../images/10000000000002F3000000926CA65D02.png | Bin
admin_manual/{ => apps}/activity/index.rst | 0
.../admin_dependencies_chk}/Configuration.rst | 0
.../admin_dependencies_chk}/Introduction.rst | 0
.../admin_dependencies_chk}/Table_of_Contents.rst | 0
.../admin_dependencies_chk}/Utilization.rst | 0
.../images/100000000000013C0000017D4FC6CEF5.png | Bin
.../images/10000000000001C9000000AF9C1CE57F.png | Bin
.../admin_dependencies_chk}/index.rst | 0
.../files_antivirus}/Configuration.rst | 0
.../files_antivirus}/Introduction.rst | 0
.../files_antivirus}/Table_of_Contents.rst | 0
.../images/1000000000000160000000DBB2FB0223.png | Bin
.../images/1000000000000165000000D3FF2168AB.png | Bin
.../images/10000000000001800000009A9494E037.png | Bin
.../images/1000000000000194000000FAD39BC0D8.png | Bin
.../images/10000000000001AC000000477C76808F.png | Bin
.../{antivirus => apps/files_antivirus}/index.rst | 0
.../files_encryption}/Configuration.rst | 0
.../files_encryption}/File_Systems.rst | 0
.../files_encryption}/Introduction.rst | 0
.../files_encryption}/Table_of_Contents.rst | 0
.../images/100000000000018B000000A090F31164.png | Bin
.../images/100000000000018E000000C4BA62B2A3.png | Bin
.../images/1000000000000193000001AE9AB8B0A2.png | Bin
.../images/10000000000001A3000000AAFE82893A.png | Bin
.../images/10000000000001A40000006C954442CE.png | Bin
.../images/10000000000001BF00000012349EAE2F.png | Bin
.../images/1000000000000227000000935D9B1EF6.png | Bin
.../images/100000000000023B000000125381F51B.png | Bin
.../images/100000000000024400000027BEE1E4A9.png | Bin
.../images/100000000000026E0000003672ADCB6E.png | Bin
.../images/100000000000029F000000B8A83D0275.png | Bin
.../images/10000000000002B30000003A5B960711.png | Bin
.../images/10000000000002C700000048F3729BAA.png | Bin
.../images/10000000000003730000002B6865E951.png | Bin
.../files_encryption}/index.rst | 0
.../files_external}/Configuration.rst | 0
.../files_external}/Introduction.rst | 0
.../files_external}/Table_of_Contents.rst | 0
.../images/100000000000003800000018D49F1CE7.png | Bin
.../images/10000000000000950000004412998BE7.png | Bin
.../images/10000000000000A800000073F49785A6.png | Bin
.../images/10000000000000B600000120706C3C75.png | Bin
.../images/10000000000000CD000000ECA8DE7780.png | Bin
.../images/10000000000001880000007EA4444400.png | Bin
.../images/10000000000001980000009271BE0D26.png | Bin
.../images/10000000000001D30000014DC251C948.png | Bin
.../images/10000000000001FD000000DF8D2D7546.png | Bin
.../images/10000000000002170000004A27056037.png | Bin
.../images/1000000000000247000000A77440E4D3.png | Bin
.../images/100000000000027B0000011D10F70F88.png | Bin
.../images/10000000000002840000016729388B7F.png | Bin
.../images/10000000000002950000021E245F6883.png | Bin
.../images/1000000000000372000002AF943ADDA0.png | Bin
.../images/10000000000003A60000011E274A1A28.png | Bin
.../images/10000000000003A6000002A9C7A660BE.png | Bin
.../images/10000000000003B30000021B5EE5D338.png | Bin
.../images/10000000000003DF00000071A41D8A1F.png | Bin
.../images/10000000000004100000005657010336.png | Bin
.../images/10000000000004770000008AAF3CFFDB.png | Bin
.../images/10000000000004C0000000795BB2C146.png | Bin
.../images/100000000000053A00000067708C8F53.png | Bin
.../images/1000000000000552000000BF22E90239.png | Bin
.../images/10000000000005970000006AE23997C9.png | Bin
.../images/10000000000005AF00000074604B1A67.png | Bin
.../images/10000000000005B90000007866D92D14.png | Bin
.../images/10000000000005BB0000007C1DF71FA7.png | Bin
.../images/10000000000005C30000006CAFFAAD61.png | Bin
.../images/10000000000005D00000003B29340A7A.png | Bin
.../images/10000000000005D50000009458C5EE48.png | Bin
.../images/10000000000005E20000009B1BA5A8CF.png | Bin
.../images/10000000000005E6000000676902E040.png | Bin
.../images/10000000000005EB000000A68BA73E2D.png | Bin
.../images/10000000000005EC00000073E678DFEC.png | Bin
.../images/10000000000005F70000005F0912E904.png | Bin
.../images/10000000000005F70000007E43DB8026.png | Bin
.../images/10000000000005FA0000005CE8491B77.png | Bin
.../images/10000000000005FF0000005F35710398.png | Bin
.../images/10000000000006000000005EDA7B96BE.png | Bin
.../images/100000000000060300000065DF96536B.png | Bin
.../images/10000000000006060000006A0106CA0C.png | Bin
.../images/100000000000061A0000006FC014C3A4.png | Bin
.../images/100000000000061D0000007047877972.png | Bin
.../images/100000000000061E0000006BCF9ECC0B.png | Bin
.../images/100000000000062A0000005F61A18950.png | Bin
.../images/1000000000000631000000E19D116AA0.png | Bin
.../images/100000000000063F00000090AAE1FA4A.png | Bin
.../{external => apps/files_external}/index.rst | 0
.../files_sharing}/Configuration.rst | 0
.../files_sharing}/Introduction.rst | 0
.../files_sharing}/Retrieving_shared_data.rst | 0
.../files_sharing}/Table_of_Contents.rst | 0
.../files_sharing}/Utilization.rst | 0
.../images/1000000000000167000000B43E4BF478.png | Bin
.../images/10000000000001CF00000176B0BE1EBC.png | Bin
.../images/10000000000003E8000001524A147A04.png | Bin
.../images/10000000000003EC000000AB60616FA7.png | Bin
.../images/10000000000004010000017E4A6552BC.png | Bin
.../images/1000000000000403000001632F0B76F6.png | Bin
.../images/1000000000000404000000FCFC13E732.png | Bin
.../images/100000000000045800000197FE462F2B.png | Bin
.../images/1000000000000462000000D44541CF9A.png | Bin
.../images/100000000000046C000000C2D3E5CF30.png | Bin
.../{share_app => apps/files_sharing}/index.rst | 0
.../files_trashbin}/Configuration_and_storage_.rst | 0
.../files_trashbin}/Introduction.rst | 0
.../files_trashbin}/Table_of_Contents.rst | 0
.../files_trashbin}/Utilization.rst | 0
.../images/10000000000002B3000000365E1CD00D.png | Bin
.../images/100000000000042F000000CC3EDDE79E.png | Bin
.../images/1000000000000523000000C6F786381C.png | Bin
.../images/100000000000052500000088DBB95005.png | Bin
.../images/1000000000000525000000BE30CF0423.png | Bin
.../images/1000000000000527000000A7AB409FE0.png | Bin
.../images/100000000000052F000000C2867B7294.png | Bin
.../images/1000000000000530000001410CF0028A.png | Bin
.../images/100000000000053100000142D9A4C916.png | Bin
.../images/1000000000000532000000285DDBBF37.png | Bin
.../{undelete => apps/files_trashbin}/index.rst | 0
.../files_versions}/Configuration_and_storage.rst | 0
.../files_versions}/Introduction.rst | 0
.../files_versions}/Utilization.rst | 0
.../images/1000000000000194000000498325A766.png | Bin
.../images/100000000000019E0000004CD2A0F407.png | Bin
.../images/10000000000001C1000000FE663748B2.png | Bin
.../images/100000000000021C0000004CACBF786C.png | Bin
.../images/10000000000002210000002DE3BE7515.png | Bin
.../images/1000000000000336000000F38C3FAF84.png | Bin
.../images/1000000000000427000000324F58266D.png | Bin
.../images/1000000000000430000000AF9D6E724E.png | Bin
.../images/10000000000004ED000000BE3B9E25D5.png | Bin
.../{versions => apps/files_versions}/index.rst | 0
.../firstrunwizard}/Configuration.rst | 0
.../firstrunwizard}/Introduction.rst | 0
.../{first_run => apps/firstrunwizard}/Links.rst | 0
.../firstrunwizard}/Table_of_Contents.rst | 0
.../{first_run => apps/firstrunwizard}/Usage.rst | 0
.../images/1000000000000200000000BCCCC35DEB.png | Bin
.../images/10000000000002A6000000BFBE298238.png | Bin
.../images/10000000000004920000028D9C8DC2CB.png | Bin
.../images/1000000000000557000002E148BAB6D4.png | Bin
.../images/10000000000005F30000030F1372448D.png | Bin
.../images/1000000000000668000002D29EAD9899.png | Bin
.../images/100000000000066D000001AAD8CE8256.png | Bin
.../{first_run => apps/firstrunwizard}/index.rst | 0
.../{LDAP => apps/user_ldap}/CONFIGURATION.rst | 0
.../{LDAP => apps/user_ldap}/Introduction.rst | 0
.../{LDAP => apps/user_ldap}/Table_of_Contents.rst | 0
.../images/10000000000003FB000002359BAFB40E.png | Bin
.../images/10000000000004170000016ACB5E15AE.png | Bin
.../images/100000000000041D0000017D8D1BC4D9.png | Bin
.../images/100000000000042500000163D2B339D5.png | Bin
.../images/100000000000042E000001D3EEB9978B.png | Bin
.../images/100000000000043000000164DA0CE8C9.png | Bin
.../images/100000000000043200000169BCD20493.png | Bin
.../images/1000020100000359000000A8B848DE68.png | Bin
.../images/10000201000005F90000029D8BA200FB.png | Bin
admin_manual/{LDAP => apps/user_ldap}/index.rst | 0
admin_manual/{ => apps}/viewers/Configuration.rst | 0
admin_manual/{ => apps}/viewers/Introduction.rst | 0
admin_manual/{ => apps}/viewers/Utilization.rst | 0
.../images/100000000000012C0000009C444B4720.png | Bin
.../images/10000000000001400000008A557EF7E3.png | Bin
.../images/10000000000001E50000006E3ECDC427.png | Bin
admin_manual/{ => apps}/viewers/index.rst | 0
admin_manual/conf.py | 3 +++
admin_manual/configuration/auth_ldap.rst | 25 +++++++++++----------
admin_manual/index.rst | 6 ++---
admin_manual/installation/installation_source.rst | 1 +
developer_manual/conf.py | 3 +++
developer_manual/index.rst | 6 ++---
user_manual/conf.py | 3 +++
user_manual/index.rst | 7 +++---
191 files changed, 37 insertions(+), 25 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