[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.5-4-gf941252

[by Andre Heinecke]

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  f941252cb4753f682d658876e88a2b41875adb6c (commit)
      from  9678216dc2f4eef17fc45d53b41470546bb93901 (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 f941252cb4753f682d658876e88a2b41875adb6c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 4 10:53:41 2015 +0200

    Fix http-proxy configuration documentation.
    
    There is no way to configure this through kleopatra atm.
    
    * configure.ac: Update compendium Version.
    * doc/manual/gpg4win-compendium-de.tex,
     doc/manual/gpg4win-compendium-en.tex: Make it clear that
     you have to edit gpg.conf for proxy setting.
    
    --
    
    GnuPG-Bug-Id: 2063

diff --git a/configure.ac b/configure.ac
index abf2e16..8a97d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,11 +55,11 @@ MANUALDATE_NOVICES="Nov. 30, 2006"
 MANUALVERSION_ADVANCED="0.0.0"
 MANUALDATE_ADVANCED="Nov. 30, 2006"
 COMPENDIUM_VERSION_DE="3.0.0"
-COMPENDIUM_DATE_DE="21. Mai 2010"
-COMPENDIUMINPROGRESS_DE="zuletzt geringfügig korrigiert am 4. Januar 2012"
+COMPENDIUM_DATE_DE="3. August 2015"
+COMPENDIUMINPROGRESS_DE="zuletzt geringfügig korrigiert am 3. August 2015"
 COMPENDIUM_VERSION_EN="3.0.0"
-COMPENDIUM_DATE_EN="2nd August 2013"
-COMPENDIUMINPROGRESS_EN="last minor changes from 2nd August 2013"
+COMPENDIUM_DATE_EN="3rd August 2015"
+COMPENDIUMINPROGRESS_EN="last minor changes from 3rd August 2015"
 
 MANUALINPROGRESS_DE=m4_if(my_isgit,[yes],["~und evtl. seitdem weiter bearbeitet"])
 MANUALINPROGRESS_EN=m4_if(my_isgit,[yes],["~and may have been further edited"])
diff --git a/doc/manual/gpg4win-compendium-de.tex b/doc/manual/gpg4win-compendium-de.tex
index 3814d93..207edfc 100644
--- a/doc/manual/gpg4win-compendium-de.tex
+++ b/doc/manual/gpg4win-compendium-de.tex
@@ -3269,12 +3269,11 @@ starten (Anleitung siehe
 Abschnitt~\ref{searchAndImportCertificateFromServer}).
 
 \textbf{Proxy-Einstellung:}\index{Proxy} Falls Sie einen Proxy in Ihrem Netzwerk
-nutzen, sollten Sie die Zertifikatsserver-Adresse in der Spalte
-\Menu{Servername} um den Parameter \Filename{http-proxy=<proxydomain>}
-ergänzen. Der vollständige Servername könnte also z.B. lauten:\\
-\Filename{keys.gnupg.net http-proxy=proxy.hq}\\ Kontrollieren und ggf.
-korrigieren können Sie die Zertifikatsserver"=Konfigurationen auch in
-der Datei: \Filename{\%APPDATA\%\back{}gnupg\back{}gpg.conf}\\
+nutzen, müssen Sie die Zertifikatsserver-Adresse in der Datei:\\
+\Filename{\%APPDATA\%\back{}gnupg\back{}gpg.conf}\\
+ergänzen.
+Fügen Sie dazu in der Datei eine weitere Zeile ein, mit dem Inhalt: \\
+\Filename{keyserver-options http-proxy=<proxy-address>}
 
 Erläuterungen zur systemweiten Konfiguration von X.509-Zertifikatsservern
 finden Sie im Abschnitt~\ref{x509CertificateServers}.
diff --git a/doc/manual/gpg4win-compendium-en.tex b/doc/manual/gpg4win-compendium-en.tex
index b78de7c..e73d2f5 100644
--- a/doc/manual/gpg4win-compendium-en.tex
+++ b/doc/manual/gpg4win-compendium-en.tex
@@ -3098,13 +3098,11 @@ Section~\ref{searchAndImportCertificateFromServer}).
 
 \newpage
 \textbf{Proxy setting:}\index{Proxy} 
-If you use a proxy in your network, you should add the parameter
-\Filename{http-proxy=<proxydomain>} to the certificate server address in the
-\Menu{Server name} column.  The full server name could therefore look
-as follows:\\
-\Filename{keys.gnupg.net http-proxy=proxy.hq}\\ You can also review
-and if necessary correct the certificate server configurations in the file:
+If you use a proxy in your network, you need to configure it
+in the file:\\
 \Filename{\%APPDATA\%\back{}gnupg\back{}gpg.conf}\\
+To enable the proxy add a new line with the content:\\
+\Filename{keyserver-options http-proxy=<proxy-adresse>}
 
 Explanations regarding the system-wide configuration of X.509 key
 servers can be found in  Section~\ref{x509CertificateServers}.

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

Summary of changes:
 configure.ac                         |  8 ++++----
 doc/manual/gpg4win-compendium-de.tex | 11 +++++------
 doc/manual/gpg4win-compendium-en.tex | 10 ++++------
 3 files changed, 13 insertions(+), 16 deletions(-)


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