glossary moved. minor wording changes

Author: masinter

content/en/_index.html

@@ -20,13 +20,13 @@ <h1>The Interlisp Revival</h1>
 </header>
 
 <div>
-<p>Welcome to the start of a new chapter in computing! We're a group of software developers making the Medley Interlisp system available for use on modern computer systems.</p>
+<p>Welcome to the start of a new chapter in software preservation and computing. We're a group of researchers, software developers, and friends working to make the Medley Interlisp system available for use on modern computer systems.</p>
 
 <p>The Medley system was created at Xerox's Palo Alto Research Center (PARC). PARC was the cradle of the modern graphical user interface and its design thinking continued with the development of Medley Interlisp, an extensible graphical operating system with nearly limitless possibilities for customization. Whatever the task, using Medley you can design a custom workflow to help accomplish it.</p>
 
-<p>Interlisp was first released by Xerox and distributed commercially until its development ceased in the 1990s. Until 2009 it survived only in the hands of a few of the original developers, but now this classic software system is running again on your favorite operating system. This project is more than a trip down memory lane: our mission is to expand the scope of what Medley can do, fulfilling its promise of software tools limited only by the user's imagination. Dive in and explore the language, the tools, and the myriad applications, experiments, and playful creations that were crafted in and for Interlisp.</p>
+<p>Interlisp had its beginnings as a DARPA sponsored Lisp environment for reasearchers. Interlisp was then ported and expanded into Interlisp-D, first released by Xerox and distributed commercially until its development tapered off in the 1990s. Now this classic software system is running again on your favorite operating system. The project is more than a trip down memory lane: our mission is to expand the scope of what Medley can do, fulfilling its promise of software tools limited only by the user's imagination. Dive in and explore the language, the tools, and the myriad applications, experiments, and playful creations that were crafted in and for Interlisp.</p>
 
-<p>Feeling confused by the jargon? Don't worry, we've got you covered. <a href="project/glossary">Check out our glossary</a> to learn the terms associated with our project.</p>
+<p>Feeling confused by the jargon? Don't worry, we've got you covered. <a href="history/glossary">Check out our glossary</a> to learn the terms associated with our project.</p>
 
 <p>Most software in this project is licensed under the terms of the <a href="https://github.com/Interlisp/medley/blob/master/LICENSE">MIT license</a>.</p>
 
@@ -42,7 +42,7 @@ <h3>What do all these terms mean?</h3>
 <p>With over five decades of history and many design iterations, there are a lot of names and other vocabulary associated with the project. <a href="project/glossary">Visit the glossary</a> to learn more.
 </p>
 <h3>Have other questions?</h3>
-<p><a href="medley/project/faqs">Our FAQs page</a> addresses other common queries about the project.</p>
+<p><a href="/project/faqs">Our FAQs page</a> addresses other common queries about the project.</p>
 </div>
 
 <!-- >{{< carousel items="1" height="500" unit="px" duration="7000" >}} -->

content/en/software/install-and-run/running-wsl.md

@@ -4,8 +4,10 @@ weight: 20
 type: docs
 ---
 
-
 Medley on WSL involves installing and maintaining the WSL subsystem within Windows. When installing and using Medley on WSL, you are working within Linux. Some familiarity with Linux and the Linux command line is helpful.  Medley on WSL is best for users who are running WSL anyway and/or prefer working in a Linux environment. Medley sees the WSL file system, and Windows files appear under "/mnt/c/", e.g., Windows download will be in "/mnt/c/Users/yourname/Downloads").
+=======
+Medley on WSL involves installing and maintaining the WSL subsystem within Windows. When installing and using Medley on WSL you are working within Linux. Some familiarity with Linux and the Linux command line is helpful.  Medley on WSL is best for users who are running WSL anyway and/or prefer working in a Linux environment. Medley sees the WSL file system, and Windows files appear under "/mnt/c/", e.g., Windows download will be in "/mnt/c/Users/yourname/Downloads").
+>>>>>>> Stashed changes
 
 Medley will run on either WSL1 or WSL2.  WSL2 is preferred, but for older machines that do not support virtualization (see 
 [here](https://learn.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/hyper-v-requirements))