RubyGems - chef - Versions diffs - 12.12.15 → 12.13.30 - Mend

chef 12.12.15 → 12.13.30

Files changed (410) hide show

checksums.yaml +4 -4
data/Gemfile +5 -0
data/LICENSE +201 -201
data/VERSION +1 -1
data/acceptance/.gitignore +2 -0
data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +1 -12
data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +29 -12
data/acceptance/Gemfile +6 -3
data/acceptance/Gemfile.lock +109 -67
data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +2 -2
data/acceptance/trivial/.kitchen.yml +1 -1
data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -1
data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -1
data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -1
data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +4 -4
data/bin/chef-apply +0 -0
data/bin/chef-client +0 -0
data/bin/chef-shell +0 -0
data/bin/chef-solo +0 -0
data/bin/knife +0 -0
data/chef.gemspec +4 -3
data/distro/common/html/_sources/ctl_chef_client.txt +35 -35
data/distro/common/html/_sources/ctl_chef_server.txt +341 -341
data/distro/common/html/_sources/ctl_chef_shell.txt +15 -15
data/distro/common/html/_sources/ctl_chef_solo.txt +25 -25
data/distro/common/html/_sources/index.txt +135 -135
data/distro/common/html/_sources/knife.txt +74 -74
data/distro/common/html/_sources/knife_bootstrap.txt +56 -56
data/distro/common/html/_sources/knife_client.txt +150 -150
data/distro/common/html/_sources/knife_common_options.txt +6 -6
data/distro/common/html/_sources/knife_configure.txt +29 -29
data/distro/common/html/_sources/knife_cookbook.txt +236 -236
data/distro/common/html/_sources/knife_cookbook_site.txt +157 -157
data/distro/common/html/_sources/knife_data_bag.txt +159 -159
data/distro/common/html/_sources/knife_delete.txt +26 -26
data/distro/common/html/_sources/knife_deps.txt +61 -61
data/distro/common/html/_sources/knife_diff.txt +34 -34
data/distro/common/html/_sources/knife_download.txt +44 -44
data/distro/common/html/_sources/knife_edit.txt +26 -26
data/distro/common/html/_sources/knife_environment.txt +158 -158
data/distro/common/html/_sources/knife_exec.txt +47 -47
data/distro/common/html/_sources/knife_index_rebuild.txt +20 -20
data/distro/common/html/_sources/knife_list.txt +33 -33
data/distro/common/html/_sources/knife_node.txt +250 -250
data/distro/common/html/_sources/knife_raw.txt +35 -35
data/distro/common/html/_sources/knife_recipe_list.txt +23 -23
data/distro/common/html/_sources/knife_role.txt +157 -157
data/distro/common/html/_sources/knife_search.txt +53 -53
data/distro/common/html/_sources/knife_serve.txt +18 -18
data/distro/common/html/_sources/knife_show.txt +26 -26
data/distro/common/html/_sources/knife_ssh.txt +43 -43
data/distro/common/html/_sources/knife_ssl_check.txt +41 -41
data/distro/common/html/_sources/knife_ssl_fetch.txt +41 -41
data/distro/common/html/_sources/knife_status.txt +37 -37
data/distro/common/html/_sources/knife_tag.txt +69 -69
data/distro/common/html/_sources/knife_upload.txt +49 -49
data/distro/common/html/_sources/knife_user.txt +127 -127
data/distro/common/html/_sources/knife_using.txt +43 -43
data/distro/common/html/_sources/knife_xargs.txt +30 -30
data/distro/common/html/_static/guide.css +504 -504
data/distro/common/html/_static/pygments.css +61 -61
data/distro/common/html/_static/underscore.js +31 -31
data/distro/common/html/ctl_chef_client.html +269 -269
data/distro/common/html/ctl_chef_server.html +727 -727
data/distro/common/html/ctl_chef_shell.html +162 -162
data/distro/common/html/ctl_chef_solo.html +193 -193
data/distro/common/html/index.html +201 -201
data/distro/common/html/knife.html +169 -169
data/distro/common/html/knife_bootstrap.html +284 -284
data/distro/common/html/knife_client.html +284 -284
data/distro/common/html/knife_common_options.html +95 -95
data/distro/common/html/knife_configure.html +104 -104
data/distro/common/html/knife_cookbook.html +486 -486
data/distro/common/html/knife_data_bag.html +373 -373
data/distro/common/html/knife_delete.html +92 -92
data/distro/common/html/knife_deps.html +142 -142
data/distro/common/html/knife_diff.html +122 -122
data/distro/common/html/knife_download.html +144 -144
data/distro/common/html/knife_edit.html +88 -88
data/distro/common/html/knife_environment.html +325 -325
data/distro/common/html/knife_exec.html +219 -219
data/distro/common/html/knife_index_rebuild.html +82 -82
data/distro/common/html/knife_list.html +113 -113
data/distro/common/html/knife_node.html +457 -457
data/distro/common/html/knife_raw.html +109 -109
data/distro/common/html/knife_recipe_list.html +90 -90
data/distro/common/html/knife_role.html +294 -294
data/distro/common/html/knife_search.html +202 -202
data/distro/common/html/knife_serve.html +78 -78
data/distro/common/html/knife_show.html +103 -103
data/distro/common/html/knife_ssh.html +176 -176
data/distro/common/html/knife_ssl_check.html +150 -150
data/distro/common/html/knife_ssl_fetch.html +150 -150
data/distro/common/html/knife_status.html +143 -143
data/distro/common/html/knife_tag.html +137 -137
data/distro/common/html/knife_upload.html +152 -152
data/distro/common/html/knife_user.html +241 -241
data/distro/common/html/knife_using.html +209 -209
data/distro/common/html/knife_xargs.html +121 -121
data/distro/common/html/search.html +81 -81
data/distro/common/man/man1/README.md +58 -58
data/distro/common/man/man1/chef-shell.1 +194 -194
data/distro/common/man/man1/knife-bootstrap.1 +215 -215
data/distro/common/man/man1/knife-client.1 +443 -443
data/distro/common/man/man1/knife-configure.1 +161 -161
data/distro/common/man/man1/knife-cookbook.1 +770 -770
data/distro/common/man/man1/knife-data-bag.1 +617 -617
data/distro/common/man/man1/knife-delete.1 +127 -127
data/distro/common/man/man1/knife-deps.1 +246 -246
data/distro/common/man/man1/knife-diff.1 +226 -226
data/distro/common/man/man1/knife-download.1 +258 -258
data/distro/common/man/man1/knife-edit.1 +121 -121
data/distro/common/man/man1/knife-environment.1 +508 -508
data/distro/common/man/man1/knife-exec.1 +362 -362
data/distro/common/man/man1/knife-index-rebuild.1 +63 -63
data/distro/common/man/man1/knife-list.1 +174 -174
data/distro/common/man/man1/knife-node.1 +716 -716
data/distro/common/man/man1/knife-raw.1 +172 -172
data/distro/common/man/man1/knife-recipe-list.1 +85 -85
data/distro/common/man/man1/knife-role.1 +426 -426
data/distro/common/man/man1/knife-search.1 +359 -359
data/distro/common/man/man1/knife-serve.1 +109 -109
data/distro/common/man/man1/knife-show.1 +160 -160
data/distro/common/man/man1/knife-ssh.1 +284 -284
data/distro/common/man/man1/knife-ssl-check.1 +207 -207
data/distro/common/man/man1/knife-ssl-fetch.1 +207 -207
data/distro/common/man/man1/knife-status.1 +234 -234
data/distro/common/man/man1/knife-tag.1 +189 -189
data/distro/common/man/man1/knife-upload.1 +280 -280
data/distro/common/man/man1/knife-user.1 +356 -356
data/distro/common/man/man1/knife-xargs.1 +189 -189
data/distro/common/man/man1/knife.1 +332 -332
data/distro/common/man/man8/chef-apply.8 +86 -86
data/distro/common/man/man8/chef-client.8 +398 -398
data/distro/common/man/man8/chef-solo.8 +260 -260
data/distro/common/markdown/README +3 -3
data/lib/chef/application.rb +23 -0
data/lib/chef/application/client.rb +10 -2
data/lib/chef/application/knife.rb +8 -0
data/lib/chef/application/solo.rb +10 -2
data/lib/chef/audit/audit_reporter.rb +5 -1
data/lib/chef/audit/runner.rb +1 -1
data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -0
data/lib/chef/chef_fs/file_system/repository/acls_dir.rb +4 -2
data/lib/chef/chef_fs/file_system/repository/base_file.rb +3 -0
data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -0
data/lib/chef/chef_fs/file_system/repository/directory.rb +12 -1
data/lib/chef/chef_fs/file_system_cache.rb +80 -0
data/lib/chef/data_collector.rb +18 -1
data/lib/chef/data_collector/resource_report.rb +1 -0
data/lib/chef/decorator/unchain.rb +16 -0
data/lib/chef/dsl/cheffish.rb +1 -0
data/lib/chef/dsl/declare_resource.rb +9 -1
data/lib/chef/file_access_control/windows.rb +3 -3
data/lib/chef/knife/bootstrap.rb +9 -0
data/lib/chef/knife/cookbook_site_install.rb +2 -11
data/lib/chef/knife/cookbook_site_share.rb +7 -13
data/lib/chef/knife/core/bootstrap_context.rb +10 -0
data/lib/chef/knife/help_topics.rb +4 -4
data/lib/chef/nil_argument.rb +3 -3
data/lib/chef/node/attribute.rb +2 -2
data/lib/chef/provider/apt_repository.rb +1 -1
data/lib/chef/provider/apt_update.rb +12 -3
data/lib/chef/provider/cron.rb +1 -1
data/lib/chef/provider/package/aix.rb +5 -1
data/lib/chef/provider/package/zypper.rb +7 -7
data/lib/chef/provider/resource_update.rb +52 -52
data/lib/chef/reserved_names.rb +9 -9
data/lib/chef/resource.rb +13 -1
data/lib/chef/resource/freebsd_package.rb +1 -1
data/lib/chef/run_context.rb +15 -42
data/lib/chef/sandbox.rb +20 -20
data/lib/chef/version.rb +1 -1
data/lib/chef/version_class.rb +7 -2
data/lib/chef/win32/file.rb +4 -4
data/lib/chef/win32/system.rb +0 -0
data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -5
data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -1
data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -13
data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -1
data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -13
data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -1
data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -11
data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -1
data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -13
data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -1
data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -13
data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -1
data/spec/data/apt/chef-integration-test2-1.0/debian/rules +0 -0
data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -22
data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -22
data/spec/data/apt/var/www/apt/conf/distributions +7 -7
data/spec/data/apt/var/www/apt/conf/incoming +4 -4
data/spec/data/apt/var/www/apt/conf/pulls +3 -3
data/spec/data/apt/var/www/apt/db/version +4 -4
data/spec/data/apt/var/www/apt/dists/sid/Release +19 -19
data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -16
data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -5
data/spec/data/bootstrap/encrypted_data_bag_secret +1 -1
data/spec/data/bootstrap/no_proxy.erb +2 -2
data/spec/data/bootstrap/secret.erb +9 -9
data/spec/data/bootstrap/test-hints.erb +12 -12
data/spec/data/bootstrap/test.erb +1 -1
data/spec/data/cb_version_cookbooks/tatft/README.rdoc +2 -2
data/spec/data/cb_version_cookbooks/tatft/attributes/default.rb +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 +1 -1
data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 +1 -1
data/spec/data/config.rb +6 -6
data/spec/data/cookbooks/angrybash/metadata.rb +2 -2
data/spec/data/cookbooks/angrybash/recipes/default.rb +8 -8
data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +2 -2
data/spec/data/cookbooks/apache2/metadata.rb +2 -2
data/spec/data/cookbooks/apache2/recipes/default.rb +2 -2
data/spec/data/cookbooks/borken/metadata.rb +2 -2
data/spec/data/cookbooks/borken/recipes/default.rb +1 -1
data/spec/data/cookbooks/borken/templates/default/borken.erb +1 -1
data/spec/data/cookbooks/chefignore +8 -8
data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -2
data/spec/data/cookbooks/ignorken/metadata.rb +2 -2
data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +1 -1
data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -2
data/spec/data/cookbooks/java/files/default/java.response +1 -1
data/spec/data/cookbooks/java/metadata.rb +2 -2
data/spec/data/cookbooks/name-mismatch-versionnumber/README.md +4 -4
data/spec/data/cookbooks/name-mismatch-versionnumber/metadata.rb +8 -8
data/spec/data/cookbooks/openldap/attributes/default.rb +16 -16
data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
data/spec/data/cookbooks/openldap/definitions/client.rb +5 -5
data/spec/data/cookbooks/openldap/definitions/server.rb +5 -5
data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -1
data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -1
data/spec/data/cookbooks/openldap/files/default/remotedir/not_a_template.erb +2 -2
data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt +2 -2
data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt +2 -2
data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -1
data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt +2 -2
data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt +2 -2
data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt +3 -3
data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -4
data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -3
data/spec/data/cookbooks/openldap/metadata.rb +8 -8
data/spec/data/cookbooks/openldap/recipes/default.rb +4 -4
data/spec/data/cookbooks/openldap/recipes/gigantor.rb +3 -3
data/spec/data/cookbooks/openldap/recipes/one.rb +15 -15
data/spec/data/cookbooks/openldap/recipes/return.rb +2 -2
data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -1
data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -1
data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -4
data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb +1 -1
data/spec/data/cookbooks/openldap/templates/default/test.erb +1 -1
data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -1
data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -4
data/spec/data/cookbooks/preseed/metadata.rb +2 -2
data/spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed +1 -1
data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -1
data/spec/data/definitions/test.rb +4 -4
data/spec/data/environment-config.rb +4 -4
data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -127
data/spec/data/fileedit/hosts +4 -4
data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/README.md +4 -4
data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/metadata.rb +13 -13
data/spec/data/invalid-metadata-chef-repo/invalid-metadata/README.md +4 -4
data/spec/data/kitchen/chefignore +6 -6
data/spec/data/kitchen/openldap/attributes/default.rb +3 -3
data/spec/data/kitchen/openldap/attributes/robinson.rb +2 -2
data/spec/data/kitchen/openldap/definitions/client.rb +3 -3
data/spec/data/kitchen/openldap/definitions/drewbarrymore.rb +2 -2
data/spec/data/kitchen/openldap/recipes/gigantor.rb +2 -2
data/spec/data/kitchen/openldap/recipes/ignoreme.rb +2 -2
data/spec/data/kitchen/openldap/recipes/woot.rb +3 -3
data/spec/data/knife_subcommand/test_explicit_category.rb +6 -6
data/spec/data/knife_subcommand/test_name_mapping.rb +4 -4
data/spec/data/knife_subcommand/test_yourself.rb +21 -21
data/spec/data/lwrp/providers/inline_compiler.rb +26 -26
data/spec/data/lwrp/providers/monkey_name_printer.rb +5 -5
data/spec/data/lwrp/providers/paint_drying_watcher.rb +7 -7
data/spec/data/lwrp/providers/thumb_twiddler.rb +7 -7
data/spec/data/lwrp/resources/foo.rb +4 -4
data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +1 -1
data/spec/data/lwrp_override/providers/buck_passer.rb +5 -5
data/spec/data/mac_users/10.7-8.plist.xml +559 -559
data/spec/data/mac_users/10.7-8.shadow.xml +11 -11
data/spec/data/mac_users/10.7.plist.xml +559 -559
data/spec/data/mac_users/10.7.shadow.xml +11 -11
data/spec/data/mac_users/10.8.plist.xml +559 -559
data/spec/data/mac_users/10.8.shadow.xml +21 -21
data/spec/data/mac_users/10.9.plist.xml +560 -560
data/spec/data/mac_users/10.9.shadow.xml +21 -21
data/spec/data/metadata/quick_start/metadata.rb +19 -19
data/spec/data/nodes/default.rb +15 -15
data/spec/data/nodes/test.example.com.rb +17 -17
data/spec/data/nodes/test.rb +15 -15
data/spec/data/null_config.rb +1 -1
data/spec/data/object_loader/environments/test.json +7 -7
data/spec/data/object_loader/environments/test.rb +2 -2
data/spec/data/object_loader/environments/test_json_class.json +8 -8
data/spec/data/object_loader/nodes/test.json +7 -7
data/spec/data/object_loader/nodes/test.rb +2 -2
data/spec/data/object_loader/nodes/test_json_class.json +8 -8
data/spec/data/object_loader/roles/test.json +7 -7
data/spec/data/object_loader/roles/test.rb +2 -2
data/spec/data/object_loader/roles/test_json_class.json +8 -8
data/spec/data/partial_one.erb +1 -1
data/spec/data/recipes/test.rb +7 -7
data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -1
data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -2
data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -2
data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -1
data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -2
data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -2
data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -1
data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -2
data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -1
data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -2
data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -1
data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -2
data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -2
data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -3
data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -1
data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
data/spec/data/run_context/cookbooks/test/definitions/new_animals.rb +9 -9
data/spec/data/run_context/cookbooks/test/definitions/new_cat.rb +5 -5
data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -1
data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -1
data/spec/data/run_context/cookbooks/test/recipes/default.rb +5 -5
data/spec/data/run_context/cookbooks/test/recipes/one.rb +7 -7
data/spec/data/run_context/cookbooks/test/recipes/two.rb +7 -7
data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -1
data/spec/data/run_context/nodes/run_context.rb +5 -5
data/spec/data/search_queries_to_transform.txt +98 -98
data/spec/data/shef-config.rb +10 -10
data/spec/data/ssl/5e707473.0 +18 -18
data/spec/data/ssl/chef-rspec.cert +27 -27
data/spec/data/ssl/chef-rspec.key +27 -27
data/spec/data/ssl/key.pem +15 -15
data/spec/data/ssl/private_key.pem +27 -27
data/spec/data/ssl/private_key_with_whitespace.pem +32 -32
data/spec/data/standalone_cookbook/chefignore +9 -9
data/spec/data/standalone_cookbook/recipes/default.rb +2 -2
data/spec/data/trusted_certs/example.crt +22 -22
data/spec/data/trusted_certs/intermediate.pem +27 -27
data/spec/data/trusted_certs/root.pem +22 -22
data/spec/functional/assets/chefinittest +34 -34
data/spec/functional/assets/testchefsubsys +10 -10
data/spec/functional/mixin/powershell_out_spec.rb +2 -2
data/spec/functional/provider/remote_file/cache_control_data_spec.rb +0 -0
data/spec/functional/resource/aix_service_spec.rb +0 -0
data/spec/functional/resource/aixinit_service_spec.rb +0 -0
data/spec/functional/resource/cron_spec.rb +8 -1
data/spec/functional/resource/env_spec.rb +0 -0
data/spec/functional/resource/link_spec.rb +1 -6
data/spec/functional/run_lock_spec.rb +17 -10
data/spec/integration/knife/diff_spec.rb +2 -2
data/spec/integration/knife/download_spec.rb +4 -4
data/spec/integration/knife/raw_spec.rb +2 -0
data/spec/integration/knife/upload_spec.rb +3 -3
data/spec/rcov.opts +2 -2
data/spec/spec_helper.rb +11 -1
data/spec/support/shared/integration/knife_support.rb +4 -0
data/spec/unit/application/client_spec.rb +35 -0
data/spec/unit/application/solo_spec.rb +6 -6
data/spec/unit/chef_fs/file_system/repository/directory_spec.rb +1 -0
data/spec/unit/data_collector_spec.rb +41 -1
data/spec/unit/dsl/declare_resource_spec.rb +30 -0
data/spec/unit/knife/cookbook_site_install_spec.rb +2 -0
data/spec/unit/knife/cookbook_site_share_spec.rb +4 -4
data/spec/unit/node_spec.rb +6 -0
data/spec/unit/provider/cron_spec.rb +16 -16
data/spec/unit/provider/package/aix_spec.rb +13 -0
data/spec/unit/provider/package/zypper_spec.rb +18 -2
data/spec/unit/resource/apt_repository_spec.rb +14 -2
data/spec/unit/resource/apt_update_spec.rb +14 -2
data/spec/unit/resource_builder_spec.rb +1 -1
data/tasks/bin/bundle-platform +0 -0
data/tasks/bin/bundle-platform.bat +0 -0
data/tasks/bin/create-override-gemfile +0 -0
data/tasks/bin/run_external_test +0 -0
data/tasks/bundle.rb +2 -2
metadata +29 -15
data/acceptance/data-collector/Berksfile.lock +0 -6

