edited timeouts second take

hej @joshk
fixed the missing commits and found the edited c- and cpp-docs!