20 Commits

Author SHA1 Message Date
Trudy Hakala
f65f17bb17 adding file; toc update 2017-03-09 11:06:31 -08:00
LizRoss
2ce7ea7a55 Fixing TOC hierarchy 2016-11-14 13:26:40 -08:00
LizRoss
6f81d38e3f Updating ACT TOC to clear up confusion of what is redirected and what still exists 2016-11-14 13:15:05 -08:00
jdeckerMS
4a6e83b81f Squashed commit of the following:
commit 8329185a7e5119d2a43a9606a8e3476fba8a3846
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 21 09:08:15 2016 -0700

    tweak

commit 99d0961d0148578322908ade9862f8b45d045e32
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 21 09:04:55 2016 -0700

    updates for pushing live

commit affc30449b7656ed0871e106620d16a0c2ce9c06
Merge: 0dd8a59 1dce84a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 21 08:59:51 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit 0dd8a5995efdc62da387f53a141b021ebaccbf91
Merge: 2aceee2 cb28398
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 21 07:21:00 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit 2aceee2831067b9b338484d86ac7cdf5a25b0e58
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 12:58:03 2016 -0700

    waas-wsus.fig9

commit 7a826aa540b40e69b9da963f486aecc3fdb3816a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 12:36:31 2016 -0700

    re-save each image

commit b700ba2cf3b70e49537b3dd313575aba90a448b6
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 12:18:34 2016 -0700

    testing new fix

commit 30c3353173ffcfd40affed79ceb74ce029a6492a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 12:10:17 2016 -0700

    rename images

commit a7995ca7999303215616fc6c197677bfc91589e9
Merge: 4b77449 e262949
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 11:54:28 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit 4b77449f242ceb1a3bbd87cc8003ffa119b6b75d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 11:52:21 2016 -0700

    renamed image file

commit 741fab2cf53e1558227a62c5b3422e472acab88d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 11:42:33 2016 -0700

    troubleshooting images

commit 521cb7e1f9701b9de29414c12e918992d8afb7d5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 11:30:59 2016 -0700

    add art

commit d65533c3ac4c0880fa2f75030c9ec1bbc49c8840
Merge: d9f0c9c bd846ca
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Sep 14 11:08:43 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit d9f0c9cd1acfc0caf3c94e62d23cefc38aa06dac
Merge: 60cc5a5 ffab5db
Author: Elizabeth Ross <lizross@microsoft.com>
Date:   Wed Sep 14 07:35:13 2016 -0700

    Merge pull request #182 from mtniehaus/patch-5

    Update waas-update-windows-10.md

commit 60cc5a58149ffbb219b34a87eae3d67b132b45f5
Merge: 7efbed7 cd4c88a
Author: Elizabeth Ross <lizross@microsoft.com>
Date:   Wed Sep 14 07:35:02 2016 -0700

    Merge pull request #183 from mtniehaus/patch-6

    Update waas-overview.md

commit cd4c88aeebc893f64bf6517c23edff9516c8b94c
Author: Michael Niehaus <niehaus@live.com>
Date:   Tue Sep 13 22:57:17 2016 -0700

    Update waas-overview.md

    Fixed up wording, changed to "two to three times per year", added "minimum of 18 months" text.

commit ffab5dbdf6ba91ae7bf271f6958aed0c5a116070
Author: Michael Niehaus <niehaus@live.com>
Date:   Tue Sep 13 21:19:42 2016 -0700

    Update waas-update-windows-10.md

    Fixing the text in the first paragraph to remove PR objections and to make it sound less like "cheery marketing" content.

commit 7efbed7a79b212cb04dcae298e0ab1da977b7c20
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Sep 13 10:27:36 2016 -0700

    8807924

commit 27926055ea9eeb082d731dcb91cd043cd996ccbf
Merge: 49b877a d048580
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Sep 13 10:03:31 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit 49b877aa73957f9aba369e0bb3d69c408200be18
Merge: 91dc45b 7d1348e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Sep 13 07:24:02 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit 91dc45bcd571532aeddceff775a401d727ec74e6
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 11:21:52 2016 -0700

    change pixel size

commit f2aa45f0f1806a4d6208c2d66a1b897dfd5a9c85
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 11:19:23 2016 -0700

    2d tweak

commit fac4a1c9d58b7c176732235db37a2c4fa37d269d
Merge: d05c373 d075214
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 11:15:10 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit d05c373be521d0b1a4f908ff34729e069d3783ee
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 11:13:57 2016 -0700

    tweak width

commit 7c5de66b7a7b5454bf49fed42ae0cc94ddc4f51a
Merge: b71bfe5 decfdee
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 11:12:16 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit b71bfe57fe1d55e23e303d92f572d8c07c19ebb8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 07:49:05 2016 -0700

    add link to Upgrade Analytics

commit 04fb2371a6be88f014f75bff39b263098f721170
Merge: b152ae6 1995a49
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 07:36:48 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

commit b152ae60eceefd237984a8acbdc8a6a7bd3f2dae
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Sep 1 07:22:09 2016 -0700

    add LTSB note

commit ef94546e0e457ad86bbbfb77432be2dae5896de5
Merge: ba5399a 48b4b10
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Aug 30 17:51:03 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdwaas

    # Conflicts:
    #	windows/manage/index.md

commit ba5399abc0161d877650915e326e70bdeef7309f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Aug 30 17:28:17 2016 -0700

    put waas content back in
2016-09-21 09:26:02 -07:00
jdeckerMS
f986e4d4c9 fix toc 2016-08-04 13:36:35 -07:00
LizRoss
0815ce717d Fixing issues 2016-07-26 10:33:30 -07:00
jdeckerMS
939167e152 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/plan/TOC.md
2016-07-22 08:07:25 -07:00
jdeckerMS
7f60f9517e Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-22 07:59:02 -07:00
LizRoss
19499f75a3 Updated toc.md file to remove deprecated ACT content 2016-07-20 12:15:48 -07:00
Greg Lindsay
8428a8640a minor fixes 2016-07-08 17:44:33 -07:00
jdeckerMS
73451ec0c8 move changelog 2016-07-07 13:14:27 -07:00
jdeckerMS
d62a1c230b EDU changes, to go live tomorrow 2016-05-25 11:13:23 -07:00
Jan Backstrom
86a24b9391 add school document to TOC 2016-05-05 11:24:52 -07:00
Brian Lich
2b6fd83920 renaming more files and fixing )) bug in toc.md 2016-04-04 16:28:48 -07:00
Brian Lich
edb7f5a067 new build 2016-03-31 09:25:25 -07:00
Brian Lich
be55b9a0bb fixing toc.md files 2016-03-11 16:27:21 -08:00
Brian Lich
9da9a0ce14 refreshing build (3/11/16) 2016-03-11 15:39:26 -08:00
Brian Lich
38e011fe68 renaming files in subfolders to index.md 2016-03-08 09:31:18 -08:00
Brian Lich
afab4332a6 test migration of everything 2016-03-07 16:53:55 -08:00
Brian Lich
d2f796097e adding some placeholder content 2016-03-06 19:16:51 -08:00