summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2012-06-22 19:56:33 -0500
committerMichael Shuler <michael@pbandjelly.org>2012-06-22 19:56:33 -0500
commit370f970b292805d2e6d63ef011da86daed3f3fab (patch)
tree220c337d942cf56f799722c96ed620d8d3e5383f
parentf9b0d62e73fc3cd061d8cf1ff054f1c5b1d4a5d7 (diff)
downloadca-certificates-370f970b292805d2e6d63ef011da86daed3f3fab.tar.gz
Add note to update-ca-certificates(8) about .crt extension needed
-rw-r--r--debian/changelog7
-rw-r--r--sbin/update-ca-certificates.82
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e8430b7..807fff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,18 @@
-ca-certificates (20120623) UNRELEASED; urgency=low
+ca-certificates (20120624) UNRELEASED; urgency=low
* Add Polish translation, thanks to Michał Kułach. Closes: #660002
* Add Turkish translation, thanks to Atila KOÇ. Closes: #661785
* Correct update-ca-certificates(8) alignment Closes: #666932
+ * Add note to update-ca-certificates(8) about .crt extension needed for
+ local CA certificates under /usr/local/share/ca-certificates
+ Closes: 595279
* Update mozilla/certdata.txt to version 1.83
Mozilla Public License updated to v2.0
(no added/removed CAs)
* Update debian/copyright to reflect MPL v2.0
* Update debian/NEWS with added/removed certs from 20111211 and 20120212
- -- Michael Shuler <michael@pbandjelly.org> Fri, 22 Jun 2012 19:44:14 -0500
+ -- Michael Shuler <michael@pbandjelly.org> Fri, 22 Jun 2012 19:52:50 -0500
ca-certificates (20120212) unstable; urgency=low
diff --git a/sbin/update-ca-certificates.8 b/sbin/update-ca-certificates.8
index 9803520..987d250 100644
--- a/sbin/update-ca-certificates.8
+++ b/sbin/update-ca-certificates.8
@@ -67,7 +67,7 @@ all CA certificates that you activated in /etc/ca-certificates.conf.
Directory of CA certificates.
.TP
.I /usr/local/share/ca-certificates
-Directory of local CA certificates.
+Directory of local CA certificates (with .crt extension).
.SH SEE ALSO
.BR c_rehash (1),
.SH AUTHOR