From dce4f4d1d19a72590be04680481b331289092e4d Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Tue, 11 Feb 2020 09:53:11 +0200
Subject: Change: restructure based on feedback from Brennen

---
 index.mdwn   | 41 ++++++++++++++++++++++++++++-------------
 news.mdwn    |  5 -----
 project.mdwn | 27 ---------------------------
 3 files changed, 28 insertions(+), 45 deletions(-)
 delete mode 100644 news.mdwn
 delete mode 100644 project.mdwn

diff --git a/index.mdwn b/index.mdwn
index a836ef1..7d8a5ca 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,12 +1,11 @@
 [[!meta title="Subplot"]]
 
 [[Download]] &mdash;
-[[Project]] &mdash;
 [[Source]] &mdash;
 [[Documentation|docs]] &mdash;
 [[Contact]] &mdash;
 [[License]] &mdash;
-[[News]]
+[[Blog]]
 
 ## When all stakeholders really need to understand acceptance criteria
 
@@ -14,19 +13,28 @@ Capture and communicate acceptance criteria for software and systems,
 and how they are verified, in a way that's understood by all project
 stakeholders.
 
-Subplot is a set of tools for specifying, documenting, and implementing
-automated acceptance tests for systems and software. Subplot tools aim
-to produce a human-readable document of acceptance criteria and a
-program that automatically tests a system against those criteria. The
-goal is for every stakeholder in a project to understand the project's
-acceptance criteria and how they're verified.
+Subplot is a set of tools for specifying, documenting, and
+implementing automated acceptance tests for systems and software.
+Subplot tools help produce a human-readable document of acceptance
+criteria and a program that automatically tests a system against those
+criteria.
 
-## Latest news from the project
+## Participate
 
-<div class="newslist">
-[[!inline pages="page(blog/*) and tagged(news)" 
-  limit=5 template=titlepage archive=yes trail=no feeds=no]]
-</div>
+Subplot is a community project: it is developed by some people who
+want to do it. You could help!
+
+* [[Source]] code
+* [[Governance]] model
+* [[Code of conduct|conduct]]
+* [[Architecture]]
+* [[Road map|roadmap]]
+* [[Contributing]] to the project
+* [[Contact]] the project
+
+Please note that this project is released with a [[Contributor Code of
+Conduct|conduct]]. By participating in this project you agree
+to abide by its terms.
 
 ## Examples
 
@@ -35,3 +43,10 @@ These are generated automatically from the Subplot source repository
 by CI, so they're always up to date.
 
 [examples]: https://examples.subplot.liw.fi/
+
+## Latest from the project
+
+<div class="newslist">
+[[!inline pages="page(blog/*)" 
+  limit=5 template=titlepage archive=yes trail=no feeds=no]]
+</div>
diff --git a/news.mdwn b/news.mdwn
deleted file mode 100644
index 11c61cf..0000000
--- a/news.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-[[!meta title="News"]]
-
-This page contains news items from the Subplot project.
-
-[[!inline pages="page(blog/*) and tagged(news)"]]
diff --git a/project.mdwn b/project.mdwn
deleted file mode 100644
index 9773e2f..0000000
--- a/project.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!meta title="Project"]]
-
-Subplot is a community project: it is developed by some people who
-want to do it. You could help!
-
-Information on how we do things, and help to get you started if you're
-interested:
-
-* [[Source]] code
-* [[Governance]] model
-* [[Code of conduct|conduct]]
-* [[Architecture]]
-* [[Road map|roadmap]]
-* [[Development blog|blog]]
-* [[Contributing]] to the project
-* [[Contact]] the project
-
-Please note that this project is released with a [[Contributor Code of
-Conduct|conduct]]. By participating in this project you agree
-to abide by its terms.
-
-Minutes from the latest meetings (see more in [[blog]]):
-
-<div class="newslist">
-[[!inline pages="page(blog/*) and tagged(meeting)" 
-  limit=3 template=titlepage archive=yes trail=no feeds=no]]
-</div>
-- 
cgit v1.2.1