From 957d8e3d900a76a05d43edc40c488fe3c935f3e5 Mon Sep 17 00:00:00 2001 From: 996icu Date: Thu, 11 Apr 2019 10:54:05 +0800 Subject: [PATCH] Reformat README --- README.md | 19 ++----------------- README_CN.md | 22 +--------------------- proposal/README.md | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 38 deletions(-) create mode 100644 proposal/README.md diff --git a/README.md b/README.md index 70c54eb..1df0b57 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ What can I do? - Update this [list](blacklist/README.md) with evidence to help every worker. - Add this [badge](externals/instruction.md) to your project to support 996.ICU. - License your awesome projects with the [Anti 996 License](LICENSE). -- Add proposals to give advice about the development of 996.ICU. +- Add [proposals](proposal/README.md) to give advice about the development of 996.ICU. - Go home at 6 pm without feeling sorry. @@ -61,20 +61,6 @@ Principles and purposes * We are working on the drafting of Anti-996 License right now and we hope to receive assistance from professionals with relevant experience. - -Proposals ---- -A proposal is a document accepted by 996.ICU. -Typically, a proposal should outline a solution or suggestion about the development of the project and community. -For more details, please read the [proposal template](proposal/proposal_template.md) document. - -To help the development of 996.ICU, you can do several things base on proposals. - -- Read the accepted proposals and try to improve them. -- Take actions according to the accepted proposals. -- Give your own proposals with a PR following the proposal format. - - Expanding influence --- @@ -107,7 +93,6 @@ License - The purpose of this license is to prevent anti-labour-law companies from using the software or codes under the license, and force those companies to weigh their way of working - See a [full list of projects](awesomelist/README.md) under Anti-996 License - - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- Anti 996 License](https://github.com/996icu/996.ICU/pull/15642) - - This version of Anti-996 License is drafted by [Katt Gu, J.D, University of Illinois, College of Law](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao); advised by [Suji Yan](https://www.linkedin.com/in/tedkoyan/), CEO of [Dimension](https://www.dimension.im). + - This draft is adapted from the MIT license. For more detailed explanation, please see [Wiki](https://github.com/kattgu7/996-License-Draft/wiki). This license is designed to be compatible with all major open source licenses. - For law professionals or anyone who is willing to contribute to future version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you. diff --git a/README_CN.md b/README_CN.md index ecd76dc..4b3bb83 100644 --- a/README_CN.md +++ b/README_CN.md @@ -19,10 +19,6 @@ 点击此处查看相关报道的[完整列表](/externals/news.md) -相关文章和讨论 ---- - -点击此处查看相关文章和讨论的[完整列表](/externals/article_and_discussion.md) 什么是996？ --- @@ -36,7 +32,7 @@ - 更新这个[名单](blacklist/README.md)（注附带证据），来帮助每一位工作者。 - 把这个[徽章](externals/instruction.md)添加到你的项目来支持 996.ICU - 为你的项目添加[反 996 许可证](LICENSE_CN)。 -- 给社区与项目发展提出新的议案。 +- 给社区与项目发展提出新的[议案](proposal/README.md)。 - 下午6点钟下班回家。 原则和目的 @@ -53,20 +49,6 @@ * 目前反 996 许可证正处于起草阶段，与此也希望有相关经验的专业人士能给予帮助。 - -提案 ---- -一个提案指的是被 996.ICU 项目接受的建议文档。 -通常一个提案应该给出一个能促进项目或社区本身发展的建议或解决方案。 -请阅读[提案模板](proposal/proposal_template.md)来了解更多细节。 - -关于提案部分，你可以尝试以下事情来助力996.ICU项目的发展： -- 阅读996ICU项目已接受的提案并且尝试提出改进建议。 -- 根据提案建议做出自己力所能及的行动。 -- 对项目或社区的发展提出自己的想法，并通过PR的形式提交到项目组。 - - - 扩大影响 --- @@ -103,7 +85,5 @@ License - 此许可证的目的是阻止违反劳动法的公司使用许可证下的软件或代码，并强迫这些公司权衡他们的行为。 - 在此处查看反 996 许可证下的[完整项目列表](awesomelist/README.md) - - 此许可证的灵感来源于 @xushunke：[Design A Software License Of Labor Protection -- 996ICU License](https://github.com/996icu/996.ICU/pull/15642) - - 当前版本反 996 许可证由 [伊利诺伊大学法学院的 Katt Gu, J.D](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao) 起草；由 [Dimension](https://www.dimension.im) 的首席执行官 [Suji Yan](https://www.linkedin.com/in/tedkoyan/) 提供建议。 - 该草案改编自 MIT 许可证，如需更多信息请查看 [Wiki](https://github.com/kattgu7/996-License-Draft/wiki)。此许可证旨在与所有主流开源许可证兼容。 - 如果你是法律专业人士，或是任何愿意为未来版本做出直接贡献的人，请访问 [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft)。感谢你的帮助。 diff --git a/proposal/README.md b/proposal/README.md new file mode 100644 index 0000000..e6b0789 --- /dev/null +++ b/proposal/README.md @@ -0,0 +1,22 @@ +提案 +--- +一个提案指的是被 996.ICU 项目接受的建议文档。 +通常一个提案应该给出一个能促进项目或社区本身发展的建议或解决方案。 +请阅读[提案模板](proposal/proposal_template.md)来了解更多细节。 + +关于提案部分，你可以尝试以下事情来助力996.ICU项目的发展： +- 阅读996ICU项目已接受的提案并且尝试提出改进建议。 +- 根据提案建议做出自己力所能及的行动。 +- 对项目或社区的发展提出自己的想法，并通过PR的形式提交到项目组。 + +Proposals +--- +A proposal is a document accepted by 996.ICU. +Typically, a proposal should outline a solution or suggestion about the development of the project and community. +For more details, please read the [proposal template](proposal/proposal_template.md) document. + +To help the development of 996.ICU, you can do several things base on proposals. + +- Read the accepted proposals and try to improve them. +- Take actions according to the accepted proposals. +- Give your own proposals with a PR following the proposal format.