2 Commits

Author SHA1 Message Date
Andrew Solovay
c02411f38d docs: Fixed bad link to cloud-backup training class
The name and URL of the old "Syncing to the Cloud" class had changed.
Fixed a single bad link; also changed the title on other pages where
the class was referred to by the old name.

I know that changing the _toc.cs files is redundant at this point
(since we don't use those files to generate TOCs any more) but I
figured I'd do it for consistency's sake.

See first comment for doc stage location.

bug: 30309375
Change-Id: I0cd8b1442ef3a8dd8a1917e897a3f0555c48e6ef
2016-07-22 14:44:03 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00