--- a/stx_goodies_petitparser.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/stx_goodies_petitparser.st	Fri Oct 03 02:33:08 2014 +0100
@@ -20,6 +20,20 @@
 
 !stx_goodies_petitparser class methodsFor:'accessing - monticello'!
 
+monticelloLastMergedVersionInfo
+    "The last merged version is: "
+
+    ^ '
+    Name: PetitParser-JanKurs.250
+    Author: JanKurs
+    Time: 01-10-2014, 04:44:04 AM
+    UUID: c46eea20-51a0-4deb-8fd5-8cb99810a8b4            
+    Repository: http://smalltalkhub.com/mc/Moose/PetitParser/main
+    '
+
+    "Created: / 03-10-2014 / 02:27:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 monticelloName
     "Return name of the package for Monticello. This is used when package is exported"
 
@@ -49,27 +63,25 @@
 !
 
 mandatoryPreRequisites
-    "list all required mandatory packages.
-     Packages are mandatory, if they contain superclasses of the package's classes
-     or classes which are extended by this package.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies
-     (the browser has a menu function for that)"
+    "list packages which are mandatory as a prerequisite.
+     This are packages containing superclasses of my classes and classes which
+     are extended by myself.
+     They are mandatory, because we need these packages as a prerequisite for loading and compiling.
+     This method is generated automatically,
+     by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of PPAbstractParseTest "
-        #'stx:libbasic'    "ArrayedCollection - extended "
-        #'stx:libbasic2'    "Text - extended "
+        #'stx:libbasic'    "ArrayedCollection - extended"
+        #'stx:libbasic2'    "Text - extended"
     )
 !
 
 referencedPreRequisites
-    "list all packages containing classes referenced by the packages's members.
-     This list can be maintained manually or (better) generated and
-     updated by looking for global variable accesses
-     (the browser has a menu function for that)
-     However, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPreRequisites method."
+    "list packages which are a prerequisite, because they contain
+     classes which are referenced by my classes.
+     We do not need these packages as a prerequisite for loading or compiling.
+     This method is generated automatically,
+     by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
     )
@@ -115,6 +127,8 @@
     ^ #(
         "<className> or (<className> attributes...) in load order"
         PPCharSetPredicate
+        PPContext
+        PPContextMemento
         PPFailure
         PPMemento
         PPParser
@@ -128,6 +142,7 @@
         PPLiteralParser
         PPPluggableParser
         PPPredicateParser
+        PPStartOfLine
         PPUnresolvedParser
         PPActionParser
         PPAndParser
@@ -156,8 +171,8 @@
 !
 
 extensionMethodNames
-    "lists the extension methods which are to be included in the project.
-     Entries are 2-element array literals, consisting of class-name and selector."
+    "list class/selector pairs of extensions.
+     A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
         Block asParser