From 2c12006b659e71039a241910f0a7cd6999a264eb Mon Sep 17 00:00:00 2001 From: Michael Shuler Date: Mon, 13 Apr 2015 22:25:38 -0500 Subject: Correct concatenated file name in man page --- debian/changelog | 7 +++++-- sbin/update-ca-certificates.8 | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e108f6..df7e217 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ca-certificates (20150117) UNRELEASED; urgency=medium +ca-certificates (20150413) UNRELEASED; urgency=medium * debian/postinst: Set mode and group of /usr/local/share/ca-certificates based on current @@ -8,6 +8,9 @@ ca-certificates (20150117) UNRELEASED; urgency=medium Add an option to set the certs in a directory to the defaults. Thanks for the patches, Paul Wise. Closes: #774059, #774201 Fix shellcheck warnings and a little indentation. + * sbin/update-ca-certificates.8: + Correct concatenated file name in man page from certificates.crt to + ca-certificates.crt. Closes: #782230 * mozilla/{certdata.txt,nssckbi.h}: Update Mozilla certificate authority bundle to version 2.2. The following certificate authorities were added (+): @@ -23,7 +26,7 @@ ca-certificates (20150117) UNRELEASED; urgency=medium - "Thawte Premium Server CA" - "Thawte Server CA" - -- Michael Shuler Sat, 17 Jan 2015 15:44:26 -0600 + -- Michael Shuler Mon, 13 Apr 2015 22:20:06 -0500 ca-certificates (20141019) unstable; urgency=medium diff --git a/sbin/update-ca-certificates.8 b/sbin/update-ca-certificates.8 index 51b2595..a76541d 100644 --- a/sbin/update-ca-certificates.8 +++ b/sbin/update-ca-certificates.8 @@ -16,7 +16,7 @@ .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -update-ca-certificates \- update /etc/ssl/certs and certificates.crt +update-ca-certificates \- update /etc/ssl/certs and ca-certificates.crt .SH SYNOPSIS .B update-ca-certificates .RI [ options ] @@ -26,7 +26,7 @@ This manual page documents briefly the command. .PP \fBupdate-ca-certificates\fP is a program that updates the directory -/etc/ssl/certs to hold SSL certificates and generates certificates.crt, +/etc/ssl/certs to hold SSL certificates and generates ca-certificates.crt, a concatenated single-file list of certificates. .PP It reads the file /etc/ca-certificates.conf. Each line gives a pathname of -- cgit v1.2.1