Guide: For consistency, use 'infinity' everywhere
Merge pull request #284 from weiss/infinity-vs-unlimited

Guide: For consistency, use 'infinity' everywhere