Note:	This topic is for temporary use; it is not part of the TWiki release documentation

Temporary Topic for TWiki.org / Dakar sync

Please record the merge progress here in this table. For an explanation of what the status notes mean, see note below.

See background on this at DakarDocumentationModelIsBroken. Tracked via Bugs:Item663. Also refer to DocChangesSinceCairo for different presentation of diffs between Cairo and current Twiki.org topics.

TWiki.org topic	Diff to	Status
ATasteOfTWiki		updated
ATasteOfTWikiTemplate		revised
AccessKeys		unchanged
AdminSkillsAssumptions		updated
AdminTools		updated & replaced by ViewDEVELOP:TWiki.AdminToolsCategory
AnApplicationWithWikiForm		Added
AppendixEncodeURLsWithUTF8		revised
AppendixFileSystem		removed See note
BasicAuthentication		removed
BookView		unchanged
BumpyWord		unchanged
ChangePassword		updated
ClassicSkin		unchanged
CommentPlugin		revised
CommentsTmpl		updated
DefaultPlugin		unchanged
DeleteOrRenameATopic		unchanged
DeleteOrRenameAnAttachment		unchanged
DontNotify		removed
DragonSkin		removed
DragonSkinCustomize		removed
DragonSkinInstall		removed
DragonSkinSiteMap		removed
EditDoesNotIncreaseTheRevision		unchanged
EditTablePlugin		revised
EmptyPlugin		updated
ExampleTopicTemplate		unchanged
FileAttachment		revised
FileAttribute		updated
FormattedSearch		updated
GnuGeneralPublicLicense		revised - paragraph re LGPL deleted.
GoBox		updated
GoodStyle		unchanged
HiddenAttachment		unchanged
HowToLogOff		removed
IncludeTopicsAndWebPages		updated
InstallPassword		removed - see ViewDEVELOP:TWiki.ResetPassword
InstalledPlugins		unchanged
InstantEnhancements		updated
InterWikis		updated
MainFeatures		unchanged (but probably should be revised)
ManagingTopics		unchanged
ManagingUsers		updated
ManagingWebs		updated
NewUserTemplate		updated
PatternSkin		revised
PatternSkinCss		revised
PatternSkinCustomization		revised
PatternSkinPalette		revised
PeterThoeny		minor revision
PlainSkin		unchanged
PreviewBackground		unchanged
PrintSkin		unchanged
QuietSave		unchanged
RegularExpression		unchanged
RenderListPlugin		unchanged
ResetPassword		updated
SearchDoesNotWork		updated
SearchHelp		updated
SearchPatternCookbook		updated
SimultaneousEdits		updated
SiteMap		updated
StandardColors		updated
StartingPoints		unchanged
TWikiAccessControl		updated
TWikiAdminCookBook		removed
TWikiContributor		revised as ViewDEVELOP:Main.TWikiContributor
TWikiCss		revised
TWikiDocGraphics		updated
TWikiDocumentation		revised
TWikiDownload		unchanged
TWikiEnhancementRequests		unchanged
TWikiFAQ		unchanged
TWikiFaqTemplate		unchanged
TWikiForms		updated
TWikiFuncModule		updated; renamed to TWikiFuncDotPm
TWikiGlossary		unchanged
TWikiHistory		revised
TWikiInstallationGuide		revised
TWikiLogos		updated
TWikiMetaData		updated
TWikiPlannedFeatures		unchanged
TWikiPlugins		updated
TWikiPreferences		revised
TWikiRegistration		revised
TWikiRegistrationPub		removed
TWikiShorthand		updated
TWikiSite		updated
TWikiSiteTools		updated
TWikiSkinBrowser		updated
TWikiSkins		updated
TWikiSystemRequirements		updated
TWikiTemplates		updated
TWikiTip001		Added. See TipsContrib
TWikiTip002		Added
TWikiTip003		Added
TWikiTip004		Added
TWikiTip005		Added
TWikiTip006		Added
TWikiTip007		Added
TWikiTip008		Added
TWikiTip009		Added
TWikiTip010		Added
TWikiTip011		Added
TWikiTip012		Added
TWikiTip013		Added
TWikiTip014		Added
TWikiTip015		Added
TWikiTip016		Added
TWikiTip017		Added
TWikiTip018		Added
TWikiTip019		Added
TWikiTip020		Added
TWikiTip021		Added
TWikiTip022		Added
TWikiTip023		Added
TWikiTip024		Added
TWikiTip025		Added
TWikiTip026		Added
TWikiTip027		Added
TWikiTip028		Added
TWikiTip029		Added
TWikiTipsOfTheDay		Added
TWikiTipsOfTheDayAddNew		Added
TWikiTipsOfTheDayAdmin		Added
TWikiTipsOfTheDayInclude		Added
TWikiTipsOfTheDayTemplate		Added
TWikiTopics		updated
TWikiTutorial		updated
TWikiUpgradeGuide		revised
TWikiUpgradeTo01Dec2000		unchanged
TWikiUpgradeTo01Dec2001		unchanged
TWikiUpgradeTo01Feb2003		unchanged
TWikiUpgradeTo01May2000		unchanged
TWikiUserAuthentication		revised
TWikiUsernameVsLoginUsername		removed
TWikiVariables		updated
TWikiVariablesAtoM		updated
TWikiVariablesNtoZ		updated
TWikiWebsTable		unchanged
TemplateWeb		updated
TextEditor		unchanged
TextFormattingFAQ		updated
TextFormattingRules		updated
TimBernersLee		unchanged
UnlockTopic		removed
WabiSabi		unchanged
WebBottomBar		unchanged
WebChanges		unchanged
WebChangesAlert		unchanged
WebHome		revised
WebIndex		unchanged
WebLeftBar		revised
WebLeftBarCookbook		unchanged
WebLeftBarExample		unchanged
WebLeftBarPersonalTemplate		revised
WebRss		revised
WebRssBase		revised
WebSearch		revised
WebSearchAdvanced		revised
WebSiteTools		revised
WebTopBar		revised
WebTopicEditTemplate		revised
WebTopicList		revised
WebTopicNonWikiTemplate		updated
WebTopicViewTemplate		updated
WelcomeGuest		updated
WhatIsWikiWiki		updated
WikiCulture		updated
WikiName		updated
WikiNotation		unchanged
WikiReferences		updated
WikiSyntax		updated
WikiSyntaxSummary		updated
WikiTopic		unchanged
WikiWikiClones		unchanged
WikiWord		updated
WindowsInstallCookbook		removed
WindowsInstallSummary		removed
YouAreHere		updated

I'm starting to review status on these topics one-by-one. Here's explanation of the notation I'm using:

• Unchanged - Cairo and current TWiki.org versions are the same.
• Revised - Topic was significantly revised in Dakar making direct comparison to Cairo version difficult. Where possible, diff between Cairo and twiki.org is reviewed to look for possible small changes & corrections have been carried over to Dakar. Note: All plugin topics are marked as revised because they have been repackaged in Dakar.
• Updated - Recent changes in Cairo have been incorporated into Dakar version.
• Deprecated - Topic no longer exists in Dakar due either to 1) changes in code-base, 2) decision to remove twiki application examples, 3) better to maintain topic on TWiki.org or 4) content being rolled into other topics. In some cases, I will cite parallel Dakar topic.
• Added - Topics recently added to twiki.org that have been added to Dakar docs.
• Missing - Topics not currently in Dakar. May need further consideration.

-- LynnwoodBrown - 12 Oct 2005

Note on AppendixFileSystem: I removed this deliberately because it is far too hard to maintain. It is far more dangerous to have an out-of-date document that claims to be authoritative than no document at all. If you require this level of documentation, then it would be better provide READMEs in the actual directory structure.

• Good move -- PTh

-- CrawfordCurrie - 02 Nov 2005

One general diff that I'm not addressing (yet) is that all the plugin topics on TWiki.org have the link to appraisal. I might look at a mass addition to this later, however, I don't see it as critical.

• CrawfordCurrie
• LynnwoodBrown
• PeterThoeny