Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
2secRain committed Jan 2, 2024
2 parents d4ff0ba + 5b73bad commit 586f04c
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 26 deletions.
52 changes: 52 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
PowerAtom 知识共享及开源协议

VERSION 1

copyright©2024 PowerAtom Foundation
任何人不得修改本协议的副本.

[引言]
本协议力图保障你参与自由知识共享项目或分享/分发/修改再分发其中内容的权力——但注意, 这些行为是有必要限制的, 请继续阅读以知晓.
请注意, 此处的自由知识共享项目, 既注重共享, 又注重免费——请继续阅读以获取详细信息.
[本协议适用的项目]
本协议适用于免费且开放源代码的知识共享项目, 如软件教程, 百科(Wiki).
如果
a)"免费"要求是避免一个逻辑矛盾, 即项目已经允许了你自由分发其中的内容, 但是需要收费, 这会违背自由知识共享的初衷——这点与自
由软件不同. 通常, 知识内容收费意味着在法律上你无权再次分发此内容. 请注意, 此处的"收费"不包括对项目主动的赞助.
b)个人/企业等的博客不适用与本协议.
[认定]
如果项目的版权所有者在项目中明确说明该项目可在本协议(即PowerAtom
知识共享及开源协议)下发布,
那么本协议的所有条款均应适用于此项目及该项目的衍生内容. 如果该项目不符合上
节内容, 那么该协议自动对此项目无效. 获得该协议协议的人, 在下文被称作"你".
[保护]
我们通过以下两个条款来保护你和其他人的权益:
a)禁止任何人否认你的上述权利(参与/分享/分发/修改再分发)或要求你放弃.
对于否定的定义:包括阻止其他人分享源代码或者是项目直接不公开源代码
亦或者对其他分发(如镜像)进行打击.
b)如果你再分发了该项目, 那么从你这里获得该项目内容副本的人将自动获得这些权利, 保护他们的这些权利也将成为你的义务.
c)如果项目使用了特定软件使内容可供正常阅读, 则需要提供此软件副本或必要配置.
[关于参与/分享/分发/修改再分发的术语的严谨解释与要求]
a)参与
参与行为, 包括向此项目提交内容/对此项目直接进行修改而非修改再分发. 请注意, 这些修改需要符合项目所在地的法律规范.并不得破坏项目内容使其他人无法正常阅读的.
同时, 所有参与者需对自己修改的内容负责.
b)分享
分享行为, 包括发送指向项目中内容的链接或者项目内容的片段.
如果直接发送项目的片段,则需要向接收者说明内容的来源并确保其能够准确找到项目.分享行为不应该包括将内容的源代码进行分享,
而被认定为分发.分享行为不应该带有对接收者的付费要求.
c)分发/修改再分发
分发行为, 包括使用直接此项目的源代码在别处公开发布(如镜像站),若对其修改后在别处公开发布则为修改行为.
如果你修改并发布了该项目的副本, 应该告知接收者获取的内容经过修改,
后引入的问题不应该影响到原作者的声誉.同时,所有修改者均需要对自己修改的内容负责.分发/修改后的内容必须在本协议下发布.
请注意, 分发行为不能带有对接收者的付费要求
[授权]
a)在此条款之外, 你无法参与/分享/分发/修改再分发此项目. 相应的,
除了本协议外没有人能够给予你这些权利.
b)本协议无需签字,
你也并没有在这份协议上签字.但一旦你有上述行为, 则代表你已经接受本协议,
你需要遵循本协议.任何人试图通过其他途径绕过本协议进行上述行为的,
本协议给予其的权利将自动终止——但从他手中以本协议获得此项目副本/许可的,
只要他们继续遵守本协议, 那么他们的许可将不会终止.
c)接收者不得将项目的内容用于商业宣传.
[协议变更]
PowerAtom Foundation可能会对此协议进行更新.以后的更新会在此版本的基础上进行一些细节变更,但思想主张不变.
Binary file removed Writerside/images/banner.png
Binary file not shown.
Binary file added Writerside/images/banner_large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Writerside/images/prod_wiki/redmiwatch4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Writerside/images/xmwts3_black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Writerside/images/xmwts3_special_colors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Writerside/images/xmwts3_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Writerside/oww.tree
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<toc-element topic="info.topic"/>
<toc-element topic="issue.md"/>
<toc-element topic="Tasks.md"/>
<toc-element href="https://mirror.ghproxy.com/https://raw.githubusercontent.com/PieTech-WS/OpenWearWiki/master/LICENSE" toc-title="许可"/>
<toc-element toc-title="文档">
<toc-element topic="writing_specifications.md"/>
</toc-element>
<toc-element topic="license.md"/>
<toc-element toc-title="产品百科">
<toc-element topic="Redmi-Watch-4.topic"/>
<toc-element topic="Xiaomi-Watch-S3.topic"/>
Expand Down
8 changes: 8 additions & 0 deletions Writerside/redirection-rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,12 @@
<description>Created after removal of "目录" from OpenWear Wiki</description>
<accepts>Wiki_Index.html</accepts>
</rule>
<rule id="342634ed">
<description><![CDATA[Created after removal of "<license.md>" from OpenWear Wiki]]></description>
<accepts>license.html</accepts>
</rule>
<rule id="7d1c2c9c">
<description>Created after removal of "许可" from OpenWear Wiki</description>
<accepts>LICENSE.html</accepts>
</rule>
</rules>
10 changes: 6 additions & 4 deletions Writerside/topics/about.topic
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title="&#20851;&#20110;" id="about">
<link-summary>OpenWear Wiki,2.5版本</link-summary>
<chapter title="OpenWear Wiki" id="about-ch1" collapsible="true" default-state="expanded">
<img alt="banner_next.png" src="banner.png"/>
<img alt="banner_next.png" src="banner_large.png"/>
<note>
本项目与其他项目(包括同名项目)均无关.与产品生产厂商均无合作/从属关系.
</note>
Expand All @@ -15,9 +15,11 @@
</p>
<p>
<control>(C)2023, PowerAtom知识共享计划及Wiki全体贡献者</control>
</p>
<p>
<control>本项目是PowerAtom 知识共享计划的组成部分</control>
本项目是PowerAtom 知识共享计划的组成部分, 在
<a href="https://mirror.ghproxy.com/https://raw.githubusercontent.com/PieTech-WS/OpenWearWiki/master/LICENSE">
PowerAtom 知识共享及开源协议
</a>
下发布.
</p>
</chapter>
<chapter title="贡献者" id="about-authors" collapsible="true" default-state="expanded">
Expand Down
2 changes: 1 addition & 1 deletion Writerside/topics/download.topic
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
您可以在GitHub Actions中找到最新的构建,下载 <ui-path>Artifacts | docs</ui-path> ,此压缩文件即为生成的Wiki副本。
</p>
<note>您可以阅读 <a href="https://www.jetbrains.com/help/writerside/local-build.html#c55a0d50_22">JetBrains官方文档</a> 获取使用此副本的方法。我们将于不久后在此加入其它方法。</note>
<warning>使用副本时,请遵守我们的 <a href="license.md">许可证</a> </warning>
<warning>使用副本时,请遵守我们的 <a href="https://mirror.ghproxy.com/https://raw.githubusercontent.com/PieTech-WS/OpenWearWiki/master/LICENSE">许可证</a> </warning>
</topic>
17 changes: 0 additions & 17 deletions Writerside/topics/license.md

