From: Rich Bowen
Date: Thu, 16 Apr 2015 18:29:27 +0000 (+0000)
Subject: Rebuild
X-Git-Tag: 2.5.0-alpha~3266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ec1207ba03a90843cbf53978d6c0d4a64b019d;p=thirdparty%2Fapache%2Fhttpd.git
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674128 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index 75d649bdeda..b77ec2d72c1 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -347,7 +347,7 @@ SSLCertificateKeyFile /path/to/this/server.key
The short answer is to use the CA.sh or CA.pl
script provided by OpenSSL. Unless you have a good reason not to,
you should use these for preference. If you cannot, you can create a
- self-signed Certificate as follows:
+ self-signed certificate as follows:
- Create a RSA private key for your server
@@ -372,7 +372,7 @@ SSLCertificateKeyFile /path/to/this/server.key
with the RSA key you just created (output will be PEM formatted):
$ openssl req -new -x509 -nodes -sha1 -days 365
- -key server.key -out server.crt
+ -key server.key -out server.crt -extensions usr_cert
This signs the server CSR and results in a server.crt file.
You can see the details of this Certificate using:
@@ -385,8 +385,7 @@ SSLCertificateKeyFile /path/to/this/server.key
You simply have to read it with the old pass-phrase and write it again,
- specifying the new pass-phrase. You can accomplish this with the following
- commands:
+ specifying the new pass-phrase. You can accomplish this with the following commands:
$ openssl rsa -des3 -in server.key -out server.key.new
diff --git a/docs/manual/ssl/ssl_faq.xml.fr b/docs/manual/ssl/ssl_faq.xml.fr
index 893bbb19c6b..c5a267dc285 100644
--- a/docs/manual/ssl/ssl_faq.xml.fr
+++ b/docs/manual/ssl/ssl_faq.xml.fr
@@ -1,7 +1,7 @@
-
+