Properly mark ruby source blocks as such and simplify how they're presented

Author: crd

book/07-git-tools/sections/rerere.asc

@@ -25,9 +25,9 @@ $ git config --global rerere.enabled true
 You can also turn it on by creating the `.git/rr-cache` directory in a specific repository, but the config setting is clearer and it can be done globally.
 
 Now let's see a simple example, similar to our previous one.
-Let's say we have a file that looks like this:
+Let's say we have a file named `hello.rb` that looks like this:
 
-[source,console]
+[source,ruby]
 ----
 #! /usr/bin/env ruby
 
@@ -177,9 +177,8 @@ Patch failed at 0001 i18n one word
 Now, we got the same merge conflict like we expected, but take a look at the `Resolved FILE using previous resolution` line.
 If we look at the file, we'll see that it's already been resolved, there are no merge conflict markers in it.
 
-[source,console]
+[source,ruby]
 ----
-$ cat hello.rb
 #! /usr/bin/env ruby
 
 def hello