From a182d5fa0f4076c11846eed9ce7c648d87035e49 Mon Sep 17 00:00:00 2001 From: Tate Tian Date: Wed, 20 Feb 2019 21:13:43 +0800 Subject: [PATCH] Small fix to docs --- .all-contributorsrc | 9 +++++++++ CONTRIBUTORS.md | 4 ++-- README.md | 8 +++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index d8c80e06..c09bd46d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -60,6 +60,15 @@ "ideas", "content" ] + }, + { + "login": "chyyuu", + "name": "chyyuu", + "avatar_url": "https://avatars3.githubusercontent.com/u/2077445?v=4", + "profile": "http://soft.cs.tsinghua.edu.cn/~chen", + "contributions": [ + "ideas" + ] } ], "contributorsPerLine": 7 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b741613f..0aa22cd5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,6 +2,6 @@ -| [Tate, Hongliang Tian
Tate, Hongliang Tian](https://github.com/tatetian)
[💻](https://github.com/occlum/libos/commits?author=tatetian "Code") [⚠️](https://github.com/occlum/libos/commits?author=tatetian "Tests") [📖](https://github.com/occlum/libos/commits?author=tatetian "Documentation") [🚧](#maintenance-tatetian "Maintenance") | [Youren Shen
Youren Shen](http://yourenis.me)
[💻](https://github.com/occlum/libos/commits?author=Yourens "Code") [⚠️](https://github.com/occlum/libos/commits?author=Yourens "Tests") | [Shoumeng Yan
Shoumeng Yan](https://github.com/ysminnpu)
[🤔](#ideas-ysminnpu "Ideas, Planning, & Feedback") [💼](#business-ysminnpu "Business development") | [Wang Runji
Wang Runji](https://wangrunji.com)
[💻](https://github.com/occlum/libos/commits?author=wangrunji0408 "Code") [⚠️](https://github.com/occlum/libos/commits?author=wangrunji0408 "Tests") | [nk7651
nk7651](https://github.com/nk7651)
[🤔](#ideas-nk7651 "Ideas, Planning, & Feedback") [🖋](#content-nk7651 "Content") | -| :---: | :---: | :---: | :---: | :---: | +| [Tate, Hongliang Tian
Tate, Hongliang Tian](https://github.com/tatetian)
[💻](https://github.com/occlum/libos/commits?author=tatetian "Code") [⚠️](https://github.com/occlum/libos/commits?author=tatetian "Tests") [📖](https://github.com/occlum/libos/commits?author=tatetian "Documentation") [🚧](#maintenance-tatetian "Maintenance") | [Youren Shen
Youren Shen](http://yourenis.me)
[💻](https://github.com/occlum/libos/commits?author=Yourens "Code") [⚠️](https://github.com/occlum/libos/commits?author=Yourens "Tests") | [Shoumeng Yan
Shoumeng Yan](https://github.com/ysminnpu)
[🤔](#ideas-ysminnpu "Ideas, Planning, & Feedback") [💼](#business-ysminnpu "Business development") | [Wang Runji
Wang Runji](https://wangrunji.com)
[💻](https://github.com/occlum/libos/commits?author=wangrunji0408 "Code") [⚠️](https://github.com/occlum/libos/commits?author=wangrunji0408 "Tests") | [nk7651
nk7651](https://github.com/nk7651)
[🤔](#ideas-nk7651 "Ideas, Planning, & Feedback") [🖋](#content-nk7651 "Content") | [chyyuu
chyyuu](http://soft.cs.tsinghua.edu.cn/~chen)
[🤔](#ideas-chyyuu "Ideas, Planning, & Feedback") | +| :---: | :---: | :---: | :---: | :---: | :---: | diff --git a/README.md b/README.md index 020c608a..a70e8ba8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Occlum -[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](CONTRIBUTORS.md) Occlum is a *memory-safe*, *multi-process* library OS (LibOS) for [Intel SGX](https://software.intel.com/en-us/sgx). As a LibOS, it enables *unmodified* applications to run on SGX, thus protecting the confidentiality and integrity of user workloads transparently. Compared to existing LibOSes for SGX, Occlum has following salient features: - * **Efficient multitasking.** The LibOS has a complete and efficient multi-process support, including fast process creation, low-cost IPC, code sharing (e.g., shared libraries) and data sharing (e.g., encrypted file systems). + * **Efficient multitasking.** The LibOS has a complete and efficient multi-process support, including fast process creation, low-cost IPC, shared OS services (e.g., encrypted file systems). * **Fault isolation.** The crash of one user process cannot crash the LibOS or other user processes, which is good for security and robustness. * **Memory safety.** The LibOS itself is written in [Rust](https://www.rust-lang.org/), a memory-safe programming language, thus free from low-level, memory bugs; @@ -79,11 +79,9 @@ Of course, Occlum must be run on Intel x86 CPUs with SGX support to do its magic While Occlum was originally designed by and incubated inside Intel, it is NOT an official Intel product. -The original source code was released by Intel in a BSD-licensed project named [SGX Multi-Process Library Operating System (SGXMPLOS)](https://github.com/occlum/sgxmplos). As the vendor-neutral, community-driven successor of SGXMPLOS, Occlum project is where all future development happens. - ## Contributors -The creators of Occlum (or SGXMPLOS) project are +The creators of Occlum project are * Hongliang Tian and Shoumeng Yan from Intel; and * Youren Shen, Yu Chen, and Kang Chen from Tsinghua University.