Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Orthography: Faces (capital F) --> faces

Rationale: Caps are for proper names; products have proper names, but features
don't. Yes, this is to a certain extent arbitrary.

I've added this rationale to the docs project style and usage guide.
  • Loading branch information...
commit e41e02d2e4790e92727bd887a37f200f06a0264d 1 parent 86cf278
authored June 19, 2012
2  source/guides/configuring.markdown
Source Rendered
@@ -112,7 +112,7 @@ The `[main]` config block is the least specific. Settings here are always effect
112 112
 
113 113
 #### `[agent]`, `[master]`, and `[user]` Blocks
114 114
 
115  
-These three blocks correspond to Puppet's run modes. Settings in `[agent]` will only be used by puppet agent; settings in `[master]` will be used by puppet master and puppet cert; and settings in `[user]` will only be used by puppet apply. The Faces subcommands introduced in Puppet 2.7 default to the `user` run mode, but their mode can be changed at run time with the `--mode` option. Note that not every setting makes sense for every run mode, but specifying a setting in a block where it is irrelevant has no observable effect.
  115
+These three blocks correspond to Puppet's run modes. Settings in `[agent]` will only be used by puppet agent; settings in `[master]` will be used by puppet master and puppet cert; and settings in `[user]` will only be used by puppet apply. The faces subcommands introduced in Puppet 2.7 default to the `user` run mode, but their mode can be changed at run time with the `--mode` option. Note that not every setting makes sense for every run mode, but specifying a setting in a block where it is irrelevant has no observable effect.
116 116
 
117 117
 ##### Notes on Puppet 0.25.5 and Older
118 118
 
2  source/pe/2.0/welcome_whats_new.markdown
Source Rendered
@@ -42,7 +42,7 @@ PE's web console is now served over SSL, and requires a login for access. This l
42 42
 Puppet Enterprise is now built around Puppet 2.7, which made several significant improvements and changes to the Puppet core:
43 43
 
44 44
 * Puppet can now manage network devices with the vlan, interface, and router resource types. 
45  
-* There's a new API for creating subcommands called Faces, and Puppet ships with prebuilt subcommands that expose core subsystems at the command line.
  45
+* There's a new API for creating subcommands called faces, and Puppet ships with prebuilt subcommands that expose core subsystems at the command line.
46 46
 * Error messages have been generally improved, including the infamous OpenSSL "Hostname was not match" error.
47 47
 * Service init scripts are now assumed to have status commands; use `hasstatus => false` to emulate the behavior from 2.6 and earlier.
48 48
 * Dynamically scoped variable lookup now causes warnings to be logged. If you're getting these warnings, you should begin [switching to fully qualified variable names and parameterized classes](/guides/scope_and_puppet.html) to eliminate dynamic scoping in your manifests.
14  style_and_usage.markdown
Source Rendered
@@ -69,6 +69,20 @@ and shortened ("Dashboard") forms. This is because Dashboard never gets executed
69 69
 by a user at the command line, and thus is only a product name and not an
70 70
 executable statement.
71 71
 
  72
+Other Capitalization Questions
  73
+------------------------------
  74
+
  75
+The basic rationale to use when capitalizing words is: is this a proper noun?
  76
+This turns out to be a squirrely question, but the judgement we went with
  77
+during the PE2 launch and have felt pretty okay about since is that PRODUCTS
  78
+are proper nouns, but FEATURES are not. That is, "live management" wouldn't be
  79
+capitalized, and neither would "faces" -- they aren't independent products. In
  80
+fact, we don't even capitalize the console.
  81
+
  82
+This was one of those tricky calls that we might revisit at some point, but
  83
+for the time being, I (NF) feel pretty good about erring on the side of not
  84
+looking like a bad fantasy novel.
  85
+
72 86
 Placeholder Text
73 87
 ----------------
74 88
 

0 notes on commit e41e02d

Please sign in to comment.
Something went wrong with that request. Please try again.