commit f61dec80aa909e37f569733be86eb44d782eb87b
Author: Megan Yancy <myancy@anaconda.com>
Date:   Thu Jul 23 16:38:21 2020 -0500

    updated release notes - correction

commit 18a643dfcba18c84f94d0bdd7e2c633306d3fd09
Author: Megan Yancy <myancy@anaconda.com>
Date:   Thu Jul 23 16:32:49 2020 -0500

    updated release notes

commit c8112da1d2c732db6bd57dc15f6ce0ea3fa0a4de
Merge: f759e25e 82e9164b
Author: Megan Yancy <58443900+myancy-anaconda@users.noreply.github.com>
Date:   Thu Jul 23 10:20:42 2020 -0500

    Merge pull request #2346 from ContinuumIO/doc_package_July
    
    building docs packages for July

commit 82e9164b09150aae4cfaf54a4007930d47d17615
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Fri Jul 17 14:33:46 2020 -0500

    building docs packages for July

commit f759e25e480e2067c711b60758bbf4f105d52fce
Merge: 5030887e fe0218be
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Jul 9 16:02:27 2020 -0500

    Merge pull request #2345 from ContinuumIO/typo
    
    adding space between words

commit 5030887e027d335bf537fa6e170099357c951bd6
Merge: ac98f967 2e032faa
Author: Cheng H. Lee <chenghlee@users.noreply.github.com>
Date:   Wed Jul 1 11:59:17 2020 -0500

    Merge pull request #2342 from ContinuumIO/eula-updates
    
    Update Anaconda EULA

commit fe0218be7d1cc332ee2f21db6b1aa7dbed8c893b
Author: Idan Englander <ienglander@0528.local>
Date:   Mon Jun 29 17:10:36 2020 -0500

    adding space between words

commit ac98f967e1f3d660b3569bf2a4b3abeafb5dc618
Merge: 7c29b9c7 4a9f23ee
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Fri Jun 26 14:34:50 2020 -0500

    Merge pull request #2344 from ContinuumIO/doc_package_June
    
    building docs packages for June

commit 4a9f23ee783eb33a19c52b653ea04aa6f6c6781f
Author: Idan Englander <ienglander@0528.local>
Date:   Fri Jun 26 14:33:21 2020 -0500

    building docs packages for June

commit 7c29b9c7962f64197e9c7bb417447880227d46f8
Merge: 3b066b44 38c4c501
Author: Megan Yancy <58443900+myancy-anaconda@users.noreply.github.com>
Date:   Tue Jun 23 07:09:09 2020 -0500

    Merge pull request #2343 from ContinuumIO/doc_package_May
    
    building doc packages

commit 38c4c501354e0d99fa1aa73206a5b294f9c0c026
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Jun 22 10:05:58 2020 -0500

    building doc packages

commit 2e032faa23c9167fdf0cc51b0ee0840c3f67273e
Author: Cheng H. Lee <clee@anaconda.com>
Date:   Mon Jun 15 11:16:22 2020 -0500

    Update Anaconda EULA

commit 3b066b44e82ee4a0451247c31fe797f8babd379a
Merge: 5df8663b 5c2729d2
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Jun 15 09:37:51 2020 -0500

    Merge pull request #2341 from ContinuumIO/removing_support_link
    
    Update help-support.rst

commit 5c2729d2dabe9ecc99433673933c9977a360d9dc
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Jun 15 09:37:31 2020 -0500

    Update help-support.rst

commit 5df8663b9136804ccae2c4511071af932a81e242
Merge: 6e5e8d37 fd8ed438
Author: csoja <crystal.soja@continuum.io>
Date:   Mon May 18 17:47:06 2020 -0500

    Merge pull request #2340 from ContinuumIO/csoja-patch-1
    
    Remove Anaconda Repository from Glossary

commit fd8ed438cc6867cf9882007545be41e5e65f5896
Author: csoja <crystal.soja@continuum.io>
Date:   Mon May 18 09:33:54 2020 -0500

    Remove Anaconda Repository from Glossary
    
    removed Anaconda Repository from Individual Edition Glossary

commit 6e5e8d377648c6496a0be77fb326923d33d9e87f
Merge: e95e0517 659b9e2d
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Fri May 8 09:24:55 2020 -0500

    Merge pull request #2339 from ContinuumIO/team_edition_scrub
    
    removing TE content as it's in aecobra/docs now

commit 659b9e2d4e5fdbe38c0e52c9a03ec3be95a42541
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Fri May 8 09:22:49 2020 -0500

    removing TE content as it's in aecobra/docs now

commit e95e0517cfd63ffcdf6296838a5b4ea0d3edc803
Merge: 29849b50 a031a044
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu May 7 12:59:29 2020 -0500

    Merge pull request #2338 from ContinuumIO/upgrade_ATE_link
    
    Linking new ATE site from docs.anaconda

commit a031a04404452cdcc06a0195af00947a2ea1d134
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Thu May 7 10:19:15 2020 -0500

    Linking new ATE site from docs.anaconda

commit 29849b506a2cbd0dc99771e01717d072cad8f0ec
Merge: 69ce2527 9505cee2
Author: Megan Yancy <58443900+myancy-anaconda@users.noreply.github.com>
Date:   Wed May 6 10:43:47 2020 -0500

    Merge pull request #2337 from ContinuumIO/mcy-oss-changes
    
    updated build.sh and meta.yaml to streamline build process

commit 9505cee2ad770e52fd881d2386cf7e0a314f3d41
Author: Megan Yancy <myancy@anaconda.com>
Date:   Wed May 6 10:32:05 2020 -0500

    updated build.sh and meta.yaml to streamline build process

commit 69ce2527191b762464f4f34e280ad40d651c446d
Merge: 9ebb3252 655ffd83
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon May 4 11:02:27 2020 -0500

    Merge pull request #2336 from ContinuumIO/roles_n_scopes
    
    moving content to "hidden" for repo move

commit 655ffd83ab8613b5d46004545d817f0ffce4748e
Author: Idan Englander <ienglander@0528.local>
Date:   Mon May 4 10:58:50 2020 -0500

    moving content to "hidden" for repo move

commit 9ebb325259a73c47bf033528f1dcf19092676fb6
Merge: 7e5299e7 d252733f
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon May 4 10:53:02 2020 -0500

    Merge pull request #2335 from ContinuumIO/docker_creation
    
    WIP - Docker creation

commit d252733fbb0c1b6366523430c61ac13868f0d64f
Author: Idan Englander <ienglander@0528.local>
Date:   Mon May 4 10:51:26 2020 -0500

    adding docker to "hidden" for repo move

commit 7e5299e74f5830ffd68bd88216759fd0a9967056
Merge: 03108d51 54708c64
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Fri May 1 12:38:06 2020 -0500

    Merge pull request #2330 from ContinuumIO/second_round_changes
    
    implementing suggestions from Dan: CBR-2201

commit 6170fc4179ca56f9d943ded29b0001063db95894
Author: Idan Englander <ienglander@0528.local>
Date:   Thu Apr 30 14:49:19 2020 -0500

    creating Docker topic

commit e31dc1aad1451db77d61e4e8ee9238802dee55f3
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Tue Apr 28 14:25:54 2020 -0500

    creating user scope topic

commit 03108d51ff8e601a30fd2847639ffd8d100f458c
Merge: cd656192 9f3810ee
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 27 13:54:08 2020 -0500

    Merge pull request #2333 from ContinuumIO/metrics_boomin
    
    Metrics topic added

commit 9f3810eea467c19a481eb28c6ca75f841c496a9a
Author: Idan Englander <ienglander@0528.local>
Date:   Mon Apr 27 13:52:20 2020 -0500

    Metrics topic added

commit 54708c641ec7e53b26ae02b243a9af2c2560632d
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 27 13:01:41 2020 -0500

    Update set_admin.rst

commit cd656192492b70f273ec8466aeab58b313cbfc40
Merge: 0fa53c68 201cc180
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 22 13:45:23 2020 -0500

    Merge pull request #2332 from ContinuumIO/build_docs_packages
    
    building docs pkgs for OSS

commit 201cc180ea10af85ae8a40e183cfd0a1f18c419d
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Wed Apr 22 13:41:39 2020 -0500

    building docs pkgs for OSS

commit 0fa53c6844aead157a16fc4fb4ded6c061a20bde
Merge: f7466d84 b56ca039
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 22 13:04:35 2020 -0500

    Merge pull request #2331 from ContinuumIO/build_docs_packages
    
    building docs pkg for April

commit b56ca03993baa9b38df342ef7a088406d3858528
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Wed Apr 22 13:02:50 2020 -0500

    building docs pkg for April

commit af0dc2e1e090b881639d11179323a2bc44e3514b
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Wed Apr 22 11:03:26 2020 -0500

    implementing suggestions from Dan: CBR-2201

commit f7466d84f3bffff2dfdfd73c9b2e4404c50743b1
Merge: 05e1a3df 016057f1
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 20 15:03:31 2020 -0500

    Merge pull request #2329 from ContinuumIO/second_round_changes
    
    added "python" to fix broken rendering of code

commit 016057f198cc7ee424af31ad6ebbcf0a0706b7d2
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 20 15:01:54 2020 -0500

    added "python" to fix broken rendering of code

commit 05e1a3dfec34b50791f3c2dd92121f9b4a783d5c
Merge: d5377dd8 25aec97c
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 16 15:17:28 2020 -0500

    Merge pull request #2328 from ContinuumIO/in-page_TOC
    
    adding TOC to top of long topics

commit 25aec97c059ec3678c9aed26f0cab0309b3a1df5
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Thu Apr 16 15:15:44 2020 -0500

    adding TOC to top of long topics

commit d5377dd83b8052a0d467d4c12600699267088882
Merge: 88b6655f f7cc0092
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Tue Apr 14 15:55:33 2020 -0500

    Merge pull request #2327 from ContinuumIO/michael_edits
    
    correcting PyPi to PyPI

commit f7cc00928a88dab9e1d6c32ffe6cba4dd916dc4d
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Tue Apr 14 15:53:54 2020 -0500

    correcting PyPi to PyPI

commit 88b6655fd70f4823fb12c939a7d1a01e25d4989c
Merge: 9150bcaa fcdaaafd
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Tue Apr 14 15:53:39 2020 -0500

    Merge pull request #2325 from ContinuumIO/michael_edits
    
    reordering offerings and adding ATE blurb

commit fcdaaafdffdd70d93b6ca8375018360b7486f5e8
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Tue Apr 14 15:52:31 2020 -0500

    Update index.rst

commit 9150bcaacc51ca98325184396d9b5822e92dbbda
Merge: 42e3ed67 a677e1bc
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 15:50:56 2020 -0500

    Merge pull request #2326 from ContinuumIO/edits_w_Saundra
    
    random link fixes, added section blurbs, etc.

commit a677e1bcf91e4248c09ea464cc24187a548170f6
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 15:48:45 2020 -0500

    random link fixes, added section blurbs, etc.

commit d5ec7c8b294acd4e10ae95619c050cd828ca7ec7
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 14:41:42 2020 -0500

    reordering offerings and adding ATE blurb

commit 42e3ed671bdcd0dbf6df580cbfc34ad2618985bd
Merge: 7ad3f2fb 633adc4c
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 14:13:36 2020 -0500

    Merge pull request #2324 from ContinuumIO/michael_edits
    
    splitting up inline links, word change

commit 633adc4c4d50a93983eca16ef8844ba8337151d1
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 14:09:30 2020 -0500

    splitting up inline links, word change

commit 7ad3f2fbc0e7fd6a02eaab8649bfc0fc85a55a52
Merge: 07290556 78332aa7
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 13:07:41 2020 -0500

    Merge pull request #2323 from ContinuumIO/csoja-patch-1
    
    Update Readme.md

commit 78332aa7dd2692eef70a317343f5bb8f2f7dec0d
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Apr 13 11:45:42 2020 -0500

    Update Readme.md
    
    Updated Anaconda Distro to Anaconda Individual Edition, and added Anaconda Team Edition.

commit 07290556f88e224c53bb956b53ab69da7801e6bb
Merge: cf1a5098 6a16ba27
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 11:04:25 2020 -0500

    Merge pull request #2322 from ContinuumIO/input_feedback_publish
    
    polishing up some image and link rendering issues

commit 6a16ba27906d4360bf06120e95dd652b2f2af388
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 11:02:10 2020 -0500

    polishing up some image and link rendering issues

commit cf1a509840bc111371593cfe775f7cc11b792158
Merge: fd5b9f4d 28753801
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 10:25:35 2020 -0500

    Merge pull request #2321 from ContinuumIO/input_feedback_publish
    
    fixing image paths and removing redundant line on top-level index

commit 28753801f309d31be4f5bfb5619c9ed8cf8171da
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 10:24:12 2020 -0500

    fixing image paths and removing redundant line on top-level index

commit fd5b9f4d2fe5893cdc22858b23ce255511df9a99
Merge: 494eda0f 18b8fe1b
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 09:21:04 2020 -0500

    Merge pull request #2320 from ContinuumIO/input_feedback_publish
    
    swapping out intro page screenshot

commit 18b8fe1bc9ff12205233e0214ddc688922db5680
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 09:15:45 2020 -0500

    swapping out intro page screenshot

commit 494eda0f4c7511cf0584352d31d85b045e766e36
Merge: cbcc024b 28d02d47
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 13 08:29:05 2020 -0500

    Merge pull request #2319 from ContinuumIO/input_feedback_publish
    
    hiding uninstall topic for the moment

commit 28d02d47946be64dffb0d9a1f4260ab53e6a0945
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Mon Apr 13 08:27:06 2020 -0500

    hiding uninstall topic for the moment

commit cbcc024b69eaf4c393ebe787a835ddf22729f03b
Merge: 5652c0f2 523b9c46
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Sat Apr 11 00:07:26 2020 -0500

    Merge pull request #2318 from ContinuumIO/input_feedback_publish
    
    adding screenshots and updating TOC

commit 523b9c46a597efb8b0732198ec167bfc8ba5c9e7
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Sat Apr 11 00:05:28 2020 -0500

    adding screenshots and updating TOC

commit 5652c0f2af2d70d89ea49b81414335ed95256eeb
Merge: 28aa9d82 e134af0b
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Fri Apr 10 15:21:31 2020 -0500

    Merge pull request #2317 from ContinuumIO/teamdoc_import
    
    writing/importing ALL the docs

commit e134af0b8c8266379f8863e1161c378707d3cda6
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 14:21:08 2020 -0500

    Update help.rst

commit ef8833e60ea51d88e7c0998a9fb069d026aa96f7
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 12:01:35 2020 -0500

    Update instructions.rst

commit 44bae6dd89c70fc465efc5fa97afa036356e3fe4
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:57:08 2020 -0500

    Update reqs.rst

commit 894f6e40891edee80fe40344ea1ee66c2a9da615
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:52:45 2020 -0500

    Update work_pack.rst

commit 64bcd2a5233b3e376782bfe08ff4091a1a47e60d
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:49:24 2020 -0500

    Update work_chan.rst

commit 472bfb687356985b226cf4e02c5de627f3e3e554
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:41:57 2020 -0500

    Update work_chan.rst

commit e338b46afdb7fb0b3876f6660ca9e0a36a98a1f0
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:21:52 2020 -0500

    Update pack_chan.rst

commit 59a7e2a03df604773e6de9412dd0f684b7952a18
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:17:54 2020 -0500

    Update logging.rst

commit 932a71efbba486bd5b76bf48417b3b663be59733
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:15:15 2020 -0500

    Update cli.rst

commit 77b0550a5d9d73ac0d234cb80489835e33d78466
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:13:18 2020 -0500

    Update cli.rst

commit 15b1b18323823026b27fe6ed22274a4808173d9c
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:07:23 2020 -0500

    Update verification.rst

commit 82b31424edb96d9c57e959a17b216de0b117b804
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 11:04:35 2020 -0500

    Update uninstall.rst

commit 4b60951141cfca2a268152b74cc65ab43c9d8f13
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 10:58:05 2020 -0500

    Update security.rst

commit 7989ce16c40c552115480848deed7c90a8240921
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 10:51:45 2020 -0500

    Update manage.rst

commit 465cfddf4c9ddbe748bd7bed25fcaf5ff19aa41c
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 10:50:36 2020 -0500

    Update login.rst

commit 3f83757c0aff1352a667c671ef6e344de6c966e8
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 10:16:33 2020 -0500

    Update create_dev.rst

commit 7c061ec8956ac61fec3a7432caf3d8a746dac007
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 09:56:19 2020 -0500

    Update create_dev.rst

commit 17b091436459833f53659fc1a93dfb76081e3021
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 9 09:43:13 2020 -0500

    Update 2fa.rst

commit c627024a6da0bb1691fb05fe847f8a9ad3687e83
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 16:36:27 2020 -0500

    Update 2fa.rst

commit cd3c3d80de1c4178351caf567275e77ba3f784dc
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 12:44:03 2020 -0500

    Update access_key.rst

commit 108a666de7c402bd7f5fecb9f412e5312ccbac22
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 11:58:08 2020 -0500

    Update index.rst

commit d46bb9d534c1d92af2ad7ef704a73404e2052fb2
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 11:57:08 2020 -0500

    Update set_admin.rst

commit 232d7cacc3b85d3c111a8dc28130bd7a45d7551f
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 11:55:49 2020 -0500

    Update manage.rst

commit 6c84fc158f05345d8ea4696e2e0fb35db7d4daa0
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 11:37:32 2020 -0500

    Update create_key.rst

commit 489025fa04b8c97940405f28e95581407302e204
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Wed Apr 8 11:35:55 2020 -0500

    Update access_key.rst

commit e53c4182ddb0adeaf27a5a9dbef33a553f1d0914
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Mon Apr 6 10:32:10 2020 -0500

    Adding actual content to Glossary

commit f40a6bef85e88d3d936d4c0696bf2945133e1829
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Fri Apr 3 16:04:33 2020 -0500

    writing/importing ALL the docs

commit 28aa9d820233166fcf76484a8a43c3aea0cf6fa0
Merge: cc456ede 2f6eeb37
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 2 11:39:39 2020 -0500

    Merge pull request #2316 from ContinuumIO/idanenglander-patch-1
    
    Changing Distribution to Individual Edition

commit 2f6eeb37c0713b49bcfb07d5ccda105cf308ecf8
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Apr 2 11:34:55 2020 -0500

    Changing Distribution to Individual Edition
    
    Last PR addressed "Distribution" in the TOC, but not in the body of the page.

commit cc456edeadeff4d4305710d893fa21adc12aa484
Merge: 4f853cd2 769031ed
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Mar 25 08:48:57 2020 -0500

    Merge pull request #2315 from ContinuumIO/csoja-202002screenshots
    
    more doc updates for 2020.02 release

commit 769031edb1c6bf0b0fe9380d9ec984e3e1a62ba7
Author: Crystal Soja <crystal.soja@continuum.io>
Date:   Tue Mar 24 17:05:47 2020 -0500

    updated screenshots
    
    and a few other small changes for the 2020.02 release

commit 4f853cd2725dcf0fdaeb59e3a3c22d4395a9f029
Merge: 0bab64b7 b71ea203
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Mar 24 10:56:25 2020 -0500

    Merge pull request #2187 from ContinuumIO/csoja-patch-1
    
    Update Anaconda Cloud index.rst

commit 0bab64b745bf995159fdaac6ca9c3a5a355b03a6
Merge: 891899af 5f48f1ec
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Mar 24 10:51:47 2020 -0500

    Merge pull request #2313 from ContinuumIO/csoja-patch-3
    
    Update EULA in docs

commit 891899afe0074a97a18149e30295f22d3ccb264e
Merge: e792583d 93e8134e
Author: idanenglander <60263976+idanenglander@users.noreply.github.com>
Date:   Thu Mar 19 11:45:25 2020 -0500

    Merge pull request #2314 from ContinuumIO/docs_packages
    
    building docs packages; changing to Indiv. Edition

commit 93e8134e8baeab65172d4425ad1b1871de635901
Author: Idan Englander <ienglander@0528.attlocal.net>
Date:   Thu Mar 19 11:43:46 2020 -0500

    building docs packages; changing to Indiv. Edition

commit 5f48f1ec613700cd14c5b3181c5ca14722eb23cf
Author: csoja <crystal.soja@continuum.io>
Date:   Thu Mar 12 15:54:39 2020 -0500

    Update EULA in docs

commit e792583deb778ff699d32f53abc412dd5d61f27f
Merge: bf686de6 15969f0a
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 13:48:08 2020 -0400

    Merge pull request #2312 from jjhelmus/anaconda_2020.02_release_notes
    
    Add anaconda 2020.02 release notes

commit 15969f0a0d3cbe7158f01db399a88214ba1f1efb
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 12:35:09 2020 -0500

    add anaconda 2020.02 release notes

commit bf686de6922207ba85f471787ca83cf680e25f2f
Merge: 058e4f7e 1b0047f0
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 13:22:40 2020 -0400

    Merge pull request #2311 from jjhelmus/anaconda_2020.02_hashes
    
    update anaconda hashes for 2020.02 release

commit 1b0047f03bae2f8e6a569f63cd5deb686296f93a
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 12:17:45 2020 -0500

    update anaconda hashes for 2020.02 release

commit 058e4f7e485c74622c8ea1b33222644acba32adf
Merge: e92efd2b fb1c0298
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 13:13:12 2020 -0400

    Merge pull request #2310 from jjhelmus/anaconda_2020.02
    
    Update package lists for Anaconda 2020.02 release

commit fb1c0298a036ed83caea4f67b539b0f1867bd8b4
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 11:50:27 2020 -0500

    fix indentation in oldpkglists.rst

commit 9413bbdf69681a20dc9224343ace502913d8e0e1
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 11:49:13 2020 -0500

    update anaconda packages list for 2020.02 release

commit 2222fe436d3c198de451e6bbe74b2005c563ee9f
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Mar 11 11:32:23 2020 -0500

    add anaconda 2019.10 packages to old-pkg-lists

commit e92efd2b29ef93f010903570b29db44d9265641a
Merge: db17b931 0eea2b71
Author: Forrest Waters <fwaters@anaconda.com>
Date:   Wed Feb 19 14:52:59 2020 -0600

    Merge pull request #2309 from ContinuumIO/nav-1.9.12-doc-changes
    
    Nav 1.9.12

commit 0eea2b718322fe611eaa46f44a78664c4f621b7d
Author: Crystal Soja <crystal.soja@continuum.io>
Date:   Wed Feb 19 14:19:12 2020 -0600

    Nav 1.9.12
    
    Documentation change for Navigator 1.9.12 release

commit db17b9314263aeed138e0ee2d6ff7430350c9fef
Author: csoja <crystal.soja@continuum.io>
Date:   Thu Feb 6 13:58:07 2020 -0600

    Update anaconda-docs meta.yaml to 2020.02

commit cbf727a39746516e3f2942dc8ccc0be782128236
Merge: 066d6a3c 1b974b9c
Author: Forrest Waters <fwaters@anaconda.com>
Date:   Wed Jan 29 11:48:06 2020 -0600

    Merge pull request #2306 from rrigdon/jan-sweep
    
    January Distro docs sweep

commit 066d6a3c545c54da9c4ff1d83e3897970006a79a
Merge: 0ce68527 4c4107ff
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jan 21 11:29:05 2020 -0600

    Merge pull request #2308 from rrigdon/fix-nav-img-test
    
    Removed broken image link

commit 4c4107ffcaca2a09368b808b17906111ea411016
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Jan 21 11:27:06 2020 -0600

    Removed broken image link

commit 0ce68527658b68c3a086dfdf890d1b022595f53e
Merge: 78d582fd de5f7190
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jan 21 11:01:21 2020 -0600

    Merge pull request #2307 from rrigdon/nav-img-test
    
    Testing if image shows up in live

commit de5f7190c286d6ba49c53c5a0f19bd571bc7ddee
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Jan 21 11:00:55 2020 -0600

    Testing if image shows up in live

commit 78d582fd7f5d6e347f84cdaa0c329c08d7c83264
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Jan 16 10:00:31 2020 -0600

    Incremented version number to 2020.01

commit 1b974b9cba5d51f9a38434a3508e3d8f7c5bdb9f
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:48:33 2020 -0600

    Edits to contribute and help & support docs

commit 26d13af7b751faf7b4972d253c5b2944c45fd79f
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:37:56 2020 -0600

    Cleaned up integration docs

commit e7301aec84e06646c94cf17375d3be09696fd898
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:37:46 2020 -0600

    Cleaned up tasks

commit eb480c8d18388ffdd2f149288d29b15cac36861f
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:37:30 2020 -0600

    Misc updates to user-guide, glossary, etc.

commit 1120181da4c612302454920f51a408243be517a5
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:36:41 2020 -0600

    Minor edits to Nav tutorials

commit d4ec1315edc1d0c94db3502eb629eda7ffffa224
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:36:27 2020 -0600

    Minor updates

commit 6316bb44bbad7d6d2b22518df2427b289ead598b
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:36:03 2020 -0600

    Navigator clean up

commit 76f66a78b7e6e1ee708182baa3590d21bc2e8df8
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Jan 16 09:35:20 2020 -0600

    Minor edits to install pages

commit 88a7b9f5a479369124a476606acb063f47dc78e2
Merge: 9e5eb0cd 89de59f6
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jan 13 10:36:22 2020 -0600

    Merge pull request #2305 from ContinuumIO/tf_gpu_notes
    
    Add links to Tensorflow documentation of running calculation of a GPU

commit 89de59f6030494045b233cb744096e3e68e80f9c
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jan 13 10:36:05 2020 -0600

    Standardized capitalization for TensorFlow

commit 879a1811725c2b537f10a391e7db1baf9b07bec5
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Jan 10 15:56:50 2020 -0600

    add links to Tensorflow documentation for using a GPU

commit d5f032a1a624e593191a214b753eb48fe5a0d057
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Jan 10 15:56:22 2020 -0600

    update CUDA version for Tensorflow

commit 9e5eb0cdb8808984d61f87b3fc16c56984a19efe
Merge: eb969e45 3c8a75f9
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Jan 10 14:11:42 2020 -0600

    Updated OS support (#2304)
    
    Updated OS support

commit 3c8a75f910ee8c81afa648709200975f6443ebea
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Jan 10 14:01:21 2020 -0600

    Added plus to 10.13

commit 76b31dcd8c9f27c60ed640e49a8fd37a9d8797da
Author: rrigdon <rrigdon@anaconda.com>
Date:   Fri Jan 10 13:53:47 2020 -0600

    Updated OS support

commit eb969e45c080d369cfc0e9f02c0f289f2b008a29
Merge: 10b1e393 913e1c9f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jan 7 13:58:02 2020 -0600

    Merge pull request #2303 from rrigdon/troubleshooting-nav-admin
    
    Navigator troubleshooting - pop up and admin privileges

commit 913e1c9fbc95efc6eb94b11a323b7bf92b2f7599
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Jan 7 13:26:50 2020 -0600

    Clarified privilege conflict with pop up

commit 38dfd6a3c7ffc6f05977bd4887b3c0c493b3d36c
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Jan 7 12:00:11 2020 -0600

    Removed references to deprecated licenses page

commit 4b3b32890db77b08bab4daf274076a2be42de73a
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Jan 7 11:59:57 2020 -0600

    Added pop up option to troubleshooting

commit 10b1e393b619434ca77367a93914053b3eeb30ff
Merge: 9a014f19 038706aa
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 19 13:30:09 2019 -0600

    Merge pull request #2302 from rrigdon/nav-img
    
    Moved imgs to new directory

commit 038706aab3ec4f11f0e854b9000aaef1904b3199
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Dec 19 13:29:28 2019 -0600

    Moved imgs to new directory

commit 9a014f19ee4d330a5e9452b2df2d0dcdfcfa67ff
Merge: b06ab534 d892342a
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 19 12:39:06 2019 -0600

    Merge pull request #2301 from rrigdon/nav-overview
    
    Testing if the images show up

commit d892342a02900d69002d74e4f2baa86ac9445c4e
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Dec 19 12:38:24 2019 -0600

    Testing if the images show up

commit b06ab53494e876118f44a0caad9825d753e981cf
Merge: 78667414 a70f41f7
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 19 10:50:32 2019 -0600

    Merge pull request #2300 from rrigdon/nav-app-tutorial
    
    Cleaned up Navigator tutorial

commit a70f41f749a6862b11b5c2dfd3d7b5ebeb67a03a
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 18 16:15:04 2019 -0600

    Built and tested arch pkgs

commit 4730f1f981be358220703208dc5dfdfe54f7f107
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 18 11:52:26 2019 -0600

    Clarified language, switched noarch with 64

commit 06154341ecabbd20f3303a6fc1dfac59f7f689d9
Author: rrigdon <rrigdon@anaconda.com>
Date:   Tue Dec 17 15:28:13 2019 -0600

    Reworked tutorial to JupyterLab

commit 1e2fc35a09dd31cde94aa296cc96f288cbddf079
Author: rrigdon <rrigdon@anaconda.com>
Date:   Mon Dec 16 13:59:04 2019 -0600

    Cleaned up navigator tutorial

commit 7866741416e84b81f0272ad6cf3255934cdbc174
Merge: f32af1ae b30bc511
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Dec 16 10:32:20 2019 -0600

    Merge pull request #2299 from rrigdon/dec-doc-pkg
    
    2019.12 Doc pkgs

commit b30bc511828f0fa559bacda444e637853adb97f4
Author: rrigdon <rrigdon@anaconda.com>
Date:   Mon Dec 16 10:25:50 2019 -0600

    2019.12 Doc pkgs

commit f32af1ae586832752137600ad1c16394d7759e4f
Merge: 85a6c02c 3ce1d796
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Dec 13 13:04:59 2019 -0600

    Merge pull request #2296 from rrigdon/proxy-task
    
    Added task on using Anaconda with a proxy

commit 3ce1d7965b33f0a0b5da9a99c2de4df80ab56ad5
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Dec 12 14:38:23 2019 -0600

    Fixed an asterisk

commit 82d00c34d6a63269da7730cbc75f99c8def4c773
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Dec 12 14:25:26 2019 -0600

    Corrected information

commit 9be5472146c8172989b12825869f6fd49d09a8f9
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 11 16:34:14 2019 -0600

    Updated with condarc info

commit 85a6c02cb84b9022bd3ff56a9619d8b4c712b70d
Merge: 9564dd89 0ecf117e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Dec 10 11:30:46 2019 -0600

    Merge pull request #2292 from rrigdon/anaconda-docs-pkg
    
    Updated version numbers and recipes

commit 9564dd89f1526e5fa13b2ff7b551f11386246f21
Merge: bde2edcb 9198665f
Author: Forrest Waters <fwaters@anaconda.com>
Date:   Mon Dec 9 11:31:58 2019 -0600

    Merge pull request #2298 from rrigdon/catalina-fix
    
    Added Catalina troubleshooting on PermissionError

commit 9198665f56e14d22b5774c444d7693577e9d2f15
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Dec 9 11:26:49 2019 -0600

    Clarified how to troubleshoot Catalina

commit 82c7c0763a24657b148609e446de969cc5964e4a
Author: rrigdon <rrigdon@anaconda.com>
Date:   Mon Dec 9 10:22:53 2019 -0600

    Added Catalina troubleshooting

commit bde2edcb96f81dfb2a791075d9d922202594a5c0
Merge: 85596ad5 61bacee7
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 5 14:15:35 2019 -0600

    Merge pull request #2297 from rrigdon/docs-pkg-test
    
    Updated directions for creating docs packages

commit 61bacee72d615f56c399dffdbd72e00e20fa84b0
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Dec 5 14:13:39 2019 -0600

    Updated directions for creating docs packages

commit e2c55e805b8c861822bcd71aa1163deaf52e442b
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 4 15:58:43 2019 -0600

    Added note linking to the proxy page

commit 5ee1a31953078d5b239c7d1f98a0bdd72f3178eb
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 4 15:48:58 2019 -0600

    Added task related to proxy

commit 7fccc280f693c5d8a61688712e8c561e90e27dc2
Author: rrigdon <rrigdon@anaconda.com>
Date:   Wed Dec 4 15:48:41 2019 -0600

    Removed useless notes

commit 85596ad58387d09681d9c1ad2915c11c75e66e7f
Merge: 854b4c10 57ae0614
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Nov 25 15:41:42 2019 -0600

    Merge pull request #2293 from rrigdon/security-policy
    
    Added security policy

commit 854b4c106a599bacaf891661b1ae2165e17f238d
Merge: c250fe79 222bc92e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Nov 21 12:59:19 2019 -0600

    Merge pull request #2295 from rrigdon/update-team-name
    
    Changed folder name to anaconda-team

commit 222bc92ea47e85dae57adc8854a7985d721fb994
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Nov 21 12:58:15 2019 -0600

    Changed folder name to anaconda-team

commit c250fe7956ee1cf29828f603cbf402bf16dff404
Merge: 7c18b2bd b3709c8e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Nov 21 11:57:38 2019 -0600

    Merge pull request #2294 from rrigdon/team-edition
    
    Added team edition section

commit b3709c8e5c80f0fe7f7358bdccde4ca73773e66b
Author: rrigdon <rrigdon@anaconda.com>
Date:   Thu Nov 21 11:49:54 2019 -0600

    Added team edition section

commit 57ae06149789daacf0f8cac7c70829faa7303ded
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Nov 18 14:24:50 2019 -0600

    Added security policy

commit 0ecf117e0d972d00105207509a5c4cb38ebed6af
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Nov 18 12:55:14 2019 -0600

    Updated version numbers and recipes

commit 7c18b2bd3bf25233936b2f4689aedce8b6acad07
Merge: 64136bde e47318da
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Nov 15 12:53:28 2019 -0600

    Merge pull request #2291 from rrigdon/catalina-note
    
    Added info about Catalina install

commit e47318da3b3ec0d0bf21d9e9227655f69c18ec78
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Nov 15 12:52:37 2019 -0600

    Added info about Catalina install

commit 64136bdee3ecb9a86905bcf94568a257c03ec2dd
Merge: be6b1241 84afb11e
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Fri Nov 15 09:26:18 2019 -0600

    Merge pull request #2289 from rrigdon/knowledge-base-transfer
    
    Knowledge base transfer

commit be6b1241fbf93439522ffdd3675220abe241b74a
Merge: fb60e6dc cc7167b7
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Nov 15 09:25:49 2019 -0600

    Merge pull request #2290 from rrigdon/python-3-8
    
    Clarified info about Python 3.8

commit cc7167b7d9dc5fa6023e0963fa0e7efc8357c6b3
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Nov 15 09:25:23 2019 -0600

    Clarified info about Python 3.8

commit fb60e6dc60c9c90d325078547cc471da92963d39
Merge: 6d3880f8 ced8cdd7
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Fri Nov 15 09:25:22 2019 -0600

    Merge pull request #2285 from rrigdon/navigator-tutorials
    
    Navigator tutorials - Replaced/fixed screenshots, deleted outdated info

commit 84afb11ef80663637898ab370ec02c7a30f7f668
Merge: 7f8b6686 6d3880f8
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Nov 14 09:55:36 2019 -0600

    Merge branch 'master' into knowledge-base-transfer

commit 6d3880f8821c7285b1b4eac111b1b6925be1024c
Merge: 6421a264 74ca90a0
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu Nov 14 00:28:59 2019 +0100

    Merge pull request #2287 from rrigdon/multi-user-installs
    
    Added page on multi-user install

commit 74ca90a0339081263de57074e52984f761b6b11f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Nov 13 16:11:43 2019 -0600

    Clarified language

commit 6421a26485b581e8ac7ec1f90c9de1954b0a0e7a
Merge: 79966890 048c4d16
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Nov 13 16:09:29 2019 -0600

    Merge pull request #2288 from rrigdon/conda-command-bash
    
    Clarified command Bash, added other Troubleshooting topics

commit 048c4d1637b08ae0a3d45333db031619ae0ec2c6
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Nov 13 16:08:50 2019 -0600

    Clarified OS, corrected word choice

commit 7f8b6686cc52ac3aad543eb76b691baa0154b69d
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 13 15:47:28 2019 -0600

    Added two tasks

commit 729624a813ff2ff0072e0ae659a466fef74ae442
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 13 15:47:18 2019 -0600

    Added troubleshooting topics

commit 16cac0f32ff4da2c708e6d707479e87fa6a97b27
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 13 15:47:07 2019 -0600

    Added Navigator troubleshooting topics

commit 5380b7459e400a66d270662c5695366d0de7ba8d
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 13 14:11:51 2019 -0600

    Clarified command Bash, added other Troubleshooting topics

commit a3f3500c83bc0245649452bdf880f6925f1c06eb
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Nov 11 15:58:24 2019 -0600

    Added page on multi-user install

commit 79966890bc9a6e54e0f9bc40aa83c803f6562f78
Merge: 0c285949 896b4de4
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Mon Nov 11 15:52:41 2019 -0600

    Merge pull request #2286 from rrigdon/command-not-found
    
    Corrected "conda: command not found" troubleshooting

commit 896b4de4b4f747549bd613641d7e1fa228381707
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Nov 11 14:56:56 2019 -0600

    Corrected "conda: command not found" troubleshooting

commit ced8cdd72ce055d5e00fea8ebff5d148506df8c5
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Nov 7 13:58:21 2019 -0600

    Replaced/fixed screenshots, deleted outdated info

commit 0c28594917d5517d90f435e8f808c74794889d31
Merge: 777513c9 3cb822ec
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Nov 6 15:51:04 2019 -0600

    Merge pull request #2284 from rrigdon/navigator-tutorials
    
    [WIP] Fixing Navigator images

commit 3cb822ec73be44ac00b924037807b2c0c5906f48
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 6 15:50:11 2019 -0600

    [WIP] image test

commit 777513c9b93336352bd89bdb450b8b39f5036b25
Merge: 41e3ac91 a6efdc09
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Nov 6 08:54:31 2019 -0600

    Merge pull request #2283 from rrigdon/fix-community-link
    
    Fixed link to community support

commit a6efdc093959ba0d1e923ad085b3effb59f7b5df
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Nov 6 08:54:00 2019 -0600

    Fixed link to community support

commit 41e3ac913b3c774018d24875b2dd70b274dff4a9
Merge: ff3ce76a fccb577d
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Tue Nov 5 20:59:26 2019 -0300

    Merge pull request #2282 from ContinuumIO/fix_typos
    
    Fix typos

commit fccb577dd1c5d337c4c8f9844100d412a167932c
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 20:57:15 2019 -0300

    Fix typos

commit ff3ce76ae6e4e51a38873f249cd4ba160af86dba
Merge: 59b21c1f 080b6700
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Tue Nov 5 20:09:27 2019 -0300

    Merge pull request #2258 from ContinuumIO/bpeters/aen4.3.3_release
    
    aen4.3.3 release

commit 080b67001953c9579ae2e2c5a168ec194e7c1c55
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 20:04:27 2019 -0300

    Port latest changes to 4.3.3 directory

commit d15797e0d2c4f39a8bdefd0de18f66ddb9298faf
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 20:04:01 2019 -0300

    Fix date

commit 5e2beb1503e0986783fabd1f22e2a8fbd4545d46
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 19:46:35 2019 -0300

    Fix date in the index

commit ee3734b9aa8614bc428fe88cd8120653b2b066b0
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 18:40:51 2019 -0300

    Add info about the new config value (emptyDefaultChannels) for the compute

commit dd6e0fb721eb673620240142b330a4558dc767af
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 18:08:39 2019 -0300

    Update upgrade section

commit bf004bf59808618ba36aa139d01c19c3b7e90249
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 17:59:42 2019 -0300

    Add more items to the release notes

commit 472971a03fcc0ecac944d60d16ec84711415059d
Author: Damian Avila <damianavila@gmail.com>
Date:   Tue Nov 5 16:58:09 2019 -0300

    Remove not used stuff coming from the WIP copy

commit 59b21c1f4ccba6ca051cc02bcd1b94c44b31eff5
Merge: 50d4378b da54ef27
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 30 10:44:25 2019 -0500

    Merge pull request #2281 from rrigdon/how-to-contribute
    
    Added How to Contribute section

commit da54ef278cc36e10b2352ffdf77b71626bcf5170
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 30 10:38:49 2019 -0500

    Incorporated edits

commit 50d4378bea51b4eb113cf46d3bc2a344bd815a9f
Merge: b180dce2 76baab58
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 28 14:22:41 2019 -0500

    Merge pull request #2280 from rrigdon/segmentation-fault
    
    Added info about segmentation fault on package import

commit 59570f1f2141daeca8a4c4e9de9c4cf72d6a8c51
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 28 13:38:37 2019 -0500

    Added How to Contribute section

commit b180dce2b0eaf0559e7ca536f24171769db22019
Merge: 29d53697 6293cc53
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 28 10:54:21 2019 -0500

    Merge pull request #2263 from rrigdon/ide-updates
    
    Major change to VSCode, minor changes to rest

commit 6293cc53768d19d54a56f775aa7093b60910b73a
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 28 10:53:50 2019 -0500

    Removed inaccurate info

commit ba559761c80428339db0900f3ffdcecd7c12e014
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 28 10:15:51 2019 -0500

    Updated broken links

commit 76baab587ea1c724d1ef3e1a665f47e14a0cdc17
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 28 09:34:45 2019 -0500

    Corrected libs to ldflags

commit d6bd0f2babae670afb50d065fc09e3d9ff8c5dfb
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 25 16:11:57 2019 -0500

    Removed repetitive info, cleaned up
    
    Changed ``python3-config --libs`` to ``python3-config -ldflags``

commit f49346940614ef776659facdc5826f2f3ce94e92
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 25 15:09:28 2019 -0500

    Added table of available options.

commit bca0e565be75ca5192bca462c48128ec16c7a0b1
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 25 14:13:22 2019 -0500

    Clarified paragraph

commit 29d536974203c788987a455b6702bdbf39a52e24
Merge: ce8788e5 dca8b84c
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Fri Oct 25 13:45:10 2019 -0500

    Merge pull request #2279 from rrigdon/navigator-updates
    
    Navigator visibility/updates/corrections/screenshots

commit 362e6f70062316c30863228df84e09758545584b
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 25 13:37:35 2019 -0500

    Restructured text

commit d76f6b6c6e009893d6d5f79cf7717b43af37ea7f
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Oct 25 13:35:49 2019 -0500

    Added info about segmentation fault on package import

commit dca8b84cdab45c0bcdb1858ffc2a83dcb211b265
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Oct 24 12:52:29 2019 -0500

    Changed version formatting

commit d6fc4da3cefe8ea5828a4187fb631cb40a32436f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 23 15:50:49 2019 -0500

    Added note about support

commit cac0d44e7c6c8bf0a6e121cc6ac786953e851fc2
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 23 15:40:52 2019 -0500

    Changed toc depth

commit 8dd29cbe4a2388d0f2ac4560bab0dd5b1c0cdb5c
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 23 15:37:07 2019 -0500

    Surfaced nav, screenshots, corrected outdated info

commit ce8788e56c368e61d92d4efa477b5aeee2e772bb
Merge: 25c1e981 5ee0cb96
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 18 14:25:13 2019 -0500

    Merge pull request #2278 from rrigdon/png-failures
    
    Removed broken images

commit 5ee0cb96765b4e6276ac5a7b6b646543001c1602
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Oct 18 14:24:38 2019 -0500

    Removed broken images

commit 25c1e98105d8ee24a5320dbdb73f1432b25357f6
Merge: c54fd0c9 de5e0aa5
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 18 14:11:04 2019 -0500

    Merge pull request #2277 from rrigdon/png-errors
    
    Minor edits, figure attempt again

commit de5e0aa57a51163a463a6a1e449e03a960853ded
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Oct 18 14:10:28 2019 -0500

    Minor edits, figure attempt again

commit c54fd0c9d54bc2c04db09a03c791b31382da48bd
Merge: 351d9c95 4520f072
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Oct 18 13:01:49 2019 -0500

    Corrected default location, updated pics (#2276)
    
    Corrected default location, updated pics

commit 4520f0726e302d5ecd2aec4a427e99d571658ba2
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Oct 18 12:43:51 2019 -0500

    Update docs/source/anaconda/user-guide/troubleshooting.rst
    
    Co-Authored-By: Mike Sarahan <msarahan@gmail.com>

commit bf0deb794fd7009ed4d72e81f688c7c50b3c6d25
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Oct 18 12:01:33 2019 -0500

    Corrected defaut location, updated pics

commit 351d9c95a123db5601c59c6da987ece6029f0795
Merge: a48a06ac 20efe333
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Oct 18 11:05:47 2019 -0500

    Minor edits of Getting Started, IDEs, and OS pages (#2267)
    
    Minor edits of Getting Started, IDEs, and OS pages

commit 20efe333bb18648d5ae401ff0e893fedc3ba4e5f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Oct 17 11:08:59 2019 -0500

    Update docs/source/anaconda/navigator/getting-started.rst
    
    Co-Authored-By: Mike Sarahan <msarahan@gmail.com>

commit a48a06acef2c37458d9ee97ff0d343c4d7ff4cb7
Merge: 1d4555c3 19972a4d
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 15:23:44 2019 -0500

    Merge pull request #2275 from rrigdon/figurefix2
    
    removed images bc they weren't rendering

commit 19972a4dc874cc9c12d534d57fd7ff17b1751c67
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 15:23:15 2019 -0500

    removed images bc they weren't rendering

commit 1d4555c3c367d2bee548df4f6191f5b6cf664236
Merge: bdc450d8 18d492b4
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 14:37:07 2019 -0500

    Merge pull request #2270 from rrigdon/default-location
    
    Updated /opt as default install

commit bdc450d89ea814d356fd8dc2b4ad2a7cae362e8d
Merge: 29e16275 51803076
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 14:32:10 2019 -0500

    Merge pull request #2274 from rrigdon/figure-fix
    
    Image fix

commit 51803076be161f45e55fa1a7f1bd018be1a6a8e6
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 14:31:29 2019 -0500

    Image fix

commit 29e16275060f4c1be109eaf69c046c273a686759
Merge: b90743d0 df1b9c12
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 14:10:39 2019 -0500

    Merge pull request #2273 from rrigdon/imagefix3
    
    fixed image names

commit df1b9c12de8d40a9a7edfc5be14d2c3ccad4cec0
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 14:09:39 2019 -0500

    fixed image names

commit b90743d0db71242648244591ee48bf906fdb51d1
Merge: e3b327d0 49e100a9
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 13:52:37 2019 -0500

    Merge pull request #2272 from rrigdon/image-fix2
    
    Image fix attempt 2

commit 49e100a9bd92cdec11153ac23df44fd9dd8d2e31
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 13:52:04 2019 -0500

    Image fix attempt 2

commit e3b327d0260550a9051e179b48f940fd40c2fbff
Merge: fa90386d 0a5cce67
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 13:30:18 2019 -0500

    Merge pull request #2271 from rrigdon/image-fix
    
    Minor change to figure

commit 0a5cce67932f4543c0a28049fdd0eaf43ee4175c
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 13:29:43 2019 -0500

    Minor change to figure

commit 18d492b4eeaf35ff9e91578651f5a7835ea15573
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Oct 16 13:17:45 2019 -0500

    Changed install location
    
    I think this edit is correct.

commit 328a51b045b35513132cf79c4096d7913ab25d62
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 16 13:06:24 2019 -0500

    Updated /opt as default install

commit fa90386d71af3298b50dcd4204ee069f27019cb9
Merge: ed5f3e98 62d483f3
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 15 13:55:17 2019 -0500

    Merge pull request #2269 from rrigdon/release-notes-2019-10
    
    Release notes for 2019.10

commit 62d483f3b96c93ca55242169a263505ce4837b8d
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Oct 15 13:45:31 2019 -0500

    Updated old pkg list and fixed formatting

commit 42a4946495b7fdd37171c5a5214cf305eb5886a3
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Oct 15 13:29:06 2019 -0500

    Release notes for 2019.10

commit ed5f3e9826224968fdf0ee3a16da01f8461534af
Merge: b4e856eb c7cb4e90
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Oct 15 13:22:13 2019 -0500

    Merge pull request #2268 from ContinuumIO/anaconda-2019-10
    
    Added release hashes

commit c7cb4e90548c176b5edbe9416031cf670f179ace
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Oct 15 13:14:37 2019 -0500

    Hashes

commit 80cad30ae7cc91975d4d80bcfcd25c376ae095fa
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 14 16:19:15 2019 -0500

    Small changes throughout for consistency

commit 1529aaacbb91a2ad19a0a3f53da5e0116baafcbf
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 14 16:19:01 2019 -0500

    Navigator - new image and clarified text

commit 02611f3b8a219e5c64d45ad38b03ee24f563511d
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 14 16:18:31 2019 -0500

    Removed the version marker for documentation

commit b4e856eb50eddf034f3b4e1cfa5e35a51fb4a3a8
Merge: be70ddc9 1440eed2
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Mon Oct 14 13:43:33 2019 -0500

    Merge pull request #2266 from rrigdon/updating-older-versions
    
    Clarified conda update --all

commit 1440eed2da3769ff8af657f345be6947af6bdeaa
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Oct 8 11:34:38 2019 -0500

    Changed `conda update anaconda` to specify the version
    
    `conda update anaconda` is not working as expected so to avoid errors, I changed it to recommend using the `conda update anaconda=versionNumber` instead.

commit d3da333bf76a64ba609a1131951f18cf6a7e4169
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 7 15:29:09 2019 -0500

    Clarified conda update --all

commit be70ddc901a715fbff48cd29520b787445b4dc5a
Merge: 129ed18f 86778ff7
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Oct 7 12:07:11 2019 -0500

    Merge pull request #2265 from ContinuumIO/update-r-pkg-list
    
    Updated r-pkg list

commit 86778ff7d709193f33617571a501a6e3a9da9f05
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Oct 7 12:05:53 2019 -0500

    Updated r-pkg list

commit 129ed18fc76428d9a83c1d9febf9d3c2cb9af31f
Merge: a81bd636 ccc9edf2
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Fri Oct 4 09:31:57 2019 -0500

    Merge pull request #2261 from rrigdon/win-install-updates
    
    Added Prompt instructions for install verification

commit a81bd6360b8fe6a2ae499bac36f502ea0ec841c2
Merge: 593e0795 64bad12d
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Oct 3 15:17:35 2019 -0500

    Merge pull request #2262 from rrigdon/navigator-troubleshooting
    
    Added 3 issues to Nav troubleshooting, formatting edit on PyCharm

commit 64bad12d36b06346da65a36230fc41552de4f430
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Oct 3 15:14:21 2019 -0500

    Clarified line 62

commit 6f8372b0dc8f23661c71105801728360b0b85846
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Oct 3 14:35:00 2019 -0500

    Major change to VSCode, minor changes to rest

commit 1e568156c50fe560d5b1a96e8be2a16e20432d93
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Oct 2 10:47:34 2019 -0500

    Added 3 issues to Nav troubleshooting, formatting edit on PyCharm

commit ccc9edf2a1fb5bdf356bd8fa4d7937e64ba0e520
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Oct 1 16:39:37 2019 -0500

    Moved verification info, provided more CLI instructions

commit 593e07952059bac50fdf1f0f0602661f9fd393a6
Merge: 19ac9d45 196cd271
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Sep 26 10:54:37 2019 -0500

    Merge pull request #2260 from rrigdon/pycharm-updates
    
    Tested and cleaned up PyCharm tutorial

commit dde5802d71e78b6f76ec26a4f3daa84342be161f
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Sep 25 16:32:50 2019 -0500

    Added Prompt instructions for install verification

commit 196cd2710ceb968c4c8ea81f0f19695dde267e62
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Sep 23 12:33:15 2019 -0500

    Tested and cleaned up PyCharm tutorial

commit 19ac9d457c822a2a5f5365e7419c0c3f83f50bcf
Merge: 2a830b3c 5a43bd65
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Thu Sep 19 12:31:44 2019 -0500

    Merge pull request #2259 from rrigdon/md5-scrub-2
    
    Removed references to MD5 for hash verification

commit 5a43bd65da5dfecf58a80540c796d3a350f71c1c
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Sep 16 14:53:18 2019 -0500

    Removed references to MD5 for hash verification

commit b120021003b6503620530ee6374816efb2b7d7e5
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Mon Sep 16 16:00:30 2019 -0300

    Port upgrade fixes to 4.3.3 version

commit 8605efff449e1094e6890a4ec62000cbea811c37
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Mon Sep 16 15:59:51 2019 -0300

    Update upgrade section with latest fixes

commit c47de4b1d50edaa157e4759bdec7f1e022da3ea3
Author: Ben Peters <bpeters@anaconda.com>
Date:   Thu Sep 12 11:20:41 2019 -0500

    Fix pam docs and add release notes stuff

commit db8c19c1be8eed1c6e868a56cc25bdf3affb901a
Author: Ben Peters <bpeters@anaconda.com>
Date:   Wed Sep 11 10:45:36 2019 -0500

    Adding PAM docs

commit 2a830b3c2bd929fe88b29089476fe070cc928540
Merge: 2f635da1 1b722690
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Fri Sep 6 10:55:44 2019 -0400

    Merge pull request #2256 from rrigdon/rrigdon-updating-anaconda
    
    Added more info about updating Anaconda

commit 1b7226907e9c404f2b29320474e6dda813a492bd
Merge: b2155d38 2f635da1
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Sep 5 11:27:36 2019 -0500

    Merge branch 'master' into rrigdon-updating-anaconda

commit 2f635da1f56de7021f5eb10b92257b24e82394ed
Merge: 4d073b98 4bd1a52d
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Sep 5 11:02:14 2019 -0500

    Merge pull request #2257 from rrigdon/rrigdon-update-minor
    
    Minor formatting change

commit 4bd1a52dcef43a75644a432d47a4d4771a61c244
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Sep 5 11:01:40 2019 -0500

    Minor formatting change

commit 4d073b98ab6fa7274960c6559c43a99e8dec0790
Merge: c2305783 43fdb357
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Sep 4 15:21:42 2019 -0500

    Merge pull request #2254 from rrigdon/glossary
    
    Added anaconda metapackage to glossary

commit b2155d3836b25c5266862edba54e1ef41034f420
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Sep 3 12:17:13 2019 -0500

    Added more info about updating Anaconda

commit f7c560d2e2eef6777995825eb244872986df49bb
Author: Ben Peters <bpeters@anaconda.com>
Date:   Fri Aug 30 09:45:52 2019 -0500

    add release notes to 4.3.3 folder

commit 8fe3c8670b0360681158f3d095a58bbc9421f2d0
Author: Ben Peters <bpeters@anaconda.com>
Date:   Fri Aug 30 09:43:41 2019 -0500

    Adding some release notes

commit 43fdb3577c0aab1ba4d7b6d27e93fd137c52e503
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Aug 29 15:56:44 2019 -0500

    Added Anaconda metapackages to glossary

commit 0f0c045343dbb1a6498e2b3803a2d739e1ca38b6
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Aug 27 14:33:03 2019 -0500

    (WIP) getting docs ready for 4.3.3

commit c2305783232e18d97437b61189414b3b43fc75d2
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Aug 21 08:37:41 2019 -0500

    fixed graphviz version

commit 1f5413c83792425b2627fbed66cd04c2616b5517
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Aug 21 08:35:38 2019 -0500

    fixed broken link on blas

commit ae5c0e584dddec6bc6c180a78574bc4fac06f4df
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Aug 16 16:35:34 2019 -0500

    removed old image

commit 296e51b382db8aee9682e72035534892fc6b6f72
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Aug 16 15:36:42 2019 -0500

    Minor grammatical changes

commit 3d6253e2755778fde47b4bdb23ee5e4d15745506
Merge: 5116f39e de933c59
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Aug 15 10:18:45 2019 -0500

    Merge pull request #2253 from rrigdon/troubleshooting-tmp
    
    Added troubleshooting for install issues with TMP

commit 5116f39e2c2c4636769f56b12dea2d85108da0d9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Aug 14 11:21:11 2019 -0500

    added missing space per AEN-1391

commit de933c5909222b1bb95d21c76920b96584471c15
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Aug 14 10:17:38 2019 -0500

    Added troubleshooting for install issues with TMP

commit 46ef0fbebebcc055022f46445a861606d4279dc5
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Aug 13 10:34:45 2019 -0500

    replace broken html links with actual refs

commit 876e08b19cc311e52da5f03e874b5d0d3c49e4ac
Merge: b74b2a78 7966e204
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Aug 8 15:09:50 2019 -0500

    Merge pull request #2252 from rrigdon/gpu-update
    
    Added link to GPU blog

commit 7966e204bc2b1b0872ef44ada6343cefbb0b2358
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Aug 8 15:04:55 2019 -0500

    Added link to GPU blog

commit b74b2a78d40598874509e0135f94daff71d93958
Merge: 671a1b78 fae2e49f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Aug 1 10:29:40 2019 -0500

    Merge pull request #2250 from rrigdon/updating-anaconda
    
    Added more detail around upgrading Anaconda

commit fae2e49f478c1e1e77baac22de8dc6945989028f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jul 30 17:29:15 2019 -0500

    Removed solver info

commit 671a1b782088be1b44e64f9159834c97cf894384
Merge: 1942d61c 4dc5ac03
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jul 30 13:24:29 2019 -0500

    Merge pull request #2251 from rrigdon/install-directions
    
    Updated install directions for 2019.07

commit 4dc5ac0309f145ceaa1bb348ae76480bb245d57b
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Jul 30 13:23:52 2019 -0500

    Updated install directions for 2019.07

commit 83e7b3c6a3b4eec94a167c3e3ad4140ce9cb83df
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jul 30 09:27:10 2019 -0500

    Minor formatting changes

commit 34e998bd80fad1272b438aa6ef1bad03f9be0f71
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jul 29 17:01:29 2019 -0500

    WIP - Added more information about updating
    
    I added more information based off of Jonathan's comments but this still needs further review and clarification.

commit 6458a152cdfffc6990801a40b2054e38e73985a5
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jul 29 11:58:51 2019 -0500

    Added clarification

commit 80965a3e7d83358b51379a7307053001812875eb
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Jul 25 11:37:04 2019 -0500

    Added more detail around upgrading Anaconda

commit 1942d61ce3d7083d3472e93b3670e2c6c13c91fa
Merge: 7d9638d1 d0eaca74
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Jul 25 11:09:03 2019 -0500

    Merge pull request #2249 from rrigdon/renaming-old-pkgs
    
    Renamed 2019.03 pkg list titles

commit d0eaca740c7062235cbebd47b136e440651702cc
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Jul 25 10:58:10 2019 -0500

    Renamed 2019.03 pkg list titles

commit 7d9638d10572661589d24471cc09bde0f3abb1b1
Merge: 49b3762c 9c062145
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Thu Jul 25 10:26:43 2019 -0500

    Merge pull request #2248 from ContinuumIO/old-pkg-2019-03
    
    Added 2019.03 pkgs to index for old pkgs

commit 49b3762cb651d08cad7c3fe88aae623bf889d5d0
Merge: 55d722a3 a0e1d485
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Thu Jul 25 10:20:58 2019 -0500

    Merge pull request #2247 from jjhelmus/update_hashes
    
    update hash pages

commit 9c062145167b9e9733064524521082334a3dedef
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Jul 25 10:20:54 2019 -0500

    Added 2019.03 pkgs to index for old pkgs

commit a0e1d48536fc643bd29e01b6deb1bc1202e4dcd7
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Thu Jul 25 10:18:51 2019 -0500

    update hash pages

commit 55d722a398ba35dc0452f45df3b24933dca4c9d8
Merge: 8b87e5b2 7ff9ba80
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 15:06:13 2019 -0500

    Merge pull request #2246 from jjhelmus/reformat_hash_table
    
    reflow all.rst

commit 7ff9ba80a50a9c4300bc23f81cf264193eda6e91
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 15:05:10 2019 -0500

    reflow all.rst

commit 8b87e5b21f7174c3588bdac4959086c24cce5bc5
Merge: 2fe8bf35 4373c16f
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:51:25 2019 -0500

    Merge pull request #2244 from jjhelmus/an_2019.07_release_notes
    
    update release-notes.rst for Anaconda 2019.07

commit 4373c16fd78158c21d3e2fe6b8eb30af68cd8d68
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:40:34 2019 -0500

    fixup spacing in release-notes.rst

commit 2fe8bf356a79b22cafe6c6745dac84e8c94fdb73
Merge: 5d1c7c6b b0bc891e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Jul 24 14:36:33 2019 -0500

    Merge pull request #2245 from jjhelmus/package_list
    
    update package lists for AD 2019.07

commit b0bc891e96bac702ed414a4a6f397a6369fa6424
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:25:35 2019 -0500

    update package lists for AD 2019.07

commit 5d1c7c6b56360ff0ce0714e50508d721d7b92db8
Merge: 7dab8ff2 7fee12c8
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:18:54 2019 -0500

    Merge pull request #2243 from jjhelmus/an_2019.07_hashes
    
    Add hash information for Anaconda 2019.07 installers

commit 621f9408389abb243784279644a110aff553a770
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:18:26 2019 -0500

    update release-notes.rst for Anaconda 2019.07

commit 7fee12c846e520fe8e2257e7aaa56d5597470b9a
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Jul 24 14:11:19 2019 -0500

    Add hash information for Anaconda 2019.07 installers

commit 7dab8ff2ce4e14315e95fcc0c682270c91d2807c
Merge: a3cfc4cc 231338ae
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jul 22 15:11:20 2019 -0500

    Merge pull request #2242 from rrigdon/link-fix
    
    Correcting link

commit 231338aeba9fdb73f7cba3acdc2deb285ef64fa2
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Jul 22 15:09:53 2019 -0500

    Correcting link

commit a3cfc4cc41c4f817ab2d7d84665cb8e914f51e57
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Jul 12 11:41:02 2019 -0500

    fixed bad link

commit e881b308d0d4cb2b200b5531123bd34f954df63d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Jul 12 11:10:40 2019 -0500

    fixed broken links

commit 72349a78621815390dd37841048db738dacdf7d5
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:58:48 2019 -0500

    fixing build failure

commit 2407738eee253a52e0b43e49428ca6af4a0d6cf8
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:57:37 2019 -0500

    removed bad link

commit 92dd6f756b84c5680e582376c3e9b4c36fb0eef6
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:56:57 2019 -0500

    removed bad link

commit b9fb17094e766d89e556913039241813a6ecf5ea
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:51:53 2019 -0500

    kicking off new build after failure

commit 5421f95eb46e83c0b4c1ac67b097eeb73092b7c3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:43:11 2019 -0500

    updated per legal (Kate's) requests

commit 3acf553d61a2e7fe4f59afc19780932b32941f4b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:42:24 2019 -0500

    updated per legal (Kate's) requests

commit 7e32fd4e5b52f88cb5003bbad8dc7389f80b8163
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jul 11 15:39:11 2019 -0500

    updated per legal (Kate's) requests

commit f79a416b7b3762126eed64379c3083f21842feb7
Merge: 0ebfd7bc 67b6cc69
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Jul 11 11:54:07 2019 -0500

    Merge pull request #2241 from rrigdon/Fedora
    
    Added info about Fedora and the compat pkg

commit 67b6cc69dba17e584e38a1638c9b2b63c76fab8b
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Jul 11 11:53:40 2019 -0500

    Added info about Fedora and the compat pkg

commit 0ebfd7bc3c1be78ac1a380c911dfd39dcfef5309
Merge: 4aa7fb49 afa1d9f1
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jul 8 14:12:31 2019 -0500

    Merge pull request #2240 from rrigdon/pycharm
    
    PyCharm page and tutorials

commit afa1d9f166e5325a5f604c09e683421b1759ff27
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Jul 8 14:11:40 2019 -0500

    Reorganized and grammatical edits

commit 389fea0c8c2f94f00dcfa2b30c584cfe06340dad
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Jul 8 13:17:05 2019 -0500

    PyCharm page and tutorials

commit 4aa7fb49997a4de7bc2ceb3f2bcc0d96aeace995
Merge: 6c4cb315 7890e69d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Jun 26 10:02:35 2019 -0500

    Merge pull request #2239 from ContinuumIO/bpeters/document_secure_cookie
    
    Adding documentation for secure_session_cookie

commit 7890e69dde80c6dd249ee06b22dbe14aa9752057
Author: Ben Peters <bpeters@anaconda.com>
Date:   Mon Jun 24 11:10:01 2019 -0500

    update doc

commit bbedfb0c5c44865b1fae714e547090aefae5da61
Author: Ben Peters <bpeters@anaconda.com>
Date:   Mon Jun 24 11:06:48 2019 -0500

    Adding documentation for secure_session_cookie

commit 6c4cb3157ad3afe63de12bd531552e7ce42f3ed2
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Jun 19 14:44:10 2019 -0500

    fixing html formatting

commit aaf8242a0c1f192e8cb1e53b527da9f2a78f3b47
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Jun 19 13:49:48 2019 -0500

    fixed formatting

commit ca681babb41a71f51b1a1966e7417a9d7a759c7a
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Jun 19 11:47:34 2019 -0500

    updated per issue 5348
    
    https://github.com/Anaconda-Platform/anaconda-server/issues/5348

commit e92a4a12d7dc0536350f07ab267cdf62a43e2cea
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Jun 18 13:17:36 2019 -0500

    updated per AEN-1446

commit 02d8144b1f75f4df9bfc51707c4c8d7896548b89
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jun 17 09:09:24 2019 -0500

    updating link to conda docs

commit 7e6dc80450d515333a1265eec23850843d542daf
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jun 13 15:08:35 2019 -0500

    added missing link to 4.3.0 upgrade

commit 85b1d4a858beb33a69d62be54edc6651fb8448a1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Jun 13 15:06:43 2019 -0500

    added missing link to 4.3.0 upgrade

commit eba619adfb4b95ba75e4e2f0ca2f2eaa9a56178a
Merge: c29f376c a7882a4a
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jun 4 11:02:03 2019 -0500

    Merge pull request #2238 from rrigdon/5-2-old-pkg-list
    
    Added in 5.2.0 old-pkg-list info

commit c29f376cb058fcb52e5e987b86b843b19806931b
Merge: e5276636 dca67267
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jun 4 11:01:46 2019 -0500

    Merge pull request #2229 from rrigdon/install-older-os
    
    Added info on using Anaconda on older OS

commit e5276636feb9b993acc8499660f9f12f74684b01
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jun 3 10:45:52 2019 -0500

    renaming to block building

commit 04e810fcfc7a8d070b11eb2ce25ba32609263ce3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jun 3 10:45:26 2019 -0500

    renaming to block building

commit ead1267a7cfcd8a658302dab48b89e615b7f88cd
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jun 3 10:44:59 2019 -0500

    changing extension to block building

commit fb235d68408d51b377d3b45d868b616d26676994
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jun 3 10:44:36 2019 -0500

    changing extension to block building

commit a7882a4ae85397de42b754b81b23e40e49725819
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri May 31 13:37:47 2019 -0500

    Added in 5.2.0 old-pkg-list info

commit 0aebf1528125492ccc41d5c3409c231c03d53b15
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri May 31 10:13:21 2019 -0500

    updated per feedback from Bradley

commit 8e83758e177e1198456a2d0e6866d02698d11428
Merge: 7887b6a9 3923cc76
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu May 30 14:15:59 2019 -0500

    Merge pull request #2237 from rrigdon/eclipse-img-fix
    
    Fixed broken image links

commit 3923cc76734c6eddc2fa6675b8126da6a2a4027a
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu May 30 14:11:14 2019 -0500

    Fixed broken image links

commit 7887b6a908e8f67abf0eafe713569748b08c7ff2
Merge: b664abd1 0ca93e6a
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu May 30 13:51:00 2019 -0500

    Merge pull request #2235 from rrigdon/eclipse
    
    Added detail and updated screenshots - Eclipse with PyDev

commit b664abd1c6c38dc2f46a10278a49bba2cd9e7b77
Merge: 2290fde1 06ee3f2b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu May 30 13:27:43 2019 -0500

    Merge pull request #2236 from ContinuumIO/bpeters/add_missing_aen_upgrade_step
    
    Add missing upgrade step

commit 06ee3f2bab80577df1cf25bad6a387d0af307c9b
Author: Ben Peters <bpeters@anaconda.com>
Date:   Thu May 30 09:49:38 2019 -0500

    Add missing upgrade step

commit 0ca93e6a239306e510a135a88cb68616f14b1d47
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed May 29 17:20:29 2019 -0500

    Added detail and updated screenshots - Eclipse with PyDev

commit 2290fde153afa1d51f70a401c3fc6cff04636a0c
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 15:19:34 2019 -0500

    updated date and formatting

commit 1aa74e38f1244a53380757da31fab481b4fc41a0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 15:17:47 2019 -0500

    went too far on versions

commit 4b824af0f557258129e6d0fcdfbbea3e35b13f1d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 15:09:06 2019 -0500

    added last 2 previous releases

commit f181ed5fe4269c5e80fe4caf5dfaa8bd82efbfba
Merge: 86f9544b bb409981
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 15:02:46 2019 -0500

    Merge pull request #2234 from ContinuumIO/bpeters/aen_432_docs
    
    changed date and fixed formatting

commit bb409981a63191baead4b58683249e6f0b1a8986
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 14:51:44 2019 -0500

    changed date and fixed formatting

commit 86f9544b9cd97f14450bf225ed94a02e8620433e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 13:08:11 2019 -0500

    changing to today's date

commit 4d8c4b3a84965ccde2bbe280dbd38fd5b0bede45
Merge: eb66fe15 147a7781
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 12:58:50 2019 -0500

    Merge pull request #2233 from ContinuumIO/bpeters/fix_upgrade_docs
    
    fix version

commit 147a77813067587eb4251a65608e0a90724efb9a
Author: Ben Peters <bpeters@anaconda.com>
Date:   Wed May 29 12:16:53 2019 -0500

    fix version

commit eb66fe1556b4aa3edb18141cc38fa2948956bfeb
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:42:27 2019 -0500

    fixed formatting for last release

commit 891df2b08329b0727223413ff74f7d41c8472b70
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:35:41 2019 -0500

    fixed bulleted list

commit 0a25844345a0370c792b109f99dfc7f7214401ad
Merge: 6848a042 cff0def6
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:27:15 2019 -0500

    Merge pull request #2232 from ContinuumIO/bpeters/aen_432_docs
    
    Adding docs for aen 432

commit cff0def6a36684cc4b66df0290d7034062e9c6d2
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:26:02 2019 -0500

    formatted commands

commit 40d86466144437dfe6506ff2f80f0e046605278e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:23:08 2019 -0500

    formatting notes

commit dee9f2b85a80ac84a874bd2c8c08cedf82349533
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:22:04 2019 -0500

    formatting note

commit ffcfef5ff02e7472f138e5ed76d855c0e8b62510
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:21:18 2019 -0500

    formatting only

commit 06036c0ae48c96a932224b0c1157778d64598b31
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:19:45 2019 -0500

    minor edit

commit 92c6a0ababa54f9b32e356296b05b613f04b12c9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:18:30 2019 -0500

    minor updates

commit dcc517de23a9850ad8ff5f31f0796b8f6dfbb6ef
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:13:57 2019 -0500

    minor edits

commit b44c6eb21f5f8ee7ebdbdac0cbed07a6e5c8ba1d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed May 29 11:00:52 2019 -0500

    minor punctuation

commit 95bd68778fa163218fa8b6e94c65669d7df0de0d
Author: Ben Peters <bpeters@anaconda.com>
Date:   Wed May 29 10:39:31 2019 -0500

    Adding docs for aen 432

commit 6848a0426411cc323c8decfc90cbe6cbbcbc351c
Merge: 62d2d319 00ffd175
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue May 28 10:03:46 2019 -0500

    Merge pull request #2231 from rrigdon/free-default
    
    Updated repository section - free channel is not default

commit 00ffd175144fb62ec2b794a971c8377210e74cda
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue May 28 10:02:17 2019 -0500

    Changed release date for this feature
    
    Co-Authored-By: Mike Sarahan <msarahan@gmail.com>

commit bcb33b6730b3162bdf50c64819756b5ea1b254d5
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu May 16 13:53:15 2019 -0500

    Updated repository section - free channel is not default

commit 62d2d31940acd6f79a795ddcedcc7dbc4c95743b
Merge: 537a56fd 6c310437
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu May 16 10:16:21 2019 -0500

    Merge pull request #2230 from rrigdon/fix-word-change
    
    Minor word change

commit 6c310437795f07cb04de78d856c6a50e010f0c5b
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon May 13 15:34:37 2019 -0500

    Minor word change

commit 537a56fdc4dffa50a9002c450fdcde83d15f26cb
Merge: 654270ef b29ceeae
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon May 13 15:26:42 2019 -0500

    Merge pull request #2228 from rrigdon/private-packages
    
    Added that you can't sign up for private packages

commit b29ceeaea55253ae6d226164d605f792a70bc1c2
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon May 13 14:59:39 2019 -0500

    Standardized notes and cleaned up formatting

commit bec6e70b925b8f37067c0481612ad3546dc05f0d
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon May 13 14:25:01 2019 -0500

    Revised notes throughout
    
    Removed brackets around placeholder text, put in notes to add clarity, removed some redundant notes.

commit dca672671171e55352b6ba492b82b6dcd49e303c
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon May 13 10:46:57 2019 -0500

    Added info on using Anaconda on older OS

commit 729a8e13ad04850799d8503883fb4cfdaf040759
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed May 8 11:20:13 2019 -0500

    Minor formatting changes

commit a97406e451ca3e1ae38ee4004db8b576ec6d2330
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed May 8 09:44:30 2019 -0500

    Added that you can't sign up for private packages

commit 654270ef1b3055a3ff43e1c83126d002c1578078
Merge: 9728366e 6b7b4f3e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu May 2 11:14:28 2019 -0500

    Merge pull request #2226 from rrigdon/install-fixes
    
    Updated linux and mac install instructions

commit 9728366ef7edef6127c1491b82f273f12fd369f8
Merge: 5952c00c 8b3bb004
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Apr 30 13:39:10 2019 -0500

    Merge pull request #2227 from rrigdon/tutorial-index
    
    Added tutorial to index

commit 8b3bb00494f1b4752dedc1a4b55230dc33655585
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Apr 30 13:38:44 2019 -0500

    Added tutorial to index

commit 6b7b4f3e25899c18bf63c1bf69d8aa92c0cee8dc
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Apr 30 13:20:25 2019 -0500

    Removed Linux types to just 2
    
    Removed different Linux types to just show RedHat and OpenSuse.

commit 7fa81a89ecae304a0ef94beb39e8bacf0f3ad377
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Apr 25 11:12:31 2019 -0500

    Updated linux and mac install instructions

commit 5952c00c0c057a47c10f446f0dce2cad54744e3f
Merge: 86fef35b 69a58122
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Apr 23 12:21:43 2019 -0500

    Merge pull request #2225 from ContinuumIO/spara
    
    Spara

commit 69a58122218c0bb5eaa246b74a49fefb412c9dcd
Author: spara <sophiaparafina@gmail.com>
Date:   Tue Apr 23 12:06:58 2019 -0500

    added context to R-tutorial

commit b7f402caa7ec977fdb4663c52093fa2e739daaf9
Author: spara <sophiaparafina@gmail.com>
Date:   Tue Apr 23 12:05:02 2019 -0500

    added context to R-tutorial

commit 86fef35b7756378caeda520b73b46feb3f091bb3
Merge: 45b2a174 03b4f2b7
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Tue Apr 23 11:02:56 2019 -0500

    Merge pull request #2221 from rrigdon/nav-app
    
    Nav app tutorial and CSS highlighting change

commit 45b2a174703f2101962caaa7b1cfe1b9d5d63546
Merge: bfa2a21e 859536c9
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 19 09:50:43 2019 -0500

    Merge pull request #2224 from ContinuumIO/msarahan-patch-1
    
    adjust language around conda init for silent install

commit 859536c9f37c00fa622a1a9eb4858eed87343f8c
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 19 09:22:57 2019 -0500

    adjust language around conda init for silent install

commit bfa2a21ebf506d2dfe307d66ea43f07f59094b86
Merge: 94caea70 6c8da8f7
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 19 09:15:16 2019 -0500

    Merge pull request #2223 from rrigdon/install-directions-fix
    
    Removed "test" from install path

commit 6c8da8f775c181d2ccd8ab0adc7de5d11d0e020e
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 19 09:10:58 2019 -0500

    Removed "test" from install path

commit 94caea70d978c5d41b5c09c14ac60082dbb955a1
Merge: de67cbdd f98308b1
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Apr 18 13:21:30 2019 -0500

    Merge pull request #2222 from rrigdon/nav-screenshots
    
    Updated screenshots

commit f98308b1f6e3d9907fc807de5aa11283035be19c
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Apr 18 13:21:04 2019 -0500

    Updated screenshots

commit 03b4f2b75fb725a3c0fdd2b85211228c48e80710
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Apr 18 12:34:07 2019 -0500

    Nav app tutorial and CSS highlighting change

commit de67cbddf8feac590ef1198d6ebe806e2d61fe55
Merge: 460031e6 a5f280ac
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 14:11:26 2019 -0500

    Merge pull request #2220 from rrigdon/user-feedback5
    
    Minor edits in IOPro and managing nav pkgs

commit 460031e68d5b50321502fc92bcda709e642ad515
Merge: 337f0f21 1221385f
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 14:08:54 2019 -0500

    Merge pull request #2218 from rrigdon/docs-installer-guides
    
    Updated install directions and screenshots

commit 1221385f644fb54c548e66bc6419446faad0fbb3
Merge: ab4f4e9c 337f0f21
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 14:02:21 2019 -0500

    Merge branch 'master' into docs-installer-guides

commit ab4f4e9ca97c3b05b7626f28feb33f08d44eda54
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 13:59:49 2019 -0500

    Changed language around PyCharm install

commit ea92808d06063e5141e6e93867939a104c3282f5
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 13:59:21 2019 -0500

    Changed language around JetBrains
    
    Changed from "partnership" to:
    The installer provides a link to install PyCharm for Anaconda at https://www.anaconda.com/pycharm.

commit a5f280acdb68c94690fb679a0ebae91acc5759f9
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 12 13:56:36 2019 -0500

    Minor edits in IOPro and managing nav pkgs

commit 337f0f211bbe84c51027808f05236972882c9262
Merge: fe2c2dc5 713af94c
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 12 13:26:22 2019 -0500

    Merge pull request #2219 from rrigdon/old-pkg-list
    
    Fixed titles and added 2018.12 to old pkg list

commit fe2c2dc52e28d6dd6388a1f2218da1968155605b
Merge: b0db45f4 c78ffcf0
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 12 13:25:36 2019 -0500

    Merge pull request #2217 from rrigdon/troubleshooting-update
    
    Added PowerShell in troubleshooting, minor edits to FAQ

commit c78ffcf06ea6ef8c0f9eb6a975b15e923be27b4e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 12 11:24:19 2019 -0500

    Updated link from continuum.io to docs.anaconda

commit 713af94c7ab2710e20b07f91e5d45797058f2741
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 12 10:34:20 2019 -0500

    Fixed titles and added 2018.12 to old pkg list

commit 836d69a1822e9cca6a2e76b6794b8939755ff23f
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 12 09:48:53 2019 -0500

    Updated install directions and screenshots

commit 2608df4cbbd738e13f2228a10f413c2084742fe6
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Apr 9 15:15:27 2019 -0500

    Added PowerShell in troubleshooting, minor edits to FAQ

commit b0db45f46c1b810783f72fc30a6b9b61b9809058
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Apr 8 13:08:58 2019 -0500

    update package lists for r

commit 733c6cc6de57c1f67e1ca5d9d4c286127ec2986e
Merge: 5b5cbd05 e3975161
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 5 13:13:58 2019 -0500

    Merge pull request #2216 from rrigdon/Fixing-release-date
    
    Changed date on release notes to April 4

commit e39751618fe862cfc06b2e56b507fceb380e43e7
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 5 13:00:55 2019 -0500

    Changed date on release notes to April 4

commit 5b5cbd05e6c31c781332558165602406c5f38df8
Merge: b342df0c 4a8b366c
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 5 12:00:23 2019 -0500

    Merge pull request #2213 from jjhelmus/pkg_lists_2019.03
    
    Update pkg lists for Anaconda Distribution 2019.03 release

commit b342df0c05684bd9d0276a9487f530316caaeb0a
Merge: 44a31478 b23ef8a8
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 5 11:55:54 2019 -0500

    Merge pull request #2215 from jjhelmus/hashes_ad_2019.03
    
    refresh hash information for AD 2019.03 release

commit b23ef8a8362537702242478be83624a747971ccf
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 11:34:01 2019 -0500

    refresh hash files

commit 44a3147859803efad167d3268d8d493907555130
Merge: 60354052 c7fcdc99
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 11:04:29 2019 -0500

    Merge pull request #2214 from rrigdon/release-removing-linux-32
    
    Removed refs to Linux 32

commit c7fcdc991e7de6197f076fcdf7405e44e0188d70
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Apr 5 11:02:49 2019 -0500

    Removed refs to Linux 32

commit 4a8b366c501431691f9c4c6525225030a3e78f2d
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 10:49:47 2019 -0500

    update package lists for 2019.03 release

commit 603540521be7d3766bdcdbbc99202e01c99ce356
Merge: e600a98d e0c9bd60
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Apr 5 10:49:36 2019 -0500

    Merge pull request #2211 from rrigdon/release-2019-03
    
    Cleaning up for 2019.03 release

commit 06bdd28471abb6a802e041e39cab1bbdfccb2eb8
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 10:48:18 2019 -0500

    remove linux-32 packages lists

commit b7605ba064197d9ef03bb22282d7890a516635f3
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 10:47:38 2019 -0500

    copy 2018.12 pkgs lists to old-pkg-lists directory

commit e600a98d2a4059b9d65abe1a3fdfd214d1bb6ac6
Merge: 72be9ff4 31f607f3
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Apr 5 10:24:32 2019 -0500

    Merge pull request #2212 from jjhelmus/release_notes_2019.03
    
    update release notes for 2019.03 release

commit 31f607f30fe4ad32b4728605f8eb00f9acc4473e
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Apr 5 10:18:28 2019 -0500

    update release notes for 2019.03 release

commit e0c9bd6094a9fc62c539465863ffdd5630f6e8c9
Merge: ff7a34d1 72be9ff4
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Apr 4 17:11:53 2019 -0500

    Merge branch 'master' into release-2019-03

commit ff7a34d14671a24e80d533adb0187967d0817f82
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Apr 4 14:20:25 2019 -0500

    Added in 2019.03 release info, removed 5.3.5 refs, standardized titles

commit 72be9ff45fabfc17f7c14877af480bee92704b36
Merge: 6660a33b 1b8bceea
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Thu Apr 4 11:57:33 2019 -0500

    Merge pull request #2210 from nehaljwani/DSNC-1074
    
    DSNC-1074 Sort list by installer versions

commit 1b8bceea9749c367ff1ce534098a92fc835adea0
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Thu Apr 4 22:23:43 2019 +0530

    DSNC-1074 Sort list by installer versions

commit 6660a33b1858415b3ef919bb757f8b0b335758fb
Merge: ab2f00a8 e0df0fea
Author: Jonathan J. Helmus <jjhelmus@gmail.com>
Date:   Wed Apr 3 17:02:00 2019 -0500

    Merge pull request #2209 from rrigdon/user-feedback-3
    
    User feedback 3

commit e0df0feaa9f5efb95ebe35af91952271bee95645
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Apr 1 15:35:18 2019 -0500

    Corrected cheatsheet links

commit 127d796cfd895099ea55bbbe992d329c3534fc7f
Author: Rachel <rrigdon@anaconda.com>
Date:   Mon Apr 1 15:07:24 2019 -0500

    Updated installation links

commit ab2f00a8288b01ca1acea96aba15f3a32129046f
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Apr 1 15:06:34 2019 -0500

    removed 2nd toc tree

commit d8eb0ce690cbd412330da3abddc699cd64509a05
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Apr 1 13:34:51 2019 -0500

    removed resources that result in broken links

commit 442f4958767e93df0c33da5b690b25c06f9cad9b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Apr 1 11:46:01 2019 -0500

    removed broken link to old, non-existent blog post

commit 870b5e98f749dc36f52ad51ed5d3070bbe081c00
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Mar 29 16:47:12 2019 -0500

    User feedback on getting started, installing mac

commit 6b666bbcba4651742064fcaef8fd496e70aa69a6
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Mar 28 11:49:08 2019 -0500

    Changed page name to "using-r-language"

commit 346b15d82378940f68f74f73d424441ad3344312
Merge: e49074f5 69e78e70
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Mar 28 11:43:42 2019 -0500

    Merge pull request #2208 from rrigdon/renaming-r-doc
    
    Renamed to "using-r-language" and updated references

commit e49074f5a29b88abd7ee3ac757f53eeb8f89f57f
Merge: 5b43ad2e 73ea1980
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Wed Mar 27 10:47:16 2019 -0500

    Merge pull request #2207 from rrigdon/rrigdon-admonitions
    
    Adding in admonitions

commit 73ea1980e5cce152778e7b7f36603f0da9ad57f9
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 26 14:35:40 2019 -0500

    Changed admonitions and grammar

commit 5b43ad2e24a11dfccef1cdd380f32b8f427c5d6b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 26 13:42:18 2019 -0500

    Update index.rst

commit 235af0e98e2af4eb35e7eca07371286e0fe3fe9f
Author: Kelly Wells <kwells@anaconda.com>
Date:   Tue Mar 26 13:24:27 2019 -0500

    archiving 4.3.1 docs
    
    archiving 4.3.1 docs

commit 6233da1a91882af0c6aec09df0b180c7900d0c59
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 26 13:18:01 2019 -0500

    Admonition and grammatical updates under Navigator

commit 69e78e70631c5168bac40c2fa836d3a979ea26f6
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 26 12:49:37 2019 -0500

    Renamed to "using-r-language" and updated references

commit 8ed460fd407a503d849cb245d5ed96970c7d626b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 26 11:19:01 2019 -0500

    Delete 4.3.1

commit 1ad6672477467ca2ef592bc6194e489b90e504e4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 26 11:18:38 2019 -0500

    creating new archive directory

commit 351473fbd8413e8450089317bce3062c046d9fe0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Mar 25 13:21:57 2019 -0500

    added date

commit f9c21b5679fd66553a1e5d515ea177ff6764473e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Mar 25 13:21:43 2019 -0500

    added date

commit 6365ab71bf56dcd2dd67f1f411ecb2456728c87c
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Mar 22 15:37:16 2019 -0500

    Added admonitions into Integration docs

commit 4aaf37683212f73ccde3aa07f4744eca12decf24
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Mar 22 15:31:07 2019 -0500

    Added admonitions to tasks

commit 53633b4d5f74121a8312551458603524040598ea
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Mar 22 15:10:09 2019 -0500

    Admonitions put in for installation docs

commit 8d57006c39ceb73e9f4122d3c9ec9b06c90f9961
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 21 14:03:40 2019 -0500

    added link to 4.3.0 in previous versions

commit a2b0758a57a5fa8691d8161c12593dbba017b09d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 21 10:46:47 2019 -0500

    Update index.rst

commit 6e32f5ab6fe4d424a0b133527e0a53005dcdf502
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 21 10:46:03 2019 -0500

    Update release-notes.rst

commit 29e955035adc5d6dd99f10cd57455ec529dbeae0
Merge: d1ff8449 fe2bc708
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Mar 21 10:12:52 2019 -0500

    Merge pull request #2205 from rrigdon/distro-admonitions
    
    Added custom css to properly format admonitions

commit d1ff84492a34e9299be4daca16d6805a773cc5bd
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 21 09:41:50 2019 -0500

    fixed date

commit 5508c712e282a2686a00f3f4df91c8029816a592
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 21 09:41:13 2019 -0500

    updated date

commit fe2bc70879cc9723c6c4e440e7e9517a48289faf
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Mar 21 09:36:43 2019 -0500

    Edited CSS formatting

commit f986b651d77dd3d94a181462c87b3786e6feb048
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Mar 20 16:24:57 2019 -0500

    Deleted lingering font files

commit 45c8aa01494bd1ff76d3dfa0e35643063036aefd
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Mar 20 16:17:21 2019 -0500

    Removed fontawesome bc workaround found

commit c5eccce6562c8ea3ad840ec9e033d6bc5597b493
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Mar 20 11:53:25 2019 -0500

    Updated CSS to make icons in admonitions

commit 5fa547e252d6c1387729b7b5f1c5d3532dd2b01b
Merge: cc8ce22b 0521c2fb
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Mar 20 13:53:19 2019 -0500

    Merge pull request #2206 from ContinuumIO/damianavila-patch-1
    
    Update 4.3.0 leftover

commit 0521c2fb7ec06cb78fb5dd81c9df6b91140a8cc6
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Wed Mar 20 15:46:42 2019 -0300

    Update 4.3.0 leftover

commit 46acf2fdb8b04579ac1b9426be258278cad89e5b
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Mar 19 16:40:56 2019 -0500

    Removed extraneous content
    
    Removed some content that held in there for notes.

commit 8ae1b5731c82aa126a81b7324a71f6f87023b441
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 19 16:31:53 2019 -0500

    Added fontawesome and custom css to properly format admonitions

commit cc8ce22b949c3e40bd1049104869faa4bd2cf491
Merge: f90990f8 0cb50710
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 19 13:05:57 2019 -0500

    Merge pull request #2202 from rrigdon/user-feedback2
    
    User feedback2

commit f90990f8830084513fdc86d1c0850205734ac93d
Merge: 8c9adf45 6cc0b0df
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 19 11:04:13 2019 -0500

    Merge pull request #2204 from ContinuumIO/bpeters/add_more_docs
    
    AEN 4.3.1 Add remaining docs changes

commit 6cc0b0df25dc491b48e3b282f77ab6773a92a649
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 19 11:03:24 2019 -0500

    added comma

commit 6fc7f8042943939f14b5f2cc61d3918c11a00082
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Mar 19 10:09:36 2019 -0500

    Add remaining docs changes

commit 8c9adf45dbfbf5004e09ae09b569b250736ab58d
Merge: 64bff124 6840d2f0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 14 15:48:59 2019 -0500

    Merge pull request #2203 from ContinuumIO/bpeters/update_431_docs
    
    Add AEN 4.3.1 docs

commit 6840d2f09fca6ef8d4a0084d5b873b96aaa1a5bb
Author: Ben Peters <bpeters@anaconda.com>
Date:   Thu Mar 14 15:43:28 2019 -0500

    Add remaining docs changes

commit 0cb507101a14f5cc47d149a560729c60b32990f5
Merge: 800e29e0 64bff124
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 12 15:52:50 2019 -0500

    Updated starter guide, cleaned up docs

commit 800e29e00a2dfe838aaab6f61f3773bd84db689b
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 12 15:50:58 2019 -0500

    Added screenshots and reorganized content

commit 64bff12499f95c5480d027e63c1048373a1821a1
Merge: 20c444cb 05a2d8c2
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 12 11:13:16 2019 -0500

    Merge pull request #2201 from rrigdon/install-licenses
    
    Corrected link and index of install-licenses

commit 20c444cbf265f4819a50f880335478c0ed6226e9
Merge: a140725c 4d57fd9d
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 12 11:11:51 2019 -0500

    Merge pull request #2194 from rrigdon/updated-cheatsheet
    
    [skip ci] Updated cheatsheet starter guide

commit 73447f925f6111881194e39604d1184f39125c39
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 12 11:03:36 2019 -0500

    Removed pytorch from win-32 lists

commit a140725cdb016026fc972e2f456b0c7db99e07a1
Merge: a0960048 db5094b7
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 12 11:02:45 2019 -0500

    Merge pull request #2199 from rrigdon/rrigdon-link-fixes
    
    Moved 2018.12 link to top of list

commit a0960048cfa5da8589921f997ec01a6e967e73e2
Merge: 6c01794a 5f7ce529
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Mar 11 09:34:27 2019 -0500

    Merge pull request #2200 from rrigdon/windows-uninstall-tips
    
    Cleaned up bullet points

commit 6c01794a8c956709a8d3f8b3cb44bb1a69b9b512
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Thu Mar 7 14:25:43 2019 -0600

    removed JotForm
    
    they disabled the account and never reset it for the new month

commit 05a2d8c203c136f06964e53ba7718b0e0e9adb7e
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Mar 7 11:27:27 2019 -0600

    Corrected link and index of install-licenses

commit de0190e3aa2a9fde2fefb104a34089f9ad27fe5e
Author: Ben Peters <bpeters@anaconda.com>
Date:   Thu Mar 7 10:21:13 2019 -0600

    Update config file

commit 5f7ce529ca0eef24b65da0560461694772e69f06
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 5 16:25:42 2019 -0600

    Cleaned up bullet points

commit db5094b7d9f31b90f3dfab6dbc3af1d80a8d8df0
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 5 16:08:13 2019 -0600

    Moved 2018.12 link to top of list

commit 87f18794498f95305f74d6088f17e4808007778c
Merge: 4f7bfcbb 983fea0f
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 5 15:25:44 2019 -0600

    Merge pull request #2198 from rrigdon/windows-uninstall-tips
    
    Added uninstall tips for Windows

commit 4f7bfcbb0b26c62472affe3a74f120b9d26ecb94
Merge: 2ee1c4ce 9f51cc65
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:25:13 2019 -0600

    Merge pull request #2197 from ContinuumIO/bpeters/aen-v4.3.1-update
    
    [WIP] Fixing versions and adding upgrade instructions

commit 9f51cc6503b0ebf42981454a1dfb9be3501f8448
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:21:47 2019 -0600

    minor updates for consistency

commit 8c4b7c3fbaf364e1f74a5e151df8bce591bccd75
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:16:32 2019 -0600

    Update work-with-environments.rst

commit 2ee6b277b5b1b2363e13c3d5b3b0b5411b00682a
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:14:17 2019 -0600

    Update use-env-variables.rst

commit ed312c01c4d667da4035569ddee77cabd61823d9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:12:32 2019 -0600

    Update faq.rst

commit 7aa4ac11e30cdb3a23af55ea6ac3f80360e2faf9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 15:02:42 2019 -0600

    more literal formatting

commit 1102969f19006d96058f05c64227cee65e3da951
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:59:23 2019 -0600

    minor literal formatting

commit 9a2eca690b804e25ddecbf879fddc72e3e9ed1e3
Merge: 24fa748b 53e9b939
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Mar 5 14:58:30 2019 -0600

    Merge branch 'bpeters/aen-v4.3.1-update' of https://github.com/ContinuumIO/docs into bpeters/aen-v4.3.1-update

commit 53e9b939a810c016603abd6457513bfcfe20eed3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:58:15 2019 -0600

    Update install-compute-node.rst

commit 24fa748bb689c7be9fec237d0f235b0514b868c4
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Mar 5 14:57:11 2019 -0600

    Fix format

commit 983fea0f008e51c47fb816e084b25b5ca3abee80
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 5 14:51:31 2019 -0600

    Added uninstall tips for Windows

commit 80f3f5fecb0d69fc7e34cc831595f6623581d65e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:48:16 2019 -0600

    minor case changes

commit fda15d0c5b4ea858ce1fb2dd1888ce587e8bb7f3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:42:59 2019 -0600

    just formatting literals

commit f115dff42867de106a0bfd1882337befc192164e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:39:49 2019 -0600

    Update create-groups-same-uid.rst

commit a12c32714a705da3d4e1c81c37ada5f8e9dbc6c3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:38:08 2019 -0600

    Update change-install-location.rst

commit 943abb44cab8735d6d51586db318096c6518acda
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Mar 5 14:32:50 2019 -0600

    Adding server-side sessions docs

commit 5460a10995f7e0e03466ab010977ff7c2a0757b3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:30:04 2019 -0600

    Update config-conda-use-local-repository.rst

commit 1885a96468530f93fa86e7fb2e80297a10383a28
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Mar 5 14:29:31 2019 -0600

    Update add-third-party-extension.rst

commit af697018f7bda1095f8705cb457639bebaf58919
Author: Ben Peters <bpeters@anaconda.com>
Date:   Tue Mar 5 14:09:58 2019 -0600

    Adding release notes

commit 2ee1c4ce909fa6ad49957723abd5c3978351ff9f
Merge: cf012558 9037d58a
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 5 11:26:48 2019 -0600

    Merge pull request #2190 from rrigdon/r-jupyter-tutorial
    
    [skip ci] Updated R and Jupyter Notebook tutorial

commit 9037d58a82806c16f5c51278a8bd2df8c30b6d51
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 5 11:18:11 2019 -0600

    Added .vscode to gitignore

commit bfb002da0754a25d00cd1aabc4f9b02d2d8804eb
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Feb 20 16:37:04 2019 -0600

    [skip ci] Updated R and Jupyter Notebook tutorial

commit 4d57fd9d8f13384c3f78621c69d329d130d627c3
Author: Rachel <rrigdon@anaconda.com>
Date:   Tue Mar 5 11:05:10 2019 -0600

    Removed outdated starter guides

commit cf012558404dc9d17f122902e425273a706aeb32
Merge: 2dcc6c6c e9cd39a2
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Tue Mar 5 10:30:58 2019 -0600

    Merge pull request #2196 from ContinuumIO/rrigdon-reqs-docs
    
    Corrected location of requirements-docs.txt

commit ff5272ba90ddf5aa6e175c847086477ebce28de6
Author: Ben Peters <bpeters@anaconda.com>
Date:   Mon Mar 4 15:50:11 2019 -0600

    Fixing versions and adding upgrade instructions

commit e9cd39a2815b029881b42d96e15ddb4cd015ff48
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Mar 4 13:34:30 2019 -0600

    Corrected location of requirements-docs.txt
    
    Changed L1 from:
    requirements_file: requirements-docs.txt
    to
    requirements_file: docs/source/requirements-docs.txt

commit 2dcc6c6cb77ff18427258d8662710e76a0c5bf2a
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Mar 4 12:05:49 2019 -0600

    added JotForm back in for March

commit fd299c6a080c95bbeb9527719699ac5fe40310df
Merge: 04859d50 d169791b
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Mon Feb 25 15:14:22 2019 -0600

    Merge pull request #2195 from ContinuumIO/renaming-reqs-doc
    
    [skip ci] Rename doc-requirements.txt to requirements-docs.txt

commit d169791b2bd46a9b1587101af9d19234c5920087
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Mon Feb 25 11:50:54 2019 -0600

    Rename doc-requirements.txt to requirements-docs.txt

commit 04859d503728048cd057c3dc0232244857616b02
Merge: 2a26e682 3b084186
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Feb 22 16:17:20 2019 -0600

    Merge pull request #2193 from ContinuumIO/rrigdon-sphinx-update-2
    
    Created doc-requirements.txt

commit 3b084186d6380d7445590d72b47e1be9386c6e01
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Feb 22 16:12:25 2019 -0600

    Removed unnecessary lines

commit 2a26e682d353d552d8e116ac4a9bae308e5f3f3c
Merge: 53e37cc2 8eb56cc2
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Feb 22 16:04:11 2019 -0600

    Merge pull request #2192 from ContinuumIO/rrigdon-sphinx-update
    
    Created readthedocs.yml

commit 3657c42e845fe19557bc9be23d63061a3ab95c35
Author: Rachel <rrigdon@anaconda.com>
Date:   Fri Feb 22 16:00:02 2019 -0600

    [skip ci] Updated cheatsheet starter guide

commit f832db0c20f4624ab31421dfa683b2ba31470119
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Feb 22 15:03:23 2019 -0600

    Created doc-requirements.txt
    
    Trying to update the Sphinx version.

commit 53e37cc2be92d46d00e5acbf4ccfbf0110e4e5c8
Merge: 9d7d6ddb 8f511966
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Feb 22 13:46:07 2019 -0600

    Merge pull request #2191 from rrigdon/migration-link-fix
    
    Migration link fix

commit 8eb56cc20b6ae042868e912841278c5162669ffd
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Feb 22 11:13:29 2019 -0600

    Created readthedocs.yml
    
    Changing Sphinx theme from 1.8.2

commit 8f511966542675306ac60f01acb5b95e7913f73a
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Feb 21 15:36:19 2019 -0600

    [skip ci] Fixed broken links

commit 78d74d02260eafc51e65bc69d239fba882c433de
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Feb 21 15:14:08 2019 -0600

    [skip ci] Updated links for MRO info

commit 4e2d58ba2c3147800dc8422f85f2edb16c7d3ef1
Merge: 49bccbd6 9d7d6ddb
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Feb 21 13:46:36 2019 -0600

    Merge branch 'master' of https://github.com/rrigdon/docs

commit 49bccbd6df142b4bb7ae91c1a3197b5b4055dae3
Author: Rachel <rrigdon@anaconda.com>
Date:   Thu Feb 21 13:44:04 2019 -0600

    [skip ci] gitignore update

commit 9d7d6ddba0fe8e5078645dbf54f85f52ebeebe59
Merge: 1a0d13c2 aa416883
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Feb 21 11:39:48 2019 -0600

    Merge pull request #2189 from rrigdon/updating-r-and-mro
    
    Updating r and mro - this has been reviewed several times by Sophia P.

commit aa416883326c1e1fe247967c077e12217d149f6d
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Feb 20 12:17:08 2019 -0600

    [skip ci] Reorganized deprecated content

commit 6090313f434087a37ddda13f6307a5bb8a7506f3
Author: Rachel <rrigdon@anaconda.com>
Date:   Wed Feb 20 10:41:07 2019 -0600

    [skip ci] Updated MRO and R language docs

commit 1a0d13c2684bee9aa0fe6657bd7ee8c548c43b15
Merge: 4b7aeb4b 75141e9e
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Feb 20 10:03:09 2019 -0600

    Merge pull request #2188 from ContinuumIO/csoja-patch-2
    
    updated install index.rst

commit 75141e9e99afede5965987dbad011987b680cb57
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Feb 20 09:36:06 2019 -0600

    updated install index.rst
    
    Removed 32-bit, x86 Linux support, since that stopped with the last release.

commit 4b7aeb4bc00c88eb474e4b220358eb11f7e74772
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Feb 15 13:14:05 2019 -0600

    removed JotForm feedback
    
    put back at end of month, when monthly limit is reset

commit b71ea203fced227a1fc359b60cc41f90a3fbde99
Author: csoja <crystal.soja@continuum.io>
Date:   Fri Feb 15 10:36:39 2019 -0600

    Update index.rst

commit 9ff495c32af6a58332fb6cec54896f763f8b58df
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Feb 13 16:53:46 2019 -0600

    added deactivate step

commit 0c292cb1103272fe4566b5f811a0c28b6519d145
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Feb 13 16:39:12 2019 -0600

    fixed broken link to conda cheatsheet

commit ed6d909c67afd430b82d11439f09a668a91c7f19
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Feb 13 16:33:39 2019 -0600

    fixed several broken links

commit 992eb60b36fd53228d78e91d17cb2a2255cc978b
Merge: 50993d95 0a0315d1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Jan 28 13:52:58 2019 -0600

    Merge pull request #2186 from ContinuumIO/update-conda-links
    
    Update docs link

commit 0a0315d113c258d049a209983fa79a0701725e9b
Author: soapy1 <scastellarin@anaconda.com>
Date:   Fri Jan 25 11:50:22 2019 -0600

    Update docs link

commit 50993d951ebfadb86106fa4afe94e767d6818ff5
Merge: 19f32488 683d6f42
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Jan 23 14:58:26 2019 -0600

    Merge pull request #2185 from ContinuumIO/conda-docs-links
    
    Update conda links for switch to RTD

commit 683d6f42a9692aaae7dda96a7494c5abd2d11f58
Author: soapy1 <scastellarin@anaconda.com>
Date:   Wed Jan 23 14:46:50 2019 -0600

    Update conda links for switch to RTD

commit 19f32488c17568bc0b6562ad6c99bbf06ce2acab
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Tue Jan 22 10:21:07 2019 -0600

    correct miniconda link
    
    Corrected broken link to send people to this miniconda installer: https://docs.conda.io/projects/continuumio-conda/en/latest/user-guide/install/macos.html

commit 18dc179c91a9dd458ae76e55994680d3fb446fa3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Jan 15 16:41:11 2019 -0600

    added link to new topic

commit e9b4e5d904e981887c7b75535e40fefd35a3e77d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Jan 15 16:40:52 2019 -0600

    creating new topic

commit fecdb33e891e38a44b9cc580cb04518766dbdd33
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 27 13:51:07 2018 -0600

    Added new cheat sheet link
    
    Added new cheat sheet link.

commit e271a7a0b6d57bc190cd35b89485dbcbc5582efe
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 27 13:49:31 2018 -0600

    Changed name and re-uploaded
    
    Changed name and uploaded file: Anaconda_Starter_Guide_CheatSheet.pdf

commit 1754664a037c0bba44fbb8c89606072967cceee2
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 27 13:48:36 2018 -0600

    Deleted file

commit 00a8142b0804d0082d32e9af600ed21ceb7f1fe9
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 27 13:40:46 2018 -0600

    Updated cheat sheet link
    
    Updated cheat sheet link

commit 3c02884c2f3d3fad483625dbbf159bbcd798d348
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 27 13:39:28 2018 -0600

    Replacing cheat sheet
    
    Replacing older cheat sheet with new collateral

commit 8fe73413adec75abcfc2aacd3498fa9db75cb446
Merge: a77e3749 d898ed8f
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Dec 21 16:40:48 2018 -0600

    Merge pull request #2184 from ContinuumIO/ad_2018.12_release_notes
    
    DSNC-831 AD 2018.12 release notes

commit d898ed8f88b0ca25436dc623e9dda11b11105a97
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Dec 21 16:39:44 2018 -0600

    DSNC-831 AD 2018.12 release notes

commit a77e374986ece8e43bb278c1695a38a13abff61b
Merge: f26dcef4 cae01f91
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Dec 21 16:37:50 2018 -0600

    Merge pull request #2181 from nehaljwani/2018.12-pkglist
    
    Update package lists for 2018.12

commit f26dcef4f084adc9ba1930581ab83a3329a610d9
Merge: 18b92ca4 e63dc3bd
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Dec 21 16:37:35 2018 -0600

    Merge pull request #2182 from ContinuumIO/AD_2018_12_pkg_list_docs
    
    Update package list for 2018.12 AD release

commit 18b92ca492e0c90e93a470cb6aa6558e91f445f7
Merge: 505c58c5 7d1585be
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Dec 21 16:37:01 2018 -0600

    Merge pull request #2183 from ContinuumIO/AD_2018.12_hashes
    
    DSNC-824 Update hashes for AD 2018.12 installers

commit 7d1585be562b88642a49f8c057675963a08cc37a
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Dec 21 15:49:37 2018 -0600

    DSNC-824 Update hashes for AD 2018.12 installers

commit e63dc3bd72cd4318196064dae991720769a88857
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Dec 21 15:02:35 2018 -0600

    update package lists for AD 2018.12

commit 8992d0226874510099eb8bc0975afa9fdff9343a
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Fri Dec 21 15:02:18 2018 -0600

    add AD 5.3.0 package lists to old pkg lists

commit cae01f91eeca7110e8e6104ffe56d1048a3b54fd
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Sat Dec 22 00:05:01 2018 +0530

    Update package lists for 2018.12

commit 505c58c5a479cf52a25b0807dd92f79f62bcab15
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Dec 14 15:14:53 2018 -0600

    Fixed spacing between ToC and heading

commit 3d898d939683a5c110121ce7d7097e9982af4ab2
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Dec 14 11:37:42 2018 -0600

    Trying to fix space issues
    
    Trying to put in space between the ToC and header.

commit c47111a50f6df869b22d3c462a8055a562ac8ea0
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Dec 14 11:25:51 2018 -0600

    Fixed space between ToC and first header
    
    Added a space between ToC and the "Getting Anaconda" header

commit fcd65912dd0c58235253f2fba1a20ea75a223286
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Fri Dec 14 10:47:35 2018 -0600

    Reorganized FAQ
    
    Broke FAQ into 4 sections and added a ToC for reference up top.

commit dc5520ad15e51e0304dd45412f77b823cdc9aafe
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 13 15:45:24 2018 -0600

    Got rid of the "hidden" part of ToC at top
    
    Made the index visible at top of page.

commit 483016367383115dc63a77da4ad0d89df12c8167
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Thu Dec 13 13:56:30 2018 -0600

    Removed outdated/inaccurate information
    
    Removed Enterprise Repository and inaccurate information in Anaconda Cloud.

commit 554161ba543471f716ca12c64d997aa13c962b85
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Dec 12 16:15:39 2018 -0600

    Changed title "Integrations" to "Using IDEs"
    
    Changed title "Integrations" to "Using IDEs"

commit 1646a41bedb9dad8094b343d46f95e48690617b8
Author: Rachel Rigdon <45607889+rrigdon@users.noreply.github.com>
Date:   Wed Dec 12 14:42:36 2018 -0600

    Changed word and added space
    
    Changed word and added space

commit a9586f66c3c96cb3bc2d24f33a2f5987f44794dc
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Dec 5 14:04:19 2018 -0600

    fixed wording per Elijah
    
    clarified text

commit cc68f0566da6de6dff5ff3716cf4d734d56dedda
Merge: 0bae2c45 d5570f86
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Dec 5 13:25:51 2018 -0600

    Merge pull request #2180 from ContinuumIO/tasks_and_integrations
    
    tasks/integrations reshuffling

commit 0bae2c451c87f8d94f060ff03379ad0c9578623c
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 14:39:29 2018 -0600

    update r-language-pkg-docs.rst
    
    drop TIP down a paragraph - so the paragraph with CRAN defined comes before where it is used in the TIP.

commit b4c3e83c8fbf89d78fe40cdc5ee47cbd397c5f74
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 14:37:32 2018 -0600

    update r-language-pkg-docs.rst
    
    add some clarification and a few links.

commit d5570f8644382dc4c5689ee5396903e063075897
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Tue Dec 4 14:04:53 2018 -0600

    tasks/integrations reshuffling
    
    moved tensorflow, cloudera, amazon-aws, docker up one level out of integrations.

commit b01ba3aca5bbe7b97d93b34036d650dff669e42e
Merge: 9aa6aded 950cd2b3
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 10:07:45 2018 -0600

    Merge pull request #2179 from ContinuumIO/csoja-patch-1
    
    more anaconda minor docs changes

commit 950cd2b36ea6eb26544452faa61a9407d429af60
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 10:03:32 2018 -0600

    update use-r-language.rst
    
    added reference to MRAN

commit f0acddda52585309d8bf1485993937ed6463367d
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 10:02:47 2018 -0600

    update use-r-language.rst
    
    changed the number of R packages

commit 5e748858d73747a017ee943bdfc1e0ca2452243a
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Dec 4 09:55:02 2018 -0600

    Update index.rst
    
    update the number of packages

commit 9aa6aded28c74530b2ae9f3c2780aa91f37a3018
Merge: 4cae7fe0 66b929db
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Mon Nov 19 14:26:10 2018 -0600

    Merge pull request #2178 from nehaljwani/DSNC-778
    
    DSNC-778 Update hashes for 5.3.1 installers

commit 66b929db1c8159c24854cf34431fd2a42f26d1ce
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Nov 19 14:08:52 2018 -0600

    DSNC-778 Add changelog for 5.3.1 Anaconda installers

commit e827e46246fe03e783c866eb16ddd8564366336d
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Nov 19 13:54:52 2018 -0600

    DSNC-778 Update hashes for 5.3.1 installers

commit c0328a59666a178cf6d9d053712efe228bc0f347
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Nov 13 14:55:17 2018 -0600

    update r-language file
    
    add note to point out the r-  prefix when installing R packages with conda

commit ed26042bf656b6fd6145f32250dd75c44d2f0099
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Nov 13 13:24:53 2018 -0600

    update tasks index
    
    change order of tasks

commit b28cf047b26deb4d032c12689e512bbfaae23e88
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Nov 13 12:19:47 2018 -0600

    update anaconda distro index
    
    add mentions of R

commit 56d2e618f45a5abd76b2fd5ed68ea995ee279f1c
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Nov 13 12:17:30 2018 -0600

    Update index.rst

commit 4cae7fe0a2cb2b51e3a194d1f272fce820b3c953
Merge: 6c08f91f 9bea5f21
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:42:08 2018 -0500

    Merge pull request #2177 from ContinuumIO/kwells-anaconda-patch-5
    
    updated screen shots to match text

commit 9bea5f2100f4a2e14f5dfe43be2a524e6c267621
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:41:55 2018 -0500

    updated screen shots to match text
    
    updated screen shots to match text

commit 6c08f91fdedb25b53b83ad057e5b1edeab4fcb69
Merge: 33f82d4c 973c732f
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Fri Nov 2 10:39:18 2018 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 33f82d4c8aa97bbb44d9ff073148e51ec64aa6db
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Fri Nov 2 10:39:11 2018 -0500

    add new nav screenshots
    
    update env screenshots with snowflakes + base(root)

commit 973c732fa0a526185fc1bd0c628205d40350c15a
Merge: a04cc6ec f2b08bf9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:21:04 2018 -0500

    Merge pull request #2176 from ContinuumIO/kwells-anaconda-patch-6
    
    fixing bad ref

commit a04cc6ec3f77fe76eb0235f09a6c13c36691bc8d
Merge: b3dd57f7 be12c998
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:20:55 2018 -0500

    Merge pull request #2175 from ContinuumIO/kwells-anaconda-patch-5
    
    adding section ref

commit f2b08bf90426525924b93e17070113452016a235
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:20:37 2018 -0500

    fixing bad ref
    
    fixing bad ref

commit be12c998a957af3bf6ceb49d89882026ec23db3c
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Nov 2 10:19:39 2018 -0500

    adding section ref
    
    adding section ref

commit b3dd57f777fc88d372807890abe0ab4bda5707c0
Merge: 0427ff33 7f497a10
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 16:11:07 2018 -0500

    Merge pull request #2174 from ContinuumIO/kwells-anaconda-patch-5
    
    changing file extension

commit 7f497a10e2fb1d1b41549524418a1602ca7a1af2
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 16:10:38 2018 -0500

    changing file extension
    
    changing file name so not picked up in docs build - removed per AENT-3785

commit 0427ff338cc64307fa5c1a0edf5ad34aa5e515de
Merge: 102e411a e3b91491
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 16:04:40 2018 -0500

    Merge pull request #2173 from ContinuumIO/kwells-anaconda-patch-5
    
    removing install licenses per AENT-3785

commit e3b91491bfb2fbcc6df0da65dad292ef639243ab
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 16:04:26 2018 -0500

    removing install licenses per AENT-3785
    
    removing install licenses item per AENT-3785

commit 102e411a6b39d7118ba3e57d79967e2c62e851f5
Merge: f555c073 d94c4df8
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 15:17:06 2018 -0500

    Merge pull request #2172 from ContinuumIO/kwells-anaconda-patch-5
    
    update per AENT-3813

commit d94c4df83df45a159ae2deb070d8b22d800f5122
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 15:15:39 2018 -0500

    added link to blog post
    
    added link to relevant blog post by @msarahan

commit cdf830d89e2a66fa7254c2602445cbebe2d113d1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 31 14:49:30 2018 -0500

    update per AENT-3813
    
    updated Troubleshooting cause and solution for menu shortcuts not displaying after installing Anaconda

commit f555c073364556bc254eb4ecf8d2b10e7519ad93
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:55:57 2018 -0500

    fix silent mode link again

commit ad69f92e8e2ff61d5bc3b27e172ea9a73a275631
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:47:52 2018 -0500

    fix FAQ link

commit 0faf29732d1472a4ba35e9fe16b799352ac44100
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:43:00 2018 -0500

    downsize menu screenshots
    
    the menu screenshots are too big, need to be smaller

commit 41c8c08d510be23972265a829df429b36afd3abb
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:37:14 2018 -0500

    Update silent mode link
    
    update silent mode link on install index.rst

commit cfcc6d28f8225c524222cf0e758880dc65a14182
Merge: 4cc6dc07 6a95917f
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:32:50 2018 -0500

    Merge pull request #2136 from ContinuumIO/csoja-patch-4
    
    Update getting-started.rst

commit 4cc6dc07d9790af97d0515fbd509344ba73629c9
Merge: bce0dfc9 12ac49ee
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 31 11:32:25 2018 -0500

    Merge pull request #2133 from ContinuumIO/csoja-patch-3
    
    create silent-mode.rst

commit bce0dfc9f019b00a5e5845a6fa540fe9fc4ee8eb
Merge: 8388fe14 80cd2247
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Wed Oct 31 11:28:04 2018 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 80cd2247fa57ecb98b15fb17d7bd0469f0252d3c
Merge: 492541cb 63948ee5
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:42:04 2018 -0500

    Merge pull request #2171 from ContinuumIO/kwells-anaconda-patch-5
    
    fixing inline TOC

commit 63948ee5a6b068866e76bbd8218a22e6424d8ba0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:41:50 2018 -0500

    fixing inline TOC
    
    fixing inline TOC

commit 492541cb855702b05ddb3de27b1cbf6cad308857
Merge: 7d9875be 6f3064a7
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:40:49 2018 -0500

    Merge pull request #2170 from ContinuumIO/kwells-anaconda-patch-5
    
    fixing inline TOC

commit 6f3064a7c2690693bc384097a83ac3f1821fe883
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:40:35 2018 -0500

    fixing inline TOC
    
    fixing inline TOC

commit 7d9875be2d3b3525fa62c0d4df6d89b9bc323654
Merge: b4511ffe 442b0852
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:35:34 2018 -0500

    Merge pull request #2169 from ContinuumIO/kwells-anaconda-patch-5
    
    testing TOC depth

commit 442b0852216fe47a6777a4f925fefab409cda1a0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:29:12 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit b4511ffe02c07f72efdc54c2b3ba7e2194b1abec
Merge: 9a8ef5ae 178be493
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:27:14 2018 -0500

    Merge pull request #2168 from ContinuumIO/kwells-anaconda-patch-5
    
    testing TOC depth

commit 178be493330a79d67972d0d7d69145b1e7497240
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:26:50 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit 9a8ef5aedbfc364f81f70047a4407f847f11fe8d
Merge: 89a4513d b2b12b4d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:13:35 2018 -0500

    Merge pull request #2167 from ContinuumIO/kwells-anaconda-patch-5
    
    updated inline TOC

commit b2b12b4dcb63065c382ae698221bebe33e9d098a
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:13:21 2018 -0500

    updated inline TOC
    
    updated inline TOC

commit 89a4513df4668bda118bea3a2171a1e9d42ca707
Merge: b1690279 3fdbdd26
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 15:02:31 2018 -0500

    Merge pull request #2166 from ContinuumIO/kwells-anaconda-patch-5
    
    testing TOC depth

commit 3fdbdd2693dc42a9fee9c436f380cc1c9837c492
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:59:51 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit b169027969de4e103011b61f690b5256fe459a26
Merge: 48c8969f f5a07ca8
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:57:03 2018 -0500

    Merge pull request #2165 from ContinuumIO/kwells-anaconda-patch-6
    
    testing TOC depth

commit 48c8969f7886869e3fb6a3ced8105254eca1b7d2
Merge: 1fcf7a2d 2028c485
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:56:53 2018 -0500

    Merge pull request #2164 from ContinuumIO/kwells-anaconda-patch-5
    
    testing TOC depth

commit f5a07ca8b0259ad8a19addca6e15ed8268c3cdfe
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:56:37 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit 2028c48590905b556f827025b128f2e90e5e498c
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:55:38 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit 8388fe1498aad46e5b7bac5f959829f36a1d1721
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Tue Oct 30 14:54:49 2018 -0500

    add screenshots
    
    add three images for getting-started section of Distro docs

commit 1fcf7a2d2250925cea8135fbaffc9fb0759889ea
Merge: 9f05563f b6a4b7fb
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:52:00 2018 -0500

    Merge pull request #2163 from ContinuumIO/kwells-anaconda-patch-5
    
    testing inline TOC placement

commit b6a4b7fbd18ab9933dd49f83ffcedeff92f04ef5
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:51:46 2018 -0500

    testing inline TOC placement
    
    testing inline TOC placement

commit 9f05563f156566374b4d964f6444e4df75463cea
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 30 14:48:40 2018 -0500

    update windows.rst
    
    change vscode image to 50% width

commit d2a64c5bec3827b845221e53adc941a48304d475
Merge: 7d6d6d24 9834799e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:45:21 2018 -0500

    Merge pull request #2162 from ContinuumIO/kwells-anaconda-patch-5
    
    testing TOC depth

commit 9834799e869b803018779fb178fe3fd8d42f6a38
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 14:45:12 2018 -0500

    testing TOC depth
    
    testing TOC depth

commit 7d6d6d24e69a6237928d27b1a18294473278db11
Merge: d817514a 1d64e2eb
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:18:09 2018 -0500

    Merge pull request #2161 from ContinuumIO/kwells-anaconda-patch-5
    
    shortened heading

commit 1d64e2ebf18c3791c13132959ae0d2fd5b1aa27b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:17:56 2018 -0500

    shortened heading
    
    shortened heading so it looks better in TOC per Crystal

commit d817514a35bcd750e54cc9449deac568f02c4a5a
Merge: c9126fd6 ae7ad4ac
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:15:35 2018 -0500

    Merge pull request #2160 from ContinuumIO/kwells-anaconda-patch-5
    
    removed headings

commit ae7ad4acd4a4c7b0e3f984d7e53a695e63672518
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:14:47 2018 -0500

    removed headings
    
    test failed - Sphinx will treats any header style it encounters first as H1, and therefore includes it in the TOC - so reverted back to bold

commit c9126fd63b42998d70227a1e512f7a5d212a8c87
Merge: 86037ccc 5aeec2ca
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:03:23 2018 -0500

    Merge pull request #2159 from ContinuumIO/kwells-anaconda-patch-5
    
    testing headings

commit 5aeec2ca9a051dc6e1a02e364635053f47f81507
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 12:03:11 2018 -0500

    testing headings
    
    testing headings per feedback from Crystal - H3 failed test and displaced TOC

commit 6a95917f464f9f11a0bea4ac69075d90a3f67d3e
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 30 11:55:57 2018 -0500

    more updates to getting started

commit 86037ccc13cab5f0c6b224fd502c312ba5bbf802
Merge: efaa51f2 68cfdee0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:43:46 2018 -0500

    Merge pull request #2158 from ContinuumIO/kwells-anaconda-patch-5
    
    testing headings

commit 68cfdee07b71a5cef92955f1150dbbf92838b469
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:43:20 2018 -0500

    testing headings
    
    testing headings

commit efaa51f2f7929462e52761f2d9ee32fabd43f717
Merge: 81a2d673 0075bae1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:25:53 2018 -0500

    Merge pull request #2157 from ContinuumIO/kwells-anaconda-patch-4
    
    cleaning up main page

commit 0075bae1c7706cb4c23b1586b4f774df19071a65
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:25:04 2018 -0500

    cleaning up main page
    
    cleaning up main landing page as part of TOC reorg

commit 81a2d673e86ad605dd3a25fab4c479334e05ae9f
Merge: ca4f5331 ed2fd9e4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:19:11 2018 -0500

    Merge pull request #2156 from ContinuumIO/kwells-anaconda-patch-4
    
    fixing TOC

commit ed2fd9e4721e1fb2f43caa71354c1a9aa3e7b650
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:18:59 2018 -0500

    fixing TOC
    
    fixing TOC

commit ca4f53318a460c744b3c68a9e4afe2cd263a1675
Merge: ef874a46 9c939511
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:08:23 2018 -0500

    Merge pull request #2155 from ContinuumIO/kwells-anaconda-patch-4
    
    test

commit 9c93951177353537a177a00f31b327aea40aa138
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:08:09 2018 -0500

    test
    
    test

commit ef874a464889e44e2fe9abaf95061f754ef2146f
Merge: 31cd05c4 9477480d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:03:23 2018 -0500

    Merge pull request #2154 from ContinuumIO/kwells-anaconda-patch-4
    
    removing inline TOC

commit 9477480d8886a6cedb5c3f526b5d4b955f15db68
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 11:03:12 2018 -0500

    removing inline TOC
    
    removing inline TOC

commit 31cd05c495b350b4878e54eac871fc5ae1f9c5be
Merge: 12d119a1 39751d42
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:50:50 2018 -0500

    Merge pull request #2153 from ContinuumIO/kwells-anaconda-patch-4
    
    moved MKL

commit 39751d427ca0753a0caf9b24bc01894b772d6355
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:50:33 2018 -0500

    moved MKL
    
    moved MKL here per request from Crystal

commit 12d119a1fb10d4e06f787601201d2daeb17003e1
Merge: ebf34c96 f6e6b3fb
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:45:43 2018 -0500

    Merge pull request #2152 from ContinuumIO/kwells-anaconda-patch-4
    
    cleaning up TOC

commit f6e6b3fb311f2f2f5da0282000e6bb4a0b50ee55
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:45:20 2018 -0500

    cleaning up TOC
    
    cleaning up TOC

commit ebf34c9601e04951a26fc5ee9438f569468cfab1
Merge: 91951700 6dbb2ee1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:36:41 2018 -0500

    Merge pull request #2151 from ContinuumIO/kwells-anaconda-patch-2
    
    moving package list

commit 6dbb2ee17811a81dc86afd04619ffbc5ed565a7b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:35:00 2018 -0500

    moving package list
    
    moving package list per input from Sophia and Crystal

commit 919517006615cdf6dbfdb8bda660a4eca016ccf3
Merge: 44ae49eb 62ad6541
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:31:36 2018 -0500

    Merge pull request #2150 from ContinuumIO/kwells-anaconda-patch-2
    
    moved navigator

commit 62ad6541fcc60bb10bfd33c657cba88a957da63e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:31:25 2018 -0500

    moved navigator
    
    moved navigator under user guide per input from Sophia and Crystal

commit 44ae49eba7d88f707d885abe431eca5ae4e2befd
Merge: ccd5c787 9334ed87
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:27:20 2018 -0500

    Merge pull request #2149 from ContinuumIO/kwells-anaconda-patch-2
    
    fixing TOC

commit 9334ed87c90aaee961d748fc377415b8269ae186
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:27:10 2018 -0500

    fixing TOC
    
    fixing TOC

commit ccd5c787c244cfd58285233db2cb507d1fb56db2
Merge: e0725a35 71573df5
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:20:15 2018 -0500

    Merge pull request #2148 from ContinuumIO/kwells-anaconda-patch-2
    
    testing

commit 71573df529a67631a761062f4b135f42877620a1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:19:59 2018 -0500

    testing
    
    testing

commit e0725a359743d953b38fc25e4b416a69c02bec12
Merge: 4b567100 0875d435
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:12:53 2018 -0500

    Merge pull request #2146 from ContinuumIO/kwells-anaconda-patch-2
    
    minor update

commit 4b56710011ce968ed2eff135f31a6cc576b33f29
Merge: 2ed550c4 dc8d6c28
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:04:49 2018 -0500

    Merge pull request #2147 from ContinuumIO/kwells-anaconda-patch-3
    
    fixing TOC strangeness

commit dc8d6c28f013b34a2cb327d3a711a57172b4cfc9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 10:04:38 2018 -0500

    fixing TOC strangeness
    
    fixing TOC strangeness

commit 0875d4354b26e2c45cb3adfe8767dd2f223b05a1
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 09:54:54 2018 -0500

    minor update
    
    minor update to package list

commit 5e62ff14fccdacab1d599f9360c37caaddc3e5b1
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 30 09:51:07 2018 -0500

    more changes to getting-started.rst

commit 2ed550c4c35af26e9f713adeb4df5ac34a43c9b8
Merge: bfcbb400 e069e28b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 08:48:33 2018 -0500

    Merge pull request #2145 from ContinuumIO/kwells-anaconda-patch-2
    
    fixing TOC

commit e069e28b0664f1bef29db3e1f333130547ffa052
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 30 08:48:22 2018 -0500

    fixing TOC
    
    fixing TOC

commit bfcbb40079b19e58a9ace46d94e5ae6316bbc2c9
Merge: dd155ecd 8e813272
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 17:00:59 2018 -0500

    Merge pull request #2144 from ContinuumIO/kwells-anaconda-patch-1-1
    
    updated TOC

commit 8e8132722ac1a17f4b0c3ec814541912fd411590
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 17:00:49 2018 -0500

    updated TOC
    
    updating TOC per input from Sophia and Crystal

commit dd155ecd4260a40f0f0510d5c21e6b18b822c432
Merge: 07547247 e207c4da
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:59:35 2018 -0500

    Merge pull request #2143 from ContinuumIO/kwells-anaconda-patch-2
    
    moved

commit e207c4dad576e3bb926d9eb3b5853ae6515ce0d4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:59:25 2018 -0500

    moved
    
    moved

commit 07547247839d354f313e005129cbe9ed7e627777
Merge: 957074c1 4292d411
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:58:14 2018 -0500

    Merge pull request #2142 from ContinuumIO/kwells-anaconda-patch-2
    
    moved

commit 4292d411aa5880ef0f91e82e639a21f989573dc3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:57:56 2018 -0500

    moved
    
    moved

commit 957074c10e6202f5584cf3f5e43e350a9477bbe0
Merge: e0d177f2 d9e43033
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:56:03 2018 -0500

    Merge pull request #2141 from ContinuumIO/kwells-anaconda-patch-1
    
    moved

commit d9e43033dec64806aaa1c2d61b15dc30eee6474e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:55:51 2018 -0500

    moved
    
    moved file under reference

commit e0d177f22004f94afd5373be8d692a4d16f8fe96
Merge: d67fd028 72125500
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:51:46 2018 -0500

    Merge pull request #2140 from ContinuumIO/kwells-nav-fix
    
    max depth fix

commit 72125500b2c310e9a399d0a4619ff948b0931410
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:51:37 2018 -0500

    max depth fix
    
    removed maxdepth value, which was preventing topics from showing up in TOC

commit d67fd028642e361deb84cd82eaa0d7f4473a20eb
Merge: 1bf57077 8251651f
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:23:09 2018 -0500

    Merge pull request #2139 from ContinuumIO/kwells-nav-update
    
    updating TOC

commit 8251651f086d89d0b121523dbb103e615ef0a68f
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:22:59 2018 -0500

    updating TOC
    
    updating TOC per input from Sophia and Crystal

commit 1bf570778664919809dfec19a5f3605e107b94d3
Merge: 994dfb68 c627bc4b
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:02:40 2018 -0500

    Merge pull request #2138 from ContinuumIO/kwells-nav-update
    
    moved and removed inline TOC

commit c627bc4b2786d3eab8d793646dd569cec4b0083a
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 16:02:28 2018 -0500

    moved and removed inline TOC
    
    moved and removed inline TOC

commit 994dfb68cf85627c9519fcc7014cb588ea7a67de
Merge: dd9ecbdb 44699f24
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:52:47 2018 -0500

    Merge pull request #2137 from ContinuumIO/kwells-nav-update
    
    updating TOC

commit 193b064f76608ea79e77162180d9cfc3ed7156bf
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 29 14:51:36 2018 -0500

    Update getting-started.rst
    
    Adding Jupyter Notebook to the guide.

commit 44699f249449d0975c5584295928aa16c724a04e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:50:04 2018 -0500

    updating TOC
    
    updating TOC per input from Sophia and Crystal

commit dd9ecbdb8bacb04cc8b6168016c1be89658f26e2
Merge: 43d26a78 8f6f915f
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:33:28 2018 -0500

    Merge pull request #2134 from ContinuumIO/kwells-nav-update
    
    creating reference TOC

commit 43d26a78cfaab5b8929c0537bb096253c7b57e5e
Merge: 9ea83b2d 5d9fe01e
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:33:19 2018 -0500

    Merge pull request #2135 from ContinuumIO/kwells-nav-update-1
    
    updated content and formatting

commit 5d9fe01eac21d8e169b52fb6fcfcce25ca16edbd
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:31:31 2018 -0500

    updated content and formatting
    
    updated content and formatting

commit 8f6f915f0bc34c9dcd1e4cf02cd6979ab0c86f55
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Mon Oct 29 14:07:48 2018 -0500

    creating reference TOC
    
    creating reference TOC per input from Sophia and Crystal

commit 9ea83b2d646903278c0939a8b9fc3ecd0bf7b2c1
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 29 13:48:49 2018 -0500

    Add Question to FAQ
    
    Add a question about previous python installations - content from conda docs

commit 12ac49ee47b4bf55a9d0a905d1b163fbf1b18217
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 29 10:47:01 2018 -0500

    create silent-mode.rst
    
    Add silent mode instructions to anaconda.com docs.

commit e26639517568169d3edd8a9657e9bfba2adf1352
Author: csoja <crystal.soja@continuum.io>
Date:   Fri Oct 26 11:41:45 2018 -0500

    Update mac-os.rst
    
    Fix images on Mac install page

commit 3a0362345c746d0e8c822b0d01460a906a8f1051
Author: csoja <crystal.soja@continuum.io>
Date:   Fri Oct 26 11:29:25 2018 -0500

    Update windows.rst
    
    Remove reference to Python 3.6 in Windows installation instructions

commit 175a4b23b318d6e66843d5e68602c66cc2343394
Merge: e67d8a46 18ae5730
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 24 13:26:25 2018 -0500

    Merge pull request #2129 from ContinuumIO/csoja-patch-3
    
    Remove Product Archive on Anaconda Distro index

commit 18ae5730207dc663294127b713667d30dd489865
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 24 12:52:16 2018 -0500

    Remove Product Archive on Anaconda Distro index
    
    Everything listed in the Product Archive is significantly out of date at this point (years) - should not be in the Anaconda Distribution docs any longer

commit e67d8a4607965aac3946353b449a5e38951acea7
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 24 12:27:23 2018 -0500

    fix typo in amazon-aws.rst
    
    fix typo  - "official"

commit dfcff13f6c48d365c21cb1d769b2aeb8d65a9858
Merge: 117f34f0 4bbce756
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Wed Oct 24 12:02:11 2018 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 117f34f075953c576579e66889c041b0efb43bd1
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Wed Oct 24 12:02:06 2018 -0500

    Update docs/source/anaconda/install/index.rst
    
    Add "Other ways to get Anaconda or Miniconda" section

commit 4bbce756633c3810c70496631857befebe099657
Merge: 18ad3929 a4b722c6
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 24 11:09:27 2018 -0500

    Merge pull request #2128 from ContinuumIO/kwells-image-path
    
    fixing path to images

commit a4b722c6c92e8a7ca7919330b606ff83f1cca4df
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 24 11:08:37 2018 -0500

    fixing path to images
    
    fixing path to images

commit 18ad3929efb109abee7992577203c19fa667a6eb
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 24 10:31:58 2018 -0500

    No change
    
    Added some spaces, so new screenshots would get uploaded to docs.anaconda.com

commit c9db7956227f2aec841ddd3ee25fd5c66b4ff83b
Merge: d738e609 566dc6be
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Tue Oct 23 18:41:05 2018 -0300

    Merge pull request #2127 from ContinuumIO/kwells-feedback-update
    
    updated with feedback from Damian

commit 566dc6be14f87e109cc35c7f4a1bf474e672062d
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 23 15:56:50 2018 -0500

    updated with feedback from Damian
    
    updated with feedback from Damian

commit d738e609bb9f97f43b45abeaa0a4657b1f0ad072
Author: Crystal Soja <crystal.soja@anaconda.com>
Date:   Tue Oct 23 14:29:07 2018 -0500

    Update win install images
    
    Update Anaconda Windows installation screenshots

commit 9966c7dfe59d908c81e2a095beefd70d0ee814ac
Merge: 6798f79c 96f85ad4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 23 13:50:29 2018 -0500

    Merge pull request #2126 from ContinuumIO/kwells-add-archive
    
    added link to 4.2.2 archive

commit 96f85ad47e3f17ad393e3545fd94619ebe0201d9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 23 13:50:14 2018 -0500

    added link to 4.2.2 archive
    
    added link to 4.2.2 archive

commit 6798f79c0a4a66657cde35f978bc304d795d591b
Author: Kelly Wells <kwells@anaconda.com>
Date:   Tue Oct 23 13:42:03 2018 -0500

    creating archive
    
    creating 4.2.2 archive for 4.3.0 release

commit 98704f75094fe44bf90eabd2b5522423261e29d9
Merge: e53cf2bb a6101ee4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 23 09:52:12 2018 -0500

    Merge pull request #2123 from ContinuumIO/damianavila-patch-1
    
    Update upgrade process to 4.3.0 release

commit a6101ee454487118d2fb106be316c6093fe391b0
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Oct 23 09:49:16 2018 -0500

    minor edits
    
    minor edits to wording

commit e4386e835a82a85d292de819e12e44d79e9f25ab
Author: Damian Avila <damianavila@gmail.com>
Date:   Mon Oct 22 19:26:53 2018 -0300

    Update versions to 4.3.0

commit fe6d64760ea243b9c90d23a846553528fd9492a1
Author: Damian Avila <damianavila@gmail.com>
Date:   Mon Oct 22 19:21:43 2018 -0300

    Add changelog to the released notes

commit e53cf2bbe084eec91a3f28a091b8b310921484c8
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 14:47:08 2018 -0500

    Update uninstall.rst
    
    small wording change

commit 41ade630c2d4d4ec19eea0e8bb2759daafa02710
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 14:42:07 2018 -0500

    Update hash index
    
    update hash link

commit da054f27a81b52421422c36ef9638638ba84d311
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 14:39:32 2018 -0500

    Update linux-power8.rst
    
    fixed hashes link

commit e1d26aaa916e916cf7225c9c04b3448205bde690
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 14:36:18 2018 -0500

    Update linux.rst
    
    update hash instructions link & small change to Anaconda Navigator note

commit 00c05db7eaa60f570a5397140c82175086f449fa
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 14:25:49 2018 -0500

    Update mac-os.rst
    
    fix hashes links & small change to Navigator Note.

commit 830d565acf22918aa472776ba82a12953816d99e
Author: csoja <crystal.soja@continuum.io>
Date:   Mon Oct 22 13:46:44 2018 -0500

    Update windows.rst
    
    updated hashes link

commit 67a4797cec8b981c55893b2544d93033c4752940
Merge: cfee204b 3ff674ae
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Wed Oct 17 11:31:22 2018 -0500

    Merge pull request #2125 from ContinuumIO/kwells-removed-tensorflow
    
    removed tensorflow pkgs

commit 3ff674ae55e7432f4b6e56f371b05e61b7cbbf11
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Wed Oct 17 11:20:44 2018 -0500

    removed tensorflow pkgs
    
    removed tensorflow pkgs per email from Michael Sarahan

commit cfee204bdfcae36a380c44ea04bcdfb6c9c73e7b
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 16 12:12:40 2018 -0500

    Update windows.rst
    
    bullet #14 still referenced old support check box that had been replaced.  changed wording to reflect the current state.

commit 6aa2337a08dd1b09029e133bafbca7550168d3da
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 16 12:07:46 2018 -0500

    Update index.rst for anaconda installation
    
    clarify system requirements

commit 2a705c2399ed2ebc79905524a7bdd508511c3542
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 16 11:49:22 2018 -0500

    Update faq.rst
    
    Add WindowsXP maximum Anaconda version.

commit 64a6843346f2840d2e3ddac9e049247efd46571c
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 16 11:38:43 2018 -0500

    Update index.rst for anaconda
    
    some other minor wording changes to improve clarity a bit.

commit 15dacba4403c8f3c293ca9f7f11ec1957cfc95f4
Author: csoja <crystal.soja@continuum.io>
Date:   Tue Oct 16 11:28:28 2018 -0500

    Update index.rst for anaconda docs
    
    Update pkg numbers on https://docs.anaconda.com/anaconda/

commit ee958a29c79a9334760efa414efab22343708a0f
Merge: 054fe0e8 265b2eb7
Author: Gonzalo Peña-Castellanos <goanpeca@gmail.com>
Date:   Mon Oct 15 17:53:37 2018 -0500

    Merge pull request #2124 from ContinuumIO/fix/spyder-refs
    
    PR: Fix spyder urls references on docs

commit 265b2eb79d18760bc18f2e79f1d022dae06ca206
Author: Gonzalo Pena-Castellanos <goanpeca@gmail.com>
Date:   Mon Oct 15 17:52:24 2018 -0500

    Fix spyder urls references on docs

commit 054fe0e8586104ca096e109783b52b257c48ec1c
Merge: 965757a3 87c1855e
Author: Sophia Castellarin <scastellarin@anaconda.com>
Date:   Mon Oct 15 15:30:54 2018 -0500

    Merge pull request #2122 from ContinuumIO/anaconda-docs-aws-marketplace
    
    Update aws user-guide to point ami users to aws marketplace

commit a4819ad25b8ba8ae7a3def66493a86f6a7b8b7fa
Author: Damian Avila <damianavila82@yahoo.com.ar>
Date:   Thu Oct 11 01:09:36 2018 -0300

    Update upgrade process to 4.3.0 release

commit 87c1855e750cf35d957e1eb92be7915525c15e12
Author: soapy1 <scastellarin@anaconda.com>
Date:   Mon Oct 8 10:03:18 2018 -0500

    Update aws user-guide to point ami users to aws marketplace

commit 965757a3bf0a0d9634f8ed079b030bb2c9663bee
Merge: 02022304 534606c1
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 3 11:30:35 2018 -0500

    Merge pull request #2120 from ContinuumIO/csoja-patch-1
    
    Update linux.rst for AD 5.3/Py3.7

commit 020223045bd3aad343f8cc7d57cb2c83fb6679ae
Merge: 462415f2 66322437
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 3 11:30:24 2018 -0500

    Merge pull request #2121 from ContinuumIO/csoja-patch-2
    
    Update linux-power-8.rst with AD 5.3/Py3.7

commit 462415f2a97f0b6d5ade5e9e0924215772cf8618
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 3 11:29:34 2018 -0500

    Update mac-os.rst for AD 5.3, Py3.7

commit 66322437e81b90916f2bc87d58bdb2b6e0b50449
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 3 11:28:01 2018 -0500

    Update linux-power-8.rst with AD 5.3/Py3.7

commit 534606c1f0c606ea67097134ee4aefc7ab37e65a
Author: csoja <crystal.soja@continuum.io>
Date:   Wed Oct 3 11:26:43 2018 -0500

    Update linux.rst for AD 5.3/Py3.7

commit ea14960ac0edfd771adf0cf519e4301cd036b551
Merge: 3b8954ae 5537ffcb
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Mon Oct 1 15:44:14 2018 -0500

    Merge pull request #2119 from nehaljwani/repo.anaconda.com
    
    Replace references to repo.continuum.io with repo.anaconda.com

commit 5537ffcb529a21e2271486f2dcbc77ee1f041268
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 1 23:08:55 2018 +0530

    Replace references to repo.continuum.io with repo.anaconda.com

commit 3b8954aeb476af0ad07bd87a840fa4dfa13b0bc3
Merge: be3d1768 4a439922
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 1 23:01:43 2018 +0530

    Merge pull request #2118 from nehaljwani/parcel-link
    
    User Guide: Update link to parcels

commit 4a43992244fc43d0ad056bcd1b699fecd8e1b383
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 1 22:51:21 2018 +0530

    User Guide: Update link to parcels
    
    repo.continuum.io -> repo.anaconda.com

commit be3d1768e199e70036683d23b9698fc7e6e77b1c
Merge: 36907e9a fbceff26
Author: Gonzalo Peña-Castellanos <goanpeca@gmail.com>
Date:   Fri Sep 28 11:18:24 2018 -0500

    Merge pull request #2117 from ContinuumIO/fix/release-notes
    
    Fix dates and update release notes for 1.9 Release

commit fbceff263fc19b7cf915e94e1e3d80edbd9d6669
Author: Gonzalo Pena-Castellanos <goanpeca@gmail.com>
Date:   Fri Sep 28 11:17:34 2018 -0500

    Fix dates and update release notes

commit 36907e9a846b3d352d6aaaf165b2742a8b175841
Merge: 8a58da78 2089ba34
Author: Gonzalo Peña-Castellanos <goanpeca@gmail.com>
Date:   Fri Sep 28 10:57:15 2018 -0500

    Merge pull request #2109 from ContinuumIO/nav19
    
    AEDOCS-191 Navigator 1.9

commit 8a58da7842bc99740dfb799be76527748898deb4
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Sep 28 09:37:56 2018 -0500

    reordered columns
    
    reordered from most recent to oldest

commit 3838428bc90a4445e1433a750ea5186f0a273e84
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Fri Sep 28 09:33:51 2018 -0500

    updated old links
    
    replaced py3.5 with py.37 to link to the latest installers

commit 730d0c94958fbc8dfb73e11f989ff316cea56d30
Merge: 95b04262 e29a161f
Author: Mike Sarahan <msarahan@gmail.com>
Date:   Fri Sep 28 08:22:30 2018 -0500

    Merge pull request #2116 from nehaljwani/5.3.0
    
    Update docs for 5.3.0 distribution release

commit e29a161fdeb6bb10db1460f9008915f5cb063164
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Fri Sep 28 04:04:56 2018 +0530

    DSNC-587 Update hashes for 5.3.0 installers

commit 594ce866bdfa70a00a225d69b8e5e67e6d1c1b96
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Fri Sep 28 04:01:13 2018 +0530

    DSNC-587 Update release notes for 5.3.0

commit d638432e625c99cdf180f5fddab64b9f08fba620
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Fri Sep 28 03:00:59 2018 +0530

    DSNC-587 Update package lists for 5.3.0

commit 95b042626acf6cccbcf93773f757f6baccc7cbc9
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Sep 25 11:21:12 2018 -0500

    updated for 3.7
    
    replaced 3.5 references with 3.7

commit 7818f732eed18205f98cb177cfb7d1b0e53724ce
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Sep 25 11:11:19 2018 -0500

    added 3.6
    
    added 3.6

commit 9bcee7420ca9f5533af8ba5bc4078865db08f2a3
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Sep 25 11:10:31 2018 -0500

    updated for 5.2.0
    
    updated for 5.2.0 installer and Python 3.6

commit a30d8c525ccabaa650d75eb711b20434ed291055
Author: kwells-anaconda <40577714+kwells-anaconda@users.noreply.github.com>
Date:   Tue Sep 25 11:05:09 2018 -0500

    updating 3.6 to 3.7
    
    updating 3.6 to 3.7

commit f05666dae7e4f22508e82277cd64bf10cbeeae32
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 21 15:02:22 2018 -0500

    Update tensorflow.rst

commit 2024a1cdaafe8efcc302765aff4494d0f04ae0d5
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 21 13:27:52 2018 -0500

    AEDOCS-275 TensorFlow
    
    AEDOCS-275 TensorFlow

commit a61081a21a27760c0302d39d88581c3acbb2ce85
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 18:42:20 2018 -0500

    Update history.md

commit 4d215dea9d8a517429696fe2088a5ced118e3a5f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 18:07:31 2018 -0500

    AEDOCS-275 update
    
    AEDOCS-275 update

commit 9ecaf8f9b79dbcec381fe5e6411b840ee64ad12b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 17:59:49 2018 -0500

    AEDOCS-275 TensorFlow on Anaconda
    
    AEDOCS-275 TensorFlow on Anaconda

commit ab0f3af1333afd1ab637a8aeb38f22b4c24ca904
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 16:16:45 2018 -0500

    Update history.md

commit dc8d16912e6f7c950491e4295eaa74f7e1365eaa
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 16:11:09 2018 -0500

    Update README.md

commit fca90e1c470b772b5f048b67e3109ad45fb5ef9b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 16:10:35 2018 -0500

    Create history.md

commit 0119c2e89fda8c901055d7b453c511ae0fc1ab4c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 20 12:09:45 2018 -0500

    fix path
    
    fix path

commit 7b7f87c5e9d533f9d8957a2b00bd910b4b16e303
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 17 15:11:29 2018 -0500

    tweak text
    
    tweak text

commit 74e677d951569851cdb0c724fb3b493d65cc90c2
Merge: b8a765a2 ec39ef58
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 17 15:08:43 2018 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs

commit b8a765a2760dd65ccc60fbe2bd3b5d5a092e1484
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 17 15:08:23 2018 -0500

    update AE 4 sys reqs
    
    update AE 4 sys reqs

commit ec39ef58af22a6e8d66ef2c91aeaac1557ebfad3
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 17 14:20:04 2018 -0500

    remove changes to main height
    
    remove changes to main height

commit 700658edc1fa3bd5e31ad627598c0426cc4e3612
Merge: 2c37d2ab 29ed08e5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 13 12:31:53 2018 -0500

    Merge pull request #2115 from ContinuumIO/iopro-update
    
    fix broken iopro link

commit 29ed08e5e16e9a358cc4c1af3df967e407bf11b7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 13 12:31:36 2018 -0500

    update IOPro frontpage
    
    update IOPro frontpage

commit b4f66350d546c75a179b3a2df5e4fb4ca9f7156c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 13 12:29:52 2018 -0500

    fix broken iopro link
    
    fix broken iopro link

commit 2c37d2ab477b883b882670cd3f0f3d3830143cd5
Merge: cccc2c82 b382c6bc
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 11 16:17:17 2018 -0500

    Merge pull request #2114 from ContinuumIO/aedocs259-r-install
    
    AEDOCS-259 R install

commit b382c6bca40f70dfa56e08f63875709aa3762560
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 11 16:16:53 2018 -0500

    AEDOCS-259 R install
    
    AEDOCS-259 R install

commit cccc2c826b6af7dc850ab73ab90e9b4528d97934
Merge: 8b46c3a9 e29d02e2
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 10 18:21:01 2018 -0500

    Merge pull request #2113 from ContinuumIO/aedocs137-offline-docs
    
    AEDOCS-137 offline docs

commit e29d02e2e715d994e3e7d3c8affb66b0927e0e1c
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 10 18:16:21 2018 -0500

    AEDOCS-137 offline docs
    
    AEDOCS-137 offline docs

commit 8b46c3a98bdb93e9f24d963b18e05a0abfe3171a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 16:53:15 2018 -0500

    Update layout.html

commit e6c6125f1c151e0f8e518fcbde3c0a815c960548
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 16:32:29 2018 -0500

    rm search-results.rst
    
    rm search-results.rst

commit f5e1fe089053e8767cd0b9ebeaa47ff48bb73011
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 16:24:31 2018 -0500

    Update layout.html

commit 5e607486792d5663955676eb3b6dc7af3bdcdc84
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 16:16:05 2018 -0500

    Update layout.html

commit 86d2b94ce2472ac11dc14d312bd8368666d58b65
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 15:41:34 2018 -0500

    AEDOCS-252 new offline pkgs
    
    AEDOCS-252 new offline pkgs

commit 959f7d1f711a90baca71341befcefbc05eeb4d58
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 14:39:55 2018 -0500

    update local-build instructions
    
    update local-build instructions

commit 68d2d781e924e4e6f3e99fb8c08e754ecdbeb57d
Merge: ce20449e 94067f46
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 14:11:25 2018 -0500

    Merge pull request #2112 from ContinuumIO/aedocs251-distro-gpus
    
    AEDOCS-251 GPUs with Anaconda Distro

commit 94067f46abc0104597d881971d7fa543362ad988
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 13:51:27 2018 -0500

    AEDOCS-251 GPUs with Anaconda Distro
    
    AEDOCS-251 GPUs with Anaconda Distro

commit ce20449e0c3f80a47e36da173027197838a05dce
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 6 11:44:32 2018 -0500

    readme updates
    
    readme updates

commit 6154d361ffae1a2e005dd9857ce81eab0428f886
Merge: 56d1ac5c 20d40602
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 5 17:57:05 2018 -0500

    Merge pull request #2111 from ContinuumIO/jotform-password
    
    add jotform password

commit 20d4060203a7c342a67f4d5f643cf8636bb1490c
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 5 17:56:48 2018 -0500

    add jotform password
    
    add jotform password

commit 56d1ac5c7318d249a09508bf6248164867cb9c67
Merge: 0a0827ab 72636c2e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 5 17:53:11 2018 -0500

    Merge pull request #2110 from ContinuumIO/jotform
    
    add jotform

commit 72636c2ed86ba801b9179c24b81fdb0bcaff39c9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 5 17:52:57 2018 -0500

    add jotform
    
    add jotform

commit 0a0827ab893f724e04aba9883fe0f6f9fcffd2db
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 19:03:07 2018 -0500

    update local builds file
    
    update local builds file

commit 2089ba3483f7adc95dadd4c6c808c7539e845e81
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 18:31:58 2018 -0500

    AEDOCS-191 Navigator 1.9
    
    AEDOCS-191 Navigator 1.9

commit 39e37dec6b0c6e80fa31499149c0160046185fa8
Merge: 03ce0df5 30305d0a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 18:29:11 2018 -0500

    Merge pull request #2108 from ContinuumIO/readthedocs
    
    ReadTheDocs migration

commit 30305d0a709fdb08290a731bfb884ded5537417e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 18:25:22 2018 -0500

    fix lists
    
    fix lists

commit bfa74ea025092da8373b3692f6e7311602a7502b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 18:19:27 2018 -0500

    cleanup
    
    cleanup

commit 022603edfa6fab9efd9d2258c67840fd2179d1ef
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 14:43:52 2018 -0500

    ReadTheDocs migration
    
    ReadTheDocs migration: being by removing build directory

commit 03ce0df51c62424a1a5034a54b803c7886d68cda
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 14:36:50 2018 -0500

    rm rsted
    
    rm rsted

commit 4dc1e516c2176745b73e3789e155bae02829c012
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 4 14:30:11 2018 -0500

    test change
    
    test change

commit e4991d1a21ddefb399463c8adad9fb804141604f
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 14:13:41 2018 -0500

    AE 4 Repo 2.33.27 release notes
    
    AE 4 Repo 2.33.27 release notes

commit b435e815931767fae10beceea2ca75de31896341
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 13:20:57 2018 -0500

    spacing
    
    spacing

commit 045ea45b001910146ce96403fe6cf8cfd672b9a8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 12:30:04 2018 -0500

    restore conda and openssl for anaconda-oss-docs pkg
    
    restore conda and openssl for anaconda-oss-docs pkg

commit 93de8316e86675b3f4532f075e91a42525399c30
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 11:56:48 2018 -0500

    new python 3.5 doc links for anaconda-oss-docs pkg
    
    new python 3.5 doc links for anaconda-oss-docs pkg

commit 20bf89a0e603a0134726b699d447d323f823a3b3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 11:52:25 2018 -0500

    anaconda-oss-docs 1.0.11
    
    anaconda-oss-docs 1.0.11

commit e7b0fee9af153e854cfe38bf29125b907b75317f
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 21 11:28:25 2018 -0500

    anaconda-docs 2.0.28
    
    anaconda-docs 2.0.28

commit 19454b24fbd5a8030ad998e1b8d24f2c97674b89
Merge: 597418ff 596d4a24
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 10 12:33:27 2018 -0500

    Merge pull request #2106 from ContinuumIO/anaconda-client
    
    anaconda-client 1.7

commit 596d4a24667b340a844812248175265044ac30e2
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 10 12:12:50 2018 -0500

    fix bad install link
    
    fix bad install link

commit 57f48b25c7ce772f95f8defa8864eaba08fb9b1c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 10 12:09:49 2018 -0500

    update help msg
    
    update help msg

commit 7dbd4cdc1eb14ec12cf113a0c417c3fc28fdb06c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 9 18:03:23 2018 -0500

    anaconda-client 1.7
    
    anaconda-client 1.7 and related improvements

commit 597418ff38ed1ec894d5eaaa6959c3dbfa845c9e
Merge: 3dab557e 472d540e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 9 11:47:40 2018 -0500

    Merge pull request #2105 from ContinuumIO/rm-conda-env-upload
    
    AEDOCS-219 conda env upload replaced by anaconda upload

commit 472d540e6bec365d7900bd9994a18e85a2159f3f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 9 11:05:59 2018 -0500

    AEDOCS-219 conda env upload replaced by anaconda upload
    
    AEDOCS-219 conda env upload replaced by anaconda upload

commit 3dab557e461daede89465ab4e2f08ef1c671cb31
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 3 13:27:48 2018 -0500

    change from AE logo to Anaconda logo
    
    change from AE logo to Anaconda logo

commit 8f79ecdfc0beafe553e2004aec79391c972d700c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 3 13:01:59 2018 -0500

    fix dashes in left menu
    
    fix dashes in left menu

commit 24a49f7092104a842a54c0d2fee154418397f4bf
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 2 18:10:53 2018 -0500

    add docs
    
    add docs

commit 757473e7e2558318c22a4673e61f116020d73b36
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 2 16:28:51 2018 -0500

    .gitignore and environment.yml files
    
    .gitignore and environment.yml files

commit d7b73f35e833bee8e1c2fb67f6c9fba8fec8eadf
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 2 13:57:44 2018 -0500

    change name of Makefile target "docs"
    
    change name of Makefile target "docs" so we can have a directory
    with that name

commit 8637055c7a31bd4179288d45af71198747584300
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 2 13:48:11 2018 -0500

    rm Guardfile
    
    rm Guardfile

commit 7b51fb553c1a54621411cff6e87d3659f004f92f
Merge: 00a51a9d b4bfe6f8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 17:08:33 2018 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 00a51a9d9faa5728111ed3f16fefcf0d089791d7
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 17:08:10 2018 -0500

    AE 4 Repo & Cloud
    
    AE 4 Repo & Cloud

commit b4bfe6f8e18b48d3adc75602e02147e9f483c8e4
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 16:56:32 2018 -0500

    Cloud/AE 4 Repo release checklist
    
    Cloud/AE 4 Repo release checklist

commit d0ed316d8bcb528ec8b4b42d17cc5c305b642e74
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 16:41:12 2018 -0500

    AEN release checklist
    
    AEN release checklist

commit 3c3a58385255d3db9cb6542956cf99bcef2ec5db
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 16:38:36 2018 -0500

    AE sys reqs in readme
    
    AE sys reqs in readme

commit c533dd6c2302e367ff7af97fa92f0526507739f5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 1 16:29:57 2018 -0500

    AEN
    
    AEN

commit b4c34b92e6b2363462e98439487db1220b05ae22
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 19:01:49 2018 -0500

    update gitignore
    
    update gitignore

commit 131890a64fe91a4164a5d71dce36be81902277b9
Merge: 719c26e6 f5e81185
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:54:48 2018 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 719c26e6ef4d3cf7513987eb774ad24c997fd417
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:54:37 2018 -0500

    oss
    
    oss

commit f5e811858a4c487178d6cfd5f12305510213b2b1
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:39:20 2018 -0500

    AESystemRequirements readme
    
    AESystemRequirements readme

commit 48990d0b7f0388f0e6b6bfd1b226d1aa64b31515
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:31:51 2018 -0500

    AESystemRequirements
    
    AESystemRequirements

commit 5796ab08365e98adcad3872da670a5e0b7f8bc07
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:16:16 2018 -0500

    fix makefile
    
    fix makefile

commit 98f5f40128323b0aee70de51951599fc4d736c6a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:13:25 2018 -0500

    adam scale aetrial
    
    adam scale aetrial

commit a6cb440fb1cfe35af0f5e588d3600adb859ded33
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 18:04:28 2018 -0500

    numbapro
    
    numbapro

commit d82337a0f3929936f6dc4bb5133951f8c16fae69
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 17:59:06 2018 -0500

    mkl-service
    
    mkl-service

commit 0267cb43da02072755a62593238bb58b59b82d38
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 17:52:21 2018 -0500

    fix makefile
    
    fix makefile

commit 798252296be71ca80712434fca705bf0ae0a20cf
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 17:46:22 2018 -0500

    iopro
    
    iopro

commit 12048f9f40d1827e0dc777a1035d19758f71b4c2
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 17:22:33 2018 -0500

    anaconda-cluster
    
    anaconda-cluster

commit 486758d32a65b39882e46efeead683d85887e795
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 17:10:44 2018 -0500

    info from old Distro readme
    
    info from old Distro readme

commit 6e5300d749cb5bb75b3ccb56af9001d9b78a48d5
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 16:38:57 2018 -0500

    anaconda distribution-docs
    
    anaconda distribution-docs

commit 43ea31a4ec256d0f39674d494c8a71bbd0bb7fc6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 30 16:06:32 2018 -0500

    accelerate
    
    accelerate

commit e93551724bc954763314eb63e631657729dc87ab
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 26 16:25:59 2018 -0500

    update numpy scipy python links
    
    update numpy scipy python links

commit 040d2fb8effe280c4a532b3e0e14a2e8b8078cee
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 26 16:13:42 2018 -0500

    anaconda-oss-docs 1.0.10
    
    anaconda-oss-docs 1.0.10

commit 68388bc8ee0cfe053783246ebb7b632bd9cdb7fa
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 26 15:40:10 2018 -0500

    anaconda-docs 2.0.27
    
    anaconda-docs 2.0.27

commit 53d06f8cab3f5ede342b162bd1a4b361a9065a75
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 16 12:30:05 2018 -0500

    fix setting inline image width
    
    fix setting inline image width

commit e19b5e9151c41f427b4d6849d3d1b527bbd681d0
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 16 12:15:01 2018 -0500

    setting inline image size
    
    setting inline image size

commit 07a564ebe9a8f9f0aebcdfd406fc204a59169f9d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 13 14:10:21 2018 -0500

    Update detailed.rst

commit 72de774681373d54b2e6717a5bb2f187a9e87073
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 13 14:09:40 2018 -0500

    Add files via upload

commit 797f2d2cb82c7479a82ca46b242a7067fd816820
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 25 17:04:10 2018 -0500

    Update offline-pkg.md

commit 67574e25ef5a72cdc301bb5925f6b403806fb421
Merge: d1360846 7e26ee28
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 30 13:45:09 2018 -0500

    Merge pull request #2073 from ContinuumIO/oss-openssl
    
    OSS docs: openssl

commit 7e26ee28315df71b5d040aeaeb5ec155cae67b8d
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 30 13:39:46 2018 -0500

    OSS docs: openssl
    
    OSS docs: openssl

commit d1360846827834c5d4d455ac9f5ffcde699a7793
Merge: 88ea7536 25dd8298
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 17:49:34 2018 -0500

    Merge pull request #2063 from ContinuumIO/rm-jotform
    
    remove jotform script

commit 25dd82986f108aedec292002f475a316bc731896
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 17:49:24 2018 -0500

    remove jotform script
    
    remove jotform script-- correct place to add it was instead ``Docs-D7/sites/all/themes/continuum_docs/templates/html.tpl.php``.

commit 88ea7536e650c069d465403c2af8cced8800855f
Merge: 36d8759c c485f8c2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 13:48:35 2018 -0500

    Merge pull request #2061 from ContinuumIO/add-jquery-noconflict
    
    add jquery noconflict

commit c485f8c2119bc2997c6bcd07d34bccd8f85777b5
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 13:47:49 2018 -0500

    add jquery noconflict
    
    add jquery noconflict

commit 36d8759c44f6092bd9f60e6573a8021f3fdd03d0
Merge: 809993a9 591f2fb3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 12:24:55 2018 -0500

    Merge pull request #2060 from ContinuumIO/jotform
    
    add JotForm

commit 591f2fb37b24286b71540af51d7ca6d11e4f59dc
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 24 12:24:02 2018 -0500

    add JotForm
    
    add JotForm

commit 809993a950e7387ab629478e0f9c6b4b026c43fc
Merge: a85938d4 3a1008de
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 20 16:29:28 2018 -0500

    Merge pull request #2054 from ContinuumIO/rm-dupe-cython
    
    remove duplicate cython

commit 3a1008ded930a180c37fb4fba6599f43ec30cf0c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 20 16:29:02 2018 -0500

    remove duplicate cython
    
    remove duplicate cython

commit a85938d4b638c476313f8de742a06438ba99530d
Merge: e01ab4f2 3942fc87
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 16:35:31 2018 -0500

    Merge pull request #2048 from ContinuumIO/oss-docs-setuptools-typo
    
    oss docs - setuptools - typo

commit 3942fc87523b6625403c8904516795a3ea105933
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 16:34:47 2018 -0500

    oss docs - setuptools - typo
    
    oss docs - setuptools - typo

commit e01ab4f2a414737b600951ad38138b324c9a55c4
Merge: 516ed612 76ec0efb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 16:17:39 2018 -0500

    Merge pull request #2045 from ContinuumIO/oss-docs-setuptools
    
    oss docs - setuptools

commit 76ec0efb56885c49b6a5a8e02f28965d42904bf1
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 16:16:58 2018 -0500

    oss docs - setuptools
    
    oss docs - setuptools

commit 516ed612a806f6bc4b4df94d9e293d8def1fd3c9
Merge: e12daedf 39c51004
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 15:29:07 2018 -0500

    Merge pull request #2043 from ContinuumIO/oss-docs-certifi-python
    
    update oss doc scripts and readme for certifi (and python)

commit 39c51004d7018c4f790e2b614eee81ea006e6e53
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 18 15:27:39 2018 -0500

    update oss doc scripts and readme for certifi (and python)
    
    update oss doc scripts and readme for certifi (and python)

commit e12daedfe19dc964c488dff28d40c63ead4b00e7
Merge: 11600755 b906367d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 5 17:06:02 2018 -0500

    Merge pull request #2034 from ContinuumIO/anaconda-oss-docs-1.0.5
    
    anaconda-oss-docs 1.0.5

commit b906367d80e0589cb6801d6ed4931d3316e71b6f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 5 17:05:52 2018 -0500

    anaconda-oss-docs 1.0.5
    
    anaconda-oss-docs 1.0.5

commit 11600755f55d3740ef62e541e24f229fe33fe36c
Merge: 42e6bf65 b99352f4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 5 16:56:53 2018 -0500

    Merge pull request #2033 from ContinuumIO/anaconda-docs-2.0.26
    
    anaconda-docs 2.0.26

commit b99352f434f720a01105344eb880257b3096dfe5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 5 16:55:58 2018 -0500

    anaconda-docs 2.0.26
    
    anaconda-docs 2.0.26

commit 42e6bf65a3b00178fb9e13a3bd6420e026a45039
Merge: 8e15c992 a339b450
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 29 14:25:06 2018 -0500

    Merge pull request #2025 from ContinuumIO/v5-anaconda-docs
    
    add v5 to anaconda-docs

commit a339b4502634ce732d2ed4202a519af5f9edd448
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 29 14:24:21 2018 -0500

    add v5 to anaconda-docs
    
    add v5 to anaconda-docs

commit 8e15c992ab4ee6274b0470d3e9f1cb4607d09554
Merge: 4f2dd2b3 a74ef084
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 29 13:52:57 2018 -0500

    Merge pull request #2024 from ContinuumIO/oss-conda
    
    update oss recipe for conda

commit a74ef0848cec9c097b11bed0bc3054eb43bd3c16
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 29 13:52:20 2018 -0500

    update oss recipe for conda
    
    update oss recipe for conda

commit 4f2dd2b35d1bc013b320a703126d0c477aa8579e
Merge: 9846620b dbe40f79
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 26 19:18:29 2018 -0500

    Merge pull request #2021 from ContinuumIO/image-updates
    
    image updates

commit dbe40f79127bde4c453a3e6f8400062f283d192f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 26 19:16:33 2018 -0500

    image updates
    
    image updates

commit 9846620b95f255f6b7e4a48c50144ba4e680b896
Merge: 99582f70 0ca81e00
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 26 17:03:42 2018 -0500

    Merge pull request #2020 from ContinuumIO/remove-fusion
    
    remove fusion

commit 0ca81e0046ed3655e3cc88103b652f7de471360c
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 26 17:03:02 2018 -0500

    remove fusion
    
    remove fusion

commit 99582f70488c7c2230d37a2d674257b819c1ff60
Merge: b6e7c5d7 40194226
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Fri Mar 23 16:31:02 2018 -0500

    Merge pull request #2010 from ContinuumIO/imgs/repo
    
    Repo-Update screenshots

commit b6e7c5d76ca4ec229d03416e98bbc801ed4756d2
Merge: 4c292518 55abf3f6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 23 15:45:57 2018 -0500

    Merge pull request #2016 from ContinuumIO/cloud-images
    
    cloud images

commit 55abf3f6f8814fdeb210c8492bc99c01ec0caf6d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 23 15:39:08 2018 -0500

    cloud images
    
    cloud images

commit 401942265f6821d5508b681c2e083a1dde234c51
Author: Saranya Mahalingam <smahalingam@anaconda.com>
Date:   Thu Mar 22 12:22:58 2018 -0500

    Repo-Update screenshots
    
    https://github.com/ContinuumIO/docs/issues/2007#event-1535851013

commit 4c29251878e9ee75a0f7f5201aa9d7c5cbbe5d11
Merge: 1b118644 43d49cb7
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 20 14:01:59 2018 -0500

    Merge pull request #2003 from ContinuumIO/pkg-build-noarch
    
    package build: update for noarch

commit 43d49cb7fdb017fe944383d15bcbd5e3ffbd17e1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 20 14:01:29 2018 -0500

    package build: update for noarch
    
    package build: update for noarch

commit 1b1186449470d1c923237801b1d669ee19c518b9
Merge: 6614b56e f2ece3c4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 16:39:09 2018 -0500

    Merge pull request #1829 from ContinuumIO/adding-conda-and-other-oss-pkgs
    
    adding conda and other OSS packages

commit f2ece3c43b7a2809359d5c7a094ca1b7b3c22cb7
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 16:11:31 2018 -0500

    try source activate
    
    try source activate

commit 7c0c5161096dd23ec86486d3ad00a289a2c0b99b
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 16:08:34 2018 -0500

    add -y to conda remove
    
    add -y to conda remove

commit 12fd59808d524dc58db5fb2b3221b37b760f50f4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 16:07:04 2018 -0500

    fix activate command
    
    fix activate command

commit a6a7650d191e11290bd28c2e7e0d3be05fcc3fa0
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 16:03:39 2018 -0500

    updates: conda only
    
    updates: conda only

commit 6614b56e776425b71263b6edad21d2a8d5d9b685
Merge: 3feb1da0 129f4b28
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:52:04 2018 -0500

    Merge pull request #1996 from ContinuumIO/readme-footer-menu
    
    add footer menu info

commit 129f4b28b2723d0f2395a81e3c9ac20b06f1efc7
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:51:54 2018 -0500

    add footer menu info
    
    add footer menu info

commit 3feb1da07a4d6661d6f3ed64b98a68d6b7700394
Merge: 7caac318 eea1fbb1
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:41:57 2018 -0500

    Merge pull request #1995 from ContinuumIO/revert-1994-add-archive-link
    
    Revert "add archive link"

commit eea1fbb1b902191aff3e09b559876cef5c62eca3
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:40:10 2018 -0500

    Revert "add archive link"

commit 7caac3181ecfd11a6cd4a0f33ad973670106b592
Merge: 90d26e0b 6c582ae7
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:24:48 2018 -0500

    Merge pull request #1994 from ContinuumIO/add-archive-link
    
    add archive link

commit 6c582ae7ddba0e9f41bf9cf723b09760db120082
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 19 14:24:36 2018 -0500

    add archive link
    
    Add archive link. Strangely we're currently seeing an archive link, which works on the home page but 404s from other pages, but can't find it anywhere in this file, this repo, or Drupal.

commit 90d26e0b8a8844faab51fc8987974f44001e673a
Merge: 7d075e1f 7c6e059b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 15 17:31:35 2018 -0500

    Merge pull request #1993 from ContinuumIO/anaconda-oss-docs-103
    
    anaconda oss docs 1.0.3

commit 7c6e059be67ad6bb886e9d127ac1d651a726d9af
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 15 17:31:24 2018 -0500

    anaconda oss docs 1.0.3
    
    anaconda oss docs 1.0.3

commit 7d075e1f9e4152da68fcc032c41703e0211423ae
Merge: 50e62cce a9e35a4a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 15 17:17:56 2018 -0500

    Merge pull request #1992 from ContinuumIO/anaconda-docs-2024
    
    anaconda docs 2.0.24

commit a9e35a4a382ffeb961bf5f1d010ccabd3f01abd6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 15 17:17:37 2018 -0500

    anaconda docs 2.0.24
    
    anaconda docs 2.0.24

commit 50e62cceb09cad073895ac885013b77c01aa91e8
Merge: 07c64004 8b8e0eda
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:32:20 2018 -0500

    Merge pull request #1988 from ContinuumIO/ae4-more-links
    
    AE4: fix more links

commit 8b8e0edabcdb32a2e57a9ea6aaadcb7180da6a0d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:32:03 2018 -0500

    AE4: fix more links
    
    AE4: fix more links

commit 07c6400497fe478979f6dc6fd2bd554887d35516
Merge: 851407c4 baeb6b51
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:31:02 2018 -0500

    Merge pull request #1987 from ContinuumIO/fix-index
    
    fix index

commit baeb6b5173d1cb5e431c52011610c01d8bac0855
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:30:52 2018 -0500

    fix index
    
    fix index

commit 851407c4a6b1c4ba08d30cc75aaf36757a378fd4
Merge: f2bfc81e a9ba3e75
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:29:58 2018 -0500

    Merge pull request #1986 from ContinuumIO/ae4-fix-links
    
    AE4: fix links

commit a9ba3e75ffba8bd13b1bd69060f7e120a4f1be21
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:29:47 2018 -0500

    AE4: fix links
    
    AE4: fix links

commit f2bfc81ecce3331791b7f6bc9589ab00a22c8379
Merge: e7c37f10 11859703
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:28:11 2018 -0500

    Merge pull request #1985 from ContinuumIO/rearrange-ae4-file
    
    rearrange AE4 file

commit 1185970339f29fc1f215ae9865b57efe430a3f23
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:27:42 2018 -0500

    rearrange AE4 file
    
    rearrange AE4 file

commit e7c37f10f4d843192a495f0f622456557779daa6
Merge: 69290288 9406401f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:14:12 2018 -0500

    Merge pull request #1984 from ContinuumIO/test-change
    
    test change

commit 9406401fa74b7c27509ebf7520a7f11317b2d737
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:14:03 2018 -0500

    test change
    
    test change

commit 69290288c1c8a95baf3928acfcf5574b82b4ecf3
Merge: 45964dd9 413e1be1
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:05:00 2018 -0500

    Merge pull request #1983 from ContinuumIO/readme-online-docs
    
    readme: add note about online docs

commit 413e1be1b6a84e6dfe9a94390ebb9f0119ee8836
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:04:47 2018 -0500

    readme: add note about online docs
    
    readme: add note about online docs

commit 45964dd9b4001a041b471e2519ee61d28a1d6f13
Merge: 51a3199c c5924bc0
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:02:38 2018 -0500

    Merge pull request #1982 from ContinuumIO/readme-ae5-branches
    
    update info on AE 5 branches

commit c5924bc0291190e4278e79a37c5f35174448d419
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 14 16:01:42 2018 -0500

    update info on AE 5 branches
    
    update info on AE 5 branches

commit 51a3199cb5d0afaf0fe382a0b34aaa9877da099b
Merge: b20375ef 0fdd3bb6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 12 17:01:48 2018 -0500

    Merge pull request #1970 from ContinuumIO/rm-ipython-dupes
    
    remove duplicates of ipython

commit 0fdd3bb6890c1a2ee254eed892628d3abd4453fe
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 12 17:01:25 2018 -0500

    remove duplicates of ipython
    
    remove duplicates of ipython

commit b20375efc6f55b44177b0a517298d4817d2a13d1
Merge: 09226c33 3fb77e0d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 9 16:58:31 2018 -0600

    Merge pull request #1959 from ContinuumIO/anaconda-docs-2.0.23
    
    anaconda-docs 2.0.23

commit 3fb77e0d2e104cfdbc6cd723b7992501f884a267
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 9 16:58:21 2018 -0600

    anaconda-docs 2.0.23
    
    anaconda-docs 2.0.23

commit 09226c3388198c54c99e0248c6b972be6752af2c
Merge: 69742844 bc76b994
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 9 15:47:06 2018 -0600

    Merge pull request #1958 from ContinuumIO/offline-oss-docs-python
    
    offline oss docs: Python

commit bc76b99434d0b1adc9ccce9fa1ee12fb18f36fca
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 9 15:46:17 2018 -0600

    offline oss docs: Python
    
    offline oss docs: Python

commit 697428441aa970a33046b493d901099838144778
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Fri Mar 9 14:08:36 2018 -0600

    Update README.md

commit 8b7ea8816527c6d46897ff7ad9880fc3266660ca
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Fri Mar 9 11:19:55 2018 -0600

    Update README.md

commit 1f5fd2160ff7b4608fe3cd86b8e350631f7be33e
Merge: e613a4c9 789ca395
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 6 14:54:32 2018 -0600

    Merge pull request #1949 from ContinuumIO/jotform-readme
    
    Create jotform.md

commit 789ca3956aa501d4893114a9634b6dcae4579128
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 6 14:54:15 2018 -0600

    add JotForm link

commit ebd6afd844f2ced362fa2c7d852ba5a3f928525c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 6 14:52:10 2018 -0600

    Create jotform.md

commit e613a4c96222be570d56f8ae69c3ebd89fd708d7
Merge: c164a1b7 a03e2f49
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 5 17:30:57 2018 -0600

    Merge pull request #1944 from ContinuumIO/archive-docs
    
    Add note that this documentation is archived

commit c164a1b72b5d4d21aee47b45d9eefca6fff29910
Merge: d09cdc72 cbdcdf7e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 5 17:09:56 2018 -0600

    Merge pull request #1945 from ContinuumIO/update-anaconda-windows-screenshots
    
    update Anaconda Windows screenshots

commit cbdcdf7e14bb3000a62ff36036783cd07b153e7f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 5 17:07:27 2018 -0600

    update Anaconda Windows screenshots
    
    update Anaconda Windows screenshots

commit a03e2f4995b47a58ebc8fc9c16e9d58ef0250d69
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Mon Mar 5 15:37:33 2018 -0600

    Add note that this documentation is archived
    
    This documentation has been moved to the archive. This note is to let people know who navigate directly to the page, similar to the note of archived products on ReadTheDocs.

commit d09cdc72bb65bee05c701ca64ce4e2c3b7632d8e
Merge: f041cde8 065ccfe2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 1 17:53:53 2018 -0600

    Merge pull request #1931 from ContinuumIO/aen-422-makefile
    
    AEN 4.2.2 Makefile update

commit 065ccfe24772fc2322987345a73c7a0a48dfb26a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 1 17:53:42 2018 -0600

    AEN 4.2.2 Makefile update

commit f041cde817b8031e653b15bfefb35082d5821d74
Merge: b5f84035 fe65fa4d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 1 17:26:32 2018 -0600

    Merge pull request #1930 from ContinuumIO/aen-422-images
    
    AEN 4.2.2 images

commit fe65fa4d21047a904f6c56684b61765bb9e64a42
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 1 17:25:57 2018 -0600

    AEN 4.2.2 images
    
    AEN 4.2.2 images

commit b5f84035ef7d466b7c313e2f7febef35c469a049
Merge: 5f4cd6ec a6fce74f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 28 17:16:41 2018 -0600

    Merge pull request #1927 from ContinuumIO/update-left-nav
    
    update left nav

commit a6fce74feb3556823ac6ec5cb08838383a6a4b46
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 28 17:15:25 2018 -0600

    update left nav
    
    update left nav

commit 5f4cd6ec1c6e5f84984a35f1d22c7ed738679d94
Merge: fb07f070 c3528ce1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Feb 27 10:20:43 2018 -0600

    Merge pull request #1920 from ContinuumIO/new-nav-r-img
    
    new Navigator R image

commit c3528ce1e5bcc8b6b050d1d33d5136acace8e1ef
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 26 18:06:00 2018 -0600

    new Navigator R image
    
    new Navigator R image

commit fb07f07055bcb3ae67f85e96ec69732578cb7eca
Merge: 5893cc70 e61be2eb
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 16 16:06:11 2018 -0600

    Merge pull request #1906 from ContinuumIO/left-nav-numbapro
    
    add numbapro to left nav

commit e61be2ebf3211ef090d660979433f25bd1895b31
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 16 16:06:03 2018 -0600

    add numbapro to left nav
    
    add numbapro to left nav

commit 5893cc70374fcda231665ff0a5e522c1cf887fa4
Merge: 15b4fb04 af5db287
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 16:28:15 2018 -0600

    Merge pull request #1903 from ContinuumIO/new-left-nav
    
    new left nav

commit af5db2874e5bf2ea3d95934a2c8151541332a8c3
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 16:27:44 2018 -0600

    fix archive link
    
    fix archive link

commit 91679a185a6fe7ea47094caec2cd9b4eb8e96764
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 16:26:48 2018 -0600

    match front page left menu
    
    match front page left menu

commit 15b4fb04bfc252d7154bfae1cbed0ff953ab0c96
Merge: 02e96431 ba5c5bab
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 15:46:00 2018 -0600

    Merge pull request #1904 from ContinuumIO/electronwill-patch-1
    
    readme: add newly discovered left menu info

commit ba5c5bab488bc516cf94359550837938d6785ebd
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 15:45:36 2018 -0600

    add newly discovered left menu info
    
    add newly discovered left menu info

commit 70eeaf612916070c28f175259dff56ed12acc3a5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 15:09:05 2018 -0600

    use new archive placeholder page
    
    use new archive placeholder page

commit d528a52f9a643bfd7e730b94206e174955d39f61
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 15:04:09 2018 -0600

    new left nav
    
    new left nav from https://docs.google.com/spreadsheets/d/17TG_nUogHwsh_w_G8n8EjLlwGvvF780TglxMBzXlBWQ/edit#gid=0

commit 02e964312d9daa42ac1e5ddf992962cebb42b955
Merge: 66fedc16 f835113a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 13:21:53 2018 -0600

    Merge pull request #1901 from ContinuumIO/update-vscode-screenshots
    
    update vscode screenshots

commit f835113a790fc308db020d726da95baceaec42a7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 13:20:54 2018 -0600

    update vscode screenshots
    
    update vscode screenshots

commit 66fedc16d9d0ea5bce4543dd4fd1ded9d7da76cf
Merge: 504eecca 444e9ca6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 09:54:31 2018 -0600

    Merge pull request #1899 from ContinuumIO/distro-51-images
    
    Distro 5.1 images

commit 444e9ca6700253794cb86e20c732d5b1eca37660
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 15 09:53:48 2018 -0600

    Distro 5.1 images
    
    Distro 5.1 images

commit 504eecca639927d8a33a0c115cd2713d84c0a40a
Merge: a9858a61 1320a584
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 14 17:40:33 2018 -0600

    Merge pull request #1898 from ContinuumIO/add-distro-51-images
    
    add Distro 5.1 images

commit 1320a584e9e0e4d9be927ea9c87f80c8c632f783
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 14 17:39:45 2018 -0600

    add Distro 5.1 images
    
    add Distro 5.1 images

commit a9858a610ac800b9658323b7067a16542c02f355
Merge: abf83ffe 0cc31bf9
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 12 15:31:03 2018 -0600

    Merge pull request #1889 from ContinuumIO/left-nav-in-index
    
    update left nav in index.rst

commit 0cc31bf90c4e6da1d3c686e59665531ec3e0f1bf
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 12 15:30:49 2018 -0600

    update left nav in index.rst
    
    update left nav in index.rst to match changes in Drupal

commit abf83ffea21046106d747676f20d634caf75c011
Merge: b4267021 68016a44
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 8 12:49:50 2018 -0600

    Merge pull request #1884 from ContinuumIO/conda-convert
    
    conda-convert is now conda convert

commit 68016a442f5f31b140147392cd264e8eb8aa75e7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 8 12:49:39 2018 -0600

    conda-convert is now conda convert
    
    conda-convert is now conda convert

commit b42670214d77cba73100cf723a349e2a38d6d6b0
Merge: 5b461603 21c5ab14
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 8 12:43:14 2018 -0600

    Merge pull request #1883 from ContinuumIO/anaconda-docs-2022
    
    anaconda-docs 2.0.22

commit 21c5ab14818a8e26f2480600e72df4377b889889
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 8 12:43:04 2018 -0600

    anaconda-docs 2.0.22
    
    anaconda-docs 2.0.22

commit 5b46160344b9b53bd690444860868177a9e4ca84
Merge: 9876a025 66a8157a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jan 29 16:56:35 2018 -0600

    Merge pull request #1847 from ContinuumIO/oss-link-editing
    
    OSS link editing

commit 66a8157a92a39535fbd3566ee6e23fc5df180fba
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jan 29 16:56:23 2018 -0600

    OSS link editing
    
    OSS link editing on docs.anaconda.com

commit 9876a02590b4a5a28d8005062b84ff8c83e3c1c2
Merge: 247061f5 aa671e6a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 26 16:43:55 2018 -0600

    Merge pull request #1840 from ContinuumIO/add-conda-to-left-nav
    
    add conda to left nav

commit aa671e6a69c33f5a3c77859e20f5d11cdb7445a4
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 26 14:17:25 2018 -0600

    add conda to left nav
    
    add conda to left nav

commit 247061f5c399ed5d6e73f37d1e7af00933e7ceab
Merge: 49f8fcd9 90ccc3c3
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 16:40:25 2018 -0600

    Merge pull request #1838 from ContinuumIO/oss-docs-numpy-scipy
    
    add numpy/scipy updates to oss-docs process

commit 90ccc3c34dcd2439262a6c6b4de17ca915f09d00
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 16:40:12 2018 -0600

    add numpy/scipy updates to oss-docs process
    
    add numpy/scipy updates to oss-docs process

commit 49f8fcd9051715535fd7042d09d2b9a3de20cdbf
Merge: 80c67c36 172ac6e2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 16:29:23 2018 -0600

    Merge pull request #1836 from ContinuumIO/fix-oss-recipe
    
    fix OSS recipe

commit 172ac6e2501113164e099363c719a31d3d8cac1d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 16:28:24 2018 -0600

    fix OSS recipe
    
    fix OSS recipe

commit 80c67c363aa0a7707ebd16defbaec8127c15abce
Merge: 56661681 3a891379
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 15:13:32 2018 -0600

    Merge pull request #1835 from ContinuumIO/add-oss-docs-to-main-readme
    
    offline package howto now includes oss-docs

commit 3a891379b5beffcef4fbcd637fc832439fdc3fa5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 15:13:21 2018 -0600

    offline package howto now includes oss-docs
    
    offline package howto now includes oss-docs

commit 5666168113a29624f4163b34a6277b64ae932c99
Merge: 520f5586 a3f148e4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 15:12:12 2018 -0600

    Merge pull request #1834 from ContinuumIO/oss-docs-readme
    
    add oss-docs to readme

commit a3f148e472e68e2a0ed51b78db4219e550e4374c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 15:11:56 2018 -0600

    add oss-docs to readme
    
    add oss-docs to readme

commit 520f558688bf0f538752de63966f28f0799f7aa1
Merge: 379b49ba 7f4e466b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 14:40:41 2018 -0600

    Merge pull request #1833 from ContinuumIO/update-offline-docs-howto
    
    update offline docs howto

commit 7f4e466b194d11639734f53566d6c4de2c1ba860
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 14:40:22 2018 -0600

    update offline docs howto
    
    update offline docs howto

commit 379b49ba99768b5945698e467a23ddf7b3e835cf
Merge: 8e5b4a19 9081bd8c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 13:59:02 2018 -0600

    Merge pull request #1831 from ContinuumIO/anaconda-docs-2021
    
    anaconda-docs 2.0.21

commit 9081bd8cc5624ad24e3c66424799cb17ae63433d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 25 13:58:51 2018 -0600

    anaconda-docs 2.0.21
    
    anaconda-docs 2.0.21

commit 8e5b4a197de11046adcc448e067b9d12c478c0b6
Merge: 6a5d16da 608927f2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 23 18:21:20 2018 -0600

    Merge pull request #1830 from ContinuumIO/add-rtd-oss-pkgs
    
    add readthedocs open source software packages

commit 608927f21832e49c3ee4acfae466e0f12d0e0fe0
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 23 18:20:14 2018 -0600

    add readthedocs open source software packages
    
    add readthedocs open source software packages

commit 565ad8a81b91cf2063cdfc06efe4ea572191d062
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 23 15:47:26 2018 -0600

    adding conda and other OSS packages
    
    adding conda and other OSS packages

commit 6a5d16da49f449a8e07d477e28287e88ae2cc842
Merge: e20229d7 464eedd2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 23 13:18:18 2018 -0600

    Merge pull request #1827 from ContinuumIO/anaconda-oss-docs-1.0.1
    
    anaconda-oss-docs 1.0.1

commit 464eedd21ad6151f0066f9ae7855d2eb1b8f07b6
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 23 13:17:18 2018 -0600

    anaconda-oss-docs 1.0.1
    
    anaconda-oss-docs 1.0.1

commit e20229d72a0ae9c41ce9da32fa94d3f47c5ad4d6
Merge: 94e6ed7b e32e638d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 20 16:02:01 2017 -0600

    Merge pull request #1759 from ContinuumIO/add-aen-420-archive-images
    
    add AEN 4.2.0 archive images

commit e32e638d72d10ab29fe2b17563778f0501fa54e8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 20 16:01:19 2017 -0600

    add AEN 4.2.0 archive images
    
    add AEN 4.2.0 archive images

commit 94e6ed7b6c22c9207c731aa21ef9d413f8d11f58
Merge: 348a45fa 2312325b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 19 13:37:02 2017 -0600

    Merge pull request #1756 from ContinuumIO/aen-421
    
    AEN 4.2.1 Makefile update

commit 2312325b8f7e6a7d68738b7c0aa946b76c38738f
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 19 13:36:23 2017 -0600

    AEN 4.2.1 Makefile update
    
    AEN 4.2.1 Makefile update

commit 348a45fae148948b7a5c19e9264d777d0c6c74d3
Merge: c471e0fe fa20a7d4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 18 14:18:28 2017 -0600

    Merge pull request #1755 from ContinuumIO/offline-docs-2020
    
    anaconda-docs 2.0.20

commit fa20a7d4e5932e1d4874e4b9cc7190d24ef08da5
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 18 14:18:05 2017 -0600

    anaconda-docs 2.0.20
    
    anaconda-docs 2.0.20

commit c471e0fe371f7d041222534fc72068cc5c169c9c
Merge: 9102411d c8a5c413
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 15 16:45:21 2017 -0600

    Merge pull request #1753 from ContinuumIO/update-other-makefile
    
    update other Makefile to remove conda and blaze

commit c8a5c413848e12ad1f6e3e5f0baef192022236cc
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 15 16:44:46 2017 -0600

    update other Makefile to remove conda and blaze
    
    update other Makefile to remove conda and blaze

commit 9102411da2b8f3f0c535985c2c4d1252b8fffc2d
Merge: fbb0f25c 2ee79ba3
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 15 15:06:45 2017 -0600

    Merge pull request #1750 from ContinuumIO/ae5-vs-docs.anaconda.com
    
    clarify AE5 vs docs.anaconda.com

commit 2ee79ba3880f73c4d6867a568b30868246060331
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 15 15:06:22 2017 -0600

    clarify AE5 vs docs.anaconda.com
    
    clarify AE5 vs docs.anaconda.com

commit fbb0f25ca261a86fd4b54fd831f5679bbf2c10a7
Merge: 323c4b9d 1eeca41a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 14 12:35:36 2017 -0600

    Merge pull request #1745 from ContinuumIO/comment-out-bokeh
    
    comment out Bokeh instructions

commit 1eeca41a9a192751cdf09edbe208883d80681470
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 14 12:34:40 2017 -0600

    comment out Bokeh instructions
    
    comment out Bokeh instructions

commit 323c4b9dd22bf8b38575af6744d61b08e436ad05
Merge: c24ef977 20917db6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 14 12:12:17 2017 -0600

    Merge pull request #1744 from ContinuumIO/bokeh-dask-left-menu
    
    point bokeh & dask offsite

commit 20917db6b9c759e3883df1837c8f36a45fcba4d4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 14 12:11:48 2017 -0600

    point bokeh & dask offsite
    
    point bokeh & dask offsite

commit c24ef977260cb47a0aa0c228c3ff7d484128de83
Merge: 080f04d9 b428f041
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 14 11:44:58 2017 -0600

    Merge pull request #1738 from ContinuumIO/match-oss-menu
    
    match OSS menu on docs pages to menu on front page

commit b428f04182dd31be9b28050ec540a3b360631440
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 12 16:57:51 2017 -0600

    match OSS menu on docs pages to menu on front page
    
    match OSS menu on docs pages to menu on front page

commit 080f04d94b342fb65be8da9f4e82f8ebb8a1b8c2
Merge: 8616250e edf4ca07
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 12 16:48:53 2017 -0600

    Merge pull request #1737 from ContinuumIO/left-menu-editing
    
    left menu editing

commit edf4ca07bc28543ca9afd775545477f4766cac16
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 12 16:44:18 2017 -0600

    left menu editing
    
    left menu editing

commit 8616250ebd21d319ae3f3407aeba846391017cbc
Merge: 32d251fc 32e06096
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Sat Dec 9 08:12:43 2017 +0700

    Merge pull request #1725 from ContinuumIO/fix-numba-removal
    
    removed numba related codes

commit 32e06096b5b4e8b2b41d8634d0952fbedf7fd3b7
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Sat Dec 9 08:12:06 2017 +0700

    removed numba related codes

commit 32d251fc1bd95bc1831ccbf12e3616ce7a8196d2
Merge: e6dd016e 16eab933
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Fri Dec 8 16:36:10 2017 +0700

    Merge pull request #1721 from ContinuumIO/remove-cython-numba
    
    removed cython and numba from menu

commit 16eab933b52defb438548424695b8d0b7505f8c6
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Fri Dec 8 16:35:47 2017 +0700

    removed cython and numba from menu

commit e6dd016ec5c5896cf68d232d8df9fa9b6417e470
Merge: 72534585 7f574751
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 4 16:14:15 2017 -0600

    Merge pull request #1697 from ContinuumIO/split-readme
    
    split readme into a few files

commit 7f574751bc6d1341fa7419d869f6ff4e8f3dda67
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 4 16:12:11 2017 -0600

    split readme into a few files
    
    split readme into a few files

commit 72534585fda701d7cbe0ff04bb5287ace2974331
Merge: 7ce645bc 64000747
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 4 15:38:12 2017 -0600

    Merge pull request #1696 from ContinuumIO/readme-deploy
    
    readme updates for deployment

commit 64000747f54707548c45c1bb4d03eeb86ac77435
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 4 15:37:34 2017 -0600

    readme updates for deployment
    
    readme updates for deployment. realized these were necessary when teaching Saranya how to do deployments today.

commit 7ce645bc97a6427e9b6bd10a55f580a95e674ce3
Merge: 7e569395 8f386ab6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 1 18:22:19 2017 -0600

    Merge pull request #1691 from ContinuumIO/add-oss-recipe
    
    add OSS docs recipe

commit 8f386ab69495fb9db32f8134dc4e0141599e602d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 1 18:21:19 2017 -0600

    add OSS docs recipe
    
    add OSS docs recipe

commit 7e569395ec6954d6c7a878de6c773c380fb5abbe
Merge: 65519f2c ef57fcad
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 30 16:10:16 2017 -0600

    Merge pull request #1688 from ContinuumIO/update-offline-docs-version
    
    update offline docs version

commit ef57fcad476eacaebb54ea81b341095721ca07d4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 30 16:10:03 2017 -0600

    update offline docs version
    
    update offline docs version

commit 65519f2c4683e8f8669a5112b90c3b772d62cb59
Merge: 5b3806e5 ac4b7e4e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 30 15:35:46 2017 -0600

    Merge pull request #1686 from ContinuumIO/increment-offline-docs-version
    
    2.0.19

commit ac4b7e4e16532a12eb421fcb04db02e5cf7cf38c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 30 15:35:36 2017 -0600

    2.0.19
    
    2.0.19

commit 5b3806e5318515b4ba32d53ed509c04c0f25df50
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Tue Nov 28 11:38:38 2017 -0600

    Update README.md

commit cd247d43f152d27c89d05e8cb3af3db3d9406899
Merge: 0e899b37 32faecb0
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 22 11:23:06 2017 -0600

    Merge pull request #1667 from ContinuumIO/add-aen-image
    
    add AEN image

commit 32faecb00e32ed0074e959ae6c31d2cd00928c42
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 22 11:22:16 2017 -0600

    add AEN image
    
    add AEN image

commit 0e899b37543b871bef49547079678f7701cac3be
Merge: c6107471 4076dbfc
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 22 11:13:17 2017 -0600

    Merge pull request #1666 from ContinuumIO/aen-420
    
    AEN 4.2.0

commit 4076dbfcf9bd909db302f594920b9494aef8089c
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 22 11:12:42 2017 -0600

    AEN 4.2.0
    
    AEN 4.2.0

commit c61074715ffc23d4e0c0a39e1db49b041cf6ed22
Merge: aa367d9d 419a6b3d
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Nov 21 20:29:41 2017 -0600

    Merge pull request #1664 from ContinuumIO/add-aen-413-images
    
    add AEN 4.1.3 images

commit 419a6b3dbad2938f612a8a0d1b23065c4c573760
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Nov 21 20:28:45 2017 -0600

    add AEN 4.1.3 images
    
    add AEN 4.1.3 images

commit aa367d9d1fa94912e3fcad8ab594c0deb2104a51
Merge: 670360ca ed0c8f3a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 16 16:05:33 2017 -0600

    Merge pull request #1652 from ContinuumIO/update-offline-docs-to-2.0.18
    
    update offline docs to 2.0.18

commit ed0c8f3ab70723b5bb2564f3428b5e0c7e005832
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 16 16:04:13 2017 -0600

    update offline docs to 2.0.18
    
    update offline docs to 2.0.18

commit 670360cabc56e8595baafa02f6e306a848611f2a
Author: Kerry Watson <kwatson@anaconda.com>
Date:   Thu Nov 16 14:58:08 2017 -0600

    Downloads update

commit 928d8ee3d5b3e39fc6a403f176bd4796f2e3e71f
Merge: 0dcaa83d 37267e56
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Sat Nov 11 09:58:32 2017 +0700

    Merge pull request #1639 from ContinuumIO/oss-cython
    
    link to cython docs

commit 37267e561cfe5401461874c9cac09dad5f5bc8b2
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Sat Nov 11 09:58:03 2017 +0700

    link to cython docs

commit 0dcaa83d34932fbcc7b2be5649f021a002cf6447
Merge: cc2c6407 2a401610
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 3 15:39:46 2017 -0500

    Merge pull request #1623 from ContinuumIO/update-docs-package-instructions
    
    update instructions for building docs package

commit 2a40161056f1e978504a4b7fe7093972cb1fe63d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 3 15:38:52 2017 -0500

    update instructions for building docs package
    
    update instructions for building docs package

commit cc2c64072a285fddfcdad372c85c03ba90785d73
Merge: 2a7aa08a 277dfe9a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 2 18:00:19 2017 -0500

    Merge pull request #1619 from ContinuumIO/new-docs-pkg
    
    docs 2.0.17

commit 277dfe9a3ebe45f075e1dde5cb06aaf6d749033c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 2 17:59:21 2017 -0500

    docs 2.0.17
    
    docs 2.0.17

commit 2a7aa08abecad83b1d43583443483e50ce0b01ea
Merge: 3f7db60d c3abd4a1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 2 13:07:06 2017 -0500

    Merge pull request #1614 from ContinuumIO/docs-build-wo-oss
    
    ability to build only main docs without OSS

commit c3abd4a154054305cdc5d4fa1fae48b5dafb085c
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Nov 2 19:36:57 2017 +0700

    ability to build only main docs without OSS

commit 3f7db60dee5753a1f3ed39f7bb72c0b1fd7e7b28
Merge: dc954f6f 16179c84
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Tue Oct 31 09:07:56 2017 +0700

    Merge pull request #1601 from ContinuumIO/gh-issue-template
    
    template for creating new issue

commit 16179c84e3302f705b3e87854eb59b433d89ebbe
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Tue Oct 31 09:07:09 2017 +0700

    template for creating new issue

commit dc954f6f17c56820f86f0647238845f519c297f9
Merge: 1a2c8f7b 357393f6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 23 21:31:33 2017 -0500

    Merge pull request #1549 from ContinuumIO/redirect-csv-format
    
    Max's preferred redirect .csv format

commit 357393f698678768d356159fe9cec26971354224
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 23 21:30:16 2017 -0500

    Max's preferred redirect .csv format
    
    Max's preferred redirect .csv format

commit 1a2c8f7ba80d26a37ee3cb2b8fe4a3ff42a8a19e
Merge: 4070555c 74090141
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Fri Oct 20 10:47:09 2017 +0700

    Merge pull request #1547 from ContinuumIO/sponsored-oss-no-link
    
    sponsored oss - link to empty page

commit 74090141119124475f4cffa86f8f161d5297e329
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Fri Oct 20 10:46:26 2017 +0700

    sponsored oss - link to empty page

commit 4070555c4df9d3c2acdaa0a796031ddbdd7e7ca6
Merge: 6b6a98ec 835c4d7d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 19 15:42:23 2017 -0500

    Merge pull request #1545 from ContinuumIO/repo-233
    
    update Makefile for Repo 2.33

commit 835c4d7d4ae6643d3ae17fc7180ad73f8ba5596f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 19 15:41:50 2017 -0500

    update Makefile for Repo 2.33
    
    update Makefile for Repo 2.33

commit 6b6a98eca5b23cf9eed506be466c224a433ba275
Merge: b33d536d 543974ae
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 18 19:22:06 2017 -0500

    Merge pull request #1542 from ContinuumIO/add-repo-232-archive-images
    
    add Repo 2.32 archive images

commit 543974aef5866e48f9feaeb09b52c44a42a6134d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 18 19:21:19 2017 -0500

    add Repo 2.32 archive images
    
    add Repo 2.32 archive images

commit b33d536d23eae1f9d23e05face97bf00019d86aa
Merge: ee9be0a0 d8b30408
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Mon Oct 16 13:48:28 2017 +0700

    Merge pull request #1536 from ContinuumIO/fix-bokeh-integration
    
    fix bokeh symlink

commit d8b30408d5c98bec182b5926e70cade8832d26a5
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Oct 16 13:47:44 2017 +0700

    fix bokeh symlink

commit ee9be0a02561bf2c0eaeda7dff2f22bdefcdfdad
Merge: 59814ad1 03e1fdf5
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Sat Oct 14 09:55:58 2017 +0700

    Merge pull request #1510 from ContinuumIO/oss-bokeh
    
    updated configs for bokeh

commit 59814ad1b540ca4431b35028e3b3ddbc7b18e45f
Merge: 20290cf7 7f5e381f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 5 14:56:22 2017 -0500

    Merge pull request #1517 from ContinuumIO/update-img
    
    Update screenshot

commit 7f5e381f384275dee9c61e1ee8b48495241b36b2
Author: Saranya Mahalingam <smahalingam@anaconda.com>
Date:   Thu Oct 5 12:07:53 2017 -0500

    Update screenshot
    
    Configure compute node screenshot - https://github.com/ContinuumIO/docs/issues/1423

commit 03e1fdf5e074f0574e536880c25f663549f67226
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Oct 5 10:24:47 2017 +0700

    nodejs required by bokeh

commit dc2b259dcf571e5ebe957cc72cbe8453e9e1d306
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Oct 4 09:51:14 2017 +0700

    google api for bokeh

commit f52572b788963370c5ca4d30964afc15c155ea17
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Fri Sep 29 19:35:18 2017 +0700

    updated configs for bokeh

commit 20290cf74d99c0eb7c8c69042577dcf7f845b178
Merge: 9ca626f5 f234c26a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 28 17:45:19 2017 -0500

    Merge pull request #1509 from ContinuumIO/new-aen-images
    
    new AEN images

commit f234c26a15470949960f381365da281e723b5989
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 28 17:33:48 2017 -0500

    new AEN images
    
    new AEN images

commit 9ca626f58277b9de61c1f49c45b7cf90a09009d6
Merge: cff6de5c bf4d6482
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 27 15:11:42 2017 -0500

    Merge pull request #1502 from ContinuumIO/add-conda-forge-to-environment.yml
    
    add conda-forge channel to environment.yml

commit bf4d648211bc4dfa2612223f644a6a1c28a97155
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 27 15:10:03 2017 -0500

    add conda-forge channel to environment.yml
    
    add conda-forge channel to environment.yml

commit cff6de5c8ab490b1007863926a03a26bd54135f7
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Sep 27 10:11:05 2017 +0700

    fix conf.py

commit abdf011223bb544cf444410e7faabba038b2213b
Merge: 99056622 17d37924
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Wed Sep 27 09:10:53 2017 +0700

    Merge pull request #1498 from ContinuumIO/docs-dask-assets
    
    updates to conf files for dask docs

commit 17d37924cd9869bcdeb7c16d6732b0f81d50b5f8
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Tue Sep 26 16:30:17 2017 +0700

    updates to conf files for dask docs

commit 99056622b17ab610ef7c91aa3c56ccc8758f72bb
Merge: de465518 2af57cd9
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Sat Sep 16 14:31:22 2017 +0700

    Merge pull request #1487 from ContinuumIO/theme-offline-updates
    
    updated style, minified js lib

commit 2af57cd914500f9509aab0b82a4ec9139dd304a0
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Sat Sep 16 14:30:30 2017 +0700

    updated style, minified js lib

commit de46551859964e5f4bb951b0699077ae82ae3210
Merge: f680b2a5 c9bf6b82
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 11 15:59:29 2017 -0500

    Merge pull request #1473 from ContinuumIO/update-nav-menu-links
    
    change io to com domain links in left nav

commit c9bf6b823c43f083080da8bc0e40c025a02e4b63
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Sep 11 19:02:05 2017 +0700

    change io to com domain links in left nav

commit f680b2a5a9a405c1c2cabf704bbc1b7831266cd8
Merge: 9c961e9d 4b9e60be
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 17:04:22 2017 -0500

    Merge pull request #1469 from ContinuumIO/repo-231-archive-images
    
    Repo 2.31 archive images

commit 4b9e60be4381006d33b484d7cabf2d3220f927f4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 17:03:33 2017 -0500

    Repo 2.31 archive images
    
    Repo 2.31 archive images

commit 9c961e9d3688cde74679b4ce872eb3a7414165b1
Merge: 614085d7 57bbedb7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 14:01:23 2017 -0500

    Merge pull request #1467 from ContinuumIO/update-offline-docs-build
    
    update offline docs build with noarch key

commit 57bbedb7a3d99930b91132ab97146976ac759f4a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 14:00:37 2017 -0500

    update offline docs build with noarch key
    
    update offline docs build with noarch key

commit 614085d7b45d01467ef6d93579197833e853c39e
Merge: d8dcbf32 59669fab
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 12:22:36 2017 -0500

    Merge pull request #1466 from ContinuumIO/new-offline-docs
    
    new offline docs

commit 59669fabc8f9eab9badb42e19279b586fa403296
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 7 12:21:27 2017 -0500

    new offline docs
    
    new offline docs

commit d8dcbf32c26c34c90d38e5a8fccea9314b410158
Merge: 6d86a98b 155b8d1a
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Thu Sep 7 21:21:51 2017 +0700

    Merge pull request #1460 from ContinuumIO/remove-top-oss
    
    remove link to top oss from left nav

commit 155b8d1a0aae30ddc7e63cfa4e35e1af91850e46
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Sep 7 21:20:58 2017 +0700

    remove link to top oss from left nav

commit 6d86a98bba6077b3ea578334dad2a69ce1949709
Merge: 8ab84fe4 6fd1c43d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 6 18:52:59 2017 -0500

    Merge pull request #1459 from ContinuumIO/repo-232
    
    update Makefile for Repo 2.32

commit 6fd1c43dfb57bef7d53923f3079fb93f5a3f8edb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 6 18:52:18 2017 -0500

    update Makefile for Repo 2.32
    
    update Makefile for Repo 2.32

commit 8ab84fe4833eb2c4323ed1a7f7a35b3b55ad7404
Merge: 4a07a682 32180c38
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 5 15:13:18 2017 -0500

    Merge pull request #1455 from ContinuumIO/kerrywatson1-patch-1
    
    Update README.md

commit 32180c3896ca190404632d83cad8f44dfc0fa6c3
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 5 14:59:27 2017 -0500

    Update README.md
    
    Info on orphan.

commit 4a07a68222e58cdb1f1c8c9194d7d5adc6e9813b
Merge: e27962fa e5756203
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 5 14:17:09 2017 -0500

    Merge pull request #1454 from ContinuumIO/kerrywatson1-patch-1
    
    Add Navigator projects tab image

commit e5756203760ffcf69c7165c1fe6a76586ec6bd81
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 5 14:16:43 2017 -0500

    Add Navigator projects tab image

commit e27962facbcfdbc881cede3f05a2aea62f038124
Merge: e7940087 5d2c8810
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 5 11:16:07 2017 -0500

    Merge pull request #1451 from ContinuumIO/mkl-eula
    
    MKL Opts EULA

commit 5d2c88101b7bc69d7a4f25f98c299b5094b6ba4e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 5 11:14:59 2017 -0500

    MKL Opts EULA
    
    MKL Opts EULA

commit e79400878702a985205ba8892f17920d4c451231
Merge: 50e0fe46 685a688b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 5 09:45:33 2017 -0500

    Merge pull request #1448 from ContinuumIO/sidebar-rename
    
    sidebar renaming continuum to anaconda

commit 685a688b7921125d375a2e9cb6341a1155722531
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 1 15:54:21 2017 -0500

    sidebar renaming continuum to anaconda
    
    sidebar renaming continuum to anaconda

commit 50e0fe463e715047aad8f4ce4d00c65b3bcc97fd
Merge: f8ac6217 9dcb9d54
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 29 14:23:41 2017 -0500

    Merge pull request #1439 from ContinuumIO/company-name
    
    update company name

commit 9dcb9d54e6581803011b53d835404b4c4163bfb1
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 28 18:21:42 2017 -0500

    restructuredtext
    
    restructuredtext

commit d8408ad72ec2a4c55615f0805085a62a3f70971e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 28 18:10:21 2017 -0500

    mkl-optimizations
    
    mkl-optimizations

commit 7a7a1796d804171f0f3d169c30511c596f8f5315
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 28 15:48:41 2017 -0500

    update company name
    
    update company name

commit f8ac6217540273fe515f3255999399a01150f8b2
Merge: 7b9325ab 1c9e74c4
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Mon Aug 28 09:59:49 2017 +0700

    Merge pull request #1434 from ContinuumIO/theme-offline-brandv2
    
    remove pdf link from footer

commit 1c9e74c4a801ca2339c16e00af03dd9d79561dd5
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Aug 28 09:58:45 2017 +0700

    remove pdf link from footer

commit 7b9325abb5f8209af312a9a64e3c05d13b183ba7
Merge: 9ba1c3fe f7929bd0
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Mon Aug 28 09:06:08 2017 +0700

    Merge pull request #1433 from ContinuumIO/theme-offline-brandv2
    
    new offline theme based on new brand-kit2 and renaming of DBA

commit f7929bd09c47dd0e8234f8ae7ef21354cb1234ae
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Aug 28 09:05:22 2017 +0700

    new offline theme based on new brand-kit2 and renaming of DBA

commit 9ba1c3fe04984ddc80f8bc654f46280b66340e71
Merge: 31d99ecd 99f1b992
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 24 13:19:30 2017 -0500

    Merge pull request #1427 from ContinuumIO/new-offline-docs-version
    
    increment version

commit 99f1b992d7ae2c3f89c60221883863304484ba44
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 24 13:19:15 2017 -0500

    increment version
    
    increment version

commit 31d99ecdb113936902a7470b6fddb6d1a4dd7193
Merge: 1e2a60cc 51186469
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 17 14:08:18 2017 -0500

    Merge pull request #1408 from ContinuumIO/add-aen-412-images
    
    Add AEN 4.1.2 images

commit 5118646962664f9647d8758fa119f8f600eb5af7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 17 14:05:24 2017 -0500

    add user images
    
    add user images

commit 1e2a60cc799ec5d5d806879bc5906998fe883b2b
Merge: 5e73ef1e ea3af572
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 16 14:27:04 2017 -0500

    Merge pull request #1397 from ContinuumIO/add-repo-img-parcel-from-prev-version
    
    add Repo img- create parcel from previous version

commit ea3af572ffed1b34f1d10787a31c371f0bdc3b37
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 16 14:25:54 2017 -0500

    add Repo img- create parcel from previous version
    
    add Repo img- create parcel from previous version

commit 5e73ef1ee425d9a6146ee0a6715d731483eedef6
Merge: bf982595 bd4f757e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 16 12:06:14 2017 -0500

    Merge pull request #1396 from ContinuumIO/add-img-aen-admin-monitor
    
    add img aen-admin-admin_monitor

commit bd4f757ec0992b9aef1204e2ec340edf82298b43
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 16 12:05:28 2017 -0500

    add img aen-admin-admin_monitor
    
    add img aen-admin-admin_monitor

commit bf982595504d0d0d7c9a7f796df92577ab935f96
Merge: bc2c64eb 784ceaa5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 16 11:58:36 2017 -0500

    Merge pull request #1393 from ContinuumIO/aen413
    
    [WIP] AEN 4.1.3

commit 6ef68672d67335778583ca36a2047781144c7510
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 15 17:11:36 2017 -0500

    add AEN 4.1.2 archive images
    
    add AEN 4.1.2 archive images

commit 784ceaa5915a656403cbea57b55f6f6def1c6d2d
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 15 12:45:52 2017 -0500

    [WIP] AEN 4.1.3
    
    [WIP] AEN 4.1.3

commit bc2c64eb607d31c39caf109b5173eb8bc01983b7
Merge: 21b5dd05 843212d5
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 11 16:34:23 2017 -0500

    Merge pull request #1389 from ContinuumIO/repo-2316
    
    update Makefile for Repo 2.31.6 release

commit 843212d57270077a2d3b94e2e93910c0227eaa73
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 11 16:33:43 2017 -0500

    update Makefile for Repo 2.31.6 release
    
    update Makefile for Repo 2.31.6 release

commit 21b5dd0596fcb322b1d2eaddacb878cee45188c8
Merge: 7d89d99f ef80f02f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Aug 8 15:02:36 2017 -0500

    Merge pull request #1380 from ContinuumIO/new-repo-image
    
    New screenshot for unified-docs repository docs

commit ef80f02f0a05798eb34682cba57acbd26fe85e5b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Aug 8 15:02:18 2017 -0500

    New screenshot for unified-docs repository docs
    
    InfoPros suggested an updated repo home page screenshot showing "Sign In" to go with the new text on the page. I updated the image name in the text to repo-home2.png.

commit 7d89d99f606ff4440e0ff0dfdaf573799e714523
Merge: 3b2f0c4f dca056ba
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 7 16:50:05 2017 -0500

    Merge pull request #1376 from ContinuumIO/readme-AE5-images
    
    readme: AE5.0 images

commit dca056bad5565bc65e549f98be5afe3fefffe791
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 7 16:49:03 2017 -0500

    readme: AE5.0 images
    
    readme: AE5.0 images

commit 3b2f0c4f54cd4532bf9d3648d0aca0a42cd59f94
Merge: 23849741 2d8c05cf
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 14:13:44 2017 -0500

    Merge pull request #1348 from ContinuumIO/increment-docs-pkg-version
    
    increment version

commit 2d8c05cf68c992b509630028fddff8d5a8f14328
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 14:13:37 2017 -0500

    increment version
    
    increment version

commit 23849741ab1db9e9cb411f8c30746487b4989318
Merge: 5187d03c dd842790
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 13:56:08 2017 -0500

    Merge pull request #1346 from ContinuumIO/repo-2.31.3
    
    Repo 2.31.3 release update

commit dd842790a05fbb3c0209a92dc0d86c0ed6eefced
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 13:55:33 2017 -0500

    Repo 2.31.3 release update
    
    Repo 2.31.3 release update

commit 5187d03c2a651d106a020daa8890fd179820077b
Merge: fe45bf59 d15d2cb6
Author: Max G <maxgamurar@users.noreply.github.com>
Date:   Thu Jul 27 23:22:35 2017 +0700

    Merge pull request #1342 from ContinuumIO/rename-anaconda-distribution
    
    add distribution to Anaconda links title

commit d15d2cb6b609b42122ad4c80a7290891d874673c
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Jul 27 23:18:54 2017 +0700

    add distribution to Anaconda links title

commit fe45bf594a173c5fa17ecc061f765370d4abe5f4
Merge: 2142ddc9 488ffadb
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 11:02:36 2017 -0500

    Merge pull request #1341 from ContinuumIO/conf.py-4.4
    
    conf.py anaconda version to 4.4

commit 488ffadb1ea3b5761edb095d7960ee3b8ea55130
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 27 11:00:07 2017 -0500

    conf.py anaconda version to 4.4
    
    conf.py anaconda version to 4.4

commit 2142ddc9abaa2cf85bb14374488f5ea6dadb9310
Merge: 2893811b cbaa513d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 26 13:09:04 2017 -0500

    Merge pull request #1337 from ContinuumIO/deploy-repo-2.31.2
    
    deploy Repo 2.31.2

commit cbaa513d6999dd2d9d230fbd82591380b0ddf095
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 26 13:08:04 2017 -0500

    deploy Repo 2.31.2
    
    deploy Repo 2.31.2

commit 2893811b395ae5e601163b08499a340731fdd957
Merge: a36070f1 c95dacba
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 25 18:12:16 2017 -0500

    Merge pull request #1334 from ContinuumIO/add-new-anaconda-install-images
    
    add new Anaconda install images

commit c95dacbab831bd98265652b4e8919046722a9242
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 25 18:11:34 2017 -0500

    add new Anaconda install images
    
    add new Anaconda install images

commit a36070f1077778707d2cc22cab928f6df7f94610
Merge: 49a6f195 0972c1f3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 18 16:04:14 2017 -0500

    Merge pull request #1312 from ContinuumIO/repo-2.31.1
    
    Repo 2.31.1

commit 0972c1f35cd9858b97651bd6d185c3f4b7b5ffbe
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 18 16:03:38 2017 -0500

    Repo 2.31.1
    
    Repo 2.31.1

commit 49a6f19569439370373f74319d582531f1e22b65
Merge: 9387c0ea 66cb15d8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 14 13:54:56 2017 -0500

    Merge pull request #1302 from ContinuumIO/new-nav-images
    
    New nav images

commit 66cb15d857c6f833be593136b4e2d73ce732d591
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 14 13:53:51 2017 -0500

    fix images
    
    fix images

commit e1ec9dbaf58da21d5ac9179059aa7db3859425e3
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 14 12:02:34 2017 -0500

    new nav images
    
    new nav images

commit 9387c0eabc3680784b092f8b18794a04ffe1ff3f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 13 14:43:31 2017 -0500

    figure example formatting
    
    figure example formatting

commit 8307e38aaa76f772e910800e2e7513b19f7c3d9a
Merge: 81eaf5b1 d548249a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jul 13 09:48:04 2017 -0500

    Merge pull request #1296 from ContinuumIO/kerrywatson1-patch-1
    
    Add image width info

commit d548249a3f7a71bf4b55252db7e48b80fa0d7458
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jul 13 09:47:53 2017 -0500

    Add image width info

commit 81eaf5b1cc3c3ec8202dd7fa86940bed05b2c9f6
Merge: 3d8c339c 86eca85c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 6 16:04:04 2017 -0500

    Merge pull request #1284 from ContinuumIO/repo-231
    
    Repo 2.31 release

commit 86eca85c2ccf7aeaad2b7654cf998b08a9ce48d4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 6 16:03:23 2017 -0500

    Repo 2.31 release
    
    Repo 2.31 release

commit 3d8c339c7aa18cae3e2b968547c34970a77a390f
Merge: 8ade7471 80674a40
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 6 15:11:17 2017 -0500

    Merge pull request #1282 from ContinuumIO/saraneem-patch-1
    
    Update Windows install image

commit 80674a403ec075cc8bf297f7ee5c27c69c2f27ba
Author: Saranya Mahalingam <smahalingam@continuum.io>
Date:   Thu Jul 6 15:09:27 2017 -0500

    Add files via upload

commit 8ade74713f164afcebe7b26d346cca83ba946417
Merge: 45644a31 2e6d9431
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 30 15:21:22 2017 -0500

    Merge pull request #1274 from ContinuumIO/kerrywatson1-patch-1
    
    Cleaned up install screenshots

commit 2e6d9431f4f764709d05b0377a664cea3dc60168
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jun 30 15:15:53 2017 -0500

    Cleaned up install screenshots

commit 45644a31e2a0d529c6970d32d06371714f73c282
Merge: ffa3c3e2 358c961a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 30 13:05:38 2017 -0500

    Merge pull request #1273 from ContinuumIO/update-nb-ext-conda1
    
    Update nb-ext-conda1

commit 358c961ac7ff6869a76a8f81359f9b8f45889e1a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jun 30 13:01:08 2017 -0500

    Add files via upload

commit ffa3c3e2262d4422f59627d750b23f69496f1134
Merge: 513ad711 2b24f98e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 29 17:09:36 2017 -0500

    Merge pull request #1272 from ContinuumIO/update-docs-version
    
    update docs version to 2.0.13

commit 2b24f98e0a9e6aed205ef4a8d4ac9c5aed2fdb53
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 29 17:08:31 2017 -0500

    update docs version to 2.0.13
    
    update docs version to 2.0.13

commit 513ad711f9756dc0103831d7f7d996d42577ccc8
Merge: 55c38651 169204ed
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 29 14:30:27 2017 -0500

    Merge pull request #1265 from ContinuumIO/saraneem-nav-screenshots-update
    
    Updated Navigator Screenshots

commit 169204ed2695f50a7742236b03da1392506b92c7
Author: Saranya Mahalingam <smahalingam@continuum.io>
Date:   Wed Jun 28 17:28:17 2017 -0500

    Updated Navigator Screenshots
    
    @kerrywatson1 Please review.

commit 55c3865103a559b3c2cb1812871f1d71ab9e1132
Merge: 27012aaf f995a898
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 28 12:50:09 2017 -0500

    Merge pull request #1262 from ContinuumIO/update-AED-screenshots
    
    update AED screenshots

commit f995a89892d56e64bd3e68c3857d4effc4217c37
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 28 12:49:31 2017 -0500

    update AED screenshots
    
    update AED screenshots

commit 27012aaf8d61fd37d1b6485108f9b26948d45c1d
Merge: d4a4dedc 477a1edc
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 22 12:41:39 2017 -0500

    Merge pull request #1248 from ContinuumIO/offline-docs-2.0.12
    
    update offline docs recipe to 2.0.12

commit 477a1edc4edbdbce9a17f389c7fbef4466a07c1e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 22 12:40:55 2017 -0500

    update offline docs recipe to 2.0.12
    
    update offline docs recipe to 2.0.12

commit d4a4dedc5667550be538f2416f3ce6320d022e2f
Merge: 4ed74480 cbb81aea
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 21 11:24:46 2017 -0500

    Merge pull request #1243 from ContinuumIO/update-link-in-mkl-docs
    
    update link in mkl docs to new distribution docs

commit cbb81aea01dbf4ffa77a0b2677cf85164a5c1b50
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 20 16:42:19 2017 -0500

    update link in mkl docs to new distribution docs
    
    update link in mkl docs to new distribution docs

commit 4ed74480ee8a97ec8b8499f6a074e7d677dd137b
Merge: 676c19b9 dbf88049
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 19 16:06:14 2017 -0500

    Merge pull request #1240 from ContinuumIO/add-aed-sublime-images
    
    add Sublime Text plugin images to AED docs

commit dbf88049429e4b16a8caf9b9710d28ec56eeab02
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 19 16:05:19 2017 -0500

    add Sublime Text plugin images to AED docs
    
    add Sublime Text plugin images to AED docs

commit 676c19b96280ef8a5445f46dfb1e2f4e541f1ae9
Merge: d64198de 75c0b465
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 14 15:34:38 2017 -0500

    Merge pull request #1228 from ContinuumIO/clarify-deployment
    
    clarify deployment

commit 75c0b465248529b85035dc90bc5d5701031727e1
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 14 15:34:07 2017 -0500

    clarify deployment
    
    clarify deployment

commit d64198de70c43712ea3b421ed018a152b156b7c2
Merge: 873858bd 4772a467
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 13 15:41:46 2017 -0500

    Merge pull request #1226 from ContinuumIO/makefile-repo-2.30.3
    
    update Makefile for Repo 2.30.3

commit 4772a4677d0e864743b4ddcb6142619a342ca880
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 13 15:41:09 2017 -0500

    update Makefile for Repo 2.30.3
    
    update Makefile for Repo 2.30.3

commit 873858bd0d72f8870c157b11410a678c2c8487dd
Merge: 03f9e6e2 3f4c0843
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 15:59:49 2017 -0500

    Merge pull request #1217 from ContinuumIO/navigator-images
    
    WIP - navigator image updates

commit 03f9e6e26465746cb7d74abb2d7475e649edb9e4
Merge: a6cde12b 41569d57
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:43:05 2017 -0500

    Merge pull request #1215 from ContinuumIO/ApurvaWavhal-patch-1
    
    Add files via upload

commit 3f4c08435518b378918a0518a3c06cebd54ae801
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:38:28 2017 -0500

    WIP - navigator image updates
    
    WIP - navigator image updates

commit a6cde12b65e5947eb5cc63879d3535147ddc0212
Merge: 7cc8bbfc 35b152f9
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:32:07 2017 -0500

    Merge pull request #1216 from ContinuumIO/revert-1213-more-nav-images
    
    Revert "WIP More updated images for Navigator section"

commit 35b152f92edfa155dc45d8b5479849a5b9f8e514
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:31:40 2017 -0500

    Revert "WIP More updated images for Navigator section"

commit 7cc8bbfc7057e0cf39f5ad7ba9c737e447fd4d84
Merge: d92f865a 1f065c58
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:31:20 2017 -0500

    Merge pull request #1213 from ContinuumIO/more-nav-images
    
    WIP More updated images for Navigator section

commit 1f065c58de44a6c8a3026befd2701639b35467c9
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 9 13:30:30 2017 -0500

    update nav-tutorial03.png
    
    update nav-tutorial03.png

commit 41569d573df461459a6c0aa031130b3c4898586e
Author: ApurvaWavhal <a.r.wavhal@gmail.com>
Date:   Fri Jun 9 09:31:01 2017 -0500

    Add files via upload
    
    New Screenshots from Navigator Tutorial -
    Displaying BioPython help text
    Installing and running Pandas

commit d92f865ae10efd9a819b136fe37a6ffde472a433
Merge: 8d3ddcb1 b78009d3
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 8 16:11:57 2017 -0500

    Merge pull request #1214 from ContinuumIO/new-nav-images
    
    Remaining images

commit b78009d3dbeaa044dd5054413e7f2a1d6e7391ca
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 8 16:09:14 2017 -0500

    Remaining images
    
    This should complete the images I worked on today. Apurva will have a separate PR for the images she worked on.

commit 8d3ddcb1ebd7565f17ea6e9732688aa3635d5f0c
Author: Saranya Mahalingam <smahalingam@continuum.io>
Date:   Thu Jun 8 15:44:28 2017 -0500

    Add files via upload

commit 5a9bf415451f92803203e6e799fbb6564ca6c77e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 8 15:24:13 2017 -0500

    More updated images for Navigator section

commit 4d9801ea0f3d6ef4de3a9649dbca46562eb34662
Merge: dcf3855f bcec901f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 8 14:53:53 2017 -0500

    Merge pull request #1212 from ContinuumIO/navigator-updates
    
    Environments tab for Navigator 1.6

commit bcec901ff10377c536f735fe633792142a8ca5de
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 8 14:51:33 2017 -0500

    Environments tab for Navigator 1.6

commit dcf3855fdcc23ff3355d14fca5acb63c92f857e5
Merge: 6a7a9e1c 47aaa984
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 1 16:32:13 2017 -0500

    Merge pull request #1196 from ContinuumIO/new-cloud-images
    
    new cloud images

commit 47aaa9846a2e5be27b725fdf20937da683d35e23
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 1 16:31:43 2017 -0500

    new cloud images
    
    new cloud images

commit 6a7a9e1ca36304ef5cdf9549aaedadcc3e3fb68b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 30 15:13:00 2017 -0500

    Update resume-downloads.md

commit 9574fcc8b0d8b1dc652ce9ac8391c11d61f08314
Merge: dfe7fd5b a1568b45
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 16:37:31 2017 -0500

    Merge pull request #1174 from ContinuumIO/repo-2.30.2-update
    
    update Makefile for Repo 2.30.2 release

commit a1568b45d4e304f0655e1268f792a88f7c99d5ab
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 16:35:30 2017 -0500

    update Makefile for Repo 2.30.2 release
    
    update Makefile for Repo 2.30.2 release

commit dfe7fd5b452de4cfe0d58599dcdfc6fec3a9312a
Merge: ba8c76aa 2e027582
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 14:31:20 2017 -0500

    Merge pull request #1170 from ContinuumIO/theme-auto-year
    
    display current year in footer (c)

commit 2e0275824951d17611ac6f3f975d1cba538b3549
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 14:30:53 2017 -0500

    fix datetime
    
    fix datetime

commit ba8c76aa72d9a70150e1689cc4d89168cb6478a1
Merge: 92d52522 2ae6895f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 14:04:35 2017 -0500

    Merge pull request #1173 from ContinuumIO/repo-2.30.1
    
    update Makefile for Repo 2.30.1

commit 2ae6895f5c11cd0c7b04a5116c4ee1d859b06e89
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 24 14:03:42 2017 -0500

    update Makefile for Repo 2.30.1
    
    update Makefile for Repo 2.30.1

commit 92d5252224f1ae72a28fc23623fb93cdea78e4ad
Merge: 27f7693b f5a9735e
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed May 24 12:32:36 2017 +0700

    Merge pull request #1171 from ContinuumIO/gitignore-gitkeep
    
    updated gitignore to keep .gitkeep and pkg folder

commit f5a9735e747e938251be84fa1523303bdb24b7cb
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed May 24 12:32:11 2017 +0700

    updated gitignore to keep .gitkeep and pkg folder

commit 61a18d64e931e8bb57eaea6e456946a38cda9b92
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed May 24 11:27:27 2017 +0700

    display current year in footer (c)

commit 27f7693baf649d4a654781de9baa0ebc5058abe6
Merge: 1f0db98f e58fb9b3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 23 19:44:51 2017 -0500

    Merge pull request #1151 from ContinuumIO/ossport-numba
    
    numba & assets and improvements for porting complex docs and packages

commit e58fb9b3fe752512bbad119bc53f4d3396b8d801
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 23 16:05:08 2017 -0500

    keep pkgs
    
    keep pkgs as discussed in https://github.com/ContinuumIO/docs/issues/1150

commit 1f0db98f8aac6b068ff44683b2d267558640e1ad
Merge: bf4d1644 3316b282
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 23 15:27:04 2017 -0500

    Merge pull request #1168 from ContinuumIO/increment-docs-version
    
    increment docs version

commit 3316b282a5e46db787796414ac5198fdbeba62a2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 23 15:26:15 2017 -0500

    increment docs version
    
    increment docs version

commit bf4d1644c79f142a4dc8f43507640db5588bfa53
Merge: 320d00fa 57690276
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:47:08 2017 -0500

    Merge pull request #1157 from ContinuumIO/reformat-vm-file-copying
    
    Update vm-file-copying.md

commit 57690276fb83cbe096cc006c5a854bc54638e703
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:46:54 2017 -0500

    Update vm-file-copying.md

commit 320d00fa89deda8a800b5dd1072eef59751e0151
Merge: 3ccf88a1 76d68573
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:43:58 2017 -0500

    Merge pull request #1156 from ContinuumIO/move-to-howtos
    
    Rename vm-file-copying.md to howtos/vm-file-copying.md

commit 76d68573dcd13dd9159ca87144f6a0eda3c7a416
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:43:26 2017 -0500

    Rename git-workflow-example.md to howtos/git-workflow-example.md

commit f36eab5369bf6415acab809f101e107b13e6a03d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:43:00 2017 -0500

    Rename resume-downloads.md to howtos/resume-downloads.md

commit 56f31002aeb6b1b0a35784964f84e696d481a4b9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:42:31 2017 -0500

    Rename vm-file-copying.md to howtos/vm-file-copying.md

commit 3ccf88a14b51837ec7cf1019ddd52f052747825a
Merge: e6d32726 dfa8ca01
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:41:33 2017 -0500

    Merge pull request #1155 from ContinuumIO/vm-file-copying
    
    notes on copying large files to VMs

commit dfa8ca01f47ad31eda7f2c6eb16bb3d6ae7dbb66
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 19:41:03 2017 -0500

    notes on copying large files to VMs
    
    notes on copying large files to VMs

commit 5c862d7225c3e00cdb33229399f72dac41fa1925
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 18 16:37:34 2017 -0500

    Makefile indentation
    
    Makefile indentation

commit 06cfeb086ffee2030bb332a97ef0dd34d23fec2a
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu May 18 14:28:13 2017 +0700

    assets and improvements for porting complex docs and packages

commit e6d3272631e78b45d05988440495d5944113d808
Merge: b0fd156a acade285
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 17 17:39:43 2017 -0500

    Merge pull request #1149 from ContinuumIO/infopros-process
    
    add infopros process

commit acade28501b811216ede68d1c5b3eadf59d21b55
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 17 17:39:28 2017 -0500

    add infopros process
    
    add infopros process

commit b0fd156a1878062f37c2618b3303858eb31a2d31
Merge: 5faa9d7a 0076e3f6
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 18:14:17 2017 -0500

    Merge pull request #1144 from ContinuumIO/repo-229-archive
    
    add Repo 2.29 archive images

commit 0076e3f64acb4955993f45e8f5fbf9639a74a6ed
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 18:13:01 2017 -0500

    add Repo 2.29 archive images
    
    add Repo 2.29 archive images

commit 5faa9d7adba5f3ac85520aea67512cd34cf18e02
Merge: 35d1eef6 24dbf972
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 16:48:56 2017 -0500

    Merge pull request #1143 from ContinuumIO/resume-downloads
    
    info on resuming downloads of large files

commit 24dbf972f878f6e45e03dc2bcfdf71ccc53e179b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 16:48:13 2017 -0500

    info on resuming downloads of large files
    
    info on resuming downloads of large files

commit 35d1eef62709a6879bde196f7fb0c1d7ce18834c
Merge: 1c58102d 90881f35
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 13:31:46 2017 -0500

    Merge pull request #1140 from ContinuumIO/add-repo-parcel-images
    
    add repo parcel page screenshots

commit 90881f35742691b772f39e9cef8a44d4817c6249
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 16 13:29:07 2017 -0500

    add repo parcel page screenshots
    
    add repo parcel page screenshots

commit 1c58102dd2e5a99cd8af379519d9831f2159b441
Merge: 7c50c908 607bd226
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 15 15:46:44 2017 -0500

    Merge pull request #1132 from ContinuumIO/aesysreq
    
    add Anaconda Enterprise System Requirements info

commit 607bd22618b250f5d6e17b9974e33aabcc3a9d3c
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 15 15:46:26 2017 -0500

    grammar
    
    grammar

commit e13e43280062afeee3780ab74c5511bf994aa442
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 15 15:45:30 2017 -0500

    add Anaconda Enterprise System Requirements info
    
    add Anaconda Enterprise System Requirements info

commit 7c50c908f9b7f6a1a7cf195830210b38e288c271
Merge: a50f390a 2575a3ed
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 12 16:29:41 2017 -0500

    Merge pull request #1128 from ContinuumIO/nav-link
    
    fix nav link

commit 2575a3edb8c3f97796bb97deffed65c2d0eeb9cc
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 12 16:29:10 2017 -0500

    fix nav link
    
    fix nav link

commit a50f390adce5f6bf2fc8bb5d1d4093de586a2cc2
Merge: 2fda9102 e1084f7a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 12 16:14:29 2017 -0500

    Merge pull request #1127 from ContinuumIO/nav-images
    
    navigator screenshots

commit e1084f7a6fd3e16ddde87ef72c094f95e13e1ec0
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 12 16:13:37 2017 -0500

    navigator screenshots
    
    navigator screenshots

commit 2fda91027931a76c3fc26ad7b79b4faceba1ffb6
Merge: a5e04b06 b37ea6cc
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri May 12 13:35:34 2017 -0500

    Merge pull request #1124 from ContinuumIO/aen-user-screenshots
    
    AEN screenshots wo iPython icons

commit b37ea6cc4d69a7776c394746a04844ce343f78b8
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu May 11 16:25:57 2017 -0500

    AEN screenshots wo iPython icons
    
    Updated screenshots per https://github.com/ContinuumIO/docs/issues/765#issuecomment-300331556

commit a5e04b0662c6559e6244ce052bc35cf12ae3ccb6
Merge: 7322faaa fa4f4ea4
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 10 16:02:33 2017 -0500

    Merge pull request #1120 from ContinuumIO/repo230
    
    update Makefile for Repo 2.30 release

commit fa4f4ea43129b895a04ba04cb6999b204a94a884
Author: Will Warner <electronwill@gmail.com>
Date:   Wed May 10 16:01:14 2017 -0500

    update Makefile for Repo 2.30 release
    
    update Makefile for Repo 2.30 release

commit 7322faaaf5d85ed3c9973f6ca0e467183890dcbc
Merge: 32ecb9ad adc1f275
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed May 3 10:14:09 2017 +0700

    Merge pull request #1102 from ContinuumIO/main-oss-link-fix
    
    fix broken link to continuum oss page

commit adc1f2754a4fb8d74a086f06c6376b87900522b3
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed May 3 10:13:12 2017 +0700

    fix broken link to continuum oss page

commit 32ecb9addf481960f0b1b4778d5cc206d6d1be83
Merge: ce215245 e8ed241c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 18:09:14 2017 -0500

    Merge pull request #1100 from ContinuumIO/add-repo-228-images
    
    add Repo 2.28 images

commit e8ed241ca1f5e8628e69444093b3317d2895a4b3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 18:08:33 2017 -0500

    add Repo 2.28 images
    
    add Repo 2.28 images

commit ce21524570cfa4ba0b70721b4f2f2d4542e3878e
Merge: 06267c52 41af13a6
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 14:52:35 2017 -0500

    Merge pull request #1096 from ContinuumIO/add-repo-227-images
    
    add Repo 2.27 images

commit 41af13a65b9af601ff834831023fee425997c093
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 14:51:42 2017 -0500

    add Repo 2.27 images
    
    add Repo 2.27 images

commit 06267c524a4da210ef647cdfeac28a70eb81080a
Merge: 5b11973f f38f5b3b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 14:23:01 2017 -0500

    Merge pull request #1095 from ContinuumIO/copyright-2017
    
    copyright 2017

commit f38f5b3bd18330b50c2b597bb3ddce284c4dfa28
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 14:22:43 2017 -0500

    copyright 2017
    
    copyright 2017

commit 7466316ff40424c6993cb251bc49b66e8a9e8735
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 14:21:48 2017 -0500

    copyright 2017
    
    copyright 2017

commit 5b11973ff033c18dc43e53a6a7b21661ae7ddf95
Merge: cf2a9d76 5191ada9
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 13:10:19 2017 -0500

    Merge pull request #1093 from ContinuumIO/accelerate-2.3.1
    
    update Makefile for Accelerate 2.3.1

commit 5191ada918b83fa7064729a77c99b51cff074bf0
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 2 13:08:33 2017 -0500

    update Makefile for Accelerate 2.3.1
    
    update Makefile for Accelerate 2.3.1

commit cf2a9d767607f98d0c1681d544d45c6bc5ccd33c
Merge: 9cae6610 1e0ff2d4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 1 20:29:30 2017 -0500

    Merge pull request #1085 from ContinuumIO/docs-llvmlite
    
    llvmlite porting updates

commit 9cae66100c51d73999e58ffad9336bb38a9a7713
Merge: be7f808d 110591f4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 1 19:27:22 2017 -0500

    Merge pull request #1088 from ContinuumIO/copyright-symbol-info
    
    Add copyright symbol info

commit 110591f4b15d4b1bb8db0d96930319a2222e127e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 1 19:26:21 2017 -0500

    remove redundant escaped space examples
    
    remove redundant escaped space examples

commit 29529c24b3f75b30be87bd5b8395b2d9595a5b3f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon May 1 10:38:39 2017 -0500

    Add copyright symbol info

commit 1e0ff2d405f8053d5a0b9f499dd355a4c901ba31
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon May 1 13:37:14 2017 +0700

    llvmlite porting updates

commit be7f808d8afb9357e5ed110855df23ec37e8b49b
Merge: b6653299 ed12f5da
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 27 13:52:28 2017 -0500

    Merge pull request #1075 from ContinuumIO/navigator-screenshot
    
    navigator screenshot-- no Anaconda Mosaic

commit ed12f5da2dd438ea5d9dfdd65357800b85539947
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 27 13:51:14 2017 -0500

    navigator screenshot-- no Anaconda Mosaic
    
    navigator screenshot-- no Anaconda Mosaic

commit b6653299fe91e30d44880835ab47fc48b9f28438
Merge: de23a899 677e7012
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 27 12:14:27 2017 -0500

    Merge pull request #1071 from ContinuumIO/nav-screenshots
    
    Updated images

commit 677e7012a61f335441a6af5adec7b23c5cc11411
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Apr 26 17:11:53 2017 -0500

    Updated images
    
    All screenshots mentioned in https://github.com/ContinuumIO/navigator/issues/1005

commit de23a8990047cdaab6ecdce155ba1708644838c6
Merge: 0e06c486 a14379ef
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 26 16:06:29 2017 -0500

    Merge pull request #1070 from ContinuumIO/update-rst-page
    
    update rst page

commit a14379ef174bc8e427f1103b3745efaf31872fff
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 26 16:05:29 2017 -0500

    update rst page
    
    update rst page

commit 0e06c48674bb401800ac06c6bf64020a4d930e95
Merge: 68995dd6 be6f78d8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 26 14:14:32 2017 -0500

    Merge pull request #1067 from ContinuumIO/better-rst-info
    
    better rst info, including adding (R) with no space

commit be6f78d8f7ce621bc021b437aaadec7d34bdf2bb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 26 14:13:41 2017 -0500

    better rst info, including adding (R) with no space
    
    better rst info, including adding (R) with no space

commit 68995dd6063f16f2c412dad5d23fd7e9b785d774
Merge: 93f80d01 039e0870
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 25 16:26:47 2017 -0500

    Merge pull request #1066 from ContinuumIO/repo-229
    
    update Makefile for Repo 2.29

commit 039e08701729fcc9cf5e76a2ed8d9a038f5fcd32
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 25 16:26:03 2017 -0500

    update Makefile for Repo 2.29
    
    update Makefile for Repo 2.29

commit 93f80d0105c32e33b7a3aac3681af0b4fe57c974
Merge: 22fc817d ac511006
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 25 14:33:27 2017 -0500

    Merge pull request #1065 from ContinuumIO/repo-228
    
    Repo 2.28 update to Makefile

commit ac511006e4b6c8d1fc0b5773077566a5a6d770f1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 25 14:32:45 2017 -0500

    Repo 2.28 update to Makefile
    
    Repo 2.28 update to Makefile

commit 22fc817dcef0f1220108ce7767aac1546a839ad9
Merge: 0c58401f 12b3b101
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 25 12:02:50 2017 -0500

    Merge pull request #1064 from ContinuumIO/LawrencePersonCIO-patch-425b
    
    Cloud Change Plan screenshot

commit 12b3b10166052c1549dead261fe0defde0a9c2dd
Author: LawrencePersonCIO <lperson@continuum.io>
Date:   Tue Apr 25 11:28:06 2017 -0500

    Cloud Change Plan screenshot
    
    This is a screen shot in support of Line 9 on 2.29 change spreadsheet for https://github.com/ContinuumIO/docs/issues/1048. Will be checking in file that references it later.

commit 0c58401fea787ac17d9ec498f5d0ae6ee09c41ce
Merge: 9e5e2ea2 d2447e95
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 19:18:35 2017 -0500

    Merge pull request #1063 from ContinuumIO/rst-typo
    
    rst typo

commit d2447e95edd7cafafd3b61bb8db14e93cb34c730
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 19:18:05 2017 -0500

    rst typo
    
    rst typo

commit 9e5e2ea2fb42762e4763914033edcda1a79cc3ef
Merge: 419313a1 048e1325
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 18:21:30 2017 -0500

    Merge pull request #1062 from ContinuumIO/sphinx-unicode-info
    
    add Sphinx info on Unicode symbols from Max

commit 048e132518870c81d3cbceffd31a8cbaa18f1fbc
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 18:21:11 2017 -0500

    add Sphinx info on Unicode symbols from Max
    
    add Sphinx info on Unicode symbols from Max

commit 419313a183c297cdef7f84e096281d6cff44361f
Merge: 810f04e2 20a4a2ae
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 18:01:55 2017 -0500

    Merge pull request #1061 from ContinuumIO/rst-guide-unicode
    
    rst guide: unicode

commit 20a4a2ae23f8c2a262a79c14116cc26f88f8b73c
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 18:01:07 2017 -0500

    rst guide: unicode
    
    rst guide: unicode

commit 810f04e21a78ebe68daa616fc6367c83dad61e70
Merge: f588a99a bb81e797
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:51:46 2017 -0500

    Merge pull request #1060 from ContinuumIO/move-img
    
    move image

commit bb81e7978d570109aed59ce9da6fef04adb9fc68
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:51:24 2017 -0500

    move image
    
    move image

commit f588a99aee143f5dd6ff06fb34e40ac761e6eda8
Merge: 7a426d8d c5198b0e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:24:47 2017 -0500

    Merge pull request #1059 from ContinuumIO/LawrencePersonCIO-patch-424f
    
    Corrected screen shot image upload.

commit c5198b0ec44e0b4b1503ede2960202e3ee4da0d0
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:23:17 2017 -0500

    rename file to add prefix "repo-"
    
    rename file to add prefix "repo-"

commit 8f1d180ab9da1fda39ac0cdde6e2ed4c774bddb1
Author: LawrencePersonCIO <lperson@continuum.io>
Date:   Mon Apr 24 16:20:14 2017 -0500

    Corrected screen shot image upload.
    
    Part of ContinuumIO/docs#1048, and will tie into https://github.com/Anaconda-Platform/anaconda-server/pull/3688

commit 7a426d8d744120438a84bce01b8ba5bcbd0ea7c4
Merge: d43f2feb 5e2a56db
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:15:50 2017 -0500

    Merge pull request #1058 from ContinuumIO/LawrencePersonCIO-patch-424d
    
    Screen shot for repo delete files

commit 5e2a56db68684a637ed79fd8cec671e0c34828e6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:14:49 2017 -0500

    rename to include prefix "repo"
    
    rename to include prefix "repo"

commit de708b930dad92a7a0ef7a9029658d247fc82560
Author: LawrencePersonCIO <lperson@continuum.io>
Date:   Mon Apr 24 16:10:39 2017 -0500

    Screen shot for repo delete files
    
    This is a screen shot for the repo delete files work as part of https://github.com/ContinuumIO/docs/issues/1048.

commit d43f2feb3cfb6e975b91091a82dd2b71c7d4b02f
Merge: 6b2a5e35 40761c74
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 24 16:10:37 2017 -0500

    Merge pull request #1057 from ContinuumIO/upload-2-28-image
    
    Add Repo 2.28 admin image

commit 40761c746b900e4a3325423c5ebd983421760a48
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Apr 24 15:16:04 2017 -0500

    Add Repo 2.28 admin image
    
    Per https://github.com/ContinuumIO/docs/issues/1055

commit 6b2a5e35db0ee0e79750b967778e836472fb1751
Merge: 6e604b09 94af1766
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 20 10:49:25 2017 -0500

    Merge pull request #1050 from ContinuumIO/increment-docs-version
    
    increment docs version

commit 94af1766489900ea519075545ba37959a0fc1617
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 20 10:48:50 2017 -0500

    increment docs version
    
    increment docs version

commit 6e604b09d47aad48f219b7b995bf32d889622882
Merge: 309eacaf 4556950a
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed Apr 19 11:21:45 2017 +0700

    Merge pull request #1038 from ContinuumIO/blaze
    
    blaze docs dependencies

commit 309eacaf96f2e77d2b2841fc8ba3fe37a4dccedc
Merge: bd1caac2 071f0528
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 18 17:28:35 2017 -0500

    Merge pull request #1046 from ContinuumIO/rst-special-chars
    
    add rst info on special chars

commit 071f0528ac03197fd7aca07f60c0adaf8addd1a7
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 18 17:27:57 2017 -0500

    add rst info on special chars
    
    add rst info on special chars: dash, unicode, smart quotes

commit bd1caac278cac160ffab0ec0016b81260bc1b442
Merge: e6bece83 559b4af2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 18 15:23:49 2017 -0500

    Merge pull request #1043 from ContinuumIO/rst-images-and-vertical-space
    
    add info about images, figures, and vertical space

commit 559b4af25a7f0acb11da04c5cc8ffbd94d4294ca
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 18 15:17:08 2017 -0500

    add info about images, figures, and vertical space
    
    add info about images, figures, and vertical space

commit 4556950a6310860858db5fd46071d403933333ec
Author: Max Gamurar <max@v-integ.com>
Date:   Mon Apr 17 21:47:58 2017 +0700

    blaze docs dependencies

commit e6bece83f78bae779d672fefa1ef2d4913e84734
Merge: d1ac85fb 470f328f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 14 15:50:52 2017 -0500

    Merge pull request #1033 from ContinuumIO/sphinxext-numpy
    
    numpydoc - not need in sphinext

commit d1ac85fbabb047c7007319971b37c2e61b0e515f
Merge: 131a0e0c 6ac2706b
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 14 13:23:46 2017 -0500

    Merge pull request #1036 from ContinuumIO/update-install-procedure-for-conda
    
    update install procedure for conda

commit 6ac2706bc7e928c0cf46dd520a68ae1e47c749a0
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 14 13:23:04 2017 -0500

    update install procedure for conda
    
    update install procedure for conda

commit 470f328f5f14e0bb62191b345b1bb6755948216e
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Fri Apr 14 09:51:28 2017 +0700

    numpydoc - not need in sphinext

commit 131a0e0c5307eed91895196be8c76266f4ea86c7
Merge: efc87165 50ed9576
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 13 15:37:29 2017 -0500

    Merge pull request #1032 from ContinuumIO/fix-environment.yml
    
    fix environment.yml

commit 50ed9576f8ef99a9df31badce07b557c9ff2c354
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 13 15:34:34 2017 -0500

    fix environment.yml
    
    fix environment.yml by removing numbapro which was forcing the
    wrong accelerate version and causing errors

commit efc8716541b5b7331527f72c4891f32346429946
Merge: 01651200 d3806d37
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 13 14:06:14 2017 -0500

    Merge pull request #1030 from ContinuumIO/conda-assets-v2
    
    conda ported assets v2

commit d3806d373a0bcca104b7a8d36a80fe454148d0e8
Merge: d7a75b75 b8ba9cd9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 13 13:38:41 2017 -0500

    Merge pull request #1031 from ContinuumIO/makefile-whitespace
    
    fix Makefile whitespace

commit b8ba9cd9d29cdc61e36c1da002678a731de66277
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 13 13:37:18 2017 -0500

    fix Makefile whitespace
    
    fix Makefile whitespace

commit d7a75b7585c31730433082de2106847140a165e0
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Apr 13 15:36:37 2017 +0700

    conda ported assets v2

commit 01651200d052e5efee5c05385bfa5fa6b9493463
Merge: ef5994b0 ef4c33a8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 16:18:13 2017 -0500

    Merge pull request #1028 from ContinuumIO/revert-1016-conda-docs-dependencies
    
    Revert "conda docs assets and addons;"

commit ef4c33a807c3ad8aef9e0ae021a49e9e80ec4567
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 16:18:01 2017 -0500

    Revert "conda docs assets and addons;"

commit ef5994b0e5ba06579815607d71c4928cca8304b1
Merge: d1f64d04 b52b8e7e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 15:50:43 2017 -0500

    Merge pull request #1016 from ContinuumIO/conda-docs-dependencies
    
    conda docs assets and addons;

commit d1f64d041038e9ec8b103c14180999c16b57a7ac
Merge: 9ec023c9 28e4add3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 15:11:38 2017 -0500

    Merge pull request #1027 from ContinuumIO/update-anaconda-images
    
    image updates

commit 28e4add371c6aa206fc9bac200331e0ea3d57373
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 15:02:26 2017 -0500

    image updates
    
    image updates

commit 9ec023c97671064ec5715cad6dca1fc0ffab2dac
Merge: 81f55a90 bcc09929
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 14:38:35 2017 -0500

    Merge pull request #1026 from ContinuumIO/update-rst-doc
    
    update rst doc

commit bcc09929044c7380c001ba2ceb8551070a46bc2e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 12 14:36:06 2017 -0500

    update rst doc
    
    update rst doc; fix indentation, add more complex list example

commit 81f55a9068baf7c52439f1e161a7e89dfcdf1d86
Merge: b754db31 8fab11a6
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 11 19:10:46 2017 -0500

    Merge pull request #1025 from ContinuumIO/update-rstcheatsheet
    
    update RST cheat sheet

commit 8fab11a65ad7596b215127b32dbf7ca0bde37361
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 11 19:08:33 2017 -0500

    update RST cheat sheet
    
    update RST cheat sheet

commit b52b8e7e32797a58ab3f7e0416e452b6030313f7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 6 18:30:29 2017 -0500

    fix whitespace
    
    fix whitespace

commit b754db31860618e1ff30d29103a203c3ccb76458
Merge: 86108ff2 6820ae48
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 6 17:45:59 2017 -0500

    Merge pull request #1019 from ContinuumIO/aen-install-imgs
    
    Add files via upload

commit 86108ff27a98eec827ddd1ee0b5431166b982d8f
Merge: d390ff09 c06dc25d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 6 14:47:29 2017 -0500

    Merge pull request #1021 from ContinuumIO/increment-offline-docs-version
    
    increment offline docs version

commit c06dc25d3c7e64493f8026656d686e7eb08c82e5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 6 14:46:54 2017 -0500

    increment offline docs version
    
    increment offline docs version

commit 6820ae483bd3f301371483735c86adf384ff78fa
Author: saraneem <smahalingam@continuum.io>
Date:   Thu Apr 6 13:07:12 2017 -0500

    Add files via upload

commit d794dee05b5391f0b847d18da87aa33457a05935
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Apr 6 19:03:56 2017 +0700

    conda docs assets and addons;

commit d390ff093256d57a93b84b049828dd842efdf2b3
Merge: 65f27240 01c71669
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 5 18:56:56 2017 -0500

    Merge pull request #1014 from ContinuumIO/images
    
    fix image paths

commit 01c716696270620aab99597a1c5ce8e9071e61d6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 5 18:56:21 2017 -0500

    fix image paths
    
    fix image paths

commit 65f272404f848b4d46cf7c311bee6ad84f743740
Merge: 18da67b1 5db61a04
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 4 14:22:08 2017 -0500

    Merge pull request #1009 from ContinuumIO/add-skip-ci-note
    
    add skip ci note

commit 5db61a043c18b05995ffa8d515dfd7c80c0bcc08
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 4 14:17:47 2017 -0500

    add skip ci note
    
    add skip ci note

commit 18da67b18989ab9990b6b886d798e7072ef68f9a
Merge: 0055d8bf e866c07f
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 4 14:01:35 2017 -0500

    Merge pull request #1008 from ContinuumIO/add-branch-info
    
    add info to readme on which branches to use in which github repos

commit e866c07f2a11e060291353465d36193d0ce0bfeb
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 4 13:56:57 2017 -0500

    add info to readme on which branches to use in which github repos
    
    add info to readme on which branches to use in which github repos

commit 0055d8bf2456b0f0392002085f3fb7eaedb6afbb
Merge: e88c72d8 c5b17aca
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 31 13:39:09 2017 -0500

    Merge pull request #1000 from ContinuumIO/makefile-pull-current
    
    Makefile pull current

commit c5b17aca4f75894bf455702cfc2b6e7acb3eede8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 31 13:31:24 2017 -0500

    add 'now' alias
    
    add 'now' alias

commit 5d35a540b59dd9f06a5bd1e2faa2152708f47e66
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 31 11:15:23 2017 -0500

    add 'pull current' option to Makefile
    
    add 'pull current' option to Makefile

commit e88c72d87fe8fe9541738e57a259cfebe3c046cf
Merge: 6100f8c6 e0213713
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 29 20:00:48 2017 -0500

    Merge pull request #993 from ContinuumIO/add-make-without-git
    
    add option to make local docs without using git at all

commit e02137130fd979505279d21dbb2597ccd4f3742c
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 29 19:59:45 2017 -0500

    add option to make local docs without using git at all
    
    add option to make local docs without using git at all

commit 6100f8c660dff6fc74aa27819898a646466baacf
Merge: 0db90bc1 7cba9b6b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 29 17:14:24 2017 -0500

    Merge pull request #992 from ContinuumIO/aen412
    
    update Makefile for AEN 4.1.2

commit 7cba9b6bd47b72f613974fb04f55083b83700c04
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 29 17:08:12 2017 -0500

    update Makefile for AEN 4.1.2
    
    update Makefile for AEN 4.1.2

commit 0db90bc1dc62bd758a1f41b8a1468af0354d3160
Merge: e4663a08 240b6435
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Mon Mar 27 14:24:11 2017 +0700

    Merge pull request #979 from ContinuumIO/oss-ext
    
    new ext for cython docs;

commit 240b6435f773ad577693a495cb75929bf91bbc45
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Mar 27 14:23:35 2017 +0700

    new ext for cython docs;

commit e4663a087f254c696c08bd91a2bccf18d03dfb6d
Merge: 1bc577a2 a5c27dcb
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 24 17:50:52 2017 -0500

    Merge pull request #975 from ContinuumIO/rst-cheatsheet
    
    add rst cheatsheet

commit a5c27dcb97bbaa8759d812ab5db9a44e66c25f08
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 24 17:49:52 2017 -0500

    add rst cheatsheet
    
    add rst cheatsheet

commit 1bc577a202e46139d360b889ea43530425740dc1
Merge: 6828ebd7 f7074113
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 18:22:50 2017 -0500

    Merge pull request #973 from ContinuumIO/increment-docs-version
    
    increment version of offline docs

commit f70741131dfc97a2fc0f21f78b328a3952815a8e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 18:21:49 2017 -0500

    increment version of offline docs
    
    increment version of offline docs

commit 6828ebd73e0588fa8ec96944054722bfad895118
Merge: 25c3a0a7 a3d69332
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 18:19:38 2017 -0500

    Merge pull request #972 from ContinuumIO/makefile-dir
    
    add note about Makefile directories

commit a3d693326b19aa0a170518a9e73e04a428e79a29
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 18:19:11 2017 -0500

    add note about Makefile directories
    
    add note about Makefile directories

commit 25c3a0a7eac28ef22c2671739bff3a8e6c399057
Merge: 55ed1467 b88fda37
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 17:39:13 2017 -0500

    Merge pull request #970 from ContinuumIO/local
    
    improve local build process

commit b88fda37eac9db16d8ca2827e1375c161047c3e0
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 23 17:38:10 2017 -0500

    improve local build process
    
    rename 'make alldocs' to 'make local', open html instead of running
    a local server.

commit 55ed14678a57fe5b857298792ff9a4e162fab774
Merge: a4727bf5 39c55423
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 22 15:00:09 2017 -0500

    Merge pull request #967 from ContinuumIO/repo2275
    
    update Makefile for Repo 2.27.5 release

commit 39c554230462c73ec22e6b8ff50bdcc73bb6c096
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 22 14:58:49 2017 -0500

    update Makefile for Repo 2.27.5 release
    
    update Makefile for Repo 2.27.5 release

commit a4727bf55761386c9f6e43363d700fa2b88790b1
Merge: fef1daf9 79507a56
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 21 16:35:41 2017 -0500

    Merge pull request #962 from ContinuumIO/fix-readme
    
    fix readme

commit 79507a5694762883da3b2071248fc6847382a841
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 21 16:35:03 2017 -0500

    fix readme
    
    fix readme. thanks to Max for noticing this!

commit fef1daf9ec75ff8747ee2b14efc02b627baa2e1d
Merge: ec6adad2 fc7abbac
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 21 11:22:54 2017 -0500

    Merge pull request #958 from ContinuumIO/gitignore-docs_oss
    
    add docs_oss to .gitignore

commit fc7abbac81b03daff2f5d88abd3d954fb969086a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 21 11:22:16 2017 -0500

    add docs_oss to .gitignore
    
    add docs_oss to .gitignore

commit ec6adad26f3b491f9b630ace558ebc67cac82adc
Merge: 6dcc87ea bf88571c
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Tue Mar 21 08:43:13 2017 +0700

    Merge pull request #954 from ContinuumIO/top_oss
    
    top oss support;

commit bf88571c0f2f3fb81d2271278defc6161ad28b14
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Sat Mar 18 19:38:17 2017 +0700

    top oss support;

commit 6dcc87eac54d92052cf1f6de151a04d6155a3fcd
Merge: 95d924c2 b221ec0c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 17 19:00:06 2017 -0500

    Merge pull request #953 from ContinuumIO/aen-411-archive-images
    
    add AEN 4.1.1 archive images

commit b221ec0c935cfd4ee050bc3d5050beef4d9d4f20
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 17 18:59:08 2017 -0500

    add AEN 4.1.1 archive images
    
    add AEN 4.1.1 archive images

commit 95d924c274bfeaf9015b8404f07707e3c86a9676
Merge: 045f8afc 06367fa6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 17 13:47:59 2017 -0500

    Merge pull request #951 from ContinuumIO/distribution-to-anaconda
    
    rename Anaconda Distribution to Anaconda

commit 06367fa62844d44b7c5f7fcd3d9953b4b83b5427
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 17 13:45:51 2017 -0500

    rename Anaconda Distribution to Anaconda
    
    rename Anaconda Distribution to Anaconda

commit 045f8afc063944044b88efa02c8dd1c4f1d490c0
Merge: 578529d2 2bc09517
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 9 14:29:37 2017 -0600

    Merge pull request #932 from ContinuumIO/increment-offline-docs-version
    
    increment offline docs version

commit 2bc095171522100bba9077d5392b484b485abd7b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 9 14:29:03 2017 -0600

    increment offline docs version
    
    increment offline docs version

commit 578529d280cb9e765cd6c7124d0bfc112f104f24
Merge: eda6e094 68d886e2
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 6 16:00:39 2017 -0600

    Merge pull request #927 from ContinuumIO/readme-staging-5.0
    
    update readme: 5.0 staging site

commit 68d886e231cc0a1b5e0a204bf370aff1f0ee41c4
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 6 15:58:08 2017 -0600

    update readme: 5.0 staging site
    
    update readme: 5.0 staging site

commit eda6e09473e1311834e57d69ee46148d42500055
Merge: e44c880b 6fbcd11a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 22 17:00:43 2017 -0600

    Merge pull request #903 from ContinuumIO/repo-226-archive-images
    
    add Repo 2.26 archive images

commit 6fbcd11a03ba88b9c2c0b37a5142e18b0fe11bcd
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 22 16:59:47 2017 -0600

    add Repo 2.26 archive images
    
    add Repo 2.26 archive images

commit e44c880bf0473047d6a0d9c1dcd8d3743c2bf4a4
Merge: f41c6681 f3a62809
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 22 15:55:36 2017 -0600

    Merge pull request #902 from ContinuumIO/repo227
    
    update Makefile for Repo 2.27

commit f3a628092117ee1837f43f226de98edd539953d0
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 22 15:54:55 2017 -0600

    update Makefile for Repo 2.27
    
    update Makefile for Repo 2.27

commit f41c66819113e95660428a752455bde58bfbe45b
Merge: ee538680 92c6ad21
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:36:48 2017 -0600

    Merge pull request #888 from ContinuumIO/pdf-update
    
    pdf updates

commit 92c6ad219462d3e7ab43d18921e07f2237c10b22
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:32:53 2017 -0600

    pdf updates
    
    pdf updates

commit ee5386805a9ebb963ae02ff59a7e30e02453fa1e
Merge: acc0ee21 52e12811
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:11:26 2017 -0600

    Merge pull request #887 from ContinuumIO/pdfs
    
    updates for pdf building

commit 52e12811d8f81a1a7b4aa3fed894b59b52d2dfca
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:09:04 2017 -0600

    anaconda logo
    
    anaconda logo

commit be8f1fc55850e1c555aea440bd95e226382c18c7
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:08:01 2017 -0600

    readme
    
    readme

commit 8c58f95fefa4841a24551394da095e2c86227f5e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 15 17:06:04 2017 -0600

    updates for pdf building
    
    updates for pdf building

commit acc0ee21a8c6b14e000871974145335c0b1ee26f
Merge: 0b802a0b 55465813
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Feb 10 11:13:49 2017 -0600

    Merge pull request #877 from ContinuumIO/feat/environment
    
    Add environment.yml

commit 0b802a0b5e11855193eeea41f787481fe43b76d6
Merge: 1a6f1f4f bfe08d56
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Feb 10 10:56:35 2017 -0600

    Merge pull request #878 from ContinuumIO/kerrywatson1-patch-1
    
    Add files via upload

commit bfe08d566aa3f353e78d7042601d560225cce039
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Feb 10 10:56:22 2017 -0600

    Add files via upload

commit 55465813cb1571b3988a8cd70f4d3fe50ac05b4e
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Thu Feb 9 13:31:55 2017 -0800

    Add environment.yml

commit 1a6f1f4f5543f26c9e487ee74d084779651a3de9
Merge: e54314b5 9789212f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 12:07:05 2017 -0600

    Merge pull request #875 from ContinuumIO/kerrywatson1-patch-1
    
    more test drive images

commit 9789212f3a65c5e021b581c4aa6d8794300fe0df
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 12:06:48 2017 -0600

    more test drive images

commit e54314b533b22eaf467c57d24e2914123ba07cb4
Merge: c6b05f04 2098cbbb
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 12:03:04 2017 -0600

    Merge pull request #874 from ContinuumIO/kerrywatson1-patch-1
    
    Upload test drive files

commit 2098cbbb7f2098f4c24f1255a6a6c5f407169fe1
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 12:02:38 2017 -0600

    Upload test drive files

commit c6b05f0429720cdcef3f1fc4c844bc69ac2fc5d9
Merge: 5319ba14 344c9737
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 11:54:03 2017 -0600

    Merge pull request #873 from ContinuumIO/kerrywatson1-patch-1
    
    Update README.md

commit 344c973746e1f3fb7f2b10ccaff73e55517025e0
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 11:53:51 2017 -0600

    Update README.md

commit 5319ba14d21ef89704ecb9d5b2a26949d2c8fccb
Merge: ea57497e 44d41719
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 11:41:25 2017 -0600

    Merge pull request #872 from ContinuumIO/kerrywatson1-patch-1
    
    Update screenshot of AE5.0 login

commit 44d417199bedc5cf672efc3134afbc59afe8dfae
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Feb 8 11:41:10 2017 -0600

    Update screenshot of AE5.0 login

commit ea57497e855f49232363f1a776fd81c25d356fb7
Merge: 4505a033 f177455b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Feb 7 12:29:12 2017 -0600

    Merge pull request #867 from ContinuumIO/add-fusion-images
    
    add fusion images

commit f177455ba30907e4d69156ee8b2d4c0005721033
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Feb 7 12:28:41 2017 -0600

    add fusion images
    
    add fusion images

commit 4505a0338cb21d5932bd49b775898cd8fa16734d
Merge: 167898dd 1ebdeac6
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Feb 6 11:12:33 2017 -0600

    Merge pull request #865 from ContinuumIO/aen-checkpoint
    
    Add files via upload

commit 1ebdeac6176a91d705bc0f0c73717f8727dc7e86
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Feb 6 11:11:48 2017 -0600

    Add files via upload

commit 167898ddd6ef02ec0f9712dc2220a5eb1ff3f4ca
Merge: 04dabeb4 fbcc86cd
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 3 11:36:24 2017 -0600

    Merge pull request #858 from ContinuumIO/add-fusion-upload-imgs
    
    add Fusion upload images

commit fbcc86cde59d80934264ced2bf524d6447d310cf
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 3 11:34:23 2017 -0600

    add Fusion upload images
    
    add Fusion upload images

commit 04dabeb4d43c7f7aa4ea8eb3e42cb9af248a9aa4
Merge: 0f8e0f91 3f03421c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 3 11:30:33 2017 -0600

    Merge pull request #856 from ContinuumIO/add-fusion-macos-certificate-images
    
    add Fusion macOS certificate images

commit 3f03421cb2bfe4c6efd421838115f48ca08adf51
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 2 16:58:24 2017 -0600

    add Fusion macOS certificate images
    
    add Fusion macOS certificate images

commit 0f8e0f915124d35a0322b5c37e527920cc7e15c7
Merge: 60ff3c85 1a104db0
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 2 16:40:23 2017 -0600

    Merge pull request #855 from ContinuumIO/new-fusion-images
    
    Upload NEW Fusion images

commit 1a104db04befebd54ccb2627833dfa10e4154a51
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Feb 2 16:36:43 2017 -0600

    Upload NEW Fusion images
    
    QA took 7 new screenshots. I've added a "1" to the end of each to designate it is new. This will help us sort them out when we insert them into text.

commit 60ff3c85dccec1b5f0bf56ac8a2308f7ef11f54e
Merge: 0c2edc7a 315390d0
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 2 16:34:23 2017 -0600

    Merge pull request #854 from ContinuumIO/fusion-images
    
    Upload Fusion replacement images

commit 315390d02b35b19e0a04982b56aaf907b7015791
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Feb 2 16:30:18 2017 -0600

    Upload Fusion replacement images
    
     per https://github.com/ContinuumIO/anaconda-fusion/issues/664
    These images are all updated by QA and optimized by docs.

commit 0c2edc7af177927e9186a9545eec50a744140e79
Merge: ed176eb5 0b1a4d73
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 2 12:46:12 2017 -0600

    Merge pull request #839 from ContinuumIO/remove-mosaic
    
    Docs: Remove mosaic from build script

commit ed176eb520dbbaaf43d1da3045c8e0aae51da951
Merge: f71eaae2 f5c4269e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Feb 2 11:04:14 2017 -0600

    Merge pull request #848 from ContinuumIO/kerrywatson1-patch-1
    
    Update README.md

commit f5c4269eff197d46d36007430c65b5e3803f573c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Feb 2 11:03:48 2017 -0600

    Update README.md

commit 0b1a4d73eba81b7d99fbf86d1940b3a874e83f59
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 31 16:24:54 2017 -0600

    update Makefile
    
    update Makefile

commit 497ab63ccd991e2a8674ae79b67fb06afe3d20d9
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 31 16:17:47 2017 -0600

    remove mosaic
    
    remove mosaic

commit f71eaae2c89de9e8e382dade5e15ee71b71146e5
Merge: 0d3f6b75 69f5d5bb
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Jan 31 14:38:14 2017 -0600

    Merge pull request #836 from ContinuumIO/stack-diagram-2
    
    Add files via upload

commit 69f5d5bbdef5a5860aee163c5a04f9e63e10148e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Jan 31 14:37:55 2017 -0600

    Add files via upload

commit 0d3f6b75a4bf440ab1861db1983d2090a8cf67a2
Merge: 03b3eab5 6e389038
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed Jan 25 11:51:51 2017 +0700

    Merge pull request #819 from ContinuumIO/theme_search_ico_fix
    
    search icon always on;

commit 6e3890382db38fa243676a9c5d32271307fd4dc9
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Jan 25 11:51:26 2017 +0700

    search icon always on;

commit 03b3eab501c41f61a78e2dc9b1060bdfaec8e619
Merge: 3e977296 cb206117
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed Jan 25 11:21:45 2017 +0700

    Merge pull request #818 from ContinuumIO/theme_updates
    
    synced theme with latest brandkit;

commit cb20611767b8efae82e8e6709e829fa468741cb6
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Jan 25 11:21:15 2017 +0700

    synced theme with latest brandkit;

commit 3e97729670b226dbceb980471cbc83e101505249
Merge: eb1f5bc8 2931663c
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed Jan 25 09:32:43 2017 +0700

    Merge pull request #817 from ContinuumIO/search_fix
    
    fixed search conflict and sidebar animation issue;

commit 2931663ce875c7b72f4a20487e6ee00d5d7b9602
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Jan 25 09:32:08 2017 +0700

    fixed search conflict and sidebar animation issue;

commit eb1f5bc8648b301853cf6f5c4e0a36edaf2a9063
Merge: 7547e9a9 cf10ee31
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 19 13:55:22 2017 -0600

    Merge pull request #812 from ContinuumIO/add-fusion-img
    
    add fusion image

commit cf10ee31643c289ee04b9a1aea2a4fb4059d1970
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 19 13:54:42 2017 -0600

    add fusion image
    
    add fusion image

commit 7547e9a921eec316cf1af46ad20839271482714e
Merge: 58bd12e4 944758b2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 12 16:49:58 2017 -0600

    Merge pull request #783 from ContinuumIO/offline-docs-process
    
    update offline docs process

commit 944758b2106030c4e97ba04beedf71b545d2ffd1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 12 16:49:15 2017 -0600

    update offline docs process
    
    update offline docs process

commit 58bd12e4600e5f78e2367e5db6b7593c2f76e10d
Merge: 4b3b4abe 62c97d5b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 12 14:49:04 2017 -0600

    Merge pull request #782 from ContinuumIO/increment-docs-pkg
    
    increment docs pkg to 2.0.6

commit 62c97d5bfa54e8960e53b68d38ec16628e564f26
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 12 14:48:14 2017 -0600

    increment docs pkg to 2.0.6
    
    increment docs pkg to 2.0.6

commit 4b3b4abe8b26afdcca47d15dfec0638cac3c663b
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jan 9 16:36:31 2017 -0600

    pipe indentation
    
    pipe indentation

commit 619d297692a724e76e374382a98d6eff952e2855
Merge: cf5e84cd 9396e812
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jan 9 15:04:36 2017 -0600

    Merge pull request #771 from ContinuumIO/kerrywatson1-patch-1
    
    Add info on spacing images

commit 9396e8127c5ad8733e1e36732b848f192028a238
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jan 9 15:04:18 2017 -0600

    Add info on spacing images

commit cf5e84cd71b80fa050e7e7a5a2ec5df059108322
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 20:29:19 2017 -0600

    image procedure & other corrections
    
    update image and downloadable file procedure, correct a few instances of 'make all' to 'make alldocs'

commit 9c4cf5ebd535e97bbe96bff2645cd32acfe81da2
Merge: b217a0b3 906fa070
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 16:30:40 2017 -0600

    Merge pull request #759 from ContinuumIO/update-makefile
    
    automate image and downloadable file sync

commit b217a0b3c6853d8294945415113fa68c22235433
Merge: 19b4cb18 3a6d1cef
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 16:28:10 2017 -0600

    Merge pull request #763 from ContinuumIO/add-images
    
    add images

commit 3a6d1cefc7f1ae9ac7e579fb03ced87adbec0fb8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 16:27:35 2017 -0600

    add images
    
    add images

commit 19b4cb18c9f6f7f457e9589b817c08224c9604dc
Merge: ed10d701 1cf95bb3
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 15:40:59 2017 -0600

    Merge pull request #762 from ContinuumIO/update-images
    
    update images

commit 1cf95bb3c8dceed942e2d51c963e0eed08f7e217
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 15:40:28 2017 -0600

    update images
    
    update images

commit 906fa070fcd8717851ae27a62b31dc871150ead3
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 13:57:53 2017 -0600

    consistent slashes
    
    consistent slashes

commit 3a1ce867071024db5236de108b6244608925025b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 5 13:56:47 2017 -0600

    automate image and downloadable file sync
    
    automate image and downloadable file sync

commit ed10d701cdf78354b9b0a655da86b61188d874f8
Merge: dea8483c 740d64fb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 21 18:38:14 2016 -0600

    Merge pull request #745 from ContinuumIO/makefile-repo-226
    
    update Makefile for Repo 2.26

commit 740d64fbdbecaaab0a75a2b9cc57113229d34a4a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 21 18:37:14 2016 -0600

    update Makefile for Repo 2.26
    
    update Makefile for Repo 2.26

commit dea8483c1123fcd5b673a500603e6bf74769d427
Merge: c56161e8 9b139c00
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 21 18:14:36 2016 -0600

    Merge pull request #741 from ContinuumIO/maxgamurar-patch-1
    
    Update README.md

commit c56161e83307dc79c3464a69fa64e02c0d053be1
Merge: 8732ac56 78a61fef
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 21 15:33:30 2016 -0600

    Merge pull request #744 from ContinuumIO/repo-226-img
    
    images for Repository 2.25 and 2.26 releases

commit 78a61fefaf18193766ebb9c0a9a7b58d0541a737
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Dec 21 15:32:34 2016 -0600

    images for Repository 2.25 and 2.26 releases
    
    images for Repository 2.25 and 2.26 releases

commit 9b139c0092727d969d8052e34f1295f1ea995086
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Wed Dec 21 13:48:04 2016 +0700

    Update README.md
    
    Changed  init instruction:
    git@github.com:maxgamurar/command_json_out.git to git@github.com:ContinuumIO/command_json_out.git

commit 8732ac563ccff0becb9c8b1195950d7a6ead75e8
Merge: 468df5b0 892c235c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 20 15:14:57 2016 -0600

    Merge pull request #739 from ContinuumIO/kerrywatson1-patch-1
    
    New screenshot w/Anaconda logo

commit 892c235c050ca9ac512d5db3b1c0c3c9ab145518
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 20 15:14:40 2016 -0600

    New screenshot w/Anaconda logo

commit 468df5b0f31d2832d565a05734cfc4189ee1817e
Merge: 43e16635 eccea8f0
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 20 14:43:16 2016 -0600

    Merge pull request #738 from ContinuumIO/aen-img-files
    
    AEN image: Files tab

commit eccea8f0f3e5005e9a6d20db0a6d2d5aac1af85b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 20 14:42:21 2016 -0600

    AEN image: Files tab
    
    AEN image: Files tab

commit 43e16635383484d4a7a56000e1473e12a59d9d07
Merge: 4bcf65c3 43fe3dec
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 19 17:29:46 2016 -0600

    Merge pull request #736 from ContinuumIO/add-finding-jupyter
    
    add finding jupyter image

commit 43fe3dec0563255a95f64ce74bce25352a9996b1
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 19 17:28:21 2016 -0600

    add finding jupyter image
    
    add finding jupyter image

commit 4bcf65c39a7385ec1e346b2af861fd34d8a5f164
Merge: 4519a19c eb672450
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 19 10:51:21 2016 -0600

    Merge pull request #735 from ContinuumIO/kerrywatson1-patch-1
    
    Update image to 4.1.1

commit eb67245003da2695a4dc5c4fa5dbb9a7127f7430
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 19 10:48:48 2016 -0600

    Update image to 4.1.1

commit 4519a19cf15dbc0b7c859fc7a8f238d76454437e
Merge: 77b5c1f1 d17de2e2
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 16 20:30:29 2016 -0600

    Merge pull request #732 from ContinuumIO/aen411-makefile
    
    update Makefile for AEN 4.1.1

commit d17de2e2a833afcc9dc97ae52e02a9f3d424374b
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 16 20:29:49 2016 -0600

    update Makefile for AEN 4.1.1
    
    update Makefile for AEN 4.1.1

commit 77b5c1f184c4079ed02bd41c75015981dc14abbe
Merge: d00b2c8c e2472d07
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 16 20:22:37 2016 -0600

    Merge pull request #731 from ContinuumIO/add-aen-410-archive-images
    
    add AEN 4.1.0 archive images

commit e2472d075619e942ae943161f56663aa2038d5aa
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 16 20:21:55 2016 -0600

    add AEN 4.1.0 archive images
    
    add AEN 4.1.0 archive images

commit d00b2c8cbb1946eba80eadbb6e05eafc16e4cc8a
Merge: cb428666 5673c234
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 16 13:54:29 2016 -0600

    Merge pull request #726 from ContinuumIO/kerrywatson1-patch-1
    
    New image linking Navigator to Repo

commit 5673c234f07a6c27b7b7f46bd3de4cd8de30b1e4
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 16 13:54:20 2016 -0600

    New image linking Navigator to Repo

commit cb428666830d943c1519c61d1a03b30e4617bb1f
Merge: 46eb0fb1 5be46414
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Dec 15 14:08:36 2016 -0600

    Merge pull request #723 from ContinuumIO/kerrywatson1-patch-1
    
    New images for AP Viewer Guide

commit 5be464146b0c626cb835978209de856e949da49c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Dec 15 14:08:26 2016 -0600

    New images for AP Viewer Guide

commit 46eb0fb10ecbb645f7fcdf6702087506d4bc4f7e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 13 17:27:37 2016 -0600

    Update README.md

commit c6536d142768d8052e2e187836d8dc657bc05bcc
Merge: 071ef8d9 33ef2ff6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 19:29:58 2016 -0600

    Merge pull request #718 from ContinuumIO/readme-versioning
    
    archiving past versions of docs for a product

commit 33ef2ff6ad82f2252bd9de1241ca30fa4935917a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 19:29:43 2016 -0600

    archiving past versions of docs for a product
    
    add note on archiving past versions of docs for a product, and images.

commit 071ef8d9fe4bb3e57c6f46366f50471c7fe063f7
Merge: 3b9d25ac d01cf8db
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 17:46:10 2016 -0600

    Merge pull request #716 from ContinuumIO/add-aen-4.0-images
    
    add aen 4.0 images

commit d01cf8db1aca5a764f1089b99b834c004c5218e5
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 17:45:25 2016 -0600

    add aen 4.0 images
    
    add aen 4.0 images

commit 3b9d25ac2e85c7c3e4236fc9224b07c58a294e04
Merge: b59f200a ee42fd36
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 16:19:22 2016 -0600

    Merge pull request #715 from ContinuumIO/test-img
    
    test image

commit ee42fd36de4875bba77321f94c1a06266d6504d2
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 12 16:18:09 2016 -0600

    test image
    
    test image

commit b59f200a74d2c6c0adf7721e97284916bf035e99
Merge: 28870f6d d46672f7
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 12 15:44:35 2016 -0600

    Merge pull request #714 from ContinuumIO/kerrywatson1-patch-1
    
    Replace bad image

commit d46672f77c7876f55513fcf8c503947a53dbf2e8
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 12 15:44:21 2016 -0600

    Replace bad image

commit 28870f6d01d81126399a5aa3f74015b898163a5e
Merge: 1d57a3fa 21b41450
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 9 15:20:50 2016 -0600

    Merge pull request #711 from ContinuumIO/kerrywatson1-patch-1
    
    Linking navigator to repo

commit 21b414501f672ab14f92513ea414d120af934fab
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 9 15:20:43 2016 -0600

    Linking navigator to repo

commit 1d57a3fa83bbc18e313c5dc973535b14505cd92d
Merge: e989af76 1b3b29ef
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 9 15:11:35 2016 -0600

    Merge pull request #710 from ContinuumIO/kerrywatson1-patch-1
    
    How to link to local repo from Navigator image

commit 1b3b29efb2d785c65e9c69765ab116876781e838
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Dec 9 15:11:24 2016 -0600

    How to link to local repo from Navigator image

commit e989af76d95f4e629919ab85bf1fadba3d620221
Merge: bb90113a a7a7cb74
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Dec 8 15:02:33 2016 -0600

    Merge pull request #708 from ContinuumIO/kerrywatson1-patch-1
    
    Anaconda repo search

commit a7a7cb74da92223092556877a12115e57a230d7c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Dec 8 15:02:25 2016 -0600

    Anaconda repo search

commit bb90113a6d87f1a38449c59851e4df743cd91870
Merge: 9632cabd 12613ad6
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 6 16:40:13 2016 -0600

    Merge pull request #702 from ContinuumIO/kerrywatson1-patch-1
    
    New repo start image

commit 12613ad69e14153d6971c7913defb04640194eda
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 6 16:40:03 2016 -0600

    New repo start image

commit 9632cabdfb143c1e0bd8e6985017736afa4e7678
Merge: 627f1102 1aaf9c8c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 6 16:30:14 2016 -0600

    Merge pull request #701 from ContinuumIO/kerrywatson1-patch-1
    
    New repo dashboard pic for user docs

commit 1aaf9c8ca15e0a4fc858f2eaf89f9c2c867f9618
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Dec 6 16:30:03 2016 -0600

    New repo dashboard pic for user docs

commit 627f110220157eb4ebf581fccd26aa5c5b4fb4f2
Merge: 1b009df5 e4ded281
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 6 15:16:59 2016 -0600

    Merge pull request #700 from ContinuumIO/remove-blog-draft
    
    remove blog draft

commit e4ded281cc856e636454ca98a6e8b9d94fd066a3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 6 15:16:26 2016 -0600

    remove blog draft
    
    remove blog draft

commit 1b009df58d5768b376b18e52b87616538812b8cc
Merge: 6991c813 7d36b236
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 6 14:58:15 2016 -0600

    Merge pull request #699 from ContinuumIO/aen-branch
    
    build AEN from 4.1.0 branch

commit 7d36b23608313b86766d47e89339299a52554d21
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Dec 6 14:56:58 2016 -0600

    build AEN from 4.1.0 branch
    
    build AEN from 4.1.0 branch

commit 6991c813dae7123bb59c45ea9609744deb46aa28
Merge: d156b9fb 6c8ad8e9
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 5 19:47:47 2016 -0600

    Merge pull request #694 from ContinuumIO/add-mdurant-blog-post
    
    add Martin Durant dask fastparquet blog post draft

commit 6c8ad8e92e21397e8e3aac0b83db31c60639690e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 5 19:47:04 2016 -0600

    add Martin Durant dask fastparquet blog post draft
    
    add Martin Durant dask fastparquet blog post draft

commit d156b9fb9812bc438dd3216e59223a0547d94e2d
Merge: 6f602df4 56514b43
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 5 16:14:28 2016 -0600

    Merge pull request #691 from ContinuumIO/kerrywatson1-patch-1
    
    Updated images for Nav 1.4

commit 56514b43e295401f7ef73b8376dce1dd56375d9d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 5 16:14:16 2016 -0600

    Updated images for Nav 1.4

commit 6f602df410ffa719757782fdf712dbfcb36aa1fb
Merge: 30e07f8c bc4e2a5b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 5 16:01:49 2016 -0600

    Merge pull request #690 from ContinuumIO/kerrywatson1-patch-1
    
    Add new Nav 1.4 screenshot

commit bc4e2a5b65599a4e025eb6f0f7779cb2a4342225
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Dec 5 16:01:38 2016 -0600

    Add new Nav 1.4 screenshot
    
    No more beta! woo hoo!

commit 30e07f8c6d531842c72cfe4d19c4fb76eddbd996
Merge: 1d5d5019 18551582
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:39:20 2016 -0600

    Merge pull request #687 from ContinuumIO/add-viz-img
    
    add AEN viz images

commit 185515827aa6f036d001b22a823668ca2c511b76
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:38:16 2016 -0600

    add AEN viz images
    
    add AEN viz images

commit 1d5d501985f7ceae92f9d6f8abee39bd42e58ec2
Merge: 75d4da98 7850237e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:18:17 2016 -0600

    Merge pull request #686 from ContinuumIO/add-web-to-gitignore
    
    add web to gitignore

commit 7850237ec94a7d6d0c6a990f3ecccb6e3ef269f8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:17:43 2016 -0600

    add web to gitignore
    
    add web to gitignore

commit 75d4da980a02ecc96276b701fc952e2fab1671c8
Merge: 31114759 058815cc
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:16:41 2016 -0600

    Merge pull request #685 from ContinuumIO/remove-web-docs
    
    remove web directory

commit 058815cc941356cb2600324529e5f35d2f3e62d7
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 17:16:09 2016 -0600

    remove web directory
    
    remove web directory

commit 3111475937d5314ec5e20b062c6b3e02fe50b478
Merge: 9e5350e6 47ad1f3e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:30:00 2016 -0600

    Merge pull request #684 from ContinuumIO/new-build
    
    once more

commit 47ad1f3ec63d58f106d2ddc51738e6cbe5e93e76
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:29:24 2016 -0600

    once more
    
    once more

commit 9e5350e62fc4e1fc414a5741b59e0b51fda32d4f
Merge: 2ff19527 089ebe13
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:25:56 2016 -0600

    Merge pull request #683 from ContinuumIO/new-build-attempt
    
    new build attempt

commit 089ebe131fee62b60443cf693e0a5746531198d6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:25:12 2016 -0600

    fix readme
    
    fix readme

commit f5ef589a5e58ace170b422860d8a75a78d4dc894
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:24:08 2016 -0600

    new build attempt
    
    new build attempt

commit 2ff195274931c6664fc3080128da68124f217fb9
Merge: e316b534 590b9d28
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:17:46 2016 -0600

    Merge pull request #682 from ContinuumIO/correct-build
    
    correct build paths

commit 590b9d28a6a8d864a928c57a5a979929d4c0e69d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:17:13 2016 -0600

    correct build paths
    
    correct build paths

commit e316b5349b4bb19c80ee8618168a9f270cf0df5b
Merge: b1001cfc ac886c2c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:15:14 2016 -0600

    Merge pull request #681 from ContinuumIO/increment-version
    
    increment version

commit ac886c2cbb78ddce7228247612ee34e5dc29d746
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:14:46 2016 -0600

    increment version
    
    increment version

commit b1001cfcd4aaa2ba174fd555db1ffb4852ac3348
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:12:49 2016 -0600

    fix command formatting
    
    fix command formatting

commit bdad22bd19212b57cbca1ab3d9baf13ebc430ac4
Merge: 75d472e3 649ab982
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:10:35 2016 -0600

    Merge pull request #680 from ContinuumIO/update-readme-and-build.sh
    
    update README and build.sh for new deployment

commit 649ab982cf5d61042eb8c6addc2e69369c6f3ef0
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 2 16:08:49 2016 -0600

    update README and build.sh for new deployment
    
    update README and build.sh for new deployment

commit 75d472e34a5feeed71d7ff03abab81355dabc37e
Merge: 5b97e640 95944dc5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 1 15:16:33 2016 -0600

    Merge pull request #678 from ContinuumIO/version
    
    increment version number of offline docs

commit 95944dc50156ca0eeea940274dd92ac76e965876
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 1 15:15:53 2016 -0600

    increment version number of offline docs
    
    increment version number of offline docs

commit 5b97e640adec33440d8d056beb494cd828ec0dee
Merge: 190d1089 47819b55
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 1 15:11:05 2016 -0600

    Merge pull request #677 from ContinuumIO/html
    
    update html

commit 47819b5589820c0ae8f890ca2b1b491418779181
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 1 15:10:33 2016 -0600

    update html
    
    update html

commit 190d1089e5cc9054548ce0b612a9b83fa62b626d
Merge: d1384683 a7da7f66
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 16:47:52 2016 -0600

    Merge pull request #656 from ContinuumIO/increment-version
    
    increment version on continuum-docs package

commit a7da7f66268455a5b540adfd1996587e058ce0ae
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 16:47:06 2016 -0600

    increment version on continuum-docs package
    
    increment version on continuum-docs package

commit d1384683f5a0b66ff3b3c6918113e072b4fc050c
Merge: cbdd4417 b5da6bf8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 16:37:32 2016 -0600

    Merge pull request #655 from ContinuumIO/html
    
    update html

commit b5da6bf8a944b724c5e60e894dea3e9a1ca3801b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 16:36:40 2016 -0600

    update html
    
    update html

commit cbdd44174072312e002e859f082cba0954ff31e2
Merge: aa4ece8f 518d53d6
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Nov 17 16:36:34 2016 -0600

    Merge pull request #654 from ContinuumIO/kerrywatson1-patch-1
    
    New images for repo managing page

commit 518d53d6a2f3c4cefd5c779c72857286d50c876d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Nov 17 16:36:24 2016 -0600

    New images for repo managing page

commit aa4ece8f843f35821a53788a4100edb5774c43b5
Merge: beb88ec5 8ffc5969
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 12:49:02 2016 -0600

    Merge pull request #648 from ContinuumIO/repo-2.24
    
    update Makefile for Repo 2.24

commit 8ffc59692186b98e4e0ceef25e41d69da9a0ad67
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 17 12:47:48 2016 -0600

    update Makefile for Repo 2.24
    
    update Makefile for Repo 2.24

commit beb88ec523290133a08a73660d8e8a0b26514cc7
Merge: 6aef3887 cb3a93b6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 16 18:15:13 2016 -0600

    Merge pull request #647 from ContinuumIO/add-repo-img
    
    add repo images

commit cb3a93b6fcf910c5d9b06ed1b01029ff89dcbd0e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 16 18:14:32 2016 -0600

    add repo images
    
    add repo images

commit 6aef3887e6e832a7147a4a949c43deb94f8f2ddf
Merge: d109874f fb6689b4
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Nov 15 16:27:51 2016 -0600

    Merge pull request #643 from ContinuumIO/kerrywatson1-patch-1
    
    Update README.md

commit fb6689b4b846bded92caa8eb34682eb4ef92dff2
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Nov 15 16:26:58 2016 -0600

    Update README.md
    
    Add instructions  for Continuum employeeson how to run a copy of the current offline docs.

commit d109874f0a2ffd13d8ba0b44c633922f46cde3d1
Merge: 0ad92b53 37402e31
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 11 17:11:06 2016 -0600

    Merge pull request #635 from ContinuumIO/html
    
    update html

commit 37402e3185cf81c6a638b93758c762759954158b
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 11 17:10:22 2016 -0600

    update html
    
    update html

commit 0ad92b539036fdb30342f43de5fe0bb41f1f3052
Merge: 0ba2bf5d e21d374a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 11 16:15:30 2016 -0600

    Merge pull request #633 from ContinuumIO/add-fusion-img
    
    add fusion image

commit e21d374ad96c76baf80303f308ea7e0e04d6505d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 11 16:15:02 2016 -0600

    add fusion image
    
    add fusion image

commit 0ba2bf5d4a25e1388eeb0d22af130e7eec8e87d5
Merge: 44b7919c 58db0619
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 9 17:42:09 2016 -0600

    Merge pull request #628 from ContinuumIO/html
    
    update html

commit 58db0619a54ab29f1d8ccf03ac577ea117efc30b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 9 17:41:40 2016 -0600

    update html
    
    update html

commit 44b7919cc28d365d91b7cd3d3a0632989f2b886e
Merge: 470771c4 c2d7bd4d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 9 12:42:02 2016 -0600

    Merge pull request #619 from ContinuumIO/theme_brandkitbased
    
    new brandkit based offline theme v1;

commit c2d7bd4d26ffbf9f518a8d00487498c9523142de
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Nov 9 13:49:09 2016 +0700

    sticky sidebar fix;

commit 470771c47619f2a1ae27dbd96b3046d0de7be997
Merge: cbbe4402 4dba5421
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Nov 8 14:43:49 2016 -0600

    Merge pull request #625 from ContinuumIO/html
    
    update html

commit 4dba54213a1ff79f9e259b40d6c0510ba23114e8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Nov 8 14:43:14 2016 -0600

    update html
    
    update html

commit cbbe4402bebdac7f3b1e253a35379b45320ff928
Merge: 59966649 72564dbd
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Nov 7 16:16:29 2016 -0600

    Merge pull request #623 from ContinuumIO/add-ae-system-reqs
    
    add AE System Requirements

commit 72564dbde28509dbf736f7844460c935ef6e6e2e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Nov 7 16:15:25 2016 -0600

    add AE System Requirements
    
    add AE System Requirements

commit 2dfb4afc2f15f6eec2aa5e522536ec2578ab51fb
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Nov 7 17:17:51 2016 +0700

    new brandkit based offline theme v1;

commit 59966649afa386e9321355f695c063e2ca795cb9
Merge: a640d4a2 d3ca9e0f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 3 16:27:48 2016 -0500

    Merge pull request #616 from ContinuumIO/increment-version
    
    increment version

commit d3ca9e0f76652ba32674a79182c45f8f7f9daa20
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 3 16:27:23 2016 -0500

    increment version
    
    increment version

commit a640d4a22df2d71ad7782c74ad4a26bc1cb519bc
Merge: 478b13ed 888dd3a1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 3 16:25:55 2016 -0500

    Merge pull request #615 from ContinuumIO/html
    
    update html

commit 888dd3a1512c3d97abf8e68f91ce6acd0cf604cc
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 3 16:25:31 2016 -0500

    update html
    
    update html

commit 478b13eda147f915fa9c596ba21f5582c3cf0abf
Merge: 939f5a53 07cc0dd5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 2 19:51:28 2016 -0500

    Merge pull request #613 from ContinuumIO/html
    
    update html

commit 07cc0dd5cbd014146926d05a55843a5934d95748
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 2 19:50:45 2016 -0500

    update html
    
    update html

commit 939f5a5355643ab0c2d1dcfe33cca7c64097bce6
Merge: 800efe6c d5292769
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 2 13:40:10 2016 -0500

    Merge pull request #608 from ContinuumIO/add-fusion-img
    
    add fusion image

commit d529276939eed826d94894dc120fedd89b07f650
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 2 13:39:43 2016 -0500

    add fusion image
    
    add fusion image

commit 800efe6c1f3a90e3ec7f8101eb89123d5f8e07bd
Merge: ad80ac73 af4540b8
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 20:02:02 2016 -0500

    Merge pull request #602 from ContinuumIO/html
    
    update html

commit af4540b87a1aa698b03bd09cd179d9243fbaedcb
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 20:01:32 2016 -0500

    update html
    
    update html

commit ad80ac736722a281ba965b9dc75be835e869bbb7
Merge: b8684ff0 9f74e68b
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 17:22:50 2016 -0500

    Merge pull request #598 from ContinuumIO/update-fusion-images
    
    update fusion images

commit 9f74e68b75eadb9b2e43a0788fef1ad34f438c30
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 17:22:16 2016 -0500

    update fusion images
    
    update fusion images

commit b8684ff0ab7376762f5adb801a23af9e4642d84c
Merge: 8bce024a 9ba56546
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 15:28:27 2016 -0500

    Merge pull request #597 from ContinuumIO/add-fusion-images
    
    add fusion images

commit 9ba565460748553bd6b04677ccf60d01ffc5e64f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 31 15:27:59 2016 -0500

    add fusion images
    
    add fusion images

commit 8bce024a9f9eb66e73161c8267dda7ac9f6553d9
Merge: b586fa16 ff8882d0
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 26 18:35:26 2016 -0500

    Merge pull request #590 from ContinuumIO/html
    
    update html

commit ff8882d0ae3b1162537b032df189ecbbebc8b3a5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 26 18:35:01 2016 -0500

    update html
    
    update html

commit b586fa1649046ea8b79e6922c4f584f86f59a8c1
Merge: c9fa7a67 71ea9b9c
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 26 18:13:17 2016 -0500

    Merge pull request #589 from ContinuumIO/repo-2.23
    
    update Makefile for Repo 2.23

commit 71ea9b9c2bc4e4a65ab370f1099a9208ff1584c9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 26 18:10:28 2016 -0500

    update Makefile for Repo 2.23
    
    update Makefile for Repo 2.23

commit c9fa7a67494239a8a41474813f26315636ba30c1
Merge: 914e7af7 a13318f2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 25 17:02:43 2016 -0500

    Merge pull request #587 from ContinuumIO/html
    
    update html

commit a13318f2555e196bb6c659b3d40fa818b7da7452
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 25 17:02:18 2016 -0500

    update html
    
    update html

commit 914e7af7ca57ab17a2578de96f1a455f04d0a17b
Merge: 0a79ea72 6c9df2cc
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 25 12:03:24 2016 -0500

    Merge pull request #584 from ContinuumIO/add-aen-install-images
    
    add aen install images

commit 6c9df2cc691c080495aa27e0027013e0f37e7b83
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 25 12:02:53 2016 -0500

    add aen install images
    
    add aen install images

commit 0a79ea7221084fc7072193a292e88df02a932257
Merge: 5977db71 54cdad20
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 24 13:19:32 2016 -0500

    Merge pull request #582 from ContinuumIO/kerrywatson1-patch-1
    
    Replacement images for 4.1

commit 54cdad20c7a29a052ebf8085642b9bfa21046776
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 24 13:19:20 2016 -0500

    Replacement images for 4.1

commit 5977db7133e807c8707384baa89b9f2e69f27b34
Merge: f1eeab36 1b8209ed
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 24 13:17:09 2016 -0500

    Merge pull request #581 from ContinuumIO/kerrywatson1-patch-1
    
    New kernel image for aen 4.1

commit 1b8209ed22eaf8f51edeb62743dac5060dbf63b1
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 24 13:16:49 2016 -0500

    New kernel image for aen 4.1

commit f1eeab3691ff0154d51e6c47ea668d010f4cf0a3
Merge: 2dd40e9f b879884f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 16:56:27 2016 -0500

    Merge pull request #565 from ContinuumIO/kerrywatson1-patch-1
    
    Fixing filenames

commit b879884f371de6146d74220cc0d9d8e1ce284a75
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 16:56:16 2016 -0500

    Fixing filenames

commit 2dd40e9f079d48ee6e44d3a05037607fcc65593d
Merge: cb5e1bff 88c6789f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 15:48:11 2016 -0500

    Merge pull request #563 from ContinuumIO/kerrywatson1-patch-1
    
    New notebooks 4.1 image

commit 88c6789fe5d6c27b4ee35fe5594c36fe14a9d2fa
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 15:48:02 2016 -0500

    New notebooks 4.1 image

commit cb5e1bff087fcaf737bb4b7dcff859e23cbf2074
Merge: f23ecb30 fbc55c83
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 15:11:50 2016 -0500

    Merge pull request #562 from ContinuumIO/kerrywatson1-patch-1
    
    New JupyterLab screenshot

commit fbc55c8377c3ba7cd81b285b620b340bcc4eec96
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 15:11:41 2016 -0500

    New JupyterLab screenshot

commit f23ecb30f5181e073d46c825d4aef4e11b1a95f8
Merge: 7a153de9 0760d91b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 13:46:26 2016 -0500

    Merge pull request #561 from ContinuumIO/kerrywatson1-patch-1
    
    New clean Admin screenshot

commit 0760d91bcdff9e2abd5738284357680ad417146a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 20 13:46:16 2016 -0500

    New clean Admin screenshot

commit 7a153de90aa9167916916ecdd8c61e3d1c87fcfd
Merge: 96e2c5f1 64d1a181
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 19 17:18:28 2016 -0500

    Merge pull request #560 from ContinuumIO/html
    
    update html

commit 64d1a1811e73e8574de50a04911cf22ab86c624a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 19 17:18:05 2016 -0500

    update html
    
    update html

commit 96e2c5f14dac15065f5301b877bd74b3c9e1c2c6
Merge: 5af26cc9 4956a15e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Oct 19 16:05:54 2016 -0500

    Merge pull request #559 from ContinuumIO/kerrywatson1-patch-1
    
    New dashboard app icons for 4.1

commit 4956a15e1a58963e57cac3eb119a9c35f8c0e9e2
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Oct 19 16:05:45 2016 -0500

    New dashboard app icons for 4.1

commit 5af26cc95a67e44467a5fe83be4e2335c1e35ebf
Merge: 006ea139 b05bf403
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 19 14:44:14 2016 -0500

    Merge pull request #558 from ContinuumIO/readme-prevent-file-collision
    
    add prevent filename collision to readme

commit b05bf403d01aa54fa368d80eb233b099e1fdddd7
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 19 14:42:53 2016 -0500

    add prevent filename collision to readme
    
    edit readme to explain how to prevent collisions in filenames of
    downloadable files.

commit 006ea139fb195715f581e8e4130e86500cef195a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 19:11:32 2016 -0500

    Update README.md

commit bb9cdb5481067996feaf502d5023bd6cf3804929
Merge: 05a7ce9d eff657b5
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 19:10:33 2016 -0500

    Merge pull request #557 from ContinuumIO/offline-docs
    
    offline docs

commit eff657b57a77678160c7382a3c2b597215019897
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 19:09:50 2016 -0500

    offline docs
    
    offline docs

commit 05a7ce9d9d90b6cf8bbb8dc0d6c409eb1cb13886
Merge: 879fe29b 7f44e9e1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 18:10:55 2016 -0500

    Merge pull request #556 from ContinuumIO/html
    
    update html

commit 7f44e9e18c385a2864c5361a62695cb8de505751
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 18:10:29 2016 -0500

    update html
    
    update html

commit 879fe29bf29c73b5f2dfd5b84e71ec60a67536b5
Merge: 6f0f9bf6 9a05cea0
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 14:17:53 2016 -0500

    Merge pull request #554 from ContinuumIO/launcher-orphan
    
    mark launcher index as orphan

commit 9a05cea03837abd5e4dcd782b54573f575012bc4
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 14:17:19 2016 -0500

    mark launcher index as orphan
    
    mark launcher index as orphan

commit 6f0f9bf641aac0eb16d64fc49df1b6961123d248
Merge: 0e83d7c2 285156d2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 13:28:03 2016 -0500

    Merge pull request #552 from ContinuumIO/add-trialvm-img
    
    add trialvm images

commit 285156d227f404fd4a1369ba44dc5c0343c1aa63
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 18 13:26:20 2016 -0500

    add trialvm images
    
    add trialvm images from https://github.com/ContinuumIO/adam/pull/457

commit 0e83d7c2039b6c7459350469667be1f186a95548
Merge: a7b8a324 9e06b476
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 13 19:28:27 2016 -0500

    Merge pull request #550 from ContinuumIO/html
    
    update html

commit 9e06b4765ff09da5ee9d0af6c099c4ca11572469
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 13 19:27:51 2016 -0500

    update html
    
    update html

commit a7b8a324f88661865b757ca39aa230f7c414f94a
Merge: 25cc9fe6 38e981b1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 13 17:11:47 2016 -0500

    Merge pull request #549 from ContinuumIO/new-trialvm-docs
    
    new trial VM docs

commit 38e981b1634bbb3892f8d940c60723b6ad38912e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 13 17:10:45 2016 -0500

    new trial VM docs
    
    new trial VM docs

commit 25cc9fe638110d8ccd76935defe22cd8cba3d432
Merge: 0aae0f41 8ee24214
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Oct 12 14:29:05 2016 -0500

    Merge pull request #548 from ContinuumIO/kerrywatson1-patch-1
    
    New image removing Wakari

commit 8ee242147ccda3186f9ad441720cc6e1ed1936ed
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Oct 12 14:28:42 2016 -0500

    New image removing Wakari

commit 0aae0f418842fa9edc8abad5e212dcdae25c051f
Merge: 9f69ecb2 091ee226
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 11 16:12:39 2016 -0500

    Merge pull request #542 from ContinuumIO/html
    
    update html

commit 091ee226874db7ecc1c1ec778119952d09711647
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 11 16:12:15 2016 -0500

    update html
    
    update html

commit 9f69ecb2b7dce21c55e3037c605f427d81407086
Merge: 56045ea3 25ffbf16
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 10 17:38:48 2016 -0500

    Merge pull request #539 from ContinuumIO/img-navigator-tutorial06
    
    update navigator-tutorial06.png

commit 25ffbf16d07c397e30fbd10f7870fa8bed870abf
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 10 17:37:47 2016 -0500

    update navigator-tutorial06.png
    
    update navigator-tutorial06.png

commit 56045ea3adfb8540bf493e689fc44f20da9cde54
Merge: 36a976ac be61a142
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 10 10:17:34 2016 -0500

    Merge pull request #538 from ContinuumIO/kerrywatson1-patch-1
    
    Upload AEN Kernel conda newenv image

commit be61a142c80e3e4fb0bd6b629e4bdf4f6ceefb68
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 10 10:17:21 2016 -0500

    Upload AEN Kernel conda newenv image

commit 36a976ac84f19fc8de7194e080db6f6d0d1662b6
Merge: a5680ebe 8b1d9bc4
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Oct 7 17:58:40 2016 -0500

    Merge pull request #537 from ContinuumIO/html
    
    update html

commit 8b1d9bc49d51cd65b993c78e4011703045c0a0e2
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Oct 7 17:58:10 2016 -0500

    update html
    
    update html

commit a5680ebef933b5c0b428c9844e1431e8623e6724
Merge: 95059656 da2e121b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 16:56:57 2016 -0500

    Merge pull request #536 from ContinuumIO/kerrywatson1-patch-1
    
    Add AEN conda kernel image for notebook page

commit da2e121bf6b173032f6b65aa3672bca4a3e44981
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 16:56:48 2016 -0500

    Add AEN conda kernel image for notebook page

commit 95059656e4430dc470787e5b29104dbbd3d66764
Merge: 8045d78b 7dcafbda
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 13:19:38 2016 -0500

    Merge pull request #534 from ContinuumIO/kerrywatson1-patch-1
    
    Add compute resource config image

commit 7dcafbdaeb5784d85e0fe8111a2ae1a2e69f35bd
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 13:19:29 2016 -0500

    Add compute resource config image

commit 8045d78bab7b8ef2764d1391017a6fc55ca533cd
Merge: 29fa05b5 473886bf
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 12:41:03 2016 -0500

    Merge pull request #533 from ContinuumIO/kerrywatson1-patch-1
    
    New viewer app image

commit 473886bf568abf85874097e3be9c77193434b78e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Oct 7 12:40:52 2016 -0500

    New viewer app image

commit 29fa05b56a3f7562388ac3de16af19c36778035d
Merge: f0db54ac d3e831f5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 6 18:13:37 2016 -0500

    Merge pull request #532 from ContinuumIO/html
    
    update html

commit d3e831f51b16b162d4a5e79dad3142e10ef89fa2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 6 18:11:42 2016 -0500

    update html
    
    update html

commit f0db54ac3d3053846d11a45dc75b932afba81069
Merge: 948763a4 6ad44a93
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 6 16:07:40 2016 -0500

    Merge pull request #531 from ContinuumIO/tequila-shots
    
    Improved and new Workbench screenshots

commit 6ad44a93c9ff435ac5cf91619cd7ad84533ab96c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 6 16:07:21 2016 -0500

    Improved and new Workbench screenshots

commit 948763a46ac6382d47992568996630bbcc9a8ad6
Merge: b3362f27 9e7d0aad
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 6 14:29:14 2016 -0500

    Merge pull request #530 from ContinuumIO/new-gateone-images
    
    New images for GateOne page

commit 9e7d0aadc4f854f47a9f8833204392bb94374c59
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Oct 6 14:29:01 2016 -0500

    New images for GateOne page

commit b3362f27f0712509ed176c40839f4e32d39da5ab
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 5 14:28:09 2016 -0500

    Update README.md

commit 2dd4b68aa243dbcaeffcc8238da0bcbb9426666b
Merge: 739be19a 2505483a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 5 12:50:45 2016 -0500

    Merge pull request #525 from ContinuumIO/makefile
    
    update Makefile to add 'make push-docs' to 'make all'

commit 2505483a592e8742bfd391285e2d640ed68290e6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 5 12:49:36 2016 -0500

    update Makefile to add 'make push-docs' to 'make all'
    
    update Makefile to add 'make push-docs' to 'make all'

commit 739be19a30ea59fbf41838e816b1f5b34e19cec0
Merge: c76a4409 6477779e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 16:58:29 2016 -0500

    Merge pull request #524 from ContinuumIO/update-html
    
    update html

commit 6477779e87ec1e186ce4740c631ee3240af474a7
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 16:57:47 2016 -0500

    update html
    
    update html

commit c76a44090a3836b5b4a664f59f34513e7be76f8a
Merge: 4fb5a2c6 d0711cb2
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 15:26:28 2016 -0500

    Merge pull request #523 from ContinuumIO/makefile
    
    Makefile

commit d0711cb2e3f83a01813f5d86eb7e847e37e3c4ea
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 15:26:01 2016 -0500

    Makefile
    
    Makefile

commit 4fb5a2c65dc7bdcfb821fe2a1700249f651dda6f
Merge: 7bdce3e9 3a39d549
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 14:23:10 2016 -0500

    Merge pull request #521 from ContinuumIO/update-makefile
    
    update Makefile

commit 3a39d549929316871884315cc9751ac550462178
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 4 14:22:05 2016 -0500

    update Makefile
    
    anaconda-server from branch release/2.20 to release/2.21, and
    new 'make push-docs' command.

commit 7bdce3e9f03604953318dfc740660b64ee59c2bd
Merge: 4ef03512 febdb364
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 3 15:55:53 2016 -0500

    Merge pull request #517 from ContinuumIO/toc-info
    
    Add TOC info on hidden and maxdepth

commit febdb3641436d0a45da7eaa6dbeb8c09b78ec670
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Oct 3 15:52:56 2016 -0500

    Add TOC info on hidden and maxdepth

commit 4ef035124a7cfc42a92f6b4108713af764874b7e
Merge: 8964d0d4 f585d2f4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 29 18:42:11 2016 -0500

    Merge pull request #511 from ContinuumIO/mkl-license
    
    add mkl license install info

commit f585d2f4df1ee9ca7a212a976d45195bb2867c3e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 29 18:41:11 2016 -0500

    add mkl license install info
    
    add mkl license install info

commit 8964d0d4f0d18b8a72f29e6c88adca7b126ae9b9
Merge: 6591e768 82ad5e58
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 29 17:44:57 2016 -0500

    Merge pull request #510 from ContinuumIO/license-manager-img
    
    add license manager screenshot

commit 82ad5e587c764606153dc4b9a3330b07fd77829b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 29 17:44:07 2016 -0500

    add license manager screenshot
    
    add license manager screenshot

commit 6591e768ec43950a0b9312d0f7248c0cf5948841
Merge: aca4f504 8ada39ca
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 27 19:03:22 2016 -0500

    Merge pull request #504 from ContinuumIO/update-html
    
    update html

commit 8ada39ca964fab5243aed4ab0c0ee8095e2c7f40
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 27 19:02:29 2016 -0500

    update html
    
    update html

commit aca4f50433f96f78e40456b8d13ab5c73dbd68eb
Merge: 4037f1f9 35b3ea76
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 27 18:26:25 2016 -0500

    Merge pull request #503 from ContinuumIO/fusion-images
    
    update fusion images

commit 35b3ea762830f0dbc1a57d3d5576a91b49fd8f6b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 27 18:25:08 2016 -0500

    update fusion images
    
    update fusion images

commit 4037f1f91f5f6be2d6bae9e091460b0d88c8db26
Merge: 6085b940 2e38ab62
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:56:43 2016 -0500

    Merge pull request #501 from ContinuumIO/aen-user-misc-imgs
    
    update aen user misc images

commit 2e38ab62c89b845dbaae551a96e27938f5479c84
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:56:29 2016 -0500

    update aen user misc images

commit 6085b940c5d386c5d8b2f8e36b81c831b1f5b121
Merge: d3fa30fd 96fc521e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:33:12 2016 -0500

    Merge pull request #500 from ContinuumIO/update-readme
    
    Update README.md

commit 96fc521ecd701be82d20b00cbad8bf73a799d4fd
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:33:02 2016 -0500

    Update README.md

commit d3fa30fd6cefdc2df6dfbf3e8bce62470194d2a6
Merge: 83ff7583 86ed67de
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:29:55 2016 -0500

    Merge pull request #499 from ContinuumIO/aen-user-apps-imgs
    
    update aen user applications images

commit 86ed67de0edea1c8d2546bd27b4ca6ce4503f052
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 13:29:45 2016 -0500

    update aen user applications images

commit 83ff7583d375bfe645fc9b5c0a1ac2b6ffe6b305
Merge: 72a4ad74 83b240e2
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 12:04:39 2016 -0500

    Merge pull request #498 from ContinuumIO/update-aen-user-imgs
    
    Update aen user images

commit 83b240e29a6ec148191ce6ed2a2f34b4023e097a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Sep 27 12:04:22 2016 -0500

    Update aen user images

commit 72a4ad74ffce77eda501c18559909456f9c7a29c
Merge: 718b63ec 0fc09884
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Sep 26 16:33:04 2016 -0500

    Merge pull request #495 from ContinuumIO/update-aen-images
    
    Update AEN images

commit 0fc09884193d9347853ecf608a0b5753cfb35340
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Sep 26 16:32:53 2016 -0500

    Update AEN images
    
    Updating images

commit 718b63ec47cca0c910449965a041e722cddb876c
Merge: 47324c62 ffc3710a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Sep 21 15:56:42 2016 -0500

    Merge pull request #474 from ContinuumIO/new-nav-1-3-images
    
    New Nav 1.3 images

commit ffc3710a321ea3c06079350a3c5d23dffa087ac6
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Sep 21 15:56:29 2016 -0500

    New Nav 1.3 images

commit 47324c6255a5e41428fc218a4cf6900b74cb1a23
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 21 13:46:14 2016 -0500

    Update README.md

commit bb39c0bfdd8574b9b194fc4a4eba1be6af2c5407
Merge: 1781b9c9 51c9a03e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 21 13:11:19 2016 -0500

    Merge pull request #473 from ContinuumIO/cas-release-branch
    
    update Makefile for latest anaconda-server release branch 2.20

commit 51c9a03ef12d0814348b3b997622391e2a669491
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 21 13:10:18 2016 -0500

    update Makefile for latest anaconda-server release branch 2.20
    
    update Makefile for latest anaconda-server release branch 2.20.
    previous branch was named 2.20.0.

commit 1781b9c99aa62b43ec0c650bdbef044d7c48cf63
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 19 17:32:12 2016 -0500

    Update README.md

commit 5a3aa509e21455ee5760128d4a1d985b7c279384
Merge: 90f2111b abcdee9b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Sep 19 14:01:35 2016 -0500

    Merge pull request #461 from ContinuumIO/kerrywatson1-patch-1
    
    Clarifying which pages to edit

commit abcdee9ba2856f87f724feae4034d19e2592323a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Sep 19 14:01:26 2016 -0500

    Clarifying which pages to edit

commit 90f2111b4f5a3194f2d0366d5af6e9c6d38206c8
Merge: f03a8d76 a39e177b
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Sep 16 13:27:26 2016 -0500

    Merge pull request #452 from ContinuumIO/kerrywatson1-patch-1
    
    New diagram for AE install page

commit a39e177bd6162a850e373cc473dda46f0fb347f4
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Sep 16 13:26:54 2016 -0500

    New diagram for AE install page

commit f03a8d76f405adee389989d2f42aa689f89b5a42
Merge: 6e5740e6 b2dd17a5
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Sep 15 16:39:55 2016 -0500

    Merge pull request #449 from ContinuumIO/update-aen-user-images
    
    Updated aen user images

commit b2dd17a5a1a608342883cf1105389d916baa9ee4
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Sep 15 16:39:41 2016 -0500

    Updated aen user images

commit 6e5740e68e515625d552425aa314c46813fb6d63
Merge: 89287f8b 741a38b1
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 9 16:18:23 2016 -0500

    Merge pull request #441 from ContinuumIO/html
    
    update html

commit 741a38b100869e90609bb9f78b9ebff9cd493bfb
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 9 16:17:52 2016 -0500

    update html
    
    update html

commit 89287f8b67644f74548ff05dcca5e63b191d0970
Merge: 10a1a6ab bf619d62
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 8 14:23:12 2016 -0500

    Merge pull request #437 from ContinuumIO/html
    
    update html

commit bf619d6291893ef6b020f4946abad68fa08b1654
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 8 14:22:37 2016 -0500

    update html
    
    update html

commit 10a1a6ab426d116a13aa376353f8fa0f92ad7583
Merge: ea86684e 92a03434
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 6 18:41:58 2016 -0500

    Merge pull request #431 from ContinuumIO/html
    
    update html

commit 92a034343c7586c3b1de481a52640be859f2347b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 6 18:41:16 2016 -0500

    update html
    
    update html

commit ea86684e25475b7c59d787e5259b18a335e129a0
Merge: b3eb18db abc3b666
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 6 15:39:16 2016 -0500

    Merge pull request #427 from ContinuumIO/repo-2.20
    
    update Makefile for Repo/Cloud 2.20 release

commit abc3b666a530c30248d51ff39e91dcbb45755eb1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 6 15:38:17 2016 -0500

    update Makefile for Repo/Cloud 2.20 release
    
    update Makefile for Repo/Cloud 2.20 release

commit b3eb18db1dd50a4dcf35206d023e72e455b79cf2
Merge: 36e2f3a6 6dd057f1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 1 12:05:29 2016 -0500

    Merge pull request #416 from ContinuumIO/html
    
    update html

commit 6dd057f17fd74d5a5531bfdb83da12da10857c25
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 1 12:05:02 2016 -0500

    update html
    
    update html

commit 36e2f3a6a34b4806726e070d7810fabc82b401ea
Merge: d7d8585d b3eaeaa7
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:41:25 2016 -0500

    Merge pull request #410 from ContinuumIO/fusion-cert-images-2
    
    Fusion cert images set2

commit b3eaeaa70bb0458ff1dcf4323656cd294eaff564
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:41:10 2016 -0500

    Fusion cert images set2

commit d7d8585dd21ee8d1ee084f3d9b9292562e2e1e83
Merge: a8da3e33 0b88f25c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:37:46 2016 -0500

    Merge pull request #409 from ContinuumIO/fusion-add-in-images-set2
    
    Fusion add-in images set 2

commit 0b88f25cc82eeef72366a5a228c306e8d89e5d45
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:35:50 2016 -0500

    Fusion add-in images set 2

commit a8da3e332aae0aac811e3f4f82402a8e7b16f993
Merge: 21130494 171aed95
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:32:55 2016 -0500

    Merge pull request #408 from ContinuumIO/kerrywatson1-patch-1
    
    Update README.md

commit 171aed95a4f85c27c2f0ea5a6a1df8c8049d6c5f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 29 15:32:45 2016 -0500

    Update README.md

commit 211304940bc46614c3a00b77c856eeaa6d5c6c18
Merge: e2fa1625 7d49c11b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 25 16:50:20 2016 -0500

    Merge pull request #405 from ContinuumIO/html
    
    update html

commit 7d49c11b23f7eb8f8fb905d136e15c7f4628d20e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 25 16:49:52 2016 -0500

    update html
    
    update html

commit e2fa16251bfd00797bc941682a34e8a09dba7ab0
Merge: 4eb2395b 8aa92f1a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 25 11:27:28 2016 -0500

    Merge pull request #403 from ContinuumIO/html
    
    update html

commit 8aa92f1af745e9fcaa9a2ea0f1b7173f81e36481
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 25 11:26:32 2016 -0500

    update html
    
    update html

commit 4eb2395b45a1d2bbf6eedf0f2cb13c5c7bb803e3
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Aug 24 12:42:31 2016 -0500

    Update README.md

commit d8ec57bb3c2ba9ba1422a97dbfae2be138f086cc
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 22 16:10:43 2016 -0500

    Update README.md

commit 1161fec6574af1e6609edf101d9f1c3a9e70a786
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 22 16:09:31 2016 -0500

    Update README.md

commit 7d162868875d0d40570151f904aee8b14b4fdfc3
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Aug 22 16:08:31 2016 -0500

    Update README.md

commit 64e40f06808e1657685e0cc26ecf398cf90b7f6a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 19 16:37:14 2016 -0500

    clarify edits to menus and content nodes
    
    clarify edits to menus and content nodes. also remove duplicate link to google spreadsheet.

commit dae6c4ac8699434c834b93377979afd0c518d1e8
Merge: 9409b252 7dc09ba7
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 15:37:01 2016 -0500

    Merge pull request #389 from ContinuumIO/new-stack-diagram2
    
    New stack diagram2

commit 7dc09ba7b1b599db83e7fcd8566e2b84a9a10f8d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 15:36:48 2016 -0500

    New stack diagram2

commit 9409b2525f704ec0b7e195496a4535d9ca40ac0d
Merge: e7bdc286 94056ca3
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 13:53:04 2016 -0500

    Merge pull request #388 from ContinuumIO/add-detail
    
    Additional detail

commit 94056ca3568a9d758d0e52e21dfdff2e6072f592
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 13:52:50 2016 -0500

    Additional detail

commit e7bdc286cca5ba20ce679f9230b76b2307504423
Merge: e72f5aaa 7e9a999c
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 13:51:06 2016 -0500

    Merge pull request #387 from ContinuumIO/self-service
    
    Add docs self-service process to readme

commit 7e9a999c490f09db45f50926672aced80510db84
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 19 13:50:37 2016 -0500

    Add docs self-service process to readme

commit e72f5aaa2a1f2206febe5927e5b11b8872ac1a7e
Merge: a5314488 1da4bdb9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 18 18:24:42 2016 -0500

    Merge pull request #380 from ContinuumIO/scale
    
    add Anaconda Scale docs

commit a53144885ca2917aa2db3833c82160d167da58d2
Merge: 4b390f3b 62d93495
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 18 17:35:42 2016 -0500

    Merge pull request #379 from ContinuumIO/adefusco/repo-tokens
    
    update some repo images

commit 1da4bdb972796382fb55566c7e6a3c2a679fab01
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 18 13:08:57 2016 -0500

    new wording for menu
    
    new wording for menu

commit 4b390f3b004e98cb70fa4a7436c173e8530928f1
Merge: 8daad605 c9058f13
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:21:06 2016 -0500

    Merge pull request #383 from ContinuumIO/stack-diagram2
    
    Upload stack diagram2

commit c9058f13673949ddfbc6d1e76268ad8bd9b91822
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:20:54 2016 -0500

    Upload stack diagram2

commit 8daad6056f0bed5176d04da917e4b55e14b81917
Merge: 42ab5baf fe38695d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:15:24 2016 -0500

    Merge pull request #382 from ContinuumIO/readme-update2
    
    A bit more detail and formatting

commit fe38695d8686a464c54a840aa16a313ccc6b452d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:15:14 2016 -0500

    A bit more detail and formatting

commit 42ab5baf9b60c065b0003c636a80c031a9a06dd0
Merge: 339537c8 239dea39
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:08:50 2016 -0500

    Merge pull request #381 from ContinuumIO/readme-update
    
    Update Readme

commit 239dea395fe86cad114cc1798ff68a6256eb970d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 18 11:08:33 2016 -0500

    Update Readme
    
    Add headings, make easier to read

commit 1d14b49c89e6a7aaefcd573fbc16585b530f537b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 17 18:40:46 2016 -0500

    add Anaconda Scale docs
    
    add Anaconda Scale docs

commit 62d93495e4c4944d80eba880bb508170f3ccc9e2
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Wed Aug 17 16:46:51 2016 -0400

    update some repo images
    
    * removed outdated cloud Organization images
    * added Web UI token page image

commit 339537c87d8f6492a516fd0812c1271694f5dd21
Merge: f81306d8 07a2d575
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 16 17:03:21 2016 -0500

    Merge pull request #378 from ContinuumIO/html
    
    update html

commit 07a2d57502cf9d736028323c3024d4efe1895e57
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 16 17:02:18 2016 -0500

    update html
    
    update html

commit f81306d81a2dbd4eb71a1801b329876195617183
Merge: f0390d93 c117fa70
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 11 16:10:33 2016 -0500

    Merge pull request #364 from ContinuumIO/makefile-repo
    
    set Makefile to use release/2.19 branch for Repo docs

commit c117fa700da4c33a1f2a771d8312a42c95db7364
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 11 16:09:14 2016 -0500

    set Makefile to use release/2.19 branch for Repo docs
    
    set Makefile to use release/2.19 branch for Repo docs

commit f0390d9329355de045fc30541a9f82c18dac1254
Merge: 0914e09c 6513acd8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 11 14:49:02 2016 -0500

    Merge pull request #362 from ContinuumIO/gitignore
    
    update .gitignore

commit 6513acd8457725123e3d829d19d27339143f15dc
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 11 14:47:03 2016 -0500

    update .gitignore
    
    update .gitignore

commit 0914e09c5cbb903647dd2aac8b59e6d8d8bfc747
Merge: dcbd35be 262fb6c2
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 19:16:08 2016 -0500

    Merge pull request #361 from ContinuumIO/repo
    
    remove repo

commit 262fb6c2f716a4892e779c2c464781536e47aeaf
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 19:14:45 2016 -0500

    remove repo
    
    remove repo (moved to https://github.com/Anaconda-Platform/anaconda-server )

commit dcbd35bebfdbcfe582e5ce5b4ce2a668289a7e92
Merge: d1c4589a 5d08d1c6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 18:04:08 2016 -0500

    Merge pull request #360 from ContinuumIO/html
    
    update html

commit 5d08d1c6dd5fee98f364c8cfae3edc949bd62d2d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 18:03:42 2016 -0500

    update html
    
    update html

commit d1c4589afbe8968ddfba8bf25329bee79cc918c8
Merge: 4af2454a c05dda33
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 18:02:48 2016 -0500

    Merge pull request #359 from ContinuumIO/cloud-repo
    
    move Cloud and Repo docs to anaconda-server repo

commit c05dda3371e567c73d34dc60e615ebd53b869a86
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 10 18:00:50 2016 -0500

    move Cloud and Repo docs to anaconda-server repo
    
    move Cloud and Repo docs to https://github.com/Anaconda-Platform/anaconda-server

commit 4af2454a2cdd83dcb565803382e2dc2029d00e5c
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Mon Aug 8 20:47:44 2016 +0700

    Update README.md
    
    added description of how to correctly remove repository from drupal.

commit 3383713a84fcf65ee71c8113061eb8fef244d2ae
Merge: bfc56667 21ccbb00
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:59:01 2016 -0500

    Merge pull request #225 from ContinuumIO/repo-uninstall
    
    improve repo uninstall instructions

commit bfc56667ec43d8644ab199adc127e8d43412e77f
Merge: f841241e 02c4a2d9
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:53:24 2016 -0500

    Merge pull request #349 from ContinuumIO/cas-mirror-not-free
    
    Add note that it's not free per customer feedback

commit f841241e782552f508b38de294e1ecc28b865947
Merge: 7d666447 206eb0ed
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Fri Aug 5 11:47:32 2016 -0700

    Merge pull request #222 from ContinuumIO/fix/mongodb-auth
    
    Add MongoDB auth/installation instructions to repo docs

commit 206eb0edeb1fcd6e44b57c7119934eb6bb9cf9fd
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Fri Aug 5 11:15:59 2016 -0700

    MongoDB restart required to reload configuration

commit 7d6664479f54f7c5c5467640768a3956f9c757b6
Merge: deee3283 675b4b58
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:09:06 2016 -0500

    Merge pull request #351 from ContinuumIO/html
    
    update html

commit 675b4b58fca2d4ecfc6bfc54bf900b67d88464b2
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:08:38 2016 -0500

    update html
    
    update html

commit deee3283d910661cc8315a1ad08c7847848a7807
Merge: e3b7bd15 8756fdf5
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:03:17 2016 -0500

    Merge pull request #350 from ContinuumIO/cluster
    
    restore cluster docs

commit 8756fdf53477ab928f59c09cdd8cc79be62bd4cb
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 5 13:02:42 2016 -0500

    restore cluster docs
    
    temporarily restore cluster docs

commit 02c4a2d961c54f2246178f788bc8efac041ab1c6
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Aug 5 11:27:00 2016 -0500

    Add note that it's not free per customer feedback
    
    @csoja

commit e3b7bd155a8c47cffc6741f220f180725fc3e862
Merge: bbc0c9ee ed41af51
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 19:46:40 2016 -0500

    Merge pull request #348 from ContinuumIO/html
    
    update html

commit ed41af513d2d6cbd4edcf8107ec02b0f1112d9e9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 19:46:19 2016 -0500

    update html
    
    update html

commit bbc0c9eeef7216842d41cbfb5aaede36db0ff28d
Merge: bf5d7129 9b5c5ff8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 19:17:15 2016 -0500

    Merge pull request #347 from ContinuumIO/cluster
    
    remove cluster docs

commit 9b5c5ff84d1fd8509fae8d5b20c22029d2847733
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 19:15:57 2016 -0500

    remove cluster docs
    
    remove cluster docs

commit bf5d7129d60bce3eccb74aa1c59ac4599dea860e
Merge: 94e04088 1a7c5783
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 4 16:30:40 2016 -0500

    Merge pull request #346 from ContinuumIO/addtl-image2
    
    Additional image2

commit 1a7c5783d33ed50f0bf6cd77990c4963ffcd1214
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 4 16:30:18 2016 -0500

    Additional image2

commit 94e04088c9565385b985674b1ebed17a293422c9
Merge: a4b084ac 65179e2f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 4 16:28:00 2016 -0500

    Merge pull request #345 from ContinuumIO/better-images2
    
    Better images 2

commit 65179e2fb6dddc15c40cb0705239bc5a5d997ad3
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Aug 4 16:19:26 2016 -0500

    Better images 2

commit a4b084aca1e3f1cba91148161b73a3a66e9aab0c
Merge: ad9693c0 c9ad99f9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 16:01:30 2016 -0500

    Merge pull request #344 from ContinuumIO/img-fix
    
    fix image

commit c9ad99f9cb4bcb9e828b4864454efbd603b0b65d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 16:00:59 2016 -0500

    fix image
    
    fix image

commit ad9693c072b95ac4b298cbceafc1fd3920e03fb7
Merge: 110949ea df90e738
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 15:54:25 2016 -0500

    Merge pull request #343 from ContinuumIO/move-img
    
    move new image to image directory

commit df90e7381411f5677f17eabdc6b4344efb1d51b4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 15:53:31 2016 -0500

    move new image to image directory
    
    move new image to image directory

commit 110949eadc658c8e38eb97f62f37d7c556f0d287
Merge: 5759a6fb 1c261c16
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Aug 4 15:29:26 2016 -0500

    Merge pull request #339 from ContinuumIO/adefusco/repo-fixes
    
    AE Repo fixes

commit 5759a6fb1b00ad9d978efc976696d4edc44ee1ae
Merge: 3ef92ae5 7da2b546
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 3 14:19:14 2016 -0500

    Merge pull request #340 from ContinuumIO/upload-conda-env-screenshot2
    
    Add screenshot of upload conda env2

commit 3ef92ae507b5776e85e4abc42fcac35f3be2a591
Merge: 11318318 dfced45f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 3 14:06:46 2016 -0500

    Merge pull request #342 from ContinuumIO/update-html
    
    update html

commit dfced45f1f4ad30c7d02f51319c2d290da47785e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 3 14:06:09 2016 -0500

    update html
    
    update html

commit 11318318c940cec20eb9e787eddeb8529f54128a
Merge: 92a7a467 b9249e08
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 3 14:04:42 2016 -0500

    Merge pull request #341 from ContinuumIO/add-aen-images
    
    add aen images

commit b9249e0810d5788353eaf0a397709dd9efe224fa
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Aug 3 14:03:57 2016 -0500

    add aen images
    
    add aen images

commit 7da2b546418b19dd14823c2c8225fd9c9ef0110a
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Aug 3 13:57:47 2016 -0500

    Add screenshot of upload conda env2
    
    Uploading dup image for build and live processes.

commit 1c261c16295144e7b58a5f58f53b9cbfe09de4f8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 2 19:01:26 2016 -0500

    formatting 2
    
    formatting 2

commit 80a6a9034b543d6c23905bb783807e7278eb1be7
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 2 19:00:11 2016 -0500

    formatting
    
    formatting

commit 3e7ef749857bcf7144103035738f0bf81d7176a9
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:44:25 2016 -0400

    updated Tools pull-down menu for anaconda cloud

commit 16bb5831b38d6579e70511e74e496443662cb502
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:43:59 2016 -0400

    fixed ambiguous reference

commit 819b1e9779fa268aa87281b86a2bb8259cc99737
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:36:41 2016 -0400

    fixed channel priority list

commit 1ec9e59db286529f0b4488d0af3de8ccbd386bd0
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:26:08 2016 -0400

    add condarc priorities

commit 5076455ff3e2313ec0de346ab4477602de95d55b
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:19:23 2016 -0400

    add whitelist/blacklist setup
    
    removed references to cas-mirror

commit b110ef472c98eb877945866c19b3e96a3b0e2e82
Author: Albert DeFusco <albert.defusco@me.com>
Date:   Tue Aug 2 17:07:40 2016 -0400

    Anaconda Repository updates
    
    * change IPython notebook to Jupyter notebook
    
    * remove faq.rst
      * this was for the deprecated cas-mirror tool
      * a new FAQ will need to be written
    
    * updated noarch_exmaple.png for new UI
    
    * removed reference to Miniconda from the cli pages

commit 92a7a4673db3f5c19f2c7975939f05ecc33520d1
Merge: 5c928a73 b69afe8e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 2 15:27:30 2016 -0500

    Merge pull request #338 from ContinuumIO/makefile
    
    fix Makefile for AEN docs

commit b69afe8e572b423f079c69a192b3b84d373b4114
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 2 15:27:00 2016 -0500

    fix Makefile for AEN docs
    
    fix Makefile for AEN docs

commit 5c928a734e1e00ec0b9a5054e02bfd7dce3bd985
Merge: 38bb3763 ba562d2f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Aug 1 12:02:57 2016 -0500

    Merge pull request #316 from ContinuumIO/add-aen-docs
    
    Add aen docs

commit 38bb37637b243df2ddea18181a1fbb4e53696980
Merge: aea79853 77c698fe
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 29 17:00:26 2016 -0500

    Merge pull request #326 from ContinuumIO/blank-bug
    
    address bug with blank line in drop-down menu list

commit 77c698febc9012c21a92a8b6222f26b811614d35
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 29 16:59:00 2016 -0500

    address bug with blank line in drop-down menu list
    
    address bug with blank line in drop-down menu list

commit aea79853098ddf3b3cf10159b41a5628c08129be
Merge: f4ca520d 239ad1f1
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jul 27 16:49:32 2016 -0500

    Merge pull request #322 from ContinuumIO/fusion-images1
    
    Updated images for Fusion

commit 239ad1f1ebeb41d31da1f0b6acef0e4283b0333e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jul 27 14:25:15 2016 -0500

    Updated images for Fusion
    
    SEE https://github.com/ContinuumIO/anaconda-fusion/pull/126
    
    Cropped images for easier readability.

commit f4ca520d3f3acc53f87bf4b5a79cf7c01951c956
Merge: d1b5747c 8d045bfc
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jul 27 14:01:05 2016 -0500

    Merge pull request #310 from ContinuumIO/mosaic-1-3-images2
    
    Revised images for Mosaic 1.3

commit ba562d2f94807a455bb1a8d53cb6a2b7848aa631
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 26 12:12:45 2016 -0500

    anaconda-enterprise-notebooks to ae-notebooks
    
    anaconda-enterprise-notebooks to ae-notebooks

commit d1b5747cbbff431d286e08ba1a85783555bc2440
Merge: e0f3bad4 6cfa95d9
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 25 18:24:28 2016 -0500

    Merge pull request #317 from ContinuumIO/update-adam-img
    
    update adam image

commit 6cfa95d9649d282e7866f771a71264ef13de3da7
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 25 18:23:55 2016 -0500

    update adam image
    
    update adam image

commit 9616df56f18d515e6b7873ddba194ae872c8f21a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 25 17:06:22 2016 -0500

    add aen-docs to toctree
    
    add aen-docs to toctree

commit 3f826e223c5cd267b63c578d01b85a04a76bf1b1
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 22 14:51:25 2016 -0500

    add aen-docs
    
    add aen-docs

commit e0f3bad476e54ca978c7ac28bea4cf53dc1c5fc2
Merge: 1da6285a b53c2021
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jul 22 10:02:10 2016 -0500

    Merge pull request #313 from ContinuumIO/correcting-nbpresent-image
    
    Correcting nbpresent image

commit b53c2021a7baf19aacd6086449e217d8fa8ca8e5
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jul 22 10:01:58 2016 -0500

    Correcting nbpresent image

commit 8d045bfc5342aae51cc24df6b7e2186e3681516f
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jul 21 12:48:34 2016 -0500

    Revised images for Mosaic 1.3
    
    UI changes

commit 1da6285a24d8a0d26a8734b4293b23a1dcc0be0a
Merge: beaa9df5 0d2cdb4a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 20 19:54:56 2016 -0500

    Merge pull request #309 from ContinuumIO/html
    
    update html

commit 0d2cdb4ab2b803c636a9341d8ba06c325a9283b9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 20 19:54:26 2016 -0500

    update html
    
    update html

commit beaa9df5fb3c798b03a6d16eae8faff8e403d929
Merge: d1f0d6ac 39d7f5dc
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 20 19:53:50 2016 -0500

    Merge pull request #308 from ContinuumIO/cli
    
    implement Max's script to produce Cloud CLI page from json help

commit 39d7f5dc04c58f98a2671552ba524b6e64f58e06
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 20 19:52:29 2016 -0500

    implement Max's script to produce Cloud CLI page from json help
    
    implement Max's script to produce Cloud CLI page from json help

commit d1f0d6ac469e447fd1f66bb6fe0e9a5e993c3459
Merge: e2289453 15a01de9
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Jul 19 10:15:14 2016 -0500

    Merge pull request #301 from ContinuumIO/replace-image2
    
    Corrected image

commit e22894534e58cf41e864ada202c17682aafbc65d
Merge: 4b27d2b1 8a817c1e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Jul 19 10:15:00 2016 -0500

    Merge pull request #302 from ContinuumIO/new-editor-image2
    
    New editor image2

commit 4b27d2b1a77d1fef9a98508014bffc0c3d631751
Merge: 01514234 fa17f2aa
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Jul 19 10:14:40 2016 -0500

    Merge pull request #303 from ContinuumIO/another-acloud-image
    
    Another acloud image

commit fa17f2aab6ddcb8394747213cfe6d61458d7ad67
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jul 18 16:35:56 2016 -0500

    Another acloud image
    
    New image to go with better explanatory text.

commit 8a817c1e2f647d970602eeda5c46cb497c489cef
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jul 18 16:18:36 2016 -0500

    New editor image2
    
    Adding a new image about nb editor.

commit 15a01de975e61f867c51901e39cec410843aae9e
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jul 18 15:55:42 2016 -0500

    Corrected image
    
    Highlighting both buttons referenced in text.

commit 01514234b6bac6cfc86db04c973990735baf2e39
Merge: f1a6069c 3fbc2f06
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 18 15:26:14 2016 -0500

    Merge pull request #300 from ContinuumIO/cloud-build-img
    
    restore cloud docs build page images

commit 3fbc2f06e893565bcb09ddd02081a97bb3a53fcc
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 18 15:25:30 2016 -0500

    restore cloud docs build page images
    
    restore cloud docs build page images

commit f1a6069c3b210465b901757596fbdd5d067850b6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 18 14:13:18 2016 -0500

    Update README.md

commit 808010fa3a8c80c03562c88bcbc189fed67f8c62
Merge: ec0e2324 f8a177aa
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 15 18:29:57 2016 -0500

    Merge pull request #299 from ContinuumIO/nb-ext-images
    
    Images for new Jupyter Notebooks Extensions page

commit f8a177aa172b80bb86cd01c0938357e72603c3a7
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jul 15 16:04:13 2016 -0500

    Images for new Jupyter Notebooks Extensions page

commit ec0e2324c9a7fc2c377788eb1a70baed31db7273
Merge: 8f031ae2 a3b22e46
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 16:21:03 2016 -0500

    Merge pull request #296 from ContinuumIO/build
    
    remove images from Anaconda Build section of Anaconda Cloud docs

commit a3b22e466b6c810447506e16c2d3b9e1aa5d6731
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 16:11:32 2016 -0500

    remove images from Anaconda Build section of Anaconda Cloud docs
    
    We have removed the Anaconda Build section of the Anaconda Cloud docs.
    This PR removes the images.

commit 8f031ae2fc9d3cad67aebef3e25daa87ed84a9c5
Merge: f0abdc46 f22f09a1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 13:46:28 2016 -0500

    Merge pull request #294 from ContinuumIO/html
    
    update html

commit f22f09a1ff2e1eec88642df44db12f254d15e880
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 13:45:56 2016 -0500

    update html
    
    update html

commit f0abdc46d5faf43bf414c92807d9dfeba2b7bedb
Merge: 0f247f21 138740a5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 13:42:56 2016 -0500

    Merge pull request #293 from ContinuumIO/adam
    
    add Adam docs

commit 138740a502c4dac0c9ab98d3e8df7221d2ae1e30
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jul 14 13:42:04 2016 -0500

    add Adam docs
    
    add Adam docs

commit 0f247f2179504f7d38e014ce99d4e96e2ce5672f
Merge: b227c454 f62bc879
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 13 15:53:47 2016 -0500

    Merge pull request #291 from ContinuumIO/repo-workflow
    
    fix workflow

commit f62bc87962cb237d05bf92b33a5fc0a80e714924
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 13 15:53:05 2016 -0500

    fix workflow
    
    fix workflow references to wakari, anaconda server

commit b227c45494d218306b56f9031ffb562ccff5a046
Merge: ce43fbbf 04414654
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 13 15:47:24 2016 -0500

    Merge pull request #290 from ContinuumIO/repo-docs-workflow-punctuation
    
    fix workflow punctuation

commit 0441465453bf05b0b23d956173ff1265a22895f3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jul 13 15:46:41 2016 -0500

    fix workflow punctuation
    
    fix workflow punctuation

commit ce43fbbf2c18aef84f44856b294e9f540b8793a0
Merge: 03846e40 afe91d4c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 16:39:32 2016 -0500

    Merge pull request #285 from ContinuumIO/makefile-fix
    
    fix makefile

commit afe91d4ca8614d10a0517269052e4c94eaba3659
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 16:39:10 2016 -0500

    fix makefile
    
    fix makefile

commit 03846e40617a52cfdd10f83717c7a78e857789c2
Merge: 2ef3bdf7 8d843a3d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 16:35:09 2016 -0500

    Merge pull request #266 from ContinuumIO/add-fusion
    
    add Fusion to Makefile

commit 2ef3bdf72e54f5e57ee27228f4dafd17d83799ae
Merge: afba5638 6f981c12
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 14:18:37 2016 -0500

    Merge pull request #283 from ContinuumIO/html
    
    update html

commit 6f981c12fa35a0c46eebbd3f99894fd7f60de35a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 14:18:06 2016 -0500

    update html
    
    update html

commit afba56384f46acd06048d0e34b86bf6c3f3f73fc
Merge: c842ecab c3891dc9
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 14:16:56 2016 -0500

    Merge pull request #282 from ContinuumIO/add-fusion-images
    
    add fusion images

commit c3891dc915c77db53388b511efb6ac8b5738e10e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 8 14:15:45 2016 -0500

    add fusion images
    
    add fusion images

commit c842ecab7a8d370a476b73add5fed9090aba4be4
Merge: 51e446db db01d4c1
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 20:12:01 2016 -0500

    Merge pull request #280 from ContinuumIO/html
    
    update html

commit db01d4c116d93d78388531dc2f393338686e4f9c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 20:11:28 2016 -0500

    update html
    
    update html

commit 51e446db83299bdf475b65acc2ee7cbccfafdee5
Merge: 2cd45b31 40db29dd
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 20:10:25 2016 -0500

    Merge pull request #279 from ContinuumIO/update-conf
    
    update conf.py

commit 40db29dd2223916fafb42c536819514c5ddaffee
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 20:09:32 2016 -0500

    update conf.py
    
    update conf.py

commit 2cd45b3184ef9c5b543a799209d264e4a20428fc
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 20:06:44 2016 -0500

    Update README.md

commit 840e47c3f27e45ae466c827c87518f27eeff0e3e
Merge: aef8e5bd 606a5f71
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 17:39:51 2016 -0500

    Merge pull request #278 from ContinuumIO/makefile
    
    fix Makefile for Accelerate 2.3.0

commit 606a5f7189c9f1afb6fac2d7af018f548cf5d1e8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jul 5 17:39:12 2016 -0500

    fix Makefile for Accelerate 2.3.0
    
    fix Makefile for Accelerate 2.3.0

commit aef8e5bd974e87b6c30771a423ae6e6b9dc5dc2f
Merge: 5e58cff5 43af7497
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 1 13:55:56 2016 -0500

    Merge pull request #276 from ContinuumIO/html
    
    update html

commit 43af7497118617574d8689e0359de56ceb5cdb9c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jul 1 13:55:26 2016 -0500

    update html
    
    update html

commit 5e58cff593b2e934f4aa316cd5ab83ef38ddeb22
Merge: 2b64ed7a 268a8b04
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 30 19:07:45 2016 -0500

    Merge pull request #273 from ContinuumIO/theme-for-offline
    
    new theme for offline documentation version;

commit 2b64ed7add1ab6b49880b1d462178c24c0f91545
Merge: ca4ceed2 2646cff6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 30 18:51:59 2016 -0500

    Merge pull request #275 from ContinuumIO/html
    
    update html

commit 2646cff604502b432a54b24fd88c570f34bd4057
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 30 18:51:25 2016 -0500

    update html
    
    update html

commit 268a8b048463050e058ba30ad4fc92815b086238
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Thu Jun 30 11:37:49 2016 +0700

    new theme for offline documentation version;

commit ca4ceed20652a1805c1811c781c53e0ffdd96d14
Merge: 5c8d159e 19bdfc84
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 29 17:28:24 2016 -0500

    Merge pull request #272 from ContinuumIO/backup-before-updating
    
    Update install.rst

commit 19bdfc84eb945cf678b6452de39c4e59d42fef32
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jun 29 17:23:27 2016 -0500

    Update install.rst
    
    Add IMPORTANT: You must have a tested backup of your installation before starting the update process.

commit 5c8d159ede68d73f5c7d9711ddf09467d75840b3
Merge: 37bbaa88 3680c82b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 29 13:17:35 2016 -0500

    Merge pull request #270 from ContinuumIO/quicklinks
    
    fix quick links

commit 3680c82b20bc699f2e26695eee19d3660bdb5ff6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 29 13:17:00 2016 -0500

    fix quick links
    
    fix quick links

commit 37bbaa88230297f7f4e33f91f003b2d62c288697
Merge: 231acac4 60b933fd
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 29 12:59:18 2016 -0500

    Merge pull request #269 from ContinuumIO/add-update-instructions
    
    Add update instructions

commit 60b933fdabb7d76f5e6d078dab20271de32dc9fb
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jun 29 10:59:29 2016 -0500

    formatting

commit 852714a0bb4fc0fb562bf0f83b76a96e60afb2bc
Author: Kerry Watson <kwatson@continuum.io>
Date:   Wed Jun 29 10:41:13 2016 -0500

    copied update instructions from index

commit 8d843a3da41f150fccce12a7861ccb47ac477d7a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 28 15:30:45 2016 -0500

    add Fusion to Makefile
    
    add Anaconda Fusion docs and repo to Makefile

commit 231acac4717ea0967485da541b09433153816ca9
Merge: ead251ba 87d54403
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 27 15:31:32 2016 -0500

    Merge pull request #263 from ContinuumIO/update-html
    
    update built html

commit 87d54403f07f5bf862d229773efa0168e38fc141
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 27 15:30:58 2016 -0500

    update built html
    
    update built html

commit ead251ba9fa34180d00a0612bd20c6fe8b2dea77
Merge: 69dba8d9 2138fb4d
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 27 14:53:23 2016 -0500

    Merge pull request #262 from ContinuumIO/new-nav-screenshots
    
    new navigator screenshots

commit 2138fb4de9ce0eabb89854424d05ab708cfee8df
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 27 14:52:30 2016 -0500

    new navigator screenshots
    
    new navigator screenshots

commit 69dba8d9768af2cc2f8c94c6fa14e6ea6db5516d
Merge: 9ea20892 09f7c8a5
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 27 13:44:39 2016 -0500

    Merge pull request #258 from ContinuumIO/edit-update-instructions
    
    important code fix per Jeremey Enns

commit 09f7c8a59d636f57387ff62db55a4d6afe7ef819
Author: Kerry Watson <kwatson@continuum.io>
Date:   Mon Jun 27 11:02:20 2016 -0500

    important code fix per Jeremey Enns

commit 9ea2089210f31a3a7a7e8a47e3202d4baf8ee303
Merge: 0ce7f932 c4372fa8
Author: bkreider <github-bk@drrr.net>
Date:   Fri Jun 24 21:06:33 2016 +0200

    Merge pull request #257 from ContinuumIO/add-synch-conda-mirror
    
    clean up old issue 557 on anconda-server

commit c4372fa8a40910111c306e37633257e00061e018
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jun 24 13:59:41 2016 -0500

    clean up old issue 557 on anconda-server

commit 0ce7f9321abe267d1a9c18a642d780c3cfdb892d
Merge: ebcbfb44 4ace5a85
Author: bkreider <github-bk@drrr.net>
Date:   Wed Jun 22 19:17:21 2016 +0200

    Merge pull request #237 from ContinuumIO/ldap-add-admin-edit
    
    LDAP edits per Bradley

commit 4ace5a85219fe255548a8b379a09b4f407db0724
Author: bkreider <github-bk@drrr.net>
Date:   Wed Jun 22 19:16:56 2016 +0200

    Update advanced.rst

commit ebcbfb44092b1bdf908791f499a3a3fba01298ab
Merge: 9d06f0be e4e71f81
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 21 17:23:19 2016 -0500

    Merge pull request #234 from ContinuumIO/cloud-home-image
    
    New image for anaconda cloud home per issue #228

commit 4fbe31770497936f6f7b6caf9cf088c1ec691b0d
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Jun 17 14:17:22 2016 -0500

    edits per Bradley

commit 9d06f0be8adc8150013ae4c382d1ee0b87acf8ef
Merge: 8b45f6e6 631f8769
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 16 17:24:55 2016 -0500

    Merge pull request #235 from ContinuumIO/new-images-managing-acloud
    
    new images for managing anaconda cloud docs page

commit 631f8769feb5d7cd6aff031ab924373218077fdb
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 16 16:41:46 2016 -0500

    new images for managing anaconda cloud docs page

commit e4e71f8109eb5a4166d62783d1a63c875cd81f67
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 16 16:28:36 2016 -0500

    New image for anaconda cloud home per issue #224

commit 21ccbb0056681f92aa40b590b65303133c23d859
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 14 17:41:29 2016 -0500

    improve repo uninstall instructions
    
    improve repo uninstall instructions

commit 8b45f6e6693c8b2cce7c766f6230c7e47ea61aff
Merge: ec3d986d 59d18f01
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 14 14:51:35 2016 -0500

    Merge pull request #224 from ContinuumIO/recent-updates
    
    recent docs updates

commit 59d18f014f67dee4a25edcd0122a7d205d83d575
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 14 14:50:38 2016 -0500

    recent docs updates
    
    recent docs updates

commit 5e768479ffbb86fdc6a8e222712063639a44782e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 14 13:20:21 2016 -0500

    remove semicolon
    
    remove semicolon

commit a08ccc35584fa7efc598cf9a5e9b11e3c669a536
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 14 13:19:00 2016 -0500

    slight tweaks for clarity
    
    slight tweaks for clarity, and using sphinx syntax for internal links

commit 32f1c803015f44d19a8f201a6e48b4a6f0c3f3e5
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Tue Jun 14 11:00:48 2016 -0700

    Add MongoDB auth/installation instructions

commit ec3d986d282760d1fb3297d2658cad1c510f361f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 13 14:58:49 2016 -0500

    Delete tmp

commit 0f177bfde86339e34eb55f0cbd27b7b3e8296253
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 13 14:58:40 2016 -0500

    Create tmp

commit 03998529e4cf7bf8e9e6e140cb954db7a5710096
Merge: 4a633cb2 2917e439
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jun 13 14:45:31 2016 -0500

    Merge pull request #219 from ContinuumIO/fix/user-content
    
    Add user content domain help

commit 2917e439b1e5fc5ae2685710aecf6642c3df900d
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Mon Jun 13 11:01:29 2016 -0700

    Add user content domain help

commit 4a633cb2089b267d71a9d1a6d17575dbdaf28fd0
Merge: e2b38fe0 aa08a38e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 16:00:29 2016 -0500

    Merge pull request #218 from ContinuumIO/short-index
    
    shorter index

commit aa08a38e8bd3937c34d8412dd213a8d1b2c523c8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 16:00:02 2016 -0500

    shorter index
    
    shorter index for offline docs

commit e2b38fe0e7e3efd05e286ffa26227c3c6f260f55
Merge: 24499777 9f74b23a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 15:58:08 2016 -0500

    Merge pull request #217 from ContinuumIO/newindex
    
    new index that doesn't redirect

commit 9f74b23af96be0d890466b0d5c5e77360781c99a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 15:55:28 2016 -0500

    new index that doesn't redirect
    
    new index file that doesn't redirect to another site, for offline
    docs

commit 24499777758bc42eafd6675c0d9c828f58bf7705
Merge: b5f9e59e cb864659
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 15:53:45 2016 -0500

    Merge pull request #216 from ContinuumIO/static-files
    
    add static files for building offline docs

commit cb8646595c0071c392bb64ee9f04af94409bf098
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jun 10 15:51:24 2016 -0500

    add static files for building offline docs
    
    Anaconda Repo airgap installs want to be able to build offline
    docs. Simplest way is to make these static html outputs
    available online in the ContinuumIO/docs repo. The package in
    the Anaconda Repo github repository will just copy them from here.

commit b5f9e59e1d53e0c339db19c0b937155e9821b7e9
Merge: 163d2cae f84cd97f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 9 16:45:40 2016 -0500

    Merge pull request #212 from ContinuumIO/repo-features
    
    discuss repository features

commit f84cd97fea876dfa611175cae93e76ebd5c48354
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 9 16:44:52 2016 -0500

    discuss repository features
    
    discuss repository features

commit 163d2cae3f3707bc4023cbe472ca78a773cf9381
Merge: 02936f62 e37c3c8f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 9 13:16:26 2016 -0500

    Merge pull request #211 from ContinuumIO/issue-203
    
    edits per 203

commit e37c3c8fba37a928c80179da3bca9db2c8b59b70
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu Jun 9 13:07:52 2016 -0500

    edits per 203

commit 02936f62c834b8eb8cd6bfe90eccbfe079bc7a19
Merge: 3ec4ffa8 da07b9ee
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 8 17:15:07 2016 -0500

    Merge pull request #210 from ContinuumIO/anaconda-install-screenshots
    
    add anaconda install screenshots

commit da07b9ee3319a2c47b3ff6bcfa8e56fd374e96cb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 8 17:14:05 2016 -0500

    add anaconda install screenshots
    
    add anaconda install screenshots

commit 3ec4ffa8935c65d6bc783e9584ac630e579edbeb
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 18:23:59 2016 -0500

    swap table for link to spreadsheet
    
    remove table and add link to spreadsheet on google docs

commit 461982a785ef89dca51428552e702ea9b9e56684
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 18:17:29 2016 -0500

    add github repo to live site table
    
    add github repo to live site table

commit b0494edb452bcfa19b3b09bd4592816afcb5f787
Merge: adabedd3 3490c6fa
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 15:03:42 2016 -0500

    Merge pull request #200 from ContinuumIO/fix-changelog-format
    
    fix changelog format

commit 3490c6fac9ced8e589780caee71a60389f753b30
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 15:02:54 2016 -0500

    fix changelog format
    
    fix changelog format: bullet list and double dashes in URL example

commit adabedd3fa7921866394cf067a47fbf5eb6bcc44
Merge: 87ce28ed 315fbe36
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 13:06:47 2016 -0500

    Merge pull request #198 from ContinuumIO/fix-indentation
    
    fix indentation

commit 315fbe36da9f159d23bc65ec741cff1ec9dae477
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 13:06:15 2016 -0500

    fix indentation
    
    fix indentation

commit 87ce28edd39c5ca3e2edb27e43c23162bf31368f
Merge: 95c69a59 10c29949
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 12:57:29 2016 -0500

    Merge pull request #197 from ContinuumIO/repo-2.18
    
    update repo docs for 2.18 release

commit 10c29949d0bfb180cbf3e528955bc136665667b9
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 12:56:17 2016 -0500

    update repo docs for 2.18 release
    
    update repo docs for 2.18 release

commit 95c69a5940bcbdc50bbb2003171bf751c650d800
Merge: de411413 3aa2f389
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jun 2 12:41:01 2016 -0500

    Merge pull request #196 from ContinuumIO/srossross-patch-1
    
    Update changelog.rst

commit 3aa2f389c3fe3d4d5a23f5a56961bc5cacaaca37
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Thu Jun 2 11:17:53 2016 -0400

    Update changelog.rst

commit de411413fe1fc101c0c30e193d147ceb3b1c299e
Merge: fb76df02 174d3ea2
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 1 17:29:22 2016 -0500

    Merge pull request #194 from ContinuumIO/link-to-cloud-docs
    
    link to cloud docs

commit 174d3ea2240809832290dd47e6f4edf8aad392e8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jun 1 17:28:51 2016 -0500

    link to cloud docs
    
    link to cloud docs

commit fb76df0255ffccc7364bb16c21139f2d8ca47023
Merge: 8b608e27 aec44c5a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 31 15:01:45 2016 -0500

    Merge pull request #193 from ContinuumIO/add-navpandas-images
    
    add navigator pandas tutorial images

commit aec44c5a4c74f4597cf4f99a7b5bcdec4e6e839e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 31 15:00:37 2016 -0500

    add navigator pandas tutorial images
    
    add navigator pandas tutorial images

commit 8b608e27d61d79bf8aebfb60aa0925177c46e327
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 31 13:39:46 2016 -0500

    fix numbapro install for docs env
    
    Make numbapro install in docs env "--no-deps" so it doesn't hold back the version of accelerate.

commit 4bf98cb91475d2c6d3a76304381d1599a9641154
Merge: 396e0899 5756766e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 31 13:25:25 2016 -0500

    Merge pull request #191 from ContinuumIO/clean-up-index
    
    clean up index

commit 5756766ee3ce985e809ca3af66d9b922c8881f74
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 31 13:23:55 2016 -0500

    clean up index
    
    normally we redirect away form the index anyway, but this cleans
    up that page so it's a bit better when building an offline copy
    of the docs for enterprise customers. "Anaconda Server" is changed
    to "Anaconda Repository" and the link is fixed.

commit 396e08997b8e003d777243beee98424c670968e4
Merge: 0ee50688 384a5a9d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 27 16:08:08 2016 -0500

    Merge pull request #188 from ContinuumIO/move-cloud
    
    move cloud docs from /anaconda/cloud to /anaconda-cloud

commit 384a5a9d2821c64681f71b55d7dff16f6c8fe54b
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 27 16:06:51 2016 -0500

    move cloud docs from /anaconda/cloud to /anaconda-cloud
    
    move cloud docs from /anaconda/cloud to /anaconda-cloud

commit 0ee5068834036a24bcea2a266dadacd70c15203a
Merge: 093bfcfe 8f41029a
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Thu May 26 14:28:56 2016 -0700

    Merge pull request #185 from ContinuumIO/license-tips
    
    tips per dsludwig suggestions

commit 8f41029aa3df4ebe52ebdffdfd2fe56bc8c97930
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu May 26 16:14:00 2016 -0500

    tips per dsludwig suggestions

commit 093bfcfe111d77013dc7dcb5479fb11deb2320a0
Merge: bc94029d e86eac54
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 26 14:53:10 2016 -0500

    Merge pull request #184 from ContinuumIO/add-cloud-docs
    
    add cloud docs

commit e86eac54b68f54e2354329a471396a2f1616024a
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 26 14:52:44 2016 -0500

    add cloud docs
    
    add cloud docs

commit bc94029d02f53002d32719b3d0479bec04d28b95
Author: Geri Ochoa <gochoa@continuum.io>
Date:   Tue May 24 14:11:52 2016 -0500

    Mosaic Images
    
    Images for the Mosaic user guide

commit 300c62ffe03a9cc26bd200b788c30c8275737c93
Merge: b38c7a70 e665ae2f
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 24 13:51:16 2016 -0500

    Merge pull request #177 from ContinuumIO/rm-pyslalib
    
    remove pyslalib folder

commit e665ae2f91043a816d8ad607c905bf6919ccf557
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 24 13:50:23 2016 -0500

    remove pyslalib folder
    
    remove pyslalib folder

commit b38c7a70274d6dcb804411a8e4363cc8af8d8732
Merge: 62216058 0bedea67
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 17 16:18:25 2016 -0500

    Merge pull request #159 from ContinuumIO/add-pyslalib-recipe
    
    copy pyslalib recipe

commit 0bedea673c8b387f8500e5f4b8e402b9244f635d
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 17 16:16:35 2016 -0500

    copy pyslalib recipe
    
    copy pyslalib recipe

commit 622160588c5f69138b5b24fb3525a22a8f65e5a4
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 13 16:05:25 2016 -0500

    Update README.md

commit d0fc2d04ae034b316d50ca5f8a86618ea19bb65e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 13 16:03:58 2016 -0500

    Update README.md

commit 40f16de41c30cc7d9f9f0f3a88b46a77aa97368e
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 13 16:02:26 2016 -0500

    Update README.md

commit c25576e71aff1750f98ad51bd8d4a8f929f36a70
Merge: 273c0d6a ed8811c7
Author: Will Warner <electronwill@gmail.com>
Date:   Tue May 10 13:30:50 2016 -0500

    Merge pull request #145 from ContinuumIO/set-default-repo-system-wide
    
    add instructions to set default repo for whole system

commit ed8811c7e2f4e17a33fff4bc7b5e7616cf9ee474
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 9 14:44:28 2016 -0500

    rephrase for clarity
    
    rephrase for clarity

commit 3800a1411d195b483677899e13c060f30b712b38
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 9 14:38:49 2016 -0500

    note sys level config only used if user level config not found
    
    note that sys level config is only used if user level config file
    is not found.

commit ece311921a44e93e0100506fb1b00c985f81ab77
Author: Will Warner <electronwill@gmail.com>
Date:   Fri May 6 19:09:50 2016 -0500

    add instructions to set default repo for whole system
    
    add instructions to set default repo for whole system

commit 273c0d6ae7839230668f5964a29263bda9a43c17
Author: Kerry Watson <kwatson@continuum.io>
Date:   Thu May 5 15:27:30 2016 -0500

    Update README.md
    
    @electronwill please review and edit or merge.

commit 18ffe0b8deb617f2338e32913eccdf4650372a47
Merge: fb3618a6 b2ad87a2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 5 14:41:15 2016 -0500

    Merge pull request #144 from ContinuumIO/update-mkl
    
    Update mkl

commit b2ad87a258ff5d2ea96b382cd1143aca30faf34e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 5 14:38:02 2016 -0500

    'conda install anaconda=4.0' to 'conda update anaconda'
    
    'conda install anaconda=4.0' to 'conda update anaconda'

commit 60363bc0b823730adef817d404542bf9e53a2d49
Author: Will Warner <electronwill@gmail.com>
Date:   Thu May 5 14:12:46 2016 -0500

    update with example error message and to indicate 2.5 is not latest
    
    update with example error message for expired licenses, and to indicate
    that 2.5 is no longer the latest version of Anaconda.

commit fb3618a602968701414f5b933096fb1eb122890c
Merge: 260c8369 64f3d114
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 2 14:45:17 2016 -0500

    Merge pull request #136 from ContinuumIO/launcher-deprecation
    
    improve launcher deprecation notice

commit 64f3d1147f5a2287873bb66cf7d980daa0cc83b6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon May 2 14:43:34 2016 -0500

    improve launcher deprecation notice
    
    improve launcher deprecation notice by adding note that launcher
    and navigator may be installed harmlessly beside each other for
    users who have upgraded, and adding uninstall instruction

commit 260c8369234831eadb77114807adefdb54860a2c
Merge: 97a22934 325c1ec8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 29 16:12:03 2016 -0500

    Merge pull request #135 from ContinuumIO/remove-aetrial-link
    
    remove ae trial link from sidebar

commit 325c1ec85b14cf81c0678c2375a4adec9f0b7882
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 29 16:11:08 2016 -0500

    remove ae trial link from sidebar
    
    remove ae trial link from sidebar. kerry explained today that we
    want the ae trial docs to be visible only to people with the direct
    link.

commit 97a2293430717a763035989af6bc667095684375
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 28 12:38:06 2016 -0500

    Update README.md

commit 789739ad96fb360012a1dfc7666cf89b999c03e1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 28 12:37:27 2016 -0500

    Update README.md

commit 00b978b6d61e6dfa22e3766aaad257f1664c9e7c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 28 12:36:53 2016 -0500

    Update README.md

commit 52acf2cfad568ccde297b4183340a1328600c051
Merge: 29b583a4 6ad9dfb9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 17:25:44 2016 -0500

    Merge pull request #133 from ContinuumIO/mkl-eula
    
    clarify Anaconda vs MKL EULA for MKL

commit 6ad9dfb9bda38b0a481dad59f59d345a28180341
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 15:41:32 2016 -0500

    note that past MKL versions were available separately
    
    note that past MKL versions were available separately from Anaconda

commit e93ef1c95ea6822910e87c94ea004a400efd0194
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 15:38:17 2016 -0500

    clarify that current MKL Opt versions use Anaconda EULA, past versions MKL EULA
    
    clarify that current MKL Opt versions use Anaconda EULA, past versions MKL EULA

commit 29b583a41bb9d88ace2771bbfd3583b3b30b588f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 13:45:12 2016 -0500

    Update README.md

commit c79fa5ff524c10ea4614cf0d9e4ebb2565aa53f8
Merge: 94d5e648 2ea84b74
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 13:28:42 2016 -0500

    Merge pull request #130 from ContinuumIO/legnth
    
    legnth to length in manual_select.png

commit 2ea84b74f37be8ddc8897ad75e207c9909270ed7
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 13:27:58 2016 -0500

    legnth to length in manual_select.png
    
    legnth to length in manual_select.png

commit 94d5e6482661cdbee05ff936ac404cbe9a576bcd
Merge: 2f358be6 3252a7ac
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 13:24:26 2016 -0500

    Merge pull request #128 from ContinuumIO/mosaic-to-dataportal
    
    change mosaic to dataportal in Makefile

commit 3252a7ac990e6a887f2c25948fb838ef834e2145
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 13:11:31 2016 -0500

    change mosaic to dataportal in Makefile
    
    change mosaic to dataportal in Makefile

commit 2f358be6c5409e92c4d4a0c10fd228c9eca937c8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 27 12:19:25 2016 -0500

    Update README.md

commit 3a164abc0e80d9ab2a39a9fbf06fa6e513ed1066
Merge: ffb8e05c dd766695
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 26 14:13:35 2016 -0500

    Merge pull request #111 from ContinuumIO/link-from-repo-docs-to-cloud-docs
    
    add link from repo docs to cloud docs

commit dd766695c25f1d247cc4217e57e371da65cff7d8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 26 14:10:55 2016 -0500

    add link from repo docs to cloud docs
    
    The repo docs cover administration, but the cloud docs cover use of
    both anaconda cloud and anaconda repo. So, this PR adds a "user
    guide" link from the repo docs to the cloud docs.

commit ffb8e05cae039252e91635ea8983c946452d27bd
Merge: 2ece198c 8c23af92
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 26 12:14:53 2016 -0500

    Merge pull request #110 from ContinuumIO/fix-mkl-eula
    
    fix MKL EULA

commit 8c23af92e02411f552a4f6ed862afea2ee9b3e7c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 26 12:13:39 2016 -0500

    fix MKL EULA
    
    fix MKL EULA: it is now covered by the Anaconda EULA, and now free
    for everyone instead of just having a free 30 day trial.

commit 2ece198c52f318b032600481d269b625d1173723
Merge: dba7a914 7709e5ed
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 25 14:18:50 2016 -0500

    Merge pull request #103 from ContinuumIO/release-2.17
    
    2.17 release

commit dba7a9146478b3738de8f48a26ce3eaf0630f0f5
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 22 14:13:49 2016 -0500

    Update README.md

commit 61bcef2a1ad24126eaf9581de2e70b2973939297
Merge: 75de8608 8e272b4f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 22 13:42:02 2016 -0500

    Merge pull request #105 from ContinuumIO/add-aetrial
    
    add aetrial

commit 8e272b4fbb30638221ab106be3e98fdeb5bb407f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 22 13:37:54 2016 -0500

    add aetrial
    
    add aetrial

commit 75de8608ed2943d3dd8bb8f3d3bf8efe23a50d72
Merge: 81657d70 a236d3ea
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 21 12:41:04 2016 -0500

    Merge pull request #101 from ContinuumIO/ldap-config
    
    add ldap config option info

commit 81657d70672176abab8b24c9cbab7b41d5c062cb
Merge: 602a435c 6be0b3b3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 14:13:42 2016 -0500

    Merge pull request #104 from ContinuumIO/remove-testhere
    
    remove testhere

commit 6be0b3b3adb974092f4b4bee34a9db2c698402eb
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 14:12:33 2016 -0500

    remove testhere
    
    remove testhere

commit 7709e5edc9cfeb9acc6f9ba4210ad7455908d90e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 13:29:47 2016 -0500

    add 2.17 update instructions to changelog
    
    add 2.17 update instructions to changelog

commit 8c448928cbf4aca7ce1cd0b20f68ef975fadc02e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 13:27:51 2016 -0500

    2.17 release
    
    2.17 release

commit 602a435cde7e561b161cb304e0f630959db8c7ab
Merge: cd46744c becf0968
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 12:59:06 2016 -0500

    Merge pull request #102 from ContinuumIO/fix-past-update-instructions
    
    add update instructions for past versions to changelog

commit becf0968e64dc72a521146490b9438305f89723d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 20 12:57:45 2016 -0500

    add update instructions for past versions to changelog
    
    add update instructions for past versions to changelog

commit a236d3ea3c260d044269c009faa55890107ce0cd
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 19 15:46:47 2016 -0500

    remove comma
    
    remove comma from yaml file, which was a typo

commit 78b770b375974dd4df24b757658a5e37c0ea5e88
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 19 14:10:03 2016 -0500

    add ldap config option info
    
    add ldap config option info

commit cd46744c34714f5c788cf25e4b840456a688c6fe
Merge: 982f9d83 dff47da5
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 19 12:18:27 2016 -0500

    Merge pull request #100 from ContinuumIO/fix-underlines
    
    fix underlines

commit dff47da58ee45e2c57a5c5531fbda2a0f35f1a6c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 19 12:17:56 2016 -0500

    fix underlines
    
    fix underlines

commit 982f9d83a196629bea3cf5f52a6fcd5e433d1a38
Merge: 32b86737 76e4e9cf
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 19 12:15:43 2016 -0500

    Merge pull request #99 from ContinuumIO/repo-2.16.9
    
    Update CHANGELOG for Anaconda Repository 2.16.6

commit 76e4e9cfdee7762a7654dced16e5be92169d1a40
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Tue Apr 19 09:49:26 2016 -0700

    Update CHANGELOG for Anaconda Repository 2.16.6

commit 32b86737e7bc7318fcaa8ecb0371cbcde59d484c
Merge: 76d063e7 674c024f
Author: maxgamurar <maxgamurar@users.noreply.github.com>
Date:   Tue Apr 19 09:24:29 2016 +0700

    Merge pull request #97 from ContinuumIO/simplified-theme
    
    Simplified theme

commit 76d063e7cd67fb9a5e8883e449b93053b20e8452
Merge: 724fbb14 06be919f
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 18 16:02:57 2016 -0500

    Merge pull request #98 from ContinuumIO/dedupe-mosaic
    
    keep anaconda/mosaic, remove anaconda-mosaic

commit 06be919fea32f2612eb9066226df11f1b02a2021
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Apr 18 16:01:44 2016 -0500

    keep anaconda/mosaic, remove anaconda-mosaic
    
    de-duplicate mosaic docs by keeping anaconda/mosaic and not anaconda-mosaic

commit 674c024ffb28c210483b556c097b3f68739f7e14
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Apr 18 11:53:12 2016 +0700

    removed TOC heading;

commit 42806548c08e3d42629888ad58de9036bb193039
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Mon Apr 18 11:52:16 2016 +0700

    new theme to suck content for drupal mod only;

commit 724fbb14e37bae657bcfeda93ff6d867bd9fb057
Merge: d6d9b9a2 25b26dea
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 15 18:28:24 2016 -0500

    Merge pull request #96 from ContinuumIO/add-dir-test
    
    add test of new root directory module

commit 25b26deac5b641678a706f7425a9d8428a07cdb7
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 15 18:27:45 2016 -0500

    add test of new root directory module
    
    add test of new root directory module

commit d6d9b9a26639ef148ce9e00eef87af229d10b4b0
Merge: 453f2033 fbf5b1b2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 17:41:08 2016 -0500

    Merge pull request #95 from ContinuumIO/add-test-mosaic
    
    add test copy of Mosaic

commit fbf5b1b24c04598cf16995f9fe11b91d936be7b1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 17:40:06 2016 -0500

    add test copy of Mosaic
    
    add test copy of Mosaic at docs.continuum.io/anaconda/mosaic/index
    as well as normal copy at docs.continuum.io/anaconda-mosaic/index

commit 453f203385f3fc49dd952a2efe353b16b4cbded1
Merge: e82dd392 799ad19e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 13:49:27 2016 -0500

    Merge pull request #94 from ContinuumIO/fix-nav-link
    
    fix link to Navigator in Launcher docs

commit 799ad19e2aa87b5c4de6ae1d4420101d4115229f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 13:48:13 2016 -0500

    fix link to Navigator in Launcher docs
    
    fix link to Navigator in Launcher docs now that Navigator is part
    of rst pages.

commit e82dd39202888618062d617bb5d12e85dc0b800f
Merge: 067abdbf f01bd0fe
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 13:11:00 2016 -0500

    Merge pull request #93 from ContinuumIO/add-nav-images
    
    add images for new navigator docs

commit f01bd0fe2e53e3a0e06cb852a6da9d5b4ac4649c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Apr 14 13:10:14 2016 -0500

    add images for new navigator docs
    
    add images for new navigator docs

commit 067abdbf15829d296d68287d0bc9ad9e153d9417
Merge: e4c7d17f 7dd5bc46
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 18:43:56 2016 -0500

    Merge pull request #92 from ContinuumIO/update-readme
    
    update README

commit 7dd5bc46c96a56cffc731272bfe26f96370cccb8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 18:42:57 2016 -0500

    update README
    
    update README, including using 'conda create' and no environment file.

commit e4c7d17fe2e36b6e97cd1fb58607fd147a45f727
Merge: 70e34930 c3f11b68
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 17:16:10 2016 -0500

    Merge pull request #91 from ContinuumIO/add-img
    
    add images

commit c3f11b6848e5053a686b6ce025872028c3c3f318
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 17:15:28 2016 -0500

    add images
    
    add images

commit 70e34930a01067dde507f928b5b860b7ccc0b3f3
Merge: 410fa849 f8ef1bb6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 13:53:01 2016 -0500

    Merge pull request #90 from ContinuumIO/add-mosaic-to-gitignore
    
    add mosaic to gitignore

commit f8ef1bb6d73a2c3b8d3cb5225ffce9ccae47d4f0
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Apr 13 13:52:31 2016 -0500

    add mosaic to gitignore
    
    add mosaic to gitignore

commit 410fa849328921f5ad474904320ac266a6538d17
Merge: b19a4967 ac9e416e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 12 15:31:38 2016 -0500

    Merge pull request #89 from ContinuumIO/anaconda-mosaic
    
    change anaconda/mosaic to anaconda-mosaic

commit ac9e416e417793284496c2404852a128d2d1c255
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 12 15:30:55 2016 -0500

    change anaconda/mosaic to anaconda-mosaic
    
    change anaconda/mosaic to anaconda-mosaic, see if it fixes our bad
    links

commit b19a496759b01f5db06c383cceab959e3a9bbc1c
Merge: c1988f2b b96c14bd
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 12 15:18:51 2016 -0500

    Merge pull request #88 from ContinuumIO/deprecate-launcher
    
    add deprecation notice to launcher page

commit b96c14bd3e2afffdf21ea4dc2dd36013fd226100
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 12 15:16:49 2016 -0500

    add deprecation notice to launcher page
    
    add deprecation notice to launcher page

commit c1988f2bbf2c2d36115c641a0e47838506e22551
Merge: ca396c75 6d2f4c89
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 8 16:07:05 2016 -0500

    Merge pull request #87 from ContinuumIO/add-dataportal
    
    add dataportal repo and Mosaic project to docs

commit 6d2f4c8902140ddeca8c0413ac8e2500a7961052
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Apr 8 16:05:52 2016 -0500

    add dataportal repo and Mosaic project to docs
    
    add dataportal repo and Mosaic project to docs

commit ca396c755b2c1c530846d46d11572c8222232f40
Merge: cb781770 92bc0c7b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 14:33:07 2016 -0500

    Merge pull request #86 from ContinuumIO/platforms
    
    option name is platforms not platform

commit 92bc0c7b53e7201d5e8159369c2ae298f749dfc3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 14:31:02 2016 -0500

    option name is platforms not platform
    
    option name is platforms not platform

commit cb781770d4589d44baaa091c81badb4a813b6701
Merge: 67e904e4 9aba9b8c
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 13:31:40 2016 -0500

    Merge pull request #85 from ContinuumIO/fix-img-2
    
    fix image ref part 2

commit 9aba9b8cfdb9c45c0c8ca73554995e9e61be0782
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 13:30:45 2016 -0500

    fix image ref part 2
    
    re-fix: since noarch-packages.rst is on top level, ../../img is now
    just img.

commit 67e904e43e8647220e427149807c539359a0ad75
Merge: dfc96e4b 1d30590d
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 13:28:59 2016 -0500

    Merge pull request #84 from ContinuumIO/fix-image
    
    fix image reference

commit 1d30590daaa27551c52a3a13204e08c6fd263efe
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Apr 5 13:28:09 2016 -0500

    fix image reference
    
    fix image reference-- noarch-packages.rst is now at the top level,
    so ../../img is now ../img

commit dfc96e4b0556d368570793a6e3ebf70561929842
Merge: 62650f0e 9e08b9bd
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 31 13:01:38 2016 -0500

    Merge pull request #83 from ContinuumIO/fix-tocs
    
    fix tables of contents for anaconda-server -> anaconda-repository

commit 9e08b9bdf88822fd27f410bff0c8b8b9691f6ff6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 31 13:00:40 2016 -0500

    fix tables of contents for anaconda-server -> anaconda-repository
    
    fix tables of contents for anaconda-server -> anaconda-repository

commit 62650f0e0a7b0ca0236974cde3afa54f732cab9f
Merge: 26e9e2b2 4974f3b6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 31 12:56:55 2016 -0500

    Merge pull request #82 from ContinuumIO/fix-makefile
    
    fix Makefile for anaconda-server -> anaconda-repository

commit 4974f3b6310baf59c9551664be71b547baf433f8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 31 12:56:06 2016 -0500

    fix Makefile for anaconda-server -> anaconda-repository
    
    fix Makefile for anaconda-server -> anaconda-repository

commit 26e9e2b29998354a08147433238fb1aa55a5b214
Merge: f2ebf333 4e41928d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 30 21:10:19 2016 -0500

    Merge pull request #79 from ContinuumIO/change-urls
    
    change URLs

commit 4e41928d4faa491d44f609066e831f6f0fb4aae9
Merge: 7030d5d7 f2ebf333
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 29 15:27:40 2016 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs into change-urls

commit f2ebf333df0e07d302c18c23667b8d0887ebb1b8
Merge: 7134569d 55faf9c8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 29 15:25:12 2016 -0500

    Merge pull request #81 from ContinuumIO/add-repo-config
    
    add info about repo config files

commit 55faf9c858bd652ffd15dc926f2ce96fe7e9be89
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 29 14:56:50 2016 -0500

    add info about repo config files
    
    add info about repo config files from @dsludwig in
    https://github.com/ContinuumIO/docs/issues/80

commit 7030d5d7727dc7622fdb23225dd2decc5036b390
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 22 12:00:13 2016 -0500

    new directory name is anaconda-repository
    
    new directory name is anaconda-repository

commit 2dcdcfa776030ecb2c722ea6bac88632df7f7230
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 21 17:46:07 2016 -0500

    change URLs
    
    change URLs. do not merge yet-- currently using placeholder
    'new-directory-name' instead of repository or anaconda-repository
    or anaconda-enterprise-repository or similar.

commit 7134569d9e1f4b1aa279f8bca860443deee04557
Merge: 85275d20 add07e21
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 21 14:54:17 2016 -0500

    Merge pull request #78 from ContinuumIO/add-mkl-uninstalling-header
    
    add MKL uninstallation header

commit add07e21717bf42dbc47f694544ec28e2859b447
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Mar 21 14:53:40 2016 -0500

    add MKL uninstallation header
    
    add MKL uninstallation header

commit 85275d20d4c8fa74da38ac4f1958e547e74727c3
Merge: e705514b 53022aee
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 16 14:16:16 2016 -0500

    Merge pull request #77 from ContinuumIO/kerberos-correction
    
    fix code blocks

commit 53022aee72c0758666df964d409f440e89e5f59d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 16 14:15:42 2016 -0500

    fix code blocks
    
    fix code blocks

commit e705514bab49b37849bb5548dda28731540ac055
Merge: 7df6de88 37c86852
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 16 14:07:19 2016 -0500

    Merge pull request #49 from ContinuumIO/feature/kerberos
    
    Start Kerberos docs

commit 7df6de88d8ad32dcc4bb1b5bbf7af29a5eb8a91a
Merge: 114f6e35 f850d86d
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 15 15:40:57 2016 -0500

    Merge pull request #75 from ContinuumIO/mkl-updates
    
    fix MKL docs to reflect current licensing and common errors

commit f850d86df7e149284a24dbf6ea380d55ddf55ae9
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 15 15:36:37 2016 -0500

    fix MKL docs to reflect current licensing and common errors
    
    fix MKL docs to reflect current licensing and move information on
    common errors from Anaconda FAQ to MKL page

commit 114f6e35b6356180b088e29a4a7750b9b2cb0197
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 10 19:30:49 2016 -0600

    Update layout.html

commit 1781b4537063085f51764a612f4d33a111c03ac5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 9 19:55:37 2016 -0600

    Update README.md

commit 44f2a506ecefec37349434ea5abfccd76e2e82ef
Merge: f945961e 4e889abe
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 8 18:51:09 2016 -0600

    Merge pull request #73 from ContinuumIO/remove-advanced-install
    
    remove advanced install instructions

commit 4e889abe6133ff963be4cccb53ea8f2a51fbcf49
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Mar 8 18:49:48 2016 -0600

    remove advanced install instructions
    
    make the advanced install instructions part of the Drupal site as
    HTML, and not an rst page.

commit f945961e69207d91dc1a34018cefa89fa2ed66be
Merge: c6fc8693 75d58aea
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 4 13:49:06 2016 -0600

    Merge pull request #72 from ContinuumIO/fix-index
    
    fix index

commit 75d58aeac0bd7a4da5628bfecd970c1967fd49f1
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Mar 4 13:48:10 2016 -0600

    fix index
    
    fix index items and formatting

commit c6fc8693ef0b9c3177e0b73fe01b84943e2407d1
Merge: 4ab2dd48 065b8870
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 3 16:36:19 2016 -0600

    Merge pull request #71 from ContinuumIO/anaconda-repo
    
    change 'repository' to 'anaconda repository' in sidebar

commit 065b88702b73d0cd96b072bbcf9060ccd5d22eb4
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 3 16:35:31 2016 -0600

    change 'repository' to 'anaconda repository' in sidebar
    
    change 'repository' to 'anaconda repository' in sidebar

commit 4ab2dd486722f3d8bafa09c313be1db9a2fe35f6
Merge: 3ffe669a 12aba1c1
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 3 13:15:06 2016 -0600

    Merge pull request #70 from ContinuumIO/fix-index
    
    fix index

commit 12aba1c1e37ad6f4c44a40480afe5a731638c1c8
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Mar 3 13:14:20 2016 -0600

    fix index
    
    fix index-- mistakenly left in a :class: tag on the open source
    header when working on it yesterday.

commit 3ffe669a87c3887cbf2d0c17fc34200dace7ca55
Merge: db46de72 811ad82a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 2 20:00:25 2016 -0600

    Merge pull request #69 from ContinuumIO/change-header-link
    
    change header link

commit 811ad82a18ee8b3acc02066699863e988262dfb3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 2 19:59:28 2016 -0600

    change header link
    
    the "Anaconda Platform" header now links to the same destination as
    "Welcome" and not the same destination as "Anaconda".

commit db46de722887452c7b2ae34e2c62b205ec0c5ee2
Merge: b49b7597 3e79bf7a
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 2 14:15:41 2016 -0600

    Merge pull request #68 from ContinuumIO/contents-and-no-ashiba
    
    fix table of contents and remove ashiba

commit 3e79bf7adefa410f0793790a0939b6ff4fa73b6f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 2 14:14:44 2016 -0600

    fix table of contents and remove ashiba
    
    fix table of contents and remove ashiba

commit b49b75970fcba5d62d2b6a0ab53f7a03c3d818e8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Mar 2 13:13:32 2016 -0600

    Update README.md

commit 37c86852bc09102b352fd25e4c07d00be7b7cf66
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Fri Feb 26 12:43:26 2016 -0800

    Update advanced.rst
    
    ktpass flag is `-pass`, not `-password`

commit d0d1f2b56982f7288dd1b83d37be750744b70853
Merge: 18a2f137 09ebc539
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 26 14:00:14 2016 -0600

    Merge pull request #67 from ContinuumIO/update-front-page
    
    fix front page for 2.16 update

commit 09ebc5391dee88087e2d9ac2086c05af177db076
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 26 13:59:41 2016 -0600

    fix front page for 2.16 update
    
    fix front page for 2.16 update

commit 18a2f13779d87aea741073b7c72abec3438e45c5
Merge: 5b51d8fe c372d157
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 26 13:53:33 2016 -0600

    Merge pull request #66 from ContinuumIO/release2-16
    
    update front page for anaconda repo 2.16

commit c372d1578546ca27e7847f2f5e06555e8e749389
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 26 13:52:10 2016 -0600

    update front page for anaconda repo 2.16
    
    update front page for anaconda repo 2.16

commit 5b51d8fe0ed5ed095d8a678670a634a3e5924b0f
Author: Rafael Hoffmann de Barros <rafaelhdebarros@gmail.com>
Date:   Thu Feb 25 11:32:15 2016 -0600

    update changelog 2.16

commit 4d1c5bb6cfda12785de54e8af026fad74d249089
Merge: f90e79ff a6f3e14d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 24 10:22:37 2016 -0600

    Merge pull request #63 from ContinuumIO/fix-cas-installer
    
    fix cas-installer

commit 71a637c4f634f01318b0619cd8c3cf3b994b977c
Merge: ea1b01c9 c57c5cf9
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Tue Feb 23 10:16:14 2016 -0800

    Merge pull request #59 from ContinuumIO/kerberos-spelling-qa
    
    Spelling and qa edits

commit ea1b01c9c91d7e65167f974e19b49a85f64b234c
Merge: 169e983f f90e79ff
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Tue Feb 23 10:13:28 2016 -0800

    Merge branch 'master' into feature/kerberos

commit a6f3e14df9a792a4d2edee76a6cc6298e948ceb6
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 22 17:20:00 2016 -0600

    customer should already have token
    
    fix from Duane: indicate that customer should already have token.

commit 2c60b32ea4387510b653057cde87c65b88b6a23b
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 22 16:54:28 2016 -0600

    this tools -> this tool
    
    small grammar fix

commit 9de95861608807c7a310ad495a6ac8965963548e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 22 16:53:03 2016 -0600

    fix cas-installer
    
    fix cas-installer instructions by clarifying token handling and
    adding correct channel.

commit f90e79ff6ba75c57de3d02b9c5ceee784bbe12c6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 19 15:53:38 2016 -0600

    Update README.md

commit a0f89845e16261779834d6ef8496f89605d245a4
Merge: 1136f25b 5772c16b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:20:41 2016 -0600

    Merge pull request #62 from ContinuumIO/remove-binstar-static
    
    remove binstar-static

commit 5772c16bb335c9569cbef56bebb9c9f9eb919ba3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:20:09 2016 -0600

    remove binstar-static
    
    remove binstar-static-- it was merged into binstar-server

commit 1136f25bb2e8605fad024ec2cd55b65899eb6f6e
Merge: bd9c5b92 d019c1e4
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:16:55 2016 -0600

    Merge pull request #57 from ContinuumIO/dsludwig-patch-1
    
    Remove reference to binstar-static

commit bd9c5b92356bced2c954b10063f8ff8302bfd3ed
Merge: 9936ebf0 4cbd0dc1
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:12:27 2016 -0600

    Merge pull request #61 from ContinuumIO/local-user
    
    Local user

commit 4cbd0dc19c99fdd9f8b0c2a0b7e25c2367257684
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:12:04 2016 -0600

    fixes
    
    fixes

commit 9936ebf00cfd8ff9cf053d75f6f59fa95314baf5
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:07:25 2016 -0600

    Update README.md

commit 50a43cec8e908a2dcafa0960c82490746b6855c8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:02:44 2016 -0600

    more fixes
    
    more fixes

commit 05760ed4a71338d68b7ee545e4c35ca7d17ae97f
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 18:00:47 2016 -0600

    fix local user wording
    
    fix local user wording

commit 2efdf871d992431d5ba8024b50fba2c45a987ae4
Merge: 37ebcd27 34eda088
Author: Nicholas Pierotti <npierotti@continuum.io>
Date:   Wed Feb 17 17:42:53 2016 -0600

    Merge pull request #60 from ContinuumIO/fix-config
    
    fix config file

commit 34eda0884f8a776bfae351824f888098161e1fc2
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 17:37:23 2016 -0600

    Update configuration.rst

commit 947c2b3d1ab70de1f3b12d5341eadc8fb85e0978
Author: Nicholas Pierotti <npierotti@hq-dhcp-20-158.corp.continuum.io>
Date:   Wed Feb 17 17:34:28 2016 -0600

    fix config file
    
    fix config file

commit 37ebcd2723b29eee5d10f16c64cdcc8ccdb53ee8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 14:20:23 2016 -0600

    Update README.md

commit 373f9eb4ce92880aada31b44ba1074cb4f2141a9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 14:18:48 2016 -0600

    Update README.md

commit 5b4555cb04f32c4d0834dfa9d111f8e14a43c919
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 17 13:07:29 2016 -0600

    Update README.md

commit d019c1e43746586a9be500822dc0fafb69c07d91
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Tue Feb 16 17:11:40 2016 -0800

    Remove reference to binstar-static
    
    The content in `binstar-static` was merged into `binstar-server`.

commit c57c5cf9f89308139b581c507596e9dabb7636a4
Author: Kerry Watson <kwatson@continuum.io>
Date:   Tue Feb 16 15:30:52 2016 -0600

    Spelling and qa edits
    
    QA edits to conform to docs site standards.

commit 169e983f696fe02d6f2e9eaff4d428b0fd9911ab
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Tue Feb 16 13:01:03 2016 -0800

    Add Active Directory configuration directions

commit 3f8281bfcd5d8fcd88c05c6686a36860811bb7e5
Merge: 42f3151d 26947907
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Feb 16 14:18:21 2016 -0600

    Merge pull request #56 from ContinuumIO/update-makefile
    
    update Makefile to move anaconda repo to distribution-docs repo

commit 2694790763c17cb20bb8d4c3b196361085395c16
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Feb 16 14:17:40 2016 -0600

    update Makefile to move anaconda repo to distribution-docs repo
    
    update Makefile to move anaconda repo to distribution-docs repo

commit 42f3151d4e271c0c0e1b43f2a29312ad038c13da
Merge: 245253a1 f2bfcd82
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 18:21:43 2016 -0600

    Merge pull request #55 from ContinuumIO/remove-cas-mirror-faq
    
    remove question on cas-mirror

commit f2bfcd82309155754832e6820b382d63a2ef8f1a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 18:20:41 2016 -0600

    remove question on cas-mirror
    
    remove question on cas-mirror which refers to past version of
    Anaconda repository

commit 245253a1badb6deaa1a6299bf2c5bdf1d8d0f513
Merge: 8cd636c8 f041e99a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:41:23 2016 -0600

    Merge pull request #54 from ContinuumIO/fix-bullets
    
    fix bullet list

commit f041e99abdfdf60293350de68fb435a281b0dd08
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:40:53 2016 -0600

    fix bullet list
    
    fix bullet list

commit 8cd636c86142f112894d895a43d65d91f4c8c4af
Merge: 00f07ee7 d90e2c64
Author: Kerry Watson <kwatson@continuum.io>
Date:   Fri Feb 12 15:33:37 2016 -0600

    Merge pull request #52 from ContinuumIO/srossross-patch-1
    
    Release 0.15.5

commit 00f07ee7f3228badc99eb880ef90058acc199623
Merge: 6bcc4eae 8b5648ec
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:32:58 2016 -0600

    Merge pull request #53 from ContinuumIO/mirrot
    
    mirrot to mirror

commit 8b5648ec0d0aeba835802405e9dcc820fb9575d4
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:32:23 2016 -0600

    mirrot to mirror
    
    mirrot to mirror

commit d90e2c6496be391bbe914158ace0e4681be14ae2
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:04:04 2016 -0600

    sercurity -> security

commit 9fbe1f1f824937be859caad3af0d0b911fac002d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 15:02:52 2016 -0600

    Febuary -> February

commit 411e0b5895b6ae13f0ce731551abf9e9655795d1
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Fri Feb 12 12:57:00 2016 -0800

    Update index.rst

commit 6bcc4eae13b52a4381472577cde4897b2c6fd440
Merge: 1bc76099 7dd4b55c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 14:52:48 2016 -0600

    Merge pull request #51 from ContinuumIO/faq-update
    
    Final changes to FAQ

commit a34868837c6b817fccf35fb433204ce1f43c054c
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Fri Feb 12 12:49:10 2016 -0800

    Update changelog.rst

commit b6641e16b2463e21dbcf6692970208a397518043
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Fri Feb 12 12:46:24 2016 -0800

    Update changelog.rst

commit 60ce1244eeb5bf5223448932bf4966702e43b71d
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Fri Feb 12 12:45:27 2016 -0800

    Update changelog.rst

commit d2e0a5724c2296fc53e1f93416143a8918b3afaf
Author: Sean Ross-Ross <srossross@gmail.com>
Date:   Fri Feb 12 12:43:51 2016 -0800

    Update index.rst

commit 7dd4b55ccd752a873de8a9d539d3a2a55fdfc93f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 13:49:24 2016 -0600

    fix support link
    
    fix support link

commit 04d771d53bff2aa9919bbdd83c4f893fb8a06a7f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 13:36:55 2016 -0600

    fix indents
    
    fix indents

commit e696840877929bd6d3202821bed3810414e71ffb
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 12 13:32:35 2016 -0600

    move ref links above section titles
    
    move ref links above section titles

commit 4088e8e61fa670da1e2801efda55d656ed5aa883
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Fri Feb 12 13:27:21 2016 -0600

    latest tech modifications to FAQ
    
    latest tech modifications

commit dd7d6596df102a969df11ee2e6940097525ad16c
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Thu Feb 11 16:07:39 2016 -0600

    Final changes to FAQ
    
    Final changes to FAQ

commit 1bc7609930179f437ae403bfccb386e6da18e1eb
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 11 14:59:27 2016 -0600

    fix indents in faq
    
    fix indents in faq

commit d6ca8bbefa4c12263cab824777f23b5bce977cd7
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 11 14:19:44 2016 -0600

    small sphinx fixes
    
    small sphinx fixes: links and hyphens

commit a460481cbcfb98b19c348ed1c27a6d9d67b614e6
Merge: d3cd788f deda9ea6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 11 13:21:50 2016 -0600

    Merge pull request #50 from ContinuumIO/add-orphan-directive
    
    add orphan directive to suppress sphinx errors

commit deda9ea67cbc3d22ff690fddb993a86f35bc91f2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 11 13:19:29 2016 -0600

    add orphan directive to suppress sphinx errors
    
    add orphan directive to suppress sphinx errors

commit cb074376df364f693d4dfd3c58ff3797dfdd7976
Merge: 0affcd12 f6b05b57
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Wed Feb 10 18:24:04 2016 -0800

    Merge branch 'feature/kerberos' of github.com:continuumio/docs into feature/kerberos

commit 0affcd12420259d5ec28d5628b06032a41b5d6d2
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Wed Feb 10 18:23:10 2016 -0800

    Add additional Kerberos details

commit f6b05b577d2afc531e4cc309c6aa44bd20c4ebb6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Feb 10 17:25:58 2016 -0600

    small changes for clarity
    
    small changes for clarity

commit 64f9c1105608816faa795bfcf7197f2d58f4fc8c
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Wed Feb 10 15:03:52 2016 -0800

    Fix references to Anaconda server

commit 2fe674112d95c80a6b7109909288dd20e0f383a4
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Wed Feb 10 11:59:21 2016 -0800

    Add note for LDAP/Kerberos superuser

commit 535e2b7653f856b2bea7e6c409be2df30b68948c
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Wed Feb 10 11:16:04 2016 -0800

    Add comment for browser config

commit 756b4fa17d35b0f41cb3ed191f8afa69bab55cfa
Author: Derek Ludwig <dludwig@continuum.io>
Date:   Tue Feb 9 14:04:18 2016 -0800

    Start Kerberos docs

commit d3cd788f6d98bd70ea84d8525ebfa76cb2f5f1ed
Merge: 1e8ae714 5237344b
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Tue Feb 9 15:06:12 2016 -0600

    update new changes and continue
    
    update new changes and continue
    
    Merge branch 'master' of github.com:ContinuumIO/docs

commit 1e8ae714843a68daaea4806d20837f6d33f7fae9
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Tue Feb 9 15:02:28 2016 -0600

    minor changes to FAQ
    
    minor changes to FAQ

commit 5237344bed2c2c46122eeb253ae720a7d77d92f1
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 8 16:03:26 2016 -0600

    Update README.md

commit ed279ec3e8b35d3896d1ff8c56ba466dce07b8eb
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 8 16:01:08 2016 -0600

    Update README.md

commit 9c04ce91963ce0997f58ef1ed02eb871c9768212
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 8 15:57:53 2016 -0600

    Update README.md

commit 805d5a16907ad60a0f73f3c60802da3a7d36e98b
Merge: 4d8c81bb 6fee8049
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 8 15:06:41 2016 -0600

    Merge pull request #47 from ContinuumIO/dsludwig-patch-1
    
    Update index.rst

commit 4d8c81bb1a984d4976807ae28eb1c5b1c61dba31
Merge: e8ca6141 bf4a6583
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Feb 8 14:25:17 2016 -0600

    Merge pull request #48 from ContinuumIO/add-license-note
    
    add license note

commit bf4a6583afc761363e460c82710fbbcb0f79e368
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Mon Feb 8 14:20:15 2016 -0600

    add license note
    
    add license note

commit 6fee8049c4ad3f6e7f6bcfaf885ac0a2897c9010
Author: Derek Ludwig <derek.s.ludwig@gmail.com>
Date:   Fri Feb 5 15:47:24 2016 -0800

    Update index.rst
    
    Remove garbage character from `conda config --add channels` that prevents it from being copy-pasted.

commit e8ca6141267b59d711cb94c18e7c9abf7ecb96f4
Merge: 635523e6 2afec0ee
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 5 11:43:39 2016 -0600

    Merge pull request #46 from ContinuumIO/archive-trconnect
    
    archive TR Connect

commit 2afec0ee826becc54fac0176546f3d8011b56996
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Feb 5 11:42:48 2016 -0600

    archive TR Connect
    
    archive TR Connect

commit 635523e6c18462c7ace510cf76a3b2825e55a699
Merge: fd3e3b94 fd42eaed
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 4 18:36:36 2016 -0600

    Merge pull request #45 from ContinuumIO/overall-update
    
    Overall update

commit fd42eaed9da5f58cdb435bfc0536b3b8eef5b689
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Feb 4 18:33:03 2016 -0600

    cleanup
    
    cleanup

commit a8cd0ad14191d993df074c7ecbf7d7e9f60d614f
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Thu Feb 4 16:25:19 2016 -0600

    Overall update of repository docs
    
    Overall update

commit 1af6c368f0e97073af1583f3c82e0eaa88c4ab4e
Merge: 0b01b712 fd3e3b94
Author: Nicholas Pierotti <npierotti@hq-dhcp-20-166.corp.continuum.io>
Date:   Mon Feb 1 13:55:18 2016 -0600

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 0b01b71248a431fb3b545a1764243b0eb49d33ef
Author: Nicholas Pierotti <npierotti@hq-dhcp-20-166.corp.continuum.io>
Date:   Mon Feb 1 10:58:14 2016 -0600

    Add changed files to build
    
    Add changed files to build

commit fd3e3b94b54ff226ac6603d47bcb010ec12c23ba
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 29 17:14:09 2016 -0600

    add accelerate to .gitignore
    
    add accelerate to the list of projects from other repos in .gitignore

commit 9682741132ed50b0e5b725ce88166ccf5c4d7605
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 29 17:10:32 2016 -0600

    remove accelerate-old to prevent sphinx errors
    
    remove accelerate-old directory to prevent sphinx build errors

commit 87aa2b764e88cec86fe48fcd377467b62956fbe6
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 29 17:06:13 2016 -0600

    move accelerate docs to prevent confusion
    
    move accelerate docs to prevent confusion

commit 2abc253feeebde1e5af5a40aa7deab8709496669
Merge: 9ecadc16 def88241
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 29 16:27:46 2016 -0600

    Merge pull request #44 from ContinuumIO/large-file-upload-timeout
    
    info on preventing timeouts on large file uploads

commit def88241d8e0b96602f026fe47041647834cf481
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 29 16:26:10 2016 -0600

    info on preventing timeouts on large file uploads
    
    Add info about how to configure gunicorn timeouts so that larger
    files can be uploaded to an Anaconda repository instance. Also
    change some instances of Anaconda server to Anaconda repository.

commit 9ecadc16ebcbf17729cf0e43626a9743a11107ec
Merge: b7e53a64 fc71e925
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Fri Jan 29 11:38:34 2016 -0600

    Merge branch 'master' of github.com:ContinuumIO/docs

commit fc71e925c8051ae89f3ba7ec1818eb6c3043c031
Merge: 1cdc0c73 2fde50e5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 17:32:01 2016 -0600

    Merge pull request #43 from ContinuumIO/eula
    
    move in EULA

commit 2fde50e52ce1d4a5857d2bdbeb77433acb99dd27
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 17:30:50 2016 -0600

    move in EULA
    
    Move the Anaconda Repository EULA from the Anaconda docs to the
    Anaconda Repository docs.

commit 1cdc0c73e1829f7dd0ad077d5e833052460aca7d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 14:36:33 2016 -0600

    Create git-workflow-example.md

commit c2937c87941c8e3fb818240e787a901f5787d260
Merge: 2af8c9b1 7585aa51
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 14:23:06 2016 -0600

    Merge pull request #42 from ContinuumIO/applications-to-apps
    
    'applications' to 'apps'

commit 7585aa514ba5f8b7c093f50836f6a5e6d05c4b5c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 14:22:03 2016 -0600

    'applications' to 'apps'
    
    'applications' to 'apps'

commit 2af8c9b17e774ece16d50057753fe113fdb51f05
Merge: 2dc1c995 c95f39cb
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 14:14:56 2016 -0600

    Merge pull request #41 from ContinuumIO/apps-to-applications
    
    change 'apps' to 'applications'

commit c95f39cb68ede2393cea56a5680d65030bddafa5
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 14:13:36 2016 -0600

    change 'apps' to 'applications'
    
    change 'apps' to 'applications'

commit 2dc1c995d86be9b27608692932cfb6fe9153d609
Merge: 3f54dbb1 0ee9025d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 13:45:52 2016 -0600

    Merge pull request #40 from ContinuumIO/fix-links
    
    fix links on index page

commit 0ee9025dccc99a6b46bb3a692e54122c4a5e7557
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 28 13:45:08 2016 -0600

    fix links on index page
    
    fix blaze, bokeh, conda, numba links on index page

commit b7e53a645cf872ea685cef3c6d4f3927fa05db31
Merge: e606610d 3f54dbb1
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Thu Jan 28 13:10:41 2016 -0600

    Merge branch 'master' of github.com:ContinuumIO/docs

commit e606610d3339a3d37eb22a693eb1fd3b8b8604a8
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Thu Jan 28 13:08:38 2016 -0600

    two deleted accelerate files
    
    two deleted accelerate files

commit 3f54dbb19f6933f70910838aa625b60ecdfb366d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 27 16:15:43 2016 -0600

    realized what was happening-- revert the last commit
    
    realized that we are pulling info from github.com/continuumio/accelerate
    as we should, just from website-docs branch instead of master branch.
    revert last commit, which is not needed.

commit aeb16f911fc6e715a0d5c34107de5739b21260fa
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 27 16:10:35 2016 -0600

    archive old accelerate docs
    
    archive old github.com/continuumio/docs/build/accelerate docs since
    we now use github.com/continuumio/accelerate/doc instead

commit 59e459a597b67f43a054479bf38911e3d1da0876
Merge: 1fc7712c 8bdee479
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 27 15:47:16 2016 -0600

    Merge pull request #39 from ContinuumIO/accelerate-changes
    
    solve accelerate differences

commit 8bdee479ff1270af6356c5616d0faa506ea6e2e3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 27 15:43:40 2016 -0600

    solve accelerate differences
    
    solve accelerate differences

commit 1fc7712c7f764ade5448963105ece6479b63bf62
Author: Max Gamurar <mgamurar@continuum.io>
Date:   Wed Jan 27 14:18:47 2016 +0700

    Google Analytics replaced with GTM;

commit c213e0cdf8965c16e75231c1792f93b12ca785e2
Merge: 41ddddf4 bc991232
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 26 12:13:23 2016 -0600

    Merge pull request #38 from ContinuumIO/install-rewrite
    
    Anaconda repository installation rewrite

commit bc991232014671a366653d7cf3fa2298c06a0f19
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 26 12:12:13 2016 -0600

    fix underlines
    
    fix underlines

commit 62d3ef63464e1c62907df28e0f3cc48e6ca16728
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Tue Jan 26 11:50:39 2016 -0600

    Anaconda repository installation rewrite
    
    Anaconda repository installation rewrite

commit 41ddddf4aef9b9f765cccea4e094e5c2eb1e3399
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 11:28:06 2016 -0600

    Update README.md

commit 51890eac5c04fbe044927109df8000b21fe376c2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 11:27:32 2016 -0600

    Update README.md

commit 253410e1265a567a540cc7232d99b8e141e9685a
Merge: 3406b64d 4eb55fd0
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 11:20:05 2016 -0600

    Merge pull request #37 from ContinuumIO/env-files
    
    create ubuntu env file, fix name of os x env file

commit 4eb55fd03e20be9b6a1829b7bd4f59976d9b7d90
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 09:18:08 2016 -0800

    create ubuntu env file, fix name of os x env file
    
    Create Ubuntu conda environment file and fix name of OS X conda
    environment file. Both still produce a conda environment named
    "docsEnv".

commit 3406b64d6d8f7b06fccd0e3f79a4c142837069da
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 11:03:32 2016 -0600

    Update advanced-installation.rst

commit 6da73cc58c6f99cbb5355610d3402d53b9a4193f
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 11:02:28 2016 -0600

    Update advanced-installation.rst

commit 9313f046a9372557d69ea8eb92724d2a773eaaa6
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 21 10:34:24 2016 -0600

    Update index.rst

commit f1b3d639207a97dc0c3bedc25eb4acea13597acf
Merge: c5b295cc b9938d42
Author: npierotti <npierotti@continuum.io>
Date:   Wed Jan 20 15:18:58 2016 -0600

    Merge pull request #36 from ContinuumIO/remove-mongodb-usage-error-message
    
    remove mongodb usage error message

commit b9938d42955f7cc105453ea8d2fcd81bb3cb079e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 20 15:04:57 2016 -0600

    remove mongodb usage error message
    
    remove mongodb usage error message

commit c5b295ccf9eb924db647bdcb6f0f26ead1f3c31d
Merge: 13a19e37 2b81bee3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 20 14:06:59 2016 -0600

    Merge pull request #35 from ContinuumIO/anaconda-server-2.14.1
    
    updates for 2.14.1 release

commit 2b81bee3a095ee7c094cebb1a3f7867e928452f6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 20 13:58:53 2016 -0600

    clean up 'what's new'
    
    clean up 'what's new'

commit e8a41c61ded9f437ceca22d44526e2ade0c9f566
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 20 13:52:19 2016 -0600

    updates for 2.14.1 release
    
    updates for 2.14.1 release

commit 13a19e375b4eaaaedbb7cd1d224a57a40fea3c0b
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Jan 20 11:32:04 2016 -0600

    Update README.md

commit ef331c2dbeb85b0117eb34f6d31a1fb45c639aad
Merge: 5d29261e 0336fbe4
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 19 18:00:20 2016 -0600

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 5d29261e9a4750b468c7fa0318d7cf9fbba6ec2e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 19 17:59:57 2016 -0600

    review install fixes
    
    review install fixes

commit 0336fbe4a09ce8eb86a182e35cadd483ded5e329
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 19 17:23:22 2016 -0600

    Update README.md

commit c3aab0bf5883cf6a19aa4a383ce227ba786eb8c9
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 19 17:21:58 2016 -0600

    Update README.md

commit cfc4ab6a5baaa3459ba20859ba133f7a1fcc3f32
Author: Nicholas Pierotti <npierotti@0288-npierotti.local>
Date:   Tue Jan 19 14:30:41 2016 -0600

    Rewrite Install
    
    Rewrite Install

commit 5b0202a170265d43f77b892ccf65fcea31a293a8
Merge: 540dcd4b 5596f81d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 14 14:42:09 2016 -0600

    Merge pull request #33 from ContinuumIO/date-format
    
    fix date format

commit 5596f81db6084710e1bf17cf052e4f611557eb5d
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Jan 14 14:41:16 2016 -0600

    fix date format
    
    fix date format

commit 540dcd4b9e008af211a26f8371f09d00d4c19c63
Merge: ae53343e 207214dd
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 12 14:22:54 2016 -0600

    Merge pull request #32 from ContinuumIO/update-changelogs
    
    update changelogs

commit 207214dde445276f692858fa0dba1816d3146162
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 12 14:22:30 2016 -0600

    update changelogs
    
    update changelogs

commit ae53343e3b5d4c051bccec5a52f430fa5bfc22ce
Merge: df827dac e443150e
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 12 14:11:30 2016 -0600

    Merge pull request #31 from ContinuumIO/fix-update-instructions
    
    update the update instructions for 2.13.1

commit e443150ee6ea0685ce31939ee921d9c1f6453bbd
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 12 14:07:30 2016 -0600

    update the update instructions for 2.13.1
    
    Update the update instructions for 2.13.1. Hopefully this will be
    automated next week at which point we should remove the added line.
    Also the changelog should be updated soon once the Anaconda Server
    repo's changelog is updated.

commit df827dac648778b42ef6504312db5af6fce1dc79
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Jan 8 19:22:45 2016 -0600

    Update index.rst

commit 8bf374e0e493f19976281503e41f7ac71431e681
Merge: 87098a54 f022ae79
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 5 14:06:23 2016 -0600

    Merge pull request #30 from ContinuumIO/add-mkl-removal-2
    
    fix code highlighting

commit f022ae79c1f2d58cc47d317e02bc71009f343141
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 5 14:05:49 2016 -0600

    fix code highlighting
    
    fix code highlighting

commit 87098a54065bc14d61c80ec69f1f255d22deb0b6
Merge: 02fe93fe 0b5814c8
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 5 14:01:19 2016 -0600

    Merge pull request #29 from ContinuumIO/add-mkl-removal
    
    add MKL removal instructions

commit 0b5814c83c94e55e5821c984189a0843c9d22483
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jan 5 14:00:21 2016 -0600

    add MKL removal instructions
    
    add MKL removal instructions

commit 02fe93fe208877f6d4ecb5eec762d3449fda208c
Author: Stephen Kearns <stephenakearns@users.noreply.github.com>
Date:   Fri Jan 1 16:55:32 2016 -0600

    updated for recent 2.12 release

commit 5f2e955407f527aaf01a68d7371363a927e27962
Author: Stephen Kearns <stephenakearns@users.noreply.github.com>
Date:   Fri Jan 1 16:49:57 2016 -0600

    Updated for recent releases 2.10, 2.11 and 2.12

commit 1601c0900e53dd3979372992c09bbfd73e73df0e
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 21 18:44:39 2015 -0600

    correct 'sphinx-docs.txt' to sphinx-docs.yml
    
    correct 'sphinx-docs.txt' to sphinx-docs.yml

commit c975079c4b3db62f5baa44e8ad085ae7cf6b2b5b
Merge: f372477c e2af05fd
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:51:44 2015 -0600

    Merge pull request #27 from ContinuumIO/accelerate2
    
    update environment to include accelerate and numbapro

commit e2af05fda000d79f37263ade42e31f74fed3af04
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:47:27 2015 -0600

    use 'conda env export > sphinx-docs.yml' not 'conda list -e'
    
    Turns out that to list pip installed packages we must use 'conda env export'
    and not 'conda list -e', and the file currently in the repo already
    does this correctly. Accordingly, rename it from sphinx-docs.txt to
    sphinx-docs.yml.

commit 52286eca8dd4e7e498e6339c0a5e0b957c090bc7
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:27:57 2015 -0600

    conda update
    
    In addition to adding accelerate and numbapro, also run 'conda update --all',
    and then update the environment file on the docs repo with that.

commit 104cddffa7514d1322eac73351aa822fc69ad966
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:18:22 2015 -0600

    update environment to include accelerate and numbapro
    
    Docs pull info from the programs, so include them in the docs environment
    to avoid build errors.

commit f372477c3708e73ce2c7ff20d723a3ec3fc2fd2c
Merge: a5a5813e 7461055c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:13:08 2015 -0600

    Merge pull request #26 from ContinuumIO/accelerate2
    
    change Makefile and repos for Accelerate 2.0

commit 7461055cf830a8f3b37e63188d3ee937bafe791c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Dec 18 17:11:28 2015 -0600

    change Makefile and repos for Accelerate 2.0
    
    change Makefile and repos for Accelerate 2.0

commit a5a5813ecfe963f7ed7b7db6d06ad81d6fcb4c73
Merge: 799a625e 29617933
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Dec 7 19:11:38 2015 -0600

    Merge pull request #25 from ContinuumIO/fix/accelerate_formatting_error
    
    Sublists need a CRLF and the list marker needs to match the whitespac…

commit 296179337e8cd8daba08bf7ccc29262d5d6e57a3
Author: Bradley Kreider <bkreider@0230-bkreider.local>
Date:   Sat Dec 5 00:12:46 2015 +0100

    Sublists need a CRLF and the list marker needs to match the whitespace of the previous item.  Otherwise you get a dl.

commit 799a625e4ae7cca47c1862d232c682781c069863
Merge: 77cd985f 2cc321ce
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 3 15:45:43 2015 -0600

    Merge pull request #23 from ContinuumIO/redirect-index
    
    redirect index to continuum.io/documentation

commit 2cc321ce014152c90dd08aac35fccccc3606c72c
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Dec 3 15:44:44 2015 -0600

    redirect index to continuum.io/documentation
    
    redirect index to continuum.io/documentation

commit 77cd985fdb30016ea630e78f68c428cb83a0afe0
Merge: 21f4f1b6 347f09b9
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 25 12:04:45 2015 -0600

    Merge pull request #21 from ContinuumIO/update-mkl
    
    update mkl license info

commit 347f09b9290e5298baa1a1e955182206f7ef6617
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Nov 25 12:03:42 2015 -0600

    update mkl license info
    
    update mkl license info-- free licenses are only for up to 4 nodes,
    and people wishing to use mkl with more should contact sales.

commit 21f4f1b634eb8135eee115f5d4aaff82e316ec54
Merge: 69c16032 dedf5e46
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 20 17:08:49 2015 -0600

    Merge pull request #20 from ContinuumIO/addons
    
    update licensing info

commit dedf5e46e506721a31a7a17041de000ee8f53774
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Nov 20 17:07:51 2015 -0600

    update licensing info
    
    update licensing info

commit 69c160324cae98c0ff5812d7c8f11a1c2970a440
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Nov 12 14:38:39 2015 -0600

    change required MongoDB from 2.4 to 2.6
    
    change required MongoDB from 2.4 to 2.6

commit 6a61439dda5a26f5d05d3c04e57a3db97f4cff4a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Nov 3 10:48:47 2015 -0600

    'these four commands' -> 'these commands'
    
    'these four commands' -> 'these commands'

commit c0d2e7ccadfff9f2d5da38ad72fd8e1b897aa5f6
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 16:12:45 2015 -0500

    fix sphinx error
    
    fix sphinx error

commit db10b908997d8b2687cd59b35b9ad2f53cd2d148
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 16:10:20 2015 -0500

    fix sphinx error
    
    fix sphinx error

commit bd2d469ca8fc5477ee111cbee8ece6c4d4085bb3
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 16:09:49 2015 -0500

    fix sphinx error
    
    fix sphinx error

commit aba8d2c4c9f5e01f99bde5c93e38cde67fd3e7bc
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 16:08:34 2015 -0500

    fix sphinx error
    
    fix sphinx error

commit 41e140ec58de8690097d2e6d16acd4ded583d356
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 16:05:06 2015 -0500

    fix sphinx error
    
    fix sphinx error

commit 4b342fab0fed15a57da5f8f350a69b81b3e3f15d
Merge: 704aad12 41372b32
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 13:31:55 2015 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 704aad12d251952b5cc7b2e7d6968241faa53edf
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Oct 28 13:29:21 2015 -0500

    add empty file 'healthy' in root dir so load balancer serves it
    
    Our load balancer uses the presence of an empty file called 'healthy'
    in the root directory, in this case the web/docs/html folder in the docs
    repo, to determine that the site does have content, and serve that content
    and not put a box into rotation that's just serving a CentOS 'welcome
    to nginx' page.

commit 41372b321a29e979ac8ce59a8e7c39f475b80487
Author: Matthew Willis <lilmatt@users.noreply.github.com>
Date:   Wed Oct 28 14:16:12 2015 -0400

    Update server IPs and remove references to 3rd web box

commit 5310782c26cb987548fc75020a9ba6da6f0b57c1
Author: Matthew Willis <lilmatt@users.noreply.github.com>
Date:   Wed Oct 28 14:14:53 2015 -0400

    Update server IPs

commit b3fdd764ef4d496478e7c292df3389e3fd1cbb92
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 27 13:21:20 2015 -0500

    include old Anaconda package lists
    
    Modify Makefile not to exclude old Anaconda package lists, so these
    can be listed as part of the documentation.

commit e2d2db5725c68a8845d32a73a9801145f77f64e3
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 27 12:43:13 2015 -0500

    fix duplicate targets named 'here'
    
    Fix the Sphinx warning that the anaconda-repository.rst file had
    multiple links described only as 'here', as in, 'click here to read
    about...' This way has better style and no Sphinx warnings.

commit 937aa3a61a012b63ae9df5b6a082514490b0cd06
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Oct 26 18:42:12 2015 -0500

    fix 'binstar-' commands to 'anaconda-server-' commands
    
    Fix 'binstar-sync-conda' and 'binstar-sync-pypi' to 'anaconda-server-
    sync-conda' and 'anaconda-server-sync-pypi'.

commit fa77250c680e777e88a0e308d2c55eb6b3c55844
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 15 15:36:52 2015 -0500

    fix package location
    
    fix package location

commit b645404c01b6b820e2a20a9ba8b7ccd5c3955b35
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Oct 15 15:33:26 2015 -0500

    fix various sphinx errors
    
    fix various sphinx errors

commit 8d5c714851f15cf39a13db91b386148b169b1dc7
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Oct 9 15:02:30 2015 -0500

    add and remove users, reset user password, resend user welcome emails, maintenance
    
    continue merging in improvements from google docs 15-17 and 18

commit 38ceb6a4d03c407ba890dea4251e80cb71644a28
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Oct 6 14:48:24 2015 -0500

    add past update instructions
    
    Some customers may need to go from 2.2 to 2.9 one revision at a time.

commit 60f4243df17554d351c26daaf2d985addd480e9d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Oct 2 10:45:20 2015 -0500

    fix blaze link again
    
    fix blaze link again

commit a491cf3fb875a9556e7a8949c3f2b92a86edac9f
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Oct 2 10:39:39 2015 -0500

    fix blaze link
    
    fix blaze link

commit c4a3326a26b15c9bf680596a1a856b9ea3d65884
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 29 16:56:53 2015 -0500

    2.9 changelog
    
    2.9 changelog

commit dca423766ee444722aa68bcc990a94bf09a6e399
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 25 17:50:56 2015 -0500

    fix acluster description
    
    fix acluster description

commit 044415984bd664ed20ef2ebfd0fec48189d4e893
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 24 15:02:53 2015 -0500

    oops, 'start' back to 'restart'
    
    'start' back to 'restart'

commit b8ef2315a503b5bdf876408632eead5c4dbe005b
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 24 14:54:34 2015 -0500

    change 'restart' to 'start' in update instructions
    
    change 'restart' to 'start' in update instructions

commit de0244442aa85ce1f8374dbaabc50489551aef27
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 24 13:39:46 2015 -0500

    move 'no environment named search' error from faq to troubleshooting
    
    move 'no env named search' error from faq to troubleshooting

commit b49e40e2f5a905195f738ef0b13d7327e0bb09e2
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 24 13:23:04 2015 -0500

    CAS docs fixes
    
    comment out user removal instructions pending a better solution.
    add faq note about errors when trying to use anaconda search on
    windows without installing anaconda-client first.
    update instructions for updating anaconda server.

commit 58b4294675a39795f7d1a9be91971311db07d638
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 23 19:01:50 2015 -0500

    more docs fixes
    
    more docs fixes

commit 3a8dbb091c8747a9b2349d0f0c5e2f97e4af4f14
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 22 17:22:05 2015 -0500

    remove 404 from sidebar
    
    remove 404 from sidebar

commit 347ac1ddaa2e0ef56b851e441f0cf24c7777d288
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 22 16:14:41 2015 -0500

    change 'start server' to 'restart server'
    
    change 'start server' to 'restart server'

commit a92445c7caa9078490c31756108f372e0579c934
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 22 15:15:47 2015 -0500

    fix typo Agust to August
    
    fix typo Agust to August

commit f99cf8e5b85d6f5a465253676699f72cab404fda
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 19:06:45 2015 -0500

    more advanced.rst fixes
    
    more advanced.rst fixes

commit 0ae01497986df902c06eab94dc99e74d0e1131f8
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 18:38:00 2015 -0500

    rewrite HTTPS
    
    rewrite HTTPS

commit b91f88ec2fa6bc024b4023fa68e9c46960220d14
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 17:36:44 2015 -0500

    fix more links
    
    fix more links

commit 0b84a7f44097b48f45cf2a1bf3be8fb9f5411de9
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 17:25:21 2015 -0500

    fix link again
    
    fix link again

commit 04bbc5e4bb0e389d97edc297d665e59167e4e695
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 17:22:37 2015 -0500

    fix broken link
    
    fix broken link

commit 8fc959dcd2d2e7f3a27fcaf7068146646fee8810
Merge: 76cee6fd ceb8a105
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 14:35:54 2015 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs

commit 76cee6fd0554abbef176607ae77cd0a8f54b869a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 14:35:37 2015 -0500

    add help section
    
    add help section

commit ceb8a1055fcf6448f64cabf69c21594fadd8abd8
Merge: f81124df a2d1085c
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 14:33:40 2015 -0500

    Merge pull request #18 from ContinuumIO/cas285
    
    Cas285

commit f81124df832dc6a013c7e09141ff5f2e4fc14e1a
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Sep 21 13:54:40 2015 -0500

    change 'conda.yaml file' to 'YAML file'
    
    change 'conda.yaml file' to 'YAML file' so it applies to pypi

commit 19897bcc0afc7b2c96ca644744839139daf1f12c
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 18 18:29:24 2015 -0500

    make toc local
    
    make table of contents local

commit 24ee1250e7628dfeaf5cbf08fef58f58746664b0
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 18 17:05:53 2015 -0500

    fix titles
    
    fix titles

commit f19349e0cd9b457c26fb3e549d47287d66b05a54
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 18 16:42:42 2015 -0500

    'stop experiencing timeouts' -> 'stop timeouts'
    
    'stop experiencing timeouts' -> 'stop timeouts'

commit 05eb9a4317e95bb000da9088a27f7219dd15e994
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 18 16:38:28 2015 -0500

    remove tables of contents, remove redundant faq anchors
    
    remove tables of contents, remove redundant faq anchors

commit 26a59e05d50914de2b88bfed147b7ca4f65e9803
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 17 13:04:05 2015 -0500

    add 404
    
    add 404

commit 8012511dce37c55ba38b5ca01c7ba9a747442304
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 17 12:55:14 2015 -0500

    refer users to client config
    
    refer users to client config

commit 43b3cf498ce3592c4755ce21bfef2684165dbfb8
Merge: be89ae52 1077c03e
Author: Will Warner <electronwill@gmail.com>
Date:   Thu Sep 17 12:38:28 2015 -0500

    Merge pull request #16 from ContinuumIO/fix/client-config
    
    Update configuration.rst

commit 1077c03eca98d1747d847d31af4c36cb5fd823c3
Author: Sean <srossross@gmail.com>
Date:   Wed Sep 16 14:37:25 2015 -0700

    Update configuration.rst

commit be89ae52a4f815774b32bbe9e643d31052134c3e
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 16 16:30:36 2015 -0500

    fix reference to sync-configuration.txt to refer to conda.yaml
    
    fix ref to sync-configuration.txt to refer to conda.yaml

commit 481e3eb8e16319f810c4c76a41885d3903756219
Author: Sean <srossross@gmail.com>
Date:   Wed Sep 16 14:02:48 2015 -0700

    Update configuration.rst

commit 6af7e80171cf9f2b3d617963de02d5b73c7e3dff
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 16 15:04:11 2015 -0500

    add port # to install docs
    
    add port # to install docs

commit 251b45b4799484368e62307854426c78de5a2c13
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 15 19:08:46 2015 -0500

    add /var/log/anaconda-server creation
    
    add /var/log/anaconda-server creation

commit a2d1085c6ad0ddce5033833e0d248ce1a917d4a8
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 9 18:28:10 2015 -0500

    add --execute to command
    
    add --execute to command

commit 6404dd924c22b3fcb05ab431bd8393e89b26d24d
Author: Will Warner <electronwill@gmail.com>
Date:   Wed Sep 9 18:14:15 2015 -0500

    add anaconda-server-db-setup instructions
    
    add anaconda-server-db-setup instructions

commit d8ad2e042818da005ecfa7090858669c6d9f9a3b
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 8 12:04:30 2015 -0500

    remove commented Loggly instructions
    
    remove commented Loggly instructions per
    https://github.com/Anaconda-Server/anaconda-server/issues/376

commit 1763e8b406cc89f158a9c1ffd9d84748981534ba
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 16:12:13 2015 -0500

    Update changelog.rst

commit 235a03e5608bd738c9c9c16a689381699b807adc
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 16:11:41 2015 -0500

    Update index.rst

commit bd4288eeb8ce80286991189dc89858bb57bfdf6e
Merge: 5f1280e5 6d8c6ed3
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 15:29:05 2015 -0500

    Merge pull request #15 from ContinuumIO/update-anaconda-server-changelog
    
    Update index AS page with more info about changes

commit 6d8c6ed309c788d36a58b1f82bad0306afa0e7d8
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 15:28:44 2015 -0500

    preserve command formatting for now

commit f633f9dddc120fdbdd2c7e5e1feead62187ec00d
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 15:26:07 2015 -0500

    more rst formatting

commit bdb5b6a15d039a03c71ddf186ce797e115b11be4
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 15:23:53 2015 -0500

    publish to publishing

commit 7a1b5507ce193a5e3938bec8b8d4fb3e1043152a
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Sep 4 15:18:34 2015 -0500

    slight formatting tweaks

commit 81b787ce2b67957aac35e68e1356cf7bde7664e0
Author: malev <marcosvanetta@gmail.com>
Date:   Fri Sep 4 14:33:14 2015 -0500

    Update index AS page with more info about changes

commit 5f1280e5ecbf4f4b4faa8941b61306000f6e4cc3
Merge: 926cf5e7 83f01939
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Sep 1 11:40:02 2015 -0500

    Merge pull request #13 from ContinuumIO/fix/readme
    
    It looks like the sphinx-docs had been converted to conda-env format …

commit 926cf5e76ae9fe2e4b94e2e8320d93c8580daf71
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 28 18:33:53 2015 -0500

    rewrite install
    
    Rewrite install guide, break requirements into separate file.

commit 0574ed5ce19fb7b99c73563b71b634a505d0fd53
Merge: 127b7ccf 6c492e40
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 28 14:58:01 2015 -0500

    Merge pull request #14 from ContinuumIO/as-2.8.1-release
    
    AnacondaServer 2.8.1 release update

commit 6c492e40b458db57c383b948cb179d3e8d069ad5
Author: malev <marcosvanetta@gmail.com>
Date:   Thu Aug 27 20:53:13 2015 -0500

    AnacondaServer 2.8.1 release update

commit 127b7ccf74247aa3df87a0a24ab2d58daa9ab27c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Aug 17 16:59:10 2015 -0500

    fixing broken link

commit 42094e9077cf3dffe95433f49983bbbab4077a56
Author: Will Warner <electronwill@gmail.com>
Date:   Fri Aug 14 15:02:11 2015 -0500

    add ssh config
    
    add ssh config

commit 63dda75ea66a2ac488767de83dd7f1830b79fc51
Merge: f980287a be4eeb42
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Aug 14 10:23:15 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit f980287a56e5ccbd93d9428d695e59ec32b9de2c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Aug 14 10:23:13 2015 -0500

    iterates through all web machines during make live

commit be4eeb424bec96d47b0189fca1605c9dc1c13167
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Aug 13 09:20:51 2015 -0500

    Update README.md

commit bee9ee18357412a88bd3dc82ad3b9638a90b8353
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Aug 13 09:16:32 2015 -0500

    adding production machine iteration

commit ccb251f48e570590080b35092119fea5c28e08ab
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Aug 13 09:14:34 2015 -0500

    adding staging machine

commit 576c2ab3112e0e6e5354d6ed9048b0671ae09786
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Wed Aug 12 19:24:50 2015 -0500

    updating makefile

commit 81acb1136dd7d5db62eb55e70c0ba3bfaed81d1a
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Aug 11 12:58:08 2015 -0500

    tiny test change: 'salesperson' -> 'sales person'
    
    We need some tiny and inconsequential change to test the deploy process tomorrow.
    This commit changes 'salesperson' to 'sales person'.

commit 83f019397391911c14951572c8875d87970f623b
Author: Bradley Kreider <bkreider@continuum.io>
Date:   Sat Aug 8 12:03:11 2015 -0400

    It looks like the sphinx-docs had been converted to conda-env format not a requirements list

commit f2c1b268c1830f0ebbe7f25dbeee87e62c1fcbef
Merge: bae6c8c8 85fc20eb
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jul 28 10:32:42 2015 -0500

    Merge pull request #11 from ContinuumIO/srossross-patch-1
    
    Fix anaconda-server install docs

commit 85fc20ebaed62bccf046668bc8c00da8569f0e3a
Merge: 552e28ed 9c77c316
Author: Lila Hickey <lhickey@hq-dhcp-20-127.corp.continuum.io>
Date:   Tue Jul 28 10:32:20 2015 -0500

    updating for Anaconda Server rename + post launch styling updates

commit 9c77c31654d85638a553672f3133d5f5c9e542dc
Merge: 053fc541 bae6c8c8
Author: Lila Hickey <lhickey@hq-dhcp-20-127.corp.continuum.io>
Date:   Tue Jul 28 09:50:47 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit bae6c8c86f7460c6fed9244873bac6fef0efe6fb
Merge: 8601b6ea 05f21207
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jul 28 09:50:00 2015 -0500

    Merge pull request #8 from ContinuumIO/rename-binstar
    
    Rename binstar.org into anaconda.org

commit 053fc541b343fdbdf19f4518541e0ba9a62aeed9
Merge: 496f5c35 8601b6ea
Author: Lila Hickey <lhickey@hq-dhcp-20-127.corp.continuum.io>
Date:   Tue Jul 28 09:46:56 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 8601b6eac79bc52bef69940db1a5d276bf9457df
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Mon Jul 27 23:33:48 2015 -0500

    Updating other favicon, in case it is referred to.

commit b1ffab11d7c4dd0768db6f932674c4d518663bd5
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Mon Jul 27 22:57:11 2015 -0500

    New favicon

commit 12fc7be40d20cb1bb40334f3adec4fa714408b5f
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Sun Jul 26 19:50:29 2015 -0500

    Changing 'Our Team' to 'Leadership Team' in main menu and footer

commit 552e28ed4f3a97056970deef1530f179a807b65c
Author: Sean <srossross@gmail.com>
Date:   Fri Jul 24 11:34:28 2015 -0700

    fix formatting
    
    fixes https://github.com/Anaconda-Server/anaconda-server/issues/409

commit 638187be2de9c0274c0e63a29926a609f247d8a1
Author: Sean <srossross@gmail.com>
Date:   Fri Jul 24 11:32:31 2015 -0700

    Update advanced.rst

commit 496f5c351b01f03661e04c300de9fc4552caa5b9
Merge: b569026b 52ef97a1
Author: Lila Hickey <lhickey@hq-dhcp-20-168.corp.continuum.io>
Date:   Wed Jul 22 18:49:34 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 52ef97a1b9f7960b87a5e239252695ae54dac191
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Wed Jul 22 18:40:23 2015 -0500

    footer link to main homepage, not docs homepage.

commit b569026b23d7e6b99f6139357e7d6770994e029a
Merge: 04a708c3 5025e78e
Author: Lila Hickey <lhickey@hq-dhcp-20-168.corp.continuum.io>
Date:   Wed Jul 22 18:09:10 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 04a708c3df9c5c68d3d30d771aa629c8cb8d7b73
Author: Lila Hickey <lhickey@hq-dhcp-20-168.corp.continuum.io>
Date:   Wed Jul 22 18:09:06 2015 -0500

    protecting make

commit 5025e78e007e2e81603344b52b41e554b2d43f3f
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Wed Jul 22 18:03:26 2015 -0500

    fixes wordmark link in footer

commit 05f212070f176854173d338babffc32f8c4a59da
Author: malev <marcosvanetta@gmail.com>
Date:   Tue Jul 21 19:11:04 2015 -0500

    Rename binstar.org into anacona.org

commit b0819264c36e815bdfddf9546a08a1c9f26fdf87
Author: Lila Hickey <lhickey@hq-dhcp-20-51.corp.continuum.io>
Date:   Tue Jul 21 08:47:23 2015 -0500

    updating for AS fresh release

commit cb94ff079d3480cf4152e5c6a8c71dedccf278a2
Merge: 0054f6c7 147f00f9
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Thu Jul 16 12:12:44 2015 -0500

    Merge remote-tracking branch 'origin/master' into refresh

commit 0054f6c7aec88f25ee9886efaa425e8316bb6f5e
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Thu Jul 16 12:12:31 2015 -0500

    Shiny new wordmark and favicon

commit 147f00f9065c926d61d46c3e151a4eabbfab31fc
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Jul 16 11:58:16 2015 -0500

    Update index.rst

commit 212157b5f60f3ce2375815a9992ad0612879b047
Merge: 54458fbe 5a50a1bc
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Thu Jul 16 11:26:06 2015 -0500

    Merge remote-tracking branch 'origin/master' into refresh

commit 54458fbe947f82591b5c626cbdb594ebe1cffee0
Author: Lila Hickey <lhickey@hq-dhcp-20-54.corp.continuum.io>
Date:   Wed Jul 15 15:13:22 2015 -0500

    updating nav, merging in AS release info

commit 5a50a1bc8665df3a613de9a65eff02a5d26efd9f
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jul 14 08:21:09 2015 -0500

    Update README.md
    
    updated instructions based on updated env file

commit 62d0fc6f2cc6be5936143e55aae16b9765fdd644
Author: Lila Hickey <lhickey@hq-dhcp-20-51.corp.continuum.io>
Date:   Tue Jul 14 08:20:33 2015 -0500

    updating environment file

commit c66a9ea0700e9a36a4d80b0149e5468e7c8996de
Author: Lila Hickey <lhickey@0056-lhickey.local>
Date:   Mon Jul 13 23:05:25 2015 -0500

    Anaconda Server 2.5.1 release notes

commit 1c96ae842db730ddd5ec0bb23ac9f47ca2d774df
Merge: 1da51dde 446c4d95
Author: Lila Hickey <lhickey@0056-lhickey.local>
Date:   Mon Jul 13 22:48:46 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 446c4d95e8a4da9d213e224c1b02b79749f6b6ee
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Mon Jul 13 21:56:09 2015 -0500

    Revert "New favicon and new Continuum logo."
    
    This reverts commit 5273844118ff251f51b8f76c643c3eff1ce4da42.

commit 5273844118ff251f51b8f76c643c3eff1ce4da42
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Mon Jul 13 21:23:02 2015 -0500

    New favicon and new Continuum logo.

commit 1da51dde3f53dd6c71039c19c67d30cbeae7067c
Merge: ed0e19de cb1b2533
Author: Lila Hickey <lhickey@hq-dhcp-20-62.corp.continuum.io>
Date:   Mon Jul 13 17:52:46 2015 -0500

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit ed0e19de1eb6a8799a68350eaa208febd77f4002
Author: Lila Hickey <lhickey@hq-dhcp-20-62.corp.continuum.io>
Date:   Mon Jul 13 17:52:08 2015 -0500

    adding documentation for 2.5.1 release

commit cb1b25331ff524188fc448c572b5d2e3218eb958
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 13 17:36:04 2015 -0500

    Update README.md

commit 78bce7749ef247d633391b03e39cfd663d91db11
Author: Will Warner <electronwill@gmail.com>
Date:   Mon Jul 13 16:24:48 2015 -0500

    Rewrite advanced installation
    
    Rewrite advanced installation instructions to clear up confusion
    surrounding presence or absence of .continuum folder, and many
    other problems.

commit 1aadebbf92a03295c3c9f918b8126d9bd0b22f0d
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jul 13 09:37:58 2015 -0500

    Update README.md
    
    adding some troubleshooting for build errors

commit e287d0710ce6c7e85dee788f6d34c2ebe9fc22c4
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Jul 9 09:47:12 2015 -0500

    Update README.md

commit 8ef64922dc580e734e5214f597273742035ff4ed
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 30 13:24:38 2015 -0500

    Update README.md

commit 62384bd6ef9aa6bea759ec4a739a27e6fc2caaf4
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Jun 26 15:30:14 2015 -0500

    removing references to cleanup branch, fixing Blaze links

commit bcd51898f2813dfb276e257251c76753b7d15ffd
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Jun 26 11:12:43 2015 -0500

    integrating Anaconda Cluster

commit f8a0b7fc1c9147fa810062b30c7ad6055068f1c5
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Thu Jun 25 09:50:19 2015 -0500

    Removing redundancy in README.

commit acdac5d9a77f17713bef8a27e3e8b8b44f9db073
Author: Will Warner <electronwill@gmail.com>
Date:   Tue Jun 23 16:36:19 2015 -0500

    Kernal -> Kernel
    
    Kernal -> Kernel

commit de27c10ba1bb8feaa84d406798933ef054250b99
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 16:00:21 2015 -0500

    formatting and clarification

commit d6d3e5871e50782f23bd448fa5328cd5011e128a
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 15:42:51 2015 -0500

    Formatting and clarification

commit 4e9a6341f2e653e244d8dca0454a9bfbd6e7fcf7
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 15:39:45 2015 -0500

    removing command line dollar sign per doc styles

commit f9bcaa2b5ba665b226d3d922184024d3ba6e374f
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 15:38:02 2015 -0500

    @srossross conjugation fix from master

commit 267c7e45fdbfc3869c88e3fcbd23ce6d1176f574
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 15:34:21 2015 -0500

    Updating Readme, including new instructions for the docs environment. Removing obsolete docs.yml and replacing with sphinx-docs.txt.

commit 52e78930f3027640c976a465b137d078ce9366fe
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 23 12:32:14 2015 -0500

    Adding username to rsync command for make live

commit 556317af59c5da68f39c4ee6eb025339d9b486a7
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Jun 19 18:04:07 2015 -0500

    fixing relative links in nav

commit ef5db952348e84bcf229e4c74acc06319abd385f
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Jun 19 17:47:56 2015 -0500

    adding hardware requirements

commit f00367568453266c49795fe78830d10513c56fd5
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 9 16:00:27 2015 -0500

    specifying webadmin user for test rsync

commit b91ada4a2c0504ac41e657796ab955b0c49ca2c9
Author: Amenity Applewhite <aapplewhite@continuum.io>
Date:   Tue Jun 9 14:40:21 2015 -0500

    menu and footer updates to match main website

commit fd67651849cbd1d49544034e3b4619e45c536868
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Apr 30 08:54:57 2015 -0500

    Updating for 2.3 release

commit a30d2b22084c87d6317dd0fa818fae00e2b35062
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Apr 27 12:58:59 2015 -0500

    updating per MattT's request

commit 771845e528d9d89152c0cb046ab95a96819c0220
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Apr 21 11:07:24 2015 -0500

    Anaconda Server 2.2.0 changelog

commit d7058866e94b0a2031b7da9058faba88f6f20691
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Apr 14 10:56:19 2015 -0500

    updating pypi mirror to include file storage warning

commit fb7de537d3f9573eab62f89e541f910e50daf2e4
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Apr 14 10:37:19 2015 -0500

    updating repository language

commit f16391b0a8dd69bfd37463c4cdfe147792bd69a6
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Apr 14 10:16:33 2015 -0500

    fixng title

commit 3a4af41750b21972d492b460619d54fd37404f6e
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Apr 9 09:37:01 2015 -0500

    including serve command

commit e0aa26a0b1c6fa258857484fa3a9c848e07464e3
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Apr 9 09:36:42 2015 -0500

    reverting to token instructions

commit 4477891b7c92617c3591062bcf59b275ff9767b0
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Thu Apr 9 09:26:19 2015 -0500

    reverting to token instructions

commit 32466b14600f9bf2d20ecac13d4d2a69ed31c2ab
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Apr 7 13:35:47 2015 -0500

    updating docs

commit ae242c9f52500dd9ea584c7a73708fd79ce27051
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Mar 31 10:53:05 2015 -0500

    removing unnecessary css

commit dee7488ffdbb5c64d7c1f86164b48a3801d2545e
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Mar 31 10:51:56 2015 -0500

    updating css

commit 217cd5135e1493e98d8c7a0f2bf965ac73109cbf
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Mar 30 14:22:19 2015 -0500

    updating some broken links/old info on installation

commit d7557078d9b17f419122b2540a94c94ad30117ed
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Thu Mar 26 19:19:36 2015 -0500

    center check marks

commit 0457915c9108dc0f5b4fa26f878e158efa6f30ad
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Thu Mar 26 14:59:08 2015 -0500

    add .fa-check

commit 0ed5b5be39ad29073613faf7ad2277da287aaf0c
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Thu Mar 26 15:01:03 2015 -0500

    add link to css

commit 7c78aa4904ef81fcf3f8a0a54fbb90d1011f12ab
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Thu Mar 26 13:20:57 2015 -0500

    remove automatic starting of web browser

commit a48a7ced8b485474aa1f92276456cf0fbfae2c4a
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Thu Mar 26 13:08:02 2015 -0500

    remove header.rst (which is now in anaconda/docs itself)

commit 2d84756baf076252f1ea0d818371f8fcc78bf148
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Wed Mar 25 17:24:28 2015 -0500

    small fixes for Linux

commit 74c6f519f56cda8025c405c2c719d00d32b0a089
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Mar 10 12:07:37 2015 -0500

    Update cas-installer.rst

commit f3f13074b64aa3a9082e3ac07dd615cc7d6bbaf0
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Mar 10 08:09:52 2015 -0500

    committing Anaconda Server changes

commit 75f7dffc7a3d73bc87c2931f02746acb7e9fee22
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Mar 2 19:03:57 2015 -0600

    updating docs.yml to be less specific

commit eca27ed4d5504f3b6bf9388f9b6f89d307792e7e
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Mar 2 07:35:09 2015 -0600

    syntax fix

commit 7837941d4fc6a177458f3aa81af14eca038851ae
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Feb 24 10:14:34 2015 -0600

    updating Makefile

commit 8a29f1b645e86117a01757fccdb6120fded1b42b
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Feb 24 10:14:16 2015 -0600

    updating layout, anaconda server language

commit cc2db1116d15180d7b5f594ba7c1b2ef61d8f353
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Feb 16 17:27:58 2015 -0600

    Update Makefile
    
    bugfix

commit f17d02119fcd891211dfae2f0e97e562b736bef5
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 11:02:46 2015 -0600

    updating gitignore

commit 5697af5b711e7a6672be989171a27b9a12ef5f9c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 10:45:40 2015 -0600

    protecting Makefile

commit 930ac7ac231366e5a1bc718112fd36904a074f1c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 10:43:44 2015 -0600

    protecting Makefile

commit 9b995d5722086337ad4bac89aac7fc13150ca71a
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 10:40:01 2015 -0600

    removing numba

commit 32d121fd50b1068d7cfb4bc5961d2705558f2bc0
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 10:38:45 2015 -0600

    protecting Makefile

commit cce20ec6b08e83e745b1579e5b57ad79a039796b
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 09:53:29 2015 -0600

    protecting Makefile

commit 50163ec6be2fd66d6d590147915e15d1dced282c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 09:04:34 2015 -0600

    protecting Makefile

commit 782ab0d5b4eb217967410510f3b3dc8b8528fb4a
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 09:01:44 2015 -0600

    protecting Makefile

commit 3495bed88a1d56106b3417ab3ad21de9865bda29
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 08:53:40 2015 -0600

    protecting Makefile

commit 4365f7a9be61ce617b396eafa94b27e0acd2c6ed
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 08:46:39 2015 -0600

    updating Makefile

commit 76805d4cc2e97364f82bafdb8e32b9c78a34b1f0
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 08:42:30 2015 -0600

    protecting Makefile contents

commit 4e9c388fd713ba7766e0898f917ca7b79d440f9f
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Tue Jan 27 08:28:16 2015 -0600

    updating Makefile to protect contents

commit 5b9cde197acae6e73ab8e21f5a9432e320bcf3b3
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 14:42:56 2015 -0600

    updating makefile to use cleanup branch for now

commit f9a7c85a6173d646398e50a33ed43ef2a282153b
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jan 27 08:30:50 2015 -0600

    Update index.rst

commit 74bc1105b1485ddb7a1cac5312ee35fc07ec54ea
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jan 27 08:29:23 2015 -0600

    Update eula.rst

commit b3df2b11787a4ff1927af5855e458a937ffc434b
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:36:00 2015 -0600

    Update recommended-workflow.rst

commit 8c38e3c3e86162ff9a3fc7833ac8ab9f10db6967
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:35:47 2015 -0600

    Update troubleshoot.rst

commit a8101ebd466ebb5750d695e50338a39e1834d180
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:35:35 2015 -0600

    Update user-administration.rst

commit 45e66384e57aae03b0a00bb4b105ebd575d1367f
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:34:53 2015 -0600

    Update maintenance.rst

commit 66362775bb2d1eea10388f3772ecd6d518b1a047
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:34:41 2015 -0600

    Update configuration.rst

commit 5fa9ebfca264b727a05e28bc32bdb6f51103c4af
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:34:23 2015 -0600

    Update advanced.rst

commit 765f5ab768aaaae97b357042833bb25adff4c7ae
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:27:06 2015 -0600

    Update index.rst

commit 74d52bbcb46a6a6e8a2b320da35e753acebbd4a7
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:26:23 2015 -0600

    Update index.rst

commit 7b87f2b936406cf009eb8d95f36cd56e49cb9c9c
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 22:25:31 2015 -0600

    Update index.rst

commit c24b9bd28fe89879829c5911a9d26c5aa53f8bc3
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 20:07:49 2015 -0600

    Update index.rst

commit 605ed5d7ba2f73148f8f06ff90e66af9b4e58f98
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 19:27:04 2015 -0600

    Update index.rst

commit 1bcd4c069d9491334b925e7e3b3046ba4f505060
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 19:25:46 2015 -0600

    Update cas-installer.rst
    
    removing introduction - to be placed in index file

commit 0c5df494ad422eb3e4b8ea63f28192ffb92132cf
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 19:11:47 2015 -0600

    Update index.rst

commit 2ef37416e93e17584cbace593ac8624fdb74d940
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 14:20:35 2015 -0600

    Update eula.rst
    
    update per Travis' request

commit e67c432910138061d53ea4c186be503b30e5c4b2
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Jan 26 18:08:26 2015 -0600

    Delete header.rst

commit 4f62947b5bd72a44343f036e4bd839b919a9c884
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 14:34:26 2015 -0600

    removing pyc file

commit 9f46f50b52fecfdbd526acfd0014420b42d448bb
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 12:01:21 2015 -0600

    removing llvmpy and numbapro docs

commit 7e3a42b450862e2a440ba7d436b0c80a57aa024a
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 11:52:49 2015 -0600

    removing IOPro, it has its own repo

commit 4b501f2d268c3106d3584a220ed160831bd58043
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 11:39:08 2015 -0600

    removing ashiba docs, they have their own repo

commit a6424f161ae8beb77f9a5e7181fffa5567886422
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 11:32:51 2015 -0600

    removing Anaconda docs, as they have their own repo

commit 65d187dacd5f0e01e73e7ead413b572b7e534bde
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 26 07:37:05 2015 -0600

    updating to remove TR docs from doc repo; they have their own

commit 3693febfde6fc21d321a6192f5468b2032669e54
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Fri Jan 16 10:37:33 2015 -0600

    Delete why-anaconda-server.rst

commit 3ae6a60f8af5e22bbdcfce5cacdb4f17c1560c58
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Jan 15 15:20:24 2015 -0600

    Update faq.rst
    
    updating to include info from https://github.com/ContinuumIO/anaconda/edit/master/docs/cas/faq.rst

commit abd65d7839a75410ed209bc4feb884732ea6e4da
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Jan 15 14:51:15 2015 -0600

    Update index.rst

commit 591a338f92087918897a84732c6e607f30f7af75
Merge: 0e75dba2 cc7a813d
Author: srossross <srossross@gmail.com>
Date:   Wed Jan 14 11:52:22 2015 -0800

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 0e75dba2cdc4d6f872107ad6e077815541f456f2
Author: srossross <srossross@gmail.com>
Date:   Wed Jan 14 11:51:47 2015 -0800

    FIX: specify minimum mongoDB version as 2.4
    
    cc @lilahickey @back2basics

commit cc7a813d120b1ed9b2f0136ba2b5f7094d218d0d
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Jan 13 13:30:06 2015 -0600

    Update docs.yml
    
    correcting sphinxcontrib-napoleon dependency

commit 8cdf836d675e0af37cc09bdf6ce205b6fa2b72e0
Merge: c6a058be ff05968e
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 12 16:27:40 2015 -0600

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit ff05968e46fdaf8a265a9d4e763106c670118800
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 12 16:27:00 2015 -0600

    updating

commit c6a058beabdc728b3d87c86e2b5fa683d0d0b0df
Merge: 42f6a5cf 9a165b96
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 12 16:26:17 2015 -0600

    Merge branch 'master' of https://github.com/ContinuumIO/docs

commit 42f6a5cf79b2ce8bfa5ece851cc542a6c683dc9c
Merge: 43e5ab75 9b1a0365
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 12 16:26:07 2015 -0600

    updating

commit 9a165b96ea21690d7212a99fd7755020df8b64a7
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 12 16:23:31 2015 -0600

    adding docs.yml environment file

commit 43e5ab752421e3063ad126c42e89c32da744d01c
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Jan 12 16:23:09 2015 -0600

    updating configuration

commit 9b1a0365e68360662a942339b5b8c89389abd1d7
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 12 16:04:03 2015 -0600

    updateing

commit a89f1208fc9cfdfb7f2b492bf57fb79d3b496b37
Merge: f66fed98 292adbfd
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 12 15:26:15 2015 -0600

    Merge branch 'master' of github.com:ContinuumIO/docs
    
    * 'master' of github.com:ContinuumIO/docs:
      updating Anaconda Server
      updating installation instructions for add-ons
      fixing makefile command
      updating to protect anaconda server info
      updating for new numpy dependencies
      updating Makefile info
      updating pkg doc generation process
      adding anaconda server faq
      updating more cstore inks
      removing strange special chars
      updating theme
      updating Anaconda Server
      removing on-site binstar mentions
      removing extraneous files
      updating anaconda server documentation

commit 292adbfd6293c14263e35490a07e9d1edc0b7c2e
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Fri Jan 9 11:30:54 2015 -0600

    updating Anaconda Server

commit 45bd9cd1b67595ac182edc4ec7d508005d52c08d
Author: Lila Hickey <lila.hickey@continuum.io>
Date:   Mon Dec 8 15:57:42 2014 -0600

    updating installation instructions for add-ons

commit 9b2d0aff4214ccbc87d7eba966e4bddc7bbd7d1b
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Wed Nov 5 11:09:57 2014 -0600

    fixing makefile command

commit 36d56554f895ab6632ce692ab21b43040e02bbe5
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Nov 3 20:38:09 2014 -0600

    updating to protect anaconda server info

commit 0dd4fd9c94b5cd86931b54a3e15de71c14e9a477
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Oct 16 17:10:14 2014 -0500

    updating for new numpy dependencies

commit bd7e28ab6e7db38dc7fda118f9b7987e20881ccb
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Oct 16 17:06:38 2014 -0500

    updating Makefile info

commit 9224425ddbf23490d938a9ab5dfc95890c01bd0b
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Oct 16 17:02:22 2014 -0500

    updating pkg doc generation process

commit 429ac41737908627dbad7de59eb08af516b82ca9
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Sep 23 16:33:55 2014 -0500

    adding anaconda server faq

commit 05e25f9269fffd0299518149e1dd6e79ca1a1a69
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Sep 22 11:49:48 2014 -0500

    updating more cstore inks

commit 5e5fa3d35aabe384843a3a0aaa7ac4808d5c0183
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Sep 22 11:30:55 2014 -0500

    removing strange special chars

commit 56d649de16a9dff965fa6b5d5a35ea38b1756fc3
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Wed Sep 17 14:41:31 2014 -0500

    updating theme

commit 8dd92c9a56f8b18191cecb27b0a1f695872ed4bd
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Tue Sep 16 11:36:04 2014 -0500

    updating Anaconda Server

commit 5f3dfdfab2de44bffe9f44f6d7f71d512bea69f9
Author: cbahr <corinna.bahr@continuum.io>
Date:   Mon Sep 15 16:34:26 2014 -0500

    removing on-site binstar mentions

commit 69c5183c92cabc2a99471608e72d837aa1a58014
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Sep 15 16:14:32 2014 -0500

    removing extraneous files

commit 4fc7fa2f259e12ece5e409c323fe9b3e3ba8c1b9
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Sep 15 16:12:07 2014 -0500

    updating anaconda server documentation

commit f66fed98e2bbba3170221355112bca9954da1f61
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 18:29:10 2014 -0500

    updating

commit 516de1eb99d9f5ba93ce66e4dca715b1e96d80be
Merge: a3569566 afd7926e
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 18:23:29 2014 -0500

    updating

commit a35695661e80e1b4ba4bdfa3eef5b527cdd0fb21
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 18:20:10 2014 -0500

    updating

commit afd7926ecf767ad441235b43be2815525eb35bca
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 17:58:25 2014 -0500

    Update index.rst

commit 155d05912dc9db0364d3407e64e18a869e6035a4
Merge: 3bd09b3f c2630842
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 17:51:14 2014 -0500

    Merge pull request #5 from ContinuumIO/launcher
    
    Launcher

commit c2630842fb3c86e23d5876946349ec31eb41cdb8
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 17:45:29 2014 -0500

    updating

commit 7ce1bc6c0471d18dfd29d48aa7642161e4d9e50a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 11 17:28:33 2014 -0500

    adding anaconda-lanucher files

commit 3bd09b3f5e91207b72393bc1cb370ff79ba8824a
Merge: 20537dfb a165027b
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Sep 11 12:58:32 2014 -0500

    Merge pull request #4 from ContinuumIO/update/as
    
    adding anaconda-server to build dir

commit a165027b21c2723cb112f8f6d7cd580ef07dc820
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Sep 10 16:52:25 2014 -0500

    adding anaconda-server to build dir

commit 20537dfb3ee3671f346fd9a37c485550eeb7ed4e
Author: Ian Stokes-Rees <ijstokes@spmetric.com>
Date:   Fri Aug 1 23:06:02 2014 -0400

    Call a spade a spade: just making the title a title, not a salutation
    
    This turns a semi-salutation into a title.  It feels a little terse, but is more consistent with what we're giving people.  The following content isn't a friendly "hey, how's it going, let's casually introduce you to what we've got", but instead a tabular meta-content index of the various documentation blocks.

commit 87469fa1dc04b48ed6247b39ae11d893d416492c
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu May 29 15:18:27 2014 -0500

    Update advanced-installation.rst
    
    updating code statements for consistency.

commit c2b774348cfde523eb3f21e56a7debf9d99a90df
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Mon Mar 10 14:18:01 2014 -0500

    adding advanced installation instructions

commit 86142b884d425fe7f8ff9d8dade1b6c87c1e7ca8
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Thu Feb 20 08:58:00 2014 -0600

    reverting layout

commit 4d1afedd6dfdd557bd5552696edb2b21075c0209
Merge: 3ff97bcd 03d3bdb8
Author: LilaHickey <hickey.lila@gmail.com>
Date:   Wed Feb 19 14:24:03 2014 -0600

    merging master with test

commit 3ff97bcd2ee924f126d526df1435ef5cd0b64258
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Feb 17 14:22:59 2014 -0600

    updating

commit 21d55d1ca4424180c80642184661f1e0ca405657
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Feb 11 12:27:58 2014 -0600

    redirecting conda pages to conda.pydata.org

commit 08b8ce72810ad8d5afd13ff6514db5b6c95fd7dc
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 30 13:14:35 2014 -0600

    adding anaconda-server

commit c41c0aba6695de848b4638e278023b4ee60ff315
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 30 12:10:24 2014 -0600

    fixing faq

commit 03d3bdb892d145c1f76379b7960158554771656d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 30 12:09:44 2014 -0600

    fixing faqs

commit beb702a843dbc66a9172bd82bf76a6287c6e6ad3
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 30 11:05:04 2014 -0600

    updating

commit 83ed195533d09193add841421b53f9ea27ecba79
Merge: 34d4dd53 60785907
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jan 29 17:34:05 2014 -0600

    merging test into master

commit 607859074e7faf3041d4d7afe58500237f55cb4d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jan 29 12:34:45 2014 -0600

    updating logo

commit d52a1839ee7a014f7a273c47cacac1f1fdf7cde5
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jan 29 12:19:25 2014 -0600

    updating files

commit 8625611e774f49fdf1c40c68dd1862a96506f70f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 28 18:43:09 2014 -0600

    updating docs to new design

commit 34d4dd5306b34c473dab552deb9a4d82c557ee5f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 27 18:03:47 2014 -0600

    updating links

commit c30b46d425921cc2cd498732f16458c78bece484
Merge: af21af62 4953f4ba
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 21 14:47:35 2014 -0600

    Merge branch 'test'
    
    * test:
      updating conda
      updating get started mkl
      updating
      merging in build from master
      updating conda docs
      updating
      updated rsted
      updating new website design
      updating docs
      updating docs
      updating docs
      updating docs
      updating services link in footer
      adding conda landing page
      updating address
      updating address
      updating for anaconda 1.7.0 release

commit af21af628501c715256c49ec48515589d1b562ec
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 21 14:47:18 2014 -0600

    pulling in changes from test

commit 4953f4badb1c94cad4c8318b8301e8ec20d3b773
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 21 14:46:25 2014 -0600

    updating conda

commit 3973ff6207ce0aa3214395636b4186e636a47903
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 21 14:42:29 2014 -0600

    updating get started mkl

commit aedb1a6d7df55689a237239cbdda456a5f80167f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 21 14:40:35 2014 -0600

    updating

commit 7db7397473327bdc1029909f9e47188c337cdbf3
Author: Maggie Mari <maggie.mari@continuum.io>
Date:   Tue Jan 14 11:54:49 2014 -0600

    Fixed broken numba docs examples link, updated examples page.

commit 892510e9009a4c0cf91993e7bfb5bb602b6e7833
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 13 11:47:25 2014 -0600

    merging in build from master

commit 54c6defb7c8e812ac47c04890a6f71557384620a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 13 11:44:08 2014 -0600

    updating

commit 6b13d96a8548514b126c7eac8bcfb03f414de60f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 13 11:43:35 2014 -0600

    updating conda docs

commit 3b903518143e485ce99c0af3fba4fcb65e735f3f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 13 11:32:21 2014 -0600

    updating conda docs

commit c1af4d6b42e68cea477b6efe3f209b653f57ae9a
Author: Maggie Mari <maggie.mari@continuum.io>
Date:   Mon Jan 13 10:59:13 2014 -0600

    Updated old numexpr link in accelerate and mkl docs.

commit 40acf6c7a1c44416d1791dd5729b3d8f6948bf4d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 10 16:13:56 2014 -0600

    updating

commit 2139aa52614e577b05306527083e04d226f75245
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 10 16:12:23 2014 -0600

    updated rsted

commit f7617e4825dc86dbab2b6b9d86c546f21531b3cb
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 10 16:11:24 2014 -0600

    updating new website design

commit e634b5a56948fefdb80995df1f78b11b6a3b0db0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Nov 18 18:47:08 2013 -0600

    updating docs

commit b30ad8c180204fe6a91a0524f1ac674fd92aae8a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Nov 18 18:46:00 2013 -0600

    updating docs

commit e5483e788ee1feecae120a68afe4e8fea7e92a90
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Nov 18 18:43:46 2013 -0600

    updating docs

commit fffc11f8500be8032466ca89b12ace8cc75e740a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Oct 29 09:05:41 2013 -0500

    updating docs

commit 85915f1f2519cbdecedbd9491ff295b144128ba2
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Oct 21 10:25:29 2013 -0500

    updating services link in footer

commit b37945ba082c2d46075758cb3adbb9e6e56a2a66
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 10 16:19:31 2013 -0500

    adding conda landing page

commit c170d109c5d1d455576c597dddb939915491dc93
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 10 14:24:22 2013 -0500

    updating address

commit 4b07a2058fddbd02c380dcb58bd3d0b38626b4cb
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Sep 25 12:15:28 2013 -0500

    updating address

commit 6cc96180f35fb310745a86468e7f42503c669bb4
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Sep 16 16:35:30 2013 -0500

    updating for anaconda 1.7.0 release

commit 602578494813e6c99a7af798beab86e2422a5985
Merge: 82636a48 9a495883
Author: Xavier <xacadena@gmail.com>
Date:   Mon Sep 9 08:41:42 2013 -0700

    Merge pull request #3 from ContinuumIO/test
    
    Test

commit 9a4958832eb57487cbc89f1a63d6c8e1120c3cc4
Author: Ghostface-jr <xacadena@gmail.com>
Date:   Mon Sep 9 10:36:50 2013 -0500

    ashiba docs

commit 97e06d4787bc83caa6a973bcf28ec12d09098ed2
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Sep 5 19:35:50 2013 -0500

    updating conda docs

commit 1fa6e6f018b30ec84fe665a476b82d9824f3b812
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 21 19:56:14 2013 -0500

    updating docs

commit 82636a48e52fcd2eeae2a345bb50574fd1a0849c
Merge: e7115c5f 20b95c82
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jul 23 10:53:00 2013 -0500

    merging changes in from test

commit 20b95c8204e0b1c6068bcb0bf7f6023fa965777f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jul 23 10:50:29 2013 -0500

    updating conda docs

commit e775fe7d8e1f4680113a5806fb80d5b703625cdd
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jul 9 17:19:19 2013 -0500

    updating theme and numbapro docs

commit a87ebeccd9bad24a3a5f22d00efe1ac713de635d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jun 21 16:44:30 2013 -0500

    updating docs for anaconda 1.6 release

commit 0d162e65187599430e4b8215f90cc0c3bef508a3
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jun 21 16:01:20 2013 -0500

    updating make file

commit 46debea6f35802dc8ea013fcdcd9db9d1509565f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jun 18 14:48:57 2013 -0500

    updating docs

commit e7115c5fa0b92feb659dc371267387f76d3d15e3
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jun 18 14:31:09 2013 -0500

    fixing links

commit 0c0b1713e433806f9215feaf7ea0cee8d302b634
Merge: 992a2d67 55293fcb
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jun 13 11:27:54 2013 -0500

    Merge branch 'test'
    
    * test:
      updating docs
      updating makefile for init_conda
      updating makefile
      updating makefile
      updating make file
      updating docs
      updating makefile
      updating make file and layout
      updating makefile
      updating docs
      removing unneeded files from imgaes'
      updating docs repo
      adding search to docs
      updating anaconda docs
      updating guardfile
      updating documentation
      updating docs
      committing changes
      updating Makefile

commit 55293fcb5af4df585740508caf566b94c634e824
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jun 12 18:03:00 2013 -0500

    updating docs

commit f7ec849ef7f4b9306cdf90d09c68a54f6a1234a1
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jun 12 13:58:08 2013 -0500

    updating makefile for init_conda

commit a18a3b2123b9251803e2a84bb7323b4319f51f40
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jun 12 13:25:13 2013 -0500

    updating makefile

commit ebafc9cf67b10066f1def23ba857bcb71e4619ad
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Jun 12 13:10:57 2013 -0500

    updating makefile

commit c9e41c2364992faaa5dbacb2c40602c815679cd5
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jun 10 17:18:04 2013 -0500

    updating make file

commit a7bf9f8a50cb9d065cd4729cc3bf6ac5ceca9cbb
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jun 10 12:55:57 2013 -0500

    updating docs

commit 6085c0190563573f94299d57264beb1940abaa93
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jun 10 12:29:18 2013 -0500

    updating makefile

commit 6e50e25b7fd159525b69efae824483fdded48143
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jun 10 11:07:11 2013 -0500

    updating make file and layout

commit 53b24bea9d17ae9b3197a1c98e977280f7dca2d0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jun 4 17:23:22 2013 -0500

    updating makefile

commit 992a2d67313e6cdf925e403f6de8d7440ac928c5
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 22 15:00:52 2013 -0500

    Update README.md

commit c22429bbe13148571b91901a71ddc01c5824e2ac
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 22 14:53:34 2013 -0500

    Update README.md

commit fb9b0c6d6897cde6886084f526dc3d693253b1ce
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 22 12:36:19 2013 -0500

    updating docs

commit 143e78d98ae45a87da3115fb231f8823672e3fb6
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 22 12:16:22 2013 -0500

    removing unneeded files from imgaes'

commit 24179e191dd75db32589e4ea69790340d015102c
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue May 21 18:43:47 2013 -0500

    updating docs repo

commit 4bf29596973d07ed8689fbc4218bbb2cd6e67503
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon May 20 11:49:29 2013 -0500

    adding search to docs

commit ba327d2ffb177f84ea6e6f6fcca13a02afd99492
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri May 17 14:18:10 2013 -0500

    updating anaconda docs

commit 3083bf3fd0c20e559e4e1e74d1dfee90cbdaa7f0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri May 17 14:15:13 2013 -0500

    updating guardfile

commit 31eac11763c9c14c7d4287b5e4ac8b03e8b71fad
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu May 16 17:06:19 2013 -0500

    updating documentation

commit 27a777992c1fef4ac19581d6cc99875d11fa76f9
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 15 17:30:48 2013 -0500

    updating docs

commit 5a6bbab7bb708fd542c42a842d6790926e1ce51b
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 15 09:40:03 2013 -0500

    committing changes

commit e6cd22e06f76fc836cee48dca74931b30860ed44
Merge: 244232f9 7647e9df
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:44:32 2013 -0500

    Merge branch 'master' into test
    
    * master:
      removing auto_examples folder creation
      removing uneeded extension for scikitlearn

commit 7647e9df418e16821e16c65628b437a583614581
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:43:57 2013 -0500

    removing auto_examples folder creation

commit c4534b578b67a1c979beb21beecf9bf5cdcebcda
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:40:04 2013 -0500

    removing uneeded extension for scikitlearn

commit 244232f9b94e6170d5e05527a922f14f8fe97343
Merge: 6c91c527 c78d03f8
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:36:09 2013 -0500

    merging changes from master

commit c78d03f8763d2956f9a6a205648c5fa7801d2038
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:34:50 2013 -0500

    adding test branch to Makefile to protect master

commit 89ddd3886f6512ba080be6d036f49a1e61376780
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:30:56 2013 -0500

    updating makefile

commit 6c91c52713826995c1a6fca4e3b6f98ef635a4eb
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:30:15 2013 -0500

    updating Makefile

commit 2bd73b81cb409db3a80c9d8f76e449a7404c6102
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:19:12 2013 -0500

    Update README.md

commit e20af8b4e017939d1962a2a6bdc804d80e9d7f00
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:17:34 2013 -0500

    readme

commit 8a4e537a2263629ba6d0eea36736ba5923f1887d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:16:26 2013 -0500

    fixing readme formating

commit cce9179bd3695d8ad85f4e05fc05a797d5da933d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 16:05:13 2013 -0500

    updating readme

commit 7bd056a5b4d013c6ae587641197a6b01398f037e
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 15:57:57 2013 -0500

    updating docs repo

commit de44278f7b54ccc620227972de16484884299c43
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 8 09:00:30 2013 -0500

    created docs makefile and removed update.sh

commit e7a414c3063a146bef9c98972838f4f169f95ad0
Author: Benjamin Zaitlen <quasiben@gmail.com>
Date:   Mon May 6 20:38:03 2013 -0500

    adding TR CONNECT docs

commit 80eb612f8d427026a5b743dade4e044570889d90
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 1 16:13:14 2013 -0500

    formatting mkl optimizations page

commit 9229baf3d4e61a2b0ffd974aeacfb8ea4aaf1f75
Merge: b906e0b4 d16bd487
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 1 15:56:45 2013 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs
    
    * 'master' of github.com:ContinuumIO/docs:
      Modified placement of links to mkl-service in MKL Optimizations and Accelerate index pages.
      Removed mkl-service from top level index, added link and supporting dev doc text for mkl-service to MKL Optimizations index.

commit b906e0b43b31d6fbe9b7e5b4e5db20c542d26952
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed May 1 15:56:39 2013 -0500

    updating mkl

commit d16bd4877fcc5fa509002c0abc65f580acfaf2c4
Author: Davin Potts <davin.potts@continuum.io>
Date:   Tue Apr 30 16:02:41 2013 -0500

    Modified placement of links to mkl-service in MKL Optimizations and Accelerate index pages.

commit 8b4257c77ac302f9c4972550a05cc68c2028add2
Author: Davin Potts <davin.potts@continuum.io>
Date:   Tue Apr 30 15:11:35 2013 -0500

    Removed mkl-service from top level index, added link and supporting dev doc text for mkl-service to MKL Optimizations index.

commit d10bca4cfd7b16e189efe229002b0b9786902090
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Apr 30 10:46:09 2013 -0500

    updating mkl copy

commit 3f2f6ddcb3dcb0754d424dad7a99b39dfd19c482
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Apr 30 10:44:58 2013 -0500

    updating copy for mkl and updates.sh

commit 7cbbf5ef02cf13a7873fcd9a2c9edfbc012b13e2
Author: Davin Potts <davin.potts@continuum.io>
Date:   Mon Apr 29 16:40:35 2013 -0500

    Corrected conda commands for use with MKL Optimizations, added MKL Optimizations EULA to top-level index.

commit 8ead154ca1069b6ba7864bf470315fbc7da6e427
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 15:30:08 2013 -0500

    Added index for MKL Optimizations, changed format on Accelerate index to match.

commit feedc89abef085d7f5c9dce25313d63ef4b31fd6
Merge: 5b61dadc 80eb349a
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 15:22:22 2013 -0500

    Reordered content a bit and fixed some formatting on index for Accelerate.

commit 5b61dadcc3c848e35d7fa9c0d2b490613fa11139
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 15:20:16 2013 -0500

    Reordered content a bit and fixed some formatting on index for Accelerate.

commit 80eb349a5c2f0ca54f0ef5b307426a62c4f2c990
Merge: 986a43e8 0ccbdd2f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Apr 26 14:04:46 2013 -0500

    cleaning up docs

commit 986a43e8fe9e407b2b237a4063e434806c82df4a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Apr 26 13:32:16 2013 -0500

    cleaning repo

commit 0ccbdd2fb166aa139e73dff97771f4b04890604b
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 12:51:23 2013 -0500

    Corrected formatting and updated Accelerate index page to reflect changes in new release.

commit 9d745425c4c85680a2f922ccb3b6002e7e2012be
Merge: 856244fc 16192b8c
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Apr 26 12:26:31 2013 -0500

    Merge branch 'master' of github.com:ContinuumIO/docs
    
    * 'master' of github.com:ContinuumIO/docs:
      Fixed names for scikit-image and scikit-learn in index list to use hyphens and not dots.
      Added MKL Optimizations EULA.

commit 16192b8c7cc66d1e5ddc1e107b03885487a3964b
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 11:59:46 2013 -0500

    Fixed names for scikit-image and scikit-learn in index list to use hyphens and not dots.

commit bc4e8411b525c0b29b7a8223204500d2ffeb50bd
Author: Davin Potts <davin.potts@continuum.io>
Date:   Fri Apr 26 11:39:00 2013 -0500

    Added MKL Optimizations EULA.

commit 856244fc69d6ae5b0e4658ed7277adf8edf6502a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Apr 24 13:17:26 2013 -0500

    removing wiserf

commit 1dd9b1eff7b5b0e153a2bcec8baddade3aa0b6f0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Apr 24 12:19:30 2013 -0500

    updating gitignore

commit 754f8d6301b53f664ef122f01a3f3ad8a65658d2
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Apr 24 12:17:33 2013 -0500

    updating docs for mkl-service

commit 1a489ad294d1250c620464de70f96347a91fdf91
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Apr 22 12:04:43 2013 -0500

    removing updates.rst as it is redundent to README.md

commit 245d759ec907a9f7364f4c87dc9d2a78e9cf7614
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Apr 22 12:02:20 2013 -0500

    updating the repo README.md file

commit 12bd87c874e0a7ff0271969e2279eedfc0d6991d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Apr 22 11:55:57 2013 -0500

    creating init.sh and update.sh files to make it easier to manage the documentation

commit a3cedba3d0cd46668cc324d76983f1f3ecd22252
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Apr 22 08:42:52 2013 -0500

    deleteing files not needed in project

commit 8af92bb51e248c1272307a6f540c4c61104c5758
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Apr 22 08:28:47 2013 -0500

    pushing updates to git

commit 92ca4acb28eb0e3dbef8ad6fc300c39ec8d4c22f
Author: James K. Lowden <jklowden@schemamania.org>
Date:   Wed Apr 17 19:47:39 2013 -0400

    first try

commit 6ff39b501ed2f7b51c178d889ffe556dd41318cc
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Mar 13 12:56:00 2013 -0500

    updating docs

commit fb538ba56f7bfcc27248bd2189424334e756c279
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Mar 12 13:00:28 2013 -0500

    updating docs

commit 4aad84e8d0883bc4ac9010eb78e1c3d2c11c0d67
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Mar 11 13:50:06 2013 -0500

    updating docs for 1.4 reposition

commit 5b4a0c05243a90c517705d93cb560ea10551ae36
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 25 11:41:04 2013 -0600

    pushing up changes

commit 560f52bcde6b7874b541abdfe267413b0b14b900
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 24 11:21:26 2013 -0600

    adding put into repo

commit 503cbef66ff2ae3988397294afc584c8310923fe
Merge: 97e77801 2d8fe91a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 24 11:19:47 2013 -0600

    updated repo for anaconda 1.3 release, merged with 1.3release branch

commit 2d8fe91aaae6ec641659cb9bad03db0058296b6a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 24 11:06:24 2013 -0600

    adding eual_numbapro back in

commit 42f53b0519a60d747813272b818bb7de7a3deaf6
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Jan 24 10:58:27 2013 -0600

    updating for site

commit 97e778017c2201823ddf43469d7972de8bd3e978
Author: Maggie Mari <maggie.mari@continuum.io>
Date:   Mon Jan 21 15:05:52 2013 -0600

    Updated anaconda faq to include question about virtualenv, linking to conda create command.

commit 2a10e9960313c1cc5123b3784d73481a40ac88a3
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 18 14:05:43 2013 -0600

    updated stage.sh file

commit f4a671cb0a4e9969f5d408e1045b1668c2bb79d8
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 18 12:28:26 2013 -0600

    updating docs for 1.3 release

commit 9d6a1b66f41e1d34f0ccde3395b10cfb17f76a1f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Jan 18 11:34:09 2013 -0600

    updaing for 1.3 release

commit 06ba7c58eb7bacfdf4ab7a38b821fb2f1caca3d5
Author: Maggie Mari <maggie.mari@continuum.io>
Date:   Wed Jan 16 10:41:57 2013 -0600

    Updated the anaconda faq

commit 53cf4e5dc9f5a3b240b18f983ab172f073d9ed4b
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 15 08:53:40 2013 -0600

    Fix CRLF

commit c95abd42f4f38956cdecbbe95859601622c718a3
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Jan 15 08:52:40 2013 -0600

    Fix CRLF:

commit 2c755abe227f14a36213a6067932ac4a63a241e0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Jan 14 16:41:14 2013 -0600

    updating docs for 1.3 release

commit e4c8eb1a6ace3b86bc5c9f539551f6ae5efe5590
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Mon Dec 17 11:33:28 2012 -0600

    update main index not to mention Anaconda Pro anymore

commit 4f5fe511f5cf151ffd1e3a0c111f5b15d64344db
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Dec 17 10:53:45 2012 -0600

    updating conda docs

commit 6d61cc4c990fb24115860af7c6947c22a7103713
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Mon Dec 17 10:38:18 2012 -0600

    rst fixes to readme

commit 3a4fc2f52785cd9966ef6cc37e6f13dfb6037a0d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Dec 13 08:51:26 2012 -0600

    changes to anaconda install.rst

commit dad13b1629443a26bb70990d5c666a1e1706e74d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Nov 27 16:17:22 2012 -0600

    updating conda docs

commit d3df61042aa001d1cfc8019a89ce944634735976
Merge: b39a0fa4 c1e33a0d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Nov 27 08:11:55 2012 -0600

    updating docs for anaconda 1.2.1 release

commit b39a0fa41be7d005cf5eaf70736ea20da8be11e8
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Nov 27 08:09:32 2012 -0600

    updating docs for anaconda 1.2.1 release

commit c1e33a0d27c7d2df42eb76e8a7952671c61e8e92
Author: Travis E. Oliphant <teoliphant@gmail.com>
Date:   Tue Nov 27 02:04:00 2012 -0600

    Change conda documentation to reflect changes to Anaconda messaging (dropping Pro)

commit 0614e1c145c42899049f895bb5699504f500cef6
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Nov 21 14:35:12 2012 -0600

    updating anaconda, iopro, and matplot lib docs

commit 6fe0be5591c703dcf941c5c5f4e7b89f2804cdef
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Nov 16 14:43:59 2012 -0600

    fixed pkgs.rst file

commit 8af8140b7ec46435b6532b6f009107c4fd8d566c
Author: Troy Powell <troy.powell@continuum.io>
Date:   Fri Nov 16 12:25:52 2012 -0600

    updated very to vary in pkgs.rst 1.1

commit 33fab6d0e10923d1802120c3f192252ffd691595
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Nov 15 15:15:00 2012 -0600

    modified gitignore file

commit bcfd1cebdc8f4e220428f8d7b0e1b4b18225414f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Nov 15 15:12:16 2012 -0600

    killing .DS_Store files

commit 336f95680836499185e83ae4969745153dbcf3a2
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Nov 15 15:07:27 2012 -0600

    updated path requirements for anaconda install

commit 8523145e50da806d733c25662d647a664605683a
Merge: fd5d00d6 e45ec6fe
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Nov 14 17:34:49 2012 -0600

    fixed pkgs.rst file after merge

commit fd5d00d662149835cd1bb6e76d6a3cfaa692ac04
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Nov 14 17:31:41 2012 -0600

    updating final changes to 1.2

commit e45ec6fe9de00499d800dfb5f3d0fd8fc48c168b
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Wed Nov 14 03:24:56 2012 -0600

    better footnotes

commit e5b822555bf6271f774cf1e8c2940d7de65f569b
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Wed Nov 14 03:03:05 2012 -0600

    fixed legend

commit 86dd4b99a97169e98ae7637573d7959c770e3811
Author: Ilan Schnell <ilanschnell@gmail.com>
Date:   Wed Nov 14 02:56:11 2012 -0600

    update package list

commit a561150dfc77701b6f6e048ef448b367fa945458
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Nov 13 18:03:04 2012 -0600

    updinting docs for anaconda 1.2

commit bd5debb50f22e1d87157e80fa63a395c5d7b3872
Author: Troy Powell <tpowell@MathBook Pro.(none)>
Date:   Mon Nov 12 17:16:11 2012 -0600

    adding conda docs

commit 7d961dbc34b3a83fa26c59aae212a7a6867b7076
Author: Troy Powell <tpowell@MathBook Pro.(none)>
Date:   Mon Nov 12 17:14:13 2012 -0600

    updating conda

commit b9ee82012af223e00ee2662c232961061a5ba7e0
Author: Travis E. Oliphant <teoliphant@gmail.com>
Date:   Thu Nov 1 18:06:03 2012 -0500

    Update Anaconda for windows instructions to include how to run Matplotlib.

commit 1272bcfeeb58d5e29d36bae31716b88d96b199fd
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Nov 1 16:40:22 2012 -0500

    Update README.md

commit e56914cd1b5f631b5f94de8ff9850165a797ed4b
Author: Troy Powell <tpowell@MathBook Pro.(none)>
Date:   Mon Oct 22 21:35:25 2012 -0500

    updated anaconda install documentation install.rst

commit f463070fb44a91d8ba4a7f7ba7b40e77fb054a9c
Author: Francesc Alted <francesc@continuum.io>
Date:   Mon Oct 22 19:43:09 2012 +0200

    Fixed a misspelling of PyTables

commit 4f38fcc4101ad3ae3e26b514c5a414372ddd9e38
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Oct 15 09:27:55 2012 -0500

    updated anaconda install from 1.0 to 1.x

commit c9e473225d819782539d6bb3a5f4b3e9a3a17520
Author: Troy Powell <troy.powell@continuum.io>
Date:   Mon Oct 15 07:40:15 2012 -0500

    updated iopro, numbapro, anaconda

commit 1a4d91e202d5d86ef2cc70215e5fc68fc2386ce1
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 11:37:36 2012 -0500

    added files to .gitignore

commit d5e885f06254a40db7acbf76aaacd991ae2db909
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 11:34:45 2012 -0500

    Update updates.rst
    
    Changes formatting a bit

commit bd0232c6508ef5a491c71ed8846091ee818d77fd
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 11:33:42 2012 -0500

    Update updates.rst
    
    Updated doc to show the 1026 error fix durring html make

commit b769b25f03688670afeff8bd9c7a4ff98846f4f7
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 11:11:50 2012 -0500

    updating docs

commit 7d720de018f29907c30e360a5b15a6fb9466e129
Author: Mark Florisson <markflorisson88@gmail.com>
Date:   Thu Oct 4 17:00:44 2012 +0100

    Mark some features as experimental, actually add numba and numbapro documentation

commit 4aab6680841ceeddaa0932a2e60bb22d1475102a
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 10:56:34 2012 -0500

    moved docs out of anaconda and to docs directory

commit 792c9da351cb14ef3d7252b428446a2580d98d3d
Author: Troy Powell <troy.powell@continuum.io>
Date:   Thu Oct 4 10:55:28 2012 -0500

    stream lining docs

commit d859018ab60714a94225d309bb7ec241256d850c
Author: Mark Florisson <markflorisson88@gmail.com>
Date:   Thu Oct 4 16:32:33 2012 +0100

    Merge in numba and numbapro docs

commit 357dc890048a0b40554d588bce5cc2ad1eead787
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Oct 3 10:00:23 2012 -0500

    updating docs

commit e459d2ea0705ee6b4d59538631403c136a7b9e48
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Sep 19 08:27:31 2012 -0500

    updating docs

commit aaa2b189b03515dbfbc84965c678dd625e24235c
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Sep 4 09:45:25 2012 -0500

    made changes to anaconda docs and interconnects

commit 7a153f3ad9da632680ba625d211c99d7dfacb96f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Sun Aug 26 16:47:30 2012 -0500

    reducing size

commit 9dbd55945ba778c4c30efebf70c0be8cb4d2330f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Sun Aug 26 16:35:16 2012 -0500

    updating gitignore

commit f45aae6b6f521d486e2c26e67e42a18694f249b0
Author: Troy Powell <troy.powell@continuum.io>
Date:   Sun Aug 26 16:26:23 2012 -0500

    added git ignore

commit 25a0c816ea06ec54fd12e421dc71d1ab08cdd273
Author: Troy Powell <troy.powell@continuum.io>
Date:   Sun Aug 26 14:04:55 2012 -0500

    pushing new rev of docs

commit cefa10c1b47371e27ee7b275f2836f20f7ec2c3f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 22 10:46:32 2012 -0500

    removed gevent tutorial

commit 4fdc292704ac19c223adcd33d9ce78c2ba2647dd
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 22 10:42:50 2012 -0500

    gevent-tutorial changing for some reason.

commit 5362ea6facecf931b3e6ed785f3a4057cae67a0f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 22 10:41:13 2012 -0500

    missed a file again?

commit ad39a065bec64b7b7706f21e009d229a1bffe1bc
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 22 10:40:29 2012 -0500

    missed a file

commit b37af10d7932f7d841f32ebe9d411f336e87723f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Wed Aug 22 10:39:57 2012 -0500

    Moved Docs from anaconda-launch to its own repo

commit 1191f0a6adb77b742a8cf0fee52c40688a0af88f
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Aug 21 14:25:46 2012 -0500

    Merge Anaconda into Docs as subdirecotry

commit 884d809000142a9b84a2746520fa960296b84156
Author: Troy Powell <troy.powell@continuum.io>
Date:   Tue Aug 21 07:31:23 2012 -0700

    Initial commit
