clean up last section and code includes

Author: kwalrath

public/docs/_examples/dependency-injection/dart/lib/providers_component.dart

@@ -167,14 +167,18 @@ class ProviderComponent6b {
   }
 }
 
-// #docregion configurable-logger
+// #docregion opaque-token
 const loggerPrefix = const OpaqueToken('Logger prefix');
+// #enddocregion opaque-token
 
+// #docregion configurable-logger
 @Injectable()
 class ConfigurableLogger extends Logger {
   final String _prefix;
 
+// #docregion use-opaque-token
   ConfigurableLogger(@Inject(loggerPrefix) this._prefix);
+// #enddocregion use-opaque-token
 
   @override
   void log(String msg) {

public/docs/dart/latest/guide/dependency-injection.jade

@@ -160,6 +160,8 @@ code-example(format, language="html").
 +makeExample('dependency-injection/dart/lib/providers_component.dart','providers-1')
 +includeShared('{ts}', 'providers-provide-2')
 +makeExample('dependency-injection/dart/lib/providers_component.dart','providers-2')
+// includeShared('{ts}', 'providers-provide-3')
+// includeShared('{ts}', 'providers-provide-4-1')
 // Don't discuss provide function.
 :marked
   We supply two arguments to the `Provider` constructor.
@@ -254,22 +256,16 @@ code-example(format, language="html").
     every class implicitly defines an interface,
     so interface names are just class names.
 +includeShared('{ts}', 'tokens-non-class-deps-1')
-[PENDING: fix!!]
-+makeExample('dependency-injection/dart/lib/app_config.dart','config','lib/app_config.dart (excerpt)')(format='.')
 :marked
   We know we can register an object with a [value provider](#value-provider).
   But what do we use for the token?
 +includeShared('{ts}', 'tokens-opaque-1')
-+makeExample('dependency-injection/dart/lib/app_config.dart','token')(format='.')
++makeExample('dependency-injection/dart/lib/providers_component.dart','opaque-token')(format='.')
 +includeShared('{ts}', 'tokens-opaque-2')
-+makeExample('dependency-injection/dart/lib/providers_component.dart','providers-9')(format=".")
-+includeShared('{ts}', 'tokens-opaque-3')
-+makeExample('dependency-injection/dart/lib/app_component.dart','providers', 'lib/app_component.dart (providers)')(format=".")
-+makeExample('dependency-injection/dart/lib/app_component.dart','ctor', 'lib/app_component.dart (constructor)')(format=".")
-
++makeExample('dependency-injection/dart/lib/providers_component.dart','use-opaque-token')(format=".")
 :marked
   Here's an example of providing configuration information
-  for an injected class. First define the configurable class:
+  for an injected class. First define the class:
 +makeExample('dependency-injection/dart/lib/providers_component.dart','configurable-logger')(format=".")
 :marked
   Then inject that class and its configuration information:

public/docs/ts/latest/guide/dependency-injection.jade

@@ -752,17 +752,17 @@ code-example(format, language="html").
 - var lang = current.path[1]
 - var objectexamples = lang == 'dart' ? 'a string or list literal, or maybe a function' : 'a string, a function, or an object'
 // Is function injection useful? Should we show it?
-- var hashes = lang == 'dart' ? 'They might be maps like this one:' : 'They tend to be object hashes like this one:'
 :marked
   ### Non-class dependencies
 
   What if the dependency value isn't a class?
   Sometimes the thing we want to inject is #{objectexamples}.
+// #enddocregion tokens-non-class-deps-1
 
-
+// TS/JS only
+:marked
   Applications often define configuration objects with lots of small facts like the title of the application or the address of a web API endpoint.
-  These configuration objects aren't always instances of a class. #{hashes}
-// #enddocregion tokens-non-class-deps-1
+  These configuration objects aren't always instances of a class. They tend to be object hashes like this one:
 +makeExample('dependency-injection/ts/app/app.config.ts','config','app/app-config.ts (excerpt)')(format='.')
 
 // TypeScript only?
@@ -805,9 +805,10 @@ code-example(format, language="html").
 // #docregion tokens-opaque-2
 - var lang = current.path[1]
 - var decorated = lang == 'dart' ? 'annotated' : 'decorated'
+- var configuration = lang == 'dart' ? '' : 'configuration'
 :marked
-  Now we inject the configuration object into any constructor that needs it, with
-  the help of an `@Inject` #{decorator} that tells Angular how to find the configuration dependency value.
+  Now we can inject the #{configuration} object into any constructor that needs it, with
+  the help of an `@Inject` #{decorator} that tells Angular how to find the #{configuration} dependency value.
 // #enddocregion tokens-opaque-2
 +makeExample('dependency-injection/ts/app/providers.component.ts','provider-9b-ctor')(format=".")
 
@@ -819,10 +820,9 @@ code-example(format, language="html").
 :marked
 // end typescript only
 
-// #docregion tokens-opaque-3
+// Skip for Dart (we have another example)
 :marked
   Or we can provide and inject the configuration object in our top-level `AppComponent`.
-// #enddocregion tokens-opaque-3
 +makeExample('dependency-injection/ts/app/app.component.ts','providers', 'app/app.component.ts (providers)')(format=".")
 +makeExample('dependency-injection/ts/app/app.component.ts','ctor', 'app/app.component.ts (constructor)')(format=".")