From c829871650af4235e398b7dd7252ff149dfd65cb Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Wed, 12 Jun 2019 17:23:36 +0100 Subject: [PATCH] docs: Fix typos and formatting Correct spelling mistakes and formatting issues. Fixes: #107. Signed-off-by: James O. D. Hunt --- Backport-Guide.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 10 +++++----- VMT/KCSA/KCSA-CVE-2019-5736.md | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Backport-Guide.md b/Backport-Guide.md index 61d7edb067..863c00756a 100644 --- a/Backport-Guide.md +++ b/Backport-Guide.md @@ -12,7 +12,7 @@ serve as a short introduction and reminder of the basic stable backport process. ## Backport Workflow The basic workflow involves creating a new local branch from the stable tree you -are targetting, then cherry picking the commits from your master branch PR +are targeting, then cherry picking the commits from your master branch PR onto that branch. You then submit your branch to GitHub as a PR against the stable branch (and not the `master` branch). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d8354d21b..fd29c14e41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -803,7 +803,7 @@ Some of the checks are: - Static analysis checks. - Unit tests. - Functional tests. -- Integretation tests. +- Integration tests. The Travis job will be executed right after the PR is opened, while the Jenkins jobs will wait to be triggered. A maintainer must add a `/test` comment diff --git a/README.md b/README.md index af67d163dd..9197cb5b73 100644 --- a/README.md +++ b/README.md @@ -73,11 +73,11 @@ The Architecture Committee is responsible for architectural decisions, including The current Architecture Committee members are: -- Eric Ernst ([`egernst`](https://github.com/egernst)), [Intel](https://www.intel.com/). -- Samuel Ortiz ([`sameo`](https://github.com/sameo)), [Intel](https://www.intel.com). -- Jon Olson ([`jon`](https://github.com/jon)), [Google](https://www.google.com). -- Xu Wang ([`gnawux`](https://github.com/gnawux)), [Ant Financial](https://www.antfin.com/index.htm?locale=en_US). -- Zhang Wei ([`WeiZhang555`](https://github.com/WeiZhang555)), [Huawei](http://www.huawei.com). +- `Eric Ernst` ([`egernst`](https://github.com/egernst)), [Intel](https://www.intel.com/). +- `Samuel Ortiz` ([`sameo`](https://github.com/sameo)), [Intel](https://www.intel.com). +- `Jon Olson` ([`jon`](https://github.com/jon)), [Google](https://www.google.com). +- `Xu Wang` ([`gnawux`](https://github.com/gnawux)), [Ant Financial](https://www.antfin.com/index.htm?locale=en_US). +- `Zhang Wei` ([`WeiZhang555`](https://github.com/WeiZhang555)), [Huawei](http://www.huawei.com). Architecture Committee elections take place in September (3 seats available) and February (2 seats available). Anyone who has made contributions to the project will be eligible to run, and anyone who has had code merged into the Kata Containers project in the 12 months (a Contributor) before the election will be eligible to vote. There are no term limits, but in order to encourage diversity, no more than 2 of the 5 seats can be filled by any one organization. The Architecture Committee will meet regularly in an open forum with times and locations published in community channels. diff --git a/VMT/KCSA/KCSA-CVE-2019-5736.md b/VMT/KCSA/KCSA-CVE-2019-5736.md index b5dd7ba306..18b783bda5 100644 --- a/VMT/KCSA/KCSA-CVE-2019-5736.md +++ b/VMT/KCSA/KCSA-CVE-2019-5736.md @@ -2,7 +2,7 @@ announcement-date: 2019-02-22 id: KCSA-CVE-2019-5736 -title: CVE-2019-5736 "runc container breakout" assessment +title: CVE-2019-5736 `runc container breakout` assessment description: Impact of CVE-2019-5736 on Kata Containers @@ -13,11 +13,11 @@ potentially-affected-components: vulnerabilities: - - cve-id: CVE-2019-5736 + - CVE-ID: CVE-2019-5736 reporters: - - name: Graham Whaley + - name: `Graham Whaley` affiliation: VMT member reported: - Original report seen on dev@opencontainers.org