Merge branch 'master' of git@github.com:lifo/docrails

1 files changed, 6 insertions, 7 deletions

diff --git a/railties/doc/guides/benchmarking_and_profiling/rubyprof.txt b/railties/doc/guides/benchmarking_and_profiling/rubyprof.txt
index edf036d13e..2dd5f2a99a 100644
--- a/railties/doc/guides/benchmarking_and_profiling/rubyprof.txt
+++ b/railties/doc/guides/benchmarking_and_profiling/rubyprof.txt
@@ -8,7 +8,6 @@ One of the things that is important to us is how long it takes to render the hom
 
 In the terminal run
 
-+
 [source, bash]
 ----------------------------------------------------------------------------
 [User profiling_tester]$ gcruby tests/performance/homepage.rb
@@ -105,7 +104,7 @@ Total: 509.724609
   1.01      5.13     5.13     0.00     0.00       27  Array#-
 ============================================================================
 
-Very similar to the processing time format. The main difference here is that instead of calculating time we are now concerned with the amount of KB put into memory *(or is it strictly the heap)* 
+Very similar to the processing time format. The main difference here is that instead of calculating time we are now concerned with the amount of KB put into memory *(or is it strictly into the heap) can I get clarification on this minor point?* 
 
 So for <Module::YAML>#quick_emit which is  singleton method on the class YAML it uses 57.66 KB in total, 23.57 through its own actions, 6.69 from actions it calls itself and that it was called twice.
 
@@ -124,11 +123,12 @@ Total: 6537.000000
   1.44    111.00    94.00     0.00    17.00       31  Array#each-1
 ============================================================================
 
- #TODO Find correct terminology for how to describe what this is exactly profiling as in are there really 2203 array objects. 
+
+ #TODO Find correct terminology for how to describe what this is exactly profiling as in are there really 2203 array objects or 2203 pointers to array objects?. 
 
 === Graph Files ===
 
-While the information gleamed from flat files is very useful we still don't know which processes each method is calling. We only know how many. This is not true for a graph file. Below is a text representation of a graph file. The actual graph file is an html entity and an example of which can be found link:Examples/graph.html[Here] 
+While the information gleamed from flat files is very useful we still don't know which processes each method is calling. We only know how many. This is not true for a graph file. Below is a text representation of a graph file. The actual graph file is an html entity and an example of which can be found link:examples/graph.html[Here] 
 
 #TODO (Handily the graph file has links both between it many processes and to the files that actually contain them for debugging. 
  )
@@ -142,7 +142,6 @@ Thread ID: 21277412
 100.00%   0.00%      8.77      0.00      8.77                   1     #toplevel*
                      8.77      0.00      8.77                 1/1     Object#run_primes
 /____________________________________________________________________________/
-
                      8.77      0.00      8.77                 1/1     #toplevel
 100.00%   0.00%      8.77      0.00      8.77                   1     Object#run_primes*
                      0.02      0.00      0.02                 1/1     Object#make_random_array
@@ -166,11 +165,11 @@ It's pointless trying to represent a tree file textually so here's a few pretty
 
 .KCachegrind Graph
 [caption="KCachegrind graph"] 
-image:Images/KGraph.png[Graph created by KCachegrind] 
+image:images/kgraph.png[Graph created by KCachegrind] 
 
 .KCachegrind List
 [caption="KCachegrind List"] 
-image:Images/KList.png[List created by KCachegrind]
+image:images/klist.png[List created by KCachegrind]
 
 #TODO Add a bit more information to this.