diff options
| -rw-r--r-- | doc/Makefile.am | 27 | ||||
| -rw-r--r-- | doc/gpg.texi | 4 | ||||
| -rw-r--r-- | doc/yat2m.c | 18 |
3 files changed, 24 insertions, 25 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 7aedaafa1..01568e7fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,12 +6,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # GnuPG is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. ## Process this file with automake to create Makefile.in @@ -42,9 +42,9 @@ DVIS = pkgdata_DATA = FAQ # we can't add gpg.texi gpgv.texi here because automake does not like them to -# be built files. +# be built files. -CLEANFILES = gpg.xml gpgv.xml gpg.ru.xml +CLEANFILES = gpg.xml gpgv.xml gpg.ru.xml DISTCLEANFILES = yat2m yat2m-stamp.tmp yat2m-stamp $(myman_pages) AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgone @@ -92,13 +92,12 @@ dist-hook: @if test "`wc -c < gpg.1`" -lt 200; then \ echo 'ERROR: dummy man page'; false; fi -# Helper to update some source files. -update-source-from-gnupg-2: - @set -e; \ - if test -d ../../gnupg/scd; then dir="../../gnupg"; \ - else exit 1; \ - fi; \ - for i in $(sources_from_trunk); do \ - cp $$dir/doc/$$i $$i; echo $$i; \ - done ;\ - echo "Please remember to update the ChangeLog!" +# Copy shared files from the master branch. We keep the texinfo files +# all in master so that we need to modify only one source. Macros are +# used to customize them for a specific version. +update-source: + @set -e; cd $(srcdir); \ + for i in $(sources_from_trunk) yat2m.c ; do \ + echo "updating from master:doc/$$i" >&2 ; \ + git show master:doc/$$i >$$i ; \ + done diff --git a/doc/gpg.texi b/doc/gpg.texi index 481e05e3d..d67900042 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -388,7 +388,7 @@ safeguard against accidental deletion of multiple keys. @item --delete-secret-key @code{name} @opindex delete-secret-key -Remove key from the secret and public keyring. In batch mode the key +Remove key from the secret keyring. In batch mode the key must be specified by fingerprint. @item --delete-secret-and-public-key @code{name} @@ -1363,7 +1363,7 @@ useful for a "persona" verification, where you sign the key of a pseudonymous user. 2 means you did casual verification of the key. For example, this -could mean that you verified that the key fingerprint and checked the +could mean that you verified the key fingerprint and checked the user ID on the key against a photo ID. 3 means you did extensive verification of the key. For example, this diff --git a/doc/yat2m.c b/doc/yat2m.c index a22176cd4..5dc81bf59 100644 --- a/doc/yat2m.c +++ b/doc/yat2m.c @@ -414,7 +414,7 @@ static void start_page (char *name) { if (verbose) - inf ("starting page `%s'", name); + inf ("starting page '%s'", name); assert (!thepage.name); thepage.name = xstrdup (name); thepage.n_sections = 0; @@ -434,7 +434,7 @@ write_th (FILE *fp) p = strrchr (name, '.'); if (!p || !p[1]) { - err ("no section name in man page `%s'", thepage.name); + err ("no section name in man page '%s'", thepage.name); free (name); return -1; } @@ -591,7 +591,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len, ignore_args = 1; /* Parameterized macros are not yet supported. */ } else - inf ("texinfo command `%s' not supported (%.*s)", command, + inf ("texinfo command '%s' not supported (%.*s)", command, ((s = memchr (rest, '\n', len)), (s? (s-rest) : len)), rest); } @@ -605,7 +605,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len, i--; if (i) { - err ("closing brace for command `%s' not found", command); + err ("closing brace for command '%s' not found", command); return len; } if (n > 2 && !ignore_args) @@ -780,13 +780,13 @@ finish_page (void) return; /* No page active. */ if (verbose) - inf ("finishing page `%s'", thepage.name); + inf ("finishing page '%s'", thepage.name); if (opt_select) { if (!strcmp (opt_select, thepage.name)) { - inf ("selected `%s'", thepage.name ); + inf ("selected '%s'", thepage.name ); fp = stdout; } else @@ -798,10 +798,10 @@ finish_page (void) } else if (opt_store) { - inf ("writing `%s'", thepage.name ); + inf ("writing '%s'", thepage.name ); fp = fopen ( thepage.name, "w" ); if (!fp) - die ("failed to create `%s': %s\n", thepage.name, strerror (errno)); + die ("failed to create '%s': %s\n", thepage.name, strerror (errno)); } else fp = stdout; @@ -1162,7 +1162,7 @@ parse_file (const char *fname, FILE *fp, char **section_name, int in_pause) } if (!incfp) - err ("can't open include file `%s':%s", + err ("can't open include file '%s':%s", incname, strerror (errno)); else { |