aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <info@minifree.org>2017-04-25 23:22:10 +0000
committerGogs <gogitservice@gmail.com>2017-04-25 23:22:10 +0000
commit829303a2607d60683fff7d0f1f60464cc0a29928 (patch)
tree6bd4ae0ab9b2f30a67b07995704942b8164667dc
parent168f77eeb007a8d29a6240cd40ad3f1add969c03 (diff)
parent593cb4f4196d9908294bef7905c16a14aeebd150 (diff)
downloadlibrebootfr-829303a2607d60683fff7d0f1f60464cc0a29928.tar.gz
librebootfr-829303a2607d60683fff7d0f1f60464cc0a29928.zip
Merge branch 'press/formalised-structure' of libreboot/libreboot into master
-rw-r--r--www/index.md2
-rw-r--r--www/news/formalised-structure.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/index.md b/www/index.md
index 1c66c30f..9842bdd5 100644
--- a/www/index.md
+++ b/www/index.md
@@ -22,7 +22,7 @@ operating system. We are a member of the
[Peers Community](https://peers.community/) project, an organisation that
supports Free Software.
-**[Community feedback is needed on whether Libreboot should re-join the GNU project.](news/proposal-rejoin-gnu.md)**
+Latest news update: [Formalising Democracy](news/formalised-structure.md)
Why use Libreboot?
------------------
diff --git a/www/news/formalised-structure.md b/www/news/formalised-structure.md
index 9121b46b..a630ff23 100644
--- a/www/news/formalised-structure.md
+++ b/www/news/formalised-structure.md
@@ -15,7 +15,7 @@ There was an underlying tension in the letter: should Libreboot rejoin GNU? On
purely political and technical levels, the answer is a resounding "yes". We
share the mission of spreading free software. Our communities overlap. Most of
the Libreboot community uses GNU software, and much of GNU uses libreboot.
-Technically, the tighter itnegration is useful. Politically, closer ties will
+Technically, the tighter integration is useful. Politically, closer ties will
strengthen both of our projects. But this is neither completely a political or
technical question -- it is a human one.