Merge pull request #149 from themanwhosold/markus_entw

finale Version der Dokumentation, letzte Screenshots eingefügt, Recht…
themanwhosold · Jan 22, 2016 · 3b750da · 3b750da
2 parents 2535103 + 3bdeaf5
commit 3b750da
Show file tree

Hide file tree

Showing 10 changed files with 440,894 additions and 56,432 deletions.
diff --git a/doc/Dokumentation/doku.pdf b/doc/Dokumentation/doku.pdf
diff --git a/doc/Dokumentation/doku.tex b/doc/Dokumentation/doku.tex
diff --git a/doc/Dokumentation/pics/AdminE.eps b/doc/Dokumentation/pics/AdminE.eps
diff --git a/doc/Dokumentation/pics/AdminOberflaeche.eps b/doc/Dokumentation/pics/AdminOberflaeche.eps
diff --git a/doc/Dokumentation/pics/DozentIn.eps b/doc/Dokumentation/pics/DozentIn.eps
diff --git a/doc/Dokumentation/pics/DozentenOberflaeche.eps b/doc/Dokumentation/pics/DozentenOberflaeche.eps
diff --git a/doc/Dokumentation/pics/Neu_StudiengangsleiterIn.eps b/doc/Dokumentation/pics/Neu_StudiengangsleiterIn.eps
diff --git a/doc/Dokumentation/pics/StudentenOberflaeche.eps b/doc/Dokumentation/pics/StudentenOberflaeche.eps
diff --git a/doc/Dokumentation/pics/neu_dozentIn.eps b/doc/Dokumentation/pics/neu_dozentIn.eps
diff --git a/src/main/webapp/adminSeite.xhtml b/src/main/webapp/adminSeite.xhtml
@@ -9,7 +9,7 @@
     <h:body>
         <ui:composition template="templates/adminTemplate.xhtml">
             <ui:define name="title">Admin Seite</ui:define>
-            <ui:define name="top">Übersicht für Administartoren
+            <ui:define name="top">Übersicht für Administratoren
                 <c:set var="admin" value="${outForStudents.getStudent(4711)}"/>
                 <br/>
                 <h:outputText value="Sie sind angemeldet als: "/>