Merge branch 'master' of https://github.com/BerkeleyLearnVerify/Scenic

BerkeleyLearnVerify · May 20, 2020 · d486a20 · d486a20
2 parents 1c7a55d + aa0b1e2
commit d486a20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/docs/credits.rst b/docs/credits.rst
@@ -1,8 +1,12 @@
 Credits
 =======
 
+If you use Scenic, we request that you cite our `PLDI 2019 paper <https://people.eecs.berkeley.edu/~sseshia/pubs/b2hd-fremont-pldi19.html>`_.
+
 Scenic is primarily maintained by Daniel J. Fremont.
 
+The Scenic project was started at UC Berkeley in Sanjit Seshia's research group.
+
 The language was developed by Daniel J. Fremont, Tommaso Dreossi, Shromona Ghosh, Xiangyu Yue, Alberto L. Sangiovanni-Vincentelli, and Sanjit A. Seshia.
 
 Edward Kim assisted in putting together this documentation.
@@ -22,3 +26,4 @@ Finally, many other people provided helpful advice and discussions, including:
 	* Jonathan Ragan-Kelley
 	* Sriram Rajamani
 	* Marcell Vazquez-Chanlatte
+
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -26,7 +26,8 @@ Either of the options above should install all of the dependencies which are req
 Scenarios using the `scenic.simulators.webots.guideways` model also require the ``pyproj`` package, and will prompt you if you don't have it.
 
 .. note::
-
+        For Windows, we recommend using `bashonwindows (the Windows subsystem for Linux) <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`_ on Windows 10.  Instructions for installing poetry on bashonwindows can be found `here <https://python-poetry.org/docs/#osx-linux-bashonwindows-install-instructions>`_.
+
 	In the past, the ``shapely`` package did not install properly on Windows.
 	If you encounter this issue, try installing it manually following the instructions `here <https://github.com/Toblerity/Shapely#built-distributions>`_.