data/distro/common/html/knife_upload.html CHANGED

@@ -1,153 +1,153 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>knife upload &mdash; chef-client Man Pages</title>
-    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-  </head>
-  <body>
-<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
-<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
-</div>
-    <div class="document">
-      <div class="documentwrapper">
-          <div class="body">
-  <div class="section" id="knife-upload">
-<h1>knife upload<a class="headerlink" href="#knife-upload" title="Permalink to this headline">¶</a></h1>
-<p>The <strong>knife upload</strong> subcommand is used to upload roles, cookbooks, environments, and data bags to the Chef server from the current working directory in the chef-repo. This subcommand is often used in conjunction with <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">diff</span></tt>, which can be used to see exactly what changes will be uploaded, and then <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt>, which does the opposite of <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt>.</p>
-<div class="section" id="syntax">
-<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
-<p>This subcommand has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="options">
-<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
-</div>
-<p>This subcommand has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
-<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
-<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
-<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]diff</span></tt></dt>
-<dd>Use to upload only new and modified files. Set to <tt class="docutils literal"><span class="pre">false</span></tt> to upload all files. Default: <tt class="docutils literal"><span class="pre">true</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]force</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--force</span></tt> to upload roles, cookbooks, etc. even if the file in the directory is identical (by default, no <tt class="docutils literal"><span class="pre">POST</span></tt> or <tt class="docutils literal"><span class="pre">PUT</span></tt> is performed unless an actual change would be made). Default: <tt class="docutils literal"><span class="pre">--no-force</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]freeze</span></tt></dt>
-<dd>Use to require changes to a cookbook be included as a new version. Only the <tt class="docutils literal"><span class="pre">--force</span></tt> option can override this setting. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">-n</span></tt>, <tt class="docutils literal"><span class="pre">--dry-run</span></tt></dt>
-<dd>Use to take no action and only print out results. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]purge</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--purge</span></tt> to delete roles, cookbooks, etc. from the Chef server if their corresponding files do not exist in the chef-repo. By default, such objects are left alone and NOT purged. Default: <tt class="docutils literal"><span class="pre">--no-purge</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]recurse</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable uploading a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
-<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
-</dl>
-</div>
-<div class="section" id="examples">
-<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Upload the entire chef-repo</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /
-</pre></div>
-</div>
-<p><strong>Upload the /cookbooks directory</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload cookbooks
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /cookbooks
-</pre></div>
-</div>
-<p><strong>Upload the /environments directory</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload environments
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /environments
-</pre></div>
-</div>
-<p><strong>Upload a single environment</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload environments/production.json
-</pre></div>
-</div>
-<p>or from the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload production.json
-</pre></div>
-</div>
-<p><strong>Upload the /roles directory</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload roles
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /roles
-</pre></div>
-</div>
-<p><strong>Upload cookbooks and roles</strong></p>
-<p>Browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload cookbooks/apache<span class="se">\*</span> roles/webserver.json
-</pre></div>
-</div>
-<p><strong>Use output of knife deps to pass command to knife upload</strong></p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload <span class="sb">`</span>knife deps nodes/*.json<span class="sb">`</span>
-</pre></div>
-</div>
-</div>
-</div>
-          </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>knife upload &mdash; chef-client Man Pages</title>
+    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    './',
+        VERSION:     '',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="_static/jquery.js"></script>
+    <script type="text/javascript" src="_static/underscore.js"></script>
+    <script type="text/javascript" src="_static/doctools.js"></script>
+  </head>
+  <body>
+<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
+<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
+</div>
+    <div class="document">
+      <div class="documentwrapper">
+          <div class="body">
+  <div class="section" id="knife-upload">
+<h1>knife upload<a class="headerlink" href="#knife-upload" title="Permalink to this headline">¶</a></h1>
+<p>The <strong>knife upload</strong> subcommand is used to upload roles, cookbooks, environments, and data bags to the Chef server from the current working directory in the chef-repo. This subcommand is often used in conjunction with <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">diff</span></tt>, which can be used to see exactly what changes will be uploaded, and then <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt>, which does the opposite of <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt>.</p>
+<div class="section" id="syntax">
+<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
+<p>This subcommand has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="options">
+<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
+</div>
+<p>This subcommand has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
+<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
+<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
+<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]diff</span></tt></dt>
+<dd>Use to upload only new and modified files. Set to <tt class="docutils literal"><span class="pre">false</span></tt> to upload all files. Default: <tt class="docutils literal"><span class="pre">true</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]force</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--force</span></tt> to upload roles, cookbooks, etc. even if the file in the directory is identical (by default, no <tt class="docutils literal"><span class="pre">POST</span></tt> or <tt class="docutils literal"><span class="pre">PUT</span></tt> is performed unless an actual change would be made). Default: <tt class="docutils literal"><span class="pre">--no-force</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]freeze</span></tt></dt>
+<dd>Use to require changes to a cookbook be included as a new version. Only the <tt class="docutils literal"><span class="pre">--force</span></tt> option can override this setting. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">-n</span></tt>, <tt class="docutils literal"><span class="pre">--dry-run</span></tt></dt>
+<dd>Use to take no action and only print out results. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]purge</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--purge</span></tt> to delete roles, cookbooks, etc. from the Chef server if their corresponding files do not exist in the chef-repo. By default, such objects are left alone and NOT purged. Default: <tt class="docutils literal"><span class="pre">--no-purge</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]recurse</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable uploading a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
+<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
+</dl>
+</div>
+<div class="section" id="examples">
+<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Upload the entire chef-repo</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /
+</pre></div>
+</div>
+<p><strong>Upload the /cookbooks directory</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload cookbooks
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /cookbooks
+</pre></div>
+</div>
+<p><strong>Upload the /environments directory</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload environments
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /environments
+</pre></div>
+</div>
+<p><strong>Upload a single environment</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload environments/production.json
+</pre></div>
+</div>
+<p>or from the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload production.json
+</pre></div>
+</div>
+<p><strong>Upload the /roles directory</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload roles
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload /roles
+</pre></div>
+</div>
+<p><strong>Upload cookbooks and roles</strong></p>
+<p>Browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload cookbooks/apache<span class="se">\*</span> roles/webserver.json
+</pre></div>
+</div>
+<p><strong>Use output of knife deps to pass command to knife upload</strong></p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife upload <span class="sb">`</span>knife deps nodes/*.json<span class="sb">`</span>
+</pre></div>
+</div>
+</div>
+</div>
+          </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+  </body>
 </html>

