diff --git a/documents/common/asymmetrie/asymmetrie.lyx b/documents/common/asymmetrie/asymmetrie.lyx
index e4fc819..cc5cb60 100644
--- a/documents/common/asymmetrie/asymmetrie.lyx
+++ b/documents/common/asymmetrie/asymmetrie.lyx
@@ -1,4 +1,4 @@
-#LyX 1.4.1 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
\lyxformat 245
\begin_document
\begin_header
diff --git a/documents/common/warumverschluesselung/warumverschluesselung.lyx b/documents/common/warumverschluesselung/warumverschluesselung.lyx
index e38953e..87809c2 100644
--- a/documents/common/warumverschluesselung/warumverschluesselung.lyx
+++ b/documents/common/warumverschluesselung/warumverschluesselung.lyx
@@ -1,4 +1,4 @@
-#LyX 1.4.1 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
\lyxformat 245
\begin_document
\begin_header
@@ -736,7 +736,7 @@ rde; Grundrechtsbindung der staatlichen Gewalt] basiert
\end_layout
\begin_layout Standard
-\begin_inset Include \input{progress/progress_warumverschluesselung.inc}
+\begin_inset Include \input{progress/progress_einfuehrung.inc}
preview false
\end_inset
diff --git a/documents/common/wiefunktionierts/wiefunktionierts.lyx b/documents/common/wiefunktionierts/wiefunktionierts.lyx
index d7dd498..d824297 100644
--- a/documents/common/wiefunktionierts/wiefunktionierts.lyx
+++ b/documents/common/wiefunktionierts/wiefunktionierts.lyx
@@ -1,4 +1,4 @@
-#LyX 1.4.1 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
\lyxformat 245
\begin_document
\begin_header
@@ -213,7 +213,7 @@ Wie die asymmetrische Verschl
\end_layout
\begin_layout Standard
-\begin_inset Include \input{progress/progress_wiefunktionierts.inc}
+\begin_inset Include \input{progress/progress_einfuehrung.inc}
preview false
\end_inset
diff --git a/documents/mod_html_files.py b/documents/mod_html_files.py
index 61dc99c..62d1f54 100644
--- a/documents/mod_html_files.py
+++ b/documents/mod_html_files.py
@@ -5,6 +5,7 @@ and stuff'''
import string
import sys
import re
+import os.path
def writeFile(data, filename):
"""
@@ -86,6 +87,12 @@ try:
content = string.replace(content,'HREF="http:','class="externalLink" href="http:')
content = string.replace(content,'HREF="https:','class="externalLink" href="https:')
+ # TODO: comment
+ startoffset=string.find(content,'
')
+ namensposition = string.find(content,os.path.basename(sys.argv[1]),startoffset)
+ if namensposition > 0:
+ content = content[:namensposition] + string.replace(content[namensposition:],'
','',1)
+
#all done, writing tuned files
writeFile(content,sys.argv[1])
diff --git a/documents/progress/progress_chat_programme.inc b/documents/progress/progress_chat_programme.inc
index 444aff3..54744d5 100644
--- a/documents/progress/progress_chat_programme.inc
+++ b/documents/progress/progress_chat_programme.inc
@@ -4,7 +4,7 @@
- Benötigte Programme
- - Gaim installieren
+ - Gaim installieren
- Ein Konto einrichten
- Gaim-Encryption installieren
- Gaim-Encryption einrichten
diff --git a/documents/progress/progress_einfuehrung.inc b/documents/progress/progress_einfuehrung.inc
index cc612f8..acf187b 100644
--- a/documents/progress/progress_einfuehrung.inc
+++ b/documents/progress/progress_einfuehrung.inc
@@ -2,7 +2,8 @@
diff --git a/documents/progress/progress_email_signieren.inc b/documents/progress/progress_email_signieren.inc
index a974761..c468081 100644
--- a/documents/progress/progress_email_signieren.inc
+++ b/documents/progress/progress_email_signieren.inc
@@ -7,7 +7,7 @@
- Verschlüsselt Mailen
- E-Mails signieren
- - E-Mails verschlüsseln
+ - E-Mails verschlüsseln
- E-Mails entschlüsseln
- Signaturen überprüfen
diff --git a/documents/progress/progress_email_verschluesseln.inc b/documents/progress/progress_email_verschluesseln.inc
index b6147a2..c468081 100644
--- a/documents/progress/progress_email_verschluesseln.inc
+++ b/documents/progress/progress_email_verschluesseln.inc
@@ -8,7 +8,7 @@
- E-Mails signieren
- E-Mails verschlüsseln
- - E-Mails entschlüsseln
+ - E-Mails entschlüsseln
- Signaturen überprüfen
diff --git a/documents/progress/progress_enigmail_einrichtung.inc b/documents/progress/progress_enigmail_einrichtung.inc
index 6ec92e4..df82c1c 100644
--- a/documents/progress/progress_enigmail_einrichtung.inc
+++ b/documents/progress/progress_enigmail_einrichtung.inc
@@ -24,7 +24,7 @@
-
Das Schlüsselbund verwalten
+
Das Schlüsselbund verwalten
Verschlüsselt Mailen
diff --git a/documents/progress/progress_enigmail_installation.inc b/documents/progress/progress_enigmail_installation.inc
index a974c61..df82c1c 100644
--- a/documents/progress/progress_enigmail_installation.inc
+++ b/documents/progress/progress_enigmail_installation.inc
@@ -19,7 +19,7 @@
Enigmail:
diff --git a/documents/progress/progress_gaim_einrichtung_konto.inc b/documents/progress/progress_gaim_einrichtung_konto.inc
index 51825b0..54744d5 100644
--- a/documents/progress/progress_gaim_einrichtung_konto.inc
+++ b/documents/progress/progress_gaim_einrichtung_konto.inc
@@ -6,7 +6,7 @@
- Gaim installieren
- Ein Konto einrichten
- - Gaim-Encryption installieren
+ - Gaim-Encryption installieren
- Gaim-Encryption einrichten
diff --git a/documents/progress/progress_gaim_encryption_einrichtung.inc b/documents/progress/progress_gaim_encryption_einrichtung.inc
index a68c4b2..54744d5 100644
--- a/documents/progress/progress_gaim_encryption_einrichtung.inc
+++ b/documents/progress/progress_gaim_encryption_einrichtung.inc
@@ -10,7 +10,7 @@
Gaim-Encryption einrichten
- Verschlüsselt Chatten
+ Verschlüsselt Chatten
\end{rawhtml}
diff --git a/documents/progress/progress_gaim_encryption_installation.inc b/documents/progress/progress_gaim_encryption_installation.inc
index 48ac0fc..54744d5 100644
--- a/documents/progress/progress_gaim_encryption_installation.inc
+++ b/documents/progress/progress_gaim_encryption_installation.inc
@@ -7,7 +7,7 @@
Gaim installieren
Ein Konto einrichten
Gaim-Encryption installieren
- Gaim-Encryption einrichten
+ Gaim-Encryption einrichten
Verschlüsselt Chatten
diff --git a/documents/progress/progress_gaim_installation.inc b/documents/progress/progress_gaim_installation.inc
index abfdfd7..54744d5 100644
--- a/documents/progress/progress_gaim_installation.inc
+++ b/documents/progress/progress_gaim_installation.inc
@@ -5,7 +5,7 @@
Benötigte Programme
- Gaim installieren
- - Ein Konto einrichten
+ - Ein Konto einrichten
- Gaim-Encryption installieren
- Gaim-Encryption einrichten
diff --git a/documents/progress/progress_gpg_installation.inc b/documents/progress/progress_gpg_installation.inc
index 4f6e5d6..703874e 100644
--- a/documents/progress/progress_gpg_installation.inc
+++ b/documents/progress/progress_gpg_installation.inc
@@ -16,9 +16,9 @@
Installation
- Enigmail:
+ Enigmail:
diff --git a/documents/progress/progress_schluessel_erstellen.inc b/documents/progress/progress_schluessel_erstellen.inc
index 0a85f04..b967933 100644
--- a/documents/progress/progress_schluessel_erstellen.inc
+++ b/documents/progress/progress_schluessel_erstellen.inc
@@ -6,7 +6,7 @@
Das Schlüsselbund verwalten
- Ein eigenes Schlüsselpaar erstellen
- - Andere Schlüssel importieren
+ - Andere Schlüssel importieren
- Schlüssel weitergeben
diff --git a/documents/progress/progress_schluessel_exportieren.inc b/documents/progress/progress_schluessel_exportieren.inc
index 00a7168..eb11fb8 100644
--- a/documents/progress/progress_schluessel_exportieren.inc
+++ b/documents/progress/progress_schluessel_exportieren.inc
@@ -10,7 +10,7 @@
Schlüssel weitergeben
- Verschlüsselt Mailen
+ Verschlüsselt Mailen
\end{rawhtml}
diff --git a/documents/progress/progress_schluessel_importieren.inc b/documents/progress/progress_schluessel_importieren.inc
index 996d602..eb11fb8 100644
--- a/documents/progress/progress_schluessel_importieren.inc
+++ b/documents/progress/progress_schluessel_importieren.inc
@@ -7,7 +7,7 @@
- Ein eigenes Schlüsselpaar erstellen
- Andere Schlüssel importieren
- - Schlüssel weitergeben
+ - Schlüssel weitergeben
Verschlüsselt Mailen
diff --git a/documents/progress/progress_schluesselbund.inc b/documents/progress/progress_schluesselbund.inc
index a2a8389..eb11fb8 100644
--- a/documents/progress/progress_schluesselbund.inc
+++ b/documents/progress/progress_schluesselbund.inc
@@ -5,7 +5,7 @@
Benötigte Programme
Das Schlüsselbund verwalten
- - Ein eigenes Schlüsselpaar erstellen
+ - Ein eigenes Schlüsselpaar erstellen
- Andere Schlüssel importieren
- Schlüssel weitergeben
diff --git a/documents/progress/progress_thunderbird_einrichtung.inc b/documents/progress/progress_thunderbird_einrichtung.inc
index 0f59591..df82c1c 100644
--- a/documents/progress/progress_thunderbird_einrichtung.inc
+++ b/documents/progress/progress_thunderbird_einrichtung.inc
@@ -13,7 +13,7 @@
GnuPG:
Enigmail:
diff --git a/documents/progress/progress_thunderbird_einrichtung_konto.inc b/documents/progress/progress_thunderbird_einrichtung_konto.inc
index 1c20046..df82c1c 100644
--- a/documents/progress/progress_thunderbird_einrichtung_konto.inc
+++ b/documents/progress/progress_thunderbird_einrichtung_konto.inc
@@ -8,7 +8,7 @@
GnuPG:
diff --git a/documents/progress/progress_thunderbird_installation.inc b/documents/progress/progress_thunderbird_installation.inc
index 2230792..df82c1c 100644
--- a/documents/progress/progress_thunderbird_installation.inc
+++ b/documents/progress/progress_thunderbird_installation.inc
@@ -7,7 +7,7 @@
Thunderbird:
diff --git a/documents/progress/progress_warumverschluesselung.inc b/documents/progress/progress_warumverschluesselung.inc
deleted file mode 100644
index 9de7d33..0000000
--- a/documents/progress/progress_warumverschluesselung.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-\begin{rawhtml}
-
-\end{rawhtml}
diff --git a/documents/progress/progress_wiefunktionierts.inc b/documents/progress/progress_wiefunktionierts.inc
deleted file mode 100644
index 40d51fc..0000000
--- a/documents/progress/progress_wiefunktionierts.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-\begin{rawhtml}
-
-\end{rawhtml}