From 648c3910391d2158cf74636614ec9469f4119db4 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 1 Aug 2006 17:35:34 +0000 Subject: [PATCH] * Untermenues geloescht - dafuer gibt es den Fortschritt * Policy angepasst --- ccd-infos/policy_formatierung.lyx | 16 +--------------- documents/common/asymmetrie/asymmetrie.lyx | 6 +++--- documents/common/chat/chat.lyx | 2 +- .../common/chat_anwendung/chat_anwendung.lyx | 2 +- .../common/chat_programme/chat_programme.lyx | 2 +- documents/common/einfuehrung/einfuehrung.lyx | 2 +- documents/common/email/email.lyx | 2 +- .../common/email_programme/email_programme.lyx | 2 +- .../gaim_einrichtung_konto.lyx | 2 +- .../gaim_encryption_einrichtung.lyx | 2 +- .../mailserviceanbieter/mailserviceanbieter.lyx | 6 +++++- .../schluessel_erstellen.lyx | 2 +- .../schluessel_export/schluessel_export.lyx | 2 +- .../schluessel_import/schluessel_import.lyx | 2 +- .../common/schluesselbund/schluesselbund.lyx | 2 +- .../thunderbird_einrichtung_konto.lyx | 2 +- .../warumverschluesselung.lyx | 6 +++--- .../common/wiefunktionierts/wiefunktionierts.lyx | 2 +- .../enigmail_einrichtung.lyx | 6 +++--- .../enigmail_installation.lyx | 2 +- .../gaim_encryption_installation.lyx | 2 +- .../gaim_installation/gaim_installation.lyx | 2 +- .../linux/gpg_installation/gpg_installation.lyx | 2 +- .../thunderbird_installation.lyx | 2 +- .../enigmail_einrichtung.lyx | 8 ++++---- .../macos/gpg_installation/gpg_installation.lyx | 2 +- .../thunderbird_installation.lyx | 2 +- documents/menue_chat.inc | 15 --------------- documents/menue_einfuehrung.inc | 16 ---------------- documents/menue_email.inc | 16 ---------------- .../enigmail_einrichtung.lyx | 6 +++--- .../enigmail_installation.lyx | 2 +- .../gaim_encryption_installation.lyx | 2 +- .../gaim_installation/gaim_installation.lyx | 2 +- .../gpg_installation/gpg_installation.lyx | 2 +- .../thunderbird_installation.lyx | 2 +- 36 files changed, 48 insertions(+), 105 deletions(-) delete mode 100644 documents/menue_chat.inc delete mode 100644 documents/menue_einfuehrung.inc delete mode 100644 documents/menue_email.inc diff --git a/ccd-infos/policy_formatierung.lyx b/ccd-infos/policy_formatierung.lyx index 38fd1a9..b35ff5f 100644 --- a/ccd-infos/policy_formatierung.lyx +++ b/ccd-infos/policy_formatierung.lyx @@ -175,15 +175,6 @@ Kopf: Das Men Die eingefügte Datei \emph on menue.inc -\emph default - bzw. - -\emph on -menue_email.inc -\emph default - oder -\emph on -menue_chat.inc \emph default ist dafür verantwortlich, dass das Menü dargestellt wird. Änderungen am Menü musst du also in dieser Datei vornehmen. @@ -201,11 +192,6 @@ Im Lyx-Men Der Dateiname ist \emph on menue.inc -\emph default - bzw. - -\emph on -menue_xyz.inc \end_layout \begin_layout Itemize @@ -218,7 +204,7 @@ die Art der Einbindung ist ''Input'' \begin_layout Itemize Beispiel: -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/asymmetrie/asymmetrie.lyx b/documents/common/asymmetrie/asymmetrie.lyx index ef2ca38..39e5a17 100644 --- a/documents/common/asymmetrie/asymmetrie.lyx +++ b/documents/common/asymmetrie/asymmetrie.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_einfuehrung.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -113,8 +113,8 @@ private Schl öffentliche Schlüssel \emph default wird jedem kommunikationswilligen Wesen zugänglich gemacht. - Der große Vorteil dieses Verfahrens im Vergleich zur symmetrischen Verschlüsse -lung + Der große Vorteil dieses Verfahrens im Vergleich zur symmetrischen Verschlüssel +ung \begin_inset Foot status open diff --git a/documents/common/chat/chat.lyx b/documents/common/chat/chat.lyx index 395c90b..41c5a7a 100644 --- a/documents/common/chat/chat.lyx +++ b/documents/common/chat/chat.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/chat_anwendung/chat_anwendung.lyx b/documents/common/chat_anwendung/chat_anwendung.lyx index c511f96..7877746 100644 --- a/documents/common/chat_anwendung/chat_anwendung.lyx +++ b/documents/common/chat_anwendung/chat_anwendung.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/chat_programme/chat_programme.lyx b/documents/common/chat_programme/chat_programme.lyx index 4282f3d..8802dc1 100644 --- a/documents/common/chat_programme/chat_programme.lyx +++ b/documents/common/chat_programme/chat_programme.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/einfuehrung/einfuehrung.lyx b/documents/common/einfuehrung/einfuehrung.lyx index eb94944..7f5977c 100644 --- a/documents/common/einfuehrung/einfuehrung.lyx +++ b/documents/common/einfuehrung/einfuehrung.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_einfuehrung.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/email/email.lyx b/documents/common/email/email.lyx index 1b31cc0..c12e369 100644 --- a/documents/common/email/email.lyx +++ b/documents/common/email/email.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/email_programme/email_programme.lyx b/documents/common/email_programme/email_programme.lyx index 31db15d..732b519 100644 --- a/documents/common/email_programme/email_programme.lyx +++ b/documents/common/email_programme/email_programme.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/gaim_einrichtung_konto/gaim_einrichtung_konto.lyx b/documents/common/gaim_einrichtung_konto/gaim_einrichtung_konto.lyx index adf490a..def7533 100644 --- a/documents/common/gaim_einrichtung_konto/gaim_einrichtung_konto.lyx +++ b/documents/common/gaim_einrichtung_konto/gaim_einrichtung_konto.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx b/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx index 83c6f5c..57fde43 100644 --- a/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx +++ b/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/mailserviceanbieter/mailserviceanbieter.lyx b/documents/common/mailserviceanbieter/mailserviceanbieter.lyx index 6efd8ff..97abbbe 100644 --- a/documents/common/mailserviceanbieter/mailserviceanbieter.lyx +++ b/documents/common/mailserviceanbieter/mailserviceanbieter.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -101,6 +101,10 @@ end{rawhtml} Mail-Anbieter \end_layout +\begin_layout Author +E-Mails verschlüsseln +\end_layout + \begin_layout Subsection* GMX \end_layout diff --git a/documents/common/schluessel_erstellen/schluessel_erstellen.lyx b/documents/common/schluessel_erstellen/schluessel_erstellen.lyx index 483393a..d8742eb 100644 --- a/documents/common/schluessel_erstellen/schluessel_erstellen.lyx +++ b/documents/common/schluessel_erstellen/schluessel_erstellen.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/schluessel_export/schluessel_export.lyx b/documents/common/schluessel_export/schluessel_export.lyx index a33f2ea..147bfef 100644 --- a/documents/common/schluessel_export/schluessel_export.lyx +++ b/documents/common/schluessel_export/schluessel_export.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/schluessel_import/schluessel_import.lyx b/documents/common/schluessel_import/schluessel_import.lyx index 9e663dc..deb525b 100644 --- a/documents/common/schluessel_import/schluessel_import.lyx +++ b/documents/common/schluessel_import/schluessel_import.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/schluesselbund/schluesselbund.lyx b/documents/common/schluesselbund/schluesselbund.lyx index 11c34d1..f2bf762 100644 --- a/documents/common/schluesselbund/schluesselbund.lyx +++ b/documents/common/schluesselbund/schluesselbund.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx b/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx index a51264b..1cfbcb6 100644 --- a/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx +++ b/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/common/warumverschluesselung/warumverschluesselung.lyx b/documents/common/warumverschluesselung/warumverschluesselung.lyx index 98a94c6..372b932 100644 --- a/documents/common/warumverschluesselung/warumverschluesselung.lyx +++ b/documents/common/warumverschluesselung/warumverschluesselung.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_einfuehrung.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -752,8 +752,8 @@ projects/krypto/stega/stega.html} Verfahren um den Inhalt von Nachrichten zu verschleiern. Hierbei werden die Texte beispielsweise in Bild- oder Ton-Dateien versteckt. - Die eingeweihte Empfangsseite kann dann aus dem Bild oder der Tonspur - die verborgene Nachricht extrahieren. + Die eingeweihte Empfangsseite kann dann aus dem Bild oder der Tonspur die + verborgene Nachricht extrahieren. Diese Art der Nachrichtenübermittlung bietet den Vorteil, dass es für nicht eingeweihte Menschen keine Möglichkeit gibt, zu erkennen, ob ein Bild eine versteckte Nachricht enthält oder eben "nur" ein Bild ist. diff --git a/documents/common/wiefunktionierts/wiefunktionierts.lyx b/documents/common/wiefunktionierts/wiefunktionierts.lyx index 85ac597..e14287b 100644 --- a/documents/common/wiefunktionierts/wiefunktionierts.lyx +++ b/documents/common/wiefunktionierts/wiefunktionierts.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_einfuehrung.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx index 608acdf..2dcef80 100644 --- a/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx +++ b/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -264,7 +264,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_konto_openpgp01.png + filename bilder/einstellungen/em_einstellungen_konto_openpgp01.png \end_inset @@ -370,7 +370,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_senden.png + filename bilder/einstellungen/em_einstellungen_senden.png \end_inset diff --git a/documents/linux/enigmail_installation/enigmail_installation.lyx b/documents/linux/enigmail_installation/enigmail_installation.lyx index c18942f..4843e89 100644 --- a/documents/linux/enigmail_installation/enigmail_installation.lyx +++ b/documents/linux/enigmail_installation/enigmail_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/linux/gaim_encryption_installation/gaim_encryption_installation.lyx b/documents/linux/gaim_encryption_installation/gaim_encryption_installation.lyx index 9ff7918..5c6f80d 100644 --- a/documents/linux/gaim_encryption_installation/gaim_encryption_installation.lyx +++ b/documents/linux/gaim_encryption_installation/gaim_encryption_installation.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/linux/gaim_installation/gaim_installation.lyx b/documents/linux/gaim_installation/gaim_installation.lyx index fef01f4..e4eeca1 100644 --- a/documents/linux/gaim_installation/gaim_installation.lyx +++ b/documents/linux/gaim_installation/gaim_installation.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/linux/gpg_installation/gpg_installation.lyx b/documents/linux/gpg_installation/gpg_installation.lyx index 7f4dd62..7db6a16 100644 --- a/documents/linux/gpg_installation/gpg_installation.lyx +++ b/documents/linux/gpg_installation/gpg_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/linux/thunderbird_installation/thunderbird_installation.lyx b/documents/linux/thunderbird_installation/thunderbird_installation.lyx index fc32190..ffa2da9 100644 --- a/documents/linux/thunderbird_installation/thunderbird_installation.lyx +++ b/documents/linux/thunderbird_installation/thunderbird_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx index 9f0796a..7f8eff2 100644 --- a/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx +++ b/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -264,7 +264,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_konto_openpgp01.png + filename bilder/einstellungen/em_einstellungen_konto_openpgp01.png \end_inset @@ -378,7 +378,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../windows/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_allgemein_winpfad.png + filename bilder/einstellungen/em_einstellungen_allgemein_winpfad.png \end_inset @@ -408,7 +408,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_senden.png + filename bilder/einstellungen/em_einstellungen_senden.png \end_inset diff --git a/documents/macos/gpg_installation/gpg_installation.lyx b/documents/macos/gpg_installation/gpg_installation.lyx index 4912971..66fd824 100644 --- a/documents/macos/gpg_installation/gpg_installation.lyx +++ b/documents/macos/gpg_installation/gpg_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/macos/thunderbird_installation/thunderbird_installation.lyx b/documents/macos/thunderbird_installation/thunderbird_installation.lyx index b664628..12fa4d1 100644 --- a/documents/macos/thunderbird_installation/thunderbird_installation.lyx +++ b/documents/macos/thunderbird_installation/thunderbird_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/menue_chat.inc b/documents/menue_chat.inc deleted file mode 100644 index 661efa1..0000000 --- a/documents/menue_chat.inc +++ /dev/null @@ -1,15 +0,0 @@ -\begin{rawhtml} - -\end{rawhtml} diff --git a/documents/menue_einfuehrung.inc b/documents/menue_einfuehrung.inc deleted file mode 100644 index d7dc8e5..0000000 --- a/documents/menue_einfuehrung.inc +++ /dev/null @@ -1,16 +0,0 @@ -\begin{rawhtml} - -\end{rawhtml} diff --git a/documents/menue_email.inc b/documents/menue_email.inc deleted file mode 100644 index 33c0d10..0000000 --- a/documents/menue_email.inc +++ /dev/null @@ -1,16 +0,0 @@ -\begin{rawhtml} - -\end{rawhtml} diff --git a/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx index aded9a8..7be43f0 100644 --- a/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx +++ b/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset @@ -264,7 +264,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_konto_openpgp01.png + filename bilder/einstellungen/em_einstellungen_konto_openpgp01.png \end_inset @@ -417,7 +417,7 @@ status open \begin_layout Standard \begin_inset Graphics - filename ../../common/enigmail_einrichtung/bilder/einstellungen/em_einstellungen_senden.png + filename bilder/einstellungen/em_einstellungen_senden.png \end_inset diff --git a/documents/windows/enigmail_installation/enigmail_installation.lyx b/documents/windows/enigmail_installation/enigmail_installation.lyx index d405a4e..c495ac3 100644 --- a/documents/windows/enigmail_installation/enigmail_installation.lyx +++ b/documents/windows/enigmail_installation/enigmail_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/windows/gaim_encryption_installation/gaim_encryption_installation.lyx b/documents/windows/gaim_encryption_installation/gaim_encryption_installation.lyx index 6067ea0..e7d401c 100644 --- a/documents/windows/gaim_encryption_installation/gaim_encryption_installation.lyx +++ b/documents/windows/gaim_encryption_installation/gaim_encryption_installation.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/windows/gaim_installation/gaim_installation.lyx b/documents/windows/gaim_installation/gaim_installation.lyx index 29eb289..8a6a4a5 100644 --- a/documents/windows/gaim_installation/gaim_installation.lyx +++ b/documents/windows/gaim_installation/gaim_installation.lyx @@ -44,7 +44,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_chat.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/windows/gpg_installation/gpg_installation.lyx b/documents/windows/gpg_installation/gpg_installation.lyx index f8ec48e..2339e3c 100644 --- a/documents/windows/gpg_installation/gpg_installation.lyx +++ b/documents/windows/gpg_installation/gpg_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset diff --git a/documents/windows/thunderbird_installation/thunderbird_installation.lyx b/documents/windows/thunderbird_installation/thunderbird_installation.lyx index 7d8bee5..11151b9 100644 --- a/documents/windows/thunderbird_installation/thunderbird_installation.lyx +++ b/documents/windows/thunderbird_installation/thunderbird_installation.lyx @@ -57,7 +57,7 @@ preview false \end_layout \begin_layout Standard -\begin_inset Include \input{menue_email.inc} +\begin_inset Include \input{menue.inc} preview false \end_inset