This file was deleted.

2 changes: 1 addition & 1 deletion Writerside/topics/products_wiki/Redmi-Watch-4.topic
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<topic xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/topic.v2.xsd"
title="Redmi Watch 4" id="Redmi-Watch-4">

<img alt="redmiwatch4.png" src="redmiwatch4.png"/>
<p>是红米第一款入Wiki的表awa</p>
</topic>
5 changes: 5 additions & 0 deletions Writerside/topics/products_wiki/Xiaomi-Watch-S3.topic
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<control><a anchor="authors">贡献者</a> <a anchor="versionLogs">更新日志</a>
</control>
</p>
<chapter title="Gallery" id="gallery" collapsible="true" default-state="expanded">
<img alt="银色" src="xmwts3_white.png" thumbnail="true"/>
<img alt="黑色" src="xmwts3_black.png" thumbnail="true"/>
<img alt="限定色" src="xmwts3_special_colors.png" thumbnail="true"/>
</chapter>

<chapter title="概览" id="summary">
<p>
Expand Down
2 changes: 1 addition & 1 deletion Writerside/topics/readme-new.topic
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</note>
<warning>
<p>
在您使用/传播本项目前, 请先阅读我们的 <a href="license.md">许可证</a>.
在您使用/传播本项目前, 请先阅读我们的 <a href="https://mirror.ghproxy.com/https://raw.githubusercontent.com/PieTech-WS/OpenWearWiki/master/LICENSE">许可证</a>
</p>
</warning>
<chapter title="介绍" id="readme-desc" collapsible="true" default-state="expanded">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
同时, 页面UI、应用路由等与Vue类似.如果你使用过Vue框架, 那么HyperOS快应用开发对于你来说不会很难.
</p>
</chapter>
<chapter title="准备工作" id="preparing">
<chapter title="准备工作" id="preparing" collapsible="true" default-state="collapsed">
<chapter title="系统要求" id="system-requires">
<table>
<tr>
Expand Down

0 comments on commit 586f04c

Please sign in to comment.