Merge branch 'master' of

ssh://git@github.com/hlindberg/misc-puppet-docs.git

Conflicts:
	how-to/run-agent-master.md

Author: hlindberg

.project

@@ -6,18 +6,16 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.xtext.ui.shared.xtextBuilder.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>

how-to/run-agent-master.md

@@ -1,9 +1,11 @@
 Run Agent and Master from source on same machine
 ===
+
 ````
 bundle exec puppet master --no-daemonize --certname localhost --dns_alt_names localhost --verbose
 bundle exec puppet agent -t --certname localhost --server localhost
 ````
+
 To re-set the CSR process for an agent:
 
 ````
@@ -16,4 +18,4 @@ Compile Catalog and get json output
 
 ````
 bundle exec puppet master --no-daemonize --compile foonode --manifest foo.pp
-````
+````