Skip to content

Commit

Permalink
Merge pull request #100 from hjwp/patch-1
Browse files Browse the repository at this point in the history
distinguish operators and functions
  • Loading branch information
olasitarska committed Aug 5, 2014
2 parents 7d685ba + 8967a8b commit abacdd6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion python_introduction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ OK, enough of strings. So far you've learned about:

- __the prompt__ - typing commands (code) into the Python prompt results in answers in Python
- __numbers and strings__ - in Python numbers are used for math and strings for text objects
- __functions__ - are actions in Python. You've used both English-language functions (upper(), len()) and symbolic ones (+, *).
- __operators__ - like + and *, combine values to produce a new one
- __functions__ - like upper() and len(), perform actions on objects.

These are the basics of every programming language you learn. Ready for something harder? We bet you are!

Expand Down

0 comments on commit abacdd6

Please sign in to comment.