From 7b6f4c9342d49fcfd2919281b82bbd249bc29e4c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 20 Aug 2021 19:52:30 +0800 Subject: [PATCH] acknowledge ctrip contribution and change copyright footer --- .../src/main/resources/static/i18n/en.json | 2 -- .../src/main/resources/static/i18n/zh-CN.json | 2 -- .../resources/static/views/common/footer.html | 2 +- docs/en/community/thank-you.md | 6 ++++++ docs/en/images/community/ctrip.jpeg | Bin 0 -> 4935 bytes docs/zh/README.md | 4 ++-- docs/zh/community/thank-you.md | 5 +++++ docs/zh/design/apollo-introduction.md | 2 +- docs/zh/faq/faq.md | 2 +- docs/zh/images/community/ctrip.png | Bin 0 -> 2360 bytes 10 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 docs/en/images/community/ctrip.jpeg create mode 100644 docs/zh/images/community/ctrip.png diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json index c254965f4..08dafbbf8 100644 --- a/apollo-portal/src/main/resources/static/i18n/en.json +++ b/apollo-portal/src/main/resources/static/i18n/en.json @@ -1,7 +1,5 @@ { "Common.Title": "Apollo Configuration Center", - "Common.Ctrip": "Ctrip", - "Common.CtripDepartment": "Framework R&D Department", "Common.Nav.ShowNavBar": "Display navigation bar", "Common.Nav.HideNavBar": "Hide navigation bar", "Common.Nav.Help": "Help", diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json index 6e5c448a8..a284b6d03 100644 --- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json +++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json @@ -1,7 +1,5 @@ { "Common.Title": "Apollo配置中心", - "Common.Ctrip": "携程", - "Common.CtripDepartment": "框架研发部", "Common.Nav.ShowNavBar": "显示导航栏", "Common.Nav.HideNavBar": "隐藏导航栏", "Common.Nav.Help": "帮助", diff --git a/apollo-portal/src/main/resources/static/views/common/footer.html b/apollo-portal/src/main/resources/static/views/common/footer.html index 6f56a0e4c..6f4b885f2 100644 --- a/apollo-portal/src/main/resources/static/views/common/footer.html +++ b/apollo-portal/src/main/resources/static/views/common/footer.html @@ -17,7 +17,7 @@

- {{'Common.Ctrip' | translate }} {{'Common.CtripDepartment' | translate }} + Copyright 2021 Apollo Authors diff --git a/docs/en/community/thank-you.md b/docs/en/community/thank-you.md index a4198b618..0cca9ef3d 100644 --- a/docs/en/community/thank-you.md +++ b/docs/en/community/thank-you.md @@ -1,5 +1,11 @@ # Thank you +

+ctrip + +The Apollo project was born in Ctrip framework R&D department, and received encouragement and support from various parties during the initial development process. +Thanks Ctrip for the contribution to the Apollo community. +
jetbrains intellij-idea diff --git a/docs/en/images/community/ctrip.jpeg b/docs/en/images/community/ctrip.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..45690facb07493e8e4bf9a8dfc6e7088a27a59b6 GIT binary patch literal 4935 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 +ctrip + +Apollo 项目诞生于携程框架研发部，在初始开发过程中得到了各方的鼓励和支持，感谢携程为 Apollo 社区做出的贡献。 +
jetbrains intellij-idea diff --git a/docs/zh/design/apollo-introduction.md b/docs/zh/design/apollo-introduction.md index cca65f9e8..866488c19 100644 --- a/docs/zh/design/apollo-introduction.md +++ b/docs/zh/design/apollo-introduction.md @@ -13,7 +13,7 @@ Apollo配置中心应运而生！ ## 1.2 Apollo简介 -Apollo（阿波罗）是携程框架部门研发的开源配置管理中心，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。 +Apollo（阿波罗）是一款可靠的分布式配置管理中心，诞生于携程框架研发部，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性，适用于微服务配置管理场景。 Apollo支持4个维度管理Key-Value格式的配置： diff --git a/docs/zh/faq/faq.md b/docs/zh/faq/faq.md index 7e7c66048..8f8b4d053 100644 --- a/docs/zh/faq/faq.md +++ b/docs/zh/faq/faq.md @@ -1,5 +1,5 @@ ## 1. Apollo是什么？ -Apollo（阿波罗）是携程框架部门研发的配置管理平台，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。 +Apollo（阿波罗）是一款可靠的分布式配置管理中心，诞生于携程框架研发部，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性，适用于微服务配置管理场景。 更多介绍，可以参考[Apollo配置中心介绍](zh/design/apollo-introduction) diff --git a/docs/zh/images/community/ctrip.png b/docs/zh/images/community/ctrip.png new file mode 100644 index 0000000000000000000000000000000000000000..d120bff0be277d5b4abd7160c1756c1ed8b4de3e GIT binary patch literal 2360 zcmV-83CH${P)RTBX{EenH1KOQ=E#5U-L(L0000ObW%=J0Px{ZU~#}7u#gfi z&!9kq);LH<`*Wz_?S>y8000PkNkl}9g>dR8vb^}P(v zU)yq4YVH7N?rwPHOMWh=`2BcnMo% zp(x#F*X9MC@&@_00H;ZZ@%tWmO$YpqflW5oG@CLKTW7B=L`iI;&8f}z47Hzaq1j} zsVp?|A-%(6cZnIINpt1L0a0%L~4XvazL$u4jSo!rEA< zeckuRu2EYk&m!V2(&p=kmL_+wivl}!_UH!|9n>beSa?8y8ki%`W=@=MnNg9AcBU zEOnwO%l1PRcW09tUL!3Bh2}RbC0E;CJa7iZ9lbA$+{q$e{3<-n_b+Eb-ltohf%I?Q zEkm}cGYj`fDjd=6E*o=G7R4{k@>4^;DukUZCfg|%PhZbR+=^vm-}A-_Oos;@T^do< zHS7oEC9m$_S{9`v%;&U`%}%@q_nr{GIZIkL&ILW&Vj5Kw2fvyLjuHIK>12g$$};hS zs%Gikx(@CpC$^7zF^jDKN&jCK%?q}gMZzw1MH*43zEm8)59L*F=WnfG2kof`7>&P)sHSp=<4c=YSCsEs#GQ~VZ>6VIMb z4!lY=XEE8a>sffDl`92bc()Ae*P{K^-nlKP3PNER9Yh83P)%9A|9kF0 z{O%^Jk@dNNg@-QRF9sH?MX(4hVsxUTwUDy+ffn@ALtD~lsof1|wKg4clonBx%OSrG zz94CeRz|+n{L$N*@Qcush&;Mrav&D`TF?uJp6xx^lCuYF_lLt?25M=FGIA!S%t%Mq z#F}fz=t2ZV1dByZ1>)3*#@0&Y5z+p-m`qfQzJ22 z@Vb_OaZUnLM>V48C#?ZMnd%TQcGoG8KDJ>$&f0) zCiCQ^TJVed=_T$T@lQ7Bq?vu)GL}b=EdxZ4FST@Y16od?6J$Mn}M5?7d~nXpv87k^b9$ zYfV2TNg8R?VtcojwP<)(h!*scP7C%Ve0sNHz=8B(AP%*J^kEQzmLwQQEp{&OiWV#; z!?mE7$~k|>bIKP9IJ>Vx{Fkxy!= zGRjDi4>}SxrEujq)v|-=`4{%{&_0YtM%{mB=hmW4pkL8~#UyIkK%+nlcnQ=ZLYJO! zBoy}i?@r!Q<#5fF*-FKJ(^8f0LSb;`GB%{je`rlx@;l5w=J^jbV>%Cp&sxOHB@j{& z^f31U0=RALGK0XwySYOwH|BmC&RmrFEX_nJ+wH%%+wJ%Ma5S9AGgMaIMA_R+z2*A( zbhMmyB+pmgh7>mH^V1P`=hF}8^KN}e_2=t6g`q1!?G3ZH#=)M%MW;0r`l@B6~3`({B+|gfP;I-(lcQOcF etUnO)KK=pmu6J5xvxZ*)0000