Merge pull request #35 from viraji/viraji-patch-2

camerons · web-flow · commit 5994f615cca5 · 2020-08-23T21:48:12.000+10:00
Viraji patch 2
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,9 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
+    ffi (1.11.1)
     ffi (1.11.1-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
@@ -29,10 +31,19 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-feed (0.12.1)
       jekyll (>= 3.7, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-remote-theme (0.4.2)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
@@ -54,6 +65,7 @@ GEM
       ffi (~> 1.0)
     rouge (3.6.0)
     ruby_dep (1.5.0)
+    rubyzip (1.3.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -68,15 +80,19 @@ GEM
     wdm (0.1.1)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
   jekyll (~> 3.8.6)
   jekyll-feed (~> 0.6)
+  jekyll-paginate
+  jekyll-remote-theme
+  jekyll-theme-slate (~> 0.1.1)
   minima (~> 2.0)
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -1,5 +1,5 @@
-  <a href="https://thegooddocsproject.dev/" style="color:#ffffff;">Home</a> |
-  <a href="https://thegooddocsproject.dev/about.html" style="color:#ffffff;">About</a> | 
-  <a href="https://thegooddocsproject.dev/licences.html" style="color:#ffffff;">Licences</a> | 
-  <a href="https://thegooddocsproject.dev/contribute.html" style="color:#ffffff;">Contribute</a> | 
-  <a href="https://thegooddocsproject.dev/contact.html" style="color:#ffffff;">Contact Us</a> | 
+  <a href="/" style="color:#ffffff;">Home</a> |
+  <a href="licences.html" style="color:#ffffff;">Licences</a>
+  <a href="community.html" style="color:#ffffff;">Community</a> | 
+  <a href="https://github.com/thegooddocsproject/templates/releases/tag/v0.1" style="color:#ffffff;">Download</a> | 
+  <a href="press.html" style="color:#ffffff;">Press</a> | 
diff --git a/community.md b/community.md
@@ -0,0 +1,13 @@
+---
+layout: default
+---
+
+## Community
+
+
+*   [Contribute](contribute.html)
+*   [Code of Conduct](https://github.com/thegooddocsproject/governance/blob/master/CodeOfConduct.md)
+*   [Contact Us](contact.html)
+*   [Roles](roles.html)
+*   [Decisions](decisions.html)
+*   [Decision Log](decisionlog.html)
diff --git a/contact.md b/contact.md
@@ -1,6 +1,10 @@
+---
+layout: default
+---
+
 # Contact us
 
-### Email Lists
+### Email lists
 Email lists are our primary form of communication. How to join and archives are linked from:
 
 * [Main list](https://thegooddocsproject.groups.io/g/main): Development discussion.
@@ -26,7 +30,11 @@ The main channels are:
 
 As of 2019/2020 we have been holding weekly half-hour video conference calls. The timeslot often changes. Reach out to us to get an invitation. All interested in contributing are welcome.
 
-### Code of Conduct
+### Weekly meeting minutes
+
+Minutes from our weekly meetings can be accessed from [here](https://github.com/thegooddocsproject/governance/wiki/Weekly-Meetings). 
+
+### Code of conduct
 
 We are nice to each other, in line with our [Code of Conduct](https://github.com/thegooddocsproject/governance/blob/master/CodeOfConduct.md).
 
diff --git a/contribute.md b/contribute.md
@@ -1,3 +1,6 @@
+---
+layout: default
+---
 
 ## How to Contribute
 
diff --git a/decisionlog.md b/decisionlog.md
@@ -0,0 +1,8 @@
+---
+layout: default
+---
+
+## The Good Docs Project Decision Logs 
+
+### [Decision Log 2020](https://github.com/thegooddocsproject/governance/wiki/Decision-Log-2020)
+### [Decision Log 2019](https://github.com/thegooddocsproject/governance/wiki/Decision-Log-2019)
diff --git a/decisions.md b/decisions.md
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+## The Good Docs Project Decisions
+
+### Criteria for Decision Making
+
+Decisions are based on voting using the following:
+
+    +1 : For
+    +0: Mildly for, but mostly indifferent
+    0: Indifferent
+    -0: Mildly against, but mostly indifferent
+    -1 : Strongly against. This is expected to be accompanied by a reason.
+
+For most decisions, a motion is raised within one of TheGoodDocsProject open forums (slack, email list, etc) and those present vote and decide. Should a decision:
+
+    Be strategic or impact many within TheGoodDocsProject,
+    Or if there is contention in deciding, and after discussion at least one member is still strongly against the motion, by continuing to vote -1,
+
+Then the motion should be referred to the PSC.
+
+For motions presented to the PSC, a motion is considered passed when there are more PSC +1 votes than -1 votes, and either all PSC members have voted, or 4 days have passed. In the case of a tie, the PSC chair shall have 1.5 votes.
diff --git a/index.md b/index.md
@@ -1,5 +1,10 @@
+---
+layout: default
+---
+
 _“Best practice templates and writing instructions for documenting open source software.”_
 
+
 ### Download
 
 * The [0.1 alpha straw-man release of templates](https://github.com/thegooddocsproject/templates/releases/tag/v0.1) was released at the 2019 Write The Docs - Australia conference.
@@ -15,7 +20,7 @@ Your _Good Docs_ can then be extended into _Better Docs_ with greater depth, qua
 
 Providing writing templates:
 
-* Amplifies the writing effectiveness of developers, power users writers, and more.
-* Improves doc quality and consistency across the board.
-* Facilitates the democratization of knowledge.
-* Leads to self-empowerment and the betterment of humankind.
+*   Amplifies the writing effectiveness of developers, power users writers, and more.
+*   Improves doc quality and consistency across the board.
+*   Facilitates the democratisation of knowledge.
+*   Leads to self-empowerment and the betterment of humankind.
diff --git a/licences.md b/licences.md
@@ -1,3 +1,6 @@
+---
+layout: default
+---
 
 ### License of Templates: 0BSD
 
diff --git a/press.md b/press.md
@@ -0,0 +1,13 @@
+---
+layout: default
+---
+
+### Press
+
+## Announcements
+
+*   2020-05-27 Article about Felicity, including [her involvement in TheGoodDocsProject](https://typo3.org/article/typo3-book-report-whos-writing-the-typo3-book)
+*   2020-03-12 Insights from involvement in [Season of Docs 2019](http://cameronshorter.blogspot.com/2020/03/insights-from-mixing-writers-with-open.html).
+*   2019-12-16 Announcing TheGoodDocsProject at the Developer Relations Conference in London. Jo Cook's [blog post](https://archaeogeek.com/blog/2019/12/15/devrelcon2019/) and [slides](https://github.com/archaeogeek/devrelcon2019).
+*   2019-11-25 Launching TheGoodDocsProject at WriteTheDocs - Australia conference (and conference highlights) [Cameron Shorter's blog post](http://cameronshorter.blogspot.com/2019/11/launching-thegooddocsproject.html).
+*   2019-11-11 [Announcement-1](https://github.com/thegooddocsproject/governance/wiki/Announcement-1) Fixit Workshop, at WriteTheDocs - Australia conference.
diff --git a/roles.md b/roles.md
@@ -0,0 +1,9 @@
+---
+layout: default
+---
+
+### Roles
+
+## The Good Docs Project Steering Committee
+
+*   Information about the Steering Committee can be found [here](https://github.com/thegooddocsproject/governance/blob/master/ProjectSteeringCommittee.md).

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +---
 +layout: default
 +---
 ## How to Contribute