Update 01.markmin
Update 01.markmin
Update 01.markmin

correções ortográficas
Update 01.markmin
Update 01.markmin
Update 01.markmin
Update 01.markmin

por que web2py?
Update 01.markmin

Segurança
Update pt-br.py
Fixed typos in Section 1.7 in Chapter 4 and 13 descriptions.
typo in static asset management patch, thanks Niphlod
Merge pull request #63 from rumz/master

Fix 2 Typos in Chapter 1
Merge branch 'master' of https://github.com/AllanMatheus/web2py-book into AllanMatheus-master

Conflicts:
	languages/pt-br.py
fixed typo and unbalanced parantheses in ch 06 example about update_or_insert with criteria
Explain the use of links to display virtual fields in grids
Fewer words required for the ti[ps on showing virtual fields in a grid
Merge pull request #66 from timrichardson/upstream

fixed typo and unbalanced parantheses in ch 06 example about update_or_i...
Merge remote-tracking branch 'upstream/master'
Merge pull request #67 from timrichardson/virtual_fields_grid

show Virtual fields in grids
Merge remote-tracking branch 'upstream/master'