Permalink
Browse files

Merge remote-tracking branch 'origin/gh-pages' into gh-pages

  • Loading branch information...
2 parents 9742cdf + af35eb3 commit b701b09a0a7e92407b45ee7c57aa3135ada02548 @treeder treeder committed Jun 9, 2012
Showing with 13 additions and 11 deletions.
  1. +1 −1 _includes/footer.html
  2. +6 −4 _posts/2012-05-11-configuration.md
  3. +6 −6 _posts/2012-05-31-solutions-image-processing.md
@@ -56,7 +56,7 @@
<li><a href="http://twitter.com/getiron" target="_blank">Twitter</a></li>
<li><a href="http://blog.iron.io" target="_blank">Blog</a></li>
<li>
- <a rel="publisher" href="https://plus.google.com/107979826672004784735" target="_blank">Google+</a><br />
+ <a rel="publisher" href="http://get.iron.io/plus" target="_blank">Google+</a><br />
<!-- Place this tag where you want the +1 button to render -->
<g:plusone size="small"></g:plusone>
@@ -28,7 +28,7 @@ If you just want to get started quickly, here's the section for you.
Create a file called `.iron.json` in your home directory (ie: `~/.iron.json`) and enter your Iron.io credentials:
<div >
-{% highlight json %}
+{% highlight js %}
{
"token": "MY_TOKEN",
"project_id": "MY_PROJECT_ID"
@@ -88,9 +88,11 @@ it would be "IRON_WORKER_TOKEN" (for IronWorker).
### The File Hierarchy
-The hierarchy of files is simple enough: if a file named ".iron.json"
-exists in your home folder, that will provide the defaults. In addition,
-if an "iron.json" file exists in the same directory as the script being
+The hierarchy of files is simple enough:
+
+1. if a file named ".iron.json"
+exists in your home folder, that will provide the defaults.
+1. if an "iron.json" file exists in the same directory as the script being
run, that will be used to *overwrite* the values from the ".iron.json"
file in your home folder. Any values in "iron.json" that are not found
in ".iron.json" will be added; any values in ".iron.json" that are not
@@ -12,7 +12,7 @@ breadcrumbs:
# Image Processing With Iron.io
<div class="alert">
-<p>Want to get right to the good stuff? <a href="https://github.com/iron-io/iron_worker_examples/tree/master/ruby_ng/Image_processing"
+<p>Want to get right to the good stuff? <a href="https://github.com/iron-io/iron_worker_examples/tree/master/ruby_ng/image_processing"
title="Image processing example on Github">Download the code from Github</a>.</p>
</div>
@@ -308,7 +308,7 @@ client.tasks.create(
## On Github
-You can find all the code for this example worker [on Github](https://github.com/iron-io/iron_worker_examples/tree/master/ruby_ng/Image_processing).
+You can find all the code for this example worker [on Github](https://github.com/iron-io/iron_worker_examples/tree/master/ruby_ng/image_processing).
Feel free to copy, edit, and run it on IronWorker! :)
## Next Steps
@@ -317,7 +317,7 @@ Any article on ImageMagick will necessarily omit a lot of the power that
the library provides&mdash;there are just too many options and commands. If
you're interested in doing more with ImageMagick, check out the official
documentation on the ImageMagick [website](http://www.imagemagick.org) for a
-much more in-depth look at the possibilities. For those using ImageMagick
-from Ruby, we recommend the [MiniMagick gem](https://github.com/probablycorey/mini_magick)
-&mdash;it's a wrapper for the command line utility that uses less memory
-than the RMagick gem.
+much more in-depth look at the possibilities.
+
+For those using ImageMagick from Ruby, we recommend the [MiniMagick gem](https://github.com/probablycorey/mini_magick)
+&mdash;it's a wrapper for the command line utility that uses less memory than the RMagick gem.

0 comments on commit b701b09

Please sign in to comment.