n/helen.md

@@ -8,8 +8,6 @@ basicdistribution: "5.51 €/month"
 distributionmargin: "4.07 c/kWh"
 basicstock: "3,93 €/month"
 stockmargin: "0,38 c/kWh"
-omahelenhighprice: "20 c/kWh"
-omahelenlowprice: "5 c/kWh"
 ---
 
 Tuntihinta @ [Apple App Store](https://apps.apple.com/app/tuntihinta/id824684537) [Google Play](https://play.google.com/store/apps/details?id=fi.fingrid.tuntihinta)
@@ -26,11 +24,8 @@ Helen markkinahintasähkö kuukaudelle {{ page.month }} on {{ page.monthly }}.
 *Jekyll ei salli matematiikkaa suoraan tietoturvasyistä.*
 
 * Kallis: <strong>{{ page.monthly }} + {{ page.distributionmargin }}</strong> (Helenin markkinasähköhinta + siirtohinta kWh)
-* Halpa: <strong>({{ page.monthly }} + {{ page.distributionmargin }}) / 2</strong> (Helenin markkinasähköhinta + siirtohinta kWh / 2), ***pyöristettynä alaspäin***
+* Hakpa: <strong>({{ page.monthly }} + {{ page.distributionmargin }}) / 2</strong> (Helenin markkinasähköhinta + siirtohinta kWh / 2), ***pyöristettynä alaspäin***
 * Marginaali: <strong>{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (Helen Sähköverkot Oy siirtohinta kWh + pörssisähkön marginaali).
-* OmaHelen kohtelee alle {{ page.omahelenlowprice }} halpana ja yli {{ page.omahelenhighprice }} kalliina, joten vaihtoehtoiset kaavat ovat:
-  * Kallis: <strong>{{ page.omahelenhighprice }} + {{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelenin korkea hinta + Marginaali)
-  * Halpa: <strong>{{ page.omahelenlowprice }} + {{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelenin matala hinta + Marginaali)
 
 ## Lähteet
 
@@ -52,9 +47,6 @@ Helen's monthly market price for month {{ page.month }} is {{ page.monthly }}.
 * Expensive: <strong>{{ page.monthly }} + {{ page.distributionmargin }}</strong> (Helen's Market Price Electricity + distribution margin)
 * Cheap: <strong>({{ page.monthly }} + {{ page.distributionmargin }}) / 2</strong> (Helen's Market Price Electricity + distribution margin / 2), ***round down***
 * Margin: <strong>{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (Distribution fee + stock margin)
-* OmaHelen app treats {{ page.omahelenlowprice }} as cheap and over {{ page.omahelenhighprice }} as expensive, so alternative equations are:
-  * Expensive: <strong>{{ page.omahelenhighprice }} + {{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelen's high price + Marginal)
-  * Cheap: <strong>{{ page.omahelenlowprice }} + {{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelen's low price + Marginal)
 
 ## Sources
 

pages/matrix.markdown

@@ -48,26 +48,6 @@ They are related to bringing Matrix to other protocols or vice versa.
 * A puppet is the opposite, a Matrix account controlled from another protocol such as IRC or XMPP (the controller/puppetmaster being the user there).
 * A double-puppet is when you are using both protocols and have connected them to each other such as a message from Discord appears as your real Matrix account and message from Matrixx appears as your real Discord account instead of something virtual only existing due to the bridge.
 
-### What does the public history visibility mean? I don't want to appear in search engines
-
-The public/world-readable history visibility option means exactly what it says,
-public even without joining the room. These rooms are accessible to tools
-such as [Matrix Static](https://view.matrix.org/) or upcoming [Matrix Public Archive](https://github.com/matrix-org/matrix-public-archive)
-and thus their history is visible in search engines. If this isn't what you
-want, set history visibility to one of the members only options (since
-selecting this option, since being invited or since join).
-
-Note that as the option name hints, the history visibility option will not
-apply to previous messages. Thus if you first make room public and then
-restrict it to members only the messages between these two changes are public
-and new users will see them. Same if messages are visible to members and
-then restricted further.
-
-Another thing worth noting here is that encryption will not prevent new users
-from reading the future messages, Matrix will share keys to new joiners to
-some extent. For more information refer to [Matrix Spec issue #1](https://github.com/matrix-org/matrix-spec/issues/1)
-and related issues.
-
 ### What are state resets?
 
 The term is used least in two different scenarios: