[taler-donau] branch master updated: rework overview

[gnunet]

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

johannes-casaburi pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new e3b19ef  rework overview
e3b19ef is described below

commit e3b19effb201304e01fb0769c0b948f7cef06ad0
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Tue May 7 16:57:49 2024 +0200

    rework overview
---
 .../donau_overview.tex => overview/overview.tex}   |   4 ----
 doc/thesis/thesis.pdf                              | Bin 866928 -> 870637 bytes
 doc/thesis/thesis.tex                              |   2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/thesis/chapters/donau_overview/donau_overview.tex 
b/doc/thesis/chapters/overview/overview.tex
similarity index 89%
rename from doc/thesis/chapters/donau_overview/donau_overview.tex
rename to doc/thesis/chapters/overview/overview.tex
index 540707e..cd739b2 100644
--- a/doc/thesis/chapters/donau_overview/donau_overview.tex
+++ b/doc/thesis/chapters/overview/overview.tex
@@ -1,9 +1,5 @@
 \section{The Concept}
-<<<<<<< HEAD
 For the Donau to work there needs to be one or more charities and donors. The 
Donau is operated by the tax authority while maintaining a list of verified 
charites the donor can donate money to. Each charity maintains a backend 
solution that allows it to communicate with the Donau and donor. When donating 
to a charity the donor sends the payment together with a signing request (done 
automatically with the payment) to the charity. The charity must verify that 
the payment was successful and [...]
-=======
-The Donau\footnote{short for donation authority} environment includes three 
stakeholders. Donors, charities and the tax authority. The donation receipt is 
no longer issued by the charity, but by the tax authority. This makes the 
validation of the receipts easy. If the tax authority signs the receipts, it 
can also check them unambiguously. The tax authority operates the centerpiece, 
the Donau (short for donation authority). The Donau is a server which 
automatically issues donation receipts.
->>>>>>> 71d683b37651803315638dc90c40cfeb94c4f887
 
 Upon receiving the signed signing request from the charity, the Donau must 
verify the charity signature and check for any legal restrictions imposed by 
law, such as a yearly donation limit. After successful verification the Donau 
creates a donation receipt which is sent to the Donor. The receipt gets saved 
on the donors device for later. This process repeats for every donation. At the 
end of the year the donor may have accumulated a bunch of these donation 
receipts.
 
diff --git a/doc/thesis/thesis.pdf b/doc/thesis/thesis.pdf
index 96c9984..ca5ef29 100644
Binary files a/doc/thesis/thesis.pdf and b/doc/thesis/thesis.pdf differ
diff --git a/doc/thesis/thesis.tex b/doc/thesis/thesis.tex
index 891fba4..c61e50e 100644
--- a/doc/thesis/thesis.tex
+++ b/doc/thesis/thesis.tex
@@ -22,7 +22,7 @@
 \input{chapters/intro/introduction}
 
 \chapter{Donau Overview}
-\input{chapters/donau_overview/donau_overview}
+\input{chapters/overview/overview}
 
 \chapter{Cryptographic Preliminaries}
 \input{chapters/crypto/crypto}

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