Further reorganisation of system categories

russellallen · Mar 3, 2015 · d521340 · d521340
1 parent 6f06078
commit d521340
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 16 deletions.
diff --git a/docs/handbook/howtoprg.rst b/docs/handbook/howtoprg.rst
@@ -44,7 +44,9 @@ screen, you can summon it by pressing the middle mouse button on the background
 
 Outliners sport three small buttons in the top-right-hand corner labeled “/\\”, “E”,
 and “X”. These buttons summon the object’s parents, add an evaluator text region to the bottom of
-the outliner, and dismiss the outliner. Press the “E” button to get an evaluator.Type ``anExampleObject`` into 
+the outliner, and dismiss the outliner. Press the “E” button to get an evaluator.
+
+Type ``anExampleObject`` into 
 the evaluator (it will already be selected) and hit the ``Get it`` button (or type metareturn 
 on UNIX, or command-return on MacOS X):
 
@@ -55,7 +57,15 @@ on UNIX, or command-return on MacOS X):
     :align: left
 
 The result object appears in your “hand” raised above the screen as if you were dragging it with the
-left button. Just click the button to set it down.
+left button. 
+
+.. note::
+
+   If this returns an error, it may be that you don't have ``anExampleObject`` in your Self world. You can always load it from the file ``objects/misc/programmingExamples.self`` as follows::
+   
+   'path/to/objects/misc/programmingExamples.self' runScript
+
+Click the button to set it down.
 
 ..  figure:: images/Pgm_Env_Image3.*
     :height: 70 px
@@ -885,4 +895,4 @@ which may take a while to learn. We hope that you find the investment worth the
 
 .. [#f9] isComplete is used by the environment to decide when it is safe to send messages like printString.
 
-.. [#f9] See www.semanticversioning.org for a specification. In essence, versions are of the form "3.2.1-alpha6"
+.. [#f10] See www.semanticversioning.org for a specification. In essence, versions are of the form "3.2.1-alpha6"
diff --git a/objects/core/abstract_OS.self b/objects/core/abstract_OS.self
@@ -8,7 +8,7 @@ See the LICENSE file for license information.
  '-- Module body'
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: platform\x7fCategory: host and filesystem\x7fModuleInfo: Module: abstract_OS InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: platform\x7fCategory: os\x7fModuleInfo: Module: abstract_OS InitialContents: FollowSlot\x7fVisibility: public'
 
          abstract_OS = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'abstract_OS' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals abstract_OS.

diff --git a/objects/core/history.self b/objects/core/history.self
@@ -15,7 +15,7 @@ See the LICENSE file for license information.
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: system\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: system\x7fCategory: prompt\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
 
          historyListEntry = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'historyListEntry' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals historyListEntry.
@@ -36,7 +36,7 @@ See the LICENSE file for license information.
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> () From: ( | {
-         'Category: system\x7fCategory: user interface\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: system\x7fCategory: prompt\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
 
          historyListEntry = bootstrap setObjectAnnotationOf: bootstrap stub -> 'traits' -> 'historyListEntry' -> () From: ( |
              {} = 'Comment: A historyListEntry is a triple: <id><command string><result object>.\x7fModuleInfo: Creator: traits historyListEntry.
@@ -191,7 +191,7 @@ SlotsToOmit: directory fileInTimeString myComment postFileIn revision subpartNam
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> () From: ( | {
-         'Category: system\x7fCategory: user interface\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: system\x7fCategory: prompt\x7fModuleInfo: Module: history InitialContents: FollowSlot\x7fVisibility: public'
 
          historyList = bootstrap setObjectAnnotationOf: bootstrap stub -> 'traits' -> 'historyList' -> () From: ( |
              {} = 'Comment: The history list records commands typed by the user, allowing a command

diff --git a/objects/core/hosts.self b/objects/core/hosts.self
@@ -8,7 +8,7 @@ See the LICENSE file for license information.
  '-- Module body'
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: platform\x7fCategory: graphical interface\x7fCategory: graphics\x7fModuleInfo: Module: hosts InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: platform\x7fCategory: graphical interface\x7fModuleInfo: Module: hosts InitialContents: FollowSlot\x7fVisibility: public'
 
          graphicsDependentGlobals* = bootstrap stub -> 'globals' -> 'quartzGlobals' -> ().
         } | ) 
@@ -1281,7 +1281,7 @@ SlotsToOmit: directory fileInTimeString myComment postFileIn revision subpartNam
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: platform\x7fCategory: graphical interface\x7fCategory: graphics\x7fModuleInfo: Module: hosts InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: platform\x7fCategory: graphical interface\x7fModuleInfo: Module: hosts InitialContents: FollowSlot\x7fVisibility: public'
 
          x11Globals = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'x11Globals' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals x11Globals.

diff --git a/objects/core/prompt.self b/objects/core/prompt.self
@@ -99,7 +99,7 @@ is a sane default for perProcessGlobals prompt inputLoopProcess\x7fModuleInfo: C
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> () From: ( | {
-         'Category: system\x7fCategory: user interface\x7fModuleInfo: Module: prompt InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: system\x7fCategory: prompt\x7fModuleInfo: Module: prompt InitialContents: FollowSlot\x7fVisibility: public'
 
          prompt = bootstrap setObjectAnnotationOf: bootstrap stub -> 'traits' -> 'prompt' -> () From: ( |
              {} = 'ModuleInfo: Creator: traits prompt.

diff --git a/objects/core/quartzHosts.self b/objects/core/quartzHosts.self
@@ -66,7 +66,7 @@ SlotsToOmit: directory fileInTimeString myComment postFileIn revision subpartNam
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: platform\x7fCategory: graphical interface\x7fCategory: graphics\x7fModuleInfo: Module: quartzHosts InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: platform\x7fCategory: graphical interface\x7fModuleInfo: Module: quartzHosts InitialContents: FollowSlot\x7fVisibility: public'
 
          quartzGlobals = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'quartzGlobals' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals quartzGlobals.

diff --git a/objects/core/stdin.self b/objects/core/stdin.self
@@ -92,8 +92,8 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: system\x7fCategory: concurrency\x7fComment: Holds the real prototype for objects
-like stdout which are lookuped up in corrent
+         'Category: system\x7fCategory: prompt\x7fCategory: concurrency\x7fComment: Holds the real prototype for objects
+like stdout which are lookuped up in current
 process by methods in defaultBehavior.\x7fModuleInfo: Module: stdin InitialContents: FollowSlot\x7fVisibility: public'
 
          perProcessGlobals = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'perProcessGlobals' -> () From: ( |
@@ -136,7 +136,7 @@ process by methods in defaultBehavior.\x7fModuleInfo: Module: stdin InitialConte
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: system\x7fModuleInfo: Module: stdin InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: system\x7fCategory: prompt\x7fModuleInfo: Module: stdin InitialContents: FollowSlot\x7fVisibility: public'
 
          userQuery = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'userQuery' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals userQuery.

diff --git a/objects/misc/programmingExamples.self b/objects/misc/programmingExamples.self
@@ -8,7 +8,7 @@ See the LICENSE file for license information.
  '-- Module body'
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> () From: ( | {
-         'Category: examples\x7fModuleInfo: Module: programmingExamples InitialContents: FollowSlot\x7fVisibility: public'
+         'Category: applications\x7fCategory: examples\x7fModuleInfo: Module: programmingExamples InitialContents: FollowSlot\x7fVisibility: public'
 
          anExampleObject = bootstrap setObjectAnnotationOf: bootstrap stub -> 'globals' -> 'anExampleObject' -> () From: ( |
              {} = 'ModuleInfo: Creator: globals anExampleObject.

diff --git a/objects/worldBuilder.self b/objects/worldBuilder.self
@@ -3,7 +3,7 @@ SELF WORLD BUILDER
 Copyright 1992-2014 AUTHORS.
 See the LICENSE file for license information.
 
-Version: 0.1.0
+Version: 0.2.0
 
 This is not a module and not managed by Transporter.
 '
@@ -17,6 +17,7 @@ This is not a module and not managed by Transporter.
   bootstrap read: 'primitiveMaker' From: 'glue'.
   bootstrap read: 'crypto' From: 'applications'.
   bootstrap read: 'allTests' From: 'tests'.
+  bootstrap read: 'programmingExamples' From: 'misc'.
 
   "Load optional components after asking user"