Merge pull request #304 from dalehenrich/dev

Merge last of bugfixes for 1.0.0-beta.32.16.

I'm going to go ahead and merge this pull request despite the existence of Issues with SSL on Squeak platforms: Issue #305 and Issue #303 ... the final resolution for these particular issues are still up in the air and I don't want to dely the release of 1.0.0-beta32.16 any longer ... will push bugfixes for those issues when we got things characterized correctly

.travis.yml

@@ -19,8 +19,8 @@ env:
 #  Squeak-4.5
 #  Squeak-Trunk
 
-#   - ST=Pharo-1.4 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st 
-#   - ST=GemStone-3.1.0.6 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st # disable until Issue #241 addressed
+   - ST=Pharo-3.0 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st 
+   - ST=GemStone-3.2.2 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st
 
    - ST=Pharo-2.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
    - ST=Pharo-2.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
@@ -44,12 +44,11 @@ env:
    - ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
    - ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
 
-#   see https://github.com/dalehenrich/metacello-work/issues/262
    - ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
    - ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
 
-#   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
 #   - ST=GemStone-2.4.4.7 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
 #   - ST=GemStone-2.4.4.7 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
 #   - ST=GemStone-2.4.5 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st

README.md

@@ -77,8 +77,6 @@ If you are interested in using GitHub with the Metacello Preview, you should che
 
 **configuration branch**: [![Build Status](https://secure.travis-ci.org/dalehenrich/metacello-work.png?branch=configuration)](http://travis-ci.org/dalehenrich/metacello-work)
 
-**1.0-beta.31.1.5 branch**: [![Build Status](https://secure.travis-ci.org/dalehenrich/metacello-work.png?branch=1.0-beta.31.1.5)](http://travis-ci.org/dalehenrich/metacello-work)
-
 [1]: docs/GettingStartedWithGitHub.md
 [2]: docs/MetacelloUserGuide.md
 [3]: docs/MetacelloScriptingAPI.md

docs/GettingStartedWithGitHub.md

@@ -156,9 +156,7 @@ you've done a git `checkout` or `pull`):
 ```Smalltalk
 Metacello image
   baseline: 'Sample';
-  get.
-Metacello image
-  baseline: 'Sample';
+  get;
   load.
 ```
 

docs/LockCommandReference.md

@@ -246,6 +246,7 @@ Metacello new
   repository: 'http://ss3.gemtalksystems.com/ss/external';
   cacheRepository: 'filetree:///opt/git/externalDir/repository';
   ignoreImage;
+  get; "get will download the ConfigurationOfExternal to the cache repository"
   fetch: 'ALL'.
 ```
 If you project is more complex (i.e., has dependent projects) then you
@@ -332,10 +333,8 @@ Use the following set of expressions to load the **Example** project:
 Metacello new
   baseline: 'Example';
   repository: 'github://dalehenrich/example:otto/repository';
-  get.
-Metacello registry
-  baseline: 'Example';
   onLock: [ :ex | ex honor ];
+  get;
   load: 'Tests'.
 ```
 The `onLock:` block gets triggered every time a locked project is loaded, 

docs/MetacelloScriptingAPI.md

@@ -214,7 +214,7 @@ conditions:
 * You may be working with a git checkout of a project and you want to
   continue using the git checkout.
 
-you many not want to have particular projects upgraded automatically.
+you may not want to have particular projects upgraded automatically.
 The `lock` command gives you control.
 
 You can lock a project to a particular version:
@@ -546,10 +546,20 @@ is rooted in the projects HOME directory.
 ####cacheRepository:
 ####ignoreImage
 ####onConflict:
+####onConflictUseIncoming
+####onConflictUseIncoming:useLoaded:
+####onConflictUseLoaded
 ####onDowngrade:
+####onDowngradeUseIncoming
+####onDowngradeUseIncoming:
 ####onLock:
+####onLockBreak
+####onLockBreak:
 ####onUpgrade:
+####onUpgradeUseLoaded
+####onUpgradeUseLoaded:
 ####onWarning:
+####onWarningLog
 ####silently
 ### Metacello Project Registry
 ### Classes