Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

docs(glossary): general cleanup and fix links #2100

Merged
merged 4 commits into from
Aug 18, 2016

Conversation

chalin
Copy link
Contributor

@chalin chalin commented Aug 12, 2016

This commit addresses issues with the glossary for all languages (JS, TS, Dart).

Fixes #1123, #1838, #2036.
Contributes to #1508.

This was originally started as post-RC5 Dart resync, but since mixing Harp partials with Jade mixins can be problematic, this commit does a general cleanup of the 3 x 2 = 6 glossary files (found in {ts,js,dart}/latest/{.,guide}).

This commit builds upon #2098 (which created the first ts/_cache copy of the glossary), but doesn't really depend on it.

@chalin
Copy link
Contributor Author

chalin commented Aug 12, 2016

@kwalrath @wardbell @Foxandxss : Ready for review. Best viewed by ignoring whitespace.

  • @kwalrath : to see the RC5 diffs in the glossary view the "glossary: replace cached by latest before edits" commit.
  • @filipesilva : you might want to review the JS glossary.

application's top level "root" [Component](#component) and optionally
registers service [providers](#provider) with the [dependency injection
system](#dependency-injection).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this information pre-RC5?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason I was under the impression that the old definition was appearing in the JS glossary, but you are correct, it should not. I'll remove it and rebase.

@Foxandxss
Copy link
Member

This needs rebase, but I like what I see.


block annotation-defn
:marked
There are different kinds of annotation in Dart. Unqualified use of the
Copy link
Contributor

@kwalrath kwalrath Aug 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's reword the first two sentences to remove the "There are" and give a hint as to what other uses of "annotation" might be. (The first sentence stopped me cold, as I tried to recall what the other kinds of annotations were.) Maybe:

When unqualified, _annotation_ refers to a Dart [metadata annotation][metadata] (as opposed to, say, a type annotation).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better. Fixed.

@kwalrath
Copy link
Contributor

Aside from what I marked, LGTM.

chalin added 4 commits August 17, 2016 15:59
This commit addresses issues with the glossary for all languages (JS, TS, Dart).

Fixes angular#1123, angular#1838, angular#2036.

This was originally started as post-RC5 Dart resync, but since mixing Harp partials with Jade mixins can be problematic, this commit does a general cleanup of the 3 x 2 = 6 glossary files (found in `{ts,js,dart}/latest/{.,guide}`).

This commit builds upon angular#2098 (which created the first `ts/_cache` copy of the glossary), but doesn't really depend on it.
@chalin chalin force-pushed the chalin-glossary-rework-0812 branch from bdd018c to de8fb3f Compare August 17, 2016 22:59
@wardbell
Copy link
Contributor

wardbell commented Aug 18, 2016

Blocked by @kwalrath until current glossary review is done

@kwalrath kwalrath merged commit 08dec19 into angular:master Aug 18, 2016
@kwalrath
Copy link
Contributor

kwalrath commented Aug 18, 2016

Actually, I wanted this change in before the editor looks at it. Pushing the updated site now...

@chalin chalin deleted the chalin-glossary-rework-0812 branch August 18, 2016 01:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants