Fix conflict

diff --cc basis/help/tutorial/tutorial.factor
Simple merge

diff --cc basis/ui/tools/tools-docs.factor
index e4bd7a9f135c954742dbfeafb9490fafca7e19c3,2caea234801e0f05de7b010d02ac6566ca13c38a..9e63be09ab3f5fb36abf2da281b011231024555c
--- 1/basis/ui/tools/tools-docs.factor
--- 2/basis/ui/tools/tools-docs.factor
+++ b/basis/ui/tools/tools-docs.factor
@@@ -1,26 -1,12 +1,24 @@@
--USING: editors help.markup help.syntax summary inspector io
--io.styles listener parser prettyprint tools.profiler
- tools.walker ui.commands ui.gadgets.panes
- ui.gadgets.presentations ui.operations
-  ui.tools.operations ui.tools.profiler
- ui.tools.common vocabs ;
 -tools.walker ui.commands ui.gadgets.editors ui.gadgets.panes
 -ui.gadgets.presentations ui.gadgets.slots ui.operations
 -ui.tools.browser ui.tools.interactor ui.tools.inspector
 -ui.tools.listener ui.tools.operations ui.tools.profiler
 -ui.tools.walker ui.tools.workspace vocabs ;
++USING: editors help.markup help.syntax summary inspector io io.styles
++listener parser prettyprint tools.profiler tools.walker ui.commands
++ui.gadgets.panes ui.gadgets.presentations ui.operations
++ui.tools.operations ui.tools.profiler ui.tools.common vocabs ;
  IN: ui.tools
  
 +ARTICLE: "starting-ui-tools" "Starting the UI tools"
 +"The UI tools start automatically where possible:"
 +{ $list
 +    { "On Windows, the tools start when the Factor executable is run." }
 +    { "On X11, the tools start if the " { $snippet "DISPLAY" } " environment variable is set." }
 +    { "On Mac OS X, the tools start if the " { $snippet "Factor.app" } " application bundle is run." }
 +}
 +"In all cases, passing the " { $snippet "-run=listener" } " command line switch starts the terminal listener instead. The UI can be started from the terminal by issuing the following command:"
 +{ $code "USE: threads" "[ \"ui.tools\" run ] in-thread" } ;
 +
 +ARTICLE: "ui-shortcuts" "UI tool keyboard shortcuts"
 +"Every UI tool has its own set of keyboard shortcuts; press " { $snippet "F1" } " inside a tool to see help. Some common shortcuts are also supported by all tools:"
 +{ $command-map tool "tool-switching" }
 +{ $command-map tool "common" } ;
 +
  ARTICLE: "ui-presentations" "Presentations in the UI"
  "A " { $emphasis "presentation" } " is a graphical view of an object which is directly linked to the object in some way. The help article links you see in the documentation browser are presentations; and if you " { $link see } " a word in the UI listener, all words in the definition will themselves be presentations."
  $nl

diff --cc basis/ui/ui-docs.factor
Simple merge