diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4920e85 --- /dev/null +++ b/LICENSE @@ -0,0 +1,447 @@ +kmalloc.org: license of the texts + +The texts of the kmalloc.org website and of the kmalloc.org manifesto +(MANIFESTO.*.md, lang/*.json, news/*.md) are released under the +Creative Commons Attribution-ShareAlike 4.0 International license +(CC BY-SA 4.0). + + Summary: https://creativecommons.org/licenses/by-sa/4.0/ + Legal code: https://creativecommons.org/licenses/by-sa/4.0/legalcode + +Not covered by this license: +- the Funkadelic quote in the manifesto, which belongs to its authors; +- the code (build.py, templates/, static/style.css) and the logo (logo/). + +The official legal code follows, as published by Creative Commons at +https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt + +======================================================================= + +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/README.md b/README.md index 9780a98..afb1d1b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Sources of the kmalloc.org website: plain static HTML, no JavaScript, valid HTML - `lang/.json` holds every text of one language (`en`, `it`, `es`, `de`, `fr`): the menu, the footer and one entry per page. The texts are plain text and the build escapes them. - `templates/` holds the chrome (`base.html`, `header.html`, `footer.html`), one body per page type in `templates/pages/` and repeated blocks in `templates/parts/`. - `static/style.css` is the one stylesheet, inlined into every page. -- `MANIFESTO..md` are the manifesto texts, version 1.0. English and Italian are the sources, Spanish, German and French are translations. +- `MANIFESTO..md` are the manifesto texts. English and Italian are at version 1.1 (`manifesto_version` and `manifesto_date` in `site.json`); Spanish, German and French are machine translations of version 1.0 (overridden in their `lang/.json`) and show a note that the English text prevails. Every version is listed on the manifesto history page. - `news/` holds the news posts, written in English only. - `badges/` holds the official W3C badges, served from our own site. - `logo/` holds the shrike logo: SVG and PNG exports, `build_logo.py`, the original PNG and the favicons in `logo/web/`. @@ -28,7 +28,7 @@ A page entry in `lang/.json` looks like this: "bios": { "squid": "..." } } -The page types are `home`, `manifesto`, `people`, `services` and `news`. Placeholders such as `{{intro}}` or `{{url_news}}` in `templates/pages/*.html` are replaced at build time, and an unknown placeholder stops the build. +The page types are `home`, `manifesto`, `people`, `services`, `news` and `history` (the manifesto history). A list of plain strings in a page entry becomes `
  • ` items. Placeholders such as `{{intro}}` or `{{url_news}}` in `templates/pages/*.html` are replaced at build time, and an unknown placeholder stops the build. ## News @@ -44,6 +44,14 @@ A post is a Markdown file named `YYYY-MM-DD-slug.md` in `news/`: The post is published at `/news/slug.html`. News are English only: the pages of the other languages list the same posts and link to them. The news index, the latest three posts on the home pages and an RSS 2.0 feed (`/news/feed.xml`, the latest 20 posts with full text) are built from the files. Every page links the feed in the head and shows the RSS icon in the footer. No em dashes: the build refuses them. +## Indexing + +Only the home pages and the manifesto pages may be indexed (`INDEXABLE` in `build.py`): they have no robots meta tag and `robots.txt` allows exactly their paths. Every other page has `noindex, nofollow, noarchive` and is blocked in `robots.txt`. + +## License + +The texts are released under CC BY-SA 4.0, see `LICENSE`. The code and the logo are not covered. + ## Publishing Pushing to `main` publishes the site. A post-receive hook in the Forgejo repository touches a trigger file, `deploy-kmalloc-site.path` on the server notices it and runs `deploy-kmalloc-site`, which builds `main` into a temporary directory and mirrors it into the web root. If the build fails nothing is copied. diff --git a/build.py b/build.py index 646c316..11f0c64 100644 --- a/build.py +++ b/build.py @@ -33,8 +33,12 @@ PAGES = { "people": dict(nav="people", lead="back"), "services": dict(nav="services", lead="back"), "news": dict(nav="news", lead="back"), + "history": dict(nav="history", lead="back"), } NAV = ("home", "manifesto", "people", "services", "news") +# Only these pages may be indexed by search engines; every other page gets noindex and is blocked in robots.txt. +INDEXABLE = ("home", "manifesto") +NOINDEX = '\n' # Files copied as they are: published name -> source. ASSETS = { @@ -249,6 +253,25 @@ def rss(L, site, all_posts): """ +def retention_row(row, cols): + """One row of the data and retention table. A 'todo' field becomes an HTML comment, never visible text.""" + if "--" in row.get("todo", ""): + fail(f"retention row {row['service']!r}: no '--' inside a TODO comment") + todo = f"\n" if row.get("todo") else "" + cells = "\n".join(f'{esc(row[k])}' for k in ("admin", "not_e2e", "kept")) + return f'{todo}\n{esc(row["service"])}\n{cells}\n' + + +def robots_txt(paths): + """Allow the indexable pages (exact paths, '$' anchors the end) and block everything else.""" + allow = [] + for path in paths: + allow.append(f"Allow: {path}$") + if path == "/": + allow.append("Allow: /?lang=en$") # the English home as linked from the other pages + return "User-agent: *\n" + "\n".join(sorted(set(allow))) + "\nDisallow: /\n" + + def build(): site = load_json("site.json") langs_order = site["languages"] @@ -261,7 +284,8 @@ def build(): key = os.path.relpath(os.path.join(root, fn), os.path.join(HERE, "templates"))[:-5] tpl[key] = read("templates", key + ".html") shared = {k: v for k, v in site.items() if isinstance(v, str)} - shared["contact_shown"] = site["contact"].replace("@", " (at) ") # no mailto link, against address harvesters + for k in ("contact", "security", "abuse"): # no mailto link, against address harvesters + shared[k + "_shown"] = site[k].replace("@", " (at) ") svc = {s["id"]: s for s in site["services"]} pages = [] @@ -314,11 +338,16 @@ def build(): ctx["lang"] = lang for k, label in L["nav"].items(): ctx["nav_" + k] = esc(label) - for k in NAV[1:]: + for k in NAV[1:] + ("history",): ctx["url_" + k] = url_for(lang, k) + ctx["history_attr"] = "" if ("history", lang) in by_id else ' hreflang="en"' + ctx["robots_meta"] = "" if p["kind"] == "page" and p["id"] in INDEXABLE else NOINDEX ctx["version_lc"] = esc(L["version"].lower()) data = p.get("data", {}) ctx.update({k: esc(v) for k, v in data.items() if isinstance(v, str)}) + # A list of plain strings in a page entry becomes list items: {{name}} goes inside
      . + ctx.update({k: "\n".join(f"
    • {esc(x)}
    • " for x in v) for k, v in data.items() + if isinstance(v, list) and all(isinstance(x, str) for x in v)}) page_title = p["title"] if p["kind"] == "page" else "kmalloc.org: " + p["title"] ctx.update(css=css, path=p["path"], title_html=html.escape(page_title), post_title=html.escape(p["title"]), description_attr=html.escape(p["description"], quote=True), doc_url=site["base_url"] + p["path"], @@ -357,6 +386,8 @@ def build(): render(tpl["parts/service-section"], dict(ctx, id=s["id"], name=esc(data["items"][s["id"]]["name"]), text=esc(data["items"][s["id"]]["text"]), url=s["url"]), "templates/parts/service-section.html") for s in site["services"]) + ctx.update({"col_" + k: esc(v) for k, v in data["retention_cols"].items()}) + ctx["retention_rows"] = "\n".join(retention_row(r, data["retention_cols"]) for r in data["retention_rows"]) elif p["id"] == "people": cards = [] for person in site["people"]: @@ -371,6 +402,10 @@ def build(): ctx, handle=esc(handle), title=(esc(nm) + " (" + esc(handle) + ")") if nm else esc(handle), bio=esc(data["bios"][handle]), links=links), "templates/parts/person-card.html")) ctx["people_cards"] = "".join(cards) + elif p["id"] == "history": + ctx["history_list"] = "\n".join( + f'

      {esc(L["version"])} {esc(v["version"])},

      \n\n' + + "
        \n" + "\n".join(f"
      • {esc(c)}
      • " for c in v["changes"]) + "\n
      \n" for v in data["versions"]) elif p["id"] == "manifesto": ctx.update(manifesto[lang]) ctx["note_block"] = f'

      \n{esc(data["note"])}\n

      \n\n' if data.get("note") else "" @@ -391,7 +426,7 @@ def build(): target = os.path.join(OUT, dest) os.makedirs(os.path.dirname(target), exist_ok=True) shutil.copy(os.path.join(HERE, src), target) - write("robots.txt", "User-agent: *\nDisallow: /\n") + write("robots.txt", robots_txt(p["path"] for p in pages if p["kind"] == "page" and p["id"] in INDEXABLE)) print(f"built {len(pages)} pages into {OUT}") diff --git a/lang/de.json b/lang/de.json index ce4649f..d866c01 100644 --- a/lang/de.json +++ b/lang/de.json @@ -8,6 +8,10 @@ "back": "kmalloc.org", "version": "Version", "toc": "Inhalt", + "history_a": "Versionsgeschichte des Manifests (auf Englisch)", + "license_text": "Texte unter der Lizenz", + "translation_note": "Maschinelle Übersetzung, nicht von Muttersprachlern geprüft. Bei Abweichungen gilt der englische Text. Fehler bitte", + "translation_note_a": "in einem öffentlichen Issue melden", "nav": { "manifesto": "Manifest", "news": "News" @@ -17,7 +21,9 @@ "path": "/de/manifesto.html", "title": "kmalloc.org: Manifest", "description": "Das Manifest von kmalloc.org: freie Software, Privatsphäre, ein offenes Internet, Würde bei der Arbeit.", - "note": "Übersetzung der Version 1.0 nach den englischen und italienischen Texten." + "note": "Übersetzung der Version 1.0 nach den englischen und italienischen Texten.", + "manifesto_version": "1.0", + "manifesto_date": "2026-11-12" } } } diff --git a/lang/en.json b/lang/en.json index 9dd5a1f..1beb493 100644 --- a/lang/en.json +++ b/lang/en.json @@ -8,6 +8,8 @@ "back": "home", "version": "Version", "toc": "Contents", + "history_a": "Manifesto history", + "license_text": "Texts under the license", "news_p": "Updates from kmalloc.org.", "news_all": "all news", "news_empty": "No news yet.", @@ -66,10 +68,8 @@ "account_p1": "The services are free of charge. To ask for an account, write to", "at_hint": "replace (at) with @", "account_p2": "telling us which services you want and the username you would like.", - "donate_h": "Support kmalloc.org", - "donate_p": "Donations are welcome and help keep the server running. Bitcoin address:", "terms_h": "Good to know", - "terms_p": "Everything is run by one person on one server, with nightly encrypted backups and no guarantees of availability. Be respectful: the manifesto explains what we stand for.", + "terms_p": "Everything is run by one person on one server, with nightly encrypted backups and no guarantees of availability.", "open_a": "open", "items": { "mail": { @@ -109,7 +109,103 @@ "account_gpg": "Messages must be encrypted with GPG, see", "privacy_h": "Logs and privacy", "privacy_p1": "This website sets no cookies, uses no trackers or analytics, and the web server does not log visits. The services keep technical logs, with IP addresses, only to run them and to protect them from abuse. All of these logs are deleted after 14 days.", - "privacy_p2": "An address that fails to log in again and again is banned: for one hour, for up to a week if it keeps coming back, and for up to 30 days if it scans the mail server. The list of banned addresses holds addresses only." + "privacy_p2": "An address that fails to log in again and again is banned: for one hour, for up to a week if it keeps coming back, and for up to 30 days if it scans the mail server. The list of banned addresses holds addresses only.", + "on_page": "On this page:", + "rules_h": "Rules of use", + "rules_p1": "Accounts are for people who share the principles of the manifesto and respect these rules. Today squid decides who gets an account.", + "rules_conduct_h": "Conduct", + "rules_conduct_p": "These are not allowed:", + "rules_conduct": [ + "Harassment, threats, hate, and discrimination against people or groups.", + "Doxxing, and violating other people's privacy.", + "Impersonation and phishing, including accounts used to deceive others.", + "Content that is illegal in Italy, such as child sexual abuse material, incitement to violence or the distribution of malware." + ], + "rules_resources_h": "Resources and services", + "rules_resources": [ + "No spam and no unsolicited bulk sending, by mail or on the lists.", + "No scans, attacks, mining, or abnormal load that harms the server or other services.", + "One account per person. Do not give away or sell your account. Use a strong password, and two-factor authentication where it is available.", + "No commercial use: the services are for personal and community use. No reselling, and no use as the infrastructure of a company." + ], + "rules_sanctions_h": "If a rule is broken", + "rules_sanctions_p": "For a minor violation: a written warning, then a suspension, then the account is closed. For a serious one, such as illegal content or an attack: immediate suspension.", + "rules_p2": "Every refusal and every step comes with a written reason. To appeal, write to", + "rules_p3": "You get a reasoned answer within 14 days.", + "rules_inactive_h": "Inactive accounts and shutdown", + "rules_inactive_p": "After 12 months without a login you get a notice. If there is no answer within 3 more months, the account is closed, with notice and the chance to export your data.", + "rules_p4": "If kmalloc.org shuts down, you get 90 days' notice and an export of your data: mail, repositories and contacts.", + "data_h": "Data and retention", + "data_p1": "What the administrator of the server can see, what is not end-to-end encrypted, and how long it is kept, service by service. On top of this, every service keeps technical logs with IP addresses for 14 days, as said above.", + "data_caption": "Data and retention, service by service", + "retention_cols": { + "service": "Service", + "admin": "The administrator can see", + "not_e2e": "Not end-to-end encrypted", + "kept": "How long it is kept" + }, + "retention_rows": [ + { + "service": "Email", + "admin": "Your mailbox: every message that is not encrypted with GPG.", + "not_e2e": "Messages, unless both sides use GPG. If you use GPG in the webmail, your private key is stored on the server, protected by your passphrase.", + "kept": "Messages: until you delete them. Webmail sessions, with the IP address: at most 6 hours.", + "todo": "cifratura a riposo delle caselle in Stalwart e archivio eventi di Stalwart non verificati nella scheda dell'host" + }, + { + "service": "Mailing lists", + "admin": "Subscribers, messages and archives, private lists included.", + "not_e2e": "Everything.", + "kept": "Archives: until the list is deleted.", + "todo": "durata degli archivi e degli iscritti di Mailman non scritta nella scheda dell'host" + }, + { + "service": "Git", + "admin": "Every repository, private ones included, with issues and pull requests.", + "not_e2e": "Everything.", + "kept": "Repositories: until you delete them. The database stores no IP addresses." + }, + { + "service": "Mastodon", + "admin": "Your posts, private mentions included.", + "not_e2e": "Everything, private mentions included.", + "kept": "Posts: until you delete them.", + "todo": "IP di accesso e sessioni nel database di Mastodon: durata non verificata, potrebbe superare i 14 giorni" + }, + { + "service": "XMPP chat", + "admin": "Your contact list, group room messages, uploaded files and one-to-one messages sent without OMEMO.", + "not_e2e": "Group rooms, uploaded files and messages sent without OMEMO.", + "kept": "Group room archive: 90 days. Uploaded files: 30 days, at most 50 MB per file.", + "todo": "archivio dei messaggi uno a uno (MAM personale) e liste contatti: durata non scritta nella scheda dell'host" + }, + { + "service": "Matrix", + "admin": "Who is in which room and when they write; the messages of rooms without encryption.", + "not_e2e": "Rooms without encryption, and the metadata of every room.", + "kept": "Messages and files: until they are deleted.", + "todo": "nessuna politica di conservazione di messaggi e media di Tuwunel nella scheda dell'host" + }, + { + "service": "Video conferences", + "admin": "Room names and who is connected while a call runs.", + "not_e2e": "Audio and video: they pass through the server.", + "kept": "Nothing is recorded.", + "todo": "verificare se l'E2EE di Jitsi è disponibile su meet.kmalloc.org; nessun componente di registrazione nella scheda" + } + ], + "data_p2": "Backups: every night the server makes an encrypted copy of every service. Copies are kept for 14 days on the server and for 14 days on a second machine. The key that decrypts them is on neither machine. Data you delete can stay in the backups for about two weeks.", + "authorities_h": "Requests from authorities", + "authorities_p1": "We hand over data only in response to a valid legal request. When the law allows it, we tell the person concerned.", + "authorities_p2": "Once a year we publish a transparency report with the number of requests received, even when there were none. The reports will be listed here.", + "security_h": "Security and abuse", + "security_p1": "Found a security problem? Write to", + "security_p2": "We answer within a few days. Give us time to fix the problem before you make it public. We take no legal action against anyone who reports in good faith. You can encrypt your report with the key above.", + "abuse_p1": "To report spam, harassment or other abuse from a kmalloc.org account, write to", + "abuse_p2": "No GPG needed.", + "funding_h": "Funding", + "funding_p1": "The server costs EUR 37.50 a month. Today squid pays for it.", + "funding_p2": "Donations help keep it running. They give no say in decisions. Bitcoin address:" }, "news": { "path": "/news/", @@ -117,6 +213,39 @@ "description": "Updates from kmalloc.org.", "intro": "Updates from kmalloc.org.", "rss": "RSS feed" + }, + "history": { + "path": "/manifesto-history.html", + "title": "kmalloc.org: Manifesto history", + "description": "Every version of the kmalloc.org manifesto, with its date and what changed.", + "heading": "Manifesto history", + "intro": "Every version of the manifesto has a number and a date. This page lists what changed in each one.", + "current_a": "Read the current manifesto", + "propose_h": "Proposing a change", + "propose_p1": "Proposals go in a public issue on the", + "propose_a": "site repository", + "propose_p2": "Today the author decides what goes in. If the language versions differ, the English text prevails. The Spanish, German and French texts are machine translations of version 1.0.", + "versions": [ + { + "version": "1.1", + "date": "2026-11-13", + "changes": [ + "Preamble: says who \"we\" is today: one person, open to others who accept the manifesto.", + "Preamble: \"anti-authoritarian\" replaces \"libertarian\" in the English text.", + "New commitments: a public table on data, a public page on funding, public criteria for accounts with a written reason and an appeal, a policy on requests from authorities, addresses for security and abuse, and 90 days' notice with a data export if kmalloc.org shuts down.", + "New section \"About this text\": dated versions, how to propose changes, the English text prevails, CC BY-SA 4.0 license.", + "Italian text, point 11: two wording fixes to match the English." + ] + }, + { + "version": "1.0", + "date": "2026-11-12", + "changes": [ + "First version, in English and Italian.", + "Machine translations into Spanish, German and French." + ] + } + ] } } } diff --git a/lang/es.json b/lang/es.json index f7404e8..7e3cbb8 100644 --- a/lang/es.json +++ b/lang/es.json @@ -8,6 +8,10 @@ "back": "kmalloc.org", "version": "Versión", "toc": "Índice", + "history_a": "Historial del manifiesto (en inglés)", + "license_text": "Textos bajo la licencia", + "translation_note": "Traducción automática, no revisada por hablantes nativos. En caso de diferencias, prevalece el texto en inglés. Si encuentras un error, puedes", + "translation_note_a": "señalarlo en una incidencia pública", "nav": { "manifesto": "Manifiesto", "news": "News" @@ -17,7 +21,9 @@ "path": "/es/manifesto.html", "title": "kmalloc.org: Manifiesto", "description": "El manifiesto de kmalloc.org: software libre, privacidad, una Internet abierta, dignidad en el trabajo.", - "note": "Traducción de la versión 1.0 a partir de los textos en inglés y en italiano." + "note": "Traducción de la versión 1.0 a partir de los textos en inglés y en italiano.", + "manifesto_version": "1.0", + "manifesto_date": "2026-11-12" } } } diff --git a/lang/fr.json b/lang/fr.json index 2cc408b..807dbed 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -8,6 +8,10 @@ "back": "kmalloc.org", "version": "Version", "toc": "Sommaire", + "history_a": "Historique du manifeste (en anglais)", + "license_text": "Textes sous licence", + "translation_note": "Traduction automatique, non relue par des locuteurs natifs. En cas de divergence, le texte anglais fait foi. Si vous trouvez une erreur, signalez-la", + "translation_note_a": "dans un ticket public", "nav": { "manifesto": "Manifeste", "news": "News" @@ -17,7 +21,9 @@ "path": "/fr/manifesto.html", "title": "kmalloc.org: Manifeste", "description": "Le manifeste de kmalloc.org: logiciel libre, vie privée, un Internet ouvert, dignité au travail.", - "note": "Traduction de la version 1.0 à partir des textes anglais et italien." + "note": "Traduction de la version 1.0 à partir des textes anglais et italien.", + "manifesto_version": "1.0", + "manifesto_date": "2026-11-12" } } } diff --git a/lang/it.json b/lang/it.json index c95a3c9..dcc5052 100644 --- a/lang/it.json +++ b/lang/it.json @@ -8,6 +8,8 @@ "back": "home", "version": "Versione", "toc": "Indice", + "history_a": "Cronologia del manifesto", + "license_text": "Testi con licenza", "news_p": "Novità da kmalloc.org, scritte in inglese.", "news_all": "tutte le news", "news_empty": "Ancora nessuna news.", @@ -69,10 +71,8 @@ "account_p1": "I servizi sono gratuiti. Per chiedere un account scrivi a", "at_hint": "sostituisci (at) con @", "account_p2": "indicando quali servizi vuoi e il nome utente che preferisci.", - "donate_h": "Sostieni kmalloc.org", - "donate_p": "Le donazioni sono benvenute e aiutano a tenere acceso il server. Indirizzo Bitcoin:", "terms_h": "Da sapere", - "terms_p": "Tutto è gestito da una persona su un solo server, con backup notturni cifrati e nessuna garanzia di disponibilità. Siate rispettosi: il manifesto spiega in cosa crediamo.", + "terms_p": "Tutto è gestito da una persona su un solo server, con backup notturni cifrati e nessuna garanzia di disponibilità.", "open_a": "apri", "items": { "mail": { @@ -112,7 +112,136 @@ "account_gpg": "I messaggi vanno cifrati con GPG, vedi", "privacy_h": "Log e privacy", "privacy_p1": "Questo sito non imposta cookie, non usa tracker né statistiche e il server web non registra le visite. I servizi conservano log tecnici, con gli indirizzi IP, solo per farli funzionare e proteggerli dagli abusi. Tutti questi log vengono cancellati dopo 14 giorni.", - "privacy_p2": "Un indirizzo che sbaglia il login più volte viene bannato: per un'ora, fino a una settimana se continua a tornare e fino a 30 giorni se scansiona il server di posta. L'elenco degli indirizzi bannati contiene solo gli indirizzi." + "privacy_p2": "Un indirizzo che sbaglia il login più volte viene bannato: per un'ora, fino a una settimana se continua a tornare e fino a 30 giorni se scansiona il server di posta. L'elenco degli indirizzi bannati contiene solo gli indirizzi.", + "on_page": "In questa pagina:", + "rules_h": "Regole d'uso", + "rules_p1": "Gli account sono per chi condivide i principi del manifesto e rispetta queste regole. Oggi decide squid chi riceve un account.", + "rules_conduct_h": "Condotta", + "rules_conduct_p": "Non sono ammessi:", + "rules_conduct": [ + "Molestie, minacce, odio e discriminazione di persone o gruppi.", + "Doxxing e violazione della privacy altrui.", + "Impersonificazione e phishing, compresi gli account usati per raggirare altre persone.", + "Contenuti illegali in Italia, come materiale pedopornografico, istigazione alla violenza o distribuzione di malware." + ], + "rules_resources_h": "Risorse e servizi", + "rules_resources": [ + "Niente spam e niente invii di massa non richiesti, nella posta e nelle liste.", + "Niente scansioni, attacchi, mining o carichi anomali che danneggiano il server o altri servizi.", + "Un account per persona. L'account non si cede e non si vende. Usa una password robusta e la verifica in due passaggi dove è disponibile.", + "Nessun uso commerciale: i servizi sono per uso personale e di comunità. Niente rivendita né uso come infrastruttura di un'azienda." + ], + "rules_sanctions_h": "Se una regola non viene rispettata", + "rules_sanctions_p": "Per una violazione lieve: un avviso scritto, poi la sospensione, poi la chiusura dell'account. Per una grave, come contenuti illegali o un attacco: sospensione immediata.", + "rules_p2": "Ogni rifiuto e ogni passo hanno un motivo scritto. Per fare ricorso scrivi a", + "rules_p3": "Ricevi una risposta motivata entro 14 giorni.", + "rules_inactive_h": "Account inattivi e chiusura", + "rules_inactive_p": "Dopo 12 mesi senza accessi ricevi un avviso. Se non rispondi entro altri 3 mesi, l'account viene chiuso, con preavviso e la possibilità di esportare i dati.", + "rules_p4": "Se kmalloc.org chiude, hai 90 giorni di preavviso e l'esportazione dei tuoi dati: posta, repository e contatti.", + "data_h": "Dati e durate", + "data_p1": "Cosa può vedere l'amministratore del server, cosa non è cifrato da capo a capo e per quanto resta, servizio per servizio. In più ogni servizio conserva log tecnici con gli indirizzi IP per 14 giorni, come scritto sopra.", + "data_caption": "Dati e durate, servizio per servizio", + "retention_cols": { + "service": "Servizio", + "admin": "L'amministratore può vedere", + "not_e2e": "Non cifrato da capo a capo", + "kept": "Per quanto resta" + }, + "retention_rows": [ + { + "service": "Email", + "admin": "La tua casella: ogni messaggio non cifrato con GPG.", + "not_e2e": "I messaggi, se le due parti non usano GPG. Se usi GPG nella webmail, la tua chiave privata sta sul server, protetta dalla tua passphrase.", + "kept": "Messaggi: finché non li cancelli. Sessioni della webmail, con l'indirizzo IP: al massimo 6 ore.", + "todo": "cifratura a riposo delle caselle in Stalwart e archivio eventi di Stalwart non verificati nella scheda dell'host" + }, + { + "service": "Mailing lists", + "admin": "Iscritti, messaggi e archivi, anche delle liste private.", + "not_e2e": "Tutto.", + "kept": "Archivi: finché la lista non viene cancellata.", + "todo": "durata degli archivi e degli iscritti di Mailman non scritta nella scheda dell'host" + }, + { + "service": "Git", + "admin": "Ogni repository, anche privato, con issue e pull request.", + "not_e2e": "Tutto.", + "kept": "Repository: finché non li cancelli. Il database non conserva indirizzi IP." + }, + { + "service": "Mastodon", + "admin": "I tuoi post, anche le menzioni private.", + "not_e2e": "Tutto, anche le menzioni private.", + "kept": "Post: finché non li cancelli.", + "todo": "IP di accesso e sessioni nel database di Mastodon: durata non verificata, potrebbe superare i 14 giorni" + }, + { + "service": "XMPP chat", + "admin": "La tua lista contatti, i messaggi delle stanze di gruppo, i file caricati e i messaggi uno a uno inviati senza OMEMO.", + "not_e2e": "Stanze di gruppo, file caricati e messaggi inviati senza OMEMO.", + "kept": "Archivio delle stanze di gruppo: 90 giorni. File caricati: 30 giorni, al massimo 50 MB per file.", + "todo": "archivio dei messaggi uno a uno (MAM personale) e liste contatti: durata non scritta nella scheda dell'host" + }, + { + "service": "Matrix", + "admin": "Chi sta in quale stanza e quando scrive; i messaggi delle stanze senza cifratura.", + "not_e2e": "Le stanze senza cifratura e i metadati di ogni stanza.", + "kept": "Messaggi e file: finché non vengono cancellati.", + "todo": "nessuna politica di conservazione di messaggi e media di Tuwunel nella scheda dell'host" + }, + { + "service": "Videoconferenze", + "admin": "I nomi delle stanze e chi è collegato durante una chiamata.", + "not_e2e": "Audio e video: passano dal server.", + "kept": "Non si registra niente.", + "todo": "verificare se l'E2EE di Jitsi è disponibile su meet.kmalloc.org; nessun componente di registrazione nella scheda" + } + ], + "data_p2": "Backup: ogni notte il server fa una copia cifrata di tutti i servizi. Le copie restano 14 giorni sul server e 14 giorni su una seconda macchina. La chiave che le decifra non sta su nessuna delle due. I dati che cancelli possono restare nei backup per circa due settimane.", + "authorities_h": "Richieste delle autorità", + "authorities_p1": "Consegniamo dati solo in risposta a una richiesta legale valida. Quando la legge lo permette, informiamo la persona interessata.", + "authorities_p2": "Una volta all'anno pubblichiamo un report di trasparenza con il numero di richieste ricevute, anche quando sono zero. I report verranno elencati qui.", + "security_h": "Sicurezza e abusi", + "security_p1": "Hai trovato un problema di sicurezza? Scrivi a", + "security_p2": "Rispondiamo entro pochi giorni. Lasciaci il tempo di correggere il problema prima di renderlo pubblico. Non intraprendiamo azioni legali contro chi segnala in buona fede. Puoi cifrare la segnalazione con la chiave qui sopra.", + "abuse_p1": "Per segnalare spam, molestie o altri abusi da un account di kmalloc.org scrivi a", + "abuse_p2": "Non serve GPG.", + "funding_h": "Fondi", + "funding_p1": "Il server costa 37,50 euro al mese. Oggi lo paga squid.", + "funding_p2": "Le donazioni aiutano a tenerlo acceso. Non danno potere decisionale. Indirizzo Bitcoin:" + }, + "history": { + "path": "/it/cronologia-manifesto.html", + "title": "kmalloc.org: Cronologia del manifesto", + "description": "Ogni versione del manifesto di kmalloc.org, con la data e cosa è cambiato.", + "heading": "Cronologia del manifesto", + "intro": "Ogni versione del manifesto ha un numero e una data. Questa pagina elenca cosa è cambiato in ciascuna.", + "current_a": "Leggi il manifesto attuale", + "propose_h": "Proporre una modifica", + "propose_p1": "Le proposte vanno in una issue pubblica sul", + "propose_a": "repository del sito", + "propose_p2": "Oggi decide l'autore che cosa entra. Se le versioni nelle varie lingue differiscono, fa fede il testo inglese. I testi in spagnolo, tedesco e francese sono traduzioni automatiche della versione 1.0.", + "versions": [ + { + "version": "1.1", + "date": "2026-11-13", + "changes": [ + "Preambolo: dice chi è \"noi\" oggi: una persona sola, aperta ad altre persone che accettano il manifesto.", + "Preambolo: nel testo inglese \"anti-authoritarian\" sostituisce \"libertarian\".", + "Impegni nuovi: una tabella pubblica sui dati, una pagina pubblica sui fondi, criteri pubblici per gli account con motivo scritto e ricorso, una politica sulle richieste delle autorità, indirizzi per sicurezza e abusi, e 90 giorni di preavviso con l'esportazione dei dati se kmalloc.org chiude.", + "Sezione nuova \"Su questo testo\": versioni datate, come proporre modifiche, fa fede il testo inglese, licenza CC BY-SA 4.0.", + "Testo italiano, punto 11: due correzioni per allinearlo all'inglese (\"chi dice di rappresentarla\", \"integrità\")." + ] + }, + { + "version": "1.0", + "date": "2026-11-12", + "changes": [ + "Prima versione, in inglese e in italiano.", + "Traduzioni automatiche in spagnolo, tedesco e francese." + ] + } + ] } } } diff --git a/site.json b/site.json index 371e1fd..d88b19a 100644 --- a/site.json +++ b/site.json @@ -7,8 +7,13 @@ "de", "fr" ], - "manifesto_version": "1.0", + "manifesto_version": "1.1", + "manifesto_date": "2026-11-13", "contact": "squid@kmalloc.org", + "security": "security@kmalloc.org", + "abuse": "abuse@kmalloc.org", + "issues_url": "https://git.kmalloc.org/squid/kmalloc.org/issues", + "license_url": "https://creativecommons.org/licenses/by-sa/4.0/", "btc": "bc1qsj5qadrzlqmfwcru4fwuqvftg833te5f9mja2c", "home_order": [ "git", diff --git a/static/style.css b/static/style.css index d2a0bd5..3cc1639 100644 --- a/static/style.css +++ b/static/style.css @@ -131,3 +131,67 @@ code { page-break-after: avoid; } } + +.note { + margin: 1em 0; + padding: .5em 1em; + border-left: 4px solid var(--accent); + background-color: var(--surface); + line-height: 1.6; +} + +table { + width: 100%; + border-collapse: collapse; + font-size: .9375em; +} + +caption { + text-align: left; + color: var(--muted); +} + +th, td { + padding: .5em .5em .5em 0; + border-bottom: 1px solid var(--border); + text-align: left; + vertical-align: top; +} + +thead th { + font-weight: bold; +} + +@media (max-width: 40em) { + .data thead { + position: absolute; + width: 1px; + height: 1px; + overflow: hidden; + clip-path: inset(50%); + } + + .data tr, .data th, .data td { + display: block; + } + + .data tbody th { + padding-top: 1em; + border-bottom: none; + font-family: "Courier New", Courier, monospace; + } + + .data td { + padding: .25em 0; + border-bottom: none; + } + + .data td::before { + content: attr(data-label) ": "; + font-weight: bold; + } + + .data tr { + border-bottom: 1px solid var(--border); + } +} diff --git a/templates/base.html b/templates/base.html index 8fb65a6..5af382b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,8 +4,7 @@ - - +{{robots_meta}} diff --git a/templates/footer.html b/templates/footer.html index d859060..cf119b3 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -3,5 +3,10 @@

      {{nojs}}

      +

      +{{history_a}} +· +{{license_text}} CC BY-SA 4.0. +

      {{badges}} diff --git a/templates/header-min.html b/templates/header-min.html index ed1627d..d9826bc 100644 --- a/templates/header-min.html +++ b/templates/header-min.html @@ -8,4 +8,8 @@ {{lang_links}}

      +

      +{{translation_note}} +{{translation_note_a}}. +

      diff --git a/templates/pages/history.html b/templates/pages/history.html new file mode 100644 index 0000000..bc4da9c --- /dev/null +++ b/templates/pages/history.html @@ -0,0 +1,15 @@ +

      {{heading}}

      + +

      +{{intro}} +{{current_a}}. +

      + +{{history_list}} +

      {{propose_h}}

      + +

      +{{propose_p1}} +{{propose_a}}. +{{propose_p2}} +

      diff --git a/templates/pages/manifesto.html b/templates/pages/manifesto.html index 2b8a1ce..e9ab26b 100644 --- a/templates/pages/manifesto.html +++ b/templates/pages/manifesto.html @@ -1,7 +1,9 @@

      {{manifesto_title}}

      -{{version}} {{manifesto_version}} +{{version}} {{manifesto_version}}, +· +{{history_a}}

      {{note_block}}

      {{toc}}

      diff --git a/templates/pages/services.html b/templates/pages/services.html index 3e546a2..ea811df 100644 --- a/templates/pages/services.html +++ b/templates/pages/services.html @@ -4,6 +4,19 @@ {{intro}}

      +

      +{{on_page}} +

      + + +

      {{account_h}}

      @@ -29,11 +42,48 @@ {{contact_keyserver}}.

      -{{service_sections}} +{{service_sections}}

      {{rules_h}}

      -{{donate_p}} -{{btc}} +{{rules_p1}} +

      + +

      {{rules_conduct_h}}

      + +

      +{{rules_conduct_p}} +

      + +
        +{{rules_conduct}} +
      + +

      {{rules_resources_h}}

      + +
        +{{rules_resources}} +
      + +

      {{rules_sanctions_h}}

      + +

      +{{rules_sanctions_p}} +

      + +

      +{{rules_p2}} +{{abuse_shown}}. +{{rules_p3}} +

      + +

      {{rules_inactive_h}}

      + +

      +{{rules_inactive_p}} +

      + +

      +{{rules_p4}}

      {{privacy_h}}

      @@ -46,6 +96,67 @@ {{privacy_p2}}

      +

      {{data_h}}

      + +

      +{{data_p1}} +

      + + + + + + + + + + + + +{{retention_rows}} + +
      {{data_caption}}
      {{col_service}}{{col_admin}}{{col_not_e2e}}{{col_kept}}
      + +

      +{{data_p2}} +

      + +

      {{authorities_h}}

      + +

      +{{authorities_p1}} +

      + +

      +{{authorities_p2}} +

      + + +

      {{security_h}}

      + +

      +{{security_p1}} +{{security_shown}}. +{{security_p2}} +

      + +

      +{{abuse_p1}} +{{abuse_shown}}. +{{abuse_p2}} +

      + +

      {{funding_h}}

      + +

      +{{funding_p1}} +

      + +

      +{{funding_p2}} +{{btc}} +

      +

      {{terms_h}}