Prepare for RDF branch landing: Fix crash reported by slamm. Make the

instanciation of the cache not happen in the global scope, which might be at an undefined time. Instead, make sure the cache is ready in the class ctor. git-svn-id: svn://10.0.0.236/branches/RDF_BRANCH_060398@6245 18797224-902f-48f8-a5cc-f745e15eee43
Bug fix.
1998-07-23 14:07:33 +00:00 · 1998-07-23 02:23:25 +00:00 · 1998-07-23 02:22:25 +00:00 · 1998-07-23 00:41:29 +00:00 · 1998-07-23 00:10:45 +00:00 · 1998-07-22 21:32:06 +00:00
7053 changed files with 2132049 additions and 106011 deletions
--- a/README/mozilla/IDEMenuBar.gif
+++ b/README/mozilla/IDEMenuBar.gif
--- a/README/mozilla/IDEPrefs.gif
+++ b/README/mozilla/IDEPrefs.gif
--- a/README/mozilla/macbuild.htm
+++ b/README/mozilla/macbuild.htm
@@ -0,0 +1,916 @@
+<HTML>
+<!--This file created 4/2/98 12:32 PM by Claris Home Page version 3.0 30 Day Trial-->
+<HEAD>
+   <TITLE>MacFE Issues</TITLE>
+   <META NAME=GENERATOR CONTENT="Claris Home Page 3.0 30 Day Trial">
+   <X-CLARIS-WINDOW TOP=43 BOTTOM=741 LEFT=5 RIGHT=661>
+   <X-CLARIS-REMOTESAVE SERVER=pinkerton USER=root DIR="/NextLibrary/WebServer/Documents/" FILE="">
+   <X-CLARIS-TAGVIEW MODE=minimal>
+<META http-equiv="Content-Type" content="text/html; charset=MacRoman"><!--This file created 3/17/98 9:38 PM by Claris Home Page version 3.0 30 Day Trial-->
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<H1>MacFE Issues</H1>
+
+<P>A general document on how to build, what works, what doesn't, and
+things to watch out for when working on the Mac client. <B>Please
+read the entire document before you start tinkering</B>...heck, you
+may just learn something!</P>
+
+<P>Abbreviations you will probably see in this document:</P>
+
+<UL>
+   <LI><B>MacFE</B> - the Macintosh front end, including all the
+   things you see and some you don't.</LI>
+   
+   <LI><B>XP</B> - cross platform back end code, mostly written in C.
+   You will see this used like, "This is an XP problem" which means
+   it's broken everywhere.</LI>
+   
+   <LI><B>MW</B> - Metrowerks Corporation. They make our build tools
+   (CodeWarrior) and PowerPlant</LI>
+   
+   <LI><B>PP</B> - PowerPlant, the GUI framework on which our app is
+   built</LI>
+   
+   <LI><B>CWProX</B> - CodeWarrior Pro version X. You'll probably see
+   CWPro1, CWPro2, and CWPro3. We may also just refer to this as
+   <B>CW</B>.</LI>
+   
+   <LI><B>IDE</B> - Integrated Development Environment. CodeWarrior
+   is an IDE.</LI>
+   
+   <LI><B>NC</B> - the working name for our Aurora technology, the
+   Navigation Center.</LI>
+   
+   <LI><B>HT</B> - HyperTree, a layer of XP APIs over RDF on which
+   the NavCenter is built.</LI>
+</UL>
+
+<H3><A HREF="#Building">Building</A></H3>
+
+<H3><A HREF="#NewFeatures">New 5.0 Features</A></H3>
+
+<H3><A HREF="#Unfinished">Unfinished Features</A></H3>
+
+<H3><A HREF="#Pitfalls">Pitfalls</A></H3>
+
+<H3><A HREF="#HistFuture">History and Future</A></H3>
+
+<P>Help for parts of this document, especially build instructions,
+was received from Dan Kogai.</P>
+
+<H2>
+
+<HR>
+
+<A NAME=Building></A>Building</H2>
+
+<H4>What are the minimum machine requirements?</H4>
+
+<P>To build Navigator, you need a fast PPC Mac. The faster the
+better. You can't build with a 68K machine because we have too many
+resources, and the build process will crash when trying to generate
+resources out of our cross-platform strings. See the discussion below
+for a way around this.</P>
+
+<P>You will need about 96 MB of physical RAM to "fast link" the app.
+You can still fast link if you give your machine 96 MB of virtual
+memory, but then the VM hit is large enough to counteract any
+improvement. One of our beta testers had a machine with only 64MB of
+physical RAM (VM was off) and it ran out of memory trying to link.
+Turning VM on got it to link, but build time increased greatly.</P>
+
+<P>Reports from the net indicate that the optimized version
+(MozillaPPC) take much less RAM to build than the 96MB we suggest. If
+you are running out of memory, try building that instead of the debug
+version (the debug symbols require a lot of RAM come link time).</P>
+
+<P>The moral of the story: get lots of physical RAM and don't use
+VM.</P>
+
+<H4>How big of a partition do I need for the source?</H4>
+
+<P>You should be ok with a 400MB disk partition, even when fully
+built. This does not include tools like the IDE, just source.</P>
+
+<P>On an HFS+ volume, a full build takes about 110MB. HFS+ is good,
+but utilities are sparse.</P>
+
+<H4>Why do I need CWPro2 or better?</H4>
+
+<P>We use CodeWarrior as our development environment at Netscape for
+the MacFE. All of the projects and tools are geared towards the
+CodeWarrior IDE. In addition, we make heavy use of PowerPlant and MSL
+which you can only get from Metrowerks.</P>
+
+<P>While we say you need at least CWPro2, you may be able to get by
+with Pro1, but probably not for very long. We haven't tested it, so
+we don't recommend it. Get the upgrade. CodeWarrior kicks serious
+butt!</P>
+
+<H4>How do I setup my development environment?</H4>
+
+<P>This part is very important--and somewhat difficult (especially
+when compared to other platforms). I repeat: Read very carefully!
+Once this part is done right, the build process itself should be as
+easy as drag and drop. </P>
+
+<P>Here's a list of 3rd party <B>software</B> that we compile into
+the application and where to get it:</P>
+
+<UL>
+   <LI>PowerPlant 1.8 - obtainable from the CodeWarrior CD.</LI>
+   
+   <LI>MSL - the Metrowerks Standard Library, obtainable from the
+   CodeWarrior CD</LI>
+   
+   <LI><A HREF="ftp://ftp.boingo.com//dan/WASTE/waste-13.hqx">WASTE
+   1.3</A></LI>
+   
+   <LI><A HREF="http://www.bact.wisc.edu/CWASTEEdit/CWASTEEdit.sit.hqx">CWASTE
+   1.6.2</A></LI>
+   
+   <LI><A HREF="ftp://ftp.scripting.com/userland/menuSharingToolkit4.1.sit.hqx">Menu
+   Sharing Toolkit</A> (from UserLand)</LI>
+   
+   <LI><A HREF="ftp://ftp.digitalalchemy.com/pub/digitalalchemy/mercutio-SDK.sit.bin">Mercutio
+   1.5 SDK</A> (only download the SDK, not the entire package, else
+   the access paths will be wrong)</LI>
+   
+   <LI><A HREF="ftp://ftp.share.com/pub/internet-configuration/ICProgKit1.4.sit">Internet
+   Config 1.4 SDK</A></LI>
+   
+   <LI><A HREF="http://www.mooseyard.com/Jens/Software/">AEGizmos
+   1.4.2</A></LI>
+</UL>
+
+<P>Here's a list of other build <B>tools</B> that you need to install
+in order to build and where to get them:</P>
+
+<UL>
+   <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_tool.bin">MacPerl
+   5 MPW Tool</A></LI>
+   
+   <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_appl.bin">MacPerl 5 Application</A></LI>
+   <LI>MakeStub - MPW (installed with CodeWarrior Heaven option). If
+   you choose not to install MPW, it is located on the MacOS Tools CD
+   in "CW Pro 2 Tools:CodeWarrior MPW:MPW:Tools"</LI>
+   
+   <LI>RunTSScript - in Mozilla source distribution
+   (mozilla:build:mac:RunTSScript), needs to be installed by hand</LI>
+   
+   <LI><A HREF="ftp://dev.apple.com/devworld/Tool_Chest/Core_Mac_OS_Tools/MPW_etc./MPW-GM/MPW/ToolServer.sit.hqx">ToolServer</A>
+   - or in the CW distribution (CW Pro 2 Tools:Apple Development
+   Tools:ToolServer 3.4.1.sit). <B>We recommend pulling it off the
+   CD</B> because it comes with configuration files for CodeWarrior
+   which you would have to create manually were you to pull it off
+   the net.</LI>
+
+   <LI><A HREF="http://people.netscape.com/sfraser/software/NewAlias_tool.sit.hqx">New Alias MPW Tool</A>
+   An MPW tool that creates Finder aliases for files.
+   </LI>
+
+   <LI>StreamEdit MPW Tool - MPW (installed with CodeWarrior Heaven option). If
+   you choose not to install MPW, it is located on the MacOS Tools CD
+   in "CW Pro 2 Tools:CodeWarrior MPW:MPW:Tools"</LI>
+   </LI>
+   
+   <LI><A HREF="ftp://dev.apple.com/devworld/Periodicals/develop/develop25/develop_Issue_25_code/ToolFrontEnd.sit.hqx">ToolFrontEnd</A></LI>
+   
+   <LI><A HREF="http://sunsite.cnlab-switch.ch/ftp/software/platform/macos/src/HTML/MPW_C.html">patch
+   2.1</A></LI>
+</UL>
+
+<P>Once you have all the pieces, here are the steps required to put
+everything together:</P>
+
+<OL>
+   <LI>Install CodeWarrior from the CD. While it is large, installing
+   the "CodeWarrior Heaven" option will guarantee that you have
+   everything you need. This will give you PowerPlant, MSL, and MPW.
+   If you choose to install less, proceed at your own risk.</LI>
+   
+   <LI>In the Finder, increase the memory partition of the IDE to
+   15MB (you can get by with 12, if need be).</LI>
+   
+   <LI>Download ToolFrontEnd. After expanding it, in "ToolFrontEnd
+   Folder:Drop-Ins" there are three items:
+   
+   <UL>
+      <LI><I>#include</I></LI>
+      
+      <LI><I>ToolFrontEnd</I></LI>
+      
+      <LI><I>ToolFrontEnd Panel</I></LI>
+   </UL>
+   
+   <P>Create a folder named "Include Scanners". Place the file
+   "#include" into the Include Scanners folder. Move the Include
+   Scanners folder to the CodeWarrior Plugins folder. Create a folder
+   named "ToolFrontEnd". Place the files "ToolFrontEnd" and
+   "ToolFrontEnd Panel" into the ToolFrontEnd folder. Place this
+   folder in the CodeWarrior Plugins folder.</P></LI>
+   
+   <LI>Open "ToolFrontEnd Panel" with ResEdit. Change the file type
+   from <B>'Panl'</B> to <B>'PanL'</B>. Save.</LI>
+   
+   <LI>Uncompress the StuffIt Archive for ToolServer. The goal is to
+   let ToolServer and MPW share the same Tools directory so you don't
+   need to have multiple versions of tools. Do the following:
+   
+   <OL>
+      <LI>Open ToolServer's Tools folder. There is one file called
+      "RMetrowerks". </LI>
+      
+      <LI>Move RMetrowerks to Tools folder of MPW. MPW folder must be
+      at "Metrowerks:Codewarrior MPW:MPW" if you installed
+      Codewarrior Heaven. </LI>
+      
+      <LI>Remove ToolServer's Tools folder.</LI>
+      
+      <LI>Now create an alias of Tools folder in "CodeWarrior MPW"
+      and move it to your ToolServer folder. Rename the alias
+      (probably called "Tools alias") to "Tools"</LI>
+      
+      <LI><FONT COLOR="#FF0000"><B>IMPORTANT</B></FONT>: Make sure
+      you only have one instance of ToolServer on your machine. If
+      the build script finds the wrong one, the correct tools will
+      not be found and strange things will happen.</LI>
+   </OL>
+   </LI>
+   
+   <LI>After installing the MacPerl MPW Tool distribution (run the
+   InstallerVISE application), in the "MacPerl &#131;" folder, there
+   will be an MPW tool named "perl". Install this in MPW's tools
+   folder.</LI>
+   
+   <LI>Install the MacPerl Application (run the
+   InstallerVISE application).  You can install this anywhere, but it is
+   recommended that you install it inside of your CodeWarrior folder for
+   easy reference. After installation, you will need to set a preference
+   to enable double-click launch of the perl scripts. This preference is set
+   by going under the Edit Menu to Preferences.  Click on the "Script" button
+   and hit the radio button "Run Scripts opened from Finder"</LI>
+   
+   <LI>Install the "patch", "MakeStub", "NewAlias" and "StreamEdit" Tools in the tools
+   folder. Note that "MakeStub" and "StreamEdit" are automatically installed by the
+   "CodeWarrior Heaven" install option.</LI>
+   
+   <LI>Install RunTSScript (found in the Mozilla source distribution)
+   in the compilers folder in your build environment
+   ("Metrowerks:Metrowerks Codewarrior:Codewarrior
+   Plugins:Compilers")</LI>
+   
+   <LI>Next, after downloading all the 3rd party software components,
+   drag WASTE, CWASTE, Menu Sharing, Mercutio, Internet Config, and
+   the AEGizmo folders (just as they are) into the "MacOS Support"
+   folder in your build environment.</LI>
+   
+   <LI>Start ToolServer from within CodeWarrior (or use MPW if you
+   are brave enough). We're about to patch some files. Make sure the
+   ToolServer menu is in the CodeWarrior menu bar by turning on the
+   <A HREF="IDEPrefs.gif">preference</A> under the "Extras" panel in
+   the IDE Preferences (not the project preferences!). The menu bar
+   should look like this:
+   
+   <P><IMG SRC="IDEMenuBar.gif" WIDTH=359 HEIGHT=20 X-CLARIS-USEIMAGEWIDTH X-CLARIS-USEIMAGEHEIGHT ALIGN=bottom></P>
+   
+   <P>Choose "Start ToolServer" from the ToolServer menu (this is the
+   icon menu between "Window" and "Help" in the menubar above). You
+   will now see a window with no close box. This is your ToolServer
+   Worksheet where you will type (or cut &amp; paste) the commands
+   for the following steps.</P>
+   
+   <P>In case you have never used MPW/ToolServer before, the
+   following is <B>very important</B>. Pressing "return" does not
+   execute commands like you might think. It just inserts a newline
+   into the worksheet like a normal text editor. <B>To actually get
+   ToolServer to execute the command, you must press "Enter" (lower
+   right of numeric keypad).</B> This executes the line that the
+   cursor is on, and only that line. If you want to execute multiple
+   lines at once, select them all and hit Enter.</P></LI>
+   
+   <LI>Set the shell variables {IDE} and {Source} to the correct
+   paths for your build environment. {IDE} is where your CodeWarrior
+   IDE is located. {Source} is the folder containing the toplevel
+   "ns" folder of the Mozilla source. Mine look like this (don't
+   forget to keep the quotes if your path includes spaces), yours
+   will almost certainly be different (<FONT COLOR="#FF0000">to
+   punctuate this, the things you need to change are in red</FONT>).
+   
+   <PRE>Set IDE "<FONT COLOR="#FF0000">Develop:Source331 Build Environment:CW Pro 2:Metrowerks CodeWarrior:</FONT>"
+Set Source "<FONT COLOR="#FF0000">Source:FreeSource:</FONT>"</PRE></LI>
+   
+   <LI>If you are using CWPro2, execute the following lines to patch
+   LDropFlag to draw correcly over non-white backgrounds. <B>You do
+   not have to do this if you are using Pro3</B> because it has been
+   fixed.
+   
+   <PRE>directory "{IDE}MacOS Support:PowerPlant:_In Progress:_Table Classes:"
+patch LDropFlag.cp "{Source}mozilla:lib:mac:patches:LDropFlag.patch"
+duplicate -y "{Source}mozilla:lib:mac:patches:DropFlag Icons.rsrc" "{IDE}MacOS Support:PowerPlant:PowerPlant Resources:"</PRE></LI>
+   
+   <LI>Execute the following lines to patch menusharing.c to allow it
+   to compile with the new Universal Headers. It references an
+   obsolete header file (GestaltEqu.h).
+   
+   <PRE>directory "{IDE}MacOS Support:Menu Sharing Toolkit 4.1:"
+patch menusharing.c "{Source}mozilla:lib:mac:patches:menusharing.patch"</PRE></LI>
+   
+   <LI>If you are using CWPro2 straight off the CD, you need to patch
+   AppleEvents.r to fix a problem with the Universal Headers (the
+   definition of the 'aedt' resource was omitted). <B>You do not have
+   to do this if you have applied the netborne patch to Pro2 or are
+   using Pro3</B> because it has been fixed.
+   
+   <PRE>directory "{IDE}MacOS Support:Headers:Rez Headers:"
+patch AppleEvents.r "{Source}mozilla:lib:mac:patches:AppleEvents.r.patch"</PRE></LI>
+   
+   <LI>You need to patch stat.mac.h to fix a problem in MSL where
+   lines were omitted (both CWPro2 and Pro3 share this problem)
+   
+   <PRE>directory "{IDE}Metrowerks Standard Library:MSL C:MSL Mac:Public Includes"
+patch stat.mac.h "{Source}mozilla:lib:mac:patches:stat.mac.h.patch"</PRE></LI>
+   
+   <LI>If you are using CWPro3, you have to unstuff and copy the old
+   Grayscale Appearance classes into the PowerPlant hierarchy. As of
+   Pro3, they are now obsolete and are located with the rest of the
+   obsolete PowerPlant files. We'll fix this shortly.</LI>
+   
+   <LI>Congratulations! Now you are ready to build. Once these steps
+   are done, you don't have to repeat these setups the next
+   time!</LI>
+</OL>
+
+<H4>Ok, so how do I build?</H4>
+<P>In the folder mozilla:build:mac:, there are several Perl scripts with
+names of the form BuildMozillaXXX.pl, where XXX is "Optimized",
+"Debug", "Tinderbox", et al.  Each script builds the corresponding
+version of Mozilla.  If you configured the MacPerl application to
+execute scripts that are opened from the finder, all you have to do is
+double click on the appropriate one; otherwise, launch MacPerl, and
+run the appropriate script from the "Run Script..." menu item.</P>
+
+<P>These `configured build' scripts are simple, and you might want to
+make your own to force your build to StopForErrors(), or alternatively
+DontStopForErrors(), et al.  You can set up certain build-script
+variables and (soon) compile-time flags.  Compare the supplied scripts
+to figure out what you might want.  Note that CodeWarriorLib, Moz.pm,
+and BuildList.pm, are AppleScript libraries and Perl modules meant to
+be used by a `configured build'.  Use your favorite POD viewer (Shuck
+comes with MacPerl) to view the documentation in the Perl scripts.</P>
+
+<P>If there were any errors in any of the projects along the way, the
+script will stop at that point and the IDE will tell you the errors.
+You can fix them and make sure they current project builds, but to
+continue the automation, you have to start from the beginning by
+double-clicking the script again. This isn't quite as bad as it
+sounds because the previous projects are already built (unless you
+changed some major header file). Please note that stopping the script
+once it has started is difficult. We are working to address
+this issue.</P>
+
+<P>After the build is complete, you can find aliases to the built libraries
+and the final Mozilla application. Debug builds are built to
+Mozilla:dist:client_debug, while optimized builds are built to Mozilla:dist:client.
+</P>
+
+<P>Don't worry too much about the numerous warnings generated during
+the build. We try our best to get the XP teams to use real compilers,
+but alas, they continue to write warning-laden code. There is also
+some generated code (Java is one example) that has a lot of warnings
+that we can't help either. If you write any new code, please help us
+in our quest to get zero warnings.</P>
+
+<H4>How long does it take to build?</H4>
+
+<P>On a G3 with the source and IDE on a RAM disk, it takes about 25
+minutes. On a PowerTowerPro 225 and everything on the hard drive, it
+takes about 45mins to an hour. On a 9500/132 it takes over 2 1/2
+hours.</P>
+
+<P>The moral of the story: Don't try this on your 6100/66.</P>
+
+<P>From Dan Kogai:</P>
+
+<BLOCKQUOTE>It took me 70 minutes to build Mozilla Debug with
+   configurations below;
+   
+   <P>PowerMac 7600/120<BR>
+   192MB RAM (No VM)<BR>
+   1 + 4 GB HD (No RAM Disk)<BR>
+   MacOS 8.1<BR>
+   CWPro2<BR>
+   HFS+ </P></BLOCKQUOTE>
+
+<H4>What's special about running the debug build?</H4>
+
+<P>Running the optimized (non-debug) version is easy, just
+double-click it and it will work. This is because all the shared
+libraries are compiled directly into the application. We don't do
+this with the debug version to facilitate changing bits in projects
+other than the main one. This way, you don't have to relink the
+entire app (which can take a while) to see the changes, just the
+project that was modified.</P>
+
+<P>As a result, you have to find a way to get all the shared
+libraries from where they are built (scattered throughout the tree)
+into the same folder as the app so CFM can find them. Luckily, the
+BuildList script will create all these aliases for you and put them
+in the right places!</P>
+
+<P>Another nicety about the debug build is that there is a special
+"trace" function which can be used to display messages about the
+state of the application as it runs through certain blocks of code.
+To see these messages (since the Mac doesn't have stdout or stderr)
+you need to run an application called TraceMonitor. TraceMonitor is
+available through Apple Computer with the ASLM package.
+</P>
+
+<H4>How do I build a 68K version?</H4>
+
+<P>For now, you can't. The projects have not been kept up to date and
+aren't even in the tree anymore. If you would like to create them and
+get all the exports right with CFM-68K, go right ahead. We will be so
+happy!</P>
+
+<H4>Why use IDE_Options.h when all that is in the project file?</H4>
+
+<P>It was originally intended to make sure that all 300 of us at
+Netscape are using the same environment and compilation flags. If
+something gets turned on/off by accident in the project prefs, it can
+introduce a subtle bug that can take days to track down for naught.
+Having a file that specifies exactly what flags should be used
+guarantees that this can't happen.</P>
+
+<P>Now that we move to net development, I'm sure you will agree that
+this is even more important.</P>
+
+<H2>
+
+<HR>
+
+<A NAME=NewFeatures></A>New 5.0 Features</H2>
+
+<H3>Navigator Center (Aurora)</H3>
+
+<P>The Navigation Center (referred to as "Aurora" in press releases)
+is an attempt to make it easier to access and organize information on
+the web. The NC unifies Bookmarks, History, Search, and local files
+into a sequence of workspaces which are accessible from a single
+location in the browser window. One of the ways the NavCenter
+diverges from a similar concept seen from our competition is the
+ability for users to create their own workspaces to organize and
+store information from both the web and their desktop.</P>
+
+<UL>
+   <LI>Main access point is a bar along the left side of the
+   browser.</LI>
+   
+   <LI>Each icon represents a workspace. <B>Click any workspace icon
+   once to slide out a hierarchical tree</B> (like the list view in
+   the Finder) that displays the information appropriate to that
+   workspace. You can manipulate the URLs and folders in the tree
+   while you are surfing the web in the adjacent pane.</LI>
+   
+   <LI>Clicking on another workspace while the shelf is open switches
+   to showing the contents of that workspace.</LI>
+   
+   <LI><B>To hide the shelf, click the close box above the column
+   headers</B></LI>
+   
+   <LI>To create new bookmarks, <B>drag bookmarks from the location
+   bar of the browser into the NC</B> and file them where you want.
+   Of course, the old methods still work.
+   
+   <UL>
+      <LI>If the NC shelf is not open, drag to the workspace where
+      you want to file the bookmark and after a small delay, the
+      <B>shelf will spring open</B>. You can now drop your new
+      bookmark exactly where you want.</LI>
+      
+      <LI>If the workspace you want is not displayed, drag over that
+      workspace and after a small delay, the contents of that
+      workspace will become visible.</LI>
+   </UL>
+   </LI>
+   
+   <LI>You can also <B>open a stand-alone NC window</B> from the
+   Communicator menu. The standard "cmd-b" and "cmd-h" for bookmarks
+   and history are wired to open a new NC window with the appropriate
+   workspace visible.</LI>
+   
+   <LI>You can <B>hide the list of workspaces</B> at the left of the
+   browser window by choosing "View:Hide NavCenter Selector". You can
+   show it again by doing the same thing. Even when hidden in the
+   browser, the stand-alone versions are always available.</LI>
+   
+   <LI>Drag bookmarks to the trash to delete them. You can also hit
+   the "delete" key (backspace) to remove bookmarks.</LI>
+   
+   <LI>The NavCenter is fully <B>context-menu savvy</B>. There are
+   many commands that are in context menus that are not in the main
+   menubar (right now).</LI>
+   
+   <LI><B>ToolTip savvy</B>. Both the title and URL can be seen in
+   their entirety by hovering over the appropriate column.</LI>
+   
+   <LI>3-state <B>sorting: alphabetical, reverse-alphabetical,
+   none</B>. Like in the Finder, setting a sort does not change the
+   hierarchy or make any permanent modifications to your
+   organizational structure.</LI>
+</UL>
+
+<H3>Personal Toolbar</H3>
+
+<UL>
+   <LI>A toolbar to store bookmarks, first seen on Win/UNIX in 4.0.
+   Single click to load URL in current browser window</LI>
+   
+   <LI><B>Drag and drop bookmarks to the toolbar to add them.</B>
+   Drag existing bookmarks on the toolbar to rearrange the order.
+   Drag bookmarks to the trash can to remove them from the
+   toolbar.</LI>
+   
+   <LI><B>Dynamically allocates horizontal space</B> to buttons on
+   toolbar. Adding new buttons shrinks existing ones, removing
+   buttons distributes the vacated space to existing buttons.
+   Changing the window width reallocates space accordingly.</LI>
+   
+   <LI>You can further manipulate, rename, rearrange, add to and
+   remove the URLs in the folder that represents the personal toolbar
+   in the Navigation Center.</LI>
+   
+   <LI>ToolTips show the full title.</LI>
+</UL>
+
+<H3>Navigator</H3>
+
+<UL>
+   <LI>new "Mariner" technology makes table layout much faster and
+   does not reload the page when the window is resized.</LI>
+   
+   <LI>buttons/popup menus in the chrome now look more like MacOS
+   controls.</LI>
+</UL>
+
+<H3>Composer Features</H3>
+
+<UL>
+   <LI>Drag and Drop</LI>
+   
+   <LI>Direct manipulation editing of tables</LI>
+</UL>
+
+<H2>
+
+<HR>
+
+<A NAME=Unfinished></A>Unfinished "Features"</H2>
+
+<P>This source release is not of beta quality, hence it will have
+lots of bugs that a normal beta (or even an alpha) would not have.
+There are many features which we are not even close to being finished
+with, let alone knowing what the final UI will be. Here are some
+things that we know about but didn't have time to get to before the
+code left the building. Feel inclined to help us out?
+Grrrrrrreat!</P>
+
+<H3>Aurora</H3>
+
+<P>Aurora is definitely a work in progress. Here are the bugs that we
+just don't have time to fix</P>
+
+<UL>
+   <LI>Real icons for files on disk</LI>
+   
+   <LI>changing view from XP code (e.g., JavaScript) has not been
+   tested, but should work</LI>
+   
+   <LI>move vs. copy notification (cursor doesn't change, etc. No XP
+   support for this yet)</LI>
+   
+   <LI>double-click on the text of an item should launch the url, not
+   trigger an in-place edit</LI>
+   
+   <LI>separator needs UI consensus and its own icon</LI>
+   
+   <LI>drag &amp; drop
+   
+   <UL>
+      <LI>can't disallow drags to trash when pane is read only. Trash
+      will still highlight even though nothing will happen.</LI>
+      
+      <LI>occasional -49 error when dragging repeatedly to browser
+      window. I think the DragManager is corrupt because -49 is not a
+      drag manager error and d&amp;d doesn't work anywhere else after
+      that.</LI>
+      
+      <LI>drag feedback doesn't work correctly when view is sorted or
+      when some items are local vs. remote.</LI>
+      
+      <LI>Composer needs to correctly handle HT_Node flavor</LI>
+      
+      <LI>Sometimes things will move, other times they will copy. Its
+      an XP thing.</LI>
+   </UL>
+   </LI>
+   
+   <LI>Chrome properties not correctly respected (relies on personal
+   toolbar being hidden to hide NavCenter)</LI>
+   
+   <LI>sort state of columns not saved (nor is anything else with
+   columns)</LI>
+   
+   <LI>we shouldn't be using HT_SetNodeName(). Use HT_SetNodeData()
+   instead</LI>
+   
+   <LI>Open/Close context menu does not redraw disclosure triangle
+   after executing</LI>
+   
+   <LI>There are currently no user configurable prefs for Aurora.
+   This will change.</LI>
+   
+   <LI>You can't edit the URL field because RDF uses this as the key
+   in its database. As a result, having two bookmarks in the same
+   workspace can lead to odd behavior</LI>
+   
+   <LI>Undo/redo does not work yet (XP problem)</LI>
+   
+   <LI>Cut deletes nodes, it does not put them on a clipboard.
+   Copy/paste do nothing. This is an XP problem.</LI>
+</UL>
+
+<P>Still major work to do:</P>
+
+<UL>
+   <LI>create new workspaces with d&amp;d</LI>
+   
+   <LI>rollover feedback on selector</LI>
+   
+   <LI>sitemap notification</LI>
+   
+   <LI>scroll selector bar</LI>
+   
+   <LI>HTML pane/search pane</LI>
+   
+   <LI>spring-loaded folders on d&amp;d</LI>
+</UL>
+
+<H3>General FE Problems</H3>
+
+<UL>
+   <LI><B>DNS lookups may hang up the machine for up to a minute.
+   Don't worry, your mac did not freeze!</B></LI>
+   
+   <LI>FTP doesn't work quite right. URLs typed into the location bar
+   will not load and the MIME mappings (save to disk, etc) are broken
+   so everything is loaded into the browser window instead of saving
+   to disk.</LI>
+   
+   <LI>frame around current tab group broken</LI>
+   
+   <LI>tabbing around to text entry areas and back to the Location
+   field is broken</LI>
+   
+   <LI>can't drag from Navigator when app is in background</LI>
+   
+   <LI>Folders on personal toolbar. Sigh, unless we can rewrite the
+   bookmarks menu code, we just don't have enough hierarchical menu
+   id's to put menus on personal toolbar folders. They still act as
+   drop sites, so you can drop urls into them but clicking on them
+   will just beep.</LI>
+   
+   <LI>Printing is....sub-optimal.</LI>
+   
+   <LI>"Mariner" layout improvements are nice, but on very
+   complicated pages the machine will hang for a few seconds while it
+   is relaying out the page. This can last 4-6 seconds sometimes.
+   This really looks bad when the NavCenter shelf is sliding out
+   during a drag and drop. If you are patient enough, you will be
+   rewarded, but it is slow.</LI>
+</UL>
+
+<H2>
+
+<HR>
+
+<A NAME=Pitfalls></A>Pitfalls</H2>
+
+<P>There are a couple of pitfalls that we have to keep straight when
+it comes to editing resources.</P>
+
+<H4>Why do I keep getting messages about unknown custom types in
+Constructor?</H4>
+
+<P>For starters, make sure you have an alias to the following two
+files in your Constructor folder:</P>
+
+<UL>
+   <LI>mozilla:cmd:macfe:rsrc:CrossProduct:Mozilla_Custom_CPPbs</LI>
+   
+   <LI>mozilla:cmd:macfe:rsrc:Communicator:MailNewsCppbs.cnst</LI>
+</UL>
+
+<P>You may have to explicitly open these files up while running
+Constructor to be able to see the new types, especially for the ones
+in MailNewsCppbs.cnst. Not sure why yet.</P>
+
+<P>For editing other kinds of resources, we have a TMPL file for
+ResEdit/Resourcerer. Place these in the appropriate location for your
+resource editor</P>
+
+<UL>
+   <LI>mozilla:cmd:macfe:rsrc:CrossProduct:Mozilla_Custom_TMPLs</LI>
+   
+   <LI>mozilla:cmd:macfe:rsrc:CrossProduct:Other_Comm_TMPLS.rsrc</LI>
+</UL>
+
+<H4>Why don't my toolbar buttons work anymore in the browser
+window?</H4>
+
+<P>Because of the way we have the toolbars as CIncludeViews (which
+work in a similar way to #include in C/C++), the RidL will be messed
+up if you edit the main browser window PPob. Constructor regenerates
+this list based on all the controls that are in the view when you
+save, but because we use CIncludeView, the toolbar buttons aren't
+actually in the view so the RidL is empty. They will still show up
+when you build, but they won't do anything because they are not
+registered with the browser window. Until we fix this, just use
+Resourcer to replace the incorrectly generated one with an old
+version. The old version is about 58 bytes long and the new one is
+about 10 so you should be able to easily tell which is which.</P>
+
+<H4>Why are there so many damn resources?</H4>
+
+<P>As you may have noticed, we've got too many damn resources. Most
+of them are 'STR ' resources which are generated at build time and
+contain all of our cross-platfrom strings. We would like to generate
+these resources more intelligently (into 1/10 the number of 'STR#'
+resources maybe) but ran out of time before the source had to go out.
+Before you rush out and change it for us, <B>stop</B>! There are some
+constraints on the final solution, mostly to do with i18n and l10n
+being able to leverage existing work on older product to do new
+products. If you want to help us out with this, please send us some
+email and we can have out i18n team talk with you to make sure it
+gets done correctly!</P>
+
+<H4>Why doesn't it work better with Internet Config?</H4>
+
+<P>For starters, the main reason why we never drank the IC kool-aid
+was that there was no support for multiple profiles. Being one of the
+main features which our competition did not have, we thought this was
+pretty important. There are rumblings in the IC world that IC 2.0
+will support multiple profiles. Great! That still leaves us with the
+second reason: there are many, many, many preferences that we use
+that are not reflected in IC. As a result, we already have to
+maintain prefs for those that are not covered by IC so we can't be
+totally IC dependent.</P>
+
+<P>Of course, now that the source is free, maybe we can drive the
+direction of IC to include all of our wacky networking prefs.</P>
+
+<H4>Where are all my old 4.0X bookmarks and prefs?</H4>
+
+<P>In the process of getting the source ready for distribution, we
+removed all mentions of "Netscape" from the product. As you may know,
+the 4.0X preferences are stored in a folder called "Netscape Users."
+Well, that folder is now called "Navigator Users" and the preference
+file is now called "Navigator Preferences" instead of "Netscape
+Preferences."</P>
+
+<P>It's probably best not to use any of your old prefs at this point
+since some of them rely on security calls that are no longer in the
+free source product. After you create a new profile (and you will
+have to when you start the free source), copy your bookmarks.html
+file from your old profile into the new user profile folder and
+replace the empty one that's already there (if there is one).</P>
+
+<P><B>For your old bookmarks to be seen, you must throw away the
+"NavCntr" folder</B> created in your new profile folder. After you do
+that bookmarks will be imported into Aurora automagically. Note that
+changes that you make to your bookmarks in 5.0 will not (as of today)
+be written back to the Bookmarks.html file, but instead are stored in
+a database within the "NavCntr" folder. If anything gets corrupted in
+the NavCenter, you can always throw this folder into the trash and
+your original bookmarks will be reimported.</P>
+
+<P>Also note that these new bookmarks and preferences are totally
+separate from your 4.0X prefs.</P>
+
+<H2>
+
+<HR>
+
+<A NAME=HistFuture></A>History and Future</H2>
+
+<H3>History</H3>
+
+<P>Excuse me while I ramble...</P>
+
+<UL>
+   <LI>Built using Metrowerks PowerPlant, the client has been PPC
+   native from day one. 68K support was dropped in 5.0 due to the
+   high cost of maintenance. Any takers?</LI>
+   
+   <LI>Mail/News was added in 2.0 and Composer was added in 3.0
+   (called Navigator Gold). Both were dramatically improved with
+   4.0.</LI>
+   
+   <LI>Java came to the Mac in 3.0, even though Windoze and unix had
+   it in 2.0.</LI>
+   
+   <LI>Multi-byte language support for inline edit fields added in
+   4.0</LI>
+   
+   <LI>The preferences used to be STR# resources. Now they are done
+   in javascript.</LI>
+   
+   <LI>Because of the sheer number of resources (and the "theoretical
+   limit" on the number of resources in a file imposed by the
+   Resource manager -- which we still exceed on a daily basis), a
+   number of strings and icons were moved out of the main application
+   and into a file called "Netscape Resources" in 4.0</LI>
+   
+   <LI>For plain-text email/form composition, we used VText up
+   through 4.0. For 5.0, we switched to WASTE because of its minimal
+   impact on the PowerPlant hierarchy. VText caused us fits every
+   time we wanted to upgrade to a newer version of PowerPlant because
+   it wrapped its tentacles around every limb of PowerPlant.</LI>
+   
+   <LI>4.0 included a new memory management scheme which drastically
+   reduced the amount of memory used by the client. This is why the
+   memory partition of 4.0 is about half of 3.0.</LI>
+   
+   <LI>A version of Navigator sans Mail/News/Composer debuted with
+   4.03, and again two days later with 4.03.1.</LI>
+</UL>
+
+<H3>Future</H3>
+
+<P>There is certainly a lot to do. In order to not duplicate too much
+work (since we are still working on this full time here at Netscape),
+I've put together a list of what we plan on doing and what we want to
+do but probably won't get around to because of time constraints.</P>
+
+<P>Things that we are going to focus on:</P>
+
+<UL>
+   <LI>More NavCenter work</LI>
+   
+   <LI>Solve the issues with too many 'STR ' resources (see note on
+   <A HREF="#Pitfalls">issues page</A>)</LI>
+   
+   <LI>Modularization (HTML display isolated from networking,
+   etc)</LI>
+   
+   <LI>use new Appearance Manager classes in PowerPlant</LI>
+   
+   <LI>Navigation Services (new open/save dialogs in Allegro)
+   support. We have an ancient SDK and have integrated it in a few
+   places, but the current implemenation that we have doesn't work
+   very well. It's cool, though.</LI>
+   
+   <LI>More drag and drop in composer.</LI>
+   
+   <LI>More support for Internet Config (see note on <A HREF="#Pitfalls">issues
+   page</A>).</LI>
+   
+   <LI>external Java VM support (MRJ, etc)</LI>
+</UL>
+
+<P>Things we would like some help on:</P>
+
+<UL>
+   <LI>printing support</LI>
+   
+   <LI>68K version</LI>
+   
+   <LI>Context Menu Manager support</LI>
+   
+   <LI>bug fixes of any kind</LI>
+   
+   <LI>performance tuning of any kind</LI>
+   
+   <LI>getting around the limitation of 255 hierarchical menus
+   imposed by the OS. This would let us do a "real" personal toolbar
+   with folders that have popup menus.</LI>
+   
+   <LI>Fixing the build system so it uses makefiles without having to
+   give up the CW IDE for source browsing/editing.</LI>
+   
+   <LI>better publishing in Composer</LI>
+   
+   <LI>add NavCenter to Composer window</LI>
+   
+   <LI>better table editing in Composer</LI>
+</UL>
+
+<ADDRESS>
+
+<HR>
+
+Mike Pinkerton (<A HREF="mailto:pinkerton@netscape.com">pinkerton@netscape.com</A>)</ADDRESS>
+</BODY>
+</HTML>
+
--- a/README/mozilla/unixbuild.htm
+++ b/README/mozilla/unixbuild.htm
@@ -0,0 +1,82 @@
+<HTML>
+<HEAD>
+<TITLE>Unix Build Instructions</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+
+<H2>
+<FONT FACE="Arial,Helvetica">Unix Build Instructions</FONT></H2>
+This document explains how to build Mozilla for Unix.
+<BR>
+<HR WIDTH="100%">
+<PRE>Requirements:
+
+&nbsp; Memory:
+&nbsp;&nbsp;&nbsp; 32MB of RAM, 128MB of swap, recommended 64MB of RAM.
+
+&nbsp; Tools:
+&nbsp;&nbsp;&nbsp; GNU C/C++ compiler 2.7.2 or better
+&nbsp;&nbsp;&nbsp; GNU make 3.74 or better
+&nbsp;&nbsp;&nbsp; Motif 1.2 (Lesstif has been used with limited success)
+
+&nbsp; Tools that will be helpful later:
+&nbsp;&nbsp;&nbsp; Perl 5.0
+&nbsp;&nbsp;&nbsp; CVS 1.8.1
+&nbsp;&nbsp;&nbsp; RCS
+&nbsp;&nbsp;&nbsp; gdb 4.16
+
+&nbsp; NOTE:
+&nbsp;&nbsp;&nbsp; * gcc version 2.8 has been used successfully.
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Your mileage may vary.
+
+Build:
+
+&nbsp; Untar the tar.gz file with the following (or your favorite variant thereof):
+
+&nbsp;&nbsp;&nbsp; gzip -dc tarball.tar.gz | tar -xvf -
+
+&nbsp; Set the following environment variables:
+&nbsp;&nbsp;&nbsp; csh/tcsh:&nbsp;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setenv NO_SECURITY 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setenv MOZ_MEDIUM 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setenv MOZILLA_CLIENT 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setenv NO_MDUPDATE 1
+
+&nbsp;&nbsp;&nbsp; sh/bash/ksh:
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NO_SECURITY=1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; MOZ_MEDIUM=1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; MOZILLA_CLIENT=1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NO_MDUPDATE=1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; export NO_SECURITY MOZ_MEDIUM MOZILLA_CLIENT NO_MDUPDATE
+
+&nbsp; Debug build is default; optimized build:
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setenv BUILD_OPT 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (BUILD_OPT=1; export BUILD_OPT)
+
+&nbsp; On AIX, <B>ap</B>pend /usr/lpp/xlC/bin to your PATH.
+&nbsp; On Solaris, SINIX, and UnixWare, <B>pre</B>pend /usr/ccs/bin to your PATH.
+
+&nbsp; Build it.&nbsp; Default target is "export libs install":
+&nbsp;&nbsp;&nbsp; cd mozilla
+&nbsp;&nbsp;&nbsp; gmake
+
+NOTE:
+
+If you haven't got perl:
+
+setenv PERL /bin/echo
+
+gmake -e
+
+Run the app:
+&nbsp; Executable lives in mozilla/cmd/xfe/{ARCHITECTURE}.{DBG|OPT}.OBJ
+&nbsp;&nbsp;&nbsp; (e.g. mozilla/cmd/xfe/Linux2.0.31_x86_DBG.OBJ/mozilla-export)
+&nbsp; Statically-linked app is "mozilla-export"
+&nbsp; dynamically-linked app is "moz-export"</PRE>
+
+<HR WIDTH="100%">
+<CENTER><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT></CENTER>
+
+</BODY>
+</HTML>
--- a/README/mozilla/winbuild.htm
+++ b/README/mozilla/winbuild.htm
@@ -0,0 +1,220 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=x-mac-roman">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en]C-NSCP  (WinNT; U) [Netscape]">
+   <META NAME="KeyWords" CONTENT="client, source, documentation">
+   <META NAME="Author" CONTENT="Chris Yeh">
+   <TITLE>WinFE Build Instructions</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+
+<H2>
+<FONT FACE="Arial,Helvetica">WinFE Build Instructions</FONT></H2>
+This document explains how to build Mozilla for the Windows platform. WinFE
+is the Windows front end module.&nbsp;
+<HR><B><FONT SIZE=+1>Required Tools:</FONT></B>
+<UL>
+<LI>
+<B>Microsoft Visual C++ version 4.2 or later</B></LI>
+
+<LI>
+<B>GNU Tools for Windows:</B>You can find these all over the web. Specifically,
+you'll need:</LI>
+
+<PRE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cp.exe
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; rm.exe</PRE>
+
+<UL>Here are some sample download sites to find these:
+<LI>
+<A HREF="http://www.cygnus.com/misc/gnu-win32">Cygnus</A></LI>
+
+<LI>
+<A HREF="http://www.gnu.org/order/ftp.html">GNU home page</A></LI>
+
+<LI>
+<A HREF="ftp://prep.ai.mit.edu/pub/gnu">MIT</A></LI>
+</UL>
+Netscape has internally modified version of gmake, shmsdos and win32gnu
+that we use to get around some problems we were having keeping in sync
+with the Unix version of gmake. This version of gmake and it's source is
+included in the Mozilla source distribution. The specific files pertaining
+to this are:
+<PRE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; gmake.exe
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; shmsdos.exe
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; uname.exe</PRE>
+These are located in the \tools\bin directory of the source package. All
+of these tools need to be put in your path.
+<LI>
+Additionally, there are Netscape-developed tools that need to be built
+prior to your first compile. These are covered in the build section.</LI>
+</UL>
+<B><FONT SIZE=+1>Setting up:</FONT></B>
+<UL>
+<LI>
+You need a Pentium with at least a 133 MHz processor and at least 250 megs
+(NTFS partition) or 500 megs (FAT partition) of hard drive space. You need
+to have a minimum of 64 megs of memory in order to build this tree. Having
+at least 128 megs of memory will make your debugging experience noticeably
+less agonizing</LI>
+
+<LI>
+The preferred platform is NT 4.0. NT 3.51 will also work, and Win95 might
+work if you're lucky. Maybe.</LI>
+
+<LI>
+Install MSVC. If you don't choose to have the MSVC install modify your
+environment variables for PATH, INCLUDE, and LIB information, be sure to
+run VCVARS32.BAT out of the MSVC bin directory prior to attempting to build.</LI>
+
+<LI>
+Download and install GNU tools. Put them in your path.</LI>
+
+<LI>
+Install Mozilla source.</LI>
+
+<LI>
+There are several environment variables you will need to set, either manually
+or via a script within a command session, or by setting them in your system
+environment located through the Control Panel | System icon. Those variables
+are:</LI>
+
+<UL>
+<LI>
+set MOZ_BITS=32</LI>
+
+<LI>
+set MOZ_DEBUG=1 (don't set this if you want to build an optimized release
+build)</LI>
+
+<LI>
+set MOZ_GOLD=1</LI>
+
+<LI>
+set MOZ_MEDIUM=1</LI>
+
+<LI>
+set MOZ_NT=351 (if running NT 3.51, don't set otherwise)</LI>
+
+<LI>
+set MOZ_OUT=(location of resulting executable and totally optional, see
+Notes for more details)</LI>
+
+<LI>
+set MOZ_SRC=(top of your tree, drive letter and path, i.e. set MOZ_SRC=d:\mozilla_src.
+The topmost directory under this should be mozilla)</LI>
+
+<LI>
+set MOZ_TOOLS=(location of the bin directory containing your GNU tools.
+The build looks for MOZ_TOOLS\bin\gmake.exe, so make sure your MOZ_TOOLS
+is figured appropriately)</LI>
+
+<LI>
+set NO_SECURITY=1</LI>
+
+<LI>
+set NSPR20=1</LI>
+
+<LI>
+if you are running VC++ 5.0 or higher: set _MSC_VER=1100</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Building:</FONT></B>
+<UL>
+<LI>
+You need to be running a vanilla command prompt. Other shells may work,
+but you might have to tweak makefiles.</LI>
+
+<LI>
+<B>Build the tools:</B> This generates several tools that handle things
+like dependency generation</LI>
+
+<UL>
+<LI>
+cd mozilla\config</LI>
+
+<LI>
+nmake /f makefile.win</LI>
+</UL>
+
+<LI>
+<B>Build the whole lizard:</B> This will do a complete build of the source
+tree. You will end up with a mozilla.exe at the end.</LI>
+
+<UL>
+<LI>
+cd mozilla</LI>
+
+<LI>
+nmake /f client.mak</LI>
+</UL>
+</UL>
+&nbsp;
+<UL>
+<LI>
+If you want to build communicator a piece at a time, these are the steps
+that client.mak steps through. If you successfully ran the client.mak step
+above, you don't need to do this.</LI>
+
+<LI>
+<B>Build the back end:</B> This builds cross platform components like NSPR
+and the shared library modules. All of the interesting output from this
+part of the build will end up in mozilla\dist, under public\ if it's a library
+header, and under WIN32_D.OBJ\ (or WIN32_O.OBJ\ for an optimized build)
+if it's a dynamic or static library. The exception is the NSPR public headers,
+which live in WIN32_D.OBJ\include.</LI>
+
+<UL>
+<LI>
+cd mozilla</LI>
+
+<LI>
+nmake /f makefile.win</LI>
+</UL>
+
+<LI>
+<B>Build the front end:</B> This builds and links into the final executable,
+mozilla.exe.</LI>
+
+<UL>
+<LI>
+cd mozilla\cmd\winfe\mkfiles32</LI>
+
+<LI>
+nmake /f mozilla.mak DEPEND=1</LI>
+
+<LI>
+nmake /f mozilla.mak</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Notes:</FONT></B>
+<UL>
+<LI>
+MOZ_OUT: If you don't set this, mozilla.exe will be generated into mozilla\cmd\winfe\mkfiles32\x86dbg
+(or x86rel for optimized builds)</LI>
+
+<LI>
+This build process does not use Visual C++ generated project files for
+several reasons having to do with (among other things) size, maintainability,
+and the long term desire to start using more of tools like gmake, or plug
+and play developer tools. This does not preclude you from using the Visual
+C++ IDE, or it's debugger (somebody fill this out with more detail).</LI>
+
+<LI>
+All of the DLLs that you need to run mozilla.exe get copied automagically
+into your output directory as the last part of build, so all you need to
+do is cd into x86dbg and run mozilla.exe to get a runnable browser.</LI>
+
+<LI>
+On a Pentium II 266 MHz machine with 128 megs of memory, it takes approximately
+30 minutes to build. Your mileage may vary.</LI>
+</UL>
+
+<HR WIDTH="100%">
+<CENTER><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT></CENTER>
+&nbsp;
+</BODY>
+</HTML>
--- a/README/mozilla/wininstall.htm
+++ b/README/mozilla/wininstall.htm
@@ -0,0 +1,53 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Chris Yeh">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en]C-NSCP  (WinNT; U) [Netscape]">
+   <TITLE>Running Mozilla...</TITLE>
+</HEAD>
+<BODY>
+
+<H2>
+<FONT FACE="Arial,Helvetica">Running Mozilla Without Trashing Netscape
+Installation</FONT></H2>
+This document explains how to run <TT>mozilla.exe</TT> separately from
+<TT>netscape.exe</TT> without trashing your regular installation of Netscape
+Communicator. This is necessary if, for example, you want to use Communicator's
+mail client while you work on Mozilla development.
+<BR>
+<HR WIDTH="100%">
+<OL>
+<LI>
+Before running <TT>mozilla.exe</TT>, create a new user profile either from
+a Netscape 4.0x installation using the "User Profile Manager" shortcut
+in the Utilities folder (on Windows) or by using&nbsp; the <TT>-new_account</TT>
+option on the command line of either <TT>netscape.exe</TT> or <TT>mozilla.exe</TT>.&nbsp;
+We suggest calling the profile "<TT>mozilla</TT>."</LI>
+
+<LI>
+Always use that new account when running <TT>mozilla.exe</TT>, and never
+run <TT>netscape.exe</TT> using that same account profile.</LI>
+</OL>
+To make things easier, you can start the application with the user account
+on the command line, for example:
+<UL><TT>mozilla.exe -P"mozilla"</TT></UL>
+This assures that prefs and the cache will not interfere between the two
+versions. This will be especially
+<BR>important as new prefs are added to the Mozilla product. Note that
+you must use quotes around the name and there can be no space between the
+"P" and the profile name. Otherwise, the application won't catch the profile
+switch, and it will try to load the profile name as the initial URL.
+
+<P>
+<HR WIDTH="100%">
+<BR>You can copy your <TT>bookmark.htm</TT> file from an existing profile
+to your new profile directory if you want to share bookmarks.
+
+<P>After the initial 3/31 release, we will add some code to Mozilla to
+prevent running with a profile that is already being used by <TT>netscape.exe</TT>.
+<BR>&nbsp;
+<HR WIDTH="100%">
+<BR><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT>
+</BODY>
+</HTML>
--- a/README/nglayout/winbuild.html
+++ b/README/nglayout/winbuild.html
@@ -0,0 +1,184 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=x-mac-roman">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.04 [en] (WinNT; I) [Netscape]">
+   <META NAME="KeyWords" CONTENT="client, source, documentation">
+   <META NAME="Author" CONTENT="Kipp E.B. Hickman">
+   <TITLE>NGLayout Windows Build Instructions</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+
+<H2>
+<FONT FACE="Arial,Helvetica">NGLayout Windows Build Instructions</FONT></H2>
+This document explains how to build NGLayout for the Windows platform.&nbsp;
+<HR><B><FONT SIZE=+1>Required Tools:</FONT></B>
+<UL>
+<LI>
+<B>Microsoft Visual C++ version 4.2 or later</B></LI>
+
+<LI>
+<B>The same set of tools for building <A HREF="http://www.mozilla.org/docs/tplist/catBuild/winbuild.htm">Mozilla</A></B></LI>
+</UL>
+<B><FONT SIZE=+1>Setting up:</FONT></B>
+<UL>
+<LI>
+You need a Pentium with at least a 133 MHz processor and at least 250 megs
+(NTFS partition) or 500 megs (FAT partition) of hard drive space. You need
+to have a minimum of 64 megs of memory in order to build this tree. These
+numbers are approximations.</LI>
+
+<LI>
+The preferred platform is NT 4.0. NT 3.51 will also work, and Win95 might
+work if you're lucky. Maybe.</LI>
+
+<LI>
+Install MSVC. If you don't choose to have the MSVC install modify your
+environment variables for PATH, INCLUDE, and LIB information, be sure to
+run VCVARS32.BAT out of the MSVC bin directory prior to attempting to build.</LI>
+
+<LI>
+Download and install GNU tools. Put them in your path.</LI>
+
+<LI>
+Install NGLayout source.</LI>
+
+<UL>
+<LI>
+cd &lt;your-source-area></LI>
+
+<LI>
+unzip -o -q win-19980415.zip</LI>
+</UL>
+
+<LI>
+There are several environment variables you will need to set, either manually
+or via a script within a command session, or by setting them in your system
+environment located through the Control Panel | System icon.</LI>
+
+
+<P>&nbsp;<B>Note: There is an additional variable for building NGLayout!
+Use this list carefully!</B>
+
+<P>&nbsp;The variables are:
+<UL>
+<LI>
+set MOZ_BITS=32</LI>
+
+<LI>
+set MOZ_DEBUG=1 (don't set this if you want to build an optimized release
+build)</LI>
+
+<LI>
+set MOZ_GOLD=1</LI>
+
+<LI>
+set MOZ_MEDIUM=1</LI>
+
+<LI>
+set MOZ_NT=351 (if running NT 3.51, don't set otherwise)</LI>
+
+<LI>
+set MOZ_OUT=(location of resulting executable and totally optional, see
+Notes for more details)</LI>
+
+<LI>
+set MOZ_SRC=(top of your tree, drive letter and path, i.e. set MOZ_SRC=d:\mozilla_src.
+The topmost directory under this should be mozilla)</LI>
+
+<LI>
+set MOZ_TOOLS=(location of the bin directory containing your GNU tools.
+The build looks for MOZ_TOOLS\bin\gmake.exe, so make sure your MOZ_TOOLS
+is figured appropriately)</LI>
+
+<LI>
+set NO_SECURITY=1</LI>
+
+<LI>
+set NSPR20=1</LI>
+
+<LI>
+if you are running VC++ 5.0 or higher: set _MSC_VER=1100; if you are running
+VC++ 4.2 then set MOZ_VCVER=42</LI>
+
+<LI>
+<B>set STANDALONE_IMAGE_LIB=1</B></LI>
+
+<LI>
+<B>set MODULAR_NETLIB=1</B></LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Building:</FONT></B>
+<UL>
+<LI>
+You need to be running a vanilla command prompt. Other shells may work,
+but you might have to tweak makefiles.</LI>
+
+<LI>
+<B>Build the tools:</B> This generates several tools that handle things
+like dependency generation</LI>
+
+<UL>
+<LI>
+cd mozilla\config</LI>
+
+<LI>
+nmake /f makefile.win</LI>
+</UL>
+
+<LI>
+<B>Build the NGLayout:</B> This will do a complete build of the source
+tree. You will end up with a viewer.exe at the end. The viewer.exe will
+be in your dist\win32_[OD].obj\bin directory (O will be used when you don't
+set MOZ_DEBUG; D will be used when you set MOZ_DEBUG).</LI>
+
+<UL>
+<LI>
+cd mozilla</LI>
+
+<LI>
+nmake /f nglayout.mak</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Running:</FONT></B>
+<UL>
+<LI>
+Once you have built the system, do this to run the viewer program (the
+viewer program is a simple test program that uses the nsIWebWidget API
+to embed a web widget object). The viewer program has a few basic menu
+items, include "Samples" which load sample tests.</LI>
+
+<UL>
+<LI>
+cd mozilla\dist\win32_[OD].obj\bin</LI>
+
+<LI>
+.\viewer.exe</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Notes:</FONT></B>
+<UL>
+<LI>
+This build process does not use Visual C++ generated project files for
+several reasons having to do with (among other things) size, maintainability,
+and the long term desire to start using more of tools like gmake, or plug
+and play developer tools. This does not preclude you from using the Visual
+C++ IDE, or it's debugger. Once you have built a viewer.exe do this to
+run it under the debugger:</LI>
+</UL>
+
+<UL>
+<UL>
+<LI>
+cd mozilla\dist\win32_[OD].obj\bin</LI>
+
+<LI>
+msdev viewer.exe</LI>
+</UL>
+</UL>
+
+<HR WIDTH="100%">
+<CENTER><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT></CENTER>
+&nbsp;
+</BODY>
+</HTML>
--- a/mozilla/CHANGES.html
+++ b/mozilla/CHANGES.html
--- a/mozilla/LEGAL
+++ b/mozilla/LEGAL
@@ -0,0 +1,40 @@
+Please be apprised of the following Legal Notices:
+
+A) The U.S. District Court for the Eastern District of Virginia has
+ruled that the Netscape Navigator code does not infringe Wang's U.S.
+Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
+Videotex as defined by the '669 patent; 2) web servers are not central
+suppliers; and 3) Navigator does not "connect," as defined by the '669
+Patent, to web servers on the Internet. Wang may appeal this decision to
+the Federal Circuit. Wang contended that its Patent disclosing a
+"Videotext" system, is infringed by the following functionality in the
+Netscape Navigator code: 1) the animated logo and status line indicators
+--See Claims 1,8 and 9; 2)  the "File Save As" function --See Claims
+23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
+Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
+extensions --See Claim 38
+
+B)   Intermind owns pending U.S. patent applications on communications
+systems which employ metadata ("channel objects") to define a control
+structure for information transfer.  The Netscape code does not infringe
+as released; however, modifications which utilize channel objects as
+described by Intermind should be considered carefully. The following is
+a statement from Intermind:  "Intermind's claims fundamentally involve
+the use of a control structure to automate communications. ...The
+essence of Intermind's top claim is that two devices sender and
+receiver have persistent storage, communicate over a network,
+and exchange a control structure including metadata which describes: 1)
+what information is to be updated, 2) when to update this information,
+and 3) how to transfer the updated information. In addition, at  least
+the receiving device must be able to process the metadata in order to
+perform the update determination and transfer. Any digital
+communications system which incorporates all of these elements will be
+covered by Intermind's patents."  See Intermind.com.
+
+C) Stac, Inc., and its licensing agent Hi/fn, own several patents which
+disclose data compression methods implementing an LZS compression
+algorithm, including U.S. Patent Nos.  4,701,745 and 5,016, 009 ("the
+Stac Patents").  The Netscape Communicator code  does not perform
+compression. If you modify the Netscape source code to perform
+compression, please take notice of the Stac Patents.
+
--- a/mozilla/LICENSE
+++ b/mozilla/LICENSE
@@ -0,0 +1,421 @@
+                           NETSCAPE PUBLIC LICENSE
+                                Version 1.0
+
+                              ----------------
+
+1. Definitions.
+
+     1.1. ``Contributor'' means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. ``Contributor Version'' means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. ``Covered Code'' means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. ``Executable'' means Covered Code in any form other than Source
+     Code.
+
+     1.6. ``Initial Developer'' means the individual or entity identified as
+     the Initial Developer in the Source Code notice required by Exhibit A.
+
+     1.7. ``Larger Work'' means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. ``License'' means this document.
+
+     1.9. ``Modifications'' means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. ``Original Code'' means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this License
+     is not already Covered Code governed by this License.
+
+     1.11. ``Source Code'' means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus any
+     associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or a list of source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. ``You'' means an individual or a legal entity exercising rights
+     under, and complying with all of the terms of, this License or a future
+     version of this License issued under Section 6.1. For legal entities,
+     ``You'' includes any entity which controls, is controlled by, or is
+     under common control with You. For purposes of this definition,
+     ``control'' means (a) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (b) ownership of fifty percent (50%) or more of the
+     outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Original Code (or portions thereof) with or without
+          Modifications, or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by Initial
+          Developer, to make, have made, use and sell (``Utilize'') the
+          Original Code (or portions thereof), but solely to the extent that
+          any such patent is reasonably necessary to enable You to Utilize
+          the Original Code (or portions thereof) and not to any greater
+          extent that may be necessary to Utilize further Modifications or
+          combinations.
+
+     2.2. Contributor Grant.
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Modifications created by such Contributor (or
+          portions thereof) either on an unmodified basis, with other
+          Modifications, as Covered Code or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by
+          Contributor, to Utilize the Contributor Version (or portions
+          thereof), but solely to the extent that any such patent is
+          reasonably necessary to enable You to Utilize the Contributor
+          Version (or portions thereof), and not to any greater extent that
+          may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be distributed
+     only under the terms of this License or a future version of this
+     License released under Section 6.1, and You must include a copy of this
+     License with every copy of the Source Code You distribute. You may not
+     offer or impose any terms on any Source Code version that alters or
+     restricts the applicable version of this License or the recipients'
+     rights hereunder. However, You may include an additional document
+     offering the additional rights described in Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which you contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that the
+     Modification is derived, directly or indirectly, from Original Code
+     provided by the Initial Developer and including the name of the Initial
+     Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+
+          (a) Third Party Claims.
+          If You have knowledge that a party claims an intellectual property
+          right in particular functionality or code (or its utilization
+          under this License), you must include a text file with the source
+          code distribution titled ``LEGAL'' which describes the claim and
+          the party making the claim in sufficient detail that a recipient
+          will know whom to contact. If you obtain such knowledge after You
+          make Your Modification available as described in Section 3.2, You
+          shall promptly modify the LEGAL file in all copies You make
+          available thereafter and shall take other steps (such as notifying
+          appropriate mailing lists or newsgroups) reasonably calculated to
+          inform those who received the Covered Code that new knowledge has
+          been obtained.
+
+          (b) Contributor APIs.
+          If Your Modification is an application programming interface and
+          You own or control patents which are reasonably necessary to
+          implement that API, you must also include this information in the
+          LEGAL file.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code, and this License in any documentation for the Source Code, where
+     You describe recipients' rights relating to Covered Code. If You
+     created one or more Modification(s), You may add your name as a
+     Contributor to the notice described in Exhibit A. If it is not possible
+     to put such notice in a particular Source Code file due to its
+     structure, then you must include such notice in a location (such as a
+     relevant directory file) where a user would be likely to look for such
+     a notice. You may choose to offer, and to charge a fee for, warranty,
+     support, indemnity or liability obligations to one or more recipients
+     of Covered Code. However, You may do so only on Your own behalf, and
+     not on behalf of the Initial Developer or any Contributor. You must
+     make it absolutely clear than any such warranty, support, indemnity or
+     liability obligation is offered by You alone, and You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     warranty, support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of the
+     Covered Code is available under the terms of this License, including a
+     description of how and where You have fulfilled the obligations of
+     Section 3.2. The notice must be conspicuously included in any notice in
+     an Executable version, related documentation or collateral in which You
+     describe recipients' rights relating to the Covered Code. You may
+     distribute the Executable version of Covered Code under a license of
+     Your choice, which may contain terms different from this License,
+     provided that You are in compliance with the terms of this License and
+     that the license for the Executable version does not attempt to limit
+     or alter the recipient's rights in the Source Code version from the
+     rights set forth in this License. If You distribute the Executable
+     version under a different license You must make it absolutely clear
+     that any terms which differ from this License are offered by You alone,
+     not by the Initial Developer or any Contributor. You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     any such terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to statute
+     or regulation then You must: (a) comply with the terms of this License
+     to the maximum extent possible; and (b) describe the limitations and
+     the code they affect. Such description must be included in the LEGAL
+     file described in Section 3.4 and must be included with all
+     distributions of the Source Code. Except to the extent prohibited by
+     statute or regulation, such description must be sufficiently detailed
+     for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation (``Netscape'') may publish revised
+     and/or new versions of the License from time to time. Each version will
+     be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If you create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), you must (a) rename Your license so that the
+     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+     any confusingly similar phrase do not appear anywhere in your license
+     and (b) otherwise make it clear that your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial Developer,
+     Original Code or Contributor in the notice described in Exhibit A shall
+     not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+     PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+     OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+     GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+     ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+     BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+     EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a ``commercial item,'' as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+     software'' and ``commercial computer software documentation,'' as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if any,
+     provides otherwise), excluding its conflict-of-law provisions. With
+     respect to disputes in which at least one party is a citizen of, or an
+     entity chartered or registered to do business in, the United States of
+     America: (a) unless otherwise agreed in writing, all disputes relating
+     to this License (excepting any dispute relating to intellectual
+     property rights) shall be subject to final and binding arbitration,
+     with the losing party paying all costs of arbitration; (b) any
+     arbitration relating to this Agreement shall be held in Santa Clara
+     County, California, under the auspices of JAMS/EndDispute; and (c) any
+     litigation relating to this Agreement shall be subject to the
+     jurisdiction of the Federal Courts of the Northern District of
+     California, with venue lying in Santa Clara County, California, with
+     the losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The application
+     of the United Nations Convention on Contracts for the International
+     Sale of Goods is expressly excluded. Any law or regulation which
+     provides that the language of a contract shall be construed against the
+     drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     Except in cases where another Contributor has failed to comply with
+     Section 3.4, You are responsible for damages arising, directly or
+     indirectly, out of Your utilization of rights under this License, based
+     on the number of copies of Covered Code you made available, the
+     revenues you received from utilizing such rights, and other relevant
+     factors. You agree to work with affected parties to distribute
+     responsibility on an equitable basis.
+
+AMENDMENTS
+Additional Terms applicable to the Netscape Public License.
+
+     I. Effect.
+     These additional terms described in this Netscape Public License --
+     Amendments shall apply to the Mozilla Communicator client code and to
+     all Covered Code under this License.
+
+     II. ``Netscape's Branded Code'' means Covered Code that Netscape
+     distributes and/or permits others to distribute under one or more
+     trademark(s) which are controlled by Netscape but which are not
+     licensed for use under this License.
+
+     III. Netscape and logo.
+     This License does not grant any rights to use the trademark
+     ``Netscape'', the ``Netscape N and horizon'' logo or the Netscape
+     lighthouse logo, even if such marks are included in the Original Code.
+
+     IV. Inability to Comply Due to Contractual Obligation.
+     Prior to licensing the Original Code under this License, Netscape has
+     licensed third party code for use in Netscape's Branded Code. To the
+     extent that Netscape is limited contractually from making such third
+     party code available under this License, Netscape may choose to
+     reintegrate such code into Covered Code without being required to
+     distribute such code in Source Code form, even if such code would
+     otherwise be considered ``Modifications'' under this License.
+
+     V. Use of Modifications and Covered Code by Initial Developer.
+
+          V.1. In General.
+          The obligations of Section 3 apply to Netscape, except to the
+          extent specified in this Amendment, Section V.2 and V.3.
+
+          V.2. Other Products.
+          Netscape may include Covered Code in products other than the
+          Netscape's Branded Code which are released by Netscape during the
+          two (2) years following the release date of the Original Code,
+          without such additional products becoming subject to the terms of
+          this License, and may license such additional products on
+          different terms from those contained in this License.
+
+          V.3. Alternative Licensing.
+          Netscape may license the Source Code of Netscape's Branded Code,
+          including Modifications incorporated therein, without such
+          additional products becoming subject to the terms of this License,
+          and may license such additional products on different terms from
+          those contained in this License.
+
+     VI. Arbitration and Litigation.
+     Notwithstanding the limitations of Section 11 above, the provisions
+     regarding arbitration and litigation in Section 11(a), (b) and (c) of
+     the License shall apply to all disputes relating to this License.
+
+EXHIBIT A.
+
+     ``The contents of this file are subject to the Netscape Public License
+     Version 1.0 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/NPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is Mozilla Communicator client code, released March
+     31, 1998.
+
+     The Initial Developer of the Original Code is Netscape Communications
+     Corporation. Portions created by Netscape are Copyright (C) 1998
+     Netscape Communications Corporation. All Rights Reserved.
+
+     Contributor(s): ______________________________________.''
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. This is due
+     to time constraints encountered in simultaneously finalizing the
+     License and in preparing the Original Code for release. You should use
+     the text of this Exhibit A rather than the text found in the Original
+     Code Source Code for Your Modifications.]
--- a/mozilla/Makefile
+++ b/mozilla/Makefile
@@ -0,0 +1,83 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= .
+
+NSPRDIR		= nsprpub
+NSPR20		= 1
+MOZILLA_CLIENT	= 1
+
+ifndef NO_MOCHA
+DIRS_JS		= js
+endif
+
+DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom network
+
+ifdef MOZ_NETCAST
+DIRS		+= netcast
+endif
+
+ifdef MOZ_JAVA
+DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
+else
+DIRS		+= sun-java nav-java $(DIRS_JS)
+endif
+
+ifndef NO_SECURITY
+DIRS		+= security
+endif
+
+DIRS		+= modules lib l10n cmd
+
+ifeq ($(STAND_ALONE_JAVA),1)
+DIRS		= config lib/xp $(NSPRDIR) jpeg modules/zlib sun-java ifc js ifc/tools sun-java/java
+endif
+
+include $(DEPTH)/config/rules.mk
+
+export:: $(OBJS)
+
+# Running this rule assembles all the SDK source pieces into dist/sdk.
+# You'll need to run this rule on every platform to get all the
+# binaries (e.g. javah) copied there. You'll also have to do special
+# magic on a Mac.
+sdk-src::
+	$(SDKINSTALL) include/npapi.h $(SDK)/include/
+	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
+	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
+	$(SDKINSTALL) include/jri.h $(SDK)/include/
+	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
+	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
+	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
+	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
+	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
+	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
+	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
+	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
+
+sdk-bin::
+	cd sdk; $(MAKE); cd ..
+	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
--- a/mozilla/build/build_number
+++ b/mozilla/build/build_number
@@ -0,0 +1 @@
+5009808600
--- a/mozilla/build/genrc.sh
+++ b/mozilla/build/genrc.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DATATYPE="$1"
+INFILE="$2"
+
+echo "${DATATYPE} RCDATA"
+sed 's/"/""/g' ${INFILE} | awk 'BEGIN { printf("BEGIN\n") } { printf("\"%s\\r\\n\",\n", $0) } END { printf("\"\\0\"\nEND\n") }'
+
+exit 0
--- a/mozilla/build/hcc
+++ b/mozilla/build/hcc
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# Fix brain-damaged compilers that don't understand -o and -c together
+#
+DASH_C=0
+DASH_O=0
+for i in $*
+do
+   case $i in
+   -c)     DASH_C=1;;
+   -o)     DASH_O=1;;
+   *.c)    C_SRC=$i;;
+   *.s)    S_SRC=$i;;
+   *.o)    OBJECT=$i;;
+   esac
+done
+
+cc $* || exit $?
+
+# if there was no -c and -o we're done
+[ $DASH_C = 1 -a $DASH_O = 1 ] || exit 0
+
+# cc always creates the .o from the .c name
+[ $C_SRC ] && OBJ=`basename $C_SRC .c`.o
+# or the .o from the .s name
+[ $S_SRC ] && OBJ=`basename $S_SRC .s`.o
+
+[ -f $OBJECT ] || [ -f $OBJ ] && mv -f $OBJ $OBJECT 
--- a/mozilla/build/hcpp
+++ b/mozilla/build/hcpp
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# Wrapper for brain-damaged compilers that don't understand -o and -c together.
+#
+
+DUMMY="XxxXxxX"
+DASH_C=0
+DASH_O=0
+GET_OBJECT=0
+C_SRC="${DUMMY}"
+CC_SRC="${DUMMY}"
+CPP_SRC="${DUMMY}"
+S_SRC="${DUMMY}"
+OBJECT="${DUMMY}"
+
+for i in $*
+do
+	if [ ${GET_OBJECT} -eq 1 ]; then
+		OBJECT="$i"
+		GET_OBJECT=0
+	fi
+	case $i in
+		-c)
+			DASH_C=1
+			;;
+		-o)
+			DASH_O=1
+			GET_OBJECT=1
+			;;
+		*.c)
+			C_SRC="$i"
+			;;
+		+.*)
+			;;
+		*.cpp)
+			CPP_SRC="$i"
+			;;
+		*.cc)
+			CC_SRC="$i"
+			;;
+		*.s)
+			S_SRC="$i"
+			;;
+	esac
+done
+
+CC $* || exit $?
+
+# LAME!!!
+if [ -f -O ]; then
+	mv -f -- -O ${OBJECT}
+fi
+
+# if there was no -c and -o we're done
+[ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
+
+# cc always creates the .o from the .c name
+if [ "${C_SRC}" != "${DUMMY}" ]; then
+	OBJ=`basename ${C_SRC} .c`.o
+elif [ "${CPP_SRC}" != "${DUMMY}" ]; then
+	OBJ=`basename ${CPP_SRC} .cpp`.o
+elif [ "${CC_SRC}" != "${DUMMY}" ]; then
+	OBJ=`basename ${CC_SRC} .cc`.o
+# or the .o from the .s name
+elif [ "${S_SRC}" != "${DUMMY}" ]; then
+	OBJ=`basename ${S_SRC} .s`.o
+fi
+
+[ -f ${OBJECT} ] || [ -f ${OBJ} ] && mv -f ${OBJ} ${OBJECT}
--- a/mozilla/build/mac/BuildList.pm
+++ b/mozilla/build/mac/BuildList.pm
@@ -0,0 +1,282 @@
+#!perl
+
+package			BuildList;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla DistMozilla);
+
+=head1 NAME
+
+BuildList - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 SYNOPSIS
+
+...
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+		use Moz;
+
+sub BuildMozilla()
+	{
+		# chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just inside "mozilla"
+
+
+		if ( $main::DEBUG )
+			{
+				$D = "Debug";
+				$dist_dir = ":dist:client_debug:";
+			}
+		else
+			{
+				$D = "";
+				$dist_dir = ":dist:client:";
+			}
+
+			#
+			# Make the project that copies headers. The target is called "Stubs" so that
+			# the AppleScript does a 'remove binaries' on the target first to guarantee
+			# that it builds.
+			#
+		
+		BuildProjectClean(":build:mac:MakeDist.mcp", "Stubs") unless $main::use_DistMozilla;
+		
+			#
+			# Build the appropriate target of each project
+			#
+
+		BuildProjectClean(":lib:mac:NSStdLib:NSStdLib.mcp",										"Stubs");
+		BuildProjectClean(":lib:mac:NSRuntime:NSRuntime.mcp",									"Stubs");
+		BuildProjectClean(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stubs");
+		BuildProjectClean(":cmd:macfe:projects:client:NavigatorStubs.mcp",		"Stubs");
+		
+		BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp",											"NSRuntime$D.shlb");
+		MakeAlias(":lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
+		
+		BuildProject(":cmd:macfe:restext:StringLib.mcp",											"Strings$D.shlb");
+		MakeAlias(":cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
+		
+		BuildProject(":lib:mac:MoreFiles:build:MoreFilesPPC.mcp",							"MoreFiles$D.shlb");
+		MakeAlias(":lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
+		
+		BuildProject(":nsprpub:macbuild:NSPR20PPC.mcp",												"NSPR20$D.shlb");
+		MakeAlias(":nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
+		
+		BuildProject(":dbm:macbuild:DBMPPC.mcp",															"DBM$D.shlb");
+		MakeAlias(":dbm:macbuild:DBM$D.shlb", "$dist_dir");
+		
+		BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",					"MemAllocator$D.shlb");
+		MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
+		
+		BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp",												"NSStdLib$D.shlb");
+		MakeAlias(":lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
+		
+		BuildProject(":modules:security:freenav:macbuild:NoSecurity.mcp",			"NoSecurity$D.shlb");
+		MakeAlias(":modules:security:freenav:macbuild:NoSecurity$D.shlb", "$dist_dir");
+		
+		BuildProject(":xpcom:macbuild:xpcomPPC.mcp",													"xpcom$D.shlb");
+		MakeAlias(":xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
+		
+		BuildProject(":lib:mac:PowerPlant:PowerPlant.mcp",										"PowerPlant$D.shlb");		
+		MakeAlias(":lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
+		
+		BuildProject(":modules:zlib:macbuild:zlib.mcp",												"zlib$D.shlb");
+		MakeAlias(":modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
+		
+		BuildProject(":jpeg:macbuild:JPEG.mcp",																"JPEG$D.shlb");
+		MakeAlias(":jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
+		
+		BuildProject(":sun-java:stubs:macbuild:JavaStubs.mcp",								"JavaRuntime$D.shlb");
+		MakeAlias(":sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");	
+		
+		BuildProject(":js:jsj:macbuild:JSJ_PPC.mcp", 													"JSJ$D.o");
+		
+		BuildProject(":js:macbuild:JavaScriptPPC.mcp",												"JavaScript$D.shlb");
+		MakeAlias(":js:macbuild:JavaScript$D.shlb", "$dist_dir");
+		
+		BuildProject(":nav-java:stubs:macbuild:NavJavaStubs.mcp",							"NavJava$D.shlb");
+		MakeAlias(":nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
+
+		BuildProject(":modules:rdf:macbuild:RDF.mcp", 												"RDF$D.shlb");
+		MakeAlias(":modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
+	
+		BuildProject(":modules:xml:macbuild:XML.mcp",													"XML$D.shlb");
+		MakeAlias(":modules:xml:macbuild:XML$D.shlb", "$dist_dir");
+		
+		BuildProject(":modules:libfont:macbuild:FontBroker.mcp",							"FontBroker$D.o");
+				
+		BuildProject(":modules:schedulr:macbuild:Schedulr.mcp",								"Scheduler$D.shlb");
+		MakeAlias(":modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
+		
+		BuildProject(":network:macbuild:network.mcp",													"Network$D.o");
+		
+		if ( $main::MOZ_LITE == 0 )
+			{
+				BuildProject(":cmd:macfe:Composer:build:Composer.mcp",						"Composer$D.o");
+				
+				# Build the appropriate resources target
+				BuildProject(":cmd:macfe:projects:client:Client.mcp", 						"Moz_Resources");
+			}
+		else
+			{
+				# Build a project with dummy targets to make stub libraries
+				BuildProject("cmd:macfe:projects:dummies:MakeDummies.mcp",				"Composer$D.o");
+				
+				# Build the appropriate resources target
+				BuildProject(":cmd:macfe:projects:client:Client.mcp", 						"Nav_Resources");
+			}
+		
+		BuildProject(":cmd:macfe:projects:client:Client.mcp", 								"Client$D");
+	}
+
+
+
+sub DistMozilla()
+	{
+		#INCLUDE
+		InstallFromManifest(":config:mac:export.mac",			":dist:config:");
+		InstallFromManifest(":include:export.mac",				":dist:include:");
+		InstallFromManifest(":cmd:macfe:pch:export.mac",	":dist:include:");
+
+		#MAC_COMMON
+		InstallFromManifest(":build:mac:export.mac",													":dist:mac:common:");
+		InstallFromManifest(":lib:mac:NSStdLib:include:export.mac",						":dist:mac:common:");
+		InstallFromManifest(":lib:mac:MacMemoryAllocator:include:export.mac",	":dist:mac:common:");
+		InstallFromManifest(":lib:mac:Misc:export.mac",												":dist:mac:common:");
+		InstallFromManifest(":lib:mac:MoreFiles:export.mac",									":dist:mac:common:morefiles:");
+		InstallFromManifest(":cmd:macfe:MANIFEST",														":dist:mac:macfe:");
+
+		#NSPR
+		InstallFromManifest(":nsprpub:pr:include:MANIFEST",					":dist:nspr:");
+		InstallFromManifest(":nsprpub:pr:src:md:mac:export.mac",		":dist:nspr:mac:");
+		InstallFromManifest(":nsprpub:lib:ds:export.mac",						":dist:nspr:");
+		InstallFromManifest(":nsprpub:lib:libc:include:export.mac",	":dist:nspr:");
+		InstallFromManifest(":nsprpub:lib:msgc:include:export.mac",	":dist:nspr:");
+		
+		#DBM
+		InstallFromManifest(":dbm:include:export.mac",	":dist:dbm:");
+		
+		#LIBIMAGE
+		InstallFromManifest(":modules:libimg:png:export.mac",			":dist:libimg:");
+		InstallFromManifest(":modules:libimg:src:export.mac",			":dist:libimg:");
+		InstallFromManifest(":modules:libimg:public:export.mac",	":dist:libimg:");
+		
+		#SECURITY_freenav
+		InstallFromManifest(":modules:security:freenav:export.mac",	":dist:security:");
+		
+		#XPCOM
+		InstallFromManifest(":xpcom:src:export.mac",		":dist:xpcom:");
+		
+		#ZLIB
+		InstallFromManifest(":modules:zlib:src:export.mac",	":dist:zlib:");
+		
+		#JPEG
+		InstallFromManifest(":jpeg:export.mac",	":dist:jpeg:");
+		
+		#JSJ
+		InstallFromManifest(":js:jsj:export.mac",	":dist:jsj:");
+		
+		#JSDEBUG
+		InstallFromManifest(":js:jsd:export.mac",	":dist:jsdebug:");
+		
+		#JS
+		InstallFromManifest(":js:src:export.mac",	":dist:js:");
+		
+		#RDF
+		InstallFromManifest(":modules:rdf:include:export.mac",	":dist:rdf:");
+		
+		#XML
+		InstallFromManifest(":modules:xml:glue:export.mac",						":dist:xml:");
+		InstallFromManifest(":modules:xml:expat:xmlparse:export.mac",	":dist:xml:");
+		
+		#LIBFONT
+		InstallFromManifest(":modules:libfont:MANIFEST",				":dist:libfont:");
+		InstallFromManifest(":modules:libfont:src:export.mac",	":dist:libfont:");
+		
+		#SCHEDULER
+		InstallFromManifest(":modules:schedulr:public:export.mac",	":dist:schedulr:");
+		
+		#NETWORK
+		InstallFromManifest(":network:cache:export.mac",						":dist:network:");
+		InstallFromManifest(":network:client:export.mac",						":dist:network:");
+		InstallFromManifest(":network:cnvts:export.mac",						":dist:network:");
+		InstallFromManifest(":network:cstream:export.mac",					":dist:network:");
+		InstallFromManifest(":network:main:export.mac",							":dist:network:");
+		InstallFromManifest(":network:protocol:about:export.mac",		":dist:network:");
+		InstallFromManifest(":network:protocol:certld:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:dataurl:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:file:export.mac",		":dist:network:");
+		InstallFromManifest(":network:protocol:ftp:export.mac",			":dist:network:");
+		InstallFromManifest(":network:protocol:gopher:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:http:export.mac",		":dist:network:");
+		InstallFromManifest(":network:protocol:js:export.mac",			":dist:network:");
+		InstallFromManifest(":network:protocol:mailbox:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:marimba:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:nntp:export.mac",		":dist:network:");
+		InstallFromManifest(":network:protocol:pop3:export.mac",		":dist:network:");
+		InstallFromManifest(":network:protocol:remote:export.mac",	":dist:network:");
+		InstallFromManifest(":network:protocol:smtp:export.mac",		":dist:network:");
+		
+		#HTML_DIALOGS
+		InstallFromManifest(":lib:htmldlgs:export.mac",	":dist:htmldlgs:");
+		
+		#LAYOUT
+		InstallFromManifest(":lib:layout:export.mac",	":dist:layout:");
+		
+		#LAYERS
+		InstallFromManifest(":lib:liblayer:include:export.mac",	":dist:layers:");
+		
+		#PARSE
+		InstallFromManifest(":lib:libparse:export.mac",	":dist:libparse:");
+		
+		#STYLE
+		InstallFromManifest(":lib:libstyle:export.mac",	":dist:libstyle:");
+		
+		#LIBHOOK
+		InstallFromManifest(":modules:libhook:public:export.mac",	":dist:libhook:");
+		
+		#LIBPREF
+		InstallFromManifest(":modules:libpref:public:export.mac",	":dist:libpref:");
+		
+		#LIBREG
+		InstallFromManifest(":modules:libreg:include:export.mac",	":dist:libreg:");
+		
+		#LIBUTIL
+		InstallFromManifest(":modules:libutil:public:export.mac",	":dist:libutil:");
+		
+		#PROGRESS
+		InstallFromManifest(":modules:progress:public:export.mac",	":dist:progress:");
+		
+		#SOFTUPDATE
+		InstallFromManifest(":modules:softupdt:include:export.mac",	":dist:softupdate:");
+		
+		#NAV_JAVA
+		InstallFromManifest(":nav-java:stubs:macjri:export.mac",	":dist:nav-java:macjri:");
+		InstallFromManifest(":nav-java:stubs:include:export.mac",	":dist:nav-java:");
+		
+		#SUN_JAVA
+		InstallFromManifest(":sun-java:stubs:include:export.mac",	":dist:sun-java:include:");
+		InstallFromManifest(":sun-java:stubs:macjri:export.mac",	":dist:sun-java:macjri:");
+	}
+
+1;
+
+
--- a/mozilla/build/mac/BuildListObsolete.pm
+++ b/mozilla/build/mac/BuildListObsolete.pm
@@ -0,0 +1,143 @@
+#!perl
+
+package			BuildListObsolete;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla);
+
+=head1 NAME
+
+BuildList - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 SYNOPSIS
+
+...
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+
+sub BuildMozilla()
+	{
+		use Moz;
+
+		chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just inside "mozilla"
+
+
+		if ( $main::DEBUG )
+			{
+				$D = " (Debug)";
+				$LibD = "Debug";
+				$dist_dir = ":dist:client_debug:";
+			}
+		else
+			{
+				$D = "";
+				$LibD = "";
+				$dist_dir = ":dist:client:";
+			}
+
+			#
+			# Build the appropriate target of each project
+			#
+
+		BuildProjectClean(":lib:mac:NSStdLib:NSStdLib.mcp",										"Stub Library");
+		BuildProjectClean(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stub Library");
+		BuildProjectClean(":cmd:macfe:projects:client:Navigator.mcp",					"Stub Library");
+		
+		BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp");
+		MakeAlias(":lib:mac:NSRuntime:NSRuntimePPCLib", "$dist_dir");
+		
+		BuildProject(":cmd:macfe:restext:NavStringLibPPC.mcp");
+		MakeAlias(":cmd:macfe:restext:StringsPPCLib", "$dist_dir");
+		
+		BuildProject(":lib:mac:MoreFiles:build:MoreFilesPPC.prj");
+		MakeAlias(":lib:mac:MoreFiles:build:MoreFilesPPC.lib", "$dist_dir");
+		
+		BuildProject(":nsprpub:macbuild:NSPR20PPC".$LibD.".mcp");
+		MakeAlias(":nsprpub:macbuild:NSPR20PPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":dbm:macbuild:DBMPPC".$LibD.".mcp");
+		MakeAlias(":dbm:macbuild:DBMPPC".$LibD."Lib", "${dist_dir}");
+
+		BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",					"PPC Shared Library$D");
+		MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocatorPPC".$LibD."Lib", "$dist_dir");
+			
+		BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp",												"PPC Shared Library");
+		MakeAlias(":lib:mac:NSStdLib:NSStdLibPPCLib", "$dist_dir");
+		
+		BuildProject(":modules:security:freenav:macbuild:NoSecurity.mcp",			"PPC Shared Library$D");
+		MakeAlias(":modules:security:freenav:macbuild:NoSecurity".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":xpcom:macbuild:xpcomPPC".$LibD.".mcp");
+		MakeAlias(":xpcom:macbuild:xpcomPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":lib:mac:PowerPlant:PowerPlant.mcp");		
+		MakeAlias(":lib:mac:PowerPlant:PowerPlantPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":modules:zlib:macbuild:zlib.mcp",												"PPC Shared Library$D");
+		MakeAlias(":modules:zlib:macbuild:zlibPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":jpeg:macbuild:JPEG.mcp",																"PPC Shared Library$D");
+		MakeAlias(":jpeg:macbuild:JPEGPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":sun-java:stubs:macbuild:JavaStubs.mcp",								"PPC Shared Library$D");
+		MakeAlias(":sun-java:stubs:macbuild:JavaRuntimePPC".$LibD."Lib", "$dist_dir");	
+		
+		BuildProject(":js:jsj:macbuild:JSJ_PPC".$LibD.".mcp");
+		
+		BuildProject(":js:macbuild:JavaScriptPPC".$LibD.".mcp");
+		MakeAlias(":js:macbuild:JavaScriptPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":nav-java:stubs:macbuild:NavJavaStubs.mcp",							"PPC Shared Library$D");
+		MakeAlias(":nav-java:stubs:macbuild:NavJavaPPC".$LibD."Lib", "$dist_dir");
+
+		if ( $main::DEBUG )
+			{
+				BuildProject(":modules:rdf:macbuild:RDF.mcp", 										"PPC Shared Library +D -LDAP");
+				MakeAlias(":modules:rdf:macbuild:RDFPPCDebugLib", "${dist_dir}");
+			}
+		else
+			{
+				Moz::BuildProject(":modules:rdf:macbuild:RDF.mcp", 								"PPC Shared Library -LDAP");
+				MakeAlias(":modules:rdf:macbuild:RDFPPCLib", "${dist_dir}");
+			}
+
+		BuildProject(":modules:xml:macbuild:XML.mcp",													"PPC Shared Library$D");
+		MakeAlias(":modules:xml:macbuild:XMLPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":modules:libfont:macbuild:FontBroker.mcp",							"PPC Library$D");
+				
+		BuildProject(":modules:schedulr:macbuild:Schedulr.mcp",								"PPC Shared Library$D");
+		MakeAlias(":modules:schedulr:macbuild:Schedulr".$LibD."PPCLib", "$dist_dir");
+		
+		BuildProject(":network:macbuild:network.mcp",													"PPC Library (Debug Moz)");
+		
+		if ( $main::MOZ_LITE == 0 )
+			{
+				BuildProject(":cmd:macfe:Composer:build:Composer.mcp",						"PPC Library$D");
+			}
+		
+		BuildProject(":cmd:macfe:projects:client:Navigator.mcp", 							"Moz PPC App$D");
+	}
+
+1;
+
+
--- a/mozilla/build/mac/BuildMozilla.pl
+++ b/mozilla/build/mac/BuildMozilla.pl
@@ -0,0 +1,31 @@
+#!perl
+
+	use Moz;
+	use BuildList;
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+$DEBUG = 0;
+$MOZ_LITE = 0;		# build moz medium. This will come from a config file at some stage.
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir(":::");
+
+BuildMozilla();
--- a/mozilla/build/mac/BuildMozilla.pm
+++ b/mozilla/build/mac/BuildMozilla.pm
@@ -0,0 +1,124 @@
+#!perl
+
+package			BuildMozilla;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla);
+
+=head1 NAME
+
+BuildMozilla - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+
+sub BuildMozilla()
+	{
+		use Moz;
+
+		chdir("::::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just above "mozilla"
+
+
+		# Ideally, we would set the target name like so:
+		# $target = $main::DEBUG ? "debug" : "optimized";
+		# ...and all projects would have corresponding targets
+
+
+		$D = $main::DEBUG ? " (Debug)" : "";	# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
+
+
+			#
+			# Build the appropriate target of each project
+			#
+
+		Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              				"Stub Library");
+		Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"Stub Library");
+		Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp",    				"Stub Library");
+
+		Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
+		Moz::BuildProject(":mozilla:cmd:macfe:restext:NavStringLibPPC.mcp");
+		Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.prj");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPCDebug.mcp");
+				Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp");
+				Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              				"PPC Shared Library");
+		Moz::BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	"PPC Shared Library$D");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp");
+		Moz::BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",            			  "PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",                    			  "PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",      				"PPC Shared Library$D");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPCDebug.mcp");
+				Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp");
+				Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",   				"PPC Shared Library$D");
+
+
+		# the following `if' can be fixed when we either rename the debug target of the RDF project, or of all the other projects
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp",               		"PPC Shared Library +D -LDAP");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp",               		"PPC Shared Library -LDAP");
+			}
+
+		Moz::BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",               				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",    				"PPC Library$D");
+		Moz::BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",     				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:network:macbuild:network.mcp",											"PPC Library (Debug Moz)");
+		Moz::BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",   					"PPC Library$D");
+		Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp",   				"Moz PPC App$D");
+	}
+
+1;
+
+
--- a/mozilla/build/mac/BuildMozillaDebug.pl
+++ b/mozilla/build/mac/BuildMozillaDebug.pl
@@ -0,0 +1,31 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 1;
+$MOZ_LITE = 0;		# build moz medium. This will come from a config file at some stage.
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir(":::");
+
+BuildMozilla();
--- a/mozilla/build/mac/CodeWarriorLib
+++ b/mozilla/build/mac/CodeWarriorLib
--- a/mozilla/build/mac/CopyExports.script
+++ b/mozilla/build/mac/CopyExports.script
@@ -0,0 +1,78 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 1
+	echo "CopyExports requires 1 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	Exit 1
+end if
+
+
+Set SourceList "{SourceRootDir}{1}"
+
+Set ScriptsDir "{SourceRootDir}mozilla:build:mac:"
+
+#set sourceList "{SourceRootDir}mozilla:{1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{SourceList}¶""
+	echo "Scripts directory is ¶"{ScriptsDir}¶""
+end if
+
+# for each line in the source file, remove it if it starts with #, otherwise quote it
+
+for curLine in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
+	
+	echo "{curLine}"
+	
+	# ignore empty lines
+	if `evaluate "{{curLine}}" != ""`
+		
+		echo "{curLine}"
+		
+		# strip out trailing comments
+		if `evaluate "{curLine}" =~ /(Å)¨1[ ¶t]+(#Å)¨2/`
+			set sourceLine "{¨1}"
+			# echo "Discarding comment {¨2}"
+		else
+			set sourceLine "{curLine}"
+		end if
+		
+		if `evaluate "{sourceLine}" =~ /([Â ¶t]+)¨1[ ¶t]+[:]*(Å)¨2/`
+		
+			if {verbose}
+				echo "Cur line is {sourceLine}"
+			end if
+		
+			set exportFile "{¨1}"
+			set theTarget "{¨2}"
+			
+			if {verbose}
+				echo "Export file name is {exportFile}"
+				echo "Target directory is {theTarget}"
+			end if
+			
+			"{ScriptsDir}CopyList.script" "{exportFile}" "{theTarget}"
+		
+		end if
+	
+	end if
+
+end for
--- a/mozilla/build/mac/CopyHeaders.script
+++ b/mozilla/build/mac/CopyHeaders.script
@@ -0,0 +1,81 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# To execute this script, select everything from "# Get the..." to 
+# " the end" and hit the Enter key.
+# 
+# Known bugs:
+# 	Header files are always copied if the export.mac file contains
+#	non-local paths.
+#	Spurious output is produced even when verbose is off.
+#
+
+# Uncomment this to get some progress information
+# set -e verbose 1
+
+# Get the root of everything
+
+set magicfilepath "{systempfolder}filepath" # Temporary items folder, "filepath"
+if !`Exists "{{magicFilePath}}"`
+	Echo "No file path file seems to have been created in the temporary items folder."
+	Echo "Was this script executed from the perl script?  That's the way it was designed."
+	Exit 1
+end if
+
+set myDirectory "`catenate "{{magicFilePath}}"`"
+delete -i "{{magicFilePath}}"
+
+Set SourceList "{myDirectory}{1}"
+(Evaluate "{myDirectory}" =~ /(Å:)¨1[Â:]+:[Â:]+:[Â:]+/) #·· dev:null
+Set -e mozillaDir "{¨1}"
+
+if !`Exists "{{mozillaDir}}"`
+	Echo "A file path was passed, but it doesn't seem to be the mozilla directory."
+	Exit 1
+end if
+echo "Mozilla directory found at {mozillaDir}"
+
+#Calculate the root directory by stripping off the leaf name.
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+# the end
--- a/mozilla/build/mac/CopyList.script
+++ b/mozilla/build/mac/CopyList.script
@@ -0,0 +1,97 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 2
+	echo "CopyList requires 2 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	echo "Parameter 2: path relative to {DestRootDir} of the directory where all the"
+	echo "             files are to be copied.  No initial colons!"
+	echo
+	Exit 1
+end if
+
+set debugEcho "" # This setting will actually duplicate the files
+#set debugEcho "echo" # This setting will merely print the "duplicate" commands.
+
+set sourceList "{SourceRootDir}{1}"
+set targetDir "{DestRootDir}{2}"
+
+# targetDir may not end in a colon for this script to work.
+if `Evaluate "{targetDir}" =~ /(Å)¨1:/`
+	#echo "Removed a colon"
+	set targetDir "{¨1}"
+end if
+
+#Ensure the target hierarchy exists
+# Volume name
+(Evaluate "{TargetDir}" =~ /([Â:]+)¨1:Å/) ·· dev:null
+Set PartialPath "{¨1}"
+Loop
+	(Evaluate "{TargetDir}" =~ /("{PartialPath}":[Â:]+)¨1([:]*)¨2Å/) ·· dev:null
+	Set PartialPath "{¨1}"
+	Set Exit 0
+	(NewFolder "{PartialPath}") ·· dev:null
+	Set Exit 1
+	break if "{¨2}" == ""
+End Loop
+
+#Calculate the source directory by stripping off the leaf name.
+(Evaluate "{SourceList}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set SourceDir "{¨1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{sourceList}¶""
+	echo "Source directory is  ¶"{SourceDir}¶""
+	echo "Target directory is ¶"{targetDir}¶""
+end if
+
+# Strip all comment lines, pipe the stripped lines into the "for" loop.
+# We quote each whole line here so that we deal with a line at a time in the
+# for loop. Don't ya just love MPW quoting rulesÉ
+
+for f in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
+	
+	if `evaluate "{{f}}" != ""`
+	
+		# strip out trailing comments (in fact, anything following whitespace)
+		if `evaluate "{f}" =~ /([Â ¶t]+)¨1[ ¶t]+([#]*Å)¨2/`
+			set sourceFile "{¨1}"
+			# echo "Discarding comment {¨2}"
+		else
+			set sourceFile "{f}"
+		end if
+		
+		# sourceFile can be a relative path, so need to get the file name for date comparisons
+		if `evaluate "{sourceFile}" =~ /Å:([Â:]+)¨1/`
+			set filename "{¨1}"
+		else
+			set filename "{sourceFile}"
+		end if
+		
+		# now copy the file if newer
+		if "`Newer "{sourceDir}{sourceFile}" "{targetDir}:{filename}"`" 		#|| !`Exists "{targetDir}:{filename}"`
+			if {verbose} ; echo "{sourceDir}{sourceFile} is newer than {targetDir}:{filename}" ; end if
+			#{debugEcho} duplicate -y "{sourceDir}{sourceFile}" "{targetDir}"
+			{debugEcho} newalias "{sourceDir}{sourceFile}" "{targetDir}:{filename}"
+		end if
+		
+	end if
+	
+end for
--- a/mozilla/build/mac/DoCopyHeaders
+++ b/mozilla/build/mac/DoCopyHeaders
@@ -0,0 +1,69 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# To execute this script, select everything from "# Get the..." to 
+# " the end" and hit the Enter key.
+# 
+# Known bugs:
+#	Spurious output is produced even when verbose is off.
+#
+
+# Uncomment this to get some progress information
+# set -e verbose 1
+
+# Get the root of everything
+
+set moz ""
+loop
+	set mozillaDir `GetFileName -d -m "Please select the ÒmozillaÓ directory"`
+	#set SourceRootDir
+	(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/) #·· dev:null
+	set moz "{¨2}"
+	break if "{moz}" == "mozilla"
+	Alert "Sorry, this only works if you select the folder called ÒmozillaÓ."
+end loop
+
+#Calculate the root directory by stripping off the leaf name.
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+# the end
--- a/mozilla/build/mac/IDE_Options.h
+++ b/mozilla/build/mac/IDE_Options.h
@@ -0,0 +1,94 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+
+	This file overrides all option settings in the IDE.  It is an attempt to allow all builds
+	to have the same options.
+
+	Note: We can't use ConditionalMacros.h in this file because it will conflict with 
+	the PowerPlant precompiled headers.
+
+*/
+
+	/* warning pragmas */
+#pragma warn_hidevirtual 		on
+#pragma warn_emptydecl 			on
+#pragma warn_unusedvar 			on
+#pragma warn_extracomma 		on
+#pragma warn_illpragma 			on
+#pragma warn_possunwant 		on
+#pragma warn_unusedarg 			off		/* turned off to reduce warnings */
+
+#pragma check_header_flags 		on
+
+	/* Language features that must be the same across libraries... */
+#pragma enumsalwaysint			on
+#pragma unsigned_char			off
+#pragma exceptions				on
+#pragma bool 					on
+
+
+	/* Save as much space as possible with strings... */
+#pragma pool_strings				on
+#pragma dont_reuse_strings			off
+
+#pragma options align=native
+#pragma sym 						on				/* Takes no memory.  OK in non-debug. */
+
+
+
+#ifdef powerc /* ...generating PowerPC */
+	#pragma toc_data 				on
+	#pragma fp_contract 			on
+	#pragma readonly_strings 		on
+
+	#ifdef DEBUG
+		#pragma traceback 			on
+		#pragma global_optimizer 	off
+		#pragma scheduling 			off
+		#pragma peephole 			off
+		#pragma optimize_for_size 	off
+	#else
+		#pragma traceback 			off
+		#pragma global_optimizer 	on
+		#pragma optimization_level 	4
+		#pragma scheduling 			604
+		#pragma peephole 			on
+		#pragma optimize_for_size	on
+	#endif
+
+#else /* ...generating 68k */
+	#pragma code68020 			on
+	#pragma code68881 			off
+
+		/* Far everything... */
+	#pragma far_code
+	#pragma far_data 			on
+	#pragma far_strings 		on
+	#pragma far_vtables 		on
+
+	#pragma fourbyteints		on	/* 4-byte ints */
+	#pragma IEEEdoubles			on	/* 8-byte doubles (as required by Java and NSPR) */
+
+	#ifdef DEBUG
+		#pragma macsbug 		on
+		#pragma oldstyle_symbols off
+	#else
+		#pragma macsbug 		off
+	#endif
+#endif
--- a/mozilla/build/mac/MANIFEST
+++ b/mozilla/build/mac/MANIFEST
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+IDE_Options.h
--- a/mozilla/build/mac/MacExportListPublic
+++ b/mozilla/build/mac/MacExportListPublic
@@ -0,0 +1,152 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# This is a list of paths to export.mac files, and destination
+# directories for the copied headers. Destinations are relative
+# to "mozilla:dist".
+
+###################
+# PUBLIC TREE
+###################
+
+#INCLUDE
+mozilla:config:mac:export.mac						:config
+mozilla:include:export.mac							:include
+mozilla:cmd:macfe:pch:export.mac					:include
+
+#MAC_COMMON
+mozilla:build:mac:export.mac						:mac:common
+mozilla:lib:mac:NSStdLib:include:export.mac			:mac:common
+mozilla:lib:mac:MacMemoryAllocator:include:export.mac	:mac:common
+mozilla:lib:mac:Misc:export.mac						:mac:common
+mozilla:lib:mac:MoreFiles:export.mac				:mac:common:morefiles
+mozilla:cmd:macfe:export.mac						:mac:macfe
+
+#NSPR
+mozilla:nsprpub:pr:include:export.mac				:nspr
+mozilla:nsprpub:pr:src:md:mac:export.mac			:nspr:mac
+mozilla:nsprpub:lib:ds:export.mac					:nspr
+mozilla:nsprpub:lib:libc:include:export.mac			:nspr
+mozilla:nsprpub:lib:msgc:include:export.mac			:nspr
+
+#DBM
+mozilla:dbm:include:export.mac						:dbm
+
+#LIBIMAGE
+mozilla:modules:libimg:png:export.mac				:libimg
+mozilla:modules:libimg:src:export.mac				:libimg
+mozilla:modules:libimg:public:export.mac			:libimg
+
+#SECURITY_freenav
+mozilla:modules:security:freenav:export.mac			:security
+
+#XPCOM
+mozilla:xpcom:src:export.mac						:xpcom
+
+#ZLIB
+mozilla:modules:zlib:src:export.mac					:zlib
+
+#JPEG
+mozilla:jpeg:export.mac								:jpeg
+
+#JSJ
+mozilla:js:jsj:export.mac							:jsj
+
+#JSDEBUG
+mozilla:js:jsd:export.mac							:jsdebug
+
+#JS
+mozilla:js:src:export.mac							:js
+
+#RDF
+mozilla:modules:rdf:include:export.mac				:rdf
+
+#XML
+mozilla:modules:xml:glue:export.mac					:xml
+mozilla:modules:xml:expat:xmlparse:export.mac		:xml
+
+#LIBFONT
+mozilla:modules:libfont:public:export.mac			:libfont
+mozilla:modules:libfont:src:export.mac				:libfont
+
+#SCHEDULER
+mozilla:modules:schedulr:public:export.mac			:schedulr
+
+#NETWORK
+mozilla:network:cache:export.mac					:network
+mozilla:network:client:export.mac					:network
+mozilla:network:cnvts:export.mac					:network
+mozilla:network:cstream:export.mac					:network
+mozilla:network:main:export.mac						:network
+mozilla:network:protocol:about:export.mac			:network
+mozilla:network:protocol:certld:export.mac			:network
+mozilla:network:protocol:dataurl:export.mac			:network
+mozilla:network:protocol:file:export.mac			:network
+mozilla:network:protocol:ftp:export.mac				:network
+mozilla:network:protocol:gopher:export.mac			:network
+mozilla:network:protocol:http:export.mac			:network
+mozilla:network:protocol:js:export.mac				:network
+mozilla:network:protocol:mailbox:export.mac			:network
+mozilla:network:protocol:marimba:export.mac			:network
+mozilla:network:protocol:nntp:export.mac			:network
+mozilla:network:protocol:pop3:export.mac			:network
+mozilla:network:protocol:remote:export.mac			:network
+mozilla:network:protocol:smtp:export.mac			:network
+
+#HTML_DIALOGS
+mozilla:lib:htmldlgs:export.mac						:htmldlgs
+
+#LAYOUT
+mozilla:lib:layout:export.mac						:layout
+
+#LAYERS
+mozilla:lib:liblayer:include:export.mac				:layers
+
+#PARSE
+mozilla:lib:libparse:export.mac						:libparse
+
+#STYLE
+mozilla:lib:libstyle:export.mac						:libstyle
+
+#LIBHOOK
+mozilla:modules:libhook:public:export.mac			:libhook
+
+#LIBPREF
+mozilla:modules:libpref:public:export.mac			:libpref
+
+#LIBREG
+mozilla:modules:libreg:include:export.mac			:libreg
+
+#LIBUTIL
+mozilla:modules:libutil:public:export.mac			:libutil
+
+#OJI
+mozilla:modules:oji:src:export.mac					:oji
+
+#PROGRESS
+mozilla:modules:progress:public:export.mac			:progress
+
+#SOFTUPDATE
+mozilla:modules:softupdt:include:export.mac			:softupdate
+
+#NAV_JAVA
+mozilla:nav-java:stubs:macjri:export.mac			:nav-java:macjri
+mozilla:nav-java:stubs:include:export.mac			:nav-java
+
+#SUN_JAVA
+mozilla:sun-java:stubs:include:export.mac			:sun-java:include
+mozilla:sun-java:stubs:macjri:export.mac			:sun-java:macjri
--- a/mozilla/build/mac/MakeDist.mcp
+++ b/mozilla/build/mac/MakeDist.mcp
--- a/mozilla/build/mac/Moz.pm
+++ b/mozilla/build/mac/Moz.pm
@@ -0,0 +1,353 @@
+=head1 NAME
+
+B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular activities related to building Mozilla
+
+=head1 SYNOPSIS
+
+    use Moz;
+
+    OpenErrorLog(":::BuildLog");
+    StopForErrors();
+
+    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
+    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
+
+    DontStopForErrors();
+
+    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
+
+=head1 DESCRIPTION
+
+B<Moz> comprises the routines needed to slap CodeWarrior around, force it to build a sequence of projects, report the results, and a few other things.
+
+=cut
+
+
+
+
+package			Moz;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildProject BuildProjectClean OpenErrorLog MakeAlias StopForErrors DontStopForErrors InstallFromManifest);
+@EXPORT_OK	= qw(CloseErrorLog UseCodeWarriorLib);
+
+	use Cwd;
+	use File::Path;
+	use ExtUtils::Manifest 'maniread';
+
+sub current_directory()
+	{
+		my $current_directory = cwd();
+		chop($current_directory) if ( $current_directory =~ m/:$/ );
+		return $current_directory;
+	}
+
+sub full_path_to($)
+	{
+		my ($path) = @_;
+		if ( $path =~ m/^[^:]+$/ )
+			{
+				$path = ":" . $path;
+			}
+
+		if ( $path =~ m/^:/ )
+			{
+				$path = current_directory() . $path;
+			}
+
+		return $path;
+	}
+
+=head2 Setup
+
+Pretty much, everything is taken care of for you.
+  However, B<Moz> does use a little compiled AppleScript library (the file CodeWarriorLib) for some of its communcication with CodeWarrior.
+  If this library isn't in the same directory as "Moz.pm", then you need to tell B<Moz> where to find it.
+  Call C<UseCodeWarriorLib($path_to_CodeWarriorLib)>.
+  This routine is not exported by default, nor are you likely to need it.
+
+=cut
+
+sub UseCodeWarriorLib($)
+	{
+		($CodeWarriorLib) = @_;
+		$CodeWarriorLib = full_path_to($CodeWarriorLib);
+	}
+
+sub activate_CodeWarrior()
+	{
+MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+	tell (load script file "$CodeWarriorLib") to ActivateCodeWarrior()
+END_OF_APPLESCRIPT
+	}
+
+BEGIN
+	{
+		UseCodeWarriorLib(":CodeWarriorLib");
+		activate_CodeWarrior();
+	}
+
+$logging								= 0;
+$recent_errors_file			= "";
+$stop_on_1st_error			= 1;
+
+
+
+
+=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
+
+The warnings and errors generated in the course of building projects can be logged to a file.
+Tinderbox uses this facility to show why a remote build failed.
+
+Logging is off by default.
+  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
+  Stop with C<CloseErrorLog()>.
+  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
+  C<CloseErrorLog()> is not exported by default. 
+
+=cut
+
+sub CloseErrorLog()
+	{
+		if ( $logging )
+			{
+				close(ERROR_LOG);
+				$logging = 0;
+				StopForErrors() if $stop_on_1st_error;
+			}
+	}
+
+
+
+sub OpenErrorLog($)
+	{
+		my ($log_file) = @_;
+
+		CloseErrorLog();
+		if ( $log_file )
+			{
+				$log_file = full_path_to($log_file);
+
+				open(ERROR_LOG, ">$log_file");
+
+				$log_file =~ m/.+:(.+)/;
+				$recent_errors_file = full_path_to("$1.part");
+				$logging = 1;
+			}
+	}
+
+
+=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
+
+When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
+  By default, your build script will C<die> after the first project that generates an error while building.
+  Change this behavior with C<DontStopForErrors()>.
+  Re-enable it with C<StopForErrors()>.
+
+=cut
+
+sub StopForErrors()
+	{
+		$stop_on_1st_error = 1;
+		
+			# Can't stop for errors unless we notice them.
+			# Can't notice them unless we are logging.
+			# If the user didn't explicitly request logging, log to a temporary file.
+
+		if ( ! $recent_errors_file )
+			{
+				OpenErrorLog("${TMPDIR}BuildResults");
+			}
+	}
+
+sub DontStopForErrors()
+	{
+		$stop_on_1st_error = 0;		
+	}
+
+sub log_message($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				print ERROR_LOG $message;
+			}
+	}
+
+sub log_message_with_time($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				my $time_stamp = localtime();
+				log_message("$message ($time_stamp)\n");
+			}
+	}
+
+sub log_recent_errors($)
+	{
+		my ($project_name) = @_;
+		my $found_errors = 0;
+
+		if ( $logging )
+			{
+				open(RECENT_ERRORS, "<$recent_errors_file");
+
+				while( <RECENT_ERRORS> )
+					{
+						if ( /^Error/ || /^CouldnÕt find project file/ )
+							{
+								$found_errors = 1;
+							}
+						print ERROR_LOG $_;
+					}
+
+				close(RECENT_ERRORS);
+				unlink("$recent_errors_file");
+			}
+
+		if ( $stop_on_1st_error && $found_errors )
+			{
+				print ERROR_LOG "### Build failed.\n";
+				die "### Errors encountered building \"$project_name\".\n";
+			}
+	}
+
+sub build_project($$$)
+	{
+		my ($project_path, $target_name, $clean_build) = @_;
+		$project_path = full_path_to($project_path);
+
+		$project_path =~ m/.+:(.+)/;
+		my $project_name = $1;
+
+		log_message_with_time("### Building \"$project_path\"");
+
+		$had_errors =
+MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
+END_OF_APPLESCRIPT
+
+			# Append any errors to the globally accumulated log file
+		if ( $had_errors )
+			{
+				log_recent_errors($project_path);
+			}
+	}
+
+=head2 Getting CodeWarrior to build projects - C<BuildProject($project, $opt_target)>, C<BuildProjectClean($project, $opt_target)>
+
+C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latter first removes object code.
+  In both, CodeWarrior opens the project if it wasn't already open; builds the given (or else current) target; and finally closes
+ the project, if it wasn't already open.
+
+=cut
+
+sub BuildProject($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, "false");
+	}
+
+sub BuildProjectClean($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, "true");
+	}
+
+
+=head2 Miscellaneous
+
+C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
+
+=cut
+
+sub MakeAlias($$)
+	{
+		my ($old_file, $new_file) = @_;
+
+			# if the directory to hold $new_file doesn't exist, create it
+		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
+			{
+				mkpath($1);
+			}
+
+			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
+		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
+			{
+				$new_file .= $1;
+			}
+
+		my $message = "Can't create a Finder alias (at \"$new_file\") for \"$old_file\";";
+		# die "$message symlink doesn't work on directories.\n" if -d $old_file;
+		die "$message because \"$old_file\" doesn't exit.\n" unless -e $old_file;
+
+		unlink $new_file;
+		# print "symlink(\"$old_file\", \"$new_file\");\n";
+		symlink($old_file, $new_file) || die "$message symlink returned an unexpected error.\n";
+	}
+
+=pod
+
+C<InstallFromManifest()>
+
+=cut
+
+sub InstallFromManifest($;$)
+	{
+		my ($manifest_file, $dest_dir) = @_;
+
+		$dest_dir ||= ":";
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		my $read = maniread(full_path_to($manifest_file));
+		foreach $file (keys %$read)
+			{
+				next unless $file;
+
+				$subdir = ":";
+				if ( $file =~ /:.+:/ )
+					{
+						$subdir = $&;
+					}
+
+				$file = ":$file" unless $file =~ m/^:/;
+				MakeAlias("$source_dir$file", "$dest_dir$subdir");
+			}
+	}
+
+
+
+1;
+
+=head1 AUTHORS
+
+Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>
+
+=head1 SEE ALSO
+
+BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
--- a/mozilla/build/mac/NSCrossProductDefines.h
+++ b/mozilla/build/mac/NSCrossProductDefines.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#error "DonÕt use me!"
+
+#define OLDROUTINELOCATIONS 0
+#define XP_MAC 1
+#ifndef NSPR20
+#define NSPR20 1
+#endif
+#define _NSPR 1
+#define _NO_FAST_STRING_INLINES_ 1
+#define HAVE_BOOLEAN 1
+#define NETSCAPE 1
+#define OTUNIXERRORS 1		/* We want OpenTransport error codes */
+
+#define OJI 1
+#define MOCHA 1
+
+/*
+	This compiles in heap dumping utilities and other good stuff
+ for developers -- maybe we only want it in for a special SDK
+ nspr/java runtime(?):
+*/
+#define DEVELOPER_DEBUG 1
+
+#define	MAX(_a,_b)	((_a) < (_b) ? (_b) : (_a))
+#define	MIN(_a,_b)	((_a) < (_b) ? (_a) : (_b))
--- a/mozilla/build/mac/RunTSScript
+++ b/mozilla/build/mac/RunTSScript
--- a/mozilla/build/mac/TinderboxMozilla.pl
+++ b/mozilla/build/mac/TinderboxMozilla.pl
@@ -0,0 +1,12 @@
+#!perl
+
+	use Moz;
+	use BuildList;		# will be BuildList when we switch to the new world
+
+$DEBUG = 1;
+$MOZ_LITE = 0;		# build moz medium. This will come from a config file at some stage.
+Moz::OpenErrorLog("::::Mozilla.BuildLog");
+
+chdir(":::");
+
+BuildMozilla();
--- a/mozilla/build/mac/export.mac
+++ b/mozilla/build/mac/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+IDE_Options.h
--- a/mozilla/build/mac/makedist.xps
+++ b/mozilla/build/mac/makedist.xps
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+	The only job of this file is for make dependencies:
+	include files here that you want to cause MakeDist
+	to happen again when they change.
+*/
+
+
+#include "MacExportListPublic"
--- a/mozilla/build/mac/makedist.xps_Make
+++ b/mozilla/build/mac/makedist.xps_Make
@@ -0,0 +1,76 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# 
+# Known bugs:
+# 	Header files are always copied if the export.mac file contains
+#	non-local paths.
+#	Spurious output is produced even when verbose is off.
+#
+
+set echo 0
+
+Evaluate % = ("{{SourceFile}}" =~ /(Å:)¨0Å/)
+Directory "{{¨0}}"
+
+set mozillaDir "{¨0}"
+if `evaluate "{mozillaDir}" =~ /(Å:)¨1[Â:]+:[Â:]+:/`
+	set -e mozillaDir "{¨1}"
+else
+	echo "Failed to find mozilla directory. Exitting"
+	exit 1;
+end if
+
+# Sanity check for mozilla
+
+if !`exists -d "{mozillaDir}"`
+	echo "Failed to find mozilla directory. Exitting"
+	exit 1;
+end if
+
+# Calculate the root directory by stripping off the leaf name.
+
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/)
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+# Now do the grunt work of copying headers. This can take some time
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+
--- a/mozilla/client.mak
+++ b/mozilla/client.mak
@@ -0,0 +1,259 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+# Enable builds on any drive if defined.
+!if !defined(MOZ_SRC)
+MOZ_SRC=y:
+!endif
+
+# Enable builds from user defined top level directory.
+!if !defined(MOZ_TOP)
+MOZ_TOP=mozilla
+!endif
+
+#//------------------------------------------------------------------------
+#// Defines specific to MOZ_NGLAYOUT
+#//------------------------------------------------------------------------
+!if defined(MOZ_NGLAYOUT)
+NGLAYOUT_MAKEFILE=nglayout.mak
+
+CVSCO = cvs -q co -P
+
+# Branch tags we use
+NETLIB_BRANCH = MODULAR_NETLIB_BRANCH
+MOZNGLAYOUT_BRANCH = RAPTOR_INTEGRATION0_BRANCH
+
+# CVS commands to pull the appropriate branch versions
+CVSCO_NETLIB = $(CVSCO) -r $(NETLIB_BRANCH)
+
+# If MOZ_BRANCH is set from the user's environment, it will be ignored.
+MOZ_BRANCH=$(MOZNGLAYOUT_BRANCH)
+!endif
+
+
+#//------------------------------------------------------------------------
+#// Figure out how to do the pull.
+#//------------------------------------------------------------------------
+!if "$(MOZ_BRANCH)" != ""
+CVS_BRANCH=-r $(MOZ_BRANCH)
+HAVE_BRANCH=1
+!else
+HAVE_BRANCH=0
+!endif
+
+!if "$(MOZ_DATE)" != ""
+CVS_BRANCH=-D "$(MOZ_DATE)"
+HAVE_DATE=1
+!else
+HAVE_DATE=0
+!endif
+
+!if $(HAVE_DATE) && $(HAVE_BRANCH)
+ERR_MESSAGE=$(ERR_MESSAGE)^
+Cannot specify both MOZ_BRANCH and MOZ_DATE
+!endif
+
+NMAKE=@nmake -nologo -$(MAKEFLAGS)
+
+#//------------------------------------------------------------------------
+#//
+#// Stuff a do complete pull and build
+#//
+#//------------------------------------------------------------------------
+
+default:: 		build_all
+
+pull_and_build_all::     pull_all    \
+			    build_all
+
+#// Do this when you pull a new tree, or else you will often get bugs
+#// when replaceing an old dist with a new dist.
+
+pull_clobber_build_all:: pull_all \
+			clobber_all \
+			build_all
+
+clobber_build_all:: 	clobber_all \
+			build_all
+
+!if defined(MOZ_NGLAYOUT)
+# Not very efficient, pull_raptor and pull_netlib will repull 
+pull_all:: pull_client_source_product pull_raptor pull_netlib
+!else
+pull_all:: pull_client_source_product 
+!endif
+
+!if defined(MOZ_NGLAYOUT)
+pull_raptor:
+	@cd $(MOZ_SRC)
+	$(CVSCO) $(MOZ_TOP)/raptor.mak
+	@cd $(MOZ_SRC)/$(MOZ_TOP)
+	$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_xpcom pull_imglib pull_raptor
+
+pull_netlib:
+	@cd $(MOZ_SRC)\.
+	$(CVSCO_NETLIB) $(MOZ_TOP)/lib/xp
+	$(CVSCO_NETLIB) $(MOZ_TOP)/lib/libnet
+	$(CVSCO_NETLIB) $(MOZ_TOP)/include/net.h $(MOZ_TOP)/include/npapi.h
+!endif
+
+pull_client_source_product:
+    @echo +++ client.mak: checking out the client with "$(CVS_BRANCH)"
+    cd $(MOZ_SRC)\.
+    -cvs -q co $(CVS_BRANCH)      MozillaSourceWin
+
+
+!if defined(MOZ_NGLAYOUT)
+# Build Raptor first.
+build_all:  build_raptor \
+			build_dist  \
+			build_client
+!else
+build_all:  build_dist  \
+			build_client
+!endif
+
+!if defined(MOZ_NGLAYOUT)
+build_raptor: 
+	cd $(MOZ_SRC)\$(MOZ_TOP)
+	$(NMAKE) -f $(NGLAYOUT_MAKEFILE) STANDALONE_IMAGE_LIB=1 MODULAR_NETLIB=1 NGLAYOUT_BUILD_PREFIX=1
+!endif
+
+build_dist:
+    @echo +++ client.mak: building dist
+    cd $(MOZ_SRC)\$(MOZ_TOP)
+    $(NMAKE) -f makefile.win
+
+
+build_client:
+    @echo +++ client.mak: building client
+    cd $(MOZ_SRC)\$(MOZ_TOP)\cmd\winfe\mkfiles32
+!if "$(MOZ_BITS)" == "16"
+    $(NMAKE) -f mozilla.mak exports
+!endif
+    $(NMAKE) -f mozilla.mak DEPEND=1
+    $(NMAKE) -f mozilla.mak
+
+
+#
+# remove all source files from the tree and print a report of what was missed
+#
+!if defined(MOZ_NGLAYOUT)
+clobber_all:: clobber_moz clobber_raptor
+!else
+clobber_all:: clobber_moz
+!endif
+
+clobber_moz:
+    cd $(MOZ_SRC)\$(MOZ_TOP)
+    $(NMAKE) -f makefile.win clobber_all
+    cd $(MOZ_SRC)\$(MOZ_TOP)\cmd\winfe\mkfiles32
+    $(NMAKE) -f mozilla.mak clobber_all
+!if !defined(MOZ_MEDIUM)
+    cd $(MOZ_SRC)\$(MOZ_TOP)\netsite\ldap\libraries\msdos\winsock
+    $(NMAKE) -f nsldap.mak clobber_all
+!endif
+
+!if defined(MOZ_NGLAYOUT)
+clobber_raptor:
+	cd $(MOZ_SRC)\$(MOZ_TOP)
+	$(NMAKE) -f $(NGLAYOUT_MAKEFILE) STANDALONE_IMAGE_LIB=1 NGLAYOUT=1 clobber	
+!endif
+
+depend:
+    -del /s /q make.dep
+    $(NMAKE) -f makefile.win depend 
+
+#//------------------------------------------------------------------------
+#// Utility stuff...
+#//------------------------------------------------------------------------
+
+#//------------------------------------------------------------------------
+# Verify that MOZ_SRC is set correctly
+#//------------------------------------------------------------------------
+# Check to see if it is set at all
+
+!if "$(MOZ_SRC)"!=""
+
+#
+# create a temp file at the root and make sure it is visible from MOZ_SRC
+#
+!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
+!endif
+
+!if !EXIST( $(MOZ_SRC)\$(MOZ_TOP)\xyzzy.tmp )
+ERR_MESSAGE=$(ERR_MESSAGE)^
+MOZ_SRC isn't set correctly: [$(MOZ_SRC)\$(MOZ_TOP)]!=[$(MAKEDIR)]
+!endif
+
+!if [del $(MAKEDIR)\xyzzy.tmp]
+!endif
+
+!else
+# MOZ_SRC isn't set at all
+ERR_MESSAGE=$(ERR_MESSAGE)^
+Environment variable MOZ_SRC isn't set.
+!endif
+
+#//------------------------------------------------------------------------
+# Verify that MOZ_BITS is set
+#//------------------------------------------------------------------------
+!if !defined(MOZ_BITS)
+ERR_MESSAGE=$(ERR_MESSAGE)^
+Environment variable MOZ_BITS isn't set.
+!endif
+
+!if !defined(MOZ_TOOLS)
+ERR_MESSAGE=$(ERR_MESSAGE)^
+Environment variable MOZ_TOOLS isn't set.
+!endif
+
+
+#//------------------------------------------------------------------------
+#// Display error 
+#//------------------------------------------------------------------------
+
+
+!if "$(ERR_MESSAGE)" != ""
+ERR_MESSAGE = ^
+client.mak:  ^
+$(ERR_MESSAGE) ^
+^
+client.mak: usage^
+^
+nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
+		    [MOZ_DATE=<cvs_date>]^
+		    [pull_and_build_all]^
+		    [pull_all]^
+		    [pull_dist]^
+		    [pull_client]^
+		    [build_all]^
+		    [build_dist]^
+		    [build_ldap]^
+		    [build_client]^
+^
+Environment variables:^
+^
+MOZ_BITS    set to either 32 or 16 ^
+MOZ_SRC     set to the directory above $(MOZ_TOP) or "$(MAKEDIR)\.."^
+MOZ_TOOLS   set to the directory containing the java compiler see ^
+		http://warp/tools/nt^
+JAVA_HOME   set to the same thing as MOZ_TOOLS^
+CVSROOT     set to the public mozilla cvs server^
+
+!ERROR $(ERR_MESSAGE)
+
+!endif
+
--- a/mozilla/cmd/Makefile
+++ b/mozilla/cmd/Makefile
@@ -0,0 +1,21 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH	= ..
+DIRS	= xfe patcher
+
+include $(DEPTH)/config/rules.mk
--- a/mozilla/cmd/dialup/as_html/1step.htm
+++ b/mozilla/cmd/dialup/as_html/1step.htm
@@ -0,0 +1,57 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="1step.js"></SCRIPT>
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js"></LINK>
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="1step100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<P CLASS="title"><B>Connecting to the Internet <BR>account server...</B></P>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH=500>
+<TR>
+</TR>
+</TABLE>
+<SPACER TYPE=HORIZONTAL SIZE=42>
+<APPLET ARCHIVE="asw.jar" CODE="netscape/asw/CPGeneratorProgress.class" HEIGHT=140 WIDTH=400></APPLET>
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/1step.js
+++ b/mozilla/cmd/dialup/as_html/1step.js
@@ -0,0 +1,242 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+var	globals = parent.parent.globals;
+var plugin = globals.document.setupPlugin;
+var documentVars = globals.document.vars;
+
+function go( msg )
+{
+	parent.parent.globals.debug( "1step go" );
+	
+	if ( parent.parent.globals.document.vars.editMode.value == "yes" )
+		return true;
+	else
+		return checkData();
+}
+
+function checkData()
+{
+	return true;
+}
+
+function configureDialer( configFolder, acctSetupIni, regFile )
+{
+	globals.debug( "Configuring dialer" );
+
+	var		intlFlag = globals.GetNameValuePair( acctSetupIni, "Mode Selection", "IntlMode" );
+	intlFlag = intlFlag.toLowerCase();
+	
+	// * determine name of scripting file
+	var		scriptEnabledFlag = "FALSE";
+	var		scriptFile = globals.GetNameValuePair( regFile, "Dial-In Configuration", "ScriptFileName" );
+	if ( scriptFile != null && scriptFile != "" )
+	{
+		scriptFile = configFolder + scriptFile;
+		scriptEnabledFlag = "TRUE";
+	}
+	else
+	{
+		scriptFile = "";
+		scriptEnabledFlag = "FALSE";
+	}
+
+	// * determine tty
+	var 	ttyFlag = globals.GetNameValuePair( regFile, "Security", "SecurityDevice" );
+	ttyFlag = ttyFlag.toLowerCase();
+	if ( ttyFlag == "yes" )
+		ttyFlag = "TRUE";
+	else
+		ttyFlag = "FALSE";
+
+	
+	// * determine outside line access string
+	var		outsideLineAccessStr = "";
+	if ( documentVars.prefixData.value != "" )
+	{
+		outsideLineAccessStr = documentVars.prefixData.value;
+		x = outsideLineAccessStr.indexOf( "," );
+		if ( x < 0 )
+			outsideLineAccessStr = outsideLineAccessStr + ",";
+	}
+
+
+	// * configure dialer for Registration Server
+	dialerData = plugin.newStringArray( 28 );		// increment this # as new dialer strings are added
+	dialerData[ 0 ]  = "FileName=" + regFile;
+	dialerData[ 1 ]  = "AccountName=" + globals.GetNameValuePair( regFile, "Dial-In Configuration", "SiteName" );
+	dialerData[ 2 ]  = "ISPPhoneNum=" + globals.GetNameValuePair( regFile, "Dial-In Configuration", "Phone" );
+	dialerData[ 3 ]  = "LoginName=" + globals.GetNameValuePair( regFile, "Dial-In Configuration", "Name" );
+	dialerData[ 4 ]  = "Password=" + globals.GetNameValuePair( regFile, "Dial-In Configuration", "Password" );
+	dialerData[ 5 ]  = "DNSAddress=" + globals.GetNameValuePair( regFile, "IP", "DNSAddress" );
+	dialerData[ 6 ]  = "DNSAddress2=" + globals.GetNameValuePair( regFile, "IP", "DNSAddress2" );
+	dialerData[ 7 ]  = "DomainName=" + globals.GetNameValuePair( regFile, "IP", "DomainName" );
+	dialerData[ 8 ]  = "IPAddress=" + globals.GetNameValuePair( regFile, "IP", "IPAddress" );
+	dialerData[ 9 ]  = "IntlMode=" + ( ( intlFlag == "yes" ) ? "TRUE" : "FALSE" );
+	dialerData[ 10 ] = "DialOnDemand=TRUE";
+	dialerData[ 11 ] = "ModemName=" + globals.document.vars.modem.value;
+	dialerData[ 12 ] = "ModemType=" + plugin.GetModemType( documentVars.modem.value );
+	dialerData[ 13 ] = "DialType=" + documentVars.dialMethod.value;
+	dialerData[ 14 ] = "OutsideLineAccess=" + outsideLineAccessStr;
+	dialerData[ 15 ] = "DisableCallWaiting=" + ( ( documentVars.cwData.value != "" ) ? "TRUE" : "FALSE" );
+	dialerData[ 16 ] = "DisableCallWaitingCode=" + documentVars.cwData.value;
+	dialerData[ 17 ] = "UserAreaCode=" + documentVars.modemAreaCode.value;				// XXX what to do if international mode?
+	dialerData[ 18 ] = "CountryCode=" + documentVars.countryCode.value;
+	dialerData[ 19 ] = "LongDistanceAccess=1";									// XXX
+	dialerData[ 20 ] = "DialAsLongDistance=TRUE";									// XXX
+	dialerData[ 21 ] = "DialAreaCode=TRUE";										// XXX
+	dialerData[ 22 ] = "ScriptEnabled=" + scriptEnabledFlag;
+	dialerData[ 23 ] = "ScriptFileName=" + scriptFile;
+	dialerData[ 24 ] = "NeedsTTYWindow=" + ttyFlag;
+	dialerData[ 25 ] = "Location=Home";
+ 	dialerData[ 26 ] = "DisconnectTime=" + globals.GetNameValuePair( acctSetupIni, "Mode Selection", "Dialer_Disconnect_After" );
+	dialerData[ 27 ] = "Path=Server";
+
+	// * write out dialer data to Java Console
+	if ( documentVars.debugMode.value.toLowerCase() == "yes" )
+	{
+		globals.debug( "\nDialer data (for Registration Server): " );
+		var numElements = dialerData.length;
+		for ( var x = 0; x < numElements; x++ )
+			globals.debug( "        " + x + ": " + dialerData[ x ] );
+	}
+
+	// * configure the dialer
+	plugin.DialerConfig( dialerData, true );
+
+	// * check if we need to reboot
+	if ( plugin.NeedReboot() == true )
+	{
+		// XXX hardcode in name of next screen???
+		globals.forceReboot( "1step.htm" );		
+		return;
+	}
+
+	if ( plugin.DialerConnect() == false )
+	{
+		plugin.DialerHangup();
+		// XXX hardcode in name of next screen???
+		window.location.replace( "error.htm" );							
+		return;
+	}
+}
+
+function loadData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	if ( parent.controls.generateControls )
+		parent.controls.generateControls();
+
+	// * only connect to reggie if editmode is off
+	if ( documentVars.editMode.value != "yes" )
+	{
+		var configFolder = globals.getConfigFolder( self );
+		var acctSetupIni = globals.getAcctSetupFilename( self );
+		var regFile = configFolder + documentVars.regServer.value;
+
+
+		var regSource = globals.GetNameValuePair( acctSetupIni, "Mode Selection", "RegSource" );
+		
+		var localFlag = globals.GetNameValuePair( regFile, "Dial-In Configuration", "LocalMode" );
+		localFlag = localFlag.toLowerCase();
+		globals.debug( "localFlag:" + localFlag );
+		if ( localFlag != "yes" )
+		{
+			globals.debug( "LocalMode==no" );
+			var connectStatusFlag = plugin.IsDialerConnected();
+			if ( connectStatusFlag == true )
+			{
+				if ( confirm( "Account Setup can't connect until you close your current connection. Close the connection now?" ) == false )
+					return;
+				plugin.DialerHangup();
+			}
+
+			configureDialer( configFolder, acctSetupIni, regFile );
+		}
+		
+		regCGI = globals.GetNameValuePair( regFile, "IP", "RegCGI" );
+		regRoot = globals.GetNameValuePair( regFile, "Configuration", "RegRoot" );
+		metadataMode = globals.GetNameValuePair( regFile, "Configuration", "MetadataMode" );
+		if ( metadataMode == "no" )
+			globals.debug( "MetadataMode==no, you will not be downloading necessary metadata" );
+		
+		if ( regCGI == null || regCGI == "" )
+		{
+			alert( "Internal problem determining the Registration Server." );
+			return;
+		}
+
+		if ( regRoot == null )
+		{
+			alert( "Internal problem determining location of Registration Server data file repository (RegRoot)." );
+			return;
+		}
+/*
+		// * write out reggie data to Java Console
+		if ( documentVars.debugMode.value.toLowerCase() == "yes" )
+		{
+			globals.debug( "\nRegServer data: " + document.forms[ 0 ].action );
+			var numElements = document.forms[ 0 ].length;
+			for ( var x = 0; x < document.forms[ 0 ].length; x++ )
+				globals.debug( "        " + x + ": " + document.forms[ 0 ].elements[ x ].name + "=" + document.forms[ 0 ].elements[ x ].value );
+		}
+*/
+	
+		// * submit reggie data
+		navigator.preference( "security.warn_submit_insecure", false );
+		navigator.preference( "security.warn_entering_secure", false );
+		navigator.preference( "security.warn_leaving_secure", false );
+
+		// * automatically submit form to registration server
+		//document.forms[ 0 ].submit();
+
+		reggieData = plugin.newStringArray( 8 );		// increment this # as new dialer strings are added
+		reggieData[ 0 ] = "CST_PHONE_NUMBER=" + documentVars.modemPhoneNumber.value;
+		reggieData[ 1 ] = "REG_SOURCE=" + regSource;
+		reggieData[ 2 ] = "CLIENT_LANGUAGE=" + navigator.language;
+		reggieData[ 3 ] = "CST_AREA_CODE_1=" + documentVars.modemAreaCode.value;
+		reggieData[ 4 ] = "CST_AREA_CODE_2=" + documentVars.altAreaCode1.value;
+		reggieData[ 5 ] = "CST_AREA_CODE_3=" + documentVars.altAreaCode2.value;
+		reggieData[ 6 ] = "CST_AREA_CODE_4=" + documentVars.altAreaCode3.value;
+		reggieData[ 7 ] = "CST_COUNTRY_CODE=" + "1";
+		
+		/*documentVars.countryCode.value;*/
+				
+		//if ( localFlag != "yes" )
+		//	globals.set1StepMode( 1 );
+		
+		var		result = plugin.GenerateComparePage( globals.getFolder( self ), regCGI, regRoot, metadataMode, reggieData );
+		
+		plugin.DialerHangup();
+		//if ( localFlag != "yes" )
+		//	globals.oneStepSemaphore = true;
+		
+		if ( result == true )
+			window.location.replace( "compwrap.htm" );
+		else
+			window.location.replace( "error.htm" );
+	}
+}
+
+function saveData()
+{
+}
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/2step.htm
+++ b/mozilla/cmd/dialup/as_html/2step.htm
@@ -0,0 +1,60 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="2step.js"></SCRIPT>
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js"></LINK>
+</HEAD>
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="2step100">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME="tagtext" LEFT=420 TOP=0 VISIBILITY=SHOW>
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+</LAYER>
+
+<!-- The layer below contains the headline and text of this screen -->
+
+<P CLASS="title"><B>Connect to 
+<SCRIPT LANGUAGE="JavaScript" ID="2step101">insertISPName();</SCRIPT>
+</B></P>
+
+<P>Account Setup will now connect you to
+<SCRIPT LANGUAGE="JavaScript" ID="2step102">insertISPName();</SCRIPT>
+so that you can create an account with this ISP.  (Note: It may take a minute for your modem to connect to this ISP.)</P>
+<P>After you have connected to
+<SCRIPT LANGUAGE="JavaScript" ID="2step103">insertISPName();</SCRIPT>
+you will be asked to supply account and billing information, such as your desired electronic mail name and password, and credit card information.</P>
+
+<CENTER>
+<SCRIPT LANGUAGE="JavaScript" ID="2step104">
+	generatePopNumberList();
+</SCRIPT>
+</CENTER>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/2step.js
+++ b/mozilla/cmd/dialup/as_html/2step.js
@@ -0,0 +1,91 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+var globals = parent.parent.globals;
+var controls = parent.controls;
+
+function go( msg )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	// * skip if we're in edit mode
+	if ( globals.document.vars.editMode.value != "yes" )
+	{
+		if ( document.forms && document.forms[ 0 ] && document.forms[ 0 ].popList )
+			globals.document.setupPlugin.CreateConfigIAS(
+				globals.selectedISP, document.forms[ 0 ].popList.selectedIndex );
+		else
+			globals.document.setupPlugin.CreateConfigIAS( globals.selectedISP, -1 );
+				
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+function checkData()
+{
+	return true;
+}
+
+function saveData()
+{
+}
+
+function insertISPName()
+{
+	document.write( globals.getSelectedISPName() );
+}
+
+function loadData()
+{
+	//parent.twostepfooter.document.writeln( "<BODY BACKGROUND='images/bg.gif' BGCOLOR='cccccc'>" );
+	//parent.twostepfooter.document.writeln( "<P>If you have trouble setting up your account call " );
+	//parent.twostepfooter.document.writeln( globals.getSelectedISPName() );
+	//parent.twostepfooter.document.writeln( "at (support number).</P>" );
+	//parent.twostepfooter.document.close();
+
+	if ( controls.generateControls )
+		controls.generateControls();
+}
+
+function generatePopNumberList()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var list = globals.document.setupPlugin.GetISPPopList( globals.selectedISP );
+	
+	globals.debug( "generating pop list" );
+	if ( list && list.length > 0 )
+	{
+		globals.debug( "emitting table" );
+		document.writeln( "<TABLE CELLPADDING=2 CELLSPACING=0 ID='minspace'><TR><TD ALIGN=LEFT VALIGN=TOP HEIGHT=25><spacer type=vertical size=2><B>Pick a phone number from the following list to connect to:</B></TD><TD ALIGN=LEFT VALIGN=TOP><FORM><SELECT NAME='popList'>");
+		for ( var x = 0; x < list.length; x++ )
+		{
+			var name = list[ x ];
+			var selected = ( x == 0 ) ? " SELECTED" : "";
+			document.writeln( "<OPTION VALUE='" + x + "'" + selected + ">" + name );
+		}
+		document.writeln( "</SELECT></FORM></TD></TR></TABLE>" );
+	}
+}
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/aboutbox.htm
+++ b/mozilla/cmd/dialup/as_html/aboutbox.htm
@@ -0,0 +1,134 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<HTML>
+
+<HEAD>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="aboutbox.js">
+</SCRIPT>
+</HEAD>
+
+<BODY BGCOLOR=EEEEEE onLoad="loadData()" ID="aboutbox100">
+
+<LAYER NAME="programName" VISIBILITY=hidden LEFT=-100 TOP=0 HEIGHT=100 WIDTH=100>
+	<TABLE BORDER=0 WIDTH="100%">
+		<TR>
+			<TD ALIGN=center VALIGN=top><STRONG>Account Setup</STRONG><BR>4.0</TD>
+		</TR>
+	</TABLE>
+</LAYER>
+
+<LAYER NAME="programDesc" VISIBILITY=hidden LEFT=250 TOP=-100 HEIGHT=100 WIDTH=100>
+	<TABLE BORDER=0 WIDTH="100%">
+		<TR>
+			<TD ALIGN=center VALIGN=top><STRONG>Internet<BR>Signup<BR>Program</STRONG></TD>
+		</TR>
+	</TABLE>
+</LAYER>
+
+<LAYER NAME="programCopyRight" VISIBILITY=hidden LEFT=740 TOP=0 HEIGHT=100 WIDTH=200>
+	<TABLE BORDER=0 WIDTH="100%">
+		<TR>
+	<TD ALIGN=center VALIGN=top>Copyright &copy 1996, 1997<BR>Netscape Communications Corp.<BR>All Rights Reserved.</TD>
+		</TR>
+	</TABLE>
+</LAYER>
+
+<LAYER NAME="ProgramThanks" VISIBILITY=hidden LEFT=10 TOP=480 WIDTH=580>
+	<CENTER>Brought to you by:</CENTER>
+	<BR>
+	
+	<TABLE BORDER=0 WIDTH="100%" BGCOLOR=CCCCCC>
+	
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Client Engineering</STRONG></TD>
+			<TD>Robert John Churchill, Rex Lam, Tim McClarren, Arshad Tayyeb, Cathleen Wang, Stella Yun</TD>
+		</TR>
+		
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>FreePPP</STRONG></TD>
+			<TD>Steve Dagley</TD>
+		</TR>
+
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Server Engineering</STRONG></TD>
+			<TD>Steve Elmer, Lucy Wu</TD>
+		</TR>
+	
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Documentation/Help</STRONG></TD>
+			<TD>Dirk Dougherty, Robin Foster, Kate O'Day</TD>
+		</TR>
+	
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>User Experience</STRONG></TD>
+			<TD>Jim Corban, Valerie Hunter</TD>
+		</TR>
+	
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Kwality Assurance</STRONG></TD>
+			<TD>Aracely Areas, John Bennett, Bruce Gay, Sarah Groves, Vashti Holt, Brent Martin, Dylan Shea, John Unruh, Pascal Vin</TD>
+		</TR>
+
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Release Engineering</STRONG></TD>
+			<TD>Don Bragg, Doug Turner, Chris Yeh</TD>
+		</TR>
+
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>International</STRONG></TD>
+			<TD>David Yett</TD>
+		</TR>
+		
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Management</STRONG></TD>
+			<TD>Leland Hambley, Nancy Wang, Monique Barbanson</TD>
+		</TR>
+	
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Marketing</STRONG></TD>
+			<TD>Ken Hickman, Debra Evans, John Freeborg, Julie Herendeen</TD>
+		</TR>
+
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Thanks!</STRONG></TD>
+			<TD>The entire Communicator team!</TD>
+		</TR>
+
+		<TR>
+			<TD ALIGN=center VALIGN=middle><STRONG>Thank Goodness for...</STRONG></TD>
+			<TD>Mountain Dew!</TD>
+		</TR>
+	
+	</TABLE>
+	
+	</CENTER>
+</LAYER>
+
+<LAYER NAME="NetscapeIcon" VISIBILITY=hidden LEFT=250 TOP=90 WIDTH=100 HEIGHT=50>
+	<CENTER>
+	<IMG SRC="images/netscape.gif" WIDTH=32 HEIGHT=32 BORDER=0><BR>
+	<LAYER NAME="NetscapeString" VISIBILITY=hidden LEFT=16>
+		Go Netscape!
+	</LAYER>
+	</CENTER>
+	</LAYER>
+</LAYER>
+
+</BODY>
+
+</HTML>
--- a/mozilla/cmd/dialup/as_html/aboutbox.js
+++ b/mozilla/cmd/dialup/as_html/aboutbox.js
@@ -0,0 +1,113 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+function go( msg )
+{
+	if ( msg=="Back" )
+		return true;
+	return false;
+}
+
+
+
+function checkData()
+{
+	return true;
+}
+
+function loadData()
+{
+	if ( parent && parent.controls && parent.controls.generateControls )
+	{
+		parent.controls.generateControls();
+	}
+	document.layers[ "programName" ].visibility = "SHOW";
+	animate1();
+}
+
+function saveData()
+{
+}
+
+function animate1()
+{
+	if ( document.layers[ "programName" ].left < 100 )
+	{
+		document.layers[ "programName" ].moveBy( 10, 0 );
+		setTimeout( "animate1()", 100 );
+	}
+	else
+	{
+		document.layers[ "programDesc" ].visibility = "SHOW";
+		animate2();
+	}
+}
+
+
+
+function animate2()
+{
+	if ( document.layers[ "programDesc" ].top < 0 )
+	{
+		document.layers[ "programDesc" ].moveBy( 0, 10 );
+		setTimeout( "animate2()", 100 );
+	}
+	else
+	{
+		document.layers[ "programCopyRight" ].visibility = "SHOW";
+		animate3();
+	}
+}
+
+
+
+function animate3()
+{
+	if ( document.layers[ "programCopyRight" ].left > 380 )
+	{
+		document.layers[ "programCopyRight" ].moveBy( -10, 0);
+		setTimeout( "animate3()", 100 );
+	}
+	else
+	{
+		document.layers[ "NetscapeIcon" ].visibility = "SHOW";
+		document.layers[ "ProgramThanks" ].visibility = "SHOW";
+		animate4();
+	}
+}
+
+
+
+function animate4()
+{
+	if ( document.layers[ "ProgramThanks" ].top > 50 )
+	{
+		document.layers[ "NetscapeIcon" ].moveBy( 0, 5 );
+		document.layers[ "ProgramThanks" ].moveBy( 0, -10 );
+		setTimeout( "animate4()", 100 );
+	}
+	else
+	{
+		document.layers[ "NetscapeIcon" ].document.layers[ "NetscapeString" ].visibility = "SHOW";
+	}
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/accounts.htm
+++ b/mozilla/cmd/dialup/as_html/accounts.htm
@@ -0,0 +1,104 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="accounts.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" ONLOAD="loadData()" ID="accounts100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+
+<P CLASS="title"><B>Welcome to Account Setup</B></P>
+
+<!-- ÇSPACER TYPE=VERTICAL SIZE=16È -->
+
+<P>Please click one of the buttons below to choose whether you would like to create a new Internet account or set up Communicator to access an account that you already have.</P>
+
+<SPACER TYPE=HORIZONTAL SIZE=72>
+
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="500">
+	<TR>
+		<TD ALIGN=LEFT  VALIGN="TOP" WIDTH="66" HEIGHT="54" ALIGN="LEFT">
+			<A HREF="about:blank" ONCLICK="document.images['new'].src='images/str_dn.gif'; setPath('New Path'); return false" ONMOUSEOVER="document.images['new'].src='images/str_mo.gif'" ONMOUSEOUT="document.images['new'].src='images/start.gif'" ID="accounts101">
+			<IMG NAME="new" SRC="images/start.gif" LOWSRC="images/str_dn.gif" BORDER=0 HEIGHT=53 WIDTH=54></A>
+		</TD>
+	
+		<TD ALIGN=LEFT WIDTH="358" VALIGN="TOP" CLASS="accounts">
+	 	
+		<B>I want to create a new Internet account.</B>
+			
+		<SPACER TYPE=VERTICAL SIZE=4>	
+					
+		If you're new to the Internet, Account Setup helps you create an Internet account that you can use right away. You can also choose this option if you want to create a second Internet account or change your Internet service provider.
+		
+		</TD>
+	</TR>
+	<TR>
+		<TD><SPACER TYPE=VERTICAL SIZE=16>
+		</TD>
+	</TR>
+	<TR>
+		<TD ALIGN="LEFT"  VALIGN="TOP" WIDTH="66" HEIGHT="54" ALIGN="LEFT">
+			<A HREF="about:blank" ONCLICK="document.images['existing'].src='images/str_dn.gif'; setPath('Existing Path'); return false" ONMOUSEOVER="document.images['existing'].src='images/str_mo.gif'" ONMOUSEOUT="document.images['existing'].src='images/start.gif'" ID="accounts102">
+			<IMG NAME="existing" SRC="images/start.gif" LOWSRC="images/str_dn.gif" BORDER=0 HEIGHT=53 WIDTH=54></A>
+		</TD>
+		<TD ALIGN="LEFT" WIDTH="358" VALIGN="TOP" CLASS="accounts">
+		
+		<B>I already have an Internet account. I want to set up Communicator to access my account.</B>
+
+			<SPACER TYPE=VERTICAL SIZE=4>
+	
+			If you already have an Internet account with an Internet service provider, Account Setup helps you quickly set up Communicator to access your account. 
+
+		</TD>
+	</TR>
+</TABLE>
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/accounts.js
+++ b/mozilla/cmd/dialup/as_html/accounts.js
@@ -0,0 +1,67 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	if (msg == parent.parent.globals.document.vars.path.value)	{
+		return(true);
+		}
+	return(false);
+}
+
+
+
+function doGo()
+{
+	parent.controls.go("Next");
+}
+
+
+
+function setPath(msg)
+{
+	parent.parent.globals.document.vars.path.value = msg;
+	setTimeout("doGo()",1);
+}
+
+
+
+function checkData()
+{
+	return(true);
+}
+
+
+
+function loadData()
+{
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/acctInfo.htm
+++ b/mozilla/cmd/dialup/as_html/acctInfo.htm
@@ -0,0 +1,120 @@
+<!--  -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="acctInfo.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="acctInfo100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+
+
+<FORM>
+
+<P CLASS="title"><B>Information About Yourself</B></P>
+	
+<P>Please enter your name and, optionally, you organization name below. Account Setup sets Communicator to add this information to the email you send and the web pages you create. </P>
+
+<CENTER>
+
+
+<TABLE CELLPADDING="3" CELLSPACING="0" border="0" WIDTH=100>
+
+
+<TR>
+	<TD></TD>
+	<TD ALIGN="CENTER" VALIGN="BOTTOM" CLASS="tabletext">
+		First:
+	</TD>
+	<TD ALIGN="CENTER" VALIGN="BOTTOM" CLASS="tabletext">
+		Last:
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT" CLASS="tabletext">
+        <B>Name:</B>
+		<spacer type=vertical size=2>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP" CLASS="tabletext">
+		<INPUT NAME="first" TYPE="text" SIZE=25 MAXLENGTH=30>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP" CLASS="tabletext">
+		<INPUT NAME="last" TYPE="text" SIZE=26 MAXLENGTH=30>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=2>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT" CLASS="tabletext">
+        <B>Organization:</B>
+		<spacer type=vertical size=2>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP" COLSPAN="2" CLASS="tabletext">
+		<INPUT NAME="company" TYPE="text" SIZE=54 MAXLENGTH=30>
+	</TD>
+</TR>
+
+
+</TABLE>
+</CENTER>
+
+</FORM>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/acctInfo.js
+++ b/mozilla/cmd/dialup/as_html/acctInfo.js
@@ -0,0 +1,107 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go()
+{
+	if (parent.parent.globals.document.vars.editMode.value == "yes")
+		return true;
+	else
+		return(checkData());
+}
+
+
+
+function checkData()
+{
+	if (document.forms[0].first.value == "")	{
+		alert("You must enter a first name.");
+		document.forms[0].first.focus();
+		document.forms[0].first.select();
+		return false;
+		}
+	if (document.forms[0].last.value == "")	{
+		alert("You must enter a last name.");
+		document.forms[0].last.focus();
+		document.forms[0].last.select();
+		return false;
+		}
+/*
+	if (document.forms[0].areaCode.value == "")	{
+		alert("You must enter an area code.");
+		document.forms[0].areaCode.focus();
+		document.forms[0].areaCode.select();
+		return false;
+		}
+	if (document.forms[0].phoneNumber.value == "")	{
+		alert("You must enter a telephone number.");
+		document.forms[0].phoneNumber.focus();
+		document.forms[0].phoneNumber.select();
+		return false;
+		}
+*/
+	return true;
+}
+
+
+
+function loadData()
+{
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].first == "undefined") || (document.forms[0].first == "[object InputArray]")) ||
+		((document.forms[0].last == "undefined") || (document.forms[0].last == "[object InputArray]")) ||
+		((document.forms[0].company == "undefined") || (document.forms[0].company == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[0].first.value = parent.parent.globals.document.vars.first.value;
+	document.forms[0].last.value = parent.parent.globals.document.vars.last.value;
+	document.forms[0].company.value = parent.parent.globals.document.vars.company.value;
+//	document.forms[0].areaCode.value = parent.parent.globals.document.vars.areaCode.value;
+//	document.forms[0].phoneNumber.value = parent.parent.globals.document.vars.phoneNumber.value;
+	parent.parent.globals.setFocus(document.forms[0].first);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].first == "undefined") || (document.forms[0].first == "[object InputArray]")) ||
+		((document.forms[0].last == "undefined") || (document.forms[0].last == "[object InputArray]")) ||
+		((document.forms[0].company == "undefined") || (document.forms[0].company == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	parent.parent.globals.document.vars.first.value = document.forms[0].first.value;
+	parent.parent.globals.document.vars.last.value = document.forms[0].last.value;
+	parent.parent.globals.document.vars.company.value = document.forms[0].company.value;
+//	parent.parent.globals.document.vars.areaCode.value = document.forms[0].areaCode.value;
+//	parent.parent.globals.document.vars.phoneNumber.value = document.forms[0].phoneNumber.value;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/billing.htm
+++ b/mozilla/cmd/dialup/as_html/billing.htm
@@ -0,0 +1,175 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="billing.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="billing100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+<P CLASS="title"><B>Your Billing Information</B></P>
+
+<P>Internet accounts are paid for by credit card. Please provide information about the credit card that you would like to use for billing. Account Setup forwards this information to your provider when you create your account. </P>
+
+
+
+<CENTER>
+
+<TABLE CELLPADDING="2" CELLSPACING="0" border="0">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>Name on Card:</B>
+		<spacer type=vertical size=2>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="MIDDLE">
+		<INPUT NAME="cardname" TYPE="text" SIZE=30 MAXLENGTH=30>
+	</TD>
+</TR>
+
+
+
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=6>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>Type of Card:</B>
+		<spacer type=vertical size=4>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="MIDDLE">
+		<SELECT NAME="cards">
+			<SCRIPT LANGUAGE="JavaScript" ID="billing101">
+			generateCards();
+			</SCRIPT>
+		</SELECT>
+	</TD>
+</TR>
+
+
+
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=3>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+		<spacer type=vertical size=6>
+        <B>Card Number:</B>
+		<spacer type=vertical size=2>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="MIDDLE">
+		<spacer type=vertical size=4>
+		<INPUT NAME="cardnumber" TYPE="text" SIZE=25 MAXLENGTH=25>
+	</TD>
+</TR>
+
+
+
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=6>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>Expiration Date:</B>
+		<spacer type=vertical size=4>
+		</FONT>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="MIDDLE">
+	
+			<SELECT NAME="month">
+			<OPTION VALUE="January">January
+			<OPTION VALUE="February">February
+			<OPTION VALUE="March">March
+			<OPTION VALUE="April">April
+			<OPTION VALUE="May">May
+			<OPTION VALUE="June">June
+			<OPTION VALUE="July">July
+			<OPTION VALUE="August">August
+			<OPTION VALUE="September">September
+			<OPTION VALUE="October">October
+			<OPTION VALUE="November">November
+			<OPTION VALUE="December">December
+			</SELECT>
+			
+			<spacer type=horizontal size=2>
+	
+			<SELECT NAME="year">
+			<OPTION VALUE="1997">1997
+			<OPTION VALUE="1998">1998
+			<OPTION VALUE="1999">1999
+			<OPTION VALUE="2000">2000
+			<OPTION VALUE="2001">2001
+			<OPTION VALUE="2002">2002
+			<OPTION VALUE="2003">2003
+			<OPTION VALUE="2004">2004
+			</SELECT>
+	</TD>
+</TR>
+</TABLE>
+
+</CENTER>
+
+</FORM>
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/billing.js
+++ b/mozilla/cmd/dialup/as_html/billing.js
@@ -0,0 +1,319 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	if (parent.parent.globals.document.vars.editMode.value == "yes")
+		return true;
+	else
+		return(checkData());
+}
+
+
+
+function generateCards()
+{
+	var theFile = parent.parent.globals.getAcctSetupFilename(self);
+	var theCards = parent.parent.globals.GetNameValuePair(theFile,"New Acct Mode","CardTypes");
+	if (theCards == null || theCards == "")	{
+		theCards = "AX,DC,MC,VI";
+		}
+
+	if (theCards.indexOf("AX")>=0)	{
+		document.writeln("<OPTION VALUE='American Express'>American Express");
+		}
+	if (theCards.indexOf("DC")>=0)	{
+		document.writeln("<OPTION VALUE='Discover Card'>Discover Card");
+		}
+	if (theCards.indexOf("MC")>=0)	{
+		document.writeln("<OPTION VALUE='MasterCard'>MasterCard");
+		}
+	if (theCards.indexOf("VI")>=0)	{
+		document.writeln("<OPTION VALUE='VISA'>VISA");
+		}
+}
+
+
+
+function loadData()
+{
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].cardname == "undefined") || (document.forms[0].cardname == "[object InputArray]")) ||
+		((document.forms[0].cards == "undefined") || (document.forms[0].cards == "[object InputArray]")) ||
+		((document.forms[0].cardnumber == "undefined") || (document.forms[0].cardnumber == "[object InputArray]")) ||
+		((document.forms[0].month == "undefined") || (document.forms[0].month == "[object InputArray]")) ||
+		((document.forms[0].year == "undefined") || (document.forms[0].year == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[0].cardname.value = parent.parent.globals.document.vars.cardname.value;
+	if (document.forms[0].cardname.value == "")	{
+		document.forms[0].cardname.value = parent.parent.globals.document.vars.first.value + " " + parent.parent.globals.document.vars.last.value;
+		}
+	for (var i = 0; i<document.forms[0].cards.length; i++)	{
+		if (parent.parent.globals.document.vars.cardtype.value == document.forms[0].cards[i].value)	{
+			document.forms[0].cards.selectedIndex = i;
+			break;
+			}
+		}
+	document.forms[0].cardnumber.value = parent.parent.globals.document.vars.cardnumber.value;
+	
+	var month = parent.parent.globals.document.vars.month.value;
+	if (month == "")	month = 0;
+	document.forms[0].month.selectedIndex = month;
+	
+	var found = false;
+	var year = parent.parent.globals.document.vars.year.value;
+	// if (year == "")	year = document.forms[0].year[0].value;
+	for (var i = 0; i<document.forms[0].year.length; i++)	{
+		if (year == document.forms[0].year[i].value)	{
+			document.forms[0].year.selectedIndex = i;
+			found = true;
+			break;
+			}
+		}
+	if (found == false)	{
+		document.forms[0].year.selectedIndex = 0;
+		}
+	parent.parent.globals.setFocus(document.forms[0].cardname);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].cardname == "undefined") || (document.forms[0].cardname == "[object InputArray]")) ||
+		((document.forms[0].cards == "undefined") || (document.forms[0].cards == "[object InputArray]")) ||
+		((document.forms[0].cardnumber == "undefined") || (document.forms[0].cardnumber == "[object InputArray]")) ||
+		((document.forms[0].month == "undefined") || (document.forms[0].month == "[object InputArray]")) ||
+		((document.forms[0].year == "undefined") || (document.forms[0].year == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	parent.parent.globals.document.vars.cardname.value = document.forms[0].cardname.value;
+	if (document.forms[0].cards.length>0 && document.forms[0].cards.selectedIndex >=0)	{
+		parent.parent.globals.document.vars.cardtype.value = document.forms[0].cards[document.forms[0].cards.selectedIndex].value;
+		}
+	else	{
+		parent.parent.globals.document.vars.cardtype.value="";
+		}
+	parent.parent.globals.document.vars.cardnumber.value = document.forms[0].cardnumber.value;
+	parent.parent.globals.document.vars.month.value = document.forms[0].month.selectedIndex;
+	parent.parent.globals.document.vars.year.value = document.forms[0].year[document.forms[0].year.selectedIndex].value;
+}
+
+
+
+function checkData()
+{
+	if (document.forms[0].cardname.value == "")	{
+		alert("You must enter a cardholder name.");
+		document.forms[0].cardname.focus();
+		document.forms[0].cardname.select();
+		return false;
+		}
+	if (document.forms[0].cardnumber.value == "")	{
+		alert("You must enter a credit card number.");
+		document.forms[0].cardnumber.focus();
+		document.forms[0].cardnumber.select();
+		return false;
+		}
+	
+	// check cardnumber validity here
+	
+	var cardNumber=document.forms[0].cardnumber.value;
+	for (var i=0; i<cardNumber.length; i++)	{
+		if ("1234567890 -".indexOf(cardNumber.substring(i,i+1)) == -1)	{
+			alert("'" + cardNumber + "' is not a valid card number.");
+			document.forms[0].cardnumber.focus();
+			document.forms[0].cardnumber.select();
+			return(false);
+			}
+		}
+	
+	// do cardnumber check-digit validity here
+	
+	var length=cardNumber.length;
+	var checkDigit=cardNumber.substring(length-1,length);
+	var	tempCardNumber="";
+	for (var i=0; i<cardNumber.length; i++)	{
+		if ("1234567890".indexOf(cardNumber.substring(i,i+1))>=0)	{
+			tempCardNumber+=cardNumber.substring(i,i+1);
+			}
+		}
+	var length=tempCardNumber.length;
+	var checkSum=0;
+	for (var i=0; i<length-1; i++)	{
+		var digit=tempCardNumber.substring(length-i-2,length-i-1);
+		var temp=digit * (1+((i+1)%2));
+		if (temp<10)	checkSum=checkSum+temp;
+		else			checkSum=checkSum+(temp-9);
+		}
+	checkSum=(10-(checkSum%10))%10;
+	if (checkSum != checkDigit)	{
+		alert("'" + cardNumber + "' is not a valid card number.");
+		document.forms[0].cardnumber.focus();
+		document.forms[0].cardnumber.select();
+		return(false);
+		}
+	
+	// do cardtype check
+	
+	var cardType="";
+	
+	if (cardNumber.substring(0,1)=="3" && cardNumber.substring(1,2)=="7")	{
+		cardType="American Express";
+		cardCode="AX";
+		}
+/*
+	else if (cardNumber.substring(0,1)=="5" && cardNumber.substring(1,2)=="6")	{
+		cardType="BankCard";
+		cardCode="BC";
+		}
+*/
+
+/*
+	else if (cardNumber.substring(0,1)=="3")	{
+		cardType="Diner's Club";
+		cardCode="DI";
+		}
+*/
+	else if (cardNumber.substring(0,1)=="5")	{
+		cardType="MasterCard";
+		cardCode="MC";
+		}
+	else if (cardNumber.substring(0,1)=="4")	{
+		cardType="VISA";
+		cardCode="VI";
+		}
+	else if (cardNumber.substring(0,1)=="6")	{
+		cardType="Discover Card";
+		cardCode="DC";
+		}
+// else cardType="unknown";
+	
+	parent.parent.globals.document.vars.cardcode.value = cardCode;
+
+	if (document.forms[0].cards.length>0)	{
+		if (cardType != document.forms[0].cards[document.forms[0].cards.selectedIndex].value)	{
+			var found=false;
+			var currentSelection = document.forms[0].cards.selectedIndex;
+			if (cardType!="")	{
+				if (!confirm(cardNumber + " is a " + cardType + ". Correct?"))	{
+					document.forms[0].cardnumber.focus();
+					document.forms[0].cardnumber.select();
+					return(false);
+					}
+				for (var i = 0; i < document.forms[0].cards.length; i++)	{
+					if (document.forms[0].cards[i].value==cardType)	{
+						document.forms[0].cards[i].selected=true;
+						parent.parent.globals.document.vars.cardtype.value=cardType;
+						found=true;
+						}
+					else	{
+						document.forms[0].cards[i].selected=false;
+						}
+					}
+				if (found == false && currentSelection>=0)	{
+					document.forms[0].cards[currentSelection].selected=true;
+					}
+				}
+	
+			if (found==false)	{
+	
+				// is the card accepted?
+				
+				var theFile = parent.parent.globals.getAcctSetupFilename(self);
+				var theCards = parent.parent.globals.GetNameValuePair(theFile,"New Acct Mode","CardTypes");
+				if (theCards == null || theCards == "")	{
+					theCards = "AX,DC,MC,VI";
+					}
+	
+				if (theCards.indexOf(cardCode)<0)	{
+					alert(cardType + " is not accepted for payment.");
+					}
+				else	{
+					alert("'" + cardNumber + "' is not a valid card number.");
+					}
+				document.forms[0].cardnumber.focus();
+				document.forms[0].cardnumber.select();
+				return(false);
+				}
+			}
+
+		// check credit card lengths
+
+		var length=tempCardNumber.length;
+		var validLength = false;
+		if (cardCode != "")	{
+			if (cardCode == "AX")	{
+				if (length == 16)	validLength=true;
+				}
+			else if (cardCode == "MC")	{
+				if (length == 16)	validLength=true;
+				}
+			else if (cardCode == "VI")	{
+				if (length == 13 || length == 16)	validLength=true;
+				}
+			else if (cardCode == "DC")	{
+				if (length == 16)	validLength=true;
+				}
+			}
+		if (validLength == false)	{
+			alert("'" + cardNumber + "' is not a valid card number. (Invalid length)");
+			document.forms[0].cardnumber.focus();
+			document.forms[0].cardnumber.select();
+			return(false);
+			}
+		}
+
+	// check month and year
+
+	var today = new Date();
+	var theMonth = today.getMonth();
+	var theYear = today.getYear()+1900;
+
+	var expiredFlag = false;
+	if (theYear > document.forms[0].year[document.forms[0].year.selectedIndex].value)	{
+		expiredFlag = true;
+		}
+	else if (theYear == document.forms[0].year[document.forms[0].year.selectedIndex].value)	{
+		if (theMonth > document.forms[0].month.selectedIndex)	{
+			expiredFlag = true;
+			}
+		}
+	if (expiredFlag)	{
+		alert("'" + cardNumber + "' appears to have expired.");
+		return(false);
+		}
+
+	return true;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/clayer.htm
+++ b/mozilla/cmd/dialup/as_html/clayer.htm
@@ -0,0 +1,223 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<HTML>
+
+
+
+<HEAD>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="clayer1.js">
+</SCRIPT>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="clayer2.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js" >
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/navbar.gif" onLoad="loadData()" ID="clayer100">
+
+
+
+<NOSCRIPT>
+<CENTER><STRONG>
+JavaScript support is disabled!<P>
+Choose "Edit | Preferences | Advanced" and enable JavaScript, then reload this page.<P>
+</CENTER></STRONG>
+</NOSCRIPT>
+
+
+
+<LAYER NAME="controls" WIDTH=620 HEIGHT=55 TOP=0 LEFT=0>
+
+	<LAYER NAME="help" LEFT=4 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['help'].src='images/hlp_down.gif';var flag=go('Help');document.images['help'].src='images/hlp_up.gif';return false"
+								onMouseOver="document.images['help'].src='images/hlp_mo.gif'"
+								onMouseOut="document.images['help'].src='images/hlp_up.gif'" ID="clayer101">
+			<IMG NAME="help" SRC="images/hlp_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=12 TOP=43>
+			<B CLASS="clayer">HELP</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="exit" LEFT=50 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank" 	onClick="document.images['exit'].src='images/ext_down.gif';var flag=go('Exit');document.images['exit'].src='images/ext_up.gif';return false"
+								onMouseOver="document.images['exit'].src='images/ext_mo.gif'"
+								onMouseOut="document.images['exit'].src='images/ext_up.gif'" ID="clayer102">
+			<IMG NAME="exit" SRC="images/ext_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=12 TOP=43>
+			<B CLASS="clayer">EXIT</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="back" LEFT=260 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['back'].src='images/bk_down.gif';var flag=go('Back');document.images['back'].src='images/bk_up.gif';return false"
+								onMouseOver="document.images['back'].src='images/bk_mo.gif'"
+								onMouseOut="document.images['back'].src='images/bk_up.gif'" ID="clayer103">
+			<IMG NAME="back" SRC="images/bk_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+		
+		<LAYER LEFT=4 TOP=43>
+			<B CLASS="clayer">BACK</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="next" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['next'].src='images/nxt_down.gif';var flag=go('Next');document.images['next'].src='images/nxt_up.gif';return false"
+								onMouseOver="document.images['next'].src='images/nxt_mo.gif'"
+								onMouseOut="document.images['next'].src='images/nxt_up.gif'" ID="clayer104">
+			<IMG NAME="next" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">NEXT</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="connectnow" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['connectnow'].src='images/cn_down.gif';var flag=go('Next');document.images['connectnow'].src='images/cn_up.gif';return false"
+								onMouseOver="document.images['connectnow'].src='images/cn_mo.gif'"
+								onMouseOut="document.images['connectnow'].src='images/cn_up.gif'" ID="clayer105">
+		<IMG NAME="connectnow" SRC="images/cn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+	
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">CONNECT NOW</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="download" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['download'].src='images/cn_down.gif';var flag=go('Next');document.images['download'].src='images/cn_up.gif';return false"
+								onMouseOver="document.images['download'].src='images/cn_mo.gif'"
+								onMouseOut="document.images['download'].src='images/cn_up.gif'" ID="clayer113">
+			<IMG NAME="download" SRC="images/cn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+		
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">CONNECT NOW</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="connectagain" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['connectagain'].src='images/nxt_down.gif';var flag=go('Next');document.images['connectagain'].src='images/nxt_up.gif';return false"
+								onMouseOver="document.images['connectagain'].src='images/nxt_mo.gif'"
+								onMouseOut="document.images['connectagain'].src='images/nxt_up.gif'" ID="clayer106">
+			<IMG NAME="connectagain" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+		
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">CONNECT AGAIN</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="connectserver" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['connectserver'].src='images/cn_down.gif';var flag=go('Next');document.images['connectserver'].src='images/cn_up.gif';return false"
+								onMouseOver="document.images['connectserver'].src='images/cn_mo.gif'"
+								onMouseOut="document.images['connectserver'].src='images/cn_up.gif'" ID="clayer107">
+			<IMG NAME="connectserver" SRC="images/cn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">CONNECT TO NETSCAPE</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="connectisp" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['connectisp'].src='images/cn_down.gif';var flag=go('Next');document.images['connectisp'].src='images/cn_up.gif';return false"
+								onMouseOver="document.images['connectisp'].src='images/cn_mo.gif'"
+								onMouseOut="document.images['connectisp'].src='images/cn_up.gif'" ID="clayer114">
+			<IMG NAME="connectisp" SRC="images/cn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">CONNECT TO ISP</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="done" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['done'].src='images/dn_down.gif';var flag=go('Done');document.images['done'].src='images/dn_up.gif';return false"
+								onMouseOver="document.images['done'].src='images/dn_mo.gif'"
+								onMouseOut="document.images['done'].src='images/dn_up.gif'" ID="clayer108">
+			<IMG NAME="done" SRC="images/dn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+	
+		<LAYER LEFT=4 TOP=43>
+			<B CLASS="clayer">DONE</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="restart" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['restart'].src='images/rb_down.gif';var flag=go('Restart');document.images['restart'].src='images/rb_up.gif';return false"
+								onMouseOver="document.images['restart'].src='images/rb_mo.gif'"
+								onMouseOut="document.images['restart'].src='images/rb_up.gif'" ID="clayer109">
+			<IMG NAME="restart" SRC="images/rb_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=8 TOP=43>
+			<B CLASS="clayer">RESTART</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="setup" LEFT=500 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=30 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['setup'].src='images/ff_down.gif';var flag=go('Setup');document.images['setup'].src='images/ff_up.gif';return false"
+								onMouseOver="document.images['setup'].src='images/ff_mo.gif'"
+								onMouseOut="document.images['setup'].src='images/ff_up.gif'" ID="clayer110">
+			<IMG NAME="setup" SRC="images/ff_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+	
+		<LAYER LEFT=0 TOP=43>
+			<B CLASS="clayer">ACCOUNT SETUP</B>
+		</LAYER>
+	</LAYER>
+
+	<LAYER NAME="connectlater" LEFT=550 TOP=0 WIDTH=200 VISIBILITY=HIDE>
+		<LAYER LEFT=4 TOP=6>
+			<A HREF="about:blank"	onClick="document.images['later'].src='images/dn_down.gif';var flag=go('Later');document.images['later'].src='images/dn_up.gif';return false"
+								onMouseOver="document.images['later'].src='images/dn_mo.gif'"
+								onMouseOut="document.images['later'].src='images/dn_up.gif'" ID="clayer111">
+			<IMG NAME="later" SRC="images/dn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</LAYER>
+
+		<LAYER LEFT=10 TOP=43>
+			<B CLASS="clayer">DONE</B>
+		</LAYER>
+	</LAYER>
+
+</LAYER>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/clayer1.js
+++ b/mozilla/cmd/dialup/as_html/clayer1.js
@@ -0,0 +1,949 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+compromisePrincipals();
+
+
+function page( file, section, variable )
+{
+	this.type = "INFO";
+	this.file = file;
+	this.section = section;
+	this.variable = variable;
+
+	this.fullhistory = false;
+	this.top = false;
+}
+
+// the following three functions make sense if you go look at the "Next" clause in the function
+// "go" below
+
+// * a "condition" is read from the Account Setup init file (typically "Config\ACCTSET.INI"),
+// from the section "[section]" and the given variable name, and if the given "value" matches,
+// the "file" gets loaded
+function condition( file, section, variable, value )
+{
+	this.type = "CONDITION";
+	this.file = file;
+	this.section = section;
+	this.variable = variable;
+	this.value = value;
+}
+
+// * a "method" is given in "method" (a JavaScript method), and if when evaluated, it's value
+// is "value", the given "file" gets loaded
+function method( file, method, value )
+{
+	this.type = "METHOD";
+	this.file = file;
+	this.method = method;
+	this.value = value;
+}
+
+// * an "action" simply loads the given "file"
+function action( file )
+{
+	this.type = "ACTION";
+	this.file = file;
+}
+
+function checkEditMode()
+{
+	if ( parent.parent && parent.parent.globals && parent.parent.globals.document.vars.editMode.value.toLowerCase() == "yes" )
+		return true;
+	else
+		return false;
+}
+
+
+
+pages=new Array();
+
+pages[0]=new Array();
+pages[0][0]=new page("main.htm",null,null);
+pages[0][1]=new method("ipreview/inpvw1.htm","parent.content.go('Internet Preview')",true);
+pages[0][2]=new method("preview/duepvw1.htm","parent.content.go('Preview')",true);
+pages[0][3]=new method("intro/intro1.htm","parent.controls.checkShowIntroFlag('')",true);
+//pages[0][4]=new condition("intro/intro1.htm","Mode Selection","Show_Intro_Screens","yes");
+//pages[0][5]=new condition("needs1.htm","Mode Selection","ForceNew","yes");
+//pages[0][6]=new condition("useAcct.htm","Mode Selection","ForceExisting","yes");
+//pages[0][7]=new action("accounts.htm");
+
+pages[1]=new Array();
+pages[1][0]=new page("accounts.htm",null,null);
+pages[1][1]=new method("needs1.htm","parent.content.go('New Path')",true);
+pages[1][2]=new method("useAcct.htm","parent.content.go('Existing Path')",true);
+
+// New Account Path
+
+pages[ 2 ] = new Array();
+pages[ 2 ][ 0 ] = new page( "needs1.htm", "New Acct Mode", "ShowNewPathInfo" );
+pages[ 2 ][ 1 ] = new condition( "newAcct.htm", "New Acct Mode", "ShowNewPathInfo", "no" );
+pages[ 2 ][ 2 ] = new method( "newAcct.htm", "parent.content.go('')", true );
+
+pages[ 3 ] = new Array();
+pages[ 3 ][ 0 ] = new page( "newAcct.htm", "New Acct Mode", "AskPersonalInfo" );
+pages[ 3 ][ 1 ] = new condition( "billing.htm", "New Acct Mode", "AskPersonalInfo", "no" );
+pages[ 3 ][ 2 ] = new method( "billing.htm", "parent.content.go('')", true );
+
+pages[ 4 ] = new Array();
+pages[ 4 ][ 0 ] = new page( "billing.htm", "New Acct Mode", "AskBillingInfo" );
+pages[ 4 ][ 1 ] = new condition( "modem1.htm", "New Acct Mode", "AskBillingInfo", "no" );
+pages[ 4 ][ 2 ] = new method( "modem1.htm", "parent.content.go('')", true );
+
+pages[ 5 ] = new Array();
+pages[ 5 ][ 0 ] = new page( "modem1.htm", null, null );
+pages[ 5 ][ 1 ] = new method( "dialinf1.htm", "parent.content.go('')", true );
+
+pages[ 6 ] = new Array();
+pages[ 6 ][ 0 ] = new page( "dialinf1.htm", null, null );
+pages[ 6 ][ 1 ] = new method( "dialinf2.htm", "parent.content.go('')", true );
+
+pages[ 7 ] = new Array();
+pages[ 7 ][ 0 ] = new page( "dialinf2.htm", null, null );
+pages[ 7 ][ 1 ] = new method( "download.htm", "parent.content.go('New Path')", true );
+pages[ 7 ][ 2 ] = new method( "connect2.htm", "parent.content.go('Existing Path')", true );
+
+pages[ 53 ] = new Array();
+pages[ 53 ][ 0 ] = new page( "download.htm", null, null );
+pages[ 53 ][ 1 ] = new method( "1step.htm", "parent.content.go( '' )", true );
+
+pages[ 54 ] = new Array();
+pages[ 54 ][ 0 ] = new page( "1step.htm", null, null );
+
+pages[ 55 ] = new Array();
+pages[ 55 ][ 0 ] = new page( "compwrap.htm", null, null );
+pages[ 55 ][ 1 ] = new method( "moreinfo.htm", "parent.content.go( '' )", true );
+
+pages[ 56 ] = new Array();
+pages[ 56 ][ 0 ] = new page( "moreinfo.htm", null, null );
+pages[ 56 ][ 1 ] = new method( "2step.htm", "parent.content.go( '' )", true );
+
+pages[ 57 ] = new Array();
+pages[ 57 ][ 0 ] = new page( "2step.htm", null, null );
+pages[ 57 ][ 1 ] = new method( "register.htm", "parent.content.go( '' )", true );
+
+pages[ 8 ] = new Array();
+pages[ 8 ][ 0 ] = new page( "connect1.htm", null, null );
+pages[ 8 ][ 1 ] = new method( "editfour.htm", "checkEditMode('')", true );
+pages[ 8 ][ 2 ] = new method( "register.htm", "parent.content.go('')", true );
+
+pages[ 9 ] = new Array();
+pages[ 9 ][ 0 ] = new page( "register.htm", null, null );
+
+// Existing Account Path
+
+pages[10]=new Array();
+pages[10][0]=new page("useAcct.htm",null,null);
+pages[10][1]=new condition("needs2.htm","Mode Selection","ExistingSRFile","...");
+pages[10][2]=new method("needs2.htm","parent.content.go('')",true);
+
+pages[11]=new Array();
+pages[11][0]=new page("needs2.htm","Existing Acct Mode","ShowExistingPathInfo");
+pages[11][1]=new condition("acctInfo.htm","Existing Acct Mode","ShowExistingPathInfo","no");
+pages[11][2]=new method("acctInfo.htm","parent.content.go('')",true);
+
+pages[12]=new Array();
+pages[12][0]=new page("acctInfo.htm","Existing Acct Mode","AskName");
+pages[12][1]=new condition("dial.htm","Existing Acct Mode","AskName","no");
+pages[12][2]=new method("dial.htm","parent.content.go('')",true);
+
+pages[13]=new Array();
+pages[13][0]=new page("dial.htm","Existing Acct Mode","AskPhone");
+pages[13][1]=new condition("namepw.htm","Existing Acct Mode","AskPhone","no");
+pages[13][2]=new method("namepw.htm","parent.content.go('')",true);
+
+pages[14]=new Array();
+pages[14][0]=new page("namepw.htm","Existing Acct Mode","AskLogin");
+pages[14][1]=new condition("email.htm","Existing Acct Mode","AskLogin","no");
+pages[14][2]=new method("email.htm","parent.content.go('')",true);
+
+pages[15]=new Array();
+pages[15][0]=new page("email.htm","Existing Acct Mode","AskEmail");
+pages[15][1]=new condition("servers.htm","Existing Acct Mode","AskEmail","no");
+pages[15][2]=new method("servers.htm","parent.content.go('')",true);
+
+pages[16]=new Array();
+pages[16][0]=new page("servers.htm","Existing Acct Mode","AskHosts");
+pages[16][1]=new condition("dns.htm","Existing Acct Mode","AskHosts","no");
+pages[16][2]=new method("dns.htm","parent.content.go('')",true);
+
+pages[17]=new Array();
+pages[17][0]=new page("dns.htm","Existing Acct Mode","AskDNS");
+pages[17][1]=new condition("publish.htm","Existing Acct Mode","AskDNS","no");
+pages[17][2]=new method("publish.htm","parent.content.go('')",true);
+
+pages[18]=new Array();
+pages[18][0]=new page("publish.htm","Existing Acct Mode","AskPublishing");
+pages[18][1]=new condition("modem1.htm","Existing Acct Mode","AskPublishing","no");
+pages[18][2]=new method("modem1.htm","parent.content.go('')",true);
+
+pages[19]=new Array();
+pages[19][0]=new page("connect2.htm",null,null);
+pages[19][1]=new method(null,"parent.content.go('Connect Now')",true);
+pages[19][2]=new method("error.htm","parent.content.go('error.htm')",true);
+
+// Final Screens
+
+pages[20]=new Array();
+pages[20][0]=new page("ok.htm",null,null);
+
+pages[21]=new Array();
+pages[21][0]=new page("okreboot.htm",null,null);
+
+pages[ 22 ] = new Array();
+pages[ 22 ][ 0 ] = new page( "error.htm", null, null );
+pages[ 22 ][ 1 ] = new method( "1step.htm", "parent.content.go( 'firstDial' )", true );
+pages[ 22 ][ 2 ] = new method( "register.htm", "parent.content.go( 'New Path' )", true );
+pages[ 22 ][ 3 ] = new method( "connect2.htm", "parent.content.go( 'Existing Path' )", true );
+
+pages[23]=new Array();
+pages[23][0]=new page("later.htm",null,null);
+pages[23][1]=new method("later.htm","parent.content.go('Done')",true);
+
+// Settings
+
+pages[24]=new Array();
+pages[24][0]=new page("settings.htm",null,null);
+
+// About Box
+
+pages[25]=new Array();
+pages[25][0]=new page("aboutbox.htm",null,null);
+
+// Manage IAS Servers
+
+pages[26]=new Array();
+pages[26][0]=new page("addias.htm",null,null);
+
+// Manage NCI Servers
+
+pages[27]=new Array();
+pages[27][0]=new page("addnci.htm",null,null);
+
+// Dialup Edition Preview Screens
+
+pages[28]=new Array();
+pages[28][0]=new page("preview/duepvw1.htm",null,null);
+//pages[28][0].fullhistory=true;
+pages[28][1]=new method("preview/duepvw2.htm","parent.content.go('')",true);
+
+pages[29]=new Array();
+pages[29][0]=new page("preview/duepvw2.htm",null,null);
+pages[29][1]=new method("preview/duepvw3.htm","parent.content.go('')",true);
+
+pages[30]=new Array();
+pages[30][0]=new page("preview/duepvw3.htm",null,null);
+pages[30][1]=new method("preview/duepvw4.htm","parent.content.go('')",true);
+
+pages[31]=new Array();
+pages[31][0]=new page("preview/duepvw4.htm",null,null);
+pages[31][1]=new method("preview/duepvw5.htm","parent.content.go('')",true);
+
+pages[32]=new Array();
+pages[32][0]=new page("preview/duepvw5.htm",null,null);
+pages[32][1]=new method("preview/duepvw7a.htm","parent.content.go('')",true);
+
+//The following array is ignored as reference to Conference feature is removed
+pages[33]=new Array();
+pages[33][0]=new page("preview/duepvw6.htm",null,null);
+pages[33][1]=new method("preview/duepvw7.htm","parent.content.go('')",true);
+
+//The following array is ignored as reference to Netcaster feature is removed
+pages[34]=new Array();
+pages[34][0]=new page("preview/duepvw7.htm",null,null);
+pages[34][1]=new method("preview/duepvw7a.htm","parent.content.go('')",true);
+
+pages[35]=new Array();
+pages[35][0]=new page("preview/duepvw7a.htm",null,null);
+pages[35][1]=new method("preview/duepvw8.htm","parent.content.go('')",true);
+
+pages[36]=new Array();
+pages[36][0]=new page("preview/duepvw8.htm",null,null);
+//pages[36][1]=new method("main.htm","parent.content.go('')",true);
+pages[36][1]=new action("main.htm");
+
+// Internet Preview Screens
+
+pages[37]=new Array();
+pages[37][0]=new page("ipreview/inpvw1.htm",null,null);
+//pages[37][0].fullhistory=true;
+pages[37][1]=new method("ipreview/inpvw2.htm","parent.content.go('')",true);
+
+pages[38]=new Array();
+pages[38][0]=new page("ipreview/inpvw2.htm",null,null);
+pages[38][1]=new method("ipreview/inpvw3.htm","parent.content.go('')",true);
+
+pages[39]=new Array();
+pages[39][0]=new page("ipreview/inpvw3.htm",null,null);
+pages[39][1]=new method("ipreview/inpvw4.htm","parent.content.go('')",true);
+
+pages[40]=new Array();
+pages[40][0]=new page("ipreview/inpvw4.htm",null,null);
+pages[40][1]=new method("ipreview/inpvw5.htm","parent.content.go('')",true);
+
+pages[41]=new Array();
+pages[41][0]=new page("ipreview/inpvw5.htm",null,null);
+pages[41][1]=new method("ipreview/inpvw5a.htm","parent.content.go('')",true);
+
+pages[42]=new Array();
+pages[42][0]=new page("ipreview/inpvw6.htm",null,null);
+pages[42][1]=new method("ipreview/inpvw7.htm","parent.content.go('')",true);
+
+pages[43]=new Array();
+pages[43][0]=new page("ipreview/ipreview/inpvw7.htm",null,null);
+//pages[43][1]=new method("main.htm","parent.content.go('')",true);	
+pages[43][1]=new action("main.htm");									// XXX For Deluxe, change "main.htm" to "ipreview/inpvw8.htm"
+
+pages[44]=new Array();
+pages[44][0]=new page("ipreview/inpvw8.htm",null,null);
+//pages[44][1]=new method("main.htm","parent.content.go('')",true);
+pages[44][1]=new action("main.htm");
+
+// start screen
+
+pages[45]=new Array();
+pages[45][0]=new page("start.htm",null,null);
+//pages[45][0].top=true;
+
+// intro screens
+
+pages[46]=new Array();
+pages[46][0]=new page("intro/intro1.htm",null,null);
+//pages[46][0].fullhistory=true;
+pages[46][1]=new method("intro/intro2.htm","parent.content.go('')",true);
+
+pages[47]=new Array();
+pages[47][0]=new page("intro/intro2.htm",null,null);
+pages[47][1]=new method("intro/intro3.htm","parent.content.go('')",true);
+
+pages[48]=new Array();
+pages[48][0]=new page("intro/intro3.htm",null,null);
+pages[48][1]=new method("intro/intro4.htm","parent.content.go('')",true);
+
+pages[49]=new Array();
+pages[49][0]=new page("intro/intro4.htm",null,null);
+pages[49][1]=new method("intro/intro5.htm","parent.content.go('')",true);
+
+pages[50]=new Array();
+pages[50][0]=new page("intro/intro5.htm",null,null);
+pages[50][1]=new method("intro/intro6.htm","parent.content.go('')",true);
+
+pages[51]=new Array();
+pages[51][0]=new page("intro/intro6.htm",null,null);
+//pages[51][1]=new condition("needs1.htm","Mode Selection","ForceNew","yes");
+//pages[51][2]=new condition("useAcct.htm","Mode Selection","ForceExisting","yes");
+pages[51][1]=new action("main.htm");
+
+pages[52]=new Array();
+pages[52][0]=new page("editfour.htm",null,null);
+pages[52][1]=new method("register.htm","parent.content.go('register.htm')",true);
+pages[52][2]=new method("ok.htm","parent.content.go('ok.htm')",true);
+pages[52][3]=new method("okreboot.htm","parent.content.go('okreboot.htm')",true);
+pages[52][4]=new method("error.htm","parent.content.go('error.htm')",true);
+
+// 53 - 57 are used in the New Account path
+
+// Added to accommodate Netcenter Screen
+pages[58]=new Array();
+pages[58][0]=new page("ipreview/inpvw5a.htm",null,null);
+pages[58][1]=new method("ipreview/inpvw6.htm","parent.content.go('')",true);
+
+
+// NB: if you add new pages here, make sure that the array indices are not already
+// being used
+
+
+function checkShowIntroFlag()
+{
+	if ( parent && parent.parent && parent.parent.globals )
+	{
+		var theFile = parent.parent.globals.getAcctSetupFilename( self );	
+
+		var theFlag = parent.parent.globals.GetNameValuePair( theFile, "Mode Selection", "Show_Intro_Screens" );
+		if ( theFlag != null )
+		{
+			theFlag = theFlag.toLowerCase();
+		}
+		return ( theFlag == "yes" );
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
+// return the page number (according to ordinals along the path taken) of "file"
+function findPageOffset( file )
+{
+	// * take off any path information preceeding file name
+	if ( ( slashPos = file.lastIndexOf( "/" ) ) > 0 )
+	{
+		file = file.substring( slashPos + 1, file.length );
+	}
+
+	// * loop through all the page information and attempt to find a page name matching
+	// "file"
+	var	pageNum = -1;
+	for ( var x = 0; x < pages.length; x++ )
+	{
+		for ( var y = 0; y < pages[ x ].length; y++ )
+		{
+			if ( pages[ x ][ y ].type== "INFO" )
+			{
+				var theName = pages[ x ][ y ].file;
+
+				// * again, remove any path
+				if ( ( slashPos = theName.lastIndexOf( "/" ) ) > 0 )
+				{
+					theName = theName.substring( slashPos + 1, theName.length );
+				}
+		
+				// * pages[ x ][ y ].file
+				if ( theName == file )
+				{
+					// * found it
+					pageNum = x;
+				}
+			
+				// * break here so we don't keep testing all the rest of the array entries after
+				// we've found the "INFO" entry	
+				break;
+			}
+		}
+		
+		// * break if we've found it
+		if ( pageNum >= 0 )
+			break;
+	}
+
+	if ( parent && parent.parent && parent.parent.globals )
+	{
+		parent.parent.globals.debug( "\tfindPageOffset: '" +file+ "' is " + pageNum );
+	}
+
+	return pageNum;
+}
+
+
+// main navigational function in Account Setup, "msg" is typically the name of a button
+// that was pressed
+function go( msg )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var editMode = false;
+	var globals = null;
+	
+	if ( parent && parent.parent && parent.parent.globals )
+		globals = parent.parent.globals;
+	
+	if ( globals != null )
+		editMode = ( globals.document.vars.editMode.value.toLowerCase() == "yes" ) ? true : false;
+
+//	var formName = new String(parent.content.location);
+	var formName = "" + parent.content.location;
+
+	if ( ( x = formName.lastIndexOf( "/" ) ) > 0 )
+		formName = formName.substring( x + 1, formName.length );
+	
+	var pageNum = findPageOffset( formName );
+	if ( pageNum >= 0 )
+		formName = pages[ pageNum ][ 0 ].file;
+
+//	var startingPageName = parent.content.document.forms[0].name;
+	var startingPageName = formName;
+	var thePlatform = globals.getPlatform();
+	var separatorString = ",";
+
+	// process messages
+
+	if ( msg == "Next" )
+	{
+		// * if something is wrong with the current page content, don't do anything
+		if ( !parent || !parent.content )
+			return;
+			
+		// * if we're currently loading, don't do anything
+		if ( parent.content.loading )
+			return;
+			
+		if ( editMode != true )
+		{
+			if ( parent.content.checkData && ( parent.content.checkData() == false ) )
+				return;
+
+			// workaround for onunload handler bugs in 4.0b2; no longer using onunload handler
+			if ( parent.content.saveData != null )
+				parent.content.saveData();
+		}
+
+		var pageName = startingPageName;
+
+		if ( globals != null )
+			globals.debug("\ngo: Starting at page " +pageName);
+
+		var acctSetupFile = "";
+		if ( globals != null )
+			acctSetupFile = globals.getAcctSetupFilename( self );
+
+		var moved = false;
+		var active = true;
+
+		while ( active )
+		{
+			active = false;			
+			var pageNum = findPageOffset( pageName );
+			if ( pageNum < 0 )
+			{
+				alert( "The file '" + pageName + "' is unknown to Account Setup." );
+				return;
+			}
+
+			for ( var x = 0; x < pages[ pageNum ].length; x++ )
+			{
+				if ( editMode == false && pages[ pageNum ][ x ].type == "CONDITION" )
+				{
+					var theFlag = globals.GetNameValuePair( acctSetupFile, pages[ pageNum ][ x ].section, 
+																			pages[ pageNum ][ x ].variable );
+					theFlag = theFlag.toLowerCase();
+					
+					if ( pages[ pageNum ][ x ].value == "..." )
+					{
+						if ( theFlag != null && theFlag != "" )
+						{
+							active = moved = true;
+							pageName = pages[ pageNum ][ x ].file;
+							break;
+						}
+					}
+					else if ( theFlag == pages[ pageNum ][ x ].value )
+					{
+						active = moved = true;
+						pageName = pages[ pageNum ][ x ].file;
+						break;
+					}
+				}
+	
+				else if ( moved == false && pages[ pageNum ][ x ].type == "METHOD" )
+				{
+					var val = eval( pages[ pageNum ][ x ].method );
+						
+					if ( globals != null )
+					{
+						globals.debug( "\tMethod: " + pages[ pageNum ][ x ].method );
+						globals.debug( "\tReturned: " + val );
+					}
+
+					if ( val == pages[ pageNum ][ x ].value )
+					{
+						active = moved = true;
+						pageName = pages[ pageNum ][ x ].file;
+						break;
+					}
+				}
+
+				else if ( moved == false && pages[ pageNum ][ x ].type == "ACTION" )
+				{
+					globals.debug( "\tAction: " + pages[ pageNum ][ x ].file );
+					active = false;
+					moved = true;
+					pageName = pages[ pageNum ][ x ].file;
+					break;
+				}
+				
+			}
+		}
+		
+		
+		if ( pageName != startingPageName )
+		{
+			if ( globals != null )
+			{
+				if ( globals.document.setupPlugin.NeedReboot() == true )
+					globals.forceReboot( pageName );
+				else
+				{
+					if ( pageName == "main.htm" )
+						globals.document.vars.pageHistory.value = "";
+					else
+						globals.document.vars.pageHistory.value += startingPageName + separatorString;
+	
+					globals.debug( "go: Moving to page " + pageName );
+	
+					pages.current = pageName;
+					parent.content.location.replace( pageName );
+
+					if ( helpWindow && helpWindow != null )
+					{
+						if ( helpWindow.closed == false )
+						{
+							doHelp( pageName );
+						}
+					}
+				}
+			}
+			else
+			{
+				pages.current = pageName;
+
+				if ( pages[ pageNum ][ 0 ].top == true )
+				{
+					parent.location.replace( pageName );
+				}
+				else
+				{
+					var theLoc = "" + parent.content.location;
+					if ( ( x = theLoc.lastIndexOf( "/" ) ) > 0 )
+					{
+						pageName = theLoc.substring( 0, x + 1 ) + pageName;
+					}
+					
+					parent.content.location.replace( pageName );
+				}
+			}
+		}
+	}
+
+	else if ( msg == "Back" )
+	{
+		if ( parent.content.loading )
+			return;
+
+		// workaround for onunload handler bugs in 4.0b2; no longer using onunload handler
+		if ( parent.content.saveData !=null )
+			parent.content.saveData();
+
+//		parent.content.history.back();
+
+		if ( parent.content.verifyData )
+		{
+			var verifyFlag = parent.content.verifyData();
+			if ( verifyFlag != true )
+			{
+				generateControls();
+				return;
+			}
+		}
+
+		if ( globals != null )
+		{
+			var historyCleanup = true;
+			while ( historyCleanup == true )
+			{
+				historyCleanup = false;
+
+				var pageHistory = globals.document.vars.pageHistory.value;
+				if ( pageHistory!="" )
+				{			
+					var pageName="";
+					x = pageHistory.lastIndexOf( separatorString );
+					pageHistory = pageHistory.substring( 0, x );
+					x = pageHistory.lastIndexOf( separatorString );
+					if ( x >= 0 )
+					{
+						pageName = pageHistory.substring( x + 1, pageHistory.length );
+						globals.document.vars.pageHistory.value = pageHistory.substring( 0, x + 1 );
+						if ( ( pageName == "register.htm" ) || ( pageName == "error.htm" ) )
+							historyCleanup = true;
+					}
+					else
+					{
+						pageName=pageHistory;
+						globals.document.vars.pageHistory.value="";
+					}
+				}
+			}
+			globals.debug("go: Moving back to page " + pageName );
+			
+			if ( pageName == "undefined" )
+				return;
+
+			pages.current = pageName;
+			if ( pageNum >= 0 && pages[ pageNum ][ 0 ].fullhistory == true )
+				parent.parent.history.back();
+			else
+				parent.content.location.replace( pageName );
+
+			if ( helpWindow && helpWindow != null )
+			{
+				if ( helpWindow.closed == false )
+					doHelp( pageName );
+			}
+		}
+		else
+		{
+			if ( pages[ pageNum ][ 0 ].fullhistory == true )
+				parent.parent.history.back();
+			else
+				parent.content.history.back();
+		}
+	}
+	else if ( msg == "Help" )
+	{
+		doHelp( formName );
+	}
+	else if ( msg == "Show Screen" )
+	{
+		var pageNum = findPageOffset( formName );
+		if ( pageNum>=0 )
+		{
+			var section = pages[ pageNum ][ 0 ].section;
+			var variable = pages[ pageNum ][ 0 ].variable;
+			if ( section != null && section!="" && variable != null && variable!="" )
+			{
+				showScreenToggle = true;
+				var acctSetupFile = globals.getAcctSetupFilename( self );
+				var theFlag = globals.GetNameValuePair( acctSetupFile, section, variable);
+				theFlag = theFlag.toLowerCase();
+				if ( theFlag == "no" )
+					theFlag="yes";
+				else
+					theFlag="no";
+				
+				parent.parent.SetNameValuePair( acctSetupFile, section, variable, theFlag);
+			}
+		}
+	}
+	else if ( msg == "Later" )
+	{
+		if ( parent.content.go( "Later" ) == true )
+		{
+
+			if ( ( globals.document.vars.editMode.value.toLowerCase() != "yes") || 
+					( confirm( "Normally, this would complete the Account Setup process and quit Communicator.  Would you like to quit now?" ) == true ) )
+			{
+//				parent.content.location.href = "later.htm";
+				if ( globals != null )
+				{
+					if ( globals.document.vars.editMode.value.toLowerCase() != "yes")
+						globals.saveGlobalData();
+					globals.document.setupPlugin.QuitNavigator();
+				}
+				window.close();
+			}
+		}
+	}
+	else if ( msg == "Done" )
+	{
+		if ( globals != null )
+		{
+			if ( globals.document.vars.editMode.value.toLowerCase() != "yes" )
+				globals.saveGlobalData();
+			if ( ( globals.document.vars.editMode.value.toLowerCase() != "yes") || 
+					( confirm( "Normally, this would complete the Account Setup process and quit Communicator.  Would you like to quit now?") == true ) )
+			{
+				globals.document.setupPlugin.QuitNavigator();
+				window.close();
+			}
+		}
+	}
+	else if ( msg == "Exit" )
+	{
+		var	longMsgFlag = true;
+		var confirmFlag = false;
+		
+		if ( formName.indexOf( "main.htm" ) >= 0 )
+			longMsgFlag = false;
+		else if ( formName.indexOf( "aboutbox.htm" ) >= 0 )
+			longMsgFlag = false;
+		else if (formName.indexOf( "error.htm" ) >= 0 )
+			longMsgFlag = false;
+		else if (formName.indexOf( "intro/" ) >= 0 )
+			longMsgFlag = false;
+		else if (formName.indexOf( "ipreview/" ) >= 0 )
+			longMsgFlag = false;
+		else if (formName.indexOf( "preview/" ) >= 0 )
+			longMsgFlag = false;
+
+		if ( longMsgFlag == true )
+		{
+			if ( globals.document.vars.editMode.value.toLowerCase() != "yes" )	
+				confirmFlag = confirm( "You haven't finished setting up your account. Are you sure you want to quit Account Setup?" );
+			else	// this is for the account setup editor
+				confirmFlag = confirm( "Are you sure you want to quit the Account Setup Editor?" );
+		}
+		else
+			confirmFlag = confirm( "Quit Account Setup?" );
+		
+		if ( confirmFlag == true )
+		{
+			if ( globals != null )
+			{
+				globals.saveGlobalData();
+				globals.document.setupPlugin.QuitNavigator();
+			}
+			window.close();
+		}
+	}
+	else if ( msg == "Restart" )
+	{
+		if ( globals.document.vars.editMode.value.toLowerCase() != "yes" )
+		{
+			globals.saveGlobalData();
+			globals.document.setupPlugin.Reboot( null );
+			window.close();
+		}
+		else
+			alert( "Cannot reboot in edit mode." );
+	}
+	else if ( msg == "About" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+		pages.current = "aboutbox.htm";
+		parent.content.location.replace( "aboutbox.htm" );
+	}
+	else if ( msg == "Setup" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+
+		var acctSetupFile = globals.getAcctSetupFilename( self );
+		var newPathFlag = globals.GetNameValuePair( acctSetupFile, "Mode Selection", "ForceNew" );
+		newPathFlag = newPathFlag.toLowerCase();
+		var existingPathFlag = globals.GetNameValuePair( acctSetupFile, "Mode Selection", "ForceExisting" );
+		existingPathFlag = existingPathFlag.toLowerCase();
+
+		var pageName="";
+		if ( newPathFlag == "yes" && existingPathFlag != "yes")
+			pageName = "needs1.htm";
+		else if ( existingPathFlag == "yes" && newPathFlag != "yes" )
+			pageName = "useAcct.htm";
+		else
+			pageName = "accounts.htm";
+		parent.content.location.replace( pageName );
+		if ( helpWindow && helpWindow != null )
+		{
+			if ( helpWindow.closed == false )
+				doHelp( pageName );
+		}
+	}
+	else if ( msg == "Edit Settings" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+		pages.current = "settings.htm";
+		parent.content.location.replace( "../CG/docs/settings.htm" );
+	}
+	else if ( msg == "Manage Servers" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+		pages.current = "editregs.htm";
+		parent.content.location.replace( "../CG/docs/editregs.htm" );
+	}
+	else if ( msg == "Manage Accounts" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+		pages.current = "editisps.htm";
+		parent.content.location.replace( "../CG/docs/editisps.htm" );
+	}
+	else if ( msg == "Edit IAS" )
+	{
+		if ( thePlatform == "Macintosh" )
+			globals.document.vars.pageHistory.value += "../../Tools/CG/docs/" + startingPageName + separatorString;
+		else
+			globals.document.vars.pageHistory.value += "../../../AccountSetupTools/CG/docs/" + startingPageName + separatorString;
+			
+		pages.current = "addias.htm";
+		parent.content.location.replace("ias/addias.htm");
+	}
+	else if ( msg == "Edit NCI" )
+	{
+		if (thePlatform == "Macintosh")
+			globals.document.vars.pageHistory.value += "../../Tools/CG/docs/" + startingPageName + separatorString;
+		else
+			globals.document.vars.pageHistory.value += "../../../AccountSetupTools/CG/docs/" + startingPageName + separatorString;
+		pages.current = "addnci.htm";
+		parent.content.location.replace( "nci/addnci.htm" );
+	}	
+	else if ( msg == "Screen Options" )
+	{
+		globals.document.vars.pageHistory.value += startingPageName + separatorString;
+			
+		if ( formName == "namepw.htm" )
+		{
+			pages.current = "asktty.htm";
+			parent.content.location.replace( "../CG/docs/asktty.htm" );
+		}
+		//else if (formName == "servers.htm")	{
+		//		pages.current = "askserv.htm";
+		//		parent.content.location.replace("../CG/docs/askserv.htm");
+		//		}
+		else if ( formName == "ok.htm" )
+		{
+			pages.current = "asksvinf.htm";
+			parent.content.location.replace( "../CG/docs/asksvinf.htm" );
+		}
+		else if ( formName == "okreboot.htm" )
+		{
+			pages.current = "asksvinf.htm";
+			parent.content.location.replace( "../CG/docs/asksvinf.htm" );
+		}
+		else if ( formName == "billing.htm" )
+		{
+			pages.current = "editcc.htm";
+			parent.content.location.replace( "../CG/docs/editcc.htm" );
+		}
+		else if ( formName == "main.htm" )
+		{
+			pages.current = "settings.htm";
+			parent.content.location.replace( "../CG/docs/settings.htm" );
+		}
+		else if ( formName == "useAcct.htm" )
+		{
+			pages.current = "editisps.htm";
+			parent.content.location.replace( "../CG/docs/editisps.htm" );
+		}
+		else if ( formName == "connect1.htm" )
+		{
+			pages.current = "editregs.htm";
+			parent.content.location.replace( "../CG/docs/editregs.htm" );
+		}		
+
+	}	//end screen options special casing
+		
+	else	
+		parent.content.go( msg );
+//	generateControls();
+}
+
+
+
+function loadData()
+{
+	var file="";
+		
+//	preLoadImages();
+
+	if (parent && parent.parent && parent.parent.globals)	{
+		file = parent.parent.globals.document.vars.startupFile.value;
+		}
+	if (file != null && file != "")	{
+		if (parent && parent.parent && parent.parent.globals)	{
+			parent.parent.globals.document.vars.startupFile.value = "";
+			}
+		parent.content.location.replace(file);
+		}
+	generateControls();
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/clayer2.js
+++ b/mozilla/cmd/dialup/as_html/clayer2.js
@@ -0,0 +1,875 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+// globals
+var theToolBar = null; 					// a global pointer to our toolbar - should it exist
+var helpWindow = null;
+var preLoaded = false;
+
+var backImages 		= null;
+var helpImages		= null;
+var exitImages		= null;
+var nextImages		= null;
+var connectImages	= null;
+var doneImages		= null;
+var ffImages		= null;
+var rebootImages	= null;
+
+
+compromisePrincipals();
+
+
+function preLoadImages()
+{
+	if ( preLoaded == false )
+	{
+		//img[0] is the normal image
+		//img[1] is the mouseover
+		//img[2] is the mousedown
+		 
+		backImages		= new Array;
+		helpImages		= new Array;
+		exitImages		= new Array;
+		nextImages		= new Array;
+		connectImages	= new Array;
+		doneImages		= new Array;
+		ffImages		= new Array;
+		rebootImages	= new Array;
+
+		backImages[0] = new Image(32,32);
+		backImages[0].src = "images/bk_up.gif";
+		backImages[1] = new Image(32,32);
+		backImages[1].src = "images/bk_mo.gif";
+		backImages[2] = new Image(32,32);
+		backImages[2].src = "images/bk_down.gif";
+
+		helpImages[0] = new Image(32,32);
+		helpImages[0].src = "images/hlp_up.gif";
+		helpImages[1] = new Image(32,32);
+		helpImages[1].src = "images/hlp_mo.gif";
+		helpImages[2] = new Image(32,32);
+		helpImages[2].src = "images/hlp_down.gif";
+
+		exitImages[0] = new Image(32,32);
+		exitImages[0].src = "images/ext_up.gif";
+		exitImages[1] = new Image(32,32);
+		exitImages[1].src = "images/ext_mo.gif";
+		exitImages[2] = new Image(32,32);
+		exitImages[2].src = "images/ext_down.gif";
+
+		nextImages[0] = new Image(32,32);
+		nextImages[0].src = "images/nxt_up.gif";
+		nextImages[1] = new Image(32,32);
+		nextImages[1].src = "images/nxt_mo.gif";
+		nextImages[2] = new Image(32,32);
+		nextImages[2].src = "images/nxt_down.gif";
+
+		rebootImages[0] = new Image(32,32);
+		rebootImages[0].src = "images/rb_up.gif";
+		rebootImages[1] = new Image(32,32);
+		rebootImages[1].src = "images/rb_mo.gif";
+		rebootImages[2] = new Image(32,32);
+		rebootImages[2].src = "images/rb_down.gif";
+
+		connectImages[0] = new Image(32,32);
+		connectImages[0].src = "images/cn_up.gif";
+		connectImages[1] = new Image(32,32);
+		connectImages[1].src = "images/cn_mo.gif";
+		connectImages[2] = new Image(32,32);
+		connectImages[2].src = "images/cn_down.gif";
+
+		doneImages[0] = new Image(32,32);
+		doneImages[0].src = "images/dn_up.gif";
+		doneImages[1] = new Image(32,32);
+		doneImages[1].src = "images/dn_mo.gif";
+		doneImages[2] = new Image(32,32);
+		doneImages[2].src = "images/dn_down.gif";
+
+		ffImages[0] = new Image(32,32);
+		ffImages[0].src = "images/ff_up.gif";
+		ffImages[1] = new Image(32,32);
+		ffImages[1].src = "images/ff_mo.gif";
+		ffImages[2] = new Image(32,32);
+		ffImages[2].src = "images/ff_down.gif";
+
+		preLoaded = true;
+		}
+}
+
+
+
+function generateControls()
+{
+	var	editMode				=	false;
+	var	showAcctsetEdit			=	false;
+	var	showRegFileEdit			=	false;
+	var	showISPFileEdit			=	false;
+	var showExit				=	true;
+	var	showHelp				=	true;
+	var	showBack				=	true;
+	var	showNext				=	true;
+	var	showConnectServer		=	false;
+	var	showConnectISP			=	false;
+	var	showConnectNow			=	false;
+	var showDownload			=	false;
+	var	showConnectLater		=	false;
+	var	showAgain				=	false;
+	var	showDone				=	false;
+	var	showRestart				=	false;
+	var showSetupShortcut		=	false;
+	var	showInternet			=	false;
+	var	showScreenToggle		=	false;
+	var	screenVisible			=	true;
+	var showScreenOptions		=	false;
+
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	if ( parent && parent.parent && parent.parent.globals )
+	{
+		editMode = ( parent.parent.globals.document.vars.editMode.value.toLowerCase() == "yes" ) ? true : false;
+	}
+
+//	var formName = parent.content.location.toString();
+	var formName = "" + parent.content.location;
+	if ( formName != null && formName != "" && formName != "about:blank" )
+	{
+		if ( ( x = formName.lastIndexOf( "/" ) ) > 0 )
+			formName = formName.substring( x + 1, formName.length );
+
+		if ( editMode == true )
+		{
+			var section = null;
+			var variable = null;
+			var pageNum = findPageOffset( formName );
+			if ( pageNum >= 0 )
+			{
+				section = pages[ pageNum ][ 0 ].section;
+				variable = pages[ pageNum ][ 0 ].variable;
+				if ( section!=null && section!="" && variable!=null && variable!="" )
+				{
+					showScreenToggle = true;
+					var theFile = parent.parent.globals.getAcctSetupFilename( self );
+					var theFlag = parent.parent.globals.GetNameValuePair( theFile, section, variable );
+					theFlag = theFlag.toLowerCase();
+					if ( theFlag == "no" )
+						screenVisible = false;
+				}
+			}
+		}
+
+		if ( formName == "main.htm" )
+		{
+			showBack = false;
+			showNext = false;
+			if ( navigator.javaEnabled() == false )
+			{
+				showNext = false;
+				editMode = false;
+				showAcctsetEdit = false;
+				showISPFileEdit = false;
+				showRegFileEdit = false;
+				document.writeln( "<CENTER><STRONG>Java support is disabled!<P>\n" );
+				document.writeln( "Choose Options | Network Preferences and enable Java, then try again.</STRONG></CENTER>\n" );
+			}
+			else if ( !navigator.mimeTypes[ "application/x-netscape-autoconfigure-dialer" ] ) 
+			{
+				showNext = false;
+				editMode = false;
+				showAcctsetEdit = false;
+				showISPFileEdit = false;
+				showRegFileEdit = false;
+				document.writeln( "<CENTER><STRONG>The 'Account Setup Plugin' is not installed!<P>\n" );
+				document.writeln( "Please install the plugin, then run 'Account Setup' again.</STRONG></CENTER>\n" );
+			}
+			else if ( parent.parent.globals.document.setupPlugin == null )
+			{
+				showNext = false;
+				editMode = false;
+			}
+			if ( editMode == true )
+			{
+				showAcctsetEdit = true;
+				showScreenOptions = true;
+			}
+		}
+		else if ( editMode == true && formName == "useAcct.htm" )
+		{
+			showScreenOptions = true;
+		} 
+		else if ( editMode == true && formName == "servers.htm" )
+		{
+			showScreenOptions = false;
+		}
+		else if ( editMode == true && formName == "billing.htm" )
+		{
+			showScreenOptions = true;
+		}
+		else if ( formName == "accounts.htm" )
+		{
+			showNext = false;
+		}
+		else if ( formName == "compare.htm" )
+		{
+		}
+		else if ( formName == "connect1.htm" )
+		{
+			showNext = false;
+			showConnectServer = true;
+			if ( editMode == true )
+				showScreenOptions = true;
+		}
+		else if ( formName == "download.htm" )
+		{
+			showNext = false;
+			showConnectServer = true;
+			if ( editMode == true )
+				showScreenOptions = true;
+		}
+		else if ( formName == "connect2.htm" )
+		{
+			showNext = false;
+			showExit = false;
+			showConnectNow = true;
+			showConnectLater = true;
+		}
+		else if ( formName == "1step.htm" )
+		{
+			showNext = false;
+			showExit = false;
+			showHelp = false;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "2stpwrap.htm" )
+		{
+			showNext = false;
+			showConnectISP = true;
+			if ( editMode == true )
+				showScreenOptions = true;
+		}
+		else if ( formName == "register.htm" )
+		{
+			showHelp = false;
+			showBack = false;
+			showNext = false;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "ok.htm" )
+		{
+			showScreenOptions = true;
+			showBack = false;
+			showExit = false;
+			showNext = false;
+			showInternet = true;
+			showDone = true;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "okreboot.htm" )
+		{
+			showScreenOptions = true;
+			showBack = false;
+			showNext = false;
+			showExit = false;
+			showDone = false;
+			showRestart = true;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "error.htm" )
+		{
+			showBack = true;
+			showExit = true;
+			showNext = false;
+			showAgain = true;
+			showDone = false;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "later.htm" )
+		{
+			showBack = false;
+			showExit = false;
+			showNext = false;
+			showDone = true;
+			if ( editMode == true )
+				showBack = true;
+		}
+		else if ( formName == "intro1.htm" )
+		{
+			showSetupShortcut = false;
+		}
+		else if ( formName == "settings.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "editregs.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "editisps.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "aboutbox.htm" )
+		{
+			showHelp = false;
+			showNext = false;
+			showBack = true;
+		}
+		else if ( formName == "namepw.htm" )
+		{
+			showScreenOptions = true;
+		}
+		else if ( formName == "asktty.htm" )
+		{
+			showScreenOptions = false;
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "askserv.htm" )
+		{
+			showScreenOptions = false;
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "asksvinf.htm" )
+		{
+			showScreenOptions = false;
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "showphon.htm" )
+		{
+			showScreenOptions = false;
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "editcc.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "addnci.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "addias.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+		else if ( formName == "editfour.htm" )
+		{
+			showBack = true;
+			showNext = false;
+			editMode = false;
+		}
+
+		if ( document && document.layers && document.layers[ "controls" ] &&
+				document.layers[ "controls" ].document &&
+				document.layers[ "controls" ].document.layers &&
+				document.layers[ "controls" ].document.layers.length > 0 )
+		{
+			document.layers[ "controls" ].layers[ "help" ].visibility = ( ( showHelp == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "exit" ].visibility = ( ( showExit == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "back" ].visibility = ( ( showBack == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "next" ].visibility = ( ( showNext == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "connectnow" ].visibility = ( ( showConnectNow == true ) ? "show" : "hide" );
+			document.layers[ "controls" ].layers[ "download" ].visibility = ( ( showDownload == true ) ? "show" : "hide" ); 
+			document.layers[ "controls" ].layers[ "connectserver" ].visibility = ( ( showConnectServer == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "connectisp" ].visibility = ( ( showConnectISP == true ) ? "show" : "hide" );
+			document.layers[ "controls" ].layers[ "connectagain" ].visibility = ( ( showAgain == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "done" ].visibility = ( ( showDone == true) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "restart" ].visibility = ( ( showRestart == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "connectlater" ].visibility = ( ( showConnectLater == true ) ? "show" : "hide" );			
+			document.layers[ "controls" ].layers[ "setup" ].visibility = ( ( showSetupShortcut == true ) ? "show" : "hide" );			
+
+			//NEW - Generate the controls for the toolbar, if it exists
+			if ( ( !theToolBar ) || ( theToolBar == null ) || ( !theToolBar.location ) || ( theToolBar.closed ) )
+			{
+				//alert("opening toolbar");
+				theToolBar = openToolBar();
+			}
+			else
+			{
+				//alert("toolbar open, generating controls" + theToolBar);
+				generateToolBarControls();	
+			}
+		}
+		else
+		{
+			setTimeout( "generateControls()", 1000 );
+		}
+		
+
+		}
+	else
+	{
+		setTimeout( "generateControls()", 1000 );
+	}
+}
+
+
+
+function doHelp(formName)
+{
+		var thePlatform;
+
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	helpFile = "./help/ashelp.htm";
+
+	var helpPath = "";
+	if (parent && parent.parent && parent.parent.globals)	{
+		helpPath = "" + parent.parent.globals.getFolder(self);
+
+		thePlatform = new String(navigator.userAgent);
+		var x=thePlatform.indexOf("(")+1;
+		var y=thePlatform.indexOf(";",x+1);
+		thePlatform=thePlatform.substring(x,y);
+		if (thePlatform == "Macintosh")	{						// Macintosh support
+			helpPath = helpPath + "help:";
+			}
+		else	{												// Windows support
+			helpPath = helpPath + "help/";
+			}
+
+		if (thePlatform != "Macintosh") {
+
+			var hpath=unescape(location.pathname);
+			hpath = hpath.substring(0, hpath.lastIndexOf('/'));
+			helpFile = hpath + "/help/ashelp.htm";
+
+			// get rid of the return char at the end of .htm
+			formName = formName.substring(0, formName.indexOf('.htm')+4);
+			// next, get rid of sub folders in formName
+			while (formName.indexOf('/') > 0)
+				formName = formName.substring(formName.indexOf('/')+1, formName.length);
+		}
+
+		var theList = parent.parent.globals.document.setupPlugin.GetFolderContents(helpPath,".htm");
+		if (theList != null)	{
+			for (var i=0; i<theList.length; i++)	{
+				if (formName == theList[i])	{
+					if (thePlatform != "Macintosh") {
+						var currentpath=unescape(location.pathname);
+						currentpath = currentpath.substring(0, currentpath.lastIndexOf('/'));
+						helpFile = currentpath + "/help/" + formName;
+					} else { 
+						helpFile = "./help/" + formName;
+					}
+					break;
+					}
+				}
+			}
+		}
+
+	if (helpFile != null && helpFile != "")	{
+		if (helpWindow == null || helpWindow.closed)	{
+			helpWindow=window.open("about:blank","Documentation","width=328,height=328,alwaysRaised=yes,dependent=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes");
+			}
+		if (helpWindow && helpWindow != null)	{
+			helpWindow.focus();
+			helpWindow.location = helpFile;
+			}
+		}
+}
+
+
+
+//here are a bunch of functions for the floating toolbar
+
+
+
+function openToolBar()
+{
+
+		var thePlatform = new String(navigator.userAgent);
+		var x=thePlatform.indexOf("(")+1;
+		var y=thePlatform.indexOf(";",x+1);
+		thePlatform=thePlatform.substring(x,y);
+
+		var	editMode = false;
+
+	if (parent && parent.parent && parent.parent.globals)	{
+		editMode=(parent.parent.globals.document.vars.editMode.value.toLowerCase() == "yes") ? true:false;
+		}
+
+	if (editMode == true)	
+	{
+		if (!(theToolBar) || (theToolBar == null) || !(theToolBar.location)) 
+		{
+			if (thePlatform == "Macintosh")	
+				theToolBar = top.open("../../Tools/Kit/config.htm","Configurator","width=400,height=104,dependent=yes,alwaysraised=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no");
+			else
+				theToolBar = top.open("../../../AccountSetupTools/Kit/config.htm","Configurator","width=400,height=104,dependent=yes,alwaysraised=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no");
+				
+		}
+	}
+	else
+	{
+		theToolBar = null;
+	}
+	return theToolBar;
+}
+
+
+
+function showLayer(layerName, showIfTrue)
+{	
+	//alert("showLayer "+showIfTrue);
+	//parent.parent.globals.debug("showing layer: " + layerName + " " + showIfTrue + " layers: " + theToolBar.document.layers.length + " " + theToolBar.document.layers[layerName]);
+	if ((theToolBar) && (theToolBar!=null)  && (theToolBar.location) && (theToolBar.finishedLoading()))
+	{
+				var gLayerName = "g_" + layerName;
+				//var theLayer = eval("theToolBar.document.layers." + layerName);
+				//parent.parent.globals.debug("theLayer: "+theLayer+ " but t.d.l.l: " + theToolBar.document.layers[layerName]);
+				//var gLayer = eval("theToolBar.document.layers.g_" + layerName);
+				
+				//if (theLayer)
+				{
+					if (showIfTrue == true)
+					{
+						//theToolBar.document.layers[layerName].visibility ="show";
+						theToolBar.showlayer(layerName);
+						theToolBar.hidelayer(gLayerName);
+						//theLayer.visibility="show";
+						//if (gLayer) gLayer.visibility="hide";
+					}
+					else
+					{
+						theToolBar.hidelayer(layerName);
+						theToolBar.showlayer(gLayerName);
+						//theToolBar.document.layers[layerName].visibility ="hide";	
+						//theLayer.visibility="hide";
+						//if (gLayer) gLayer.visibility="show";
+					}
+				}
+				//else
+					//theToolBar.history.go(0);
+
+	}
+}
+
+function screenVisible()
+{
+	var isVisible = true;
+	var formName = parent.content.location.toString();
+	if (formName!=null && formName!="")	{
+		if ((x=formName.lastIndexOf("/"))>0)	{
+			formName=formName.substring(x+1,formName.length);
+			}
+			var section=null;
+			var variable=null;
+			var pageNum=findPageOffset(formName);
+			if (pageNum>=0)	{
+				section=pages[pageNum][0].section;
+				variable=pages[pageNum][0].variable;
+				if (section!=null && section!="" && variable!=null && variable!="")	{
+					var theFile = parent.parent.globals.getAcctSetupFilename(self);
+					var theFlag = parent.parent.globals.GetNameValuePair(theFile,section, variable);
+					theFlag = theFlag.toLowerCase();
+					if (theFlag == "no")	
+						isVisible=false;	
+					}
+				}
+	//alert("clayer: screenVisible = : " + isVisible + "flag (" + variable + ") = " + theFlag);
+	}
+	return isVisible;
+}
+
+function showScreen(inValue)
+{
+	//alert("in showscreen");
+	var formName = parent.content.location.toString();
+	
+	if (formName!=null && formName!="")	
+	{
+		if ((x=formName.lastIndexOf("/"))>0)	{
+		formName=formName.substring(x+1,formName.length);
+		}
+
+		//alert("formName: " + formName);
+		var pageNum=findPageOffset(formName);
+		if (pageNum>=0)	
+		{
+			var section=pages[pageNum][0].section;
+			var variable=pages[pageNum][0].variable;
+			//alert("sec: " + section + " var: "+variable); 
+			if (section!=null && section!="" && variable!=null && variable!="")	{
+				var theFile = parent.parent.globals.getAcctSetupFilename(self);
+				var theFlag; // = parent.parent.globals.GetNameValuePair(theFile,section, variable);
+
+
+				//theFlag = theFlag.toLowerCase();
+				//if (theFlag == "no")	theFlag="yes";
+				//else			theFlag="no";
+				
+				if (inValue == false)
+					theFlag = "no";
+				else
+					theFlag = "yes";
+				
+				//alert("Setting flag " + variable + " to " + theFlag + " invalue: " + inValue);
+				parent.parent.globals.SetNameValuePair(theFile,section, variable,theFlag);
+				return (theFlag == "yes");
+				}
+		}		
+		else
+		{
+			alert("This screen cannot be suppressed");
+			return true;	//forces the checkbox back on
+		}
+	}
+}
+
+
+function generateToolBarControls()
+{
+	var editMode				=	false;
+//	var	editMode				=	parent.parent.editMode();
+	var	showScreenToggle		=	false;	
+	var showScreenOptions		=	false;
+	var isScreenVisible			=	true;
+	var showEditHelp			= 	true;
+	
+	//var	showAcctsetEdit			=	false;
+	//var	showRegFileEdit			=	false;
+	//var	showISPFileEdit			=	false;
+
+	if (parent && parent.parent && parent.parent.globals)	{
+		editMode=(parent.parent.globals.document.vars.editMode.value.toLowerCase() == "yes") ? true:false;
+		}
+
+//	var formName = parent.content.location.toString();
+	var formName = "" + parent.content.location;
+
+	if (formName!=null && formName!="")	
+	{
+		if ((x=formName.lastIndexOf("/"))>0)	{
+			formName=formName.substring(x+1,formName.length);
+			}
+
+		// this decides whether we should show the checkbox
+		var pageNum=findPageOffset(formName);
+		if (pageNum>=0)	
+		{
+			section=pages[pageNum][0].section;
+			variable=pages[pageNum][0].variable;
+			if (section!=null && section!="" && variable!=null && variable!="")	{
+				showScreenToggle=true;
+				//var theFile = parent.parent.globals.getAcctSetupFilename(self);
+				//var theFlag = parent.parent.globals.GetNameValuePair(theFile,section, variable);
+				//theFlag = theFlag.toLowerCase();
+				//if (theFlag == "no")	screenVisible=false;
+				}
+		}
+
+
+		if (formName == "main.htm")
+			showScreenOptions=true;
+		else if (formName == "useAcct.htm")
+			showScreenOptions=true;
+		else if (formName == "servers.htm")
+			showScreenOptions=false;
+		else if (formName == "billing.htm")
+			showScreenOptions=true;
+		else if (formName == "connect1.htm")
+				showScreenOptions=true;
+		else if (formName == "connect2.htm")
+			;
+		else if (formName == "register.htm")
+			;
+		else if (formName == "ok.htm")
+			showScreenOptions=true;
+		else if (formName == "okreboot.htm")
+			showScreenOptions=true;
+		else if (formName == "error.htm")
+			;
+		else if (formName == "later.htm")
+			;
+		else if (formName == "settings.htm")
+			editMode = false;
+		else if (formName == "editregs.htm")
+			editMode=false;
+		else if (formName == "editisps.htm")
+			editMode=false;
+		else if (formName == "aboutbox.htm")
+			;
+		else if (formName == "namepw.htm")
+			showScreenOptions=true;
+
+		else if (formName == "asktty.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "askserv.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "asksvinf.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "showphon.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "editcc.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "addnci.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "addias.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+		else if (formName == "editfour.htm")
+		{
+			showScreenOptions=false;
+			editMode=false;
+		}
+
+
+		if (theToolBar && theToolBar != null && (theToolBar.location) && (theToolBar.document.layers) && !(theToolBar.closed)
+			&& (theToolBar.ready) && (theToolBar.ready == true))
+		{
+
+			if (theToolBar.finishedLoading())
+			{
+				showLayer("reload", editMode);
+				showLayer("edit", editMode);
+				showLayer("chooseed", editMode);
+				showLayer("edithelp", editMode);
+				showLayer("options", showScreenOptions);
+				showLayer("showscreen", showScreenToggle);
+				if (showScreenToggle == true)
+					theToolBar.setShowScreenBox();
+				
+				theToolBar.updateLayersLayer();
+				//alert("found toolbar! - setting help location");
+				theToolBar.setHelpLocation();
+				
+			}
+			else
+			{
+				//alert("Found toolbar, without reloadlayer!");
+				theToolBar.history.go(0);	
+			}
+		}
+		//else
+			//alert("warning: toolbar not found");
+	}
+}
+
+function showDocumentLayer(inLayerName, inDoShow)
+{
+	if (inDoShow == "hide")
+		inDoShow = false;
+	else if (inDoShow != false)
+		inDoShow = true;
+	
+	if (parent.content && parent.content.document.layers[inLayerName])
+	{
+		if (inDoShow == true)
+		{
+			parent.content.document.layers[inLayerName].visibility = "show";
+			//alert("showing layer: " + inLayerName);
+		}
+		else
+		{
+			parent.content.document.layers[inLayerName].visibility = "hide";
+			//alert("hiding layer: " + inLayerName);
+		}
+	}
+
+}
+
+
+function countDocumentLayers()
+{
+	if (parent.content.document.layers)
+		return parent.content.document.layers.length;
+	else
+		return 0;
+}
+
+function getLayerName(inIndex)
+{
+	if (parent.content.document.layers && parent.content.document.layers[inIndex])
+		return parent.content.document.layers[inIndex].name;
+	return null;
+}
+
+function getLayerSrc(inIndex)
+{
+	if (parent.content.document.layers && parent.content.document.layers[inIndex])
+		return parent.content.document.layers[inIndex].src;
+	return null;
+}
+
+function getDocumentLocation()
+{
+	return parent.content.document.location;
+}
+
+function getDocumentLayerVisibility(inLayerName)
+{
+	if (parent.content.document.layers && parent.content.document.layers[inLayerName])
+		return parent.content.document.layers[inLayerName].visibility;
+	else 
+		return null;
+
+}
+
+function reloadDocument()
+{
+	top.globals.debug("RELOADING DOCUMENT!!!!" + parent.content.history);
+	if (parent.content.history)
+		parent.content.history.go(0);
+}
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/cmprehd.htm
+++ b/mozilla/cmd/dialup/as_html/cmprehd.htm
@@ -0,0 +1,45 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<HTML>
+<HEAD>
+<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="cmprehd.js"></SCRIPT>
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js"></LINK>
+</HEAD>
+
+<BODY BACKGROUND="images/bg.gif" onLoad="loadData()" BGCOLOR="cccccc" ID="cmprehd001">
+
+<!-- The layer below contains the Account Setup identifier. -->
+<LAYER NAME="tagtext" LEFT=420 TOP=0 VISIBILITY=SHOW>
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+</LAYER>
+
+<P CLASS="title"><B>Compare Internet Service Providers</B></P>
+<P>Select an Internet Service Provider (ISP) to get more information and begin
+account creation.</P>
+<P CLASS="comparesmall">
+<B CLASS="compare">Provider Highlights:</B>
+	<IMG SRC="metadata/images/feature1.gif" HEIGHT=16 WIDTH=16><B>Free Account Time!</B>
+	<IMG SRC="metadata/images/feature2.gif" HEIGHT=16 WIDTH=16>Phone Bill Billing
+	<IMG SRC="metadata/images/feature3.gif" HEIGHT=16 WIDTH=16>Web Page Hosting
+</P>
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/cmprehd.js
+++ b/mozilla/cmd/dialup/as_html/cmprehd.js
@@ -0,0 +1,28 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+function loadData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+	
+	if ( parent.parent.controls.generateControls )
+		parent.parent.controls.generateControls();
+}
+
+// end hiding contents from old browers -->
--- a/mozilla/cmd/dialup/as_html/compwrap.htm
+++ b/mozilla/cmd/dialup/as_html/compwrap.htm
@@ -0,0 +1,28 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<HTML>
+<HEAD>
+<TITLE>Account Setup</TITLE>
+<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="compwrap.js"></SCRIPT>
+</HEAD>
+
+<FRAMESET rows="140,*" BORDER=0 FRAMEBORDER="no">
+	<FRAME NAME="compareheader" SRC="cmprehd.htm" NORESIZE SCROLLING="no">
+	<FRAME NAME="compare" SRC="compare.htm" NORESIZE>
+</FRAMESET>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/compwrap.js
+++ b/mozilla/cmd/dialup/as_html/compwrap.js
@@ -0,0 +1,39 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+function go( msg )
+{
+	parent.parent.globals.debug( "compwrap go" );
+	
+	if ( compare.ispRadio != null && compare.ispRadio != "" )
+	{
+		parent.parent.globals.debug( compare.ispRadio );
+		parent.parent.globals.selectedISP = compare.ispRadio;
+		return true;
+	}
+	alert( "You haven't selected an ISP" );
+	return false;
+}
+
+function checkData()
+{
+	return true;
+}
+
+// end hiding contents from old browers -->
--- a/mozilla/cmd/dialup/as_html/config/ACCTSET.INI
+++ b/mozilla/cmd/dialup/as_html/config/ACCTSET.INI
@@ -0,0 +1,48 @@
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+; 
+;  The contents of this file are subject to the Netscape Public License
+;  Version 1.0 (the "NPL"); you may not use this file except in
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+;  http://www.mozilla.org/NPL/
+; 
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+;  for the specific language governing rights and limitations under the
+;  NPL.
+; 
+;  The Initial Developer of this code under the NPL is Netscape
+;  Communications Corporation.  Portions created by Netscape are
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+;  Reserved.
+;
+[Mode Selection]
+IntlMode=no
+ForceNew=no
+ForceExisting=no
+ExistingSRFile=
+Show_Intro_Screens=yes
+Dialer_Disconnect_After=
+RegSource=APL
+
+[New Acct Mode]
+ShowNewPathInfo=yes
+AskPersonalInfo=yes
+AskBillingInfo=yes
+CardTypes="AX,DC,MC,VI"
+RegServer=
+SavePasswords=yes
+AskSaveAcctInfo=yes
+
+[Existing Acct Mode]
+ShowNoneAbove=yes
+ShowExistingPathInfo=yes
+ShowPhones=no
+AskName=yes
+AskPhone=yes
+AskLogin=yes
+AskTTY=yes
+AskEmail=yes
+AskHosts=yes
+AskDNS=yes
+AskPublishing=yes
+RegPodURL=http://home.netscape.com/home/register.html
--- a/mozilla/cmd/dialup/as_html/config/RegServ.IAS
+++ b/mozilla/cmd/dialup/as_html/config/RegServ.IAS
@@ -0,0 +1,45 @@
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+; 
+;  The contents of this file are subject to the Netscape Public License
+;  Version 1.0 (the "NPL"); you may not use this file except in
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+;  http://www.mozilla.org/NPL/
+; 
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+;  for the specific language governing rights and limitations under the
+;  NPL.
+; 
+;  The Initial Developer of this code under the NPL is Netscape
+;  Communications Corporation.  Portions created by Netscape are
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+;  Reserved.
+;
+[Dial-In Configuration]
+ScriptFileName=
+Phone=+1 (800) 638-8290
+Password=YWg0ZrhvamYLZix1ADRvdWpttnp3
+Name=mozillarama
+Description=Netscape Internet Account Server
+SiteName=Netscape Internet Account Server
+
+[IP]
+RegCGI=https://reggie.netscape.com/IAS5/docs/reg.cgi
+DNSAddress2=205.217.225.20
+DNSAddress=205.217.225.10
+DomainName=netscape.com
+IPAddress=0.0.0.0
+Enabled=Yes
+
+[Configuration]
+REG_SCRIPTING=
+RegRoot=https://reggie.netscape.com/IAS5/docs/
+
+[Security]
+SecurityDevice=No
+
+; This is a sample registration file that logs into the 
+; Netscape Internet Account Server.
+; New User Interface
+; This file should be replaced with registration file(s)
+; specific to your registration server.
--- a/mozilla/cmd/dialup/as_html/connect1.htm
+++ b/mozilla/cmd/dialup/as_html/connect1.htm
@@ -0,0 +1,79 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="connect1.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="connect100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+
+<P CLASS="title"><B>Connect to Server</B></P>
+	
+<P>Account Setup will now connect you to the Internet account server, where you can learn about the account plans available and create an account. After Account Setup dials your modem and makes a connection, the Internet account server screens are displayed here, in the Account Setup window.</P>
+
+<P>When evaluating account plans, think about these questions:</P>
+
+<UL>
+	<LI>How much time do you think you'll spend on the Internet each month?</LI>
+	<LI>What are the monthly or hourly rates?</LI>
+	<LI>What technical support is offered?</LI>
+</UL>
+
+
+
+<P ID="nospace">Make sure your modem is properly connected and turned on, then click Connect to Server to begin.</P>
+
+<CENTER>
+<SCRIPT LANGUAGE = "JavaScript" ID="connect101">
+		generateRegServerList();
+</SCRIPT>
+</CENTER>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/connect1.js
+++ b/mozilla/cmd/dialup/as_html/connect1.js
@@ -0,0 +1,134 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	if (parent.parent.globals.document.vars.editMode.value != "yes")	{
+		// if RegServer specified in ACCTSET.INI, use it
+	
+		var theFile = parent.parent.globals.getAcctSetupFilename(self);
+		var intlFlag = parent.parent.globals.GetNameValuePair(theFile,"Mode Selection","IntlMode");
+		intlFlag = intlFlag.toLowerCase();
+	
+		var theRegFile = parent.parent.globals.GetNameValuePair(theFile,"New Acct Mode","RegServer");
+		
+		if (theRegFile != null && theRegFile != "")	{
+			parent.parent.globals.document.vars.regServer.value = theRegFile;
+			}
+		else	{
+			// otherwise, if multiple .IAS files exist, get list selection and determine appropriate .IAS file
+	
+			var pathName = parent.parent.globals.getConfigFolder(self);
+			var theList = parent.parent.globals.document.setupPlugin.GetFolderContents(pathName,".IAS");
+			if (theList != null)	{
+				if (theList.length >1)	{
+					if (document.forms[0].regServerList.selectedIndex<0)	{
+						alert("Please select an Internet account server.");
+						return(false);
+						}
+					for (var x=0; x<theList.length; x++)	{
+						var file = parent.parent.globals.getConfigFolder(self) + theList[x];
+						var name = parent.parent.globals.document.setupPlugin.GetNameValuePair(file,"Dial-In Configuration","SiteName");
+	
+						if (name == document.forms[0].regServerList.options[document.forms[0].regServerList.selectedIndex].text)	{
+							parent.parent.globals.document.vars.regServer.value = theList[x];
+							break;
+							}
+						}
+					if (parent.parent.globals.document.vars.regServer.value == "")	{
+						alert("Internal problem locating appropriate registration server file.");
+						return(false);
+						}
+					}
+				else if (theList.length==1)	{
+					parent.parent.globals.document.vars.regServer.value = theList[0];
+					}
+				else	{
+					alert("Internal problem locating a registration server file.");
+					return(false);
+					}
+				}
+			else	{
+				alert("Internal problem locating appropriate registration server file.");
+				return(false);
+				}
+			}
+		return(true);
+		}
+	else	{
+		return(false);
+		}
+}
+
+
+
+function checkData()
+{
+	return(true);
+}
+
+
+
+function loadData()
+{
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+}
+
+
+
+function generateRegServerList()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	// if RegServer is not specified in ACCTSET.INI and multiple .IAS files exist, build list
+
+	var theFile = parent.parent.globals.getAcctSetupFilename(self);
+	var theRegFile = parent.parent.globals.GetNameValuePair(theFile,"New Acct Mode","RegServer");
+	
+	if (theRegFile == null || theRegFile == "")	{
+		var pathName = parent.parent.globals.getConfigFolder(self);
+		var theList = parent.parent.globals.document.setupPlugin.GetFolderContents(pathName,".IAS");
+		if (theList != null)	{
+			if (theList.length >1)	{
+				document.writeln("<TABLE CELLPADDING=2 CELLSPACING=0 ID='minspace'><TR><TD ALIGN=LEFT VALIGN=TOP HEIGHT=25><spacer type=vertical size=2><B>Select an Internet account server:</B></TD><TD ALIGN=LEFT VALIGN=TOP><FORM><SELECT NAME='regServerList'>");
+				for (var x=0; x<theList.length; x++)	{
+					var file = parent.parent.globals.getConfigFolder(self) + theList[x];
+					var name = parent.parent.globals.document.setupPlugin.GetNameValuePair(file,"Dial-In Configuration","SiteName");
+					var selected=(x==0) ? " SELECTED":"";
+					document.writeln("<OPTION VALUE='" + name + "'" + selected + ">" + name);
+					}
+				document.writeln("</SELECT></FORM></TD></TR></TABLE>");
+				}
+			}
+		}
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/connect2.htm
+++ b/mozilla/cmd/dialup/as_html/connect2.htm
@@ -0,0 +1,63 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="connect2.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="connect200">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+<P CLASS="title"><B>You're Done!</B></P>
+	
+<P>You're now finished using Account Setup and can connect to the Internet after you click Connect Now or Done. </P>
+
+<P>If you want to connect to the Internet now, click Connect Now. If you don't want to connect
+to the Internet now, click Done. When you want to use the Internet, all you have to do is launch Communicator from the Netscape Communicator folder or program group.</P>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/connect2.js
+++ b/mozilla/cmd/dialup/as_html/connect2.js
@@ -0,0 +1,538 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function configureDialer()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	var theFile = parent.parent.globals.getAcctSetupFilename(self);
+	var intlFlag = parent.parent.globals.GetNameValuePair(theFile,"Mode Selection","IntlMode");
+	intlFlag = intlFlag.toLowerCase();
+
+
+	var theFolder = parent.parent.globals.getConfigFolder(self);
+	theRegFile = theFolder + parent.parent.globals.document.vars.regServer.value;
+
+
+	// platform check
+	var thePlatform = new String(navigator.userAgent);
+	var x=thePlatform.indexOf("(")+1;
+	var y=thePlatform.indexOf(";",x+1);
+	thePlatform=thePlatform.substring(x,y);
+
+
+/*
+	// determine name of scripting file
+	var scriptEnabledFlag = parent.parent.globals.GetNameValuePair(theRegFile,"Script","ScriptEnabled");
+	scriptEnabledFlag = scriptEnabledFlag.toLowerCase();
+	var theScriptFile = "";
+	if (scriptEnabledFlag == "yes")	{
+		theScriptFile = parent.parent.globals.GetNameValuePair(theRegFile,"Script","ScriptFileName");
+		if (theScriptFile != null && theScriptFile != "")	{
+			theScriptFile = theFolder + theScriptFile;
+			scriptEnabledFlag = "TRUE";
+			}
+		else	{
+			theScriptFile="";
+			scriptEnabledFlag = "FALSE";
+			}
+		}
+	else	{
+		scriptEnabledFlag = "FALSE";
+		}
+*/
+
+
+	// determine outside line access string
+	
+	var outsideLineAccessStr = "";
+	if (parent.parent.globals.document.vars.prefixData.value != "")	{
+		outsideLineAccessStr = parent.parent.globals.document.vars.prefixData.value;
+		x = outsideLineAccessStr.indexOf(",");
+		if (x<0)	outsideLineAccessStr = outsideLineAccessStr + ",";
+		}
+
+
+	// build TAPI phone number
+
+	if (intlFlag == "yes")	{
+		var thePhone = parent.parent.globals.document.vars.accountPhoneNumber.value;
+		var theCountry = "";
+		var theCountryCode="";					// XXX
+		var longDistanceAccess="";
+		var dialAsLongDistanceFlag="FALSE";
+		var	dialAreaCodeFlag="FALSE";
+		var userAreaCode="";
+		}
+	else	{
+		var thePhone = "(" + parent.parent.globals.document.vars.accountAreaCode.value + ") " + parent.parent.globals.document.vars.accountPhoneNumber.value;
+		var theCountry = "USA";
+		var theCountryCode="1";
+		var longDistanceAccess="1";				// XXX
+		var dialAsLongDistanceFlag="TRUE";
+		var	dialAreaCodeFlag="TRUE";
+		var userAreaCode=parent.parent.globals.document.vars.modemAreaCode.value;
+		if (userAreaCode == parent.parent.globals.document.vars.accountAreaCode.value)	{
+			dialAsLongDistanceFlag="FALSE";
+			dialAreaCodeFlag = "FALSE";
+			}
+
+		}
+
+
+	// determine new profile name (used for Account in dialer & profile name, save info default filename)
+
+	var	newProfileName = parent.parent.globals.document.vars.accountName.value;
+	if (newProfileName=="")	{
+		newProfileName = parent.parent.globals.document.vars.first.value;
+		if (parent.parent.globals.document.vars.last.value != "")	{
+			newProfileName = newProfileName + " " + parent.parent.globals.document.vars.last.value;
+			}
+		}
+	if (newProfileName!="")	newProfileName = newProfileName + "'s";
+	if (parent.parent.globals.document.vars.providername.value != "")	{
+		newProfileName = newProfileName + " " + parent.parent.globals.document.vars.providername.value;
+		}
+	newProfileName = newProfileName + " Account";
+	if (newProfileName.length > 240)	newProfileName=newProfileName.substring(0,240);
+
+
+	if (thePlatform == "Win16")	{
+		if (newProfileName.length > 40)	newProfileName=newProfileName.substring(0,40);
+		}
+
+	
+	// On WIN32 platforms, check if newProfileName contains any invalid characters, such as '/'
+	// On Mac, disallow invalid characters such as ':'
+
+	if ((thePlatform == "WinNT") || (thePlatform == "Win95")) {
+		var x=0;
+		x = newProfileName.indexOf('/');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('/');
+			}
+		x = newProfileName.indexOf('\\');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\\');
+			}
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		x = newProfileName.indexOf('\"');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\"');
+			}
+		x = newProfileName.indexOf('?');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('?');
+			}
+		x = newProfileName.indexOf('<');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('<');
+			}
+		x = newProfileName.indexOf('>');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('>');
+			}
+		x = newProfileName.indexOf('|');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('|');
+			}
+		x = newProfileName.indexOf('&');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf('&');
+			}
+		}
+	else if (thePlatform == "Macintosh")	{
+		var x=0;
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		}
+	else if (thePlatform == "Win31") {
+		var x=0;
+		x = newProfileName.indexOf('(');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf('(');
+			}
+		x = newProfileName.indexOf(')');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf(')');
+			}
+		}
+
+
+	// configure dialer
+
+	dialerData = parent.parent.globals.document.setupPlugin.newStringArray(28);		// increment this # as new dialer strings are added
+	dialerData[0]  = "FileName=" + theRegFile;
+	dialerData[1]  = "AccountName=" + newProfileName;								// parent.parent.globals.document.vars.providername.value;
+	dialerData[2]  = "ISPPhoneNum=" + thePhone;
+	dialerData[3]  = "LoginName=" + parent.parent.globals.document.vars.accountName.value;
+	dialerData[4]  = "Password=" + parent.parent.globals.document.vars.accountPassword.value;
+	dialerData[5]  = "DNSAddress=" + parent.parent.globals.document.vars.primaryDNS.value;
+	dialerData[6]  = "DNSAddress2=" + parent.parent.globals.document.vars.secondaryDNS.value;
+	dialerData[7]  = "DomainName=" + parent.parent.globals.document.vars.domainName.value;
+	dialerData[8]  = "IPAddress=" + parent.parent.globals.document.vars.ipAddress.value;
+	dialerData[9]  = "IntlMode=" + ((intlFlag=="yes") ? "TRUE":"FALSE");
+	dialerData[10] = "DialOnDemand=TRUE";
+	dialerData[11] = "ModemName=" + parent.parent.globals.document.vars.modem.value;
+	dialerData[12] = "ModemType=" + parent.parent.globals.document.setupPlugin.GetModemType(parent.parent.globals.document.vars.modem.value);
+	dialerData[13] = "DialType=" + parent.parent.globals.document.vars.dialMethod.value;
+	dialerData[14] = "OutsideLineAccess=" + outsideLineAccessStr;
+	dialerData[15] = "DisableCallWaiting=" + ((parent.parent.globals.document.vars.cwData.value != "") ? "TRUE":"FALSE");
+	dialerData[16] = "DisableCallWaitingCode=" + parent.parent.globals.document.vars.cwData.value;
+	dialerData[17] = "UserAreaCode=" + userAreaCode;
+	dialerData[18] = "CountryCode=" + theCountryCode;
+	dialerData[19] = "LongDistanceAccess=" + longDistanceAccess;
+	dialerData[20] = "DialAsLongDistance=" + dialAsLongDistanceFlag;
+	dialerData[21] = "DialAreaCode=" + dialAreaCodeFlag;
+	dialerData[22] = "ScriptEnabled=" + parent.parent.globals.document.vars.scriptEnabled.value;
+	dialerData[23] = "ScriptFileName=" + parent.parent.globals.document.vars.scriptFile.value;
+	dialerData[24] = "NeedsTTYWindow=" + (parent.parent.globals.document.vars.ttyWindow.checked ? "TRUE":"FALSE");									// XXX
+	dialerData[25] = "Location=Home";
+	dialerData[26] = "DisconnectTime=" + parent.parent.globals.GetNameValuePair(theFile,"Mode Selection","Dialer_Disconnect_After");
+	dialerData[27] = "Path=Existing";
+
+
+	// write out dialer data to Java Console
+
+	if (parent.parent.globals.document.vars.debugMode.value.toLowerCase() == "yes")	{
+		parent.parent.globals.debug("\nDialer data (ISP: '" + parent.parent.globals.document.vars.providername.value + "'): ");
+		var numElements = dialerData.length;
+		for (var x=0; x<numElements; x++)	{
+			parent.parent.globals.debug("        " + x + ": " + dialerData[x]);
+			}
+		}
+
+	parent.parent.globals.document.setupPlugin.DialerConfig(dialerData,false);
+
+
+	// configure desktop (Windows)
+
+	var fileName = parent.parent.globals.document.vars.providerFilename.value;
+	var iconFilename = fileName.toUpperCase();
+	if (iconFilename == "")	{
+		iconFilename = theFolder + "DEFAULT.ICO";
+		}
+	else	{
+		var x = iconFilename.lastIndexOf(".NCI");
+		if (x>0)	{
+			iconFilename = iconFilename.substring(0,x) + ".ICO";
+			}
+		else	{
+			iconFilename = "";
+			}
+		}
+
+	parent.parent.globals.document.setupPlugin.DesktopConfig(newProfileName, iconFilename, theFile);
+
+
+	// set up Navigator preferences
+
+	var userName = parent.parent.globals.document.vars.first.value;
+	if (parent.parent.globals.document.vars.last.value != "")	{
+		userName = userName + " " + parent.parent.globals.document.vars.last.value;
+		}
+
+	navigator.preference("network.hosts.smtp_server",		parent.parent.globals.document.vars.SMTP.value);
+	navigator.preference("network.hosts.nntp_server",		parent.parent.globals.document.vars.NNTP.value);
+
+	navigator.preference("network.hosts.pop_server",	parent.parent.globals.document.vars.mailServer.value);
+	if (parent.parent.globals.document.vars.mailProtocol.value.toUpperCase() == "IMAP")	{
+		navigator.preference("mail.server_type",			1);
+		}
+	else	{
+		navigator.preference("mail.server_type",			0);
+		}
+
+	var mailID=""
+	var mailAccount = parent.parent.globals.document.vars.emailName.value;
+	x = mailAccount.indexOf("@");
+	if (x>=0)	{
+		mailID=mailAccount.substring(0,x);
+		}
+	else	{
+		mailID=mailAccount;
+		if (parent.parent.globals.document.vars.domainName.value != "")	{
+			mailAccount = mailID + "@" + parent.parent.globals.document.vars.domainName.value;
+			}
+		}
+
+	navigator.preference("mail.pop_name",					mailID);
+	navigator.preference("mail.identity.organization",		parent.parent.globals.document.vars.company.value);
+	navigator.preference("mail.identity.reply_to",			mailAccount);
+	navigator.preference("mail.identity.username",			userName);
+	navigator.preference("mail.identity.useremail",			mailAccount);
+
+	navigator.preference("mail.remember_password",	false);
+	navigator.preference("mail.pop_password",		"");
+	var theMailPassword=parent.parent.globals.document.vars.emailPassword.value;
+	if (theMailPassword != null && theMailPassword != "")	{
+		theMailPassword = parent.parent.globals.document.setupPlugin.EncryptString(theMailPassword);
+		if (theMailPassword != null && theMailPassword != "")	{
+			navigator.preference("mail.remember_password",	true);
+			navigator.preference("mail.pop_password",		theMailPassword);
+			}
+		}
+
+	navigator.preference("editor.author",					userName);
+	navigator.preference("editor.publish_username",			parent.parent.globals.document.vars.accountName.value);
+	navigator.preference("editor.publish_location",			parent.parent.globals.document.vars.publishURL.value);
+	navigator.preference("editor.publish_browse_location",	parent.parent.globals.document.vars.viewURL.value);
+
+	navigator.preference("editor.publish_password",			"");
+	navigator.preference("editor.publish_save_password",	false);
+	var thePublishPassword=parent.parent.globals.document.vars.publishPassword.value;
+	if (thePublishPassword != "")	{
+		thePublishPassword = parent.parent.globals.document.setupPlugin.EncryptString(thePublishPassword);
+		if (thePublishPassword != null && thePublishPassword != "")	{
+			navigator.preference("editor.publish_password",			thePublishPassword);
+			navigator.preference("editor.publish_save_password",	true);
+			}
+		}
+
+
+	navigator.preference("browser.mac.use_internet_config", false);
+
+
+	var profileDir = parent.parent.globals.document.setupPlugin.GetCurrentProfileDirectory();
+	if (profileDir != null && profileDir != "")	{
+
+		// write MUC Configuration file
+
+		var thePlatform = new String(navigator.userAgent);
+		var x=thePlatform.indexOf("(")+1;
+		var y=thePlatform.indexOf(";",x+1);
+		thePlatform=thePlatform.substring(x,y);
+	
+		var configFile="";
+		if (thePlatform == "Macintosh")	{				// Macintosh support
+			configFile = profileDir + "Configuration";
+			}
+		else	{										// Windows support
+			configFile = profileDir + "CONFIG.INI";
+			}
+		
+		parent.parent.globals.document.setupPlugin.SetNameValuePair(configFile,"Account", "Account", newProfileName);		// parent.parent.globals.document.vars.providername.value);
+		parent.parent.globals.document.setupPlugin.SetNameValuePair(configFile,"Modem", "Modem", parent.parent.globals.document.vars.modem.value);
+		parent.parent.globals.document.setupPlugin.SetNameValuePair(configFile,"Location", "Location", "Home");
+		
+
+		// write out default Bookmark file (if one doesn't exist yet)
+		
+		var currentBookmarkFilename="";
+		if (thePlatform == "Macintosh")	{				// Macintosh support
+			currentBookmarkFilename = profileDir + "Bookmarks.html";
+			}
+		else	{										// Windows support
+			currentBookmarkFilename = profileDir + "BOOKMARK.HTM";
+			}
+
+		var bookmarkData = parent.parent.globals.document.setupPlugin.GetNameValuePair(currentBookmarkFilename,null,null);
+		if ((bookmarkData == null) || (bookmarkData == "") || (bookmarkData.indexOf("HREF")<0))	{
+			var defaultBookmarkFilename = parent.parent.globals.getConfigFolder(self) + "bookmark.htm";
+			bookmarkData = parent.parent.globals.document.setupPlugin.GetNameValuePair(defaultBookmarkFilename,null,null);
+			if (bookmarkData != null && bookmarkData != "")	{
+				parent.parent.globals.document.setupPlugin.SaveTextToFile(currentBookmarkFilename,bookmarkData,false);
+				}
+			}
+
+		// copy profile lock file (if one is specified in selected .NCI file)
+		
+		theProviderFilename = parent.parent.globals.document.vars.providerFilename.value;
+		if (theProviderFilename != "")	{
+			var configLockFile = parent.parent.globals.document.setupPlugin.GetNameValuePair(theProviderFilename,"Configuration","ConfigurationFileName");
+			if (configLockFile != null && configLockFile != "")	{
+
+				// read in .CFG file (from Config folder)
+
+				configLockFile = theFolder + configLockFile;
+				var cfgData = parent.parent.globals.document.setupPlugin.ReadFile(configLockFile);
+				if (cfgData != null && cfgData != "")	{
+
+					// write out PROFILE.CFG file (inside of current profile directory)
+
+					var profileLockfilename = profileDir + "PROFILE.CFG";
+					parent.parent.globals.document.setupPlugin.WriteFile(profileLockfilename,cfgData);
+					}
+				}
+			}
+		}
+
+
+	// rename profile
+
+	if (thePlatform == "Macintosh") {
+		if (newProfileName.length > 31)	newProfileName=newProfileName.substring(0,31);
+		}
+
+	parent.parent.globals.document.setupPlugin.SetCurrentProfileName(newProfileName);
+	if (parent.parent.globals.document.vars.debugMode.value.toLowerCase() == "yes")	{
+		parent.parent.globals.debug("\nSetting profile name: " + newProfileName);
+		}
+}
+
+
+
+function showWindowBars()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	// check browser version
+	var theAgent=navigator.userAgent;
+	var x=theAgent.indexOf("/");
+	if (x>=0)	{
+		theVersion=theAgent.substring(x+1,theAgent.length);
+		x=theVersion.indexOf(".");
+		if (x>0)	{
+			theVersion=theVersion.substring(0,x);
+			}			
+		if (parseInt(theVersion)>=4)	{
+			top.statusbar.visible=true;
+			top.scrollbars.visible=true;
+			top.toolbar.visible=true;
+			top.menubar.visible=true;
+			top.locationbar.visible=true;
+			top.personalbar.visible=true;
+			}
+		}
+	parent.parent.globals.document.setupPlugin.SetKiosk(false);
+}
+
+
+
+function setLocation(theURL)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+	
+	var theWindow=window.open(theURL,"__BLANK","toolbar=yes,location=yes,directories=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes");
+
+//	parent.parent.location.replace(theURL);										// jumping to the URL
+	top.close();
+}
+
+
+
+function go(msg)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	if (msg=="Connect Now")	{
+
+		if (parent.parent.globals.document.vars.editMode.value != "yes")	{
+			configureDialer();
+
+			if (parent.parent.globals.document.setupPlugin.NeedReboot() == true)	{
+				parent.parent.globals.forceReboot("connect2.htm");				// XXX hardcode in name of next screen???
+				return(false);
+				}
+
+			if (parent.parent.globals.document.setupPlugin.DialerConnect() == false)	{
+				window.location.replace("error.htm");							// XXX hardcode in name of next screen???
+				return(false);
+				}
+	
+//			showWindowBars();
+	
+			var theFile = parent.parent.globals.getAcctSetupFilename(self);
+			var theURL = parent.parent.globals.GetNameValuePair(theFile,"Existing Acct Mode","RegPodURL");
+			if (theURL == null || theURL == "")	{
+				theURL = "http://home.netscape.com/";
+				}
+			setTimeout("setLocation(\'" + theURL + "\')", 1000);
+			}
+		else	{
+			alert("You cannot connect while in edit mode.");
+			return(false);
+			}
+		}
+	else if (msg == "error.htm")	{
+		if (parent.parent.globals.document.vars.editMode.value == "yes")	{	// only do this if editMode is false
+				return (confirm("Since you are in edit mode, would you like to edit the error screen that users will see if the connection fails?"));
+				}
+		else	{
+			return(false);
+			}
+		}
+	else if ((msg=="Later") && (parent.parent.globals.document.vars.editMode.value != "yes"))	{	
+		configureDialer();
+		//showWindowBars();
+		return(true);
+		}
+	else if (msg=="Back")	{
+		history.back();
+		}
+	return(false);
+}
+
+
+
+function checkData()
+{
+	return(true);
+}
+
+
+
+function doGo()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+	parent.controls.go("Next");
+}
+
+
+
+function loadData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	if (parent.parent.globals.document.vars.tryAgain.value == "yes")	{
+		parent.parent.globals.document.vars.tryAgain.value = "no";
+		setTimeout("doGo()",1);
+		}
+
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/dial.htm
+++ b/mozilla/cmd/dialup/as_html/dial.htm
@@ -0,0 +1,98 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="dial.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" ONLOAD="loadData()" ID="dial100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+<P CLASS="title"><B>Your Account Access Phone Number</B></P>
+	
+<P>Enter the number you dial to connect to your Internet account.</P>
+
+
+<SPACER TYPE=HORIZONTAL SIZE=72>
+
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+        Telephone Number:
+		</B>
+		<spacer type=vertical size=2>
+	</TD>
+	<TD VALIGN="TOP" ALIGN="LEFT" COLSPAN="2">
+	    <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" ID="nospace">
+	      <TR>
+	        <TD ALIGN="CENTER" VALIGN="BOTTOM">
+	       	<SCRIPT LANGUAGE="JavaScript" ID="dial101">
+	    	writeLocalText("Area Code:");
+	    	</SCRIPT>
+		    </TD>
+	        <TD ALIGN="CENTER" VALIGN="BOTTOM">
+				Number:&nbsp;
+			</TD>
+	      </TR>
+	      <TR>
+    	      <TD ALIGN="MIDDLE" VALIGN="TOP">
+			    <INPUT NAME="accountAreaCode" TYPE="&{localString};" SIZE=3 MAXLENGTH=3>
+             </TD>
+    	      <TD ALIGN="LEFT" VALIGN="TOP">
+			    <INPUT NAME="accountPhoneNumber" TYPE="text" SIZE=24 MAXLENGTH=24>
+             </TD></TR></TABLE>
+		</TD>
+    </TR>
+</TABLE>
+
+</FORM>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/dial.js
+++ b/mozilla/cmd/dialup/as_html/dial.js
@@ -0,0 +1,128 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+var	intlString = "";
+var	localString = "";
+
+
+
+var theFile = parent.parent.globals.getAcctSetupFilename(self);
+var intlFlag = parent.parent.globals.GetNameValuePair(theFile,"Mode Selection","IntlMode");
+intlFlag = intlFlag.toLowerCase();
+
+if (intlFlag == "yes")	{
+	intlString = "text";
+	localString = "hidden";
+	}
+else	{
+	intlString = "hidden";
+	localString = "text";
+	}
+
+
+
+function writeLocalText(theString)
+{
+	if (localString == "text")	{
+		document.write(theString);
+		}
+}
+
+
+
+function go(msg)
+{
+	if (parent.parent.globals.document.vars.editMode.value == "yes")
+		return true;
+	else
+		return(checkData());
+}
+
+
+
+function checkData()
+{
+	if (intlFlag != "yes")	{
+		if (document.forms[0].accountAreaCode.value == "")	{
+			alert("You must enter an area code.");
+			parent.parent.globals.setFocus(document.forms[0].accountAreaCode);
+			return(false);
+			}
+		if (parent.parent.globals.verifyAreaCode(document.forms[0].accountAreaCode.value)==false)	{
+			alert("Please enter a valid area code.");
+			parent.parent.globals.setFocus(document.forms[0].accountAreaCode);
+			return(false);
+			}
+		}
+	if (document.forms[0].accountPhoneNumber.value == "")	{
+		alert("You must enter a telephone number.");
+		parent.parent.globals.setFocus(document.forms[0].accountPhoneNumber);
+		return(false);
+		}
+	if (parent.parent.globals.verifyPhoneNumber(document.forms[0].accountPhoneNumber.value)==false)	{
+		alert("Please enter a valid telephone number.");
+		parent.parent.globals.setFocus(document.forms[0].accountPhoneNumber);
+		return(false);
+		}
+	return(true);
+}
+
+
+
+function loadData()
+{
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].accountAreaCode == "undefined") || (document.forms[0].accountAreaCode == "[object InputArray]")) ||
+		((document.forms[0].accountPhoneNumber == "undefined") || (document.forms[0].accountPhoneNumber == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	if (intlFlag != "yes")	{
+		document.forms[0].accountAreaCode.value = parent.parent.globals.document.vars.accountAreaCode.value;
+		}
+	document.forms[0].accountPhoneNumber.value = parent.parent.globals.document.vars.accountPhoneNumber.value;
+	parent.parent.globals.setFocus(document.forms[0].accountAreaCode);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].accountAreaCode == "undefined") || (document.forms[0].accountAreaCode == "[object InputArray]")) ||
+		((document.forms[0].accountPhoneNumber == "undefined") || (document.forms[0].accountPhoneNumber == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	if (intlFlag != "yes")	{
+		parent.parent.globals.document.vars.accountAreaCode.value = document.forms[0].accountAreaCode.value;
+		}
+	parent.parent.globals.document.vars.accountPhoneNumber.value = document.forms[0].accountPhoneNumber.value;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/dialinf1.htm
+++ b/mozilla/cmd/dialup/as_html/dialinf1.htm
@@ -0,0 +1,154 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="dialinf1.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" ONLOAD="loadData()" ID="dialinf100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+<P CLASS="title"><B>Dialing Settings for Your Location</B></P>
+	
+<P>Please specify any special dialing settings that apply to the location that you are connecting from.</P>
+
+<P>If you have Call Waiting, you should turn it off before you connect. Select a code from the pop-up menu below, or enter one of your own in the text box.</P>
+
+
+<spacer type=horizontal size=72>
+
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0"ID="minspace">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        
+        <B>Turn off Call Waiting with:&nbsp;</B>
+		
+		<SPACER TYPE=VERTICAL SIZE=2>
+	</TD>
+	<TD ALIGN=LEFT VALIGN="MIDDLE" ALIGN="RIGHT">
+	
+		<INPUT NAME="cwData" TYPE="text" SIZE=8 MAXLENGTH=8 ONCHANGE="updateCWOptions(document.forms[0].cwData)" ID="dialinf101">
+        
+        <SPACER TYPE=HORIZONTAL SIZE=6>
+	</TD>
+					
+	<TD ALIGN=LEFT VALIGN="BOTTOM" ALIGN="RIGHT">	
+	    <SPACER TYPE=VERTICAL SIZE=1>	
+		<SELECT NAME="cwOptions" ONCHANGE="updateCWOptions(document.forms[0].cwOptions)" ID="dialinf102">
+			<OPTION VALUE="">(Line Doesn't Have Call Waiting)
+			<OPTION VALUE="*70,">*70,
+			<OPTION VALUE="1170,">1170,
+			<OPTION VALUE="70#,">70#,
+		</SELECT>
+	</TD>
+</TR>
+</TABLE>
+
+
+<SPACER TYPE=VERTICAL SIZE=16>
+	
+<P>If you are connecting from a building with an internal phone network--such as from an office or a hotel--you need to access an outside line before you can connect.</P>
+
+
+<spacer type=horizontal size=72>
+
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" ID="minspace">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+		
+		<B>Access an outside line by dialing:&nbsp;</B>
+		
+		<SPACER TYPE=VERTICAL SIZE=2>
+	</TD>
+	<TD ALIGN=LEFT VALIGN="MIDDLE" ALIGN="LEFT">
+	
+		<INPUT NAME="prefixData" TYPE="text" SIZE=8 MAXLENGTH=20 ONCHANGE="updatePrefix(document.forms[0].prefixData)" ID="dialinf103">
+        
+	</TD>
+</TR>
+</TABLE>
+
+
+
+<!-- The layer below contains pulse and tone radio buttons --!>
+
+<LAYER NAME = "dialingMethods" VISIBILITY = "hide">
+
+<P ID="nospace">Which dialing method would you like to use?</P>
+
+<spacer type=horizontal size=72>
+
+<TABLE CELLPADDING="0" CELLSPACING="0" border="0" ID="minspace">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+		<B>
+		<FORM>
+			<INPUT NAME="dialMethod" TYPE="radio" VALUE="TONE" CHECKED>Tone
+			<INPUT NAME="dialMethod" TYPE="radio" VALUE="PULSE">Pulse
+		</FORM>
+		</B>
+	</TD>
+</TR>
+</TABLE>
+
+</LAYER>
+
+<SCRIPT LANGUAGE="JavaScript" ID="dialinf104">
+	generateDialingMethods();
+	updateCWOptions(document.forms[0].cwData);
+</SCRIPT>
+
+
+
+</FORM>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/dialinf1.js
+++ b/mozilla/cmd/dialup/as_html/dialinf1.js
@@ -0,0 +1,275 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	return(true);
+}
+
+
+
+function verifyCallWaiting(cwData)
+{
+	var	validFlag=true;
+
+	if (cwData.length > 0)	{
+		for (var x=0; x<cwData.length; x++)	{
+			if ("0123456789*#,".indexOf(cwData.charAt(x)) <0)	{
+				validFlag=false;
+				break;
+				}
+			}
+		}
+	return(validFlag);
+}
+
+
+
+function verifyPrefix(prefixData)
+{
+	var	validFlag=true;
+
+	if (prefixData.length > 0)	{
+		for (var x=0; x<prefixData.length; x++)	{
+			if ("0123456789,".indexOf(prefixData.charAt(x)) <0)	{
+				validFlag=false;
+				break;
+				}
+			}
+		}
+	return(validFlag);
+}
+
+
+
+function checkData()
+{
+	if (verifyCallWaiting(document.forms[0].cwData.value) == false)	{
+		alert("Please enter a valid call waiting string. (It may contain numbers, asterisks, pound signs and commas.)");
+		parent.parent.globals.setFocus(document.forms[0].cwData);
+		return(false);
+		}
+	if (verifyPrefix(document.forms[0].prefixData.value) == false)	{
+		alert("Please enter a valid outside line string. (It may contain numbers and commas.)");
+		parent.parent.globals.setFocus(document.forms[0].prefixData);
+		return(false);
+		}
+	return(true);
+}
+
+
+
+function loadData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].cwData == "undefined") || (document.forms[0].cwData == "[object InputArray]")) ||
+		((document.forms[0].cwOptions == "undefined") || (document.forms[0].cwOptions == "[object InputArray]")) ||
+		((document.forms[0].prefixData == "undefined") || (document.forms[0].prefixData == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[0].cwData.value=parent.parent.globals.document.forms[0].cwData.value;
+//	document.forms[0].cwOFF.checked=parent.parent.globals.document.forms[0].cwOFF.checked;
+//	document.forms[0].cwOFF.checked=(document.forms[0].cwData.value=="") ? 0:1;
+
+	var found=false;
+	for (var i = 0; i < document.forms[0].cwOptions.length; i++)	{
+		if (document.forms[0].cwOptions[i].value==parent.parent.globals.document.forms[0].cwData.value)	{
+			document.forms[0].cwOptions[i].selected=true;
+			found=true;
+			}
+		else	{
+			document.forms[0].cwOptions[i].selected=false;
+			}
+		}
+	if (found==false)	{
+		if (document.forms[0].cwData.value == "")	{
+			document.forms[0].cwOptions[0].text = "(Line Doesn't Have Call Waiting)";
+			document.forms[0].cwOptions[0].value = "";
+			}
+		else	{
+			document.forms[0].cwOptions[0].text = document.forms[0].cwData.value;
+			document.forms[0].cwOptions[0].value = document.forms[0].cwData.value;
+			}
+		document.forms[0].cwOptions[0].selected=true;
+		}
+	document.forms[0].prefixData.value=parent.parent.globals.document.forms[0].prefixData.value;
+//	document.forms[0].prefix.checked=parent.parent.globals.document.forms[0].prefix.checked;
+//	document.forms[0].prefix.checked=(document.forms[0].prefixData.value=="") ? 0:1;
+
+	var theModem = parent.parent.globals.document.vars.modem.value;
+	var theModemType = parent.parent.globals.document.setupPlugin.GetModemType(theModem);
+	if (theModemType != null)	{
+		theModemType = theModemType.toUpperCase();
+		if (theModemType == "ISDN")	{
+			// do nothing
+			}
+		else	{
+			if (parent.parent.globals.document.forms[0].dialMethod.value == "PULSE")	{
+				document.layers["dialingMethods"].document.forms[0].dialMethod[0].checked=false;
+				document.layers["dialingMethods"].document.forms[0].dialMethod[1].checked=true;
+				}
+			else	{
+
+				document.layers["dialingMethods"].document.forms[0].dialMethod[0].checked=true;
+				document.layers["dialingMethods"].document.forms[0].dialMethod[1].checked=false;
+				}
+			}
+		}
+	parent.parent.globals.setFocus(document.forms[0].cwData);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].cwData == "undefined") || (document.forms[0].cwData == "[object InputArray]")) ||
+		((document.forms[0].cwOptions == "undefined") || (document.forms[0].cwOptions == "[object InputArray]")) ||
+		((document.forms[0].prefixData == "undefined") || (document.forms[0].prefixData == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+//	parent.parent.globals.document.forms[0].cwOFF.checked = document.forms[0].cwOFF.checked;
+	parent.parent.globals.document.forms[0].cwData.value = document.forms[0].cwData.value;
+//	parent.parent.globals.document.forms[0].prefix.checked = document.forms[0].prefix.checked;
+	parent.parent.globals.document.forms[0].prefixData.value = document.forms[0].prefixData.value;
+
+	var theModem = parent.parent.globals.document.vars.modem.value;
+	var theModemType = parent.parent.globals.document.setupPlugin.GetModemType(theModem);
+	if (theModemType != null)	{
+		theModemType = theModemType.toUpperCase();
+		if (theModemType == "ISDN")	{
+			parent.parent.globals.document.forms[0].dialMethod.value = theModemType;
+			}
+		else	{
+			if (document.layers["dialingMethods"].document.forms[0].dialMethod[1].checked == true)	{
+				parent.parent.globals.document.forms[0].dialMethod.value = document.layers["dialingMethods"].document.forms[0].dialMethod[1].value;
+				}
+			else	{
+				parent.parent.globals.document.forms[0].dialMethod.value = document.layers["dialingMethods"].document.forms[0].dialMethod[0].value;
+				}
+			}
+		}
+}
+
+
+
+function updateCWOptions(theObject)
+{
+/*
+	if (theObject.name=="cwOFF")	{
+		if (theObject.checked)	{
+			parent.parent.globals.setFocus(document.forms[0].cwData);
+			}
+		else	{
+			document.forms[0].cwData.value="";
+			document.forms[0].cwOFF.checked=0;
+			}
+		}
+	else
+*/
+	if (theObject.name=="cwData")	{
+		document.forms[0].cwOptions[0].text = "(Line Doesn't Have Call Waiting)";
+		document.forms[0].cwOptions[0].value = "";
+		if (document.forms[0].cwData.value=="")	{
+			document.forms[0].cwOptions.selectedIndex = 0;
+			}
+		else	{
+			var found=0;
+			for (var x=1; x<document.forms[0].cwOptions.length; x++)	{
+				if (document.forms[0].cwOptions[x].text == document.forms[0].cwData.value)	{
+					found=x;
+					break;
+					}
+				}
+			if (found<1)	{
+				document.forms[0].cwOptions[0].text = document.forms[0].cwData.value;
+				document.forms[0].cwOptions[0].value = document.forms[0].cwData.value;
+				}
+			document.forms[0].cwOptions.selectedIndex = found;
+			}
+		}
+	else
+	 if (theObject.name=="cwOptions")	{
+		document.forms[0].cwData.value=document.forms[0].cwOptions[document.forms[0].cwOptions.selectedIndex].value;
+		parent.parent.globals.setFocus(document.forms[0].cwData);
+//		document.forms[0].cwOFF.checked=1;
+		}
+	return(true);
+}
+
+
+
+function updatePrefix(theObject)
+{
+/*
+	if (theObject.name=="prefix")	{
+		if (theObject.checked)	{
+			parent.parent.globals.setFocus(document.forms[0].prefixData);
+			}
+		else	{
+			document.forms[0].prefixData.value="";
+			document.forms[0].prefix.checked=0;
+			}
+		}
+	else if (theObject.name=="prefixData")	{
+		if (document.forms[0].prefixData.value=="")	{
+			document.forms[0].prefix.checked=0;
+			}
+		else	{
+			document.forms[0].prefix.checked=1;
+			}
+		}
+*/
+	return(false);
+}
+
+
+
+function generateDialingMethods()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	var theModem = parent.parent.globals.document.vars.modem.value;
+	var theModemType = parent.parent.globals.document.setupPlugin.GetModemType(theModem);
+	if (theModemType != null && theModemType.toUpperCase() != "ISDN")	
+	{
+		document.layers["dialingMethods"].visibility = "show";
+	}
+	else
+	{
+		document.layers["dialingMethods"].visibility = "hide";
+	}
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/dialinf2.htm
+++ b/mozilla/cmd/dialup/as_html/dialinf2.htm
@@ -0,0 +1,114 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+<HEAD>
+<TITLE>Account Setup</TITLE>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="dialinf2.js">
+</SCRIPT>
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+</HEAD>
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" ONLOAD="loadData()" ID="dialinf200">
+<!-- The layer below contains the Account Setup identifier. -->
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+</LAYER>
+<!-- The layer below contains the headline and text of this screen -->
+<FORM>
+<P CLASS="title"><B>Phone Number of Your Location</B></P>
+<P>Please enter the phone number of the line that you are currently using--
+the line that is now connected to your computer or modem. Account Setup will use this
+information to set up your connection software to access the Internet.</P>
+<SPACER TYPE=HORIZONTAL SIZE=72>
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+        Telephone Number:
+		</B>
+		<spacer type=vertical size=2>
+	</TD>
+	<TD VALIGN="TOP" ALIGN="LEFT" COLSPAN="2">
+	    <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" ID="nospace">
+	      <TR>
+	        <TD ALIGN="CENTER" VALIGN="BOTTOM">
+				<SCRIPT LANGUAGE="JavaScript" ID="dialinf202">
+		    	writeLocalText("Area Code:");
+		    	</SCRIPT>
+		    </TD>
+	      </TR>
+	      <TR>
+    	      <TD ALIGN="MIDDLE" VALIGN="TOP">
+    	    	<INPUT NAME="modemAreaCode" TYPE="&{localString};" SIZE=3 MAXLENGTH=3>
+             </TD>
+    	      <TD ALIGN="LEFT" VALIGN="TOP">
+    	    	<INPUT NAME="modemPhoneNumber" TYPE="text" SIZE=24 MAXLENGTH=24>
+             </TD>
+          </TR>
+        </TABLE>
+	</TD>
+</TR>
+</TABLE>
+<P>Optional: If an ISP is not available in your area, Account Setup will check up to 3
+additional area codes to find an Internet service provider you can access.</P>
+<SPACER TYPE=HORIZONTAL SIZE=72>
+<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR>
+	<TD VALIGN="TOP" ALIGN="LEFT" COLSPAN="2">
+	    <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" ID="nospace">
+	      <TR>
+	        <TD VALIGN="TOP" ALIGN="LEFT">
+              <B>Alternate Area Code 1:</B>
+		      <SPACER TYPE=VERTICAL SIZE=2>
+	        </TD>
+	        <TD ALIGN="MIDDLE" VALIGN="TOP">
+	          <INPUT NAME="altAreaCode1" TYPE="text" SIZE=3 MAXLENGTH=3>
+		    </TD>
+	      </TR>
+	      <TR>
+	        <TD VALIGN="MIDDLE" ALIGN="LEFT">
+              <B>Alternate Area Code 2:</B>
+		      <SPACER TYPE=VERTICAL SIZE=2>
+	        </TD>
+    	    <TD ALIGN="MIDDLE" VALIGN="TOP">
+    	      <INPUT NAME="altAreaCode2" TYPE="text" SIZE=3 MAXLENGTH=3>
+            </TD>
+          </TR>
+          <TR>
+	        <TD VALIGN="BOTTOM" ALIGN="LEFT">
+              <B>Alternate Area Code 3:</B>
+		      <SPACER TYPE=VERTICAL SIZE=2>
+	        </TD>
+    	    <TD ALIGN="MIDDLE" VALIGN="TOP">
+    	      <INPUT NAME="altAreaCode3" TYPE="text" SIZE=3 MAXLENGTH=3>
+            </TD>
+          </TR>
+        </TABLE>
+	</TD>
+</TR>
+
+</TABLE>
+</FORM>
+</BODY>
+</HTML>
+
--- a/mozilla/cmd/dialup/as_html/dialinf2.js
+++ b/mozilla/cmd/dialup/as_html/dialinf2.js
@@ -0,0 +1,171 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+var	intlString = "";
+var	localString = "";
+
+
+
+var theFile = parent.parent.globals.getAcctSetupFilename(self);
+var intlFlag = parent.parent.globals.GetNameValuePair(theFile,"Mode Selection","IntlMode");
+intlFlag = intlFlag.toLowerCase();
+
+if ( intlFlag == "yes" )
+{
+	intlString = "text";
+	localString = "hidden";
+}
+else
+{
+	intlString = "hidden";
+	localString = "text";
+}
+
+
+
+function writeLocalText( theString )
+{
+	if ( localString == "text" )
+	{
+		document.write( theString );
+	}
+}
+
+
+
+function go( msg )
+{
+	if ( ( parent.parent.globals.document.vars.editMode.value == "yes" ) || checkData() )
+	{
+		if ( msg == parent.parent.globals.document.vars.path.value )
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+
+
+function checkData()
+{
+	if ( intlFlag != "yes" )
+	{
+		if ( document.forms[ 0 ].modemAreaCode.value == "" )
+		{
+			alert( "You must enter an area code." );
+			parent.parent.globals.setFocus( document.forms[ 0 ].modemAreaCode );
+			return false;
+		}
+		if ( parent.parent.globals.verifyAreaCode( document.forms[ 0 ].modemAreaCode.value ) == false )
+		{
+			alert( "Please enter a valid area code." );
+			parent.parent.globals.setFocus( document.forms[ 0 ].modemAreaCode );
+			return false;
+		}
+	}
+	if ( document.forms[ 0 ].modemPhoneNumber.value == "" )
+	{
+		alert( "You must enter a telephone number." );
+		parent.parent.globals.setFocus( document.forms[ 0 ].modemPhoneNumber );
+		return false;
+	}
+	if ( parent.parent.globals.verifyPhoneNumber( document.forms[ 0 ].modemPhoneNumber.value ) == false )
+	{
+		alert( "Please enter a valid telephone number." );
+		parent.parent.globals.setFocus( document.forms[ 0 ].modemPhoneNumber );
+		return false;
+	}
+	return true;
+}
+
+
+
+function loadData()
+{
+	// ¥ make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (	(	( document.forms[ 0 ].modemAreaCode == "undefined" ) || 
+				( document.forms[ 0 ].modemAreaCode == "[object InputArray]" )
+			) ||
+			(	( document.forms[ 0 ].modemPhoneNumber == "undefined" ) || 
+				( document.forms[ 0 ].modemPhoneNumber == "[object InputArray]" ) ) )
+	{
+		top.globals.debug( "FORM ELEMENT = " + document.forms[ 0 ].modemPhoneNumber );
+		top.globals.debug( "SET FOCUS: " + document.forms[ 0 ].modemAreaCode + "BAD OBJECT!!!" );
+		top.globals.debug( "HISTORY: " + parent.content.history );
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[ 0 ].modemAreaCode.value = parent.parent.globals.document.vars.modemAreaCode.value;
+
+	if ( intlFlag != "yes" )
+	{
+		if ( document.forms[ 0 ].modemAreaCode.value == "" )
+		{
+			document.forms[ 0 ].modemAreaCode.value = parent.parent.globals.document.vars.areaCode.value;
+		}
+	}
+
+	document.forms[ 0 ].modemPhoneNumber.value = parent.parent.globals.document.vars.modemPhoneNumber.value;
+	if ( document.forms[ 0 ].modemPhoneNumber.value == "" )
+	{
+		document.forms[ 0 ].modemPhoneNumber.value = parent.parent.globals.document.vars.phoneNumber.value;
+	}
+
+	document.forms[ 0 ].altAreaCode1.value = parent.parent.globals.document.vars.altAreaCode1.value;
+	document.forms[ 0 ].altAreaCode2.value = parent.parent.globals.document.vars.altAreaCode2.value;
+	document.forms[ 0 ].altAreaCode3.value = parent.parent.globals.document.vars.altAreaCode3.value;
+	
+	parent.parent.globals.setFocus( document.forms[ 0 ].modemAreaCode );
+	if ( parent.controls.generateControls )
+		parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].modemAreaCode == "undefined") || (document.forms[0].modemAreaCode == "[object InputArray]")) ||
+		((document.forms[0].modemPhoneNumber == "undefined") || (document.forms[0].modemPhoneNumber == "[object InputArray]")))
+	{
+		top.globals.debug("SAVE DATA ...");
+		top.globals.debug("FORM ELEMENT = " + document.forms[0].modemPhoneNumber);
+		top.globals.debug("SET FOCUS: " + document.forms[0].modemAreaCode + "BAD OBJECT!!!");
+		top.globals.debug("HISTORY: " + parent.content.history);
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	if ( intlFlag != "yes" )
+	{
+		parent.parent.globals.document.vars.modemAreaCode.value = document.forms[ 0 ].modemAreaCode.value;
+	}
+	parent.parent.globals.document.vars.modemPhoneNumber.value = document.forms[ 0 ].modemPhoneNumber.value;
+	parent.parent.globals.document.vars.altAreaCode1.value = document.forms[ 0 ].altAreaCode1.value;
+	parent.parent.globals.document.vars.altAreaCode2.value = document.forms[ 0 ].altAreaCode2.value;
+	parent.parent.globals.document.vars.altAreaCode3.value = document.forms[ 0 ].altAreaCode3.value;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/dns.htm
+++ b/mozilla/cmd/dialup/as_html/dns.htm
@@ -0,0 +1,133 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="dns.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="dns100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+
+<FORM>
+
+<P CLASS="title"><B>Your Provider's Domain and DNS Servers</B></P>
+	
+<P>Enter your provider's domain name and DNS server addresses. Your provider might have given you this information when you created your account. If you don't have the information, call your provider's technical support office before continuing.</P>
+
+<CENTER>
+<TABLE CELLPADDING="3" CELLSPACING="0" border="0">
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+		<B>
+		Domain name:
+		</B>
+		<spacer type=vertical size=8>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="MIDDLE">
+		<INPUT NAME="domainName" TYPE="text" SIZE=32 MAXLENGTH=32>
+	</TD>
+	<TD VALIGN="BOTTOM" ALIGN="LEFT">
+        <spacer type=horizontal size=3>(For example, <BR>
+        <spacer type=horizontal size=3>providername.com)
+		<spacer type=vertical size=2>
+	</TD>        
+</TR>
+
+
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+		<B>
+		Primary DNS&nbsp;
+		<BR>
+		Server Address:
+		</B>
+		
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="BOTTOM">
+		<INPUT NAME="primaryDNS" TYPE="text" SIZE=32 MAXLENGTH=32>
+	</TD>
+	<TD VALIGN="BOTTOM" ALIGN="LEFT">
+        <spacer type=horizontal size=3>(For example, 0.0.0.0)
+	</TD>        
+</TR>
+
+
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=0>
+	</TD>
+</TR>
+
+
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+		Secondary DNS&nbsp;
+		<BR>
+		Server Address:
+		</B>
+		
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="BOTTOM">
+		<INPUT NAME="secondaryDNS" TYPE="text" SIZE=32 MAXLENGTH=32>
+	</TD>
+	<TD VALIGN="BOTTOM" ALIGN="LEFT">
+        <spacer type=horizontal size=3>(For example, 0.0.0.0)
+	</TD>        
+</TR>
+</TABLE>
+</CENTER>
+
+</FORM>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/dns.js
+++ b/mozilla/cmd/dialup/as_html/dns.js
@@ -0,0 +1,98 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	if (parent.parent.globals.document.vars.editMode.value == "yes")
+		return true;
+	else
+		return(checkData());
+}
+
+
+
+function checkData()
+{
+	if (document.forms[0].primaryDNS.value == "" && document.forms[0].secondaryDNS.value != "")	{
+		document.forms[0].primaryDNS.value = document.forms[0].secondaryDNS.value;
+		document.forms[0].secondaryDNS.value = "";
+		}
+
+	if (document.forms[0].primaryDNS.value != "")	{
+		if (parent.parent.globals.verifyIPaddress(document.forms[0].primaryDNS.value)==false)	{
+			alert("The address of the primary DNS server is not valid. It should consist of digits separated by periods.");
+			document.forms[0].primaryDNS.focus();
+			document.forms[0].primaryDNS.select();
+			return(false);
+			}
+		}
+	if (document.forms[0].secondaryDNS.value != "")	{
+		if (parent.parent.globals.verifyIPaddress(document.forms[0].secondaryDNS.value)==false)	{
+			alert("The address of the secondary DNS server is not valid. It should consist of digits separated by periods.");
+			document.forms[0].secondaryDNS.focus();
+			document.forms[0].secondaryDNS.select();
+			return(false);
+			}
+		}
+	return(true);
+}
+
+
+
+function loadData()
+{
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].domainName == "undefined") || (document.forms[0].domainName == "[object InputArray]")) ||
+		((document.forms[0].primaryDNS == "undefined") || (document.forms[0].primaryDNS == "[object InputArray]")) ||
+		((document.forms[0].secondaryDNS == "undefined") || (document.forms[0].secondaryDNS == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[0].domainName.value = parent.parent.globals.document.vars.domainName.value;
+	document.forms[0].primaryDNS.value = parent.parent.globals.document.vars.primaryDNS.value;
+	document.forms[0].secondaryDNS.value = parent.parent.globals.document.vars.secondaryDNS.value;
+	parent.parent.globals.setFocus(document.forms[0].domainName);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].domainName == "undefined") || (document.forms[0].domainName == "[object InputArray]")) ||
+		((document.forms[0].primaryDNS == "undefined") || (document.forms[0].primaryDNS == "[object InputArray]")) ||
+		((document.forms[0].secondaryDNS == "undefined") || (document.forms[0].secondaryDNS == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	parent.parent.globals.document.vars.domainName.value = document.forms[0].domainName.value;
+	parent.parent.globals.document.vars.primaryDNS.value = document.forms[0].primaryDNS.value;
+	parent.parent.globals.document.vars.secondaryDNS.value = document.forms[0].secondaryDNS.value;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/download.htm
+++ b/mozilla/cmd/dialup/as_html/download.htm
@@ -0,0 +1,82 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="connect1.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="download100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+
+<P CLASS="title"><B>Connect to Netscape</B></P>
+	
+<P>Account Setup will now connect you to the Internet account server,
+to download information about available Internet Service Providers (ISPs)
+and their account plans.  (Note: It may take as long as two minutes
+for the information to be retrieved.)</P>
+
+<P>When evaluating account plans, think about these questions:</P>
+
+<UL>
+	<LI>How much time do you think you'll spend on the Internet each month?</LI>
+	<LI>What are the monthly or hourly rates?</LI>
+	<LI>What services are offered?</LI>
+</UL>
+
+
+
+<P ID="nospace">Make sure your modem is properly connected and turned on, then click "Connect to Netscape" to begin.</P>
+
+<CENTER>
+<SCRIPT LANGUAGE = "JavaScript" ID="connect101">
+	generateRegServerList();
+</SCRIPT>
+</CENTER>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/download.js
+++ b/mozilla/cmd/dialup/as_html/download.js
@@ -0,0 +1,155 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go( msg )
+{
+//	parent.parent.globals.debug( "download go" );
+	
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	// * skip if we're in edit mode
+	if ( parent.parent.globals.document.vars.editMode.value != "yes" )
+	{
+		// * if "RegServer" specified in ACCTSET.INI, use it
+		var theFile = parent.parent.globals.getAcctSetupFilename( self );
+		var intlFlag = parent.parent.globals.GetNameValuePair( theFile, "Mode Selection", "IntlMode" );
+		intlFlag = intlFlag.toLowerCase();
+		var theRegFile = parent.parent.globals.GetNameValuePair( theFile, "New Acct Mode", "RegServer" );
+		
+		if ( theRegFile != null && theRegFile != "" )
+		{
+			parent.parent.globals.document.vars.regServer.value = theRegFile;
+		}
+		else
+		{
+			// * otherwise, if multiple .IAS files exist, get list selection and determine appropriate .IAS file
+			var pathName = parent.parent.globals.getConfigFolder( self );
+			var theList = parent.parent.globals.document.setupPlugin.GetFolderContents( pathName,".IAS" );
+
+			if ( theList != null )
+			{
+				if ( theList.length > 1 )
+				{
+					if ( document.forms[ 0 ].regServerList.selectedIndex < 0 )
+					{
+						alert( "Please select an Internet account server." );
+						return false;
+					}
+					
+					for ( var x = 0; x < theList.length; x++ )	
+					{
+						var file = parent.parent.globals.getConfigFolder( self ) + theList[ x ];
+						var name = parent.parent.globals.document.setupPlugin.GetNameValuePair( file, "Dial-In Configuration", "SiteName" );
+	
+						if ( name == document.forms[ 0 ].regServerList.options[ document.forms[ 0 ].regServerList.selectedIndex ].text )
+						{
+							parent.parent.globals.document.vars.regServer.value = theList[ x ];
+							break;
+						}
+					}
+					
+					if ( parent.parent.globals.document.vars.regServer.value == "" )
+					{
+						alert( "Internal problem locating appropriate registration server file." );
+						return false;
+					}
+				}
+				else if ( theList.length == 1 )
+				{
+					parent.parent.globals.document.vars.regServer.value = theList[ 0 ];
+				}
+				else
+				{
+					alert( "Internal problem locating a registration server file." );
+					return false;
+				}
+			}
+			else
+			{
+				alert( "Internal problem locating appropriate registration server file." );
+				return false;
+			}
+		}
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
+
+function checkData()
+{
+	return true;
+}
+
+
+
+function loadData()
+{
+	if ( parent.controls.generateControls )
+		parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+}
+
+
+
+function generateRegServerList()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	// if RegServer is not specified in ACCTSET.INI and multiple .IAS files exist, build list
+
+	var theFile = parent.parent.globals.getAcctSetupFilename( self );
+	var theRegFile = parent.parent.globals.GetNameValuePair( theFile, "New Acct Mode", "RegServer" );
+	
+	if ( theRegFile == null || theRegFile == "" )
+	{
+		var pathName = parent.parent.globals.getConfigFolder( self );
+		var theList = parent.parent.globals.document.setupPlugin.GetFolderContents( pathName, ".IAS" );
+		if ( theList != null )
+		{
+			if ( theList.length > 1 )	
+			{
+				document.writeln( "<TABLE CELLPADDING=2 CELLSPACING=0 ID='minspace'><TR><TD ALIGN=LEFT VALIGN=TOP HEIGHT=25><spacer type=vertical size=2><B>Select an Internet account server:</B></TD><TD ALIGN=LEFT VALIGN=TOP><FORM><SELECT NAME='regServerList'>");
+				for ( var x = 0; x < theList.length; x++ )
+				{
+					var file = parent.parent.globals.getConfigFolder( self ) + theList[ x ];
+					var name = parent.parent.globals.document.setupPlugin.GetNameValuePair( file, "Dial-In Configuration", "SiteName" );
+					var selected = ( x== 0 ) ? " SELECTED" : "";
+					document.writeln( "<OPTION VALUE='" + name + "'" + selected + ">" + name );
+				}
+				document.writeln( "</SELECT></FORM></TD></TR></TABLE>" );
+			}
+		}
+	}
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/editfour.htm
+++ b/mozilla/cmd/dialup/as_html/editfour.htm
@@ -0,0 +1,151 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="editfour.js">
+ 
+</SCRIPT>
+<LINK REL=STYLESHEET TYPE="text/JavaScript"  ARCHIVE="asw.jar" HREF="editfour.js">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#000000" VLINK="#000000" ALINK="#FF0000"
+onload="loadData()" ID="editfour100">
+
+<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="3" WIDTH="100%" ID="nospace">
+	<TR>
+		<TD BGCOLOR="#CCCCFF">
+			<spacer type=horizontal size=4>
+			<P STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='12px';fontWeight='bold';lineHeight='1';marginTop='0';marginRight='40';marginLeft='0';
+">Other Account Setup Screens</P>
+			</FONT>
+		</TD>
+	</TR>
+	<TR>
+		<TD>
+			<spacer type=vertical size=6>
+		</TD>
+	</TR>
+</TABLE>
+
+<TABLE BORDER="1" CELLSPACING="0"  CELLPADDING="0" BGCOLOR="#FFFFFF" WIDTH="100%" ID="nospace">
+	<TR>
+		<TD ALIGN=LEFT VALIGN=TOP>
+		
+<TABLE BORDER="0" CELLSPACING="0"  CELLPADDING="3" BGCOLOR="#FFFFFF" WIDTH="100%" ID="nospace">
+	<TR>
+		<TD VALIGN="TOP" WIDTH=468 ALIGN=LEFT>
+			<FONT STYLE="marginLeft='6';fontSize='10px';fontFamily='PrimaSans BT,Helvetica,Arial';marginTop='6'
+">The last few screens of the Account Setup's IAS mode are listed below. Account Setup displays these screens only in the specific circumstances described. You can edit these screens just as you would other screens of Account Setup. To load one of the screens, click the arrow corresponding to the screen. </P>
+		</TD>
+	</TR>
+</TABLE>
+
+		
+<TABLE BORDER="0" CELLSPACING="0"  CELLPADDING="2" BGCOLOR="#FFFFFF" WIDTH= ID="nospace">
+	<TR>
+		<TD VALIGN="TOP">
+			<A HREF="about:blank" onclick="setPath('register.htm');return false" ID="editfour101"><IMG NAME="next" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</TD>
+		<TD><FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+			<B>register.htm</B>
+			</FONT>
+			<spacer type=vertical size=8>
+            <FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+            Displayed by Account Setup while it is in the process of connecting to the Internet account server.
+			</FONT>
+		</TD>
+	</TR>
+		
+	<TR>
+		<TD>
+			<spacer type=vertical size=2>
+		</TD>
+	</TR>
+
+	<TR>
+		<TD VALIGN="TOP">
+			<A HREF="about:blank" onclick="setPath('ok.htm');return false" ID="editfour102"><IMG NAME="next" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</TD>
+		<TD><FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+			<B>ok.htm</B>
+			</FONT>
+			<spacer type=vertical size=8>
+            <FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+            Displayed by Account Setup when the user has successfully completed the process of using your Internet account server to create an account. Account Setup receives the user's account information from your server, disconnects from the server, then loads this screen in the Account Setup window. 
+			</FONT>
+		</TD>
+	</TR>
+
+	<TR>
+		<TD>
+			<spacer type=vertical size=2>
+		</TD>
+	</TR>
+
+	<TR>
+		<TD VALIGN="TOP">
+			<A HREF="about:blank" onclick="setPath('okreboot.htm');return false" ID="editfour103"><IMG NAME="next" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</TD>
+		<TD><FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+			<B>okreboot.htm</B>
+			</FONT>
+			<spacer type=vertical size=8>
+            <FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+            Displayed in the same circumstances as above, if the users must restart his or her computer before connecting to the Internet.  This is a situation which 
+            will occur on Macintoshes running MacTCP only.  Ignore this page if you are configuring for a Windows environment.
+			</FONT>
+		</TD>
+	</TR>
+
+	<TR>
+		<TD>
+			<spacer type=vertical size=2>
+		</TD>
+	</TR>
+
+	<TR>
+		<TD VALIGN="TOP">
+			<A HREF="about:blank" onclick="setPath('error.htm');return false" ID="editfour104"><IMG NAME="next" SRC="images/nxt_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
+		</TD>
+		<TD><FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+			<B>error.htm</B>
+			</FONT>
+			<spacer type=vertical size=8>
+            <FONT STYLE="fontFamily='PrimaSans BT,Helvetica,Arial';fontSize='10px';marginTop='0';marginLeft='24'
+">
+            Displayed if Account Setup can't establish a connection with your Internet account server or the user connects to the Internet account server but exits without creating an account.
+			</FONT><spacer type=vertical size=4>
+		</TD>
+	</TR>
+</TABLE>
+
+		</TD>
+	</TR>
+</TABLE>
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/editfour.js
+++ b/mozilla/cmd/dialup/as_html/editfour.js
@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+		var	thePath = "";
+
+
+function go(msg)
+{
+	if (msg == thePath)	{
+		return(checkData());
+		}
+	return(false);
+}
+
+function doGo()
+{
+	parent.controls.go("Next");
+}
+
+function setPath(msg)
+{
+	thePath = msg;
+	setTimeout("doGo()",1);
+}
+
+function checkData()
+{
+	return(true);
+}
+
+
+
+function loadData()
+{
+	if (parent && parent.controls && parent.controls.generateControls)	{
+		parent.controls.generateControls();
+		}
+}
+
+
+
+function saveData()
+{
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/email.htm
+++ b/mozilla/cmd/dialup/as_html/email.htm
@@ -0,0 +1,119 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="email.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="email100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline and text of this screen -->
+
+
+<FORM>
+
+<P CLASS="title"><B>Your Email Login and Password</B></P>
+
+<P>Enter your email name and password, if they are different from your account login name and password. If you are not sure about your email login and password, call your provider's technical support office.</P>
+
+<CENTER>
+<TABLE CELLPADDING="3" CELLSPACING="0" border="0">
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+		Email Login:
+		</B>
+		<spacer type=vertical size=2>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP">
+		<INPUT NAME="emailName" TYPE="text" SIZE=32 MAXLENGTH=32>
+	</TD>
+	<TD VALIGN="BOTTOM" ALIGN="LEFT">
+        (For example, jsmith)
+		<spacer type=vertical size=2>
+	</TD>        
+</TR>
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=0>
+	</TD>
+</TR>
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+		Password:
+		</B>
+		<spacer type=vertical size=2>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP" COLSPAN="2">
+		<INPUT NAME="emailPassword" TYPE="password" SIZE=32 MAXLENGTH=32>
+	</TD>
+</TR>
+<TR>
+	<TD COLSPAN="3">
+		<spacer type=vertical size=0>
+	</TD>
+</TR>
+<TR>
+	<TD VALIGN="BOTTOM" ALIGN="RIGHT">
+        <B>
+		Type Password Again:
+		</B>
+		<spacer type=vertical size=2>
+	</TD>
+	<TD ALIGN="LEFT" VALIGN="TOP" COLSPAN="2">
+		<INPUT NAME="emailPasswordCheck" TYPE="password" SIZE=32 MAXLENGTH=32>
+	</TD>
+</TR>
+
+</TABLE>
+</CENTER>
+
+</FORM>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/email.js
+++ b/mozilla/cmd/dialup/as_html/email.js
@@ -0,0 +1,93 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+function go(msg)
+{
+	if (parent.parent.globals.document.vars.editMode.value == "yes")
+		return true;
+	else
+		return(checkData());
+}
+
+
+
+function checkData()
+{
+	if (document.forms[0].emailPassword.value != document.forms[0].emailPasswordCheck.value)	{
+		if (document.forms[0].emailPassword.value == "")	{
+			parent.parent.globals.setFocus(document.forms[0].emailPassword);
+			}
+		else	{
+			parent.parent.globals.setFocus(document.forms[0].emailPasswordCheck);
+			}
+		alert("The password you entered in 'Type Password Again' does not match the password you entered in 'Password'. Please re-enter your password.");
+		return(false);
+		}
+	return(true);
+}
+
+
+
+function loadData()
+{
+	// make sure all data objects/element exists and valid; otherwise, reload.  SUCKS!
+	if (((document.forms[0].emailName == "undefined") || (document.forms[0].emailName == "[object InputArray]")) ||
+		((document.forms[0].emailPassword == "undefined") || (document.forms[0].emailPassword == "[object InputArray]")) ||
+		((document.forms[0].emailPasswordCheck == "undefined") || (document.forms[0].emailPasswordCheck == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return;
+	}
+
+	document.forms[0].emailName.value = parent.parent.globals.document.vars.emailName.value;
+	document.forms[0].emailPassword.value = parent.parent.globals.document.vars.emailPassword.value;
+	document.forms[0].emailPasswordCheck.value = parent.parent.globals.document.vars.emailPasswordCheck.value;
+	if (document.forms[0].emailName.value == "" && document.forms[0].emailPassword.value == "" && document.forms[0].emailPasswordCheck.value == "")	{
+		document.forms[0].emailName.value = parent.parent.globals.document.vars.accountName.value;
+		document.forms[0].emailPassword.value = parent.parent.globals.document.vars.accountPassword.value;
+		document.forms[0].emailPasswordCheck.value = parent.parent.globals.document.vars.accountPasswordCheck.value;
+		}
+	parent.parent.globals.setFocus(document.forms[0].emailName);
+	if (parent.controls.generateControls)	parent.controls.generateControls();
+}
+
+
+
+function saveData()
+{
+	// make sure all form element are valid objects, otherwise just skip & return!
+	if (((document.forms[0].emailName == "undefined") || (document.forms[0].emailName == "[object InputArray]")) ||
+		((document.forms[0].emailPassword == "undefined") || (document.forms[0].emailPassword == "[object InputArray]")) ||
+		((document.forms[0].emailPasswordCheck == "undefined") || (document.forms[0].emailPasswordCheck == "[object InputArray]")))
+	{
+		parent.controls.reloadDocument();
+		return(true);
+	}
+
+	parent.parent.globals.document.vars.emailName.value = document.forms[0].emailName.value;
+	parent.parent.globals.document.vars.emailPassword.value = document.forms[0].emailPassword.value;
+	parent.parent.globals.document.vars.emailPasswordCheck.value = document.forms[0].emailPasswordCheck.value;
+	return(true);
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/error.htm
+++ b/mozilla/cmd/dialup/as_html/error.htm
@@ -0,0 +1,106 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
+<HTML>
+
+
+
+<HEAD>
+<TITLE>Account Setup</TITLE>
+
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="error.js">
+</SCRIPT>
+
+<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js">
+</LINK>
+
+</HEAD>
+
+
+
+<BODY BACKGROUND="images/bg.gif" BGCOLOR="cccccc" onLoad="loadData()" ID="error100">
+
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
+<B CLASS="previewtag">ACCOUNT SETUP</B>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+
+
+<!-- The layer below contains the headline of this screen -->
+
+
+<P CLASS="title"><B>Connection Error...</B></P>
+
+
+
+<!-- The layer below contains the text displayed for errors encountered while the user
+is in IAS mode -->
+
+<LAYER NAME="IAS Mode" VISIBILITY=HIDE>
+<SPACER TYPE=HORIZONTAL SIZE=72>
+	<TABLE BORDER="0" CELLPADDING="6" CELLSPACING="0" WIDTH=470>
+		<TR>
+	    	<TD ALIGN=LEFT VALIGN=TOP BGCOLOR="FFFFFF">
+
+				<P ID="nomargins">Your connection to the Internet account server closed before you finished creating an account.</P>
+				
+				<P ID="nomargins">If you exited the Internet account server before you were finished creating an account, you can reconnect to the server later by launching Account Setup from the Netscape Communicator folder.</P>
+
+				<P ID="nomargins">If Account Setup wasn't able to establish a connection with the Internet account server, make sure that your modem is installed properly, connected, and turned on. Also make sure that the telephone line you are using has an ordinary dial tone. When you're ready to try connecting again, click Connect Again.</P>
+
+				<P ID="nomargins">For more troubleshooting tips, click Help.</P>
+
+			</TD>
+		</TR>
+	</TABLE>
+
+</LAYER>
+
+
+
+<!-- The layer below contains the text displayed for errors encountered while the user
+is in NCI mode -->
+
+<LAYER NAME="NCI Mode" VISIBILITY=HIDE>
+<SPACER TYPE=HORIZONTAL SIZE=72>
+	<TABLE BORDER="0" CELLPADDING="6" CELLSPACING="0" WIDTH=500>
+		<TR>
+	    	<TD ALIGN=LEFT VALIGN=TOP BGCOLOR="FFFFFF">
+
+				<P ID="nomargins">Account Setup wasn't able to establish a connection to your account. Make sure that your modem is installed properly, connected, and turned on. Also make sure that the telephone line you are using has an ordinary dial tone. When you're ready to try connecting again, click Connect Again.</P>
+
+				<P ID="nomargins">For more troubleshooting tips, click Help.</P>
+
+			</TD>
+		</TR>
+	</TABLE>
+
+</LAYER>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/error.js
+++ b/mozilla/cmd/dialup/as_html/error.js
@@ -0,0 +1,84 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+function go( msg )
+{
+	if ( parent.parent.globals.document.vars.editMode.value != "yes" )
+	{
+		if ( msg == "firstDial" )
+		{
+			if ( parent.parent.globals.document.vars.oneStepMode.value != "yes" )
+			{
+				parent.parent.globals.document.vars.tryAgain.value = "yes";
+				return checkData();
+			}
+		}
+		if ( msg == parent.parent.globals.document.vars.path.value )
+		{
+			parent.parent.globals.document.vars.tryAgain.value = "yes";
+			return checkData();
+		}
+		return false;
+	}
+	else
+	{
+		if ( msg == parent.parent.globals.document.vars.path.value )
+			alert( "Sorry, you cannot connect while in using the Account Setup Editor." );
+		return false;
+	}
+}
+
+function checkData()
+{
+	return true;
+}
+
+function showErrorLayer()
+{
+	if ( document.layers[ "IAS Mode" ] && document.layers[ "NCI Mode" ] )
+	{
+		if ( parent.parent.globals.document.vars.path.value == "Existing Path" )
+		{
+			document.layers[ "IAS Mode" ].visibility = "hide";
+			document.layers[ "NCI Mode" ].visibility = "show";
+		}
+		else
+		{
+			document.layers[ "IAS Mode" ].visibility = "show";
+			document.layers[ "NCI Mode" ].visibility = "hide";
+		}
+	}
+	else
+		setTimeout( "showErrorLayer()", 1000 );
+}
+
+function loadData()
+{
+	setTimeout( "showErrorLayer()", 1000 );
+	if ( parent.controls.generateControls )
+		parent.controls.generateControls();
+}
+
+function saveData()
+{
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/globals.htm
+++ b/mozilla/cmd/dialup/as_html/globals.htm
@@ -0,0 +1,143 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<HTML>
+<HEAD>
+<EMBED NAME='setupPlugin' TYPE='application/x-netscape-autoconfigure-dialer' HIDDEN=true MAYSCRIPT></EMBED>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="globals1.js">
+</SCRIPT>
+<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="globals2.js">
+</SCRIPT>
+</HEAD>
+
+<BODY BGCOLOR = #000066>
+
+<PRE>
+<FORM NAME="vars">
+
+Debug Mode: <INPUT NAME="debugMode" TYPE="Text" VALUE="yes"><BR>
+Edit Mode: <INPUT NAME="editMode" TYPE="Text" VALUE="no"><BR>
+QA Mode: <INPUT NAME="qaMode" TYPE="Text" VALUE="no"><BR>
+1Step Mode: <INPUT NAME="oneStepMode" TYPE="Text" VALUE="no"><BR>
+International Mode: <INPUT NAME="intlMode" TYPE="Text"><BR>
+Startup File: <INPUT NAME="startupFile" TYPE="Text"><BR>
+Registration server: <INPUT NAME="regServer" TYPE="text"><BR>
+Reg Data: <TEXTAREA ROWS=4 COLS=60 NAME="regData" TYPE="text"></TEXTAREA><BR>
+Reg Bookmark File: <TEXTAREA ROWS=4 COLS=60 NAME="regBookmark" TYPE="text"></TEXTAREA><BR>
+Reg Lock File: <TEXTAREA ROWS=4 COLS=60 NAME="lockFile" TYPE="text"></TEXTAREA><BR>
+RegMode Active: <INPUT NAME="regMode" TYPE="text"><P>
+Inited: <INPUT NAME="inited" TYPE="Text" VALUE="no"><BR>
+Offline Mode: <INPUT NAME="offlineMode" TYPE="Text"><BR>
+Warn on Cookies: <INPUT NAME="cookieWarning" TYPE="Text"><BR>
+Error, Try Again: <INPUT NAME="tryAgain" TYPE="Text" VALUE="no"><BR>
+Screen History: <TEXTAREA ROWS=3 COLS=40 NAME="pageHistory"></TEXTAREA><BR>
+
+<P><CENTER><HR WIDTH="50%"></CENTER><P>
+
+Path: <INPUT NAME="path" TYPE="text"><BR>
+
+First: <INPUT NAME="first" TYPE="text"><BR>
+Last: <INPUT NAME="last" TYPE="text"><BR>
+Company: <INPUT NAME="company" TYPE="text"><BR>
+Address1: <INPUT NAME="address1" TYPE="text"><BR>
+Address2: <INPUT NAME="address2" TYPE="text"><BR>
+Address3: <INPUT NAME="address3" TYPE="text"><BR>
+City: <INPUT NAME="city" TYPE="text"> 
+State: <INPUT NAME="state" TYPE="text"> 
+Zip: <INPUT NAME="zip" TYPE="text"><BR>
+Areacode: <INPUT NAME="areaCode" TYPE="text"> 
+Phonenumber: <INPUT NAME="phoneNumber" TYPE="text"><BR>
+Country: <INPUT NAME="country" TYPE="text"><BR>
+CountryCode: <INPUT NAME="countryCode" TYPE="text"><BR>
+
+Cardname: <INPUT NAME="cardname" TYPE="text"><BR>
+Cardtype: <INPUT NAME="cardtype" TYPE="text"><BR>
+Cardcode: <INPUT NAME="cardcode" TYPE="text"><BR>
+Cardnumber: <INPUT NAME="cardnumber" TYPE="text"><BR>
+Month: <INPUT NAME="month" TYPE="text"><BR>
+Year: <INPUT NAME="year" TYPE="text"><BR>
+
+Modem: <INPUT NAME="modem" TYPE="text"><BR>
+
+Manufacturer: <INPUT NAME="manufacturer" TYPE="text"><BR>
+Model: <INPUT NAME="model" TYPE="text"><BR>
+<INPUT NAME="port" TYPE="radio">Modem Port<BR>
+<INPUT NAME="port" TYPE="radio">Printer Port<BR>
+
+Modem Areacode: <INPUT NAME="modemAreaCode" TYPE="text"> 
+Modem Phonenumber: <INPUT NAME="modemPhoneNumber" TYPE="text"><BR>
+
+Accept Language: <INPUT NAME="acceptLanguage" TYPE="text">
+
+Alternate Area Code 1: <INPUT NAME="altAreaCode1" TYPE="text">
+Alternate Area Code 2: <INPUT NAME="altAreaCode2" TYPE="text">
+Alternate Area Code 3: <INPUT NAME="altAreaCode3" TYPE="text"><BR>
+
+<!INPUT NAME="cwOFF" TYPE="checkbox">
+CallWaiting: <INPUT NAME="cwData" TYPE="text"><BR>
+<!INPUT NAME="prefix" TYPE="checkbox">
+Prefix: <INPUT NAME="prefixData" TYPE="text"><BR>
+DialMethod: <INPUT NAME="dialMethod" TYPE="text"><BR>
+
+Providername: <INPUT NAME="providername" TYPE="text"><BR>
+ProviderFilename: <INPUT NAME="providerFilename" TYPE="text"><BR>
+
+Account Areacode: <INPUT NAME="accountAreaCode" TYPE="text"> 
+Account Phonenumber: <INPUT NAME="accountPhoneNumber" TYPE="text"><BR>
+
+Login Name: <INPUT NAME="accountName" TYPE="text"><BR>
+Password: <INPUT NAME="accountPassword" TYPE="password"><BR>
+Password Check: <INPUT NAME="accountPasswordCheck" TYPE="password"><BR>
+TTY Window: <INPUT NAME="ttyWindow" TYPE="checkbox"><BR>
+
+Email Name: <INPUT NAME="emailName" TYPE="text"><BR>
+Email Password: <INPUT NAME="emailPassword" TYPE="password"><BR>
+Email Password Check: <INPUT NAME="emailPasswordCheck" TYPE="password"><BR>
+
+Publish URL: <INPUT NAME="publishURL" TYPE="text"><BR>
+Publish Password: <INPUT NAME="publishPassword" TYPE="password"><BR>
+Publish Password Check: <INPUT NAME="publishPasswordCheck" TYPE="password"><BR>
+View URL: <INPUT NAME="viewURL" TYPE="text"><BR>
+
+SMTP server: <INPUT NAME="SMTP" TYPE="text"><BR>
+Mail server: <INPUT NAME="mailServer" TYPE="text"><BR>
+Mail protocol: <INPUT NAME="mailProtocol" TYPE="text"><BR>
+NNTP server: <INPUT NAME="NNTP" TYPE="text"><BR>
+LDAP server: <TEXTAREA NAME="LDAP" TYPE="text"></TEXTAREA><BR>
+
+Domain name: <INPUT NAME="domainName" TYPE="text"><BR>
+Primary DNS server: <INPUT NAME="primaryDNS" TYPE="text"><P>
+Secondary DNS server: <INPUT NAME="secondaryDNS" TYPE="text"><P>
+Static IP address: <INPUT NAME="ipAddress" TYPE="text"><P>
+
+Static IP address: <INPUT NAME="scriptEnabled" TYPE="text"><P>
+Static IP address: <INPUT NAME="scriptFile" TYPE="text"><P>
+
+Profile Lockfilename: <INPUT NAME="lckFilename" TYPE="text"><P>
+
+External Editor: <INPUT NAME="externalEditor" TYPE="text"><P>
+
+</FORM>
+</PRE>
+
+</BODY>
+
+<SCRIPT LANGUAGE="JavaScript" ID="globals100">
+loadGlobalData();
+</SCRIPT>
+
+</HTML>
--- a/mozilla/cmd/dialup/as_html/globals1.js
+++ b/mozilla/cmd/dialup/as_html/globals1.js
@@ -0,0 +1,965 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+compromisePrincipals();
+enableExternalCapture(); 												// This requires UniversalBrowserWrite access
+parent.captureEvents( Event.MOUSEDOWN | Event.MOUSEUP | Event.DRAGDROP | Event.DBLCLICK );
+parent.onmousedown = cancelEvent;
+parent.onmouseup = cancelEvent;
+parent.ondragdrop = cancelEvent;
+parent.ondblclick = cancelEvent;
+
+var oneStepSemaphore = false;
+var selectedISP = null;
+
+function cancelEvent( e )
+{
+	var retVal = false;
+
+	if ( ( e.which < 2 ) && ( e.type != "dragdrop" ) && ( e.type != "dblclick" ) )
+		retVal = routeEvent( e );
+
+	return retVal;
+}
+
+
+
+function debug( theString )
+{
+	java.lang.System.out.println( theString );
+//	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+//
+//	if ( document.vars.debugMode.value.toLowerCase() == "yes" )
+//		document.setupPlugin.debug( theString );
+}
+
+function GetNameValuePair( file, section, variable )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var value = parent.globals.document.setupPlugin.GetNameValuePair( file, section, variable );
+	if ( value == null )
+		value = "";
+	return value;
+}
+
+function SetNameValuePair( file, section, variable, data )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	parent.globals.document.setupPlugin.SetNameValuePair( file, section, variable, data );
+	//debug( "\tSetNameValuePair: [" + section + "] " + variable + "=" + data );
+}
+
+
+// * returns a string representing the path to the folder named "Config" inside the folder "Data" that
+//	is installed in the Communicator's home directory
+function getConfigFolder( object )
+{
+	var	pathName;
+	pathName = getFolder( object ) + "Config" + "\\";
+
+	//debug( "getConfigFolder: " + pathName );
+
+	return pathName;
+}
+
+// * returns a string representing the path to the file "ACCTSET.INI" inside the folder
+//	returned from getConfigFolder
+function getAcctSetupFilename( object )
+{
+	var file;
+	file = getConfigFolder( object ) + "ACCTSET.INI";
+
+	//debug( "getAcctSetupFilename: " + file );
+	return file;
+}
+
+function getPlatform()
+{
+	var platform = new String( navigator.userAgent );
+	var x = platform.indexOf( "(" ) + 1;
+	var y = platform.indexOf( ";", x + 1 );
+	platform = platform.substring( x, y );
+	return platform;
+}
+	
+// * returns a canoncial path to the folder containing the document representing the current contents of "window"
+function getFolder( window )
+{
+	platform = getPlatform();
+
+	if ( platform == "Macintosh" )
+	{				// Macintosh support
+		var path = unescape( window.location.pathname );
+		if ( ( x = path.lastIndexOf( "/" ) ) > 0 )
+			path = path.substring( 0, x + 1 );
+
+		//var fileArray = path.split( "/" );
+		//var newpath = fileArray.join( ":" ) + ":";
+
+		//if ( newpath.charAt( 0 ) == ':' )
+		//	newpath = newpath.substring( 1, newpath.length );
+
+		newpath = path;
+	}
+	else	
+	{										// Windows support
+
+		// note: JavaScript returns path with '/' instead of '\'
+		var path = unescape( window.location.pathname );
+
+		var drive = "|";
+		
+		// gets the drive letter and directory path
+		if ( ( x = path.lastIndexOf( "|" ) ) > 0 )
+		{
+			drive = path.substring( path.indexOf( '/' ) + 1, path.indexOf( '|' ) );
+			path = path.substring( path.indexOf( '|' ) + 1, path.lastIndexOf( '/' ) + 1 );
+		}
+
+		var pathArray = path.split( "/" );
+		path = pathArray.join( "\\" );
+
+		//debug( "drive: " + drive + " path: " + path );
+
+		// construct newpath		
+
+		newpath = drive + ":" + path + "\\";
+		debug( "path: " + newpath );
+	}
+	return newpath;
+}
+
+function setFocus( theObject )
+{
+	theObject.focus();
+	theObject.select();
+}
+
+function message( txt )
+{
+	window.status = txt;
+	setTimeout( "remove_message()", 10000 );
+}
+
+function remove_message()
+{
+	window.status = "";
+}
+
+function getSelectedISPName()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var		ispDisplayName = document.setupPlugin.GetISPDisplayName( selectedISP );				
+	
+	return ispDisplayName;
+}
+
+function checkPluginExists( name, generateOutputFlag )
+{
+	/*
+	var myPlugin = navigator.plugins["name"];
+	if (myPlugin)	{
+		// do something here
+		}
+	else	{
+		document.writeln("<CENTER><STRONG>Warning! The '" +name+ "' plug-in is not installed!</STRONG></CENTER>\n");
+		}
+	*/
+	
+	if ( navigator.javaEnabled() )
+	{
+		var myMimetype = navigator.mimeTypes[ name ]
+		if ( myMimetype )
+		{
+		 	return true;
+		}
+		else
+		{
+			if ( generateOutputFlag == true )
+			{
+				document.writeln( "<CENTER><STRONG>The 'Account Setup Plugin' is not installed!<P>\n" );
+				document.writeln( "Please install the plugin, then run 'Account Setup' again.</STRONG></CENTER>\n" );
+			}
+		 return false;
+		}
+	}
+	else
+	{
+		if ( generateOutputFlag==true )
+		{
+			document.writeln( "<CENTER><STRONG>Java support is disabled!<P>\n" );
+			document.writeln( "Choose Options | Network Preferences and enable Java, then try again.</STRONG></CENTER>\n" );
+		}
+	 	return false;
+	}
+}
+
+
+
+function forceReboot(pageName)
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+	debug( "go: Reboot needed before move to page " + pageName );
+	alert( "A reboot is needed. Account Setup will continue after the reboot." );
+	navigator.preference( "mail.check_new_mail", false );
+	document.vars.startupFile.value = pageName;
+	saveGlobalData();
+
+	// if rebooting and using magic profile, rename it so that it won't be automatically deleted at next launch
+	var profileName = parent.parent.globals.document.setupPlugin.GetCurrentProfileName();
+	if ( profileName != null && profileName != "" )
+	{
+		profileName = profileName.toUpperCase();
+		if ( profileName == '911' || profileName == 'USER1' )
+			parent.parent.globals.document.setupPlugin.SetCurrentProfileName( "912" );
+	}
+
+	parent.parent.globals.document.setupPlugin.Reboot( getFolder( self ) + "start.htm" );
+}
+
+
+
+function findVariable( theVar )
+{
+	var theValue = "";
+	var regData = parent.parent.globals.document.vars.regData.value;
+	var x = regData.indexOf( theVar + "=" );
+	if ( x >= 0 )
+	{
+		x = x + theVar.length + 1;
+		var y = regData.indexOf( "\r", x );
+		if ( y > x )
+		{
+			theValue = regData.substring( x, y );
+			debug( "findVariable: " + theVar + "=" + theValue );
+		}
+	}
+	return theValue;
+}
+
+
+
+//	contentFile = "main.htm";
+function getContentPage()
+{
+//	var file = contentFile;
+//	contentFile = null;
+	var file = parent.parent.globals.document.vars.startupFile.value;
+	parent.parent.globals.document.vars.startupFile.value = "";
+	return file;
+}
+
+function setContentPage( file )
+{
+//	contentFile = file;
+	parent.parent.globals.document.vars.startupFile.value = file;
+}
+
+
+function loadUserInput()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	if (document.vars.inited.value != "yes")	{
+		document.vars.inited.value = "yes";
+
+		var cookieWarning = navigator.preference("network.cookie.warnAboutCookies");
+		if (cookieWarning == true)	{
+			document.vars.cookieWarning.value = "yes";
+			}
+		else	{
+			document.vars.cookieWarning.value = "no";
+			}
+		navigator.preference("network.cookie.warnAboutCookies", false);
+
+		document.vars.offlineMode.value = navigator.preference("offline.startup_mode");
+		navigator.preference("offline.startup_mode", 0);		// online
+		navigator.preference("network.online", true);
+
+		var acctSetupFile = getAcctSetupFilename(self);
+		if (acctSetupFile != null && acctSetupFile != "")	{
+			var intlMode = parent.parent.globals.GetNameValuePair(acctSetupFile,"Mode Selection","IntlMode");
+			if (intlMode != null && intlMode != "")	{
+				intlMode = intlMode.toLowerCase();
+				}
+			}
+	
+		var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
+		if (userInputFile != null && userInputFile != "")	{
+			userInputFile = userInputFile + "ACCTSET.DAT";
+			var theSection="Account Setup User Input";
+		
+			var regServer = GetNameValuePair(userInputFile,theSection,"regServer");
+			if (regServer != null && regServer != "")	{
+				document.vars.regServer.value = regServer;
+				SetNameValuePair(userInputFile,theSection,"regServer", "");
+				}
+			document.vars.first.value = GetNameValuePair(userInputFile,theSection,"first");
+			document.vars.last.value = GetNameValuePair(userInputFile,theSection,"last");
+			document.vars.company.value = GetNameValuePair(userInputFile,theSection,"company");
+			document.vars.address1.value = GetNameValuePair(userInputFile,theSection,"address1");
+			document.vars.address2.value = GetNameValuePair(userInputFile,theSection,"address2");
+			if (intlMode=="yes")	{
+				document.vars.address3.value = GetNameValuePair(userInputFile,theSection,"address3");
+				document.vars.city.value="";
+				document.vars.state.value="";
+				document.vars.zip.value="";
+				document.vars.areaCode.value="";
+				}
+			else	{
+				document.vars.address3.value="";
+				document.vars.city.value = GetNameValuePair(userInputFile,theSection,"city");
+				document.vars.state.value = GetNameValuePair(userInputFile,theSection,"state");
+				document.vars.zip.value = GetNameValuePair(userInputFile,theSection,"zip");
+				document.vars.areaCode.value = GetNameValuePair(userInputFile,theSection,"areaCode");
+				}
+			document.vars.phoneNumber.value = GetNameValuePair(userInputFile,theSection,"phoneNumber");
+			document.vars.country.value = GetNameValuePair(userInputFile,theSection,"country");
+			document.vars.countryCode.value = GetNameValuePair(userInputFile,theSection,"countryCode");
+				
+			document.vars.cardname.value = GetNameValuePair(userInputFile,theSection,"cardname");
+			document.vars.cardtype.value = GetNameValuePair(userInputFile,theSection,"cardtype");
+			document.vars.cardcode.value = GetNameValuePair(userInputFile,theSection,"cardcode");
+			document.vars.cardnumber.value = GetNameValuePair(userInputFile,theSection,"cardnumber");
+			SetNameValuePair(userInputFile,theSection,"cardnumber", "");
+	
+			document.vars.month.value = GetNameValuePair(userInputFile,theSection,"month");
+			document.vars.year.value = GetNameValuePair(userInputFile,theSection,"year");
+	
+			document.vars.modem.value = GetNameValuePair(userInputFile,theSection,"modem");
+			document.vars.manufacturer.value = GetNameValuePair(userInputFile,theSection,"manufacturer");
+			document.vars.model.value = GetNameValuePair(userInputFile,theSection,"model");
+	
+	
+			document.vars.externalEditor.value = GetNameValuePair(userInputFile,theSection,"externalEditor");
+	
+	
+			if (intlMode=="yes")	{
+				document.vars.modemAreaCode.value="";
+				}
+			else	{
+				document.vars.modemAreaCode.value = GetNameValuePair(userInputFile,theSection,"modemAreaCode");
+				}
+			document.vars.modemPhoneNumber.value = GetNameValuePair(userInputFile,theSection,"modemPhoneNumber");
+			
+			document.vars.altAreaCode1.value = GetNameValuePair( userInputFile, theSection, "altAreaCode1" );
+			document.vars.altAreaCode2.value = GetNameValuePair( userInputFile, theSection, "altAreaCode2" );
+			document.vars.altAreaCode3.value = GetNameValuePair( userInputFile, theSection, "altAreaCode3" );
+			
+			document.vars.cwData.value = GetNameValuePair(userInputFile,theSection,"cwData");
+			if (document.vars.cwData.value != null && document.vars.cwData.value != "")
+			{
+//				document.vars.prefix.cwOFF=1;
+			}
+			else
+			{
+//				document.vars.prefix.cwOFF=0;
+			}
+			document.vars.prefixData.value = GetNameValuePair(userInputFile,theSection,"prefixData");
+			if (document.vars.prefixData.value != null && document.vars.prefixData.value != "")
+			{
+//				document.vars.prefix.checked=1;
+			}
+			else
+			{
+//				document.vars.prefix.checked=0;
+			}
+			document.vars.dialMethod.value = GetNameValuePair(userInputFile,theSection,"dialMethod");
+	
+			document.vars.providername.value = GetNameValuePair(userInputFile,theSection,"providername");
+			if (intlMode=="yes")
+			{
+				document.vars.accountAreaCode.value="";
+			}
+			else
+			{
+				document.vars.accountAreaCode.value = GetNameValuePair(userInputFile,theSection,"accountAreaCode");
+			}
+			document.vars.accountPhoneNumber.value = GetNameValuePair(userInputFile,theSection,"accountPhoneNumber");
+	
+			document.vars.accountName.value = GetNameValuePair(userInputFile,theSection,"accountName");
+			document.vars.emailName.value = GetNameValuePair(userInputFile,theSection,"emailName");
+			document.vars.publishURL.value = GetNameValuePair(userInputFile,theSection,"publishURL");
+			document.vars.viewURL.value = GetNameValuePair(userInputFile,theSection,"viewURL");
+
+			document.vars.accountPassword.value = GetNameValuePair(userInputFile,theSection,"accountPassword");		// existing path
+			document.vars.accountPasswordCheck.value = GetNameValuePair(userInputFile,theSection,"accountPasswordCheck");
+			document.vars.emailPassword.value = GetNameValuePair(userInputFile,theSection,"emailPassword");
+			document.vars.emailPasswordCheck.value = GetNameValuePair(userInputFile,theSection,"emailPasswordCheck");
+			document.vars.publishPassword.value = GetNameValuePair(userInputFile,theSection,"publishPassword");
+			document.vars.publishPasswordCheck.value = GetNameValuePair(userInputFile,theSection,"publishPasswordCheck");
+			document.vars.SMTP.value = GetNameValuePair(userInputFile,theSection,"SMTP");
+			document.vars.mailServer.value = GetNameValuePair(userInputFile,theSection,"mailServer");
+			document.vars.mailProtocol.value = GetNameValuePair(userInputFile,theSection,"mailProtocol");
+			document.vars.NNTP.value = GetNameValuePair(userInputFile,theSection,"NNTP");
+			document.vars.domainName.value = GetNameValuePair(userInputFile,theSection,"domainName");
+			document.vars.primaryDNS.value = GetNameValuePair(userInputFile,theSection,"primaryDNS");
+			document.vars.secondaryDNS.value = GetNameValuePair(userInputFile,theSection,"secondaryDNS");
+			document.vars.ipAddress.value = GetNameValuePair(userInputFile,theSection,"ipAddress");
+			document.vars.scriptEnabled.value = GetNameValuePair(userInputFile,theSection,"scriptEnabled");
+			document.vars.scriptFile.value = GetNameValuePair(userInputFile,theSection,"scriptFile");
+			document.vars.lckFilename.value = GetNameValuePair(userInputFile,theSection,"lckFilename");
+
+			SetNameValuePair(userInputFile,theSection,"accountPassword", "");										// existing path
+			SetNameValuePair(userInputFile,theSection,"accountPasswordCheck", "");
+			SetNameValuePair(userInputFile,theSection,"emailPassword", "");
+			SetNameValuePair(userInputFile,theSection,"emailPasswordCheck", "");
+			SetNameValuePair(userInputFile,theSection,"publishPassword", "");
+			SetNameValuePair(userInputFile,theSection,"publishPasswordCheck", "");
+			}
+		}
+}
+
+
+
+/*
+	loadGlobalData:		checks for the plugin; reads in any saved user input from a previous session
+*/
+
+function loadGlobalData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	if ( document.setupPlugin == null )
+		return;
+
+	if ( document.vars.inited.value != "yes" )
+	{
+
+		// load globals here
+	
+		var acctSetupFile = getAcctSetupFilename( self );
+		if ( acctSetupFile != null && acctSetupFile != "" )
+		{
+			var intlMode = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "IntlMode" );
+			if ( intlMode != null && intlMode != "" )
+			{
+				intlMode = intlMode.toLowerCase();
+				document.vars.intlMode.value = intlMode;
+			}
+			
+			var editMode = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "EditMode" );
+			if ( editMode != null && editMode != "" )
+			{
+				editMode = editMode.toLowerCase();
+				document.vars.editMode.value = editMode;
+				SetNameValuePair( acctSetupFile, "Mode Selection", "EditMode", "no" );
+			}
+
+			// if not in editMode, ensure that OS support is available (networking,dialer,etc)
+			if ( editMode != "yes" )
+			{
+				var installedFlag = document.setupPlugin.CheckEnvironment();
+				if ( installedFlag != true )
+				{
+					document.setupPlugin.QuitNavigator();
+					return;
+				}
+			}
+
+			// set appropriate path info (if not prompting user)
+	
+			document.vars.path.value = "";
+			var newPathFlag = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "ForceNew" );
+			newPathFlag = newPathFlag.toLowerCase();
+			var existingPathFlag = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "ForceExisting" );
+			existingPathFlag = existingPathFlag.toLowerCase();
+	
+			if ( newPathFlag == "yes" && existingPathFlag != "yes" )
+				document.vars.path.value = "New Path";
+			else if ( existingPathFlag == "yes" && newPathFlag != "yes" )
+				document.vars.path.value = "Existing Path";
+
+			document.vars.oneStepMode.value = "";
+			var oneStepModeFlag = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "OneStepMode" );
+			oneStepModeFlag = oneStepModeFlag.toLowerCase();
+			if ( oneStepModeFlag == "yes" )
+				document.vars.oneStepMode = "yes";
+						
+			if ( document.vars.debugMode.value.toLowerCase() != "yes" && ( document.vars.editMode.value.toLowerCase() != "yes" ) )
+				if (checkPluginExists( "application/x-netscape-autoconfigure-dialer", false ) )
+					document.setupPlugin.SetKiosk( true );
+		}
+		
+		
+		// load in user input (if any)
+		var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
+		if ( userInputFile != null && userInputFile != "" )
+		{
+
+			userInputFile = userInputFile + "ACCTSET.DAT";
+			var theSection = "Account Setup User Input";
+	
+			document.vars.externalEditor.value = GetNameValuePair( userInputFile, theSection, "externalEditor" );
+
+			var startupFile = GetNameValuePair( userInputFile, theSection, "startupFile" );
+			if ( startupFile != null && startupFile != "" )
+			{
+				document.vars.startupFile.value = startupFile;
+				document.vars.path.value = GetNameValuePair( userInputFile, theSection, "path" );
+				document.vars.pageHistory.value = GetNameValuePair( userInputFile, theSection, "pageHistory" );
+
+				SetNameValuePair( userInputFile, theSection, "startupFile", "" );
+				SetNameValuePair( userInputFile, theSection, "path", "" );
+				SetNameValuePair( userInputFile, theSection, "pageHistory", "" );
+
+				// if coming out of a reboot and using magic profile, rename it so that it won't be automatically deleted at next launch
+			
+				var profileName = document.setupPlugin.GetCurrentProfileName();
+				if ( profileName != null && profileName != "" )
+				{
+					profileName = profileName.toUpperCase();
+					if ( profileName == '912' )
+						document.setupPlugin.SetCurrentProfileName( "USER1" );
+				}
+				loadUserInput();
+			}
+			else
+			{
+				document.vars.startupFile.value = "main.htm";
+				// defer loading user input until after main screen has loaded (faster speedup)
+			}
+			parent.screen.location.replace( "screen.htm" );
+		}
+
+		// QA support
+
+		var qaMode = document.vars.qaMode.value;
+		if ( qaMode != null && qaMode != "" )
+		{
+			qaMode = qaMode.toLowerCase();
+			if ( qaMode == "yes" )
+			{
+				if ( confirm( "Would you like to use a Milan data file to configure Communicator?" ) == true )
+				{
+					if ( document.setupPlugin.Milan( null, null, true, false ) == true )
+						document.vars.regMode.value = "yes";
+				}
+			}
+		}
+	}
+	
+	if ( document.vars.regMode.value == "yes" )
+		setRegisterMode( 1 );
+}
+
+function saveExternalEditor()
+{
+	// Since we don't do a saveGlobalData in editMode, we need an alternate way to save the externalEditor
+	// as a preference in ACCTSET.DAT.  This is it.
+	
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+	var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
+	if ( userInputFile != null && userInputFile != "" )
+	{
+		userInputFile = userInputFile + "ACCTSET.DAT";
+		var theSection = "Account Setup User Input";
+		SetNameValuePair( userInputFile, theSection, "externalEditor", document.vars.externalEditor.value );
+	}
+}
+
+function saveGlobalData()
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	if ( document.vars.editMode.value.toLowerCase() == "yes" )
+		return;
+
+	if ( document.setupPlugin == null )
+		return;
+/*
+	if (document.vars.debugMode.value.toLowerCase() != "yes" && (document.vars.editMode.value.toLowerCase() != "yes"))	{
+		if (checkPluginExists("application/x-netscape-autoconfigure-dialer",false))	{
+			document.setupPlugin.SetKiosk(false);
+			}
+		}
+	top.statusbar.visible=true;
+	top.scrollbars.visible=true;
+	top.toolbar.visible=true;
+	top.menubar.visible=true;
+	top.locationbar.visible=true;
+	top.personalbar.visible=true;				// was directory
+*/
+		
+	if (document.vars.cookieWarning.value == "yes")
+	{
+		navigator.preference("network.cookie.warnAboutCookies", true);
+	}
+	else
+	{
+		navigator.preference("network.cookie.warnAboutCookies", false);
+	}
+
+	if (document.vars.offlineMode.value != "undefined")
+	{
+		navigator.preference("offline.startup_mode", document.vars.offlineMode.value);
+	}
+
+
+	// save user input (if any)
+	var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
+	if (userInputFile != null && userInputFile != "")
+	{
+		userInputFile = userInputFile + "ACCTSET.DAT";
+		var theSection="Account Setup User Input";
+	
+		SetNameValuePair(userInputFile,theSection,"startupFile", document.vars.startupFile.value);
+		SetNameValuePair(userInputFile,theSection,"regServer", document.vars.regServer.value);
+
+		SetNameValuePair(userInputFile,theSection,"first", document.vars.first.value);
+		SetNameValuePair(userInputFile,theSection,"last", document.vars.last.value);
+		SetNameValuePair(userInputFile,theSection,"company", document.vars.company.value);
+		SetNameValuePair(userInputFile,theSection,"address1", document.vars.address1.value);
+		SetNameValuePair(userInputFile,theSection,"address2", document.vars.address2.value);
+		SetNameValuePair(userInputFile,theSection,"address3", document.vars.address3.value);
+		SetNameValuePair(userInputFile,theSection,"city", document.vars.city.value);
+		SetNameValuePair(userInputFile,theSection,"state", document.vars.state.value);
+		SetNameValuePair(userInputFile,theSection,"zip", document.vars.zip.value);
+		SetNameValuePair(userInputFile,theSection,"areaCode", document.vars.areaCode.value);
+		SetNameValuePair(userInputFile,theSection,"phoneNumber", document.vars.phoneNumber.value);
+		SetNameValuePair(userInputFile,theSection,"country", document.vars.country.value);
+		SetNameValuePair(userInputFile,theSection,"countryCode", document.vars.countryCode.value);
+		
+		SetNameValuePair(userInputFile,theSection,"cardname", document.vars.cardname.value);
+		SetNameValuePair(userInputFile,theSection,"cardtype", document.vars.cardtype.value);
+		SetNameValuePair(userInputFile,theSection,"cardcode", document.vars.cardcode.value);
+		if (document.setupPlugin.NeedReboot() == true)	{
+			SetNameValuePair(userInputFile,theSection,"cardnumber", document.vars.cardnumber.value);
+			SetNameValuePair(userInputFile,theSection,"path", document.vars.path.value);
+			SetNameValuePair(userInputFile,theSection,"pageHistory", document.vars.pageHistory.value);
+
+			SetNameValuePair(userInputFile,theSection,"accountPassword", document.vars.accountPassword.value);		// existing path
+			SetNameValuePair(userInputFile,theSection,"accountPasswordCheck", document.vars.accountPasswordCheck.value);
+			SetNameValuePair(userInputFile,theSection,"emailPassword", document.vars.emailPassword.value);
+			SetNameValuePair(userInputFile,theSection,"emailPasswordCheck", document.vars.emailPasswordCheck.value);
+			SetNameValuePair(userInputFile,theSection,"publishPassword", document.vars.publishPassword.value);
+			SetNameValuePair(userInputFile,theSection,"publishPasswordCheck", document.vars.publishPasswordCheck.value);
+			SetNameValuePair(userInputFile,theSection,"SMTP", document.vars.SMTP.value);
+			SetNameValuePair(userInputFile,theSection,"mailServer", document.vars.mailServer.value);
+			SetNameValuePair(userInputFile,theSection,"mailProtocol", document.vars.mailProtocol.value);
+			SetNameValuePair(userInputFile,theSection,"NNTP", document.vars.NNTP.value);
+			SetNameValuePair(userInputFile,theSection,"domainName", document.vars.domainName.value);
+			SetNameValuePair(userInputFile,theSection,"primaryDNS", document.vars.primaryDNS.value);
+			SetNameValuePair(userInputFile,theSection,"secondaryDNS", document.vars.secondaryDNS.value);
+			SetNameValuePair(userInputFile,theSection,"ipAddress", document.vars.ipAddress.value);
+			SetNameValuePair(userInputFile,theSection,"scriptEnabled", document.vars.scriptEnabled.value);
+			SetNameValuePair(userInputFile,theSection,"scriptFile", document.vars.scriptFile.value);
+			SetNameValuePair(userInputFile,theSection,"lckFilename", document.vars.lckFilename.value);
+		}
+		else
+		{
+			SetNameValuePair(userInputFile,theSection,"cardnumber", "");
+			SetNameValuePair(userInputFile,theSection,"path", "");
+			SetNameValuePair(userInputFile,theSection,"pageHistory", "");
+
+			SetNameValuePair(userInputFile,theSection,"accountPassword", "");										// existing path
+			SetNameValuePair(userInputFile,theSection,"accountPasswordCheck", "");
+			SetNameValuePair(userInputFile,theSection,"emailPassword", "");
+			SetNameValuePair(userInputFile,theSection,"emailPasswordCheck", "");
+			SetNameValuePair(userInputFile,theSection,"publishPassword", "");
+			SetNameValuePair(userInputFile,theSection,"publishPasswordCheck", "");
+		}
+		SetNameValuePair(userInputFile,theSection,"month", document.vars.month.value);
+		SetNameValuePair(userInputFile,theSection,"year", document.vars.year.value);
+
+		SetNameValuePair(userInputFile,theSection,"modem", document.vars.modem.value);
+		SetNameValuePair(userInputFile,theSection,"manufacturer", document.vars.manufacturer.value);
+		SetNameValuePair(userInputFile,theSection,"model", document.vars.model.value);
+
+		SetNameValuePair(userInputFile,theSection,"modemAreaCode", document.vars.modemAreaCode.value);
+		SetNameValuePair(userInputFile,theSection,"modemPhoneNumber", document.vars.modemPhoneNumber.value);
+		SetNameValuePair(userInputFile,theSection,"altAreaCode1", document.vars.altAreaCode1.value);
+		SetNameValuePair(userInputFile,theSection,"altAreaCode2", document.vars.altAreaCode2.value);
+		SetNameValuePair(userInputFile,theSection,"altAreaCode3", document.vars.altAreaCode3.value);
+
+		SetNameValuePair(userInputFile,theSection,"cwData", document.vars.cwData.value);
+		SetNameValuePair(userInputFile,theSection,"prefixData", document.vars.prefixData.value);
+		SetNameValuePair(userInputFile,theSection,"dialMethod", document.vars.dialMethod.value);
+
+		SetNameValuePair(userInputFile,theSection,"providername", document.vars.providername.value);
+		SetNameValuePair(userInputFile,theSection,"providerFilename", document.vars.providerFilename.value);		// existing path
+		SetNameValuePair(userInputFile,theSection,"accountAreaCode", document.vars.accountAreaCode.value);
+		SetNameValuePair(userInputFile,theSection,"accountPhoneNumber", document.vars.accountPhoneNumber.value);
+
+		SetNameValuePair(userInputFile,theSection,"accountName", document.vars.accountName.value);
+		SetNameValuePair(userInputFile,theSection,"emailName", document.vars.emailName.value);
+		SetNameValuePair(userInputFile,theSection,"publishURL", document.vars.publishURL.value);
+		SetNameValuePair(userInputFile,theSection,"viewURL", document.vars.viewURL.value);
+		SetNameValuePair(userInputFile,theSection,"externalEditor", document.vars.externalEditor.value);
+		}
+}
+
+/*
+function monitorDialupConnection( numSecondsElapsed, monitorFunction,
+	monitorEndpointSuccessFunction, monitorEndpointFailureFunction )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var		connectStatusFlag = document.setupPlugin.IsDialerConnected();
+	
+	// * give us 10 seconds to before we start to check the connection status
+	if ( ( numSecondsElapsed < 10 ) || ( connectStatusFlag == true ) )
+	{
+		numSecondsElapsed = numSecondsElapsed + 1;
+		
+		if ( eval ( monitorFunction ) == null )
+			setTimeout( "setRegisterMode(" + numSecondsElapsed + ")", 1000 );
+		else
+			eval( monitorEndpointSuccessFunction );
+	}
+	else
+	{
+		// hang up (even if already disconnected, this will delete
+		// the dialer's reference to the Registration Server)
+		document.setupPlugin.DialerHangup();
+		eval( monitorEndpointFailureFunction );
+	}
+}
+*/
+
+function set1StepMode( numSecondsElapsed )
+{
+	
+	debug( "set1StepMode: " + numSecondsElapsed );
+	
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var			connectStatusFlag = document.setupPlugin.IsDialerConnected();
+
+	if ( ( numSecondsElapsed < 10 ) || ( connectStatusFlag == true ) )
+	{
+		//debug( "still connected" );
+		numSecondsElapsed = numSecondsElapsed + 1;
+
+		if ( oneStepSemaphore == false )
+		{
+			setTimeout( "set1StepMode(" + numSecondsElapsed + ")", 1000 );
+		}
+		else
+		{
+			oneStepSemphore = false;
+		}
+	}
+	else
+	{
+		document.setupPlugin.DialerHangup();
+
+		// go to error screen
+		setContentPage( "error.htm" );
+		parent.screen.location.replace( "screen.htm" );
+	}
+}
+			
+		
+		
+function setRegisterMode( numSecondsElapsed )
+{
+	netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
+
+	var			connectStatusFlag = document.setupPlugin.IsDialerConnected();
+	document.vars.regMode.value = "yes";
+	var			regData = document.setupPlugin.GetRegInfo( false );
+
+	if ( ( numSecondsElapsed < 10 ) || ( connectStatusFlag == true ) )
+	{
+		numSecondsElapsed = numSecondsElapsed + 1;
+
+		if ( regData == null )
+			setTimeout( "setRegisterMode(" + numSecondsElapsed + ")", 1000 );	// check every second
+		else
+		{
+			// handle multi-line data differently
+
+			var bookmarkTag = "BOOKMARK_FILE=";
+			var bookmarkTagLen = bookmarkTag.length;
+
+			document.vars.regMode.value = "no";
+			document.vars.regData.value = "";
+			debug( "\nRegistration Complete: " + regData.length + " item(s)" );
+			
+			for ( var x=0; x < regData.length; x++ )
+			{
+				var data = "" + regData[x];
+				var dataLen = data.length;
+
+				if ( data.indexOf( bookmarkTag ) ==0 )
+				{
+					data = data.substring( bookmarkTagLen, dataLen );
+					document.vars.regBookmark.value = data;
+				}
+				else
+					document.vars.regData.value = document.vars.regData.value + regData[ x ] + "\r";
+
+				debug( "        " + x + ": " + regData[ x ] );
+			}
+			
+			document.setupPlugin.GetRegInfo( true );
+
+			// hang up (this will delete the dialer's
+			// reference to the Registration Server)
+			document.setupPlugin.DialerHangup();
+
+			// check status and go to appropriate screen
+
+			var status = findVariable( "STATUS" );
+			if ( status == "OK" )
+			{
+				configureNewAccount();
+
+				var rebootFlag = document.setupPlugin.NeedReboot();
+				if ( rebootFlag == true )
+					setContentPage( "okreboot.htm" );
+				else
+					setContentPage( "ok.htm" );
+
+			}
+			else if ( status == "EXIT" )
+			{
+				saveGlobalData();
+				document.setupPlugin.QuitNavigator();
+			}
+			else
+				setContentPage( "error.htm" );
+				
+			parent.frames[ 0 ].location.replace( "screen.htm" );
+
+			navigator.preference( "security.warn_submit_insecure", true );
+			navigator.preference( "security.warn_entering_secure", true );
+			navigator.preference( "security.warn_leaving_secure", true );
+		}
+	}
+
+	// * we've lost the connection
+	else
+	{
+		document.vars.regMode.value = "no";
+
+		// hang up (even if already disconnected, this will delete
+		// the dialer's reference to the Registration Server)
+		document.setupPlugin.DialerHangup();
+
+		// go to error screen
+		document.setupPlugin.GetRegInfo( true );
+		setContentPage( "error.htm" );
+		parent.screen.location.replace( "screen.htm" );
+
+		navigator.preference( "security.warn_submit_insecure", true );
+		navigator.preference( "security.warn_entering_secure", true );
+		navigator.preference( "security.warn_leaving_secure", true );
+	}
+}
+
+
+
+function verifyIPaddress( address )
+{
+	var dotCount = 0, dotIndex = 0, net, validFlag = false;
+
+	while ( dotIndex >= 0 )
+	{
+		net = "";
+		dotIndex = address.indexOf( "." );
+		if ( dotIndex >=0 )
+		{
+			net = address.substring( 0, dotIndex );
+			address = address.substring( dotIndex + 1 );
+			++dotCount;
+		}
+		else
+		{
+			net = address;
+			if ( net=="" )
+				break;
+		}
+
+		netValue = parseInt( net );
+		if ( isNaN( netValue ) )
+			break;
+		if ( netValue < 0 || netValue > 255 )
+			break;
+
+		if ( dotCount == 3 && dotIndex < 0 )
+			validFlag = true;
+	}	
+	return validFlag;
+}
+
+function verifyAreaCode( areaCode )
+{
+	var	validFlag = false;
+
+	if ( areaCode.length >= 3 )
+	{
+		validFlag = true;
+		for ( var x = 0; x < areaCode.length; x++ )
+		{
+			if ( "0123456789".indexOf( areaCode.charAt( x ) ) < 0 )
+			{
+				validFlag = false;
+				break;
+			}
+		}
+	}
+	return validFlag;
+}
+
+function verifyZipCode( zipCode )
+{
+	var	validFlag = false;
+
+	if ( zipCode.length >= 5 )
+	{
+		validFlag = true;
+		for ( var x = 0; x < zipCode.length; x++ )
+		{
+			if ( "0123456789-".indexOf( zipCode.charAt( x ) ) < 0 )
+			{
+				validFlag = false;
+				break;
+			}
+		}
+	}
+	return validFlag;
+}
+
+function verifyPhoneNumber( phoneNum )
+{
+	var	validFlag = false;
+
+	if ( phoneNum.length >= 7 )
+	{
+		validFlag = true;
+		for ( var x=0; x < phoneNum.length; x++ )
+		{
+			if ( "0123456789().,-+ ".indexOf( phoneNum.charAt( x ) ) < 0 )
+			{
+				validFlag = false;
+				break;
+			}
+		}
+	}
+	return validFlag;
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/globals2.js
+++ b/mozilla/cmd/dialup/as_html/globals2.js
@@ -0,0 +1,816 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+<!--  to hide script contents from old browsers
+
+
+
+compromisePrincipals();
+
+
+
+function configureNewAccount()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	var theFile = getAcctSetupFilename(self);
+	var intlFlag = GetNameValuePair(theFile,"Mode Selection","IntlMode");
+	intlFlag = intlFlag.toLowerCase();
+
+
+	var theScript = findVariable("LOGIN_SCRIPT");
+
+
+	// determine outside line access string
+	
+	var outsideLineAccessStr = "";
+	if (document.vars.prefixData.value != "")	{
+		outsideLineAccessStr = document.vars.prefixData.value;
+		x = outsideLineAccessStr.indexOf(",");
+		if (x<0)	outsideLineAccessStr = outsideLineAccessStr + ",";
+		}
+
+	var dialAsLongDistance = findVariable("DIAL_AS_LONG_DISTANCE");
+	if (dialAsLongDistance != null && dialAsLongDistance!="")	{
+		var dialAsLongDistanceFlag = (dialAsLongDistance=="NO") ? "FALSE":"TRUE";
+		var dialAreaCode = findVariable("DIAL_AREA_CODE");
+		var dialAreaCodeFlag = "FALSE";
+		if (dialAreaCode != null && dialAreaCode != "")	{
+			dialAreaCodeFlag = (dialAreaCode == "NO") ? "FALSE":"TRUE";
+			}
+		}
+	else if (intlFlag == "yes")	{
+		var dialAsLongDistanceFlag = "FALSE";
+		var dialAreaCodeFlag = "FALSE";
+		}
+	else	{
+		var dialAsLongDistanceFlag = "TRUE";
+		var dialAreaCodeFlag = "TRUE";
+
+		var ispAreaCode="";
+		var ispPhoneNum = findVariable("PHONE_NUM");
+		if (ispPhoneNum != null && ispPhoneNum!="")	{
+			var x=ispPhoneNum.indexOf("(");
+			if (x>=0)	{
+				var y=ispPhoneNum.indexOf(")",x+1);
+				ispAreaCode=ispPhoneNum.substring(x+1,y);
+				}
+			}
+		if (ispAreaCode == document.vars.modemAreaCode.value)	{
+			dialAsLongDistanceFlag="FALSE";
+			dialAreaCodeFlag = "FALSE";
+			}
+		}
+
+
+	// determine new profile name (used for Account in dialer & profile name)
+
+	var	newProfileName = findVariable("LOGIN");
+	if (newProfileName=="")	{
+		newProfileName = document.vars.first.value;
+		if (document.vars.last.value != "")	{
+			newProfileName = newProfileName + " " + document.vars.last.value;
+			}
+		}
+	if (newProfileName!="")	newProfileName = newProfileName + "'s";
+	if (findVariable("SITE_NAME") != "")	{
+		newProfileName = newProfileName + " " + findVariable("SITE_NAME");
+		}
+	newProfileName = newProfileName + " Account";
+	if (newProfileName.length > 240)	newProfileName=newProfileName.substring(0,240);
+
+
+	// platform check
+
+	var thePlatform = new String(navigator.userAgent);
+	var x=thePlatform.indexOf("(")+1;
+	var y=thePlatform.indexOf(";",x+1);
+	thePlatform=thePlatform.substring(x,y);
+
+	if (thePlatform == "Win16")	{
+		if (newProfileName.length > 40)	newProfileName=newProfileName.substring(0,40);
+		}
+
+	
+	// On Win32 platforms, check if newProfileName contains any invalid characters, such as '/'
+	// On Mac, disallow invalid characters such as ':'
+	
+	if ((thePlatform == "WinNT") || (thePlatform == "Win95")) {
+		var x=0;
+		x = newProfileName.indexOf('/');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('/');
+			}
+		x = newProfileName.indexOf('\\');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\\');
+			}
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		x = newProfileName.indexOf('\"');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\"');
+			}
+		x = newProfileName.indexOf('?');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('?');
+			}
+		x = newProfileName.indexOf('<');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('<');
+			}
+		x = newProfileName.indexOf('>');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('>');
+			}
+		x = newProfileName.indexOf('|');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('|');
+			}
+		x = newProfileName.indexOf('&');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf('&');
+			}
+		}
+	else if (thePlatform == "Macintosh")	{
+		var x=0;
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		}
+	else if (thePlatform == "Win16") {
+		var x=0;
+		x = newProfileName.indexOf('(');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf('(');
+			}
+		x = newProfileName.indexOf(')');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf(')');
+			}
+		}
+
+
+	// configure dialer for new account 
+
+	dialerData = document.setupPlugin.newStringArray(24);		// increment this # as new dialer strings are added
+	dialerData[0]  = "FileName=" + findVariable("SITE_FILE");
+	dialerData[1]  = "AccountName=" + newProfileName;
+	dialerData[2]  = "ISPPhoneNum=" + findVariable("PHONE_NUM");
+	dialerData[3]  = "LoginName=" + findVariable("LOGIN");
+	dialerData[4]  = "Password=" + findVariable("PASSWORD");
+	dialerData[5]  = "DNSAddress=" + findVariable("DNS_ADDR");
+	dialerData[6]  = "DNSAddress2=" + findVariable("DNS_ADDR_2");
+	dialerData[7]  = "DomainName=" + findVariable("DOMAIN_NAME");
+	dialerData[8]  = "IntlMode=" + ((intlFlag=="yes") ? "TRUE":"FALSE");
+	dialerData[9]  = "DialOnDemand=TRUE";
+	dialerData[10] = "ModemName=" + document.vars.modem.value;
+	dialerData[11] = "ModemType=" + document.setupPlugin.GetModemType(document.vars.modem.value);
+	dialerData[12] = "DialType=" + document.vars.dialMethod.value;
+	dialerData[13] = "OutsideLineAccess=" + outsideLineAccessStr;
+	dialerData[14] = "DisableCallWaiting=" + ((parent.parent.globals.document.vars.cwData.value != "") ? "TRUE":"FALSE");
+	dialerData[15] = "DisableCallWaitingCode=" + parent.parent.globals.document.vars.cwData.value;
+	dialerData[16] = "DialAsLongDistance=" + dialAsLongDistanceFlag;
+	dialerData[17] = "DialAreaCode=" + dialAreaCodeFlag;
+	dialerData[18] = "ScriptEnabled=" + ((theScript==null || theScript=="") ? "FALSE":"TRUE");
+	dialerData[19] = "Script=" + theScript;
+	dialerData[20] = "AutoSend=" + findVariable("AUTO_SEND");
+	dialerData[21] = "Location=Home";
+	dialerData[22] = "DisconnectTime=" + GetNameValuePair(theFile,"Mode Selection","Dialer_Disconnect_After");
+	dialerData[23] = "Path=New";
+
+
+	// write out dialer data to Java Console
+
+	debug("\nNew Account for ISP: " + findVariable("SITE_NAME"));
+	var numElements = dialerData.length;
+	for (var x=0; x<numElements; x++)	{
+		debug("        " + x + ": " + dialerData[x]);
+		}
+
+	parent.parent.globals.document.setupPlugin.DialerConfig(dialerData,false);
+
+
+	// configure desktop (Windows)
+
+	parent.parent.globals.document.setupPlugin.DesktopConfig(newProfileName, null, theFile);
+
+
+	// set up Navigator preferences
+
+	var userName = document.vars.first.value;
+	if (document.vars.last.value != "")	{
+		userName = userName + " " + document.vars.last.value;
+		}
+
+	navigator.preference("network.hosts.smtp_server",		findVariable("SMTP_HOST"));
+	navigator.preference("network.hosts.nntp_server",		findVariable("NNTP_HOST"));
+
+	var mailID=""
+	var mailAccount = findVariable("IMAP_HOST");
+	if (mailAccount == "")	{
+		mailAccount = findVariable("POP_SERVER");
+		}
+	var mailServer="";
+
+	x = mailAccount.indexOf("@");
+	if (x>=0)	{
+		mailID=mailAccount.substring(0,x);
+		mailServer=mailAccount.substring(x+1,mailAccount.length);
+		}
+	else	{
+		mailID=mailAccount;
+		mailServer=findVariable("DOMAIN_NAME");
+		if (mailServer != "")	{
+			mailAccount = mailID + "@" + mailServer;
+			}
+		}
+
+	navigator.preference("network.hosts.pop_server",	mailServer);
+	if (findVariable("IMAP_HOST") != "")	{
+		navigator.preference("mail.server_type",			1);
+		navigator.preference("mail.imap.server_sub_directory",findVariable("IMAP_SERVERPATH"));
+		}
+	else	{
+		navigator.preference("mail.server_type",			0);
+		}
+
+	navigator.preference("mail.pop_name",					mailID);
+	navigator.preference("mail.identity.organization",		document.vars.company.value);
+	navigator.preference("mail.identity.reply_to",			findVariable("EMAIL_ADDR"));
+	navigator.preference("mail.identity.username",			userName);
+	navigator.preference("mail.identity.useremail",			mailAccount);
+
+	navigator.preference("mail.remember_password",	false);
+	navigator.preference("mail.pop_password",		"");
+	var theMailPassword=findVariable("POP_PASSWORD");
+	if (theMailPassword != null && theMailPassword != "")	{
+		theMailPassword = parent.parent.globals.document.setupPlugin.EncryptString(theMailPassword);
+		if (theMailPassword != null && theMailPassword != "")	{
+			navigator.preference("mail.remember_password",	true);
+			navigator.preference("mail.pop_password",		theMailPassword);
+			}
+		}
+
+	navigator.preference("editor.author",					userName);
+	navigator.preference("editor.publish_username",			mailID);
+	var pushURL = findVariable("PUBLISH_PUSH_URL");
+	navigator.preference("editor.publish_location",			pushURL);
+	navigator.preference("editor.publish_browse_location",	findVariable("PUBLISH_VIEW_URL"));
+
+	navigator.preference("editor.publish_password",			"");
+	navigator.preference("editor.publish_save_password",	false);
+	if (pushURL != null && pushURL != "")	{
+		var thePublishPassword=findVariable("PASSWORD");
+		if (thePublishPassword != "")	{
+			thePublishPassword = parent.parent.globals.document.setupPlugin.EncryptString(thePublishPassword);
+			if (thePublishPassword != null && thePublishPassword != "")	{
+				navigator.preference("editor.publish_save_password",	true);
+				navigator.preference("editor.publish_password",			thePublishPassword);
+				}
+			}
+		}
+
+	if (findVariable("HOME_URL") != "")	{
+		navigator.preference("browser.startup.page",		1);							// 0 blank, 1 homepage, 2 last visited
+		navigator.preference("browser.startup.homepage",	findVariable("HOME_URL"));
+		}
+
+
+	// look for LDAP data
+
+	var ldapNum = navigator.preference("ldap_1.number_of_directories");
+	if (ldapNum == null || ldapNum == "")	{
+		// if # of directories isn't defined, count any existing LDAP entries
+		ldapNum=1;
+		while(true)	{
+			var ldapEntry = navigator.preference("ldap_1.directory" + ldapNum + ".filename");
+			if (ldapEntry == null || ldapEntry == "")	break;
+			ldapNum = ldapNum + 1;
+			}
+		}
+	ldapNum = 1 + ldapNum;
+
+	var ldapEntriesAddedFlag=false;
+	var ldapIndex=1;
+	while(true)	{
+		var ldapURL = findVariable("LDAP_HOST_" + ldapIndex);
+		if (ldapURL == null || ldapURL == "")	break;
+		
+		var secureLDAP = false;
+		var	searchBase = "";
+		var portNum = 389;
+
+		if (ldapURL.indexOf("ldaps://")==0)	{					// LDAP over SSL
+			secureLDAP = true;
+			portNum = 636;
+			ldapURL = ldapURL.substring(8,ldapURL.length);
+			}
+		else if (ldapURL.indexOf("ldap://")==0)	{
+			ldapURL = ldapURL.substring(7,ldapURL.length);
+			}
+		var x = ldapURL.indexOf("/");							// find any search base
+		if (x>0)	{
+			searchBase = ldapURL.substring(x+1,ldapURL.length);
+			ldapURL = ldapURL.substring(0,x);
+			}
+		x = ldapURL.indexOf(":");								// find any port number
+		if (x>0)	{
+			portNumString = ldapURL.substring(x+1,ldapURL.length);
+			ldapURL = ldapURL.substring(0,x);
+			if (portNumString != "")	{
+				portNum = parseInt(portNumString);
+				}
+			}
+
+		var ldapDesc = findVariable("LDAP_DESC_" + ldapIndex);
+		if (ldapDesc == "")	{
+			ldapDesc = ldapURL;
+			}
+
+		ldapEntriesAddedFlag = true;
+		navigator.preference("ldap_1.directory" + ldapNum + ".filename", "");
+		navigator.preference("ldap_1.directory" + ldapNum + ".description", ldapDesc);
+		navigator.preference("ldap_1.directory" + ldapNum + ".serverName", ldapURL);
+		navigator.preference("ldap_1.directory" + ldapNum + ".port", portNum);
+		navigator.preference("ldap_1.directory" + ldapNum + ".isSecure", secureLDAP);
+		navigator.preference("ldap_1.directory" + ldapNum + ".searchBase", searchBase);
+		navigator.preference("ldap_1.directory" + ldapNum + ".searchString", "");
+		navigator.preference("ldap_1.directory" + ldapNum + ".dirType", 0);
+		navigator.preference("ldap_1.directory" + ldapNum + ".isOffline", false);
+		navigator.preference("ldap_1.directory" + ldapNum + ".savePassword", false);
+
+		if (document.vars.debugMode.value.toLowerCase() == "yes")	{
+			debug("\tLDAP #" + ldapNum + " Desc: " + ldapDesc);
+			debug("\tLDAP #" + ldapNum + " serverName: " + ldapURL);
+			debug("\tLDAP #" + ldapNum + " port: " + portNum);
+			debug("\tLDAP #" + ldapNum + " isSecure: " + secureLDAP);
+			debug("\tLDAP #" + ldapNum + " searchBase: " + searchBase);
+			}
+		
+		ldapNum = ldapNum + 1;
+		ldapIndex = ldapIndex + 1;
+		}
+
+	if (ldapEntriesAddedFlag == true)	{
+		navigator.preference("ldap_1.number_of_directories", ldapNum);
+		}
+
+
+	// on Mac, prevent Internet Config from overriding new settings
+
+	navigator.preference("browser.mac.use_internet_config", false);
+
+
+	var profileDir = document.setupPlugin.GetCurrentProfileDirectory();
+	if (profileDir != null && profileDir != "")	{
+
+		// write MUC Configuration file
+
+		var thePlatform = new String(navigator.userAgent);
+		var x=thePlatform.indexOf("(")+1;
+		var y=thePlatform.indexOf(";",x+1);
+		thePlatform=thePlatform.substring(x,y);
+	
+		var configFile="";
+		if (thePlatform == "Macintosh")	{				// Macintosh support
+			configFile = profileDir + "Configuration";
+			}
+		else	{										// Windows support
+			configFile = profileDir + "CONFIG.INI";
+			}
+		
+		document.setupPlugin.SetNameValuePair(configFile,"Account", "Account", newProfileName);			// findVariable("SITE_NAME")
+		document.setupPlugin.SetNameValuePair(configFile,"Modem", "Modem", document.vars.modem.value);
+		document.setupPlugin.SetNameValuePair(configFile,"Location", "Location", "Home");
+
+
+		// write out Reggie bookmark file (if one was sent)
+		
+		var currentBookmarkFilename="";
+		var CRLF="";
+		if (thePlatform == "Macintosh")	{				// Macintosh support
+			currentBookmarkFilename = profileDir + "Bookmarks.html";
+			CRLF = "\r";
+			}
+		else	{										// Windows support
+			currentBookmarkFilename = profileDir + "BOOKMARK.HTM";
+			CRLF = "\r\n";
+			}
+
+
+		// Mac only: on clean install, core Communicator doesn't copy over Bookmarks.html file from Defaults folder
+		// so grab a copy from our Config folder
+
+		if (thePlatform == "Macintosh")	{
+			var theActiveProfileName = document.setupPlugin.GetCurrentProfileName();
+			if (theActiveProfileName != null)	{
+				theActiveProfileName = theActiveProfileName.toUpperCase();
+				if (theActiveProfileName == '911' || theActiveProfileName == 'USER1')	{
+					var theDefaultBookmarkFilename = parent.parent.globals.getConfigFolder(self) + "Bookmarks.html";
+					var theBookmarkData = parent.parent.globals.document.setupPlugin.GetNameValuePair(theDefaultBookmarkFilename,null,null);
+					if (theBookmarkData == null || theBookmarkData == "")	{
+						theDefaultBookmarkFilename = parent.parent.globals.getConfigFolder(self) + "bookmark.htm";
+						theBookmarkData = parent.parent.globals.document.setupPlugin.GetNameValuePair(theDefaultBookmarkFilename,null,null);
+						}
+					if (theBookmarkData != null && theBookmarkData != "")	{
+						parent.parent.globals.document.setupPlugin.SaveTextToFile(currentBookmarkFilename,theBookmarkData,false);
+						}
+					}
+				}
+			}
+
+
+		var bookmarkData = "" + document.setupPlugin.GetNameValuePair(currentBookmarkFilename,null,null);
+		if (bookmarkData != "")	{
+			if (bookmarkData.indexOf("<!DOCTYPE NETSCAPE-Bookmark-file-1>") ==0)	{					// check for valid bookmark file header
+
+				// build new bookmark title
+
+				var titleStr = "Bookmarks";
+				var name = "";
+				if (parent.parent.globals.document.vars.first.value != "" && parent.parent.globals.document.vars.last.value != "")	{
+					name = parent.parent.globals.document.vars.first.value + " " + parent.parent.globals.document.vars.last.value;
+					}
+				else	{
+					name = findVariable("LOGIN");
+					}
+				if (name != "")	titleStr = titleStr + " for " + name;
+
+				// change TITLE section
+
+				var startTitleindex=bookmarkData.indexOf("<TITLE>");
+				var endTitleindex=bookmarkData.indexOf("</TITLE>");
+				if (startTitleindex>0 && endTitleindex>0)	{
+					startTitleindex = startTitleindex + "<TITLE>".length;
+					var bookmarkDataLen = bookmarkData.length;
+					bookmarkData = bookmarkData.substring(0,startTitleindex) + titleStr + bookmarkData.substring(endTitleindex,bookmarkDataLen);
+					}
+
+				// change H1 section
+
+				var startTitleindex=bookmarkData.indexOf("<H1>");
+				var endTitleindex=bookmarkData.indexOf("</H1>");
+				if (startTitleindex>0 && endTitleindex>0)	{
+					startTitleindex = startTitleindex + "<H1>".length;
+					var bookmarkDataLen = bookmarkData.length;
+					bookmarkData = bookmarkData.substring(0,startTitleindex) + titleStr + bookmarkData.substring(endTitleindex,bookmarkDataLen);
+					}
+				}
+			}
+
+		var regBookmarkData = document.vars.regBookmark.value;
+		if (regBookmarkData != null && regBookmarkData != "")	{
+			if (regBookmarkData.indexOf("<!DOCTYPE NETSCAPE-Bookmark-file-1>") == 0 )	{				// check for valid bookmark file header
+				var cleanFlag = false;
+				var activeProfileName = document.setupPlugin.GetCurrentProfileName();
+				if (activeProfileName != null)	{
+					activeProfileName = activeProfileName.toUpperCase();
+					if (activeProfileName == '911' || activeProfileName == 'USER1')	{
+						cleanFlag=true;
+						}
+					}
+
+				if (cleanFlag == true)	{																// if magic profile, write out entire new bookmark file
+					bookmarkData = regBookmarkData;
+					}
+				else	{																				// else append onto end of bookmark file
+					var headerStr = "<DL><p>" + CRLF;
+					var startDLindex=regBookmarkData.indexOf(headerStr);
+					if (startDLindex>0)	{
+						startDLindex = startDLindex + headerStr.length;
+						}
+					var lastDLindex = regBookmarkData.lastIndexOf("</DL>");
+					if (startDLindex>0 && startDLindex>0)	{											// remove bookmark header/footer data
+						var newBookmarkData = regBookmarkData.substring(startDLindex,lastDLindex);
+						if (newBookmarkData != "")	{
+							if (bookmarkData.indexOf(newBookmarkData) <0)	{
+								var startDLindex=bookmarkData.indexOf(headerStr);
+								if (startDLindex>0)	{
+									startDLindex = startDLindex + headerStr.length;
+									}
+								var lastDLindex = bookmarkData.lastIndexOf("</DL>");
+								if (startDLindex>0 && startDLindex>0)	{								// merge into current bookmark file
+									var bookmarkDataLen = bookmarkData.length;
+									// append new bookmark data to bookmark file
+									bookmarkData = bookmarkData.substring(0,lastDLindex) + newBookmarkData + bookmarkData.substring(lastDLindex,bookmarkDataLen);
+									}
+								}
+							}
+						}
+					}
+				}
+			else	{																					// if invalid bookmark header, discard
+				regBookmarkData = "";
+				}
+			}
+
+		if (thePlatform == "Win16")	{
+			if (bookmarkData.length >= 16000)	{
+				bookmarkData = "";
+				}
+			}
+
+		if (bookmarkData != "")	{
+			document.setupPlugin.SaveTextToFile(currentBookmarkFilename,bookmarkData,false);
+			}
+
+
+		// append ISP bookmark (if Reggie sends it down) to profile's bookmark file
+
+		var ISPurl = findVariable("ISP_URL");
+		if (ISPurl != null && ISPurl != "")	{
+			bookmarkData = "" + document.setupPlugin.GetNameValuePair(currentBookmarkFilename, null, null);
+			if (bookmarkData != null && bookmarkData != "")	{
+				var lastDLindex = bookmarkData.lastIndexOf("</DL>");
+				if (lastDLindex >= 0)	{
+					var newData = bookmarkData.substring(0,lastDLindex);
+					newData = newData + "\t<DT><A HREF=\"" + ISPurl + "\">" + findVariable("SITE_NAME") + "</A>" + CRLF;
+					newData = newData + bookmarkData.substring(lastDLindex,bookmarkData.length);
+
+					if (thePlatform == "Win16")	{
+						if (newData.length >= 16000)	{
+							newData = "";
+							}
+						}
+					if (newData != "")	{
+						document.setupPlugin.SaveTextToFile(currentBookmarkFilename,newData,false);
+						}
+					}
+				}
+			}
+
+		}
+
+
+	// rename profile
+	
+	if (thePlatform == "Macintosh") {
+		if (newProfileName.length > 31)	newProfileName=newProfileName.substring(0,31);
+		}
+
+	document.setupPlugin.SetCurrentProfileName(newProfileName);
+	debug("\nSetting profile name: " + newProfileName);
+
+	
+	// set the default path to now be the existing path
+	
+	document.vars.path.value = "Existing Path";
+}
+
+
+
+function saveAccountInfo(promptFlag)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
+
+	var thePlatform = new String(navigator.userAgent);
+	var x=thePlatform.indexOf("(")+1;
+	var y=thePlatform.indexOf(";",x+1);
+	thePlatform=thePlatform.substring(x,y);
+
+	var CRLF;
+	if (thePlatform == "Macintosh")	{
+		CRLF = "\r";
+		}
+	else	{
+		CRLF = "\r\n";
+		}
+
+	// Determine the current date
+
+	var theFile = parent.parent.globals.getAcctSetupFilename(self);
+	var savePasswordFlag = parent.parent.globals.GetNameValuePair(theFile,"New Acct Mode","SavePasswords");
+
+	var now = new Date();
+	theDate = now.getMonth()+1 + "/" + now.getDate() + "/" + (now.getYear()+1900);
+	theDate += "  ";
+	var theHour = now.getHours();
+	var theString = " AM";
+	if (theHour >=12)	{
+		theHour = theHour-12;
+		theString = " PM";
+		}
+	var theMinute = now.getMinutes();
+	if (theMinute < 10)	{
+		theMinute="0" + theMinute;
+		}
+	theDate += theHour + ":" + theMinute + theString;
+
+	// Mangle the POP/IMAP server
+
+	var mailProtocol = "IMAP";
+	var popIMAPServer = findVariable("IMAP_HOST");
+	if (popIMAPServer == "")	{
+		mailProtocol = "POP";
+		popIMAPServer = findVariable("POP_SERVER");
+		}
+	var atLocation = popIMAPServer.indexOf("@");
+	if (atLocation>=0)	{
+		popIMAPServer = popIMAPServer.substring(atLocation+1);
+		}
+
+	// Create the output string to save
+
+	var output = "Your Account Information                  " + theDate + CRLF;
+	   output += "______________________________________________________________" + CRLF + CRLF;
+	   output += "Name:                                     " + parent.parent.globals.document.vars.first.value + " " + parent.parent.globals.document.vars.last.value + CRLF;
+	   output += "Provider:                                 " + findVariable("SITE_NAME") + CRLF + CRLF;
+
+	   output += "Dialup access number:                     " + findVariable("PHONE_NUM") + CRLF + CRLF;
+
+	   output += "Login name:                               " + findVariable("LOGIN") + CRLF;
+
+	if (savePasswordFlag == "yes")	{
+	   output += "Login password:                           " + findVariable("PASSWORD") + CRLF + CRLF;
+		}
+
+	   output += "Email address:                            " + findVariable("EMAIL_ADDR") + CRLF;
+
+	if (savePasswordFlag == "yes")	{
+	   output += "Email password:                           " + findVariable("POP_PASSWORD") + CRLF + CRLF;
+		}
+
+	   output += "SMTP server:                              " + findVariable("SMTP_HOST") + CRLF;
+	   
+	if (mailProtocol == "IMAP")	{
+	   output += "IMAP server:                              " + popIMAPServer + CRLF;
+	   
+	   var imapDir = findVariable("IMAP_SERVERPATH");
+	   if (imapDir != "")	{
+	   output += "IMAP server mailbox path:                 " + imapDir + CRLF;
+			}
+		}
+	else	{
+	   output += "POP server:                               " + popIMAPServer + CRLF;
+		}
+	   output += "News (NNTP) server:                       " + findVariable("NNTP_HOST") + CRLF + CRLF;
+
+	   output += "Domain name:                              " + findVariable("DOMAIN_NAME") + CRLF;
+	   output += "Primary DNS server:                       " + findVariable("DNS_ADDR") + CRLF;
+	   output += "Secondary DNS server:                     " + findVariable("DNS_ADDR_2") + CRLF + CRLF;
+
+	   var viewURL = findVariable("PUBLISH_VIEW_URL");
+	   if (viewURL != "")	{
+	   output += "Publishing View URL:                      " + viewURL + CRLF;
+			}
+	   var pushURL = findVariable("PUBLISH_PUSH_URL");
+	   if (pushURL != "")	{
+	   output += "Publishing Push URL:                      " + pushURL + CRLF;
+			}
+
+	   output += CRLF;
+
+	   output += "Modem:                                    " + parent.parent.globals.document.vars.modem.value + CRLF + CRLF;
+
+	   output += "Other information:" + CRLF + CRLF;
+	   output += "Provider's technical support number:      " + findVariable("ISP_SUPPORT") + CRLF;
+
+
+	// determine new profile name (used for Account in dialer & profile name, save info default filename)
+
+	var	newProfileName = findVariable("LOGIN");
+	if (newProfileName=="")	{
+		newProfileName = document.vars.first.value;
+		if (document.vars.last.value != "")	{
+			newProfileName = newProfileName + " " + document.vars.last.value;
+			}
+		}
+	if (newProfileName!="")	newProfileName = newProfileName + "'s";
+	if (findVariable("SITE_NAME") != "")	{
+		newProfileName = newProfileName + " " + findVariable("SITE_NAME");
+		}
+	newProfileName = newProfileName + " Account Info";
+
+	if (thePlatform == "Macintosh") {
+		if (newProfileName.length > 31)	newProfileName=newProfileName.substring(0,31);
+		}
+
+	
+	// On WIN32 platforms, check if newProfileName contains any invalid characters, such as '/'
+	// On Mac, disallow invalid characters such as ':'
+
+	if ((thePlatform == "WinNT") || (thePlatform == "Win95")) {
+		var x=0;
+		x = newProfileName.indexOf('/');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('/');
+			}
+		x = newProfileName.indexOf('\\');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\\');
+			}
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		x = newProfileName.indexOf('\"');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('\"');
+			}
+		x = newProfileName.indexOf('?');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('?');
+			}
+		x = newProfileName.indexOf('<');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('<');
+			}
+		x = newProfileName.indexOf('>');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('>');
+			}
+		x = newProfileName.indexOf('|');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf('|');
+			}
+		}
+	else if (thePlatform == "Macintosh")	{
+		var x=0;
+		x = newProfileName.indexOf(':');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(x+1, newProfileName.length);			
+			x = newProfileName.indexOf(':');
+			}
+		}
+	else if (thePlatform == "Win16") {
+		var x=0;
+		x = newProfileName.indexOf('(');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x-1) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf('(');
+			}
+		x = newProfileName.indexOf(')');
+		while ((x >= 0) && (newProfileName.length != 0)) {
+			newProfileName = newProfileName.substring(0, x-1) + newProfileName.substring(x+1, newProfileName.length);
+			x = newProfileName.indexOf(')');
+			}
+		}
+
+
+	// create the default filename to save output to
+/*
+	var defaultFilename = findVariable("SITE_FILE");
+	if (defaultFilename != "")	defaultFilename=defaultFilename + " ";
+	defaultFilename = defaultFilename + "Account Info";
+*/
+
+	var savedFlag=false;
+	if (promptFlag==false)	{
+		var profileDir = document.setupPlugin.GetCurrentProfileDirectory();
+		if (profileDir != null && profileDir != "")	{
+			if (thePlatform == "Macintosh")	{
+				newProfileName = profileDir + "Account Info";
+				}
+			else	{
+				newProfileName = profileDir + "ACCTINFO.TXT";
+				}
+			savedFlag = parent.parent.globals.document.setupPlugin.SaveTextToFile(newProfileName,output,false);		// defaultFilename
+			}
+		}
+	else	{
+		savedFlag = parent.parent.globals.document.setupPlugin.SaveTextToFile(newProfileName,output,true);		// defaultFilename
+		}
+	return(savedFlag);
+}
+
+
+
+// end hiding contents from old browsers  -->
--- a/mozilla/cmd/dialup/as_html/help/accounts.htm
+++ b/mozilla/cmd/dialup/as_html/help/accounts.htm
@@ -0,0 +1,89 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Welcome to Account Setup</B></P>
+
+<P>Account Setup is a utility that helps you quickly set up Communicator to access
+the Internet. To use Account Setup properly, you must choose whether you want Account
+Setup to:</P>
+
+<UL>
+<LI>Help you create a new Internet account with your Internet service provider, or
+
+<spacer type=vertical size=4>
+	
+<LI>Help you quickly set up Netscape Communicator and its connection software to
+	access an account that you already have.
+</UL>
+
+<P>Select the option &quot;I want to create a new Internet account&quot; if:</P>
+
+<UL>
+
+<LI>You are new to the Internet, or
+
+<spacer type=vertical size=4>
+	
+<LI>You want create a second or additional Internet account.
+</UL>
+
+<P>Select the option &quot;I already have an Internet account&quot; if:</P>
+
+<UL>
+
+<LI>You want to set up access to an Internet account that you already have. Your account must be provided by an Internet service provider and must offer access to Internet services such as the World Wide Web, email, and newsgroups.
+</UL>
+
+<P>To select one of the options described above, click the button to the left of the option in the Account Setup screen.
+Then follow through the rest of the Account Setup screens, entering the appropriate information in each screen. </P>
+
+<P>You can leave Account Setup at any time by clicking Exit in the Account Setup navigation bar.</P>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/acctInfo.htm
+++ b/mozilla/cmd/dialup/as_html/help/acctInfo.htm
@@ -0,0 +1,57 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Your Name and Company</B></P>
+
+<P>Type your full name and, optionally, your organization name into the text boxes on
+this screen. Account Setup then sets Communicator's Mail & Groups and Editor preferences
+accordingly.</P>
+
+<P><FONT SIZE=2><A HREF="ashelp.htm">[CONTENTS]</A></FONT></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/ashelp.htm
+++ b/mozilla/cmd/dialup/as_html/help/ashelp.htm
--- a/mozilla/cmd/dialup/as_html/help/billing.htm
+++ b/mozilla/cmd/dialup/as_html/help/billing.htm
@@ -0,0 +1,77 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Your Billing Information</B></P>
+
+<P>Internet accounts that you create using Account Setup must be paid for by credit card. Account Setup assists you by forwarding the credit card information you provide on the screen to your provider. This mechanism enables you to create an Internet account and use it right away.
+
+<P>To ensure the privacy of your credit card information, Account Setup scrambles your credit card number before transmitting it to your provider. Your provider has a unique security key that allows it to read your credit card number. In addition, Account Setup does not store your credit card information anywhere on your computer.</P>
+
+<P>Use the text boxes and pop-up menus to specify your credit card type, its number,
+and its expiration date:</P>
+
+<UL>
+	<LI>Name on card: Your name as it appears on your credit card.
+
+<spacer type=vertical size=4>
+	
+	<LI>Type of card: The type of card you're using. You can use American Express, Discover,
+	MasterCard, or VISA.
+
+<spacer type=vertical size=4>
+	
+	<LI>Card number: The card number as it appears on the card.
+
+<spacer type=vertical size=4>
+	
+	<LI>Expiration date: The expiration date that appears on the card.
+</UL>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/connect1.htm
+++ b/mozilla/cmd/dialup/as_html/help/connect1.htm
@@ -0,0 +1,74 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Connect to Server</B></P>
+
+<P>You've finished entering the information that Account Setup needs to connect you to the Internet account server. Click Connect Now to connect to the Internet account server, where you can learn about the account plans available and
+create a new Internet account.</P>
+
+<P>When you click Connect Now, Account Setup uses your modem, phone line, and the connection software installed with Communicator to initiate a connection with the Internet account server. For this reason, your modem must be properly installed and turned on, and your phone line must be available to Account Setup.</P>
+
+<P>After Account Setup successfully connects, it loads the Internet account server screens in the Account Setup window. Follow the instructions on the Internet account server screens to learn about account plans available and create an account. Help is also available from the Internet account server screens.</P>
+
+<P>When evaluating account plans, it helps to have some idea of how you will be using the Internet:
+<UL>
+	<LI>Will you always connect from home or will you also connect while traveling? Some plans offer a toll-free access number for travelers. Others offer a selection of many local access points so that you can always connect, wherever you are. However, these services might cost extra.
+
+<spacer type=vertical size=4>
+	
+	<LI>How many hours will you spend on the Internet each month? Some plans are designed for people who connect less often, letting you pay by the hour for Internet access. Other plans are designed for people who connect every day, giving you unlimited hours of connection time for a flat monthly fee. 
+
+</UL>
+
+<P>Once you have chosen an account plan and created an account, Account Setup disconnects you from the Internet account server. It then automatically configures your computer to access your new account. 
+
+<P>If you don't want to connect to the Internet account server right now, you don't need to. Account Setup saves the information you provided (except your credit card number), so that when you are ready to create an account, all you have to do is launch Account Setup and move to this screen to connect.</P>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/connect2.htm
+++ b/mozilla/cmd/dialup/as_html/help/connect2.htm
@@ -0,0 +1,61 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>You're Done!</B></P>
+
+<P>You've finished entering all the information that Account Setup needs to set up access to your Internet account. Account Setup configures your computer to access your account when you click either Connect Now or Done.  </P>
+
+<P>If you want Account Setup to configure your computer and then connect you to the Internet right now, click Connect Now. </P>
+
+<P>If you want Account Setup to configure your computer but don't want it to connect you to your account right now, click Done. When you are ready to connect to the Internet, all you have to do is launch Netscape Communicator by double-clicking its icon in the Netscape Communicator folder or program group.</P>
+
+<P>When you have more questions about using Communicator, you can find the information you need in Communicator's Help system, available from the Help menu, in and the Reference Library, available in the Netscape Communicator folder or program group.</P>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/dial.htm
+++ b/mozilla/cmd/dialup/as_html/help/dial.htm
@@ -0,0 +1,58 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Your Account Access Number</B></P>
+
+<P>Enter the phone number your computer dials to connect to your Internet account. If dialing within the United States and Canada, be sure to include the area code.</P>
+
+<P>If Account Setup already displays an access number in this screen, it is the access number recommended by your Internet service provider. It is best to use this number.
+</UL>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/dialinf1.htm
+++ b/mozilla/cmd/dialup/as_html/help/dialinf1.htm
@@ -0,0 +1,98 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ 
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Dialing Settings for Your Location</B></P>
+
+<P>Enter any of the dialing settings listed on this screen to enable Account Setup to successfully connect with the Internet account server:</P>
+
+<UL>
+	<LI><B>The code you dial to turn off Call Waiting</B> (optional): 
+	
+	<spacer type=vertical size=4>
+
+	If you have Call
+	Waiting, you should turn it off while you are connected to the Internet. Calls that come 
+	in while you are connected might disturb the connection. 
+	
+	<spacer type=vertical size=4>
+
+From the pop-up menu on the screen, select the code you use to turn off Call Waiting during a call. If your code isn't listed, enter your code in the text box to the left of the menu. If you have Call Waiting but aren't sure what code to use to turn it off, call your telephone company.
+
+<spacer type=vertical size=4>
+	
+	If you don't have Call Waiting, leave "Line Doesn't Have Call Waiting" selected in the 
+	pop-up menu.
+	
+<spacer type=vertical size=4>
+	
+	<LI><B>The number you dial to access an outside line</B> (optional): 
+			
+	<spacer type=vertical size=4>
+
+	If you are connecting from within an internal phone network, such as from an office building or hotel, enter the number that you dial access an outside line.
+
+<spacer type=vertical size=4>
+	
+	If you don't need to access an outside line before dialing, leave the text box blank.
+
+<spacer type=vertical size=4>
+	
+	<LI><B>Your telephone's dialing method</B> (if applicable):
+		
+	<spacer type=vertical size=4>
+
+	 Choose either tone or pulse
+	dialing. Tone dialing, used by push-button telephones, is suitable for most phone
+	lines. However, some phone lines still use pulse dialing, the older method used by
+	rotary telephones.
+</UL>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/dialinf2.htm
+++ b/mozilla/cmd/dialup/as_html/help/dialinf2.htm
@@ -0,0 +1,57 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Phone Number of Your Location</B></P>
+
+<P>Enter the phone number of the line that is currently connected to your modem or computer. Account Setup uses this information to determine how to whether to dial an area code or other prefix. Therefore, don't enter your home phone number if you are connecting from another location.</P>
+
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/dns.htm
+++ b/mozilla/cmd/dialup/as_html/help/dns.htm
@@ -0,0 +1,67 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Your Provider's Domain Name and DNS Servers</B></P>
+
+<P>Enter your provider's domain name and the internet addresses of your provider's DNS servers into the text boxes:</P>
+
+<UL>
+	<LI>Domain Name: Your provider's domain name is the internet identity of your provider's network of computers. It often looks something like <TT>providername.com</TT> or <TT>providername.net</TT>. 
+
+<spacer type=vertical size=4>
+	
+	<LI>Primary and Secondary DNS Servers: Your provider's Domain Name System (DNS) servers route your email, requests for web pages, and other Internet traffic to their proper destinations on the Internet. The secondary DNS server is a backup to the primary server, in case the primary server goes offline or a part of the network is unavailable for some reason. 
+</UL>
+
+<P>Unlike the mail and news server information on the previous screen, Account Setup <B>must</B> have your provider's domain name and DNS server address before you can access the Internet. If you don't have this information or are unsure about the information
+that you do have, call your provider before going on with Account Setup.</P>
+
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/email.htm
+++ b/mozilla/cmd/dialup/as_html/help/email.htm
@@ -0,0 +1,62 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Your Email Login and Password</B></P>
+
+<P>Many Internet service providers let you use your account login name and
+password to access your email. That way, you only have a single login and password to remember. Other providers, though, ask you to use a different login
+and password for accessing email.</P>
+
+<P>If your provider has given you a special login and password for email, enter them
+into the appropriate text boxes. Account Setup configures Communicator's Mail & Groups preferences with the information you enter on this screen. </P>
+
+<P>Account Setup automatically enters your account login and password into the text boxes on this screen. If you use a different login and password for email, enter the information into this screen. If you aren't sure whether you need a special email login and password, or aren't sure what yours is, call your provider's technical support office.</P>
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/error.htm
+++ b/mozilla/cmd/dialup/as_html/help/error.htm
@@ -0,0 +1,59 @@
+<!--  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+ -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+
+	<TITLE>Account Setup Help</TITLE>
+   	<LINK REL=STYLESHEET TYPE="text/JavaScript" HREF="hsheet.htm" TITLE="Account Setup">
+</HEAD>
+
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF" BACKGROUND="../images/bg.gif" LINK="#0000EE" VLINK="#551A8B" ALINK="#0000FF">
+
+<!-- The layer below contains the Account Setup identifier. -->
+
+<LAYER NAME = "tagtext" LEFT = 0 TOP = 0 VISIBILITY = SHOW>
+
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
+<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="../images/tag.gif">
+<B CLASS="helptag">ACCOUNT SETUP</B>
+</FONT>
+</TD></TR>
+</TABLE>
+
+</LAYER>
+<spacer type=vertical size=36>
+
+
+<!-- The main text of this Help screen appears below. -->
+
+<P><B>Connection Error...</B></P>
+
+<P>If you are having trouble connecting, retrace your steps in Account Setup to make sure that you entered the information correctly, then try connecting again. </P>
+
+<P>Also, make sure your modem is properly connected and turned on. If you want to try connecting again now, click Connect Again. </P>
+
+<P>For troubleshooting tips, use this link: <A HREF="ashelp.htm#troubleshooting">Troubleshooting</A>.
+
+<P><A HREF="ashelp.htm">[CONTENTS]</A></P>
+
+
+
+</BODY>
+</HTML>
--- a/mozilla/cmd/dialup/as_html/help/fppphlp.htm
+++ b/mozilla/cmd/dialup/as_html/help/fppphlp.htm
--- a/mozilla/cmd/dialup/as_html/help/hsheet.htm
+++ b/mozilla/cmd/dialup/as_html/help/hsheet.htm
@@ -0,0 +1,77 @@
+/*  -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil -*-
+  
+   The contents of this file are subject to the Netscape Public License
+   Version 1.0 (the "NPL"); you may not use this file except in
+   compliance with the NPL.  You may obtain a copy of the NPL at
+   http://www.mozilla.org/NPL/
+  
+   Software distributed under the NPL is distributed on an "AS IS" basis,
+   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   for the specific language governing rights and limitations under the
+   NPL.
+  
+   The Initial Developer of this code under the NPL is Netscape
+   Communications Corporation.  Portions created by Netscape are
+   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   Reserved.
+*/
+//TAGS FOR ACCOUNT SETUP HELP
+
+tags.BODY.fontFamily="PrimaSans BT, Helvetica,Arial";
+tags.BODY.borderWidths(0, 0, 0, 0);
+tags.BODY.paddings(0, 0, 0, 0);
+
+tags.P.fontFamily="PrimaSans BT, Helvetica,Arial";
+tags.P.fontSize="12";
+tags.P.lineHeight="1.1";
+tags.P.marginRight="3";
+tags.P.marginLeft="3";
+
+
+//Titles of Internet Preview screens
+
+classes.title.all.fontSize="23";
+classes.title.all.fontFamily="PrimaSans BT, Helvetica,Arial";
+classes.title.all.margins(34,0,0,43);
+
+
+//Tables (for forms inputs, etc.)
+
+tags.TABLE.marginTop="6";
+
+tags.TD.fontFamily="PrimaSans BT, Helvetica,Arial";
+tags.TD.fontSize="12";
+tags.TD.lineHeight="1.1"
+
+
+
+//the entries below are exceptions to the standard definition
+
+ids.nospace.marginTop="0";
+ids.minspace.marginTop="6";
+ids.nomargins.margins(14,8,8,8);
+ids.buttontext.fontSize="12";
+
+ids.smallleftmargin.margins(14,40,0,160);
+ids.mediumleftmargin.margins(14,40,0,265);
+ids.bulletssmallleftmargin.marginLeft="160";
+
+
+//Lists
+
+tags.UL.listStyleType="disc";
+tags.UL.fontFamily="PrimaSans BT, Helvetica,Arial";
+tags.UL.fontSize="12";
+tags.LI.fontSize="10";
+tags.OL.fontFamily="PrimaSans BT, Helvetica,Arial";
+tags.OL.fontSize="12";
+
+
+//Account Setup tag
+
+classes.helptag.all.fontSize="12";
+classes.helptag.all.paddingLeft="5";
+classes.helptag.all.color="white";
+classes.helptag.all.marginTop="0";
+
+
--- a/mozilla/cmd/dialup/as_html/help/images/fppp1.gif
+++ b/mozilla/cmd/dialup/as_html/help/images/fppp1.gif
--- a/mozilla/cmd/dialup/as_html/help/images/fppp10.gif
+++ b/mozilla/cmd/dialup/as_html/help/images/fppp10.gif
--- a/mozilla/cmd/dialup/as_html/help/images/fppp11.gif
+++ b/mozilla/cmd/dialup/as_html/help/images/fppp11.gif
--- a/mozilla/cmd/dialup/as_html/help/images/fppp12.gif
+++ b/mozilla/cmd/dialup/as_html/help/images/fppp12.gif
--- a/Show More
+++ b/Show More