1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 15:22:08 +02:00

Merge remote-tracking branch 'imkingdavid/ticket/10524' into develop

* imkingdavid/ticket/10524:
  [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places
This commit is contained in:
Oleg Pudeyev 2011-12-14 20:44:00 -05:00
commit 6233bde5ed

View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="keywords" content="" />
<meta name="description" content="Olympus coding guidelines document" />
<meta name="description" content="Ascraeus coding guidelines document" />
<title>phpBB3 &bull; Coding Guidelines</title>
<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
@ -21,7 +21,7 @@
<div id="doc-description">
<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
<h1>Coding Guidelines</h1>
<p>Olympus coding guidelines document</p>
<p>Ascraeus coding guidelines document</p>
<p style="display: none;"><a href="#start_here">Skip</a></p>
</div>
@ -35,7 +35,7 @@
<!-- BEGIN DOCUMENT -->
<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.</p>
<p>These are the phpBB Coding Guidelines for Ascraeus, all attempts should be made to follow them as closely as possible.</p>
<h1>Coding Guidelines</h1>