summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/programs/apachectl.xml10
-rw-r--r--docs/manual/upgrading.xml8
2 files changed, 12 insertions, 6 deletions
diff --git a/docs/manual/programs/apachectl.xml b/docs/manual/programs/apachectl.xml
index 424dd951f6..aef56b27e7 100644
--- a/docs/manual/programs/apachectl.xml
+++ b/docs/manual/programs/apachectl.xml
@@ -134,17 +134,15 @@ equivalent to <code>apachectl -t</code>.</dd>
</dl>
-<p>The following additional option is available, but deprecated.</p>
+<p>The following option was available in earlier version but has been removed.</p>
<dl>
<dt><code>startssl</code></dt>
-<dd>This is equivalent to <code>apachectl -k start -DSSL</code>. We
-recommend that you use that command explicitly, or you adjust your
-<code>httpd.conf</code> to remove the <directive module="core"
-type="section">IfDefine</directive> section so that SSL will always be
-available.</dd>
+<dd>To start <program>httpd</program> with SSL support, you should edit
+your configuration file to include the relevant directives and then
+use the normal <code>apachectl start</code>.</dd>
</dl>
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 93778e10d5..46b7b765a8 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -57,6 +57,14 @@
the <code>conf/extra/</code> directive of the installed
server.</li>
+ <li>The <program>apachectl</program> option
+ <code>startssl</code> is no longer available. To enable ssl
+ support, you should edit <code>httpd.conf</code> to include the
+ relevant <module>mod_ssl</module> directives and then use
+ <code>apachectl start</code> to start the server. An example
+ configuration to activate <module>mod_ssl</module> has been included
+ in <code>conf/extra/httpd-ssl.conf</code>.</li>
+
<li>The default setting of <directive
module="core">UseCanonicalName</directive> is now
<code>Off</code>. If you did not have this directive in your