Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mahan Marwat
2015-10-03 22:07:08 +05:00
12 changed files with 37 additions and 15 deletions
+2 -2
View File
@@ -255,8 +255,8 @@ system. `Puppet Forge <https://forge.puppetlabs.com/>`_ is a repository for
modules written by the community for Open Source and Enterprise Puppet.
Puppet Agents are installed on nodes whose state needs to be monitored or
changed. A desginated server known as the Puppet Master is responsible for
orchastrating the agent nodes.
changed. A designated server known as the Puppet Master is responsible for
orchestrating the agent nodes.
Agent nodes send basic facts about the system such as to the operating system,
kernel, architecture, ip address, hostname etc. to the Puppet Master.
+1 -1
View File
@@ -15,7 +15,7 @@ and the mailing list https://groups.google.com/forum/#!forum/project-camelot
Cocoa
-----
.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
GTk
---