Applied patch [ 1042241 ] Fixes print setup problem (MSW UNICODE build)

[wxWidgets.git] / docs / latex / wx / manual.tex

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index bc4599eed8536f030c12c6d3e01b322414ee60e0..c61f315e9d1d7be3e8e554018e465a338c97c580 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,13 +26,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt

-\title{wxWidgets 2.5.1: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.5.3: A portable C++ and Python GUI toolkit}

 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}

-\date{February 2004}
+\date{October, 2004}

 }
 \makeindex
 \begin{document}
 }
 \makeindex
 \begin{document}


@@ -82,7 +82,7 @@ Robin Dunn, et al}
 }
 \end{comment}
 
 }
 \end{comment}
 

-\chapter{Copyright notice}
+\chapter{Copyright notice}\label{copyrightnotice}

 \setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 


@@ -94,8 +94,10 @@ Portions (c) 1996 Artificial Intelligence Applications Institute\\
 
 Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
 licendoc.txt) for conditions of software and documentation use.
 
 Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
 licendoc.txt) for conditions of software and documentation use.

+Note that we use the old name wxWindows in the license, pending
+recognition of the new name by OSI.

 
 

-\section*{wxWidgets Library License, Version 3}
+\section*{wxWindows Library License, Version 3}\label{wxlicense}

 
 Copyright (c) 1992-2004 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
 
 
 Copyright (c) 1992-2004 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
 


@@ -126,7 +128,7 @@ EXCEPTION NOTICE
 
 1. As a special exception, the copyright holders of this library give 
 permission for additional uses of the text contained in this release of 
 
 1. As a special exception, the copyright holders of this library give 
 permission for additional uses of the text contained in this release of 

-the library as licensed under the wxWidgets Library License, applying 
+the library as licensed under the wxWindows Library License, applying 

 either version 3 of the License, or (at your option) any later version of 
 the License as published by the copyright holders of version 3 of the 
 License document. 
 either version 3 of the License, or (at your option) any later version of 
 the License as published by the copyright holders of version 3 of the 
 License document. 


@@ -149,7 +151,7 @@ choice whether to permit this exception to apply to your modifications.
 If you do not wish that, you must delete the exception notice from such 
 code and/or adjust the licensing conditions notice accordingly. 
 
 If you do not wish that, you must delete the exception notice from such 
 code and/or adjust the licensing conditions notice accordingly. 
 

-\section*{GNU Library General Public License, Version 2}
+\section*{GNU Library General Public License, Version 2}\label{gnulicense}

 
 Copyright (C) 1991 Free Software Foundation, Inc.
 675 Mass Ave, Cambridge, MA 02139, USA
 
 Copyright (C) 1991 Free Software Foundation, Inc.
 675 Mass Ave, Cambridge, MA 02139, USA