diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6b69f086c0..ed3c0f0650 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,70 +53,73 @@ p,ul,td {font-size:10pt;}
1.i. Changes since 2.0.4
-- Fixed user activation - user was able to activate himself after his account got deactivated
-- Fixed not correctly working phpbb_realpath function
+- Removed user facing session_id checks
+- Fixed user self-activation after deactivation
+- Fixed incorrect functioning of phpbb_realpath
- Fixed wrong path to database schema files within the upgrade script
-- Fixed username validation - catch double quotes correctly
-- Changed email validation (apersands are allowed within emails now)
+- Fixed double quote problem with username validation
+- Allow & within email addresses
- Fixed email validation for banned email addresses
- Removed underline from email domain validation
-- Fixed redirection for PM Sentbox Folder, Installation and sending Email to another user
+- Fixed redirection for sentbox folder, installation and email
- Fixed poll deletion
- Fixed Mozilla navigation bar
-- Changed/Fixed URL bbcode parsing
+- Fixed URL bbcode parsing
- Fixed database timeouts while searching the forums
- Fixed wrong email return path in admin mass mailing - netclectic
- Fixed MS-SQL failures within the update script
- Fixed memberlist sort order
- Fixed not showing leading spaces within Code BBCode
- Fixed problem with adding double quotes to subject titles
-- Username input field is not shown within Profile Editing if user is not allowed to change his Username
+- Remove username input field from profile when user cannot change name
- Fixed pagination error with highlighting
- Fixed errors if no smilies are installed
-- Fixed CSS issues with IE 5.2 on MacOS X - maybe other browsers were affected too
-- Fixed invalid session errors within the Moderator Control Panel
-- Fixed language variables within Authentication - error message were not correctly displayed
+- Fixed CSS issues with IE 5.2 on MacOS X
+- Fixed missing sid propagation problem within the Moderator Control Panel
+- Fixed language variables within Authentication error output
- Removed doubled CSS class definitions within input fields
- Fixed username change within the Administration Panel
- Added missing <tr> tags to index_body.tpl
-- Added missing username language variable to statistics (Administration Panel)
+- Added missing username language variable to admin index page
- Fixed moderator status update if a usergroup got deleted
-- Fixed poll handling - if a user wanted to edit his post polls got doubled
+- Fixed poll handling upon post edit
- Fixed remove common words from search table if post get pruned - Nuttzy99
- Fixed behaviour on splitting topics if no checkbox is selected
- Anonymous is no longer displayed within Username dropdown boxes
- Fixed viewprofile redirection if an invalid mode was specified
-- Fixed fraction settings within determining common words (only one PHP Version is affected) - Novan
-- Prevent admin to change usernames to his own username within the username administration
-- Activation email is sent to all admins instead of sending the email to the board email address
-- Fixed replacement of html entities
-- Fixed Announcement count, preventing the user to see/delete announcements if a complete page was filled with them
-- Added variable checks to database backup and restore screen - now users should be able to restore their backups with register_globals set to OFF
-- Prevented profile field 'Pop up window on new Private Message' from resetting if user returns from the Avatar Gallery
+- Fixed fraction settings within determining common words - Novan
+- Prevent admin change usernames to his own within the ACP
+- Activation email is sent to all admins
+- Fixed conversion of & to & in appropriate cases
+- Fixed display of "greater than topics per page" announcements preventing display of normal posts
+- Added variable checks to database backup and restore screen
+- Prevented pm popup window from resetting after visiting avatar gallery
- Fixed special character handling with word censor
-- Added SID to jumpbox - now the session id should be delivered correctly after jumping to a new forum
+- Added SID to jumpbox
- Fixed problems with usernames using html special chars
-- Added GMT + 13 to English lang_main, all translators are encouraged to do likewise - within the last release a language variable was missing
+- Added GMT + 13 to English lang_main, all translators are encouraged to do likewise
- Deleted doubled 'U_MEMBERLIST' assignment from page_header.php
- Fixed wrong display of Signature Checkbox while editing Private Message
- Fixed disappearing post text if emoticon was inserted directly after pressing a BBCode button
-- Display correct alt-tag for smilies within postings - emoticon instead of filename
-- Prevented the ability to apply BBCode to website contents - we will find another EasterEgg
-- Fixed problems with very long user passwords
-- Limited username length the strict way - duplicate username registrations should no longer occur
-- Changed split words handling - now foreign characters are indexed correctly, searching for them works too
-- Changed empty email To Field to use a non-disclosure delimiter - Anti-Spam software should handle those mails correctly, they are RFC compliant
+- Display correct alt-tag for smilies within postings
+- Prevented the ability to apply BBCode to website contents
+- Fixed maxlength issue with password field in login_body.tpl
+- Fixed possible username duplication issue with validation and username length
+- Fixed split words function to handle additional foreign characters
+- Changed empty email To Field to use a non-disclosure delimiter
- Fixed wrong language var in install.php - FTP Config screen
- Fixed alt tag for locked topic images in viewforum_body.tpl
- Fixed typo in groupcp.php - $lang['Unsub_success'] instead of $lang['Usub_success']
- Fixed timezone display
- Fixed wrong display of author quote tag within profile - Cl1mh4224rd
-- Delete user sessions after deactivating the username to prevent him navigating the forum (if logged in)
+- Added deletion of sessions of users whose account is deactivated
- Added mail header X-MimeOLE to the emailer class
-- Prevent registration if user is logged in or user trying to register a second time
-- Prevent usage of ALT-255 in Usernames
-- Fixed IP retrieval for users with two proxy setups while the first proxy is hiding the clients IP Address - cosmos
-- If user votes in poll without selecting an option, he will be redirected to the topic.
+- Prevent registration if user is logged in or user trying to register again
+- Prevent usage of char(255) in usernames
+- Added check for additional FORWARDED_FOR IP's - cosmos
+- Fixed handling of non-selection of option when voting
+- Fixed potential xss issue with memberslist mode
+- Default English support for visual confirmation - translators are encouraged to support this
1.ii. Changes since 2.0.3
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index 38b095c6fa..6945ba6a4d 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -3,7 +3,7 @@
-phpBB 2.0.0 :: FAQ
+phpBB 2.0.x :: FAQ