data/distro/common/html/knife_user.html CHANGED

@@ -1,242 +1,242 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>knife user &mdash; chef-client Man Pages</title>
-    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-  </head>
-  <body>
-<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
-<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
-</div>
-    <div class="document">
-      <div class="documentwrapper">
-          <div class="body">
-  <div class="section" id="knife-user">
-<h1>knife user<a class="headerlink" href="#knife-user" title="Permalink to this headline">¶</a></h1>
-<p>The <strong>knife user</strong> subcommand is used to manage the list of users and their associated RSA public key-pairs.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">This subcommand ONLY works when run against the open source Chef server and will not run against Enterprise Chef (including hosted Enterprise Chef), or Private Chef.</p>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
-</div>
-<div class="section" id="create">
-<h2>create<a class="headerlink" href="#create" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">create</span></tt> argument is used to create a user. This process will generate an RSA key pair for the named user. The public key will be stored on the Chef server and the private key will be displayed on <tt class="docutils literal"><span class="pre">STDOUT</span></tt> or written to a named file.</p>
-<ul class="simple">
-<li>For the user, the private key should be copied to the system as <tt class="docutils literal"><span class="pre">/etc/chef/client.pem</span></tt>.</li>
-<li>For knife, the private key is typically copied to <tt class="docutils literal"><span class="pre">~/.chef/client_name.pem</span></tt> and referenced in the knife.rb configuration file.</li>
-</ul>
-<div class="section" id="syntax">
-<h3>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user create USER_NAME <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="options">
-<h3>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">-a</span></tt>, <tt class="docutils literal"><span class="pre">--admin</span></tt></dt>
-<dd>Use to create a client as an admin client. This is required for any user to access Open Source Chef as an administrator. This option only works when used with the open source Chef server and will have no effect when used with Enterprise Chef.</dd>
-<dt><tt class="docutils literal"><span class="pre">-f</span> <span class="pre">FILE_NAME</span></tt>, <tt class="docutils literal"><span class="pre">--file</span> <span class="pre">FILE_NAME</span></tt></dt>
-<dd>Use to save a private key to the specified file name.</dd>
-<dt><tt class="docutils literal"><span class="pre">-p</span> <span class="pre">PASSWORD</span></tt>, <tt class="docutils literal"><span class="pre">--password</span> <span class="pre">PASSWORD</span></tt></dt>
-<dd>The user password.</dd>
-<dt><tt class="docutils literal"><span class="pre">--user-key</span> <span class="pre">FILE_NAME</span></tt></dt>
-<dd>All users are assigned a public key. Use to write the public key to a file.</dd>
-</dl>
-</div>
-<div class="section" id="examples">
-<h3>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h3>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Create a user</strong></p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user create <span class="s2">&quot;Radio Birdman&quot;</span> -f /keys/user_name
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="delete">
-<h2>delete<a class="headerlink" href="#delete" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">delete</span></tt> argument is used to delete a registered user.</p>
-<div class="section" id="id1">
-<h3>Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user delete USER_NAME
-</pre></div>
-</div>
-</div>
-<div class="section" id="id2">
-<h3>Options<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
-<p>This command does not have any specific options.</p>
-</div>
-<div class="section" id="id3">
-<h3>Examples<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Delete a user</strong></p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user delete <span class="s2">&quot;Steve Danno&quot;</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="edit">
-<h2>edit<a class="headerlink" href="#edit" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">edit</span></tt> argument is used to edit the details of a user. When this argument is run, knife will open $EDITOR. When finished, knife will update the Chef server with those changes.</p>
-<div class="section" id="id4">
-<h3>Syntax<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user edit USER_NAME
-</pre></div>
-</div>
-</div>
-<div class="section" id="id5">
-<h3>Options<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
-<p>This command does not have any specific options.</p>
-</div>
-<div class="section" id="id6">
-<h3>Examples<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
-<p>None.</p>
-</div>
-</div>
-<div class="section" id="list">
-<h2>list<a class="headerlink" href="#list" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">list</span></tt> argument is used to view a list of registered users.</p>
-<div class="section" id="id7">
-<h3>Syntax<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user list <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="id8">
-<h3>Options<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">-w</span></tt>, <tt class="docutils literal"><span class="pre">--with-uri</span></tt></dt>
-<dd>Use to show the corresponding URIs.</dd>
-</dl>
-</div>
-<div class="section" id="id9">
-<h3>Examples<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
-<p>None.</p>
-</div>
-</div>
-<div class="section" id="reregister">
-<h2>reregister<a class="headerlink" href="#reregister" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">reregister</span></tt> argument is used to regenerate an RSA key pair for a user. The public key will be stored on the Chef server and the private key will be displayed on <tt class="docutils literal"><span class="pre">STDOUT</span></tt> or written to a named file.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Running this argument will invalidate the previous RSA key pair, making it unusable during authentication to the Chef server.</p>
-</div>
-<div class="section" id="id10">
-<h3>Syntax<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user reregister USER_NAME <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="id11">
-<h3>Options<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">-f</span> <span class="pre">FILE_NAME</span></tt>, <tt class="docutils literal"><span class="pre">--file</span> <span class="pre">FILE_NAME</span></tt></dt>
-<dd>Use to save a private key to the specified file name.</dd>
-</dl>
-</div>
-<div class="section" id="id12">
-<h3>Examples<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Regenerate the RSA key-pair</strong></p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user reregister <span class="s2">&quot;Robert Younger&quot;</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="show">
-<h2>show<a class="headerlink" href="#show" title="Permalink to this headline">¶</a></h2>
-<p>The <tt class="docutils literal"><span class="pre">show</span></tt> argument is used to show the details of a user.</p>
-<div class="section" id="id13">
-<h3>Syntax<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show USER_NAME <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="id14">
-<h3>Options<a class="headerlink" href="#id14" title="Permalink to this headline">¶</a></h3>
-<p>This argument has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">-a</span> <span class="pre">ATTR</span></tt>, <tt class="docutils literal"><span class="pre">--attribute</span> <span class="pre">ATTR</span></tt></dt>
-<dd>The attribute (or attributes) to show.</dd>
-</dl>
-</div>
-<div class="section" id="id15">
-<h3>Examples<a class="headerlink" href="#id15" title="Permalink to this headline">¶</a></h3>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Show user data</strong></p>
-<p>To view a user named <tt class="docutils literal"><span class="pre">Dennis</span> <span class="pre">Teck</span></tt>, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show <span class="s2">&quot;Dennis Teck&quot;</span>
-</pre></div>
-</div>
-<p>to return something like:</p>
-<div class="highlight-bash"><div class="highlight"><pre>chef_type:   user
-json_class:  Chef::User
-name:        Dennis Teck
-public_key:
-</pre></div>
-</div>
-<p><strong>Show user data as JSON</strong></p>
-<p>To view information in JSON format, use the <tt class="docutils literal"><span class="pre">-F</span></tt> common option as part of the command like this:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show <span class="s2">&quot;Dennis Teck&quot;</span> -F json
-</pre></div>
-</div>
-<p>(Other formats available include <tt class="docutils literal"><span class="pre">text</span></tt>, <tt class="docutils literal"><span class="pre">yaml</span></tt>, and <tt class="docutils literal"><span class="pre">pp</span></tt>, e.g. <tt class="docutils literal"><span class="pre">-F</span> <span class="pre">yaml</span></tt> for YAML.)</p>
-</div>
-</div>
-</div>
-          </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>knife user &mdash; chef-client Man Pages</title>
+    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    './',
+        VERSION:     '',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="_static/jquery.js"></script>
+    <script type="text/javascript" src="_static/underscore.js"></script>
+    <script type="text/javascript" src="_static/doctools.js"></script>
+  </head>
+  <body>
+<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
+<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
+</div>
+    <div class="document">
+      <div class="documentwrapper">
+          <div class="body">
+  <div class="section" id="knife-user">
+<h1>knife user<a class="headerlink" href="#knife-user" title="Permalink to this headline">¶</a></h1>
+<p>The <strong>knife user</strong> subcommand is used to manage the list of users and their associated RSA public key-pairs.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This subcommand ONLY works when run against the open source Chef server and will not run against Enterprise Chef (including hosted Enterprise Chef), or Private Chef.</p>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
+</div>
+<div class="section" id="create">
+<h2>create<a class="headerlink" href="#create" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">create</span></tt> argument is used to create a user. This process will generate an RSA key pair for the named user. The public key will be stored on the Chef server and the private key will be displayed on <tt class="docutils literal"><span class="pre">STDOUT</span></tt> or written to a named file.</p>
+<ul class="simple">
+<li>For the user, the private key should be copied to the system as <tt class="docutils literal"><span class="pre">/etc/chef/client.pem</span></tt>.</li>
+<li>For knife, the private key is typically copied to <tt class="docutils literal"><span class="pre">~/.chef/client_name.pem</span></tt> and referenced in the knife.rb configuration file.</li>
+</ul>
+<div class="section" id="syntax">
+<h3>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user create USER_NAME <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="options">
+<h3>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">-a</span></tt>, <tt class="docutils literal"><span class="pre">--admin</span></tt></dt>
+<dd>Use to create a client as an admin client. This is required for any user to access Open Source Chef as an administrator. This option only works when used with the open source Chef server and will have no effect when used with Enterprise Chef.</dd>
+<dt><tt class="docutils literal"><span class="pre">-f</span> <span class="pre">FILE_NAME</span></tt>, <tt class="docutils literal"><span class="pre">--file</span> <span class="pre">FILE_NAME</span></tt></dt>
+<dd>Use to save a private key to the specified file name.</dd>
+<dt><tt class="docutils literal"><span class="pre">-p</span> <span class="pre">PASSWORD</span></tt>, <tt class="docutils literal"><span class="pre">--password</span> <span class="pre">PASSWORD</span></tt></dt>
+<dd>The user password.</dd>
+<dt><tt class="docutils literal"><span class="pre">--user-key</span> <span class="pre">FILE_NAME</span></tt></dt>
+<dd>All users are assigned a public key. Use to write the public key to a file.</dd>
+</dl>
+</div>
+<div class="section" id="examples">
+<h3>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h3>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Create a user</strong></p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user create <span class="s2">&quot;Radio Birdman&quot;</span> -f /keys/user_name
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="delete">
+<h2>delete<a class="headerlink" href="#delete" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">delete</span></tt> argument is used to delete a registered user.</p>
+<div class="section" id="id1">
+<h3>Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user delete USER_NAME
+</pre></div>
+</div>
+</div>
+<div class="section" id="id2">
+<h3>Options<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>This command does not have any specific options.</p>
+</div>
+<div class="section" id="id3">
+<h3>Examples<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Delete a user</strong></p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user delete <span class="s2">&quot;Steve Danno&quot;</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="edit">
+<h2>edit<a class="headerlink" href="#edit" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">edit</span></tt> argument is used to edit the details of a user. When this argument is run, knife will open $EDITOR. When finished, knife will update the Chef server with those changes.</p>
+<div class="section" id="id4">
+<h3>Syntax<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user edit USER_NAME
+</pre></div>
+</div>
+</div>
+<div class="section" id="id5">
+<h3>Options<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<p>This command does not have any specific options.</p>
+</div>
+<div class="section" id="id6">
+<h3>Examples<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<p>None.</p>
+</div>
+</div>
+<div class="section" id="list">
+<h2>list<a class="headerlink" href="#list" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">list</span></tt> argument is used to view a list of registered users.</p>
+<div class="section" id="id7">
+<h3>Syntax<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user list <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Options<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">-w</span></tt>, <tt class="docutils literal"><span class="pre">--with-uri</span></tt></dt>
+<dd>Use to show the corresponding URIs.</dd>
+</dl>
+</div>
+<div class="section" id="id9">
+<h3>Examples<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<p>None.</p>
+</div>
+</div>
+<div class="section" id="reregister">
+<h2>reregister<a class="headerlink" href="#reregister" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">reregister</span></tt> argument is used to regenerate an RSA key pair for a user. The public key will be stored on the Chef server and the private key will be displayed on <tt class="docutils literal"><span class="pre">STDOUT</span></tt> or written to a named file.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Running this argument will invalidate the previous RSA key pair, making it unusable during authentication to the Chef server.</p>
+</div>
+<div class="section" id="id10">
+<h3>Syntax<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user reregister USER_NAME <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id11">
+<h3>Options<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">-f</span> <span class="pre">FILE_NAME</span></tt>, <tt class="docutils literal"><span class="pre">--file</span> <span class="pre">FILE_NAME</span></tt></dt>
+<dd>Use to save a private key to the specified file name.</dd>
+</dl>
+</div>
+<div class="section" id="id12">
+<h3>Examples<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Regenerate the RSA key-pair</strong></p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user reregister <span class="s2">&quot;Robert Younger&quot;</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="show">
+<h2>show<a class="headerlink" href="#show" title="Permalink to this headline">¶</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">show</span></tt> argument is used to show the details of a user.</p>
+<div class="section" id="id13">
+<h3>Syntax<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show USER_NAME <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id14">
+<h3>Options<a class="headerlink" href="#id14" title="Permalink to this headline">¶</a></h3>
+<p>This argument has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">-a</span> <span class="pre">ATTR</span></tt>, <tt class="docutils literal"><span class="pre">--attribute</span> <span class="pre">ATTR</span></tt></dt>
+<dd>The attribute (or attributes) to show.</dd>
+</dl>
+</div>
+<div class="section" id="id15">
+<h3>Examples<a class="headerlink" href="#id15" title="Permalink to this headline">¶</a></h3>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Show user data</strong></p>
+<p>To view a user named <tt class="docutils literal"><span class="pre">Dennis</span> <span class="pre">Teck</span></tt>, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show <span class="s2">&quot;Dennis Teck&quot;</span>
+</pre></div>
+</div>
+<p>to return something like:</p>
+<div class="highlight-bash"><div class="highlight"><pre>chef_type:   user
+json_class:  Chef::User
+name:        Dennis Teck
+public_key:
+</pre></div>
+</div>
+<p><strong>Show user data as JSON</strong></p>
+<p>To view information in JSON format, use the <tt class="docutils literal"><span class="pre">-F</span></tt> common option as part of the command like this:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife user show <span class="s2">&quot;Dennis Teck&quot;</span> -F json
+</pre></div>
+</div>
+<p>(Other formats available include <tt class="docutils literal"><span class="pre">text</span></tt>, <tt class="docutils literal"><span class="pre">yaml</span></tt>, and <tt class="docutils literal"><span class="pre">pp</span></tt>, e.g. <tt class="docutils literal"><span class="pre">-F</span> <span class="pre">yaml</span></tt> for YAML.)</p>
+</div>
+</div>
+</div>
+          </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+  </body>
 </html>