Merge pull request #1726 from Uma-95/1705-glossary-additions

#1705-glossary additions

Author: jakirkham

src/misc/00_intro.rst

@@ -6,8 +6,14 @@ Glossary
 
 .. glossary::
 
+  Conda package
+     **C**\ onda **P**\ ackage. A conda package is a ``.tar.bz2`` or ``.conda`` archive that contains libraries, executable programs, data files and other components, as well as metadata under the ``info/`` directory. Its contents are unpacked in the installation prefix. `Learn More <https://en.wikipedia.org/wiki/Conda_(package_manager)>`__.
+
+  Conda channel
+     **C**\ onda **C**\hannel. Conda channels are the locations where packages are stored. They serve as the base for hosting and managing packages. ``conda-forge`` is one example of a conda channel. `Learn More <https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/channels.html>`__.
+     
   Environment  
-    An environment is a tool that helps to keep dependencies required by different projects separate by creating isolated spaces for them that contain per-project dependencies for them. `Learn More <https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/environments.html>`__.
+    An environment is a tool that helps to keep dependencies required by different projects separate by creating isolated spaces where these dependencies are installed. `Learn More <https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/environments.html>`__.
 
   CI
     **C**\ ontinuous **I**\ ntegration. Continuous integration is the practice of automating the integration of code changes from multiple contributors into a single software project. `Learn More <https://en.wikipedia.org/wiki/Continuous_integration>`__.

src/user/introduction.rst

@@ -41,6 +41,8 @@ conda-forge is a community effort that tackles these issues:
  - By default, we build packages for macOS, Linux AMD64 and Windows AMD64.
  - Many packages are updated by multiple maintainers with an easy option to become a maintainer.
  - An active core developer team is trying to also maintain abandoned packages.
+ 
+You can refer to the glossary `here<https://conda-forge.org/docs/misc/00_intro.html#glossary>`.
 
 How can I install packages from conda-forge?
 --------------------------------------------