diff options
author | xrs <xrs@mail36.net> | 2019-06-29 12:02:32 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2019-06-29 12:02:32 +0200 |
commit | 5ab8aeb8562de10ed887675f5ef4c342e23efcca (patch) | |
tree | 35922dea514c2dc6f4b18cfc095c9e23fbbb48aa | |
parent | ea44b0b72e42e760dabb5f63f19f3f34fba6512b (diff) | |
parent | 224fd5433a7326000e6878e3aadc45c4d2ca8712 (diff) | |
download | www-5ab8aeb8562de10ed887675f5ef4c342e23efcca.tar.gz www-5ab8aeb8562de10ed887675f5ef4c342e23efcca.zip |
Merge branch 'master' of ssh://git.gnunet.org/www
-rw-r--r-- | news/2019-06-DSTJ.inc | 3 | ||||
-rw-r--r-- | template/index.html.j2 | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/news/2019-06-DSTJ.inc b/news/2019-06-DSTJ.inc index 90d265d8..ad74b86b 100644 --- a/news/2019-06-DSTJ.inc +++ b/news/2019-06-DSTJ.inc | |||
@@ -1,6 +1,7 @@ | |||
1 | <article> | 1 | <article> |
2 | <h3><a name="">2019-06-28: Peer DSTJ is dead, long live peer Y924</a></h3> | 2 | <h3><a name="">2019-06-28: Peer DSTJ is dead, long live peer Y924</a></h3> |
3 | <p> | 3 | <p> |
4 | After some issues with our infrastructure we needed to replace our bootstrapping peer. To avoid problems when connecting to GNUnet the operator of a peer needs to update its node by removing the peer ID DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0 from the system. | 4 | After some issues with our infrastructure we needed to replace our bootstrapping peer. To avoid problems when connecting to GNUnet the operator of a peer needs to update its node by removing the peer ID DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0 from the system. |
5 | <!-- We should explain how to remove the peer ID. I am unsure how to do this correctly myself! -dvn --> | ||
5 | </p> | 6 | </p> |
6 | </article> | 7 | </article> |
diff --git a/template/index.html.j2 b/template/index.html.j2 index dc9e4fbd..91d7b4ba 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 | |||
@@ -279,10 +279,10 @@ | |||
279 | <div class="row"> | 279 | <div class="row"> |
280 | <div class="col-lg-4"> | 280 | <div class="col-lg-4"> |
281 | <section> | 281 | <section> |
282 | <h3>{{ _("Filesharing") }}</h3> | 282 | <h3>{{ _("Filesharing (Alpha)") }}</h3> |
283 | <p> | 283 | <p> |
284 | {% trans %} | 284 | {% trans %} |
285 | GNUnet filesharing is an application that provides | 285 | GNUnet filesharing is an application that aims to provide |
286 | censorship-resistant, anonymous filesharing. The publisher is | 286 | censorship-resistant, anonymous filesharing. The publisher is |
287 | empowered to make a gradual choice between performance and anonymity. | 287 | empowered to make a gradual choice between performance and anonymity. |
288 | {% endtrans %} | 288 | {% endtrans %} |
@@ -291,7 +291,7 @@ | |||
291 | </div> | 291 | </div> |
292 | <div class="col-lg-4"> | 292 | <div class="col-lg-4"> |
293 | <section> | 293 | <section> |
294 | <h3>{{ _("Conversation") }}</h3> | 294 | <h3>{{ _("Conversation (Pre-Alpha)") }}</h3> |
295 | <p> | 295 | <p> |
296 | {% trans %} | 296 | {% trans %} |
297 | GNUnet conversation is an application that provides secure | 297 | GNUnet conversation is an application that provides secure |