Merge branch 'master' into survos

README.md

@@ -14,11 +14,11 @@ Propel has some nice features you should know about:
  - It provides command line tools for generating code (well documented with an IDE-friendly syntax);
  - It's very flexible: you can simply extend Propel;
  - It uses PDO (PHP Data Objects) so it allows you to use the RDBMS of your choice (MySQL, SQLite, PostgreSQL, Oracle and MSSQL are supported);
- - Propel is an open-source project which is [well documented](http://propelorm.org/documentation/).
+ - Propel is an open-source project which is [well documented](http://propelorm.org/Propel/documentation/).
 
 ## Installation ##
 
-Read the [Propel documentation](http://www.propelorm.org/).
+Read the [Propel documentation](http://propelorm.org/Propel/).
 
 
 ## License ##