Remove fiveruns. And preamble->index

4 files changed, 2 insertions, 55 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index 8de7e24738..0837e71ceb 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -288,7 +288,7 @@ guides = [
   { 'activerecord' => 'finders' },
   { 'debugging' => 'debugging_rails_applications' },
   { 'caching' => 'caching_with_rails' },
-  { 'benchmarking_and_profiling' => 'preamble' },
+  { 'benchmarking_and_profiling' => 'index' },
   { 'actionview' => 'layouts_and_rendering' }
 ]
 
diff --git a/railties/doc/guides/benchmarking_and_profiling/appendix.txt b/railties/doc/guides/benchmarking_and_profiling/appendix.txt
index ce618603d4..8e2e383ff3 100644
--- a/railties/doc/guides/benchmarking_and_profiling/appendix.txt
+++ b/railties/doc/guides/benchmarking_and_profiling/appendix.txt
@@ -90,15 +90,6 @@ service both for when in development and when you put your application into prod
 
 #TODO more in-depth without being like an advertisement. 
 
-=== FiveRuns ===
-http://www.fiveruns.com/[http://www.fiveruns.com/]
-
-#TODO give a bit more detail
-
-==== TuneUp ====
-
-In their words "a new socially networked application profiling tool for Ruby on Rails developers. Designed for rapid application performance analysis in development, both privately or collaboratively with input from the community, FiveRuns TuneUp gives developers visibility into performance trouble spots and bottlenecks before they reach production."
-
 ==== Manage ====
 
 Like new relic a production monitoring tool. 
diff --git a/railties/doc/guides/benchmarking_and_profiling/preamble.txt b/railties/doc/guides/benchmarking_and_profiling/preamble.txt
deleted file mode 100644
index aa1b4e49c8..0000000000
--- a/railties/doc/guides/benchmarking_and_profiling/preamble.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Benchmarking and Profiling Rails
-================================
-Matthew Bergman <MzbPhoto@gmail.com>
-v0.6, September 2008
-
-Benchmarking and Profiling is an important part of the development process that is not nearly enough talked about for  beginning developers. Its hard enough learning a language and successfully writing an application. But without a firm understanding optimization, production ready apps are a near impossibility. No matter how well you code, or how much you know about a language there is always something that will trip up your application. 
-
-This article is my attempt to give the basic knowledge and methodology needed to optimize your application as painlessly as possible. We are are attempting this on two fronts. Both as a straight explanation and also through a real example of how benchmarking can speed up an application. 
-
-The main things that are covered are 
-
-* The basics of statistical analysis
-* Methodology behind benchmarking and profiling
-* Reading the log file for optimization
-* Performance Unit tests
-* Working with Ruby-Prof
-* HTTPREF #because you should know it
-* Overview of dedicated analysis options
-
-There are a lot of areas we need to cover so lets start. 
-
-
-include::definitions.txt[]
-
-include::basics.txt[]
-
-include::statistics.txt[]
-
-include::edge_rails_features.txt[]
-
-include::rubyprof.txt[]
-
-include::digging_deeper.txt[]
-
-include::gameplan.txt[]
-
-include::appendix.txt[]
-
-
-
- 
-
-
- 
diff --git a/railties/doc/guides/index.txt b/railties/doc/guides/index.txt
index 1e6d5665f8..dfbb3d2799 100644
--- a/railties/doc/guides/index.txt
+++ b/railties/doc/guides/index.txt
@@ -109,7 +109,7 @@ ways of achieving this and how to understand what is happening "behind the scene
 of your code.
 ***********************************************************
 
-.link:benchmarking_and_profiling/preamble.html[Benchmarking and Profiling Rails Applications]
+.link:benchmarking_and_profiling/index.html[Benchmarking and Profiling Rails Applications]
 ***********************************************************
 CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/4[Lighthouse Ticket]