summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2015-04-13 22:25:38 -0500
committerMichael Shuler <michael@pbandjelly.org>2015-04-13 22:25:38 -0500
commit2c12006b659e71039a241910f0a7cd6999a264eb (patch)
tree6068e06439bfb9b85c2cc1e416d938301fcdfa0b
parent36e9bdc2a3fce7c0633b839ae311b611901cec4a (diff)
downloadca-certificates-2c12006b659e71039a241910f0a7cd6999a264eb.tar.gz
Correct concatenated file name in man page
-rw-r--r--debian/changelog7
-rw-r--r--sbin/update-ca-certificates.84
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 <michael@pbandjelly.org> Sat, 17 Jan 2015 15:44:26 -0600
+ -- Michael Shuler <michael@pbandjelly.org> 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 <n> 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