From 7c0c1c3e559aa3199b828bfbdceafc500231a9b2 Mon Sep 17 00:00:00 2001 From: Kris Jordan Date: Mon, 9 Jul 2012 13:04:05 -0400 Subject: [PATCH] Updated information and link regarding traits. This commit is via github.com/wilmoore - Removed information that alluded to (traits === mixins) -- this is misleading. - Changed link to PHP manual so mirros can be chosen on the fly. --- _includes/language-highlights.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/language-highlights.md b/_includes/language-highlights.md index 5f7c7d1..9bcef03 100644 --- a/_includes/language-highlights.md +++ b/_includes/language-highlights.md @@ -2,12 +2,12 @@ ## Programming Paradigms -PHP is a flexible, dynamic language that supports a variety of programming techniques. It has evolved dramatically over the years, notably adding a solid object-oriented model in PHP 5.0 (2004), anonymous functions and namespaces in PHP 5.3 (2009), and traits (or mixins) in PHP 5.4 (2012). +PHP is a flexible, dynamic language that supports a variety of programming techniques. It has evolved dramatically over the years, notably adding a solid object-oriented model in PHP 5.0 (2004), anonymous functions and namespaces in PHP 5.3 (2009), and traits in PHP 5.4 (2012). ### Object-oriented Programming * [Read about Object-oriented PHP][oop] -* [Read about Traits (also known as Mixins)][traits] +* [Read about Traits][traits] ### Functional Programming @@ -83,7 +83,7 @@ Starting with PHP 5.4, you can develop locally on a PHP-enabled web server witho [anonymous-functions]: http://www.php.net/manual/en/functions.anonymous.php [magic-methods]: http://php.net/manual/en/language.oop5.magic.php [reflection]: http://www.php.net/manual/en/intro.reflection.php -[traits]: http://www.php.net/manual/en/language.traits.php +[traits]: http://www.php.net/traits [call-user-func-array]: http://php.net/manual/en/function.call-user-func-array.php [phpinfo]: http://php.net/manual/en/function.phpinfo.php