updated doc and README file

README.md

@@ -4,9 +4,7 @@ Silex is a simple web framework to develop simple websites:
 
     require_once __DIR__.'/silex.phar';
 
-    use Silex\Application;
-
-    $app = new Application();
+    $app = new Silex\Application();
 
     $app->get('/hello/{name}', function($name) {
         return "Hello $name";
@@ -17,7 +15,7 @@ Silex is a simple web framework to develop simple websites:
     });
 
     $app->error(function($e) {
-        return "An error occured<br />" . $e->getMessage();
+        return "An error occured<br />".$e->getMessage();
     });
 
     $app->run();
@@ -43,8 +41,7 @@ You can build the `silex.phar` file by running `php compile`.
 
 ## More Information
 
-Read the documentation of Symfony2 for more information about how you can
-leverage Symfony2 features.
+Read the [documentation][5] for more information.
 
 ## Slides
 
@@ -55,6 +52,7 @@ leverage Symfony2 features.
 Silex is licensed under the MIT license.
 
 [1]: http://symfony.com
-[2]: http://github.com/fabpot/silex/blob/master/silex.phar
+[2]: http://silex-project.org/get/silex.phar
 [3]: https://github.com/sebastianbergmann/phpunit
 [4]: http://www.slideshare.net/IgorWiedler/silex-the-symfony2-microframework
+[5]: http://silex-project.org/documentation

doc/conf.py

@@ -4,7 +4,7 @@ from pygments.lexers.web import PhpLexer
 
 sys.path.append(os.path.abspath('_exts'))
 
-extensions = ['configurationblock']
+extensions = []
 master_doc = 'index'
 highlight_language = 'php'
 

doc/index.rst

@@ -10,3 +10,4 @@ Silex
     extensions
     internals
     contributing
+    extensions/index

doc/intro.rst

@@ -41,35 +41,7 @@ value is sent back to the client.
 
 Finally, the app is run. It's really that easy!
 
-Installation
-------------
-
-Installing Silex is as easy as it can get. Download the [`silex.phar`][2] file
+Installing Silex is as easy as it can get. Download the `silex.phar`_ file
 and you're done!
 
-License
--------
-
-Silex is licensed under the MIT license.
-
-.. code-block:: text
-
-    Copyright (c) 2010 Fabien Potencier
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is furnished
-    to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
+.. _silex.phar: http://silex-project.org/get/silex.phar