[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-40-gefebc61
by Emanuel Schuetze
cvs at cvs.gnupg.org
Fri Aug 2 09:16:31 CEST 2013
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 efebc6188f90f35bfc2c4208b1ef6b141debfe42 (commit)
via 6c845a71508fe82b32fb8802e971240ce6dc70f2 (commit)
from a8d29be8a356d016c21c1398342e263361c7fe05 (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 efebc6188f90f35bfc2c4208b1ef6b141debfe42
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Jul 31 10:18:15 2013 +0200
(manual) Set COMPENDIUM_VERSION_EN to 3.0.0.
* doc/manual/configure.ac: Set COMPENDIUM_VERSION_EN from
3.0.0-beta1 to 3.0.0. Set COMPENDIUM_DATE_EN.
* doc/manual/gpg4win-compendium-en.tex: Disable
COMPENDIUMINPROGRESS_EN.
diff --git a/configure.ac b/configure.ac
index 45f7a68..1c861ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,9 @@ 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_VERSION_EN="3.0.0-beta1"
-COMPENDIUM_DATE_EN="31. August 2010"
-COMPENDIUMINPROGRESS_EN="last minor changes from 4. January 2012"
+COMPENDIUM_VERSION_EN="3.0.0"
+COMPENDIUM_DATE_EN="2nd August 2013"
+COMPENDIUMINPROGRESS_EN="last minor changes from 2nd August 2013"
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-en.tex b/doc/manual/gpg4win-compendium-en.tex
index 8400923..b78de7c 100644
--- a/doc/manual/gpg4win-compendium-en.tex
+++ b/doc/manual/gpg4win-compendium-en.tex
@@ -162,7 +162,7 @@
\newcommand{\HlxIcons}{../images-hyperlatex}
% Footer
- \htmladdress{$\copyright$ \compendiumDateEN, v\compendiumVersionEN~\compendiuminprogressEN
+ \htmladdress{$\copyright$ \compendiumDateEN, v\compendiumVersionEN%~\compendiuminprogressEN
\html{br/}
\html{small}
The Gpg4win Compendium is filed under the
@@ -275,7 +275,7 @@
{A publication of the Gpg4win Initiative
\\[0.2cm]
Version \compendiumVersionEN~from \compendiumDateEN\\
- \small\compendiuminprogressDE%
+% \small\compendiuminprogressDE%
}
}
commit 6c845a71508fe82b32fb8802e971240ce6dc70f2
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Fri Jul 19 08:14:59 2013 +0200
(manual) Fixed reported typos in English compendium file.
diff --git a/doc/manual/gpg4win-compendium-en.tex b/doc/manual/gpg4win-compendium-en.tex
index 9c453f9..8400923 100644
--- a/doc/manual/gpg4win-compendium-en.tex
+++ b/doc/manual/gpg4win-compendium-en.tex
@@ -869,7 +869,7 @@ th\textbf{r}ow\textbf{i}ng \textbf{s}to\textbf{n}es.)}}
While it may not be easy to remember
this sequence of letters, it is also unlikely that you will forget how
-to arrive at the passphrase it as long as you remember the original
+to arrive at the passphrase as long as you remember the original
sentence. Over time, and the more often you use the phrase, you will
commit it to memory. No one else can guess the passphrase.
@@ -1007,7 +1007,7 @@ described as a \textbf{``hierarchical trust concept''}.
In the case of Gpg4win or other \Email{} encryption programs,
this concept is found in almost mirror-like fashion in
\textbf{S/MIME}. Added to this is\textbf{OpenPGP}, another concept
-that only works this way on the Internet. S/MIME und OpenPGP have the
+that only works this way on the Internet. S/MIME and OpenPGP have the
same task: the encryption and signing of data. Both use the already
familiar public key method. While there are some important
differences, in the end, none of these standards offer any general
@@ -1144,7 +1144,7 @@ Click on \Button{Next}.
On the page that contains \textbf{the selection of components} you can
decide which programs you want to install.
-A default selection has already been made for you. Yo can also insall
+A default selection has already been made for you. Yo can also install
individual components at a later time.
Moving your mouse cursor over a component will display a brief
@@ -1169,7 +1169,7 @@ Gpg4win.
Then click on \Button{Next}.
\clearpage
-Now you can decide which \textbf{links} should be insalled -- the
+Now you can decide which \textbf{links} should be installed -- the
system will automatically create a link with the start menu. You can
change this link later on using the Windows dashboard settings.
@@ -2195,7 +2195,7 @@ please proceed as follows:
insert the highlighted section into a text editor and save the
public certificate. For file endings, you should use
\Filename{.asc} or \Filename{.gpg} for
- OpenPGP certificates and \Filename{.pem} oder \Filename{.der}
+ OpenPGP certificates and \Filename{.pem} or \Filename{.der}
for X.509 certificates.
\end{itemize}
@@ -3062,7 +3062,7 @@ Open the configuration dialog in Kleopatra:\\
\Menu{Settings $\rightarrow$ Configure Kleopatra...}
-Now set up a new certificate server under the group \Menu{Certificate servers}
+Now set up a new certificate server under the group \Menu{Directory Services}
by clicking on the \Menu{New} button. Select between \Menu{OpenPGP} or
\Menu{X.509}.
@@ -3313,7 +3313,7 @@ signature later on, you will need both files.
The example below shows which new file you will receive if you sign
your selected file (here \Filename{<dateiname>.txt}) using OpenPGP or
-S/MIME. There are four possibler esulting file types:
+S/MIME. There are four possible resulting file types:
\T\ifthenelse{\boolean{DIN-A5}}{\enlargethispage{2\baselineskip}}{}
@@ -3498,7 +3498,7 @@ during the previous encryption process -- otherwise you cannot decrypt
the file with your private key (see Chapter~\ref{ch:archive}).
Select the encrypted file -- hence one that ends with \Filename{.gpg},
-\Filename{.asc}, \Filename{.p7m} oder \Filename{.pem} -- and select
+\Filename{.asc}, \Filename{.p7m} or \Filename{.pem} -- and select
the entry \Menu{Decrypt and check} in the Windows Explorer context
menu:
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 +++---
doc/manual/gpg4win-compendium-en.tex | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list