[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.1-2-ge594843

by Andre Heinecke cvs at cvs.gnupg.org
Wed May 9 12:08:05 CEST 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  e5948435dbc21bef915558f23fe5878930498cd4 (commit)
      from  1d73a7aa11f1ada390e69ced93c412a490033179 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5948435dbc21bef915558f23fe5878930498cd4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 9 12:06:44 2018 +0200

    doc: Fix claws mentions and supported ini entries
    
    * doc/gpg4win-compendium-en.tex, doc/gpg4win-compendium-de.tex:
    Fix claws mentions and supported ini entries.

diff --git a/doc/manual/gpg4win-compendium-de.tex b/doc/manual/gpg4win-compendium-de.tex
index 04f4b4b..a0368e9 100644
--- a/doc/manual/gpg4win-compendium-de.tex
+++ b/doc/manual/gpg4win-compendium-de.tex
@@ -478,8 +478,6 @@ Gpg4win umfasst in Version 2 die folgenden Programme:
        eXtension|see{GpgEX}}\index{GpgEX}\\ ist eine Erweiterung für den
        Windows-Explorer\index{Windows-Explorer}, mit der man Dateien
        über das Kontextmenü signieren bzw.  verschlüsseln kann.
-    \item \textbf{Claws Mail}\index{Claws Mail}\\ ist ein vollständiges
-        \Email{}-Programm mit sehr guter Unterstützung für GnuPG.
 \end{itemize}
 
 Mit dem Verschlüsselungsprogramm GnuPG (GNU Privacy Guard) kann
@@ -5304,9 +5302,9 @@ Eine Integration von GnuPG wird derzeit f
 \item[Outlook ab Version 2003] mit GpgOL. GpgOL ist Bestandteil des
     Gpg4win-Pakets. \index{Outlook}
 
-\item[Claws Mail:]\index{Claws Mail} Dieses \Email{}-Programm wird im Gpg4win-Paket
-    mitgeliefert und kann optional installiert werden.  Eine solche
-    Installation konfiguriert bereits die Programmerweiterung für die
+\item[Claws Mail:]\index{Claws Mail} Dieses \Email{}-Programm ist
+    verwandt mit dem Gpg4win-Paket und kann optional installiert werden.
+    Eine solche Installation konfiguriert bereits die Programmerweiterung für die
     Verwendung von PGP/MIME und S/MIME. Diese Erweiterung verwendet
     jedoch nicht Kleopatra und bietet daher derzeit nicht denselben
     Komfort, wie die Outlook-Erweiterung GpgOL.
@@ -5382,26 +5380,12 @@ Hier ist ein Beispiel f
   inst_gpgex = true
   inst_kleopatra = true
   inst_gpa = true
-  inst_claws_mail = false
   inst_compendium = true
 
   ; Die Stellen, an denen Verknüpfungen erzeugt werden sollen.
   inst_start_menu = true
-  inst_desktop = false
-  inst_quick_launch_bar = false
-
-  ; Im Gegensatz zu den anderen Optionen überschreibt diese Option
-  ; die Einstellung des Benutzers im Installationsassistenten.
-  inst_start_menu_folder = Gpg4win
-
-  ; Standard-Konfigurationsdateien.
-  gpg.conf = D:\config\gpg-site.conf
-  gpg-agent.conf = D:\config\gpg-agent-site.conf
-  trustlist.txt = D:\config\trustlist-site.txt
-  dirmngr.conf = D:\config\dirmngr-site.conf
-  dirmngr_ldapserver.conf = D:\config\dirmngr_ldapserver-site.conf
-  scdaemon.conf = D:\config\scdaemon-site.txt
-  gpa.conf = D:\config\gpa-site.conf
+  inst_desktop = true
+
 \end{verbatim}
 \T\ifthenelse{\boolean{DIN-A5}}{\normalsize}{}
 
diff --git a/doc/manual/gpg4win-compendium-en.tex b/doc/manual/gpg4win-compendium-en.tex
index 599388a..12f56e7 100644
--- a/doc/manual/gpg4win-compendium-en.tex
+++ b/doc/manual/gpg4win-compendium-en.tex
@@ -441,8 +441,6 @@ Gpg4win includes the following programs:
        eXtension|see{GpgEX}}\index{GpgEX}\\ is an extension for
        Windows Explorer\index{Windows-Explorer} which can be used to
        sign and encrypt files using the context menu.
-    \item \textbf{Claws Mail}\index{Claws Mail}\\ is a
-        full \Email{} program that offers very good support for GnuPG.
 \end{itemize}
 
 Using the GnuPG (GNU Privacy Guard) encryption program,
@@ -5500,7 +5498,7 @@ Currently, an integration of GnuPG is offered for the following
 \item[Outlook as of Version 2003] with GpgOL. GpgOL is a part of the
     Gpg4win package. \index{Outlook}
 
-\item[Claws Mail:]\index{Claws Mail} This \Email{} program is part of
+\item[Claws Mail:]\index{Claws Mail} This \Email{} program is realated to
     the Gpg4win package, and can be optionally installed. Such an
     installation already configures the program extension for the use
     of PGP/MIME and S/MIME. This extension however does not use
@@ -5576,26 +5574,14 @@ This is an example of the contents in a control file which displays
   inst_gpgex = true
   inst_kleopatra = true
   inst_gpa = true
-  inst_claws_mail = false
   inst_compendium = true
 
-  ; The locations at which linkages are to be prepared.
+  ; Create Desktop shortcuts
+  inst_desktop = true
+
+  ; Create Start Menu entries
   inst_start_menu = true
-  inst_desktop = false
-  inst_quick_launch_bar = false
-
-  ; In contrast to the other options, this option overwrites
-  ; the user's settings in the installation assistant.
-  inst_start_menu_folder = Gpg4win
-
-  ; Standard configuration files.
-  gpg.conf = D:\config\gpg-site.conf
-  gpg-agent.conf = D:\config\gpg-agent-site.conf
-  trustlist.txt = D:\config\trustlist-site.txt
-  dirmngr.conf = D:\config\dirmngr-site.conf
-  dirmngr_ldapserver.conf = D:\config\dirmngr_ldapserver-site.conf
-  scdaemon.conf = D:\config\scdaemon-site.txt
-  gpa.conf = D:\config\gpa-site.conf
+
 \end{verbatim}
 \T\ifthenelse{\boolean{DIN-A5}}{\normalsize}{}
 

-----------------------------------------------------------------------

Summary of changes:
 doc/manual/gpg4win-compendium-de.tex | 26 +++++---------------------
 doc/manual/gpg4win-compendium-en.tex | 26 ++++++--------------------
 2 files changed, 11 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list