-{section: DRAFT Welcome to the Condor Development Wiki}
-Some pages need condensing to a sub page, but this is the general idea.
+{section: DRAFT Welcome to the Condor Wiki}
 
 <html>
 <table>
@@ -7,95 +6,35 @@
 <td valign="top">
 </html>
 
-*Information for:*
-*: {wiki: DeveloperWiki Developers}
-*: {wiki: AdministratorWiki Administrators}
-*: {wiki: EndUserWiki Users}
-
-*All Developers*
-
+*General Interest*
+*: {link: http://www.cs.wisc.edu/condor The Condor Project}
+*: {link: http://www.cs.wisc.edu/condor/manual Manuals}
+*: {wiki: CondorMailingLists Condor Mailing Lists}
+*: WikiDocumentation
 
-*: {wiki: DeveloperReleasePlan Tickets targeted for the next release}
+*Users*
+*: {wiki: EndUserWiki Users}
 *: {link: http://www.cs.wisc.edu/condor/overview/ Non-technical overview}
-*: {link: http://www.cs.wisc.edu/condor/developers/overview.html Technical overview} [pull off of developer site and put into wiki so no password required]
-*: {wiki: CondorMailingLists Condor Mailing Lists}
-*: {wiki: TicketSubmissionGuideLines Ticket Submission Guide Lines}
-*: {wiki: DevTutorials Developer Tutorials}
-*: {wiki: PortingCondorInfo Porting Condor Info} [put into tutorial]
+
+*Administrators*
+*: {wiki: AdministratorWiki Administrators}
 *: {wiki: CreatingPersonalCondor Creating a Personal Condor} [put into tutorial]
-*: {wiki: CreatingNewDaemons Creating a new daemon} [put into tutorial]
-*: {wiki: AuthoringSuccessfulPatch Authoring a Successful Patch}
-*: {wiki: ManualEntryGuidelines Manual Entry Guidelines}
-*: {wiki: ManualIndexEntries Manual Index Entries How To}
-*: *Building*
-*:: {wiki: BuildingCondorOnUnix Unix} _(NEEDS UPDATING)_
-*:: {wiki: BuildingCondorOnWindows Windows}
-*: *Testing*
-*:: {wiki: TestAddHowto Test Suite Overview}
-*:: {wiki: TestingCondorOnWindows Testing Condor on Windows}
-
-*Core Developers @ UW-Madison*
-
-*: {wiki: GitWorkFlow Git Work Flow}
-*: {wiki: GitWisdom Git Wisdom}
-*: {wiki: GitPushChecklist Checklist: git push} [put into GitWorkFlow]
-*: {wiki: PerformingCodeReviews Performing Code Reviews}
-*: {link: http://nmi-s006.cs.wisc.edu/results/Run-condor.php Nightly build results} ({link: http://www.cs.wisc.edu/condor/developers/testsuite/buildandtestblog.html Built-Test Blog})
-*: {link: http://bonsai.cs.wisc.edu/gitweb/gitweb.cgi GitWeb} (and deprecated {link: http://bonsai.cs.wisc.edu/bonsai/cvsqueryform.cgi Bonsai})
-*: {link: http://www.cs.wisc.edu/condor/developers/download_stats/downloads.html Download Analysis}
-*: {link: http://tonic.cs.wisc.edu:5467 Coverity-found bugs}
-*: {wiki: NmiBuild Building Condor on NMI}
-*: {wiki: NmiBuildOlderRelease Building an Older Release in NMI}
-*: {wiki: ReleasePunchList Release Punch-List}
-*: {wiki: ReportWritingTips Git Trac Report Writing Tips}
-*: *Git Trac*
-*:: {wiki: GitTracAccounts Creating GitTrac Accounts}
-*:: {wiki: RepositoryBackups Repository Backups}
-*:: FrequentlyAskedQuestions
-*:: CvstracDocumentation
-*:: WikiDocumentation
-*:: CreatingNewWiki
-
-*Development proposals* [condense/move to DeveloperReleasePlan]
-_:Please ensure proposals are associated with tickets, and vice versa.
-
-*: Ongoing
-*:: {wiki: StudentProjects Project ideas for student hourlies}
-*:: {wiki: SubmitRequirements Submit Requirements }
-*: {wiki: DeferredDevelopmentProposals Deferred }
-*: {wiki: ResolvedDevelopmentProposals Resolved }
-*: {wiki: DevelopersEnhancements 7.3 series enhancements}
+*: {wiki: HowToAdminRecipes Administrator HOWTO Recipes}
+*: {wiki: CondorPortsTable The Condor Ports Table}
+*: {link: http://www.cs.wisc.edu/condor/security/ Security Issues In Condor}
 
 <html>
 </td>
 <td valign="top">
 </html>
 
-*Administrators*
-*: {wiki: HowToAdminRecipes Administrator HOWTO Recipes}
-*: {wiki: CondorPortsTable The Condor Ports Table}
-*: {link: http://www.cs.wisc.edu/condor/security/ Security Issues In Condor}
-
-*Wisdom*
 
-*: {wiki: MemoryProfiling Profiling Memory Usage}
-*: {wiki: ExecutionProfiling Profiling Code Execution}
-*: SyscallMode (Feb. 1999)
-*: JavaUniverse (Dec. 2001)
-*: {wiki: MpiWisdom MPI Wisdom} (July 2002)
-*: {wiki: CodingGuidelinesAndRulesForImake Coding Guidlines/Rules when using Imake in the Condor build system} (May 2004)
-*: {link: http://www.cs.wisc.edu/condor/developers/ports.html Ports and Where They Work}
-*: details about {wiki: DetailsAboutCondorStats condor_stats} (Jan 2004)
-*: {wiki: AddingNewComponentToBuildTree Adding a new component to build tree} (Jan 2004)
-*: {wiki: AddingNewExternalPackage Adding a new external package}
-*: {wiki: CondorErrorDataStructure CondorError data structure} (Jan 2006)
-*: {wiki: AutoclustingAndSignificantAttributes Autoclustering and SIGNIFICANT_ATTRIBUTES} (Jan 2006)
-*: {wiki: StorkWisdom Stork } (June 2006)
-*: {wiki: DebuggingSmashedStacks Debugging Smashed Stacks} (Aug 2006)
-*: {wiki: WindowsDebugging Windows Debugging}
-*: {link: http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html GCC Inline Assembly Tutorial}
-*: {wiki: WisdomGsiSetup HOWTO quickly setup GSI Security for testing}
-*: {wiki: EmacsSettingsForCondorCodingStyle Emacs Settings For Condor Coding Style}
+*Developers*
+*: {wiki: DeveloperWiki Developers}
+*: {wiki: DeveloperReleasePlan Tickets targeted for the next release}
+*: {link: http://www.cs.wisc.edu/condor/developers/overview.html Technical overview} [pull off of developer site and put into wiki so no password required]
+*: {wiki: TicketSubmissionGuideLines Ticket Submission Guide Lines}
+*: {wiki: DevTutorials Developer Tutorials}
 
 *People who maintain and author Condor*
 *: {wiki:DeveloperHomePages Developer Home Pages}