X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b953bdc2934895fa31d859be25be1f850701c2c3..66f55ec64c250fc51147815bf905a86e943bfd16:/docs/html/faqgen.htm

diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index e0f0fc6673..cdea35dd73 100644
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -88,7 +88,7 @@ applications.
 <H3>How can I prepare for wxWindows 2?</H3>
 
 To make porting to wxWindows 2 easier in the future, take a look at some
-<a href="http://web.ukonline.co.uk/julian.smart/wxwin/prepare.htm">tips</a> for writing existing code in a 2-compatible way.<P>
+<a href="http://www.wxwindows.org/prepare.htm">tips</a> for writing existing code in a 2-compatible way.<P>
 
 <H3>How much has the API changed since 1.xx?</H3>
 
@@ -186,12 +186,33 @@ has been built into wxString.<P>
 There is nothing to stop an application using templates or the string class for its own
 purposes.<P>
 
+<H3>Is there a rich edit/markup widget for wxWindows 2?</H3>
+
+These are the possibilities so far:<P>
+
+<ul>
+<li>The richedit sample has a text editor that does markup.
+<li>See <a href="http://www.scintilla.org" target=_top>www.scintilla.org</a> for
+a very nice syntax-highlighting editor widget. Robin Dunn is writing a wxWindows wrapper
+for this widget.
+<li>If you only need to display marked-up information, rather than edit it,
+then wxHTML will suit your needs. wxHTML is built into wxWindows - please see the reference
+manual for details, and samples/html.
+<li>There are rich edit widgets in both WIN32 and GTK+, but there is currently
+no wxWindows wrapper for these.
+</ul>
+
+<P>
+
 <H3>How is wxWindows 2 being developed?</H3>
 
 We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWindows. This allows
 us to make alterations and upload them instantly to the server in Edinburgh, from
 which others can update their source.<P>
 
+To build source from CVS, see the file BuildCVS.txt in the top-level wxWindows distribution
+directory.<P>
+
 <H3>How is wxWindows 2 distributed?</H3>
 
 By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.<P>
@@ -203,8 +224,8 @@ finished?) to think very far ahead. However, we know we want to make wxWindows a
 and well-publicised as possible. We also want to aim for better platform-independence of
 resources such as icons and bitmaps, standardising on the PNG for all platforms.<P>
 
-Other possibilities include: DCOM/CORBA compatibility; a wxWindows book; an
-<a href="http://web.ukonline.co.uk/julian.smart/wxwin/wxide.htm">IDE</a>;
+Other possibilities include: DCOM/CORBA compatibility; a wxWindows book;
+<a href="http://wxstudio.linuxbox.com/">wxStudio</a>, an IDE;
 other platforms; other interface abilities such as speech output.<P>
 
 We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
@@ -221,8 +242,8 @@ from Java, and the level of interest in wxWindows is as high as ever.<P>
 
 <H3>How can I help the project?</H3>
 
-Please check out the <a href="http://web.ukonline.co.uk/julian.smart/wxwin/develop.htm" target=main>Backroom</a> pages,
-in particular the <a href="http://web.ukonline.co.uk/julian.smart/wxwin/projects.htm">suggested projects</a>, and
+Please check out the <a href="http://www.wxwindows.org/develop.htm" target=main>Backroom</a> pages,
+in particular the <a href="http://www.wxwindows.org/projects.htm">suggested projects</a>, and
 mail <a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a> or the developers' mailing list with your own suggestions.<P>
 
 </font>