From 4b5fab372ff69a809144dee3a0a7f90c219fe400 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 30 Jan 2008 16:14:39 +0000
Subject: merge with revision #r8350

git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html   | 5 +++++
 phpBB/docs/hook_system.html | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'phpBB/docs')

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 815c51f147..8dd058d421 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -108,6 +108,11 @@
 		<li>[Fix] Fix possible database transaction errors if code returns on error and rollback happened (Bug #17025)</li>
 		<li>[Change] Allow numbers in permission names for modifications, as well as uppercase letters for the request_ part (Bug #20125)</li>
 		<li>[Fix] Use HTTP_HOST in favor of SERVER_NAME for determining server url for redirection and installation (Bug #19955)</li>
+		<li>Removing s_watching_img from watch_topic_forum() function (Bug #20445)</li>
+		<li>Changing order for post review if more than one post affected (Bug #15249)</li>
+		<li>Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)</li>
+		<li>Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)</li>
+		<li>Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li>
 	</ul>
 	
 	<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
index b7fd702987..565e0096fc 100644
--- a/phpBB/docs/hook_system.html
+++ b/phpBB/docs/hook_system.html
@@ -14,7 +14,7 @@
 <title>phpBB3 &bull; Hook System</title>
 
 <style type="text/css">
-<!--
+/* <![CDATA[ */
 
 /*
 	The original "prosilver" theme for phpBB3
@@ -309,7 +309,7 @@ a:active	{ color: #368AD2; }
 	margin-left: 25px;
 }
 
-//-->
+/* ]]> */
 </style>
 
 </head>
-- 
cgit v1.2.1