Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 136 additions & 13 deletions content/css/apsite.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,19 @@ span.transnote, span.phonetic {
color: #888;
}

/* sidebar position: left */
div#apmenu {
position: absolute;
top: 5.5em;
left: 1em;
margin-left: 0;
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Layout: flexbox wrapper + sidebar + content
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#site-wrapper {
display: flex;
margin-top: 40px;
padding: 4px;
padding: 0 1em;
}

div#apmenu {
width: 13.5em;
flex-shrink: 0;
padding: 4px;
background-color: #fff;
color: inherit;
}
Expand All @@ -74,13 +78,9 @@ div#apmenu {
font-size: 13px;
}

/* contents for apsite */
div#apcontents {
position: absolute;
top: 5.5em;
left: 14em;
right: 1em;
margin-top: 40px;
flex: 1;
min-width: 0;
padding: 4px;
background-color: #fff;
color: inherit;
Expand Down Expand Up @@ -1137,3 +1137,126 @@ p.figure dfn {
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* -> The End <-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Responsive / Mobile
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

/* Responsive logo */
#site-logo {
max-width: 100% !important;
width: auto !important;
height: auto;
}

/* Page header */
#page-header {
position: relative;
}

/* Mobile menu toggle - hidden on desktop */
#menu-toggle {
display: none;
position: absolute;
top: 10px;
left: 10px;
background: #557697;
color: #fff;
border: none;
font-size: 24px;
padding: 6px 12px;
border-radius: 4px;
cursor: pointer;
}

#menu-toggle:hover {
background: #405871;
}

/* Tablet breakpoint */
@media (max-width: 900px) {
#site-wrapper {
padding: 0 0.5em;
}

div#apmenu {
width: 11em;
}
}

/* Mobile breakpoint */
@media (max-width: 768px) {
body {
padding: 0;
}

div#page-header {
background-color: #304558;
padding: 5px 0 8px;
}

div#page-header p.menu {
display: none;
}

div#page-header img#site-logo {
width: 100% !important;
max-width: 800px;
height: auto !important;
margin: 0 auto !important;
display: block;
}

div#page-header p.apache {
display: none;
}

div#page-header a.badge {
position: absolute;
top: 5px;
right: 5px;
margin: 0;
}

div#page-header a.badge img {
width: 50px;
height: 50px;
margin: 0 !important;
}

#menu-toggle {
display: block;
}

#site-wrapper {
flex-direction: column;
padding: 0 0.5em;
margin-top: 20px;
}

div#apmenu {
width: 100%;
display: none;
order: -1;
}

div#apmenu.open {
display: block;
}

div#apcontents {
padding: 4px 0;
}

/* Prevent tables from overflowing */
#apcontents table {
display: block;
overflow-x: auto;
}

/* Prevent images from overflowing */
#apcontents img {
max-width: 100%;
height: auto;
}
}
38 changes: 16 additions & 22 deletions content/index.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Title: Welcome!
license: https://www.apache.org/licenses/LICENSE-2.0

# The Number One HTTP Server On The Internet
The Apache HTTP Server Project is an effort to develop and maintain an
open-source HTTP server for modern operating systems including UNIX and
Windows. The goal of this project is to provide a secure, efficient and
extensible server that provides HTTP services in sync with the current HTTP
standards.
# Apache HTTP Server
A fast, reliable, and extensible open-source web server for modern
operating systems. Apache httpd powers everything from personal sites to
mission-critical production infrastructure with:
Comment on lines +5 to +7
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is Novell NetWare a “modern operating system”?😁 I feel the portability point already addresses that, so I suggest just:

Suggested change
A fast, reliable, and extensible open-source web server for modern
operating systems. Apache httpd powers everything from personal sites to
mission-critical production infrastructure with:
The Apache HTTP Server (httpd) is a fast, reliable, and extensible open-source
web server which powers everything from personal sites to
mission-critical production infrastructure with:


The Apache HTTP Server ("httpd") was launched in 1995 and it has been the most popular web server on the Internet since
April 1996. It has celebrated its 25th birthday as a project in February 2020.
- **Flexible configuration** — .htaccess per-directory config, virtual hosts, dynamic module loading
- **Security** — TLS/SSL, authentication modules, fine-grained access control
- **Performance** — event MPM, HTTP/2, content caching, reverse proxy
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MPMs are an Apache httpd concept. Someone who does not know httpd won't even know what MPM means, let alone what the event MPM is, so:

