home ยป zplus/freepost.git
Author zPlus <zplus@peers.community> 2017-04-01 14:12:00
Committer Gogs <gogitservice@gmail.com> 2017-04-01 14:12:00
Commit e9afa82 (patch)
Tree 52377bf
Parent(s)

Merge branch 'patch-1' of SylvieLorxu/freepost into master


commits diff: a79838a..e9afa82
2 files changed, 13 insertions, 13 deletions โ€” download


Diffstat
-rw-r--r-- template/about.twig 18
-rw-r--r-- template/header.twig 8

Diff options
View
Side
Whitespace
Context lines
Inter-hunk lines
+9/-9 M   template/about.twig
index 6ff0e6d..e36a0e8
old size: 4K - new size: 4K
@@ -3,27 +3,27 @@
3 3 <div class="about">
4 4
5 5 <p>
6 - We are a community of people interested in free software and free culture. Here at <em>freepost</em> we share interesting links, articles, and stories related to these topics.
6 + We are a community of people interested in open source software and open culture. Here at <em>openpost</em> we share interesting links, articles, and stories related to these topics.
7 7 </p>
8 8 <p>
9 9 Please read this page before using the website.
10 10 </p>
11 11
12 12 <h3 id="who">
13 - Who maintains <em>freepost</em>?
13 + Who maintains <em>openpost</em>?
14 14 </h3>
15 15 <p>
16 - <em>freepost</em> is maintained by <a href="http://peers.community">Peers</a>. We are part of a highly motivated community of people with a strong interest in free culture.
16 + <em>openpost</em> is maintained by <a href="http://peers.community">Peers</a>. We are part of a highly motivated community of people with a strong interest in open culture.
17 17 </p>
18 18
19 19 <h3 id="what-to-post">
20 20 What to post
21 21 </h3>
22 22 <p>
23 - The general rule is: anything related to free software and free culture, that is interesting to you, and that you think other like-minded people will find interesting too.
23 + The general rule is: anything related to open source software and open culture, that is interesting to you, and that you think other like-minded people will find interesting too.
24 24 </p>
25 25 <p>
26 - You are free to submit any links ranging from software, to art, science, and politics, as long as they have some interesting relevance with free culture. This means that most posts about proprietary software, politics, religion, sport, or meme are off-topic.
26 + You are open to submit any links ranging from software, to art, science, and politics, as long as they have some interesting relevance with open culture. This means that most posts about proprietary software, politics, religion, sport, or meme are off-topic.
27 27 </p>
28 28
29 29 <h3 id="how-to-post">
@@ -66,15 +66,15 @@
66 66 Privacy Policy
67 67 </h3>
68 68 <p>
69 - <em>freepost</em> can optionally store a user email address, which is only used to reset the user password. Emails are not shared with anybody and can be deleted at any time by the user.
69 + <em>openpost</em> can optionally store a user email address, which is only used to reset the user password. Emails are not shared with anybody and can be deleted at any time by the user.
70 70 <br />
71 - <em>freepost</em> is currently hosted by <a href="https://tuxfamily.org">TuxFamily</a>. TuxFamily keeps the web server raw access logs for up to a year, as required by French laws. Read more on their <a href="https://faq.tuxfamily.org/Privacy/En">FAQ</a>.
71 + <em>openpost</em> is currently hosted by <a href="https://tuxfamily.org">TuxFamily</a>. TuxFamily keeps the web server raw access logs for up to a year, as required by French laws. Read more on their <a href="https://faq.tuxfamily.org/Privacy/En">FAQ</a>.
72 72 </p>
73 73 <p>
74 - If you wish to increase your anonymity while browsing <em>freepost</em>, we suggest to use <a href="https://www.torproject.org">Tor</a> and a random email address.
74 + If you wish to increase your anonymity while browsing <em>openpost</em>, we suggest to use <a href="https://www.torproject.org">Tor</a> and a random email address.
75 75 </p>
76 76 <p>
77 - <em>freepost</em> does <strong>not</strong> make use of any third-party service (for example CDNs).
77 + <em>openpost</em> does <strong>not</strong> make use of any third-party service (for example CDNs).
78 78 </p>
79 79
80 80 </div>

+4/-4 M   template/header.twig
index 54f622e..f4dfd9d
old size: 3K - new size: 3K
@@ -6,7 +6,7 @@
6 6
7 7 <link href="css/freepost.css" rel="stylesheet">
8 8
9 - <title>{{ title is defined ? title ~ ' - ' }}freepost</title>
9 + <title>{{ title is defined ? title ~ ' - ' }}openpost</title>
10 10 </head>
11 11
12 12 <body>
@@ -16,10 +16,10 @@
16 16 <div class="flex-container">
17 17 <div class="flex-item">
18 18 <a href="{{ ''|docroot }}" class="logo">
19 - free
19 + open
20 20
21 21 {# &nbsp; is an extra space because "post" is displayed attached to the picture (not sure why) #}
22 - <img alt="๐Ÿต&nbsp;" title="freepost" src="images/freepost.png" />
22 + <img alt="๐Ÿต&nbsp;" title="openpost" src="images/freepost.png" />
23 23
24 24 post
25 25 </a>
@@ -59,4 +59,4 @@
59 59 </div>
60 60 </div>
61 61
62 - <div class="content">
62 > \ No newline at end of file
62 + <div class="content">