Update troubleshooting guide with php.ini path workaround
Update troubleshooting guide with PHP memory_limit solution
Merge pull request #182 from deb-cfengine/tutorial_updater

Add tutorials.markdown and tutorials folder to 3.5
Update information about package version selection.

Related to issue #3314.
(cherry picked from commit d247b2afd50dec425d629b8cefa8796258702ea2)
Merge pull request #171 from awsiv/3.5.x

Update troubleshooting guide with PHP memory_limit
Merge pull request #186 from kacfengine/3.5

[3.5] Update information about package version selection.
Add details about mon.*_diskfree values
Indicate units, and clarify calculated values
(cherry picked from commit 5d02a09b94af68356f5e275bf9bce0e34b582d76)
Deprecate host_licenses_paid
This is not used as of CFEngine Enterprise 3.5
(cherry picked from commit d3a805d324893bc4f700c7a35f4eb595e9c94524)
Merge pull request #191 from deb-cfengine/cherrypick_Nick_updates

Cherrypick nick updates
Link from mode to rxdirs and visa versa

(cherry picked from commit 2f668a33ab09d80074111512ef7228a81decab42)
Cherry-picking: Adding new primer to Tutorials section; updates links
Removed white space in code block
(cherry picked from commit 1f940a1ed8ffbbbeefe48140234cb6e1bd3dea8d)

Conflicts:
	examples/tutorials/new-users.markdown
Merge pull request #201 from deb-cfengine/CP_erikprimer

Cherry-picking: Adding new primer to Tutorials section; updates links