From f4c858ac7b90bbc28c834c24feaf65ee5f8889ea Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 15 Mar 2007 09:45:17 +0000
Subject: [PATCH] Change log and readme/manual contents update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt         | 20 ++++----------------
 docs/latex/wx/manual.tex |  2 +-
 docs/readme.txt          |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f248657aec..6375693831 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -93,19 +93,19 @@ Major new features in 2.8 release
 
 wxMac
 
-- Corrected top border size for wxStaticBox with empty label (nusi)
+- Corrected top border size for wxStaticBox with empty label (nusi).
+- Fixed wxFont, wxPen and wxBrush accessor bugs introduced in 2.8.2.
 
 wxMSW:
 
-- Fixed wxFileName::GetSize() for large files
+- Fixed wxFileName::GetSize() for large files.
+- Fixed wxFont and wxPen accessor bugs introduced in 2.8.2.
 
 
 2.8.2
 -----
 
 All:
-<<<<<<< changes.txt
-=======
 
 - Added wxSizerFlags::Shaped(), FixedMinSize(), Top() and Bottom() methods.
 - Added wxCSConv::IsOk() (Manuel Martin).
@@ -125,21 +125,9 @@ All:
 - Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk)
 
 Unix Ports:
->>>>>>> 1.1006.2.13
 
-<<<<<<< changes.txt
-- Added wxSizerFlags::Shaped(), FixedMinSize(), Top() and Bottom() methods
-- Added wxCSConv::IsOk() (Manuel Martin)
-- Added wxDateTime::GetDateOnly()
-- Made wxTextFile work with unseekable files again (David Hart)
-- Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
-- Added wxSearchCtrl::[Get|Set]DescriptiveText
-- Added wxToolBar::SetTool[Normal|Disabled]Bitmap for wxMSW, wxGTK and wxMac
-
-=======
 - Fixed crash in wxGetUserName() in Unicode build
 
->>>>>>> 1.1006.2.13
 wxMSW
 
 - Fix lack of spin control update event when control lost focus.
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 5db561a052..9af5142e82 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWidgets 2.8.2: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.8.3: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
diff --git a/docs/readme.txt b/docs/readme.txt
index aa4c8df266..21d9f8a9b8 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.8.2
+wxWidgets 2.8.3
 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++