[taler-marketing] branch master updated (9dfad30 -> 9221cc4)

[gnunet]

This is an automated email from the git hooks/post-receive script.

oec pushed a change to branch master
in repository marketing.

    from 9dfad30  ethereum is _still_ POW
     new 6a13a9e  typo fixed
     new 9221cc4  fix some references

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 2022-privacy/literature.bib | 8 +++-----
 2022-privacy/privacy.tex    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/2022-privacy/literature.bib b/2022-privacy/literature.bib
index 50456ef..b83bc8f 100644
--- a/2022-privacy/literature.bib
+++ b/2022-privacy/literature.bib
@@ -504,8 +504,7 @@ series = {SEC'16}
 @misc{EurostatAge10,
   author       = {Eurostat},
   title        = {{Population on 1 January by age and sex (Europa, 
Altersgruppe 10)}},
-  howpublished = {Webpräsenz von Eurostat},
-  url          = {https://bit.ly/32iWEyV}
+  howpublished = {\url{https://bit.ly/32iWEyV}}
 }
 
 @book{dannen2017introducing,
@@ -519,15 +518,14 @@ series = {SEC'16}
 @misc{merge2022,
   title={The merge},
   year={2022},
-  url = {https://ethereum.org/en/upgrades/merge}
+  howpublished = {\url{https://ethereum.org/en/upgrades/merge}}
 }
 
 @misc{nelson2021,
   title={The State of the Merge: An Update on Ethereum’s Merge to Proof of 
Stake in 2022},
   author={Matt Nelson},
   year = {2021},
-  howpublished={consensys.net},
-  url = 
{https://consensys.net/blog/news/the-state-of-the-merge-an-update-on-ethereums-merge-to-proof-of-stake-in-2022/}
+  howpublished = 
{\url{https://consensys.net/blog/news/the-state-of-the-merge-an-update-on-ethereums-merge-to-proof-of-stake-in-2022/}}
 }
 
 @article{noether2015ring,
diff --git a/2022-privacy/privacy.tex b/2022-privacy/privacy.tex
index aae409b..29ab32e 100644
--- a/2022-privacy/privacy.tex
+++ b/2022-privacy/privacy.tex
@@ -66,7 +66,7 @@ citizens and businesses.
 \section{Currency, crypto-currency and payment systems} \label{sec:terms}
 
 Currency is ``\emph{something that is used as a medium of exchange;
-  money.}''\cite{dictionaryCurrency}. Form the French dictionary, currency
+  money.}''\cite{dictionaryCurrency}. From the French dictionary, currency
 (i.e. la monnaie) is an ``\emph{Instrument of measurement and conservation of
   value, legal means of exchanging goods}''\footnote{``Instrument de mesure et
   de conservation de la valeur, moyen légal d'échange des biens.''}, or

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.