From a8d0ee3f7da78fc357760586b8b5cdba0d80882c Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Fri, 15 Apr 2016 11:14:44 -0700 Subject: [PATCH] Revert "move enterprise chapters to subdir" This reverts commit d8efc04dff4c014d9d4d51b5b2620119088b521c. --- admin_manual/contents.rst | 16 ++++++++-------- .../enterprise_clients/custom_client_repos.rst | 6 ------ .../images/ownbrander-1.png | Bin 15309 -> 0 bytes .../creating_branded_apps.rst | 2 +- .../enterprise_clients/custom_client_repos.rst | 6 ++++++ .../enterprise_clients/index.rst | 0 .../enterprise_only_auth.rst | 0 .../images/app-sharepoint-enable.png | Bin .../images/auth_backends-2.png | Bin .../images/auth_backends.png | Bin .../images/ldap-home-connector-1.png | Bin .../images/ldap-home-connector-2.png | Bin .../images/ldap-home-connector-3.png | Bin .../images/sharepoint-1.png | Bin .../images/sharepoint-2.png | Bin .../images/sharepoint-3.png | Bin .../images/sharepoint-4.png | Bin .../images/sharepoint-drive-config.png | Bin .../images/wnd-1.png | Bin .../images/wnd-2.png | Bin .../images/wnd-3.jpg | Bin .../images/wnd-3.png | Bin .../enterprise_external_storage/index.rst | 0 .../jive_configuration.rst | 4 ++-- .../ldap_home_connector_configuration.rst | 0 ...ft_as_primary_object_store_configuration.rst | 0 .../sharepoint-integration_configuration.rst | 0 .../windows-network-drive_configuration.rst | 2 +- .../enterprise_file_management/files_drop.rst | 2 +- .../files_tagging.rst | 0 .../images/files-drop-1.png | Bin .../images/files-drop-2.png | Bin .../images/files-drop-3.png | Bin .../images/files-drop-4.png | Bin .../images/files-drop-5.png | Bin .../images/files-drop-6.png | Bin .../images/files-drop-7.png | Bin .../images/workflow-1.png | Bin .../images/workflow-2.png | Bin .../images/workflow-3.png | Bin .../images/workflow-4.png | Bin .../enterprise_file_management/index.rst | 0 .../enterprise_firewall/file_firewall.rst | 0 .../enterprise_firewall/images/firewall-1.png | Bin .../enterprise_firewall/images/firewall-2.png | Bin .../enterprise_firewall/images/firewall-3.png | Bin .../enterprise_firewall/index.rst | 0 .../enterprise_installation/index.rst | 0 .../license_keys_installation.rst | 0 .../linux_installation.rst | 14 +++----------- .../supported_apps_installation.rst | 2 +- .../enterprise_logging_apps.rst | 2 +- .../enterprise_logging/images/logging-1.png | Bin .../enterprise_logging/index.rst | 0 .../enterprise_server_branding.rst | 4 ++-- .../enterprise_server_branding/index.rst | 0 .../enterprise_user_management/index.rst | 0 .../user_auth_shibboleth.rst | 12 ++++++------ .../images/jive_2.png | Bin .../images/jive_config.png | Bin .../images/ownbrander-1.png | Bin .../images/shib-gui1.png | Bin .../images/shib-gui2.png | Bin .../images/shib-gui4.png | Bin .../images/shib-gui5.png | Bin .../images/shib-gui6.png | Bin .../images/shibboleth-personal.png | Bin .../images/webbrander-1.png | Bin .../installation/linux_installation.rst | 4 ++-- .../installation/source_installation.rst | 2 +- admin_manual/maintenance/upgrade.rst | 3 +-- admin_manual/whats_new_admin.rst | 4 ++-- 72 files changed, 38 insertions(+), 47 deletions(-) delete mode 100644 admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst delete mode 100644 admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png rename admin_manual/{enterprise-only => }/enterprise_clients/creating_branded_apps.rst (97%) create mode 100644 admin_manual/enterprise_clients/custom_client_repos.rst rename admin_manual/{enterprise-only => }/enterprise_clients/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/enterprise_only_auth.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/app-sharepoint-enable.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/auth_backends-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/auth_backends.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/ldap-home-connector-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/ldap-home-connector-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/ldap-home-connector-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/sharepoint-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/sharepoint-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/sharepoint-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/sharepoint-4.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/sharepoint-drive-config.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/wnd-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/wnd-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/wnd-3.jpg (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/images/wnd-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/jive_configuration.rst (99%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/ldap_home_connector_configuration.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/sharepoint-integration_configuration.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_external_storage/windows-network-drive_configuration.rst (99%) rename admin_manual/{enterprise-only => }/enterprise_file_management/files_drop.rst (96%) rename admin_manual/{enterprise-only => }/enterprise_file_management/files_tagging.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-4.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-5.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-6.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/files-drop-7.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/workflow-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/workflow-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/workflow-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/images/workflow-4.png (100%) rename admin_manual/{enterprise-only => }/enterprise_file_management/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_firewall/file_firewall.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_firewall/images/firewall-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_firewall/images/firewall-2.png (100%) rename admin_manual/{enterprise-only => }/enterprise_firewall/images/firewall-3.png (100%) rename admin_manual/{enterprise-only => }/enterprise_firewall/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_installation/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_installation/license_keys_installation.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_installation/linux_installation.rst (71%) rename admin_manual/{enterprise-only => }/enterprise_installation/supported_apps_installation.rst (81%) rename admin_manual/{enterprise-only => }/enterprise_logging/enterprise_logging_apps.rst (92%) rename admin_manual/{enterprise-only => }/enterprise_logging/images/logging-1.png (100%) rename admin_manual/{enterprise-only => }/enterprise_logging/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_server_branding/enterprise_server_branding.rst (97%) rename admin_manual/{enterprise-only => }/enterprise_server_branding/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_user_management/index.rst (100%) rename admin_manual/{enterprise-only => }/enterprise_user_management/user_auth_shibboleth.rst (98%) rename admin_manual/{enterprise-only/enterprise_external_storage => }/images/jive_2.png (100%) rename admin_manual/{enterprise-only/enterprise_external_storage => }/images/jive_config.png (100%) rename admin_manual/{enterprise-only/enterprise_clients => }/images/ownbrander-1.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shib-gui1.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shib-gui2.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shib-gui4.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shib-gui5.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shib-gui6.png (100%) rename admin_manual/{enterprise-only/enterprise_user_management => }/images/shibboleth-personal.png (100%) rename admin_manual/{enterprise-only/enterprise_server_branding => }/images/webbrander-1.png (100%) diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index efc53481e..f8e03bca7 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -24,11 +24,11 @@ Enterprise Subscription Only .. toctree:: :maxdepth: 3 - enterprise-only/enterprise_installation/index - enterprise-only/enterprise_clients/index - enterprise-only/enterprise_server_branding/index - enterprise-only/enterprise_external_storage/index - enterprise-only/enterprise_user_management/index - enterprise-only/enterprise_file_management/index - enterprise-only/enterprise_logging/index - enterprise-only/enterprise_firewall/index + enterprise_installation/index + enterprise_clients/index + enterprise_server_branding/index + enterprise_external_storage/index + enterprise_user_management/index + enterprise_file_management/index + enterprise_logging/index + enterprise_firewall/index diff --git a/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst b/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst deleted file mode 100644 index e1882b601..000000000 --- a/admin_manual/enterprise-only/enterprise_clients/custom_client_repos.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== -Custom Client Download Repositories -=================================== - -See :doc:`../../configuration_server/custom_client_repos` to learn how to test -and configure custom download repository URLs for your branded clients. diff --git a/admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png b/admin_manual/enterprise-only/enterprise_server_branding/images/ownbrander-1.png deleted file mode 100644 index 3be47ba0f47a713c4d6b6784f83676c582bac9bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15309 zcmZ9zb97$M_Xc`mJ85h;R)e=elQ&j_#%$8qHXGYc8aK9$#6Y^b790id85dZ)bNeQqb06@Tgq(k5#Kd#^UAf`TUQ1-%-%JA^;%bW5W zACCw&66*EjHvjak^B zTRy^N9=|T}O5bygF(MnHm8fvZF9M_jJX4+<09FJWEMd5PXP=I7#q?f!yh=$rt%LKA zwhlozBTkOgNfXs2ZCC!NTlH}V)zmY$Ba|PvpD;0YY-0W3;W+`w=x0(4h(9#KfGijq z8a;HOt;YbQ(ef17&to9Hui`3`>rJ&V$-ToJ5xfnyK!{$Er+H4?6Ry{BGCZVR8C7ws zzX@4q6Ay_a1aGw4LXu6LEzg0GA%KKA#h58R3*MloK+eg?Ip)AdCsY3okL~uz%xs0; zOX01~olJXn1z{N-6;x{{GDrXtK!>0JFd#$#Ac-`c+<*weY>PJdmkBF_xnbUj=(N zfYF`NLYDE4ibT>_MoOY=((?v@?gj9B@acJjQv6E3V3-CUDTARkupmriHI6G!CGtZ| z7%iZDrk;dUz27A!?9ykv?5;k`agb5x%~9&N80b0B;VGm7os=%7nbuaWzFoZI7zSS; zAkb5$2rzu2wKAl{aVVAGDe&tpI_4en92jB1$T9Hf>!11V9J~v2Z|3gSHop@rh60ZH zFetk)=~aiyF+DO}TnOk2=61W#7<6UC`E?XUTp0AS;JjKfpKQGaJ7wedi|lrCSw16W zfFfFs*;V+*VR2@usd&8CofLxjp(+|tJyAkCF<|*hNv_FUM33>cKNJgXzMRZ10tqY( zrU;brg%yI9-MDk7FgquN?5wKf;`uZ+=o$KRP)ZN1B!+!VgJC z0bv7%Mo)(lmNotM%hqdrg3egR6a_s2nU9}vrt@r66BcuZUS-DP$Zu?D(-C$kf$MzJaK`3tl7@=r};Te=q@ZR;PQ&VTn(=#m@pfbZxRLaCO5E8No zrTX{{42Bg-#fGFSllA8aOr+#e=yl4Qaupaiq02Ft6ER9a7!4IIIffzvd;kSQg~VA2 z@9&>R4=SXl=@isdjGm(Oc*f)qWM`&87PN%OFaq-LCMHKyHO4$@2lvR4q8SS)3>?j*!Df_BqThazTS89y_o{rwCJUMR+i+g4ul zqmpWe!!K$SXJ<5mT^t?Ydv4J3og)eybv7%~@G*h;H3~4LV(ot1wH7V1qN){>fhjfp zomB>b8TQ`Rq>Oej!LRa^NAdLFz_ufC?>TAyhYND1y;ufa;}RAGIXVS;bZ)Kqg?@fd zB3Af9q+%iy6TNI#-JI>SzTz!Caqa5rm$^oZLkd#L66@u}ME`(cLZtBO0NF6gWz+;F zP3>PF9T1o;I(L?<)w?N>h&7{~EVqyIloicD1D5wB7AWy!raFfl0U_uRvAI14qCdjs zMnv&X*4pjgA7p~!(dQ^B-xtSV3;DOi32uwBV zxyPN&O&Fa{V|~%Ysm|Ka5hAGwz!_HTaav}8isPbKYZ9Al`I>VUe+3Bz@q$zL%X0Y% zHX~LF%BS{j+%#3mq|p`L#}FDafCL)AptGhsU7RG=_#Qn@p4eC*)Qc504*~t#k1deI zyS=}yKx`TAA^q2{M_9;*q5XKH!rxtw>9H>!S%vkrWLpDzz4iIRK;R!tHHFmkEKMEd z*nL6-P5tF6qJ;jG!tdBHt@_LO5exd7G-aXWOD-1|rby<)NH4s`Gne8oKgig}0E`5h z$mH{D_^~iR>I%v$ijDJ=z{2V{FXfb!h(|kfhN!R6qu-u}_e`RmSgAEzl;BbdL`>Df zQcwKdf`LBHQitjG+oibxs5qF_J4Bc2mmZ1kik4BkPj*WW>aIPvZBswp~GgyL&H#z5Cfccg#NkroJo?8O@fX;I^ zxfD%PyY|AG_XwyAEKxIs&Xzybc|7B)DjVncs5EPCubtUps*EEFTMs>_(`@@#+Y(?6 z8!LEJAeC<8_W5hy=9|9s(8ml~sMjk?nI~bH{(?cA-oK?<#5{8hT-0UFHgc6#WnspR zR`!bbEz+i{f}pn?Y>bDG$XWVVs0!`w-n`^|c2Jty(fTC{109L;3(My)1#%?nV7jdV zT&Ma-(UaceQ%@13Vkr=u*bpLQ$^N{B^|1gaYiv=p@8m?M$=}X%e#dXJ?c+5KH7s7k zb8hFG?FGEMyedR+y>KqL2(R(*K5Wo1fC=Im9d*JUGJa3&SMLS8yscmpUiNyhnGp@m z)-G$*I@&7~`41gdoQ|-_@I~d%=zv6k7~|eGezM~yLck}*cWCKx_g_ZE`4LI^7z3B5 z00AEIVYT01$Sl#QhI}`-W8cY2(ZK@(qFrRd{rC!tziy_g=Hlu^HmK~F)uF=|J=M8sR3JWAFoQiOg;W1KM?;cQfpA~s|A#xksD<Zcu|5MTI^SA)D(Hz>^^!4gI;-d){Qz{A?N^MjMA2smyX>fubq5)Uv$XJpW}* zu;#Q=q8Uc+&^u6t<=hJ7yx7W19q=*mA4_^-K*G^Kr7(Y|Dq$i!!< z?`12p9eY>r-%@}20~lc}E@c@@Z>Z!GTxh=jR|&aUk=&xE>UVLgdalhBxE*a;KN$RMtFreefM>yfB^}}_p(`o$q zZK3{nIP7!S6>+|paN@>@IU*T)`X)B#I2J;zCCl1-nfOwKD?@p+o3;o963YGgnx~q3 zgu1|N>|;}30kKc;MBC`*?P(LBLPGnM7ucyk)Oxd-^O&ph{U)Nl3t@aZ3pVX}~lyfw5JSfwg)JnQZYjb2s zHD9gjRGO=8Wo&Y_BB&{~`limP`I*|HNXt2GuJ-x6H4TQkdi*##=qYe&ErW=BSYU$7 zW+|t66b{5q!V}L!uY-NTR7_vOz>qqcsa|5=gGOS?qUAg~nl!&F4pQ&IFIh!%+ViM^ zK~QnDaPr$yDQy{-yN`nQ$6&DF)gPuGyJzd$st75_sU&qLY7q-p>W(RPcd;1HUR&EF z!_aPXavh&gqmg3#%e*=_m*8af^Yg;u8b?QQZJRY+{_l@pHE`7uwCp}6_^W*${e+J8 z%A)SonG$WCkoPNmsRX0Dd>0q#9X8^hu8VhVwvo4*Ei7DiXrDi~&n2*5RB${_BZctc z0JC?6bF|EB&qLKc%6CpJ4}))OJ-Oool>P))Ne^ppv)zsn!GPYWhm*bP+7%&7=(RrP z-*)Yam$P%tFHS)?*R$MQy3VtQ4B8x#e#hQ#!^_g;kBiSotyUU~*FmIfb(i7q_pA0{ zyg;<0UeA-RV4M4U@}6%sS0U5ouac7lRh`4bL&+vJ9UZSed}At|kZCeW6EeV8@ngbs zvj-&TFzZhyD|a!v4e)~TE>fkAgQY4&vt;xDA#fsP)>`#>lO=-xMV+A+xHV>RE7Gu~J4O9T(8vzT6ANQVV3@y8cP zVZB~F8S)^IMwIrH`md)v%jPmK1PH6BTjy_m=sh=Z5}Z>DXP|9n>~#rG1xpTwk4xV7 z&wnMUsChqjn`lAFjq;WgTiA zTwfDx!Dtq4HwAELds(jkn6h3c8Y?yXU@}+BP?N&};ovW^G zSS@(v=zf9}$^Cui85!W?aiBd4Hn~v1>8GiuH=RJI-3(>L*$FYpG#irG*xU^_SJ}mu{c6!(9rJ3%nlVkO9apbiZGemxOzuT?lXAcwge) ztGBek1IiBeSlKRkYJ9zdxFg5c^@`dXk>h2#`^I$Ds0?RXTwrsx*sr#8k&(e?%}ne5&h`; z%K~O)gQ5e~o(0KYN9z;EO27yR?uMv@wN*7RHj;L$K4@Q_+>16SHrhwldJA*zfL z{ z?J*lBJi=fdC1vd0=eEENcz7%9C`zT=fun_1TLbI4AZH44r+UYH?dhdCkeaGWZEl(Q z7SnPJM1?DuL4R6#WWs4?Cm=k4Y1m1|mWpDE@!KZ_azZkzNIo}4?>=+jV)anWxXL|F$%8+ln|9+ z0L2$$8Tde;09_Q~-3L{po=Pa^p}LcDT^JlwZ|N>>mYSGE02tnrEEFB*EQiodwOgJ` zI8Ikj6`eh&dp=DHS`@cjAGVYgTyw{BTS0caq)C+IFv|FeO}O5PZ! zTfe8QWLN?`MLkiN8fEr?2@j@i&T&dD4WWejRq7ezmoa*#EBDd6Gv8p!5TWBn%{%x8 z^lUmtmTNHgJ(V@BRI_6%xdo^Vn-E15mFNtVTebOU`3#}AxN?+lU*c5fY;Da;bdg$u zJ3Be)rl%c`yMq!AUGs^Zp#Gz*!2u1=uR>j|p|PA|c#Tr!)V+VUD{GbKVF3lkoPezr z^m5@$v4=xlIBt7xFnDORW|_Uu({W)j2H{f`V2#_ejuzoEinJ#$3NxVTa@LVG>3JOI z{i4{PI-GWVbk&3$L2`teSfOsOp)bs*Vsn;X`1K{N-}@#itlYBvLfkF${W*?>aJap? zF99spQ!VB4kkGGTwl=#l-$NWFP??QGwj`xs*VW{RwsyZTUc&6^tVE7V>UI@E{0Yw6 zP8zd6uJ=t>K>-45wG^Md?}MR`pa%9NmT`$P_GhHo;ZWu~_R>^@)aM5JZ9-;oZ(RSj z6gQV5nwhd7hXi=%>O1Nz$tWfVSXfx_tbY@o9TBiHd~Ulu1uy3=hY&n`SH1tEps)!A zkP#o6np+m4a+@C$WUr=1Rq zq*Yi-2~h*~Rg>24w>~k{-@84wrhd&brotYK=Vmx!2qj&rU9gIx>ZI-8`z3}v*%w26lr>m+6Z;rvSIe72obZ70q`o_PVdfVJ&YC_s1BJ8=0ZJVHMhOv8Yf;WAArC*KZfSPidK` zd?TvswO3(TJf8XMWr+z{Zi~iGS&i3s%Wpq(3;$e=Tr}2;FIL2qW{o_6<^u8YP z)b;w^nvasC>$>YW{_^-1j~J`^L&hT!fuS>wxy6VLqA438SSSwFWpvC7Cv*XM65WFe z+xCY_S>05gB+|bjM5uy|#CT+dLwY*Iotu;8`6Fd!-5=_mr*Dz3pzdZeY7~NBNQAiJ z^`xIQo0~ru^H9hC3DmedLrUPxVDDI%$>lEtIn`Gx?Wz8^AUHtdvS?RNgc;siug|$v z+8l1Z9Lim7k-k-t;|=ocf9C0^bXE8vxv87AjvXFe@k@ivTdvcfz4ltKAUrO&zSLyb zZz<@D#c=AC=YE;%#ctUdJK={xi?sOwIqFg+YMIwmH@y*GKOM8`pnUt;9KJKd8&Umk zLaou*1RH?u@8%cD#n5bC!o^^NE!dc)4*2Kl1$jh*cX~iblr^2KCk<{uUwkFxcG_dn ztnVa_owCTz!9{BDz6wnZh#tI0NYTVzf@VWYso-(?rwS=!+gx+X)E$BQEAS){T9lj!c@Av z=Ejq6=8ApoTmywalU%fB*YOSZ3zbz#xK)Xqp6FFQX=qRh1ORC#lIe=9&x?uAfcU`E z^Ur<=?LNvRXY)HA#%c(BzC*8VdL^Q$1z1Q(>L4hk9-W$VhtBAZMxyoiRADXeA$(VB zff{dzQ>O_i;o8t*4tAJ?}9C!&1x7=6Z_(Y$NSksH@8f{@-p6S$0UN{y!sH$-zCE6%N)9(D>Fce*_O%(x>obw{W6oJ^M@Ka(UmvC# zcli};sy+6GWDpKRLR2FElexba&#M95grHkw4z!9a( zxJ>^}M^mkr1CwFK0UYFE4-RYOC#JKNg|Hb0`*AGCP> zsYubDqf>98-Q{*FNOvvuZ;uPI*J07H4EYcel7PeHQj&AM1;~Xi4lSp?^uX^&gjbX) zqJpl@)0pFER7W#Eo@7UI+o~f5s-ENY8}@N6Lbn8nSwKVww% zJP0=usyeZe(GzXkm{9cXD$q356jd9w+t#h`jhPIA;hg9gka)tZ`7J%UuRY)B6Brb0 zX}}ZVcsZ0<_j2Hpdbc}TYw}dxk%+4Rq@HJuhStfVNyg$#j*fw|P<}*$eNL9YB@BzR zZ$~A>MvFPqpYWh1Ch0O-P0qIdomxIOScRCdLQ>y`9elH2Gb<8-E)70U3}!OuA?htcJI{)W?Y|7pW8i z&U+*>6HELye`=gLi4fH5>0L7CH8mAlP2>W|U2@VSuq2D_NRAd~=Vm!Lk5b_tz2rrH zEf$M93PkB6LICyg*}>D3+<&=d6LEK4`S%#_xD?FL`WJ9RJ-eVA=oK&pV-cb?97?}R z5zXfwV%X%gM-(;1=`_246Yp1*xfAzY{?T1Oy~IB;$Fac6I)c~S!y0wgYQVSW=U7NX z6A7C_I!4uDGjv$v8eJV9SS0V?Ctm=8EEjxy#QaDBIW{SiITo=X=YUVu36}p`^3c2z zJQrwUL*l-LrNWA?9%;yCsT{L6K$BtbVo#>-q9h#j5BtaGu4}CGHEhzekS#<-sYfgI zDq$>ZTD)qZoi)Pw@?i9wFx6F;r(g*y2g**DJQ|>qXmN?Za{v2yr%5sg8D!te>~<=L zSov+To|AjD$0sXD_j7J3V;R^5fP+d%zmvR)qBaB`INQ7aGLvP zrW}*h*QWcWvr&pP*H4<9Y9iVY!@zJ<7viJm7ahXnHwQm{db|cBHrx~kA$;4p>S9$k~n+GDJp^gefCKY1umO+UVQ}wj+WBz_L5#Q_lDlcu+#(Ll4EHrVMge zSMqWprMT4zdwl_+W^~9HA*O*cls|4EB5voi^3_snCJVn1Gpm5wk*RD>-me*gw|sac#( z|K4Pk4U?~RC4NS?Y%>Qndg!Hd^!?sQ_umM&XJh3lrHwF4o*24ZzU-IUHs+Mg!l_Bc z#3GV9oRWD+bQv;#V&@2_!Ml?7Fy^FyXfLHnm>RGEq09inq#qj8dD@JUK$7i z^v;!&HERmU%(ue@j06PCG)CM1VH74(=O>`M?bO5HLS*JyP`*c&KK|}0p zZXO6I;^%&PH@u~PJXD&J$a-3_HM2r=4*UiMrfkA&gd1rVHI)smZDHz;A;6F!=MlL# z42jWGGYusb*wI)3I`OuVLvn&3#YLefp{0oEBa`BT5#hH6@b>0P^A$O%wjhZwwao$S3+=rVsoI@A3a7b82RJ zrFNo4urIk}|1WX&IrgI{nOQ<3CfL&fZf8Vzhwd^FLXrWqioHKPrOE9icvlAA+?JEt zG{GUcdnDm2zFoXai4cP*kQe1?*qEX*Dx*OI3z^atODp=Jfi$5t=!M6=(HH&Z4G_tR zA{dZ8m-!uUvzW$XG_E`tM=2iC08KXpAE_akA9DRW!!a>GnOsQJITn(g`S(Uu?r1fQ zM47ZkBDlvq@?K|3ap*7R?}21iRMY-?90;FU3QQn6jRdMDaU_6T z(Tji^MY&458Y`AcnAB?{Y+k_8C=$~eCOQ%E1O>ej00<5Liv{>@(-)l^FNJ|C>D~~( z&1!{55-6l0*|Jud_Zs*Coe@hdB;tLYK;ad<@Co8##_6&C7$`Ia|XsOm9-f^kuBFrrahH zqHT7nrWsIcQh{dlFOG$5xR-ZqDb{4)r#}^*khCg}Pc$yeA+L!iD^u?N#xc-{hqjW` zlLn_j4~fl4QtHnZtzjy`b8p@4E*frGl=;(7hAc-?cr8vviasBU0#2?eD4)soXOz6s zZC?8DxDdkpdq6nS*oqG-=d2JT?+A0_m}+!=0=B>BQ)FRIPWOBBuBLH?=JEY=O<|_b zceg-LB@L3n)!{9sfY z;EayM1ebFqmK%mHaR%xE8q)OCy`{Ki5_kndWV<}fMaWn&wGMeRj7Fids)8#DHsB2ze0 zIdK`iTQf^k3g-Y%u>pUZATcKwlK@}-&jNHuF4?a>sR)r$QlcxTK=4rgw~J&JWs#ec zd%P(sc<2|P()-=Fq@tb1wwcUP$1mOhgs3Jn6-R>&+p+E3P^MGIj(#DXkB@1}lpuFx zKY-7pD20uzjYYRBZsX6O8QCCBUlfdB;D!|=e(;-G*2k8zrJx|SmLN$Rfhk2vDQ?m= z5xa~zBZ{f%lZ_>>Y_Ikak$RjwHnK>%?NgCw+beB3!iQWZ)(8DL4o_I(XM$*=myj|w zhZO4DCYisy!NQcO!x=!qQjnr1hS@mk54q1b5U)t3ks6j9F)USzUq6vQ;K%O>K zlsc4fCXvI-EaGjT`KBR726opo+w3<6Xa3uM!_eCuGU`|-MRZPYr1^8mIZf*YcMRNMJZkK5Cwz19KeYMGc`-;rtS|c}vAL#p)`YfaQ(GZk3$! z$u;l!b>yRq7b%t3$aDV3%^Zho%wQs4B zseduqftjBAD@`W`Gwg@P`uk3hdw3; zwaqog_FGVk(L^}q*%8>V>Nq{>n*2;W^q1Tp#A=rz$yjo%f|P_S0`?u+Ri=dwcdX?dOmi&KoHk`b+~A zbX7G~xoO|HUgj#P+ixQ(RFvaYmE*myk9Bz`EmN3{ET~V~yxsqll(-j2xyM0b%x5%x zxs)1fmFrCtZc1gNkJ*L-KIEF2o=L71Gu0;WN-`wP>P^nsSzcB3zQL-QS}C=l?_Wpr zX<^69Kl#+3fpaIl$mdB9Gqe?1a(5y@sO#^YA{?{H+sMvV%)49t74HL7>PyQY5|4vP zgT=qwzm2opH!YL2cwJM^*PgPj_ql;i=eOemXKnk_OOrVTeJ4xuRF1+YF!$!c=Gdq# zKR-s>!&IQbeCBp|?MKiG9Rq`-V0==-FA3qHs(cDa>;mI0_V{i8bXR_k;PFve;ufdV z!*fy|vC~0lOK}PekgI;O6QeYVe>Cd@}_yVC?X5&erajYswQ_-NgS7vqqFXTgVc?Us9>li&Ms zIX8+Q0x&Qzz+V#GkQ>aL$l&Fb8UZl(_X>g|(!K-Qcr+N6P2ao0vlko7LetQjAX)7 zB;cWBA{NK=F%Tu%Dd-OlLx@ex51?JsP^_n(yuo8s!4ix+PW%|v!Ec?i*=5LiLWVM|U3jsH^`~?s zVMgDiV)fmSp%v?Q7p&X@O;|1aKk=IMC-$O5sq2t%;n8TIE>#h4T{2BhRdsPTvC2xE zJy(6QjYRNul3<7!F%+`mE$BDILu%7EO7P4hf@{)uqhan6t1%f{LR(4B?M2?`3L;6_ zDMzRHcV4Uifk`Mi@&!?a^x-Wfi>6A6#6KY!ckzf9VcqFoA9R~@=Y9JMw~cJ@ERqjv zg&26zL;8Mm%eJZfZg52-JcOwl;feX0|9ERpFgAL2(}4b z59$7fMSJGSNs55+x$$~ySjU9uGdkgWckJkNrHZ|H$O>KRm?#4B+@NUJ@ywmv%8 zOb^&9Ntw}vTkxrK-uXapD5zqxHxOCD&$mV<`AeMD6G2Z%6&DdRQXv*!1va$Rx|{UT zDX4qT6#0WX4_bIrd41ba??>Lzl7rd9} zm_hApxq@U zKu>QPI+<7)Vyci+bA2IGw~dFxL%4D4D*v&zR0**rD;!|N%vBA7=xHytB4GR%k0z%= z!Hkk$x$0-wx@#>$p3l5%&MbK{;RA$g^sKD*EEZ=un2xHLH}&2;4|Yp&}O# zA+nPY9!umIv{lr&>xYDbg39{<2_G#}Hm~&iL|U@q>6n<97?_xu2AK|c7Gt)1VkrKv zQ6whsPW12pcoI3n|F{vRUHkxf5EYTM)I|>0yw}drW9A9H{Qx<`Lps{)?jopyk#{cl z!C{YjcG?ki{E zk%P(p`g?P>U^6H%?-xgt`~HH@Yk?Qt;Ki6aTT;+sEcHK4ouf1hQgpYHPYL*zRTX?Q zypOpOGSRX3vQUNlnd4g5{@P#ev1b`Oj;^`A@5OUl)}NQ5rY|vWBRo!SG-G1X^aR+$K|Jp zxXYJI1gP6lE(7bY>kS^KQ=#)&r?m#$;W>SE`{|R)3A6(wOYb*O6%$J(%tiM+@6U+rw^g81%U?Q+`0v-+K&g5I>E4^5zUwnjSMS{= zUd{8z<1eZ||5$hZBK>Oq&?VSD!4;9=dXVA%&)egc<6K93TLB70^8V=kHlF45wC4KU zM(TMda{l%!3`))A?fvWR_Ac7XHOP7i8{(q;Wv@+eu;Xxwu(_h;xc~aBS-O3j|JV!( zGIL{2aQ!JEt9^wu;TM=46ET1h9>!Vl{#lp*{oQLp&9ocBo#APXDdYV4$y-Zn z{Yr4Y^*vIgeebyaGQfOHhp$iwyp+}QN~rsOYA!+$9vEfJoP|^VauC6-<*hFwbZhN; zQK1<%tPxflicjC~6q_SvN=*z3G^yOXY?0*t;nsCt#D84PagF-bso&cA`P83qwtARZ zBR+_1NJXc0sb)J{aK&l)w4>uaz|zux&SDD+U{Gsp{b_i=mY4zOAYv~&!YnNR%Bz~G z%W*N~>HTtge&%)2bQ;vt1trg4*)D!3_`a|Evc>KEb(%}yd+}yli@0>s3`|ay%ImH4 zke~Ytxb)nYyAr=>n+e_Ymxe;C0En^Y+l``>i}~xxjVC z`#Pm)*3&;G)gR$jZhJPji_&3uz(bNw{Rki9n2V-A91vd2q4IqHVjzzWgddd%OusB~ zSF{{h;%2#@T5m3;2{iDHW|Hq!fbNM$uM%kQn#E)A6Oue%18eTz&*4})j+E|6V*gNj z!eup`4y$IhSk1y@dDcEra(n7|Den#`3ox`j?2&rpoP>;P*{!7_2|O-eP?IKeOF~EC zi@0gRU~MbJ#6~K2{$@q)VTBe~oQg>WeBcs0uAjWy-qrUC>5yVAm=Ky z&W3}l1QGAoRfhJO@nS9?9A;2q^){)dI6NTaymEakuE_*h3Ce7M z@Ay@zX?YW`UGM1X98v4DLPwJiUQP9}W4q#rX2vd|c`$A&?{xWuR6BntBbN4^S5h@M zz5cz?<@?*;#yHgBSNXDUnYbDv(43XVx+edwU>=_v!c8(&b>JyAg9?_UZwI=FdrA^# z_D@#?_A1Oj<1fBO>2pbH>G3Z$x4qZmTwgU<5wMlus;a|%kqN`lQ)Vvei4?5WtU`o! zwj?goQWtUNZwP32o6{OMKgpS%Ez#9_f9jU^IvE*SZaE%LS$>}~Z)3L1So8E$$QEa( z_~x=@3t_na%I)#+ey3&v{h4t6u4?@CiFPYX@G;1f062L)b`B38_Rw)Vau;_$+}W>jJ?-cXu6rj$%j9Y{he+NtOtMQLzA(w<$mad1)D zgR%*WIqLC~r?|Z1{jJNh$apPqS=a00t_%k$i95^bwvM6UtKEBGxq2?h)l7x)hOqD7 z`wI(hKXb;ETJ7sB1UK0sMtojB>KPtiTM@Ihs-~sV<-}N_*p1;hBHcoBoAqk3D~zV| zCoUC@XWcB5R9P(O-#+MT*HN!9q&n(tl`k@vN2BiUOQdVMuWw2v+$mu zn$xKKS6jZkyq-PRyC+tZOQ!9Bfmg@TTeEen`?t&TmUox=Rqxj0OgJ4vMz!iZEgyno zLf`Jx?iq*xcnDm(0JY0lB}DgnqUxK0y+X8kEtfIseHUGCLu)m(_BWH~mEm#z`!Doe1q+XR*F>E2i|6}aSU`UE1=HYXjv){KbMqe~(N>Y<-LRo*qg05I&Q`b& zBSGNCWUk&6dy4RB#rbR)%U5^xAMNuuIPtSzzNkE+yLi3kJXL>16W?R{%<|^Dvnx5;<7h3v-?wdc$`W>s* z^=MRi-|G3(7lyQvHPGS>0fJayZ&Ak zIp~~=r&lj;vW`;y(dUkvlxg8{!CG#Vgp)P@p8P`X%F+c^#829nhvQ|VUNGxI3r0x4PvLwKGto-WrPDO>T38agv$7Xqo?7S-|9_-`JQiNBwbIsA;kFn9?h2=_JrW9TUhw5b-8k!d4Gk8L z$KO4(_5A{!N4vtxq{(Bo?!B71^?nnSB^UW3x_Ni%iL0f!dTS`&T-37DD(|$U=V&EJ z)cDhD=N7kc6doY(+-=Ev>g(`+WN;SLKA!&%fh^uOtl3Mj!Ky4HX>LFzop@Lr)0rOr zUe59~dsr9De{Z%W^H&!KH25O7eJBV2x{Qx!xktHEu3R38=sq9F>*CQQPta2?dwXtY ztT#P!M|nevFv-6jC8o`-zc454q*Il}&+X7bPAGnsop>HV$;!GuCG@)6DfEz=AMSXc zWRf3ut%!}J?AmyH@q^3~0?^<5{5(1UzzF&Z2@+Pa=->bf>VM9Mm&qYpPHyDDv%wO~ z-_O)+zQX!4JR8Ba4pjMhW19y)uCnu5^DB2r9j)v(@#$nawVJ^ae6c`uSTDDPhLork z=jBL6R34>5qwjrit%?*BmS0Pd5ylmL`%_-8)$E709?~?QlkJRT06veX2tVpeVlbc{ zXjbch4Z&)gmkl9!|F5FC<*539RdGMFM*~(DK1vB z{-T#8H5%{3St0oXW=79b4rPmEhI4rVmq~s>jGg-(o=YNlhM{#$%p-o9ITIRw&4at$ z@a8nG9gD-{zT8sCN*b(%_ctL{@n0qlE` z)X7X@ew$$SOm`rIpY)X@c69}oNQVWJY&F(5F=1yW<@I-x~~NmrvcT?E59 zKK4vHberl7&^}>qk(FVyv4xPpG7nBUI5{|C0^ymapNU8D3{u8*9UR%fLVZGJvbLw8 zK3iT&hUrC@9LoLH+3J%o^}CvO7<@*ghUa14FS}v=?IaD>jp-9ol+tHSA?XrE(7m&6 zWM%R3WK$$*AZlTmsxmFS^xC=d35>&1<0*oixsc%ya8s;Z@Mo&Va7?R^oK(M+PdN?j z(QFe^;y*5CbWZJrm6XLQ^8|2Uw*4rJ95V0e$g4{x%kfhS0I3*~0X*EmjX%?}r>6PZ z{ZZRIku$(y8W(Tv6fgZ{Vjw8>Gsnm2bjl$U zseNcAaKMDrku7B!rd?ydMU;G4pLNXYJYReqrnM#6cCwDx$0kw(2{*rRJh&K@P(8?u z0!H$jS)0hbykm4oim4BaIpb26q}MD{nU$##qN(GIDNv~5gNOIA?V83R zZMoe<^X9`. + :doc:`LDAP expert settings <../configuration_user/user_auth_ldap>`. .. note:: In many scenarios Shibboleth is not intended to hide the user's password from the service provider, but only to implement SSO. If that is @@ -202,7 +202,7 @@ In **Autoprovision Users** mode the app will not ask another user backend, but instead provision users on the fly by reading the two additional environment variables for display name and email address. -.. figure:: images/shib-gui6.png +.. figure:: ../images/shib-gui6.png :alt: Dropdowns for mapping Shibboleth environment configuration variables to ownCloud user attributes. *figure 2: Mapping Shibboleth environment configuration variables to ownCloud @@ -242,7 +242,7 @@ shows a test Shibboleth login screen from `Testshib.org `_ on the ownCloud desktop sync client. -.. figure:: images/shib-gui1.png +.. figure:: ../images/shib-gui1.png :alt: First client login screen. *figure 3: First login screen* @@ -251,7 +251,7 @@ Then after going through the setup wizard, the desktop sync client displays the server and login information just like it does for any other ownCloud server connections. -.. figure:: images/shib-gui4.png +.. figure:: ../images/shib-gui4.png :alt: The ownCloud client shows which server you are connected to. *figure 4: ownCloud client displays server information* @@ -269,7 +269,7 @@ WebDAV Url, for example ``https://cloud.example.com/remote.php/nonshib-webdav/`` to log in with their username and password. The password is generated on the Personal settings page. -.. image:: images/shibboleth-personal.png +.. image:: ../images/shibboleth-personal.png .. note:: In **Single sign-on only** mode the alternative WebDAV Url feature will not work, as we have no way to store the WebDAV password. Instead the diff --git a/admin_manual/enterprise-only/enterprise_external_storage/images/jive_2.png b/admin_manual/images/jive_2.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_external_storage/images/jive_2.png rename to admin_manual/images/jive_2.png diff --git a/admin_manual/enterprise-only/enterprise_external_storage/images/jive_config.png b/admin_manual/images/jive_config.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_external_storage/images/jive_config.png rename to admin_manual/images/jive_config.png diff --git a/admin_manual/enterprise-only/enterprise_clients/images/ownbrander-1.png b/admin_manual/images/ownbrander-1.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_clients/images/ownbrander-1.png rename to admin_manual/images/ownbrander-1.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui1.png b/admin_manual/images/shib-gui1.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shib-gui1.png rename to admin_manual/images/shib-gui1.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui2.png b/admin_manual/images/shib-gui2.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shib-gui2.png rename to admin_manual/images/shib-gui2.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui4.png b/admin_manual/images/shib-gui4.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shib-gui4.png rename to admin_manual/images/shib-gui4.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui5.png b/admin_manual/images/shib-gui5.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shib-gui5.png rename to admin_manual/images/shib-gui5.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shib-gui6.png b/admin_manual/images/shib-gui6.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shib-gui6.png rename to admin_manual/images/shib-gui6.png diff --git a/admin_manual/enterprise-only/enterprise_user_management/images/shibboleth-personal.png b/admin_manual/images/shibboleth-personal.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_user_management/images/shibboleth-personal.png rename to admin_manual/images/shibboleth-personal.png diff --git a/admin_manual/enterprise-only/enterprise_server_branding/images/webbrander-1.png b/admin_manual/images/webbrander-1.png similarity index 100% rename from admin_manual/enterprise-only/enterprise_server_branding/images/webbrander-1.png rename to admin_manual/images/webbrander-1.png diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst index 744e9e09e..9988505ad 100644 --- a/admin_manual/installation/linux_installation.rst +++ b/admin_manual/installation/linux_installation.rst @@ -70,8 +70,8 @@ to the next major release before you're ready. Installing ownCloud Enterprise Subscription ------------------------------------------- -See :doc:`../enterprise-only/enterprise_installation/linux_installation` for -instructions on installing ownCloud Enterprise Subscription. +See :doc:`../enterprise_installation/linux_installation` for instructions on +installing ownCloud Enterprise Subscription. Downgrading Not Supported ------------------------- diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index c5d0c39cd..c9c8c87f2 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -8,7 +8,7 @@ ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date. .. note:: Enterprise Subscription customers should refer to - :doc:`../enterprise-only/enterprise_installation/linux_installation` + :doc:`../enterprise_installation/linux_installation` If there are no packages for your Linux distribution, or you prefer installing from the source tarball, you can setup ownCloud from scratch using a classic diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 35d0fc06c..4d42e685f 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -14,8 +14,7 @@ There are three ways to upgrade your ownCloud server: from `owncloud.org/install/`_. * Enterprise Subscription customers will use their Enterprise software repositories to maintain their ownCloud servers, rather than the Open Build - Service. Please see - :doc:`../enterprise-only/enterprise_installation/linux_installation` for + Service. Please see :doc:`../enterprise_installation/linux_installation` for more information. When an update is available for your ownCloud server, you will see a diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst index b69038467..cb0b500d1 100644 --- a/admin_manual/whats_new_admin.rst +++ b/admin_manual/whats_new_admin.rst @@ -32,9 +32,9 @@ Enterprise Only --------------- * Advanced tagging management with the Workflow app. - (:doc:`enterprise-only/enterprise_file_management/files_tagging`) + (:doc:`enterprise_file_management/files_tagging`) * Advanced authentication backends. - (:doc:`enterprise-only/enterprise_external_storage/enterprise_only_auth`) + (:doc:`enterprise_external_storage/enterprise_only_auth`) * Password policy app for share links, for setting password requirements such as minimum length and required characters. (:ref:`password_policy_label`)