Suggested change
- **Performance**event MPM, HTTP/2, content caching, reverse proxy
- **Performance** — HTTP/2, content caching, reverse proxy

- **Extensibility** — 100+ modules for rewriting, proxying, load balancing, scripting, and more
- **Portability** — runs on Linux, Windows, macOS, and most Unix-like systems

The Apache HTTP Server is a project of [The Apache Software
Foundation](https://www.apache.org/).
Expand All @@ -31,19 +32,12 @@ Apache HTTP Server version 2.<span>4</span>.43 or newer is required in order to
2.4](https://downloads.apache.org/httpd/CHANGES_2.4) | [New Features in httpd
2.4](docs/trunk/new_features_2_4.html) {.centered}

# Apache httpd 2.2 End-of-Life <span>2018-01-01</span>
As previously announced, the Apache HTTP Server Project has discontinued
all development and patch review of the 2.2.x series of releases.
# Apache httpd 2.2 End-of-Life
Apache httpd 2.2 is end-of-life. The final release was 2.2.34 (July 2017).
No further patches, bug fixes, or security updates will be provided.
Users should upgrade to 2.4.x.
Comment on lines +36 to +38
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, EOL is not an adjective.

Suggested change
Apache httpd 2.2 is end-of-life. The final release was 2.2.34 (July 2017).
No further patches, bug fixes, or security updates will be provided.
Users should upgrade to 2.4.x.
Apache httpd 2.2 reached end-of-life. The final release was 2.2.34 (July 2017).
No further patches, bug fixes, or security updates will be provided.
Users should upgrade to 2.4.


The Apache HTTP Server Project had long committed to provide maintenance
releases of the 2.2.x flavor through June of 2017. The final release 2.2.34
was published in July 2017, and no further evaluation of bug reports or
security risks will be considered or published for 2.2.x releases.

# Want to try out the Apache HTTP Server?
Great! We have updated our [download page](/download.cgi) in an effort to
better utilize our mirrors. We hope that by making it easier to use our mirrors, we will be able to provide a better download experience.

Please ensure that you [verify](/download.cgi#verify) your downloads using
PGP or MD5 signatures.
# Download
Get the latest release from the [download page](/download.cgi).
Please [verify](/download.cgi#verify) your downloads.
Comment on lines +41 to +42
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is entirely pre-existing, but if I may, the verification sentence is superfluous (and funny). The download page already asks for that in bold.

Suggested change
Get the latest release from the [download page](/download.cgi).
Please [verify](/download.cgi#verify) your downloads.
Get the latest release from the [download page](/download.cgi).


17 changes: 16 additions & 1 deletion theme/apache/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="/css/apsite.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
<meta name="author" content="Documentation Group" /><meta name="email" content="docs@httpd.apache.org" />
{% block head %}
Expand All @@ -22,12 +23,14 @@
<p class="menu">&nbsp;</p>
<p class="apache">&nbsp;</p>
<a href="/">
<img alt="" width="800" height="72" src="/images/httpd_logo_wide_new.png" />
<img alt="Apache HTTP Server" src="/images/httpd_logo_wide_new.png" id="site-logo" />
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure this alt value is necessary/best. I don't master a11y, but this plays the role of a link to the homepage; perhaps there can be an invisible "Homepage" link, or the value should be "Homepage".

</a>
<a class="badge" href="https://www.apache.org/foundation/contributing.html">
<img src="https://www.apache.org/images/SupportApache-small.png">
</a>
<button id="menu-toggle" aria-label="Toggle navigation menu">&#9776;</button>
</div>
<div id="site-wrapper">
<div id="apmenu">
<script type="text/javascript" src="https://www.apachecon.com/event-images/snippet.js"></script>
<p style="margin-top: -10px;">
Expand Down Expand Up @@ -115,5 +118,17 @@ <h1 id="miscellaneous"><a href="/info/">Miscellaneous</a><a class="headerlink" h
and other countries.</p>
</div>
</div>
</div><!-- /#site-wrapper -->
<script>
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type is required in XHTML:

Suggested change
<script>
<script type="text/javascript">

(function() {
var toggle = document.getElementById('menu-toggle');
var menu = document.getElementById('apmenu');
if (toggle && menu) {
toggle.addEventListener('click', function() {
menu.classList.toggle('open');
});
}
})();
</script>
</body>
</html>