sammazza on "child theme and function.php"

There seems to be a comfict between what it says here:
http://codex.wordpress.org/Child_Themes about how to add functionality in a child theme (it says create a function.php file in your child theme folder)

and what it says inside my theme's function.php
/*--------------------------------------------------------------------*/
/* You can add custom functions below */
/*--------------------------------------------------------------------*/
I am using wooThemes Mystile.

Which is the right way of doing things?
I am using WP 3.7.1 and the latest version of the theme.
Cheers