Merge jv
authorMerge Script
Tue, 19 Jul 2016 07:09:54 +0200
branchjv
changeset 16738 1a1b5477fdd5
parent 16734 8b6e7ef9a974 (current diff)
parent 16737 7067cab3037e (diff)
child 16741 f621547bfc73
Merge
CodeGeneratorTool.st
SyntaxElementVariable.st
Tools__NewSystemBrowser.st
--- a/CodeGeneratorTool.st	Fri Jul 15 07:00:52 2016 +0200
+++ b/CodeGeneratorTool.st	Tue Jul 19 07:09:54 2016 +0200
@@ -395,7 +395,7 @@
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
- inclusion of the above copyright notice.   This software may not
+ inclusion of the above copyright notice.  This software may not
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.' bindWith:'%1' with:copyrightHolder.
--- a/SyntaxElementVariable.st	Fri Jul 15 07:00:52 2016 +0200
+++ b/SyntaxElementVariable.st	Tue Jul 19 07:09:54 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SyntaxElement subclass:#SyntaxElementVariable
 	instanceVariableNames:'name assigned'
 	classVariableNames:''
@@ -36,25 +38,15 @@
 
 documentation
 "
- Replace 'SyntaxElement', 'NewClass1' and
- the empty string arguments by true values.
+    documentation to be added
 
- Install (or change) the class by 'accepting',
- either via the menu or the keyboard (usually CMD-A).
-
- You can also change the category simply by editing
- the categoryString and accepting.
+    [author:]
 
- To be nice to others (and yourself later), do not forget to
- add some documentation; preferably under the classes documentation
- protocol.
- (see the `create documentation stubs' item in the methodList menu;
-  switch from instance to class to find this menu item.)
+    [instance variables:]
 
- Notice, that ST/X uses the convention to document the class using
- comment-only class methods (however, ST80 comments are supported and
- can be changed via the class-documentation menu).
+    [class variables:]
 
+    [see also:]
 "
 ! !
 
@@ -97,10 +89,10 @@
 !SyntaxElementVariable class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.6 2014-02-05 18:57:25 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.6 2014-02-05 18:57:25 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/Tools__NewSystemBrowser.st	Fri Jul 15 07:00:52 2016 +0200
+++ b/Tools__NewSystemBrowser.st	Tue Jul 19 07:09:54 2016 +0200
@@ -54765,7 +54765,7 @@
     ] ifFalse:[
         "/ nextPutLine:' Documentation:'.
         infoStream nextPutLine:commentOrNil; cr.
-        infoStream nextPutLine:' Notice: '.
+        infoStream nextPutLine:' Notice:'.
         infoStream nextPutAll:'   the above text has been extracted from the classes '.
         infoStream nextPutLine:(isComment ifTrue:['comment.'] ifFalse:['documentation method.']).
         infoStream nextPutLine:'   Any change in it will be lost if you ''accept'' here.'.