← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to docs/manual/sitemap.html.en

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 01:28:04 UTC
  • mfrom: (14.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100505012804-vbouq0xs3tu2vvij
Tags: 2.2.15-5ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)
  + Dropped:
    - debian/patches/206-fix-potential-memory-leaks.dpatch: No longer needed.
    - debian/patches/206-report-max-client-mpm-worker.dpatch: No longer needed.
    - debian/config-dir/apache2.conf: Merged back from debian.
    - mod-reqtimeout functionality: Merge back from debian.
    - debian/patches/204_CVE-2010-0408.dpatch: No longer needed.
    - debian/patches/205_CVE-2010-0434.dpatch: No longer needed.
    - debian/patches/203_fix-ab-segfault.dpatch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/manual/sitemap.html.en
227
227
<li><a href="mod/mod_proxy_ftp.html">Apache Module mod_proxy_ftp</a></li>
228
228
<li><a href="mod/mod_proxy_http.html">Apache Module mod_proxy_http</a></li>
229
229
<li><a href="mod/mod_proxy_scgi.html">Apache Module mod_proxy_scgi</a></li>
 
230
<li><a href="mod/mod_reqtimeout.html">Apache Module mod_reqtimeout</a></li>
230
231
<li><a href="mod/mod_rewrite.html">Apache Module mod_rewrite</a></li>
231
232
<li><a href="mod/mod_setenvif.html">Apache Module mod_setenvif</a></li>
232
233
<li><a href="mod/mod_so.html">Apache Module mod_so</a></li>