Merge pull request #28 from feature/update-people-page

Resolved conflicts in: dropdown-menu.js overview.html Signed-off-by: Melissa Sulprizio <[email protected]>
geoschem · Jun 6, 2024 · 0dd1841 · 0dd1841
2 parents ffff55e + 0074732
commit 0dd1841
Show file tree

Hide file tree

Showing 12 changed files with 827 additions and 13,751 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Thank you for looking into contributing to GEOS-Chem! GEOS-Chem is a grass-roots model that relies on contributions from community members like you. Whether you're new to GEOS-Chem or a longtime user, you're a valued member of the community, and we want you to feel empowered to contribute.
 
-Updates to the GEOS-Chem model benefit both you and the [entire GEOS-Chem community](https://geoschem.github.io/people.html).  You benefit through [coauthorship and citations](https://geoschem.github.io/new-developments.html).  Priority development needs are identified at GEOS-Chem users' meetings with updates between meetings based on [GEOS-Chem Steering Committee (GCSC)](https://geoschem.github.io/steering-cmte.html) input through [Working Groups](https://geoschem.github.io/working-groups.html).
+Updates to the GEOS-Chem model benefit both you and the [entire GEOS-Chem community](https://geoschem.github.io/users.html).  You benefit through [coauthorship and citations](https://geoschem.github.io/new-developments.html).  Priority development needs are identified at GEOS-Chem users' meetings with updates between meetings based on [GEOS-Chem Steering Committee (GCSC)](https://geoschem.github.io/steering-cmte.html) input through [Working Groups](https://geoschem.github.io/working-groups.html).
 
 ## We use GitHub
 We use GitHub to host the GEOS-Chem website files. to track issues, user questions, and feature requests, and to accept pull requests: [https://github.com/geoschem/geoschem.github.io](https://github.com/geoschem/geoschem.github.io). Please help out as you can in response to issues and user questions.

diff --git a/SUPPORT.md b/SUPPORT.md
@@ -1,7 +1,6 @@
 # Support Guidelines
 
-GEOS-Chem support is maintained by the **GEOS-Chem Support Team
-(GCST)**, which is based jointly at Harvard University and Washington University in St. Louis.
+GEOS-Chem support is maintained by the **GEOS-Chem Support Team (GCST)**, which is based jointly at Harvard University and Washington University in St. Louis.
 
 We track bugs, user questions, and feature requests through **[GitHub issues](https://www.youtube.com/watch?v=dFBhdotYVf8)**. Please help out as you can in response to issues and user questions.
 
@@ -13,7 +12,7 @@ We use GitHub issues to support user questions. To ask a question, **[open a new
 
 ## What type of support can I expect?
 We will be happy to assist you in resolving bugs and technical issues
-with the GEOS-Chem website.  User support and outreach is an important part of our  mission to support the [International GEOS-Chem User Community](https://geoschem.github.io/people.html).
+with the GEOS-Chem website.  User support and outreach is an important part of our  mission to support the [International GEOS-Chem User Community](https://geoschem.github.io/users.html).
 
 Even though we can assist in several ways, we cannot possibly do everything.  We rely on GEOS-Chem users being resourceful and willing to try to resolve problems on their own to the greatest extent possible.
 

diff --git a/dropdown-menu.js b/dropdown-menu.js
@@ -31,7 +31,7 @@ function inlineDropDownMenu() {
   </li>\
   <li class="menuparent"><a class="menu-heading">Research</a>\
     <ul>\
-      <li><a href="people.html" >People and Projects</a></li>\
+      <li><a href="users.html">GEOS-Chem Users</a></li>\
       <li><a href="https://scholar.google.com/citations?user=ho-sNj4AAAAJ" >Publications</a></li>\
       <li><a href="http://wiki.geos-chem.org/GEOS-Chem_model_development_priorities" >Model Development Priorities</a></li>\
       <li><a href="narrative.html"  title="">Narrative Description (and how to cite GEOS-Chem)</a></li>\

diff --git a/gca2.html b/gca2.html
@@ -123,7 +123,7 @@ <h1 id="page-title" ng-non-bindable="">Overview</h1>
 </p>
 
 <p>
-	<a href="http://geos-chem.org/">GEOS-Chem</a> is a global/regional model of atmospheric composition used by <a href="http://geos-chem.org/geos_people.html">a large research community worldwide</a> for a very wide range of applications. GEOS-Chem Asia meetings are organized every two years by the <a href="http://acmg.seas.harvard.edu/jlaqc/index.html">Joint NUIST-Harvard Laboratory for Air Quality and Climate (JLAQC)</a> to benefit the Asian community using GEOS-Chem and to supplement the <a href="http://acmg.seas.harvard.edu/geos/meetings/2019/index.html">International GEOS-Chem meetings (IGC)</a> held at Harvard in alternate years. See the <a href="http://acmg.seas.harvard.edu/geos/meetings/2018_GCA/index.html">Presentations and Posters from the GCA1 meeting</a> held at NUIST in May 2018.
+	<a href="http://geos-chem.org/">GEOS-Chem</a> is a global/regional model of atmospheric composition used by <a href="https://geoschem.github.io/users.html">a large research community worldwide</a> for a very wide range of applications. GEOS-Chem Asia meetings are organized every two years by the <a href="http://acmg.seas.harvard.edu/jlaqc/index.html">Joint NUIST-Harvard Laboratory for Air Quality and Climate (JLAQC)</a> to benefit the Asian community using GEOS-Chem and to supplement the <a href="http://acmg.seas.harvard.edu/geos/meetings/2019/index.html">International GEOS-Chem meetings (IGC)</a> held at Harvard in alternate years. See the <a href="http://acmg.seas.harvard.edu/geos/meetings/2018_GCA/index.html">Presentations and Posters from the GCA1 meeting</a> held at NUIST in May 2018.
 </p>
 
 <p>

diff --git a/index.html b/index.html
@@ -131,11 +131,11 @@ <h3><strong><a href="http://wiki.seas.harvard.edu/geos-chem/index.php/GEOS-Chem_
 </p>
 
 <p align="justify">
-GEOS-Chem is a global 3-D model of atmospheric chemistry driven by meteorological input from the Goddard Earth Observing System (GEOS) of the <a href="http://gmao.gsfc.nasa.gov/">NASA Global Modeling and Assimilation Office</a>. It is applied by <a href="people.html" title="">research groups around the world</a> to a wide range of atmospheric composition problems. Scientific direction of the model is provided by the international <a href="steering-cmte.html" title="">GEOS-Chem Steering Committee</a> and by <a href="https://projects.iq.harvard.edu/acmg-geos/geos-working-groups" title="">User Working Groups</a>. The model is managed by the <a href="support-team.html" title="">GEOS-Chem Support Team</a>, based at Harvard University and Washington University with support from the US NASA Earth Science Division, the Canadian National and Engineering Research Council, and the Nanjing University of Information Sciences and Technology.
+GEOS-Chem is a global 3-D model of atmospheric chemistry driven by meteorological input from the Goddard Earth Observing System (GEOS) of the <a href="http://gmao.gsfc.nasa.gov/">NASA Global Modeling and Assimilation Office</a>. It is applied by <a href="users.html" title="">research groups around the world</a> to a wide range of atmospheric composition problems. Scientific direction of the model is provided by the international <a href="steering-cmte.html" title="">GEOS-Chem Steering Committee</a> and by <a href="working-groups.html" title="">User Working Groups</a>. The model is managed by the <a href="support-team.html" title="">GEOS-Chem Support Team</a>, based at Harvard University and Washington University with support from the US NASA Earth Science Division, the Canadian National and Engineering Research Council, and the Nanjing University of Information Sciences and Technology.
 </p>
 
 <p align="justify">
-GEOS-Chem is a grass-roots open-access model owned by its <a href="people.html" title="">users</a>, and ownership implies some responsibilities as listed in our <a href="welcome.html" title="">welcome page for new users</a>. If you are interested in using GEOS-Chem, please contact the <a href="support-team.html">GEOS-Chem Support Team</a> who will send you instructions for joining the user community and accessing the code.
+GEOS-Chem is a grass-roots open-access model owned by its <a href="users.html" title="">users</a>, and ownership implies some responsibilities as listed in our <a href="welcome.html" title="">welcome page for new users</a>. If you are interested in using GEOS-Chem, please contact the <a href="support-team.html">GEOS-Chem Support Team</a> who will send you instructions for joining the user community and accessing the code.
 </p>
 
 <p align="justify">
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,7 +123,7 @@ <h1 id="page-title" ng-non-bindable="">Overview</h1> @@
     </p>
     <p>
-    	<a href="http://geos-chem.org/">GEOS-Chem</a> is a global/regional model of atmospheric composition used by <a href="http://geos-chem.org/geos_people.html">a large research community worldwide</a> for a very wide range of applications. GEOS-Chem Asia meetings are organized every two years by the <a href="http://acmg.seas.harvard.edu/jlaqc/index.html">Joint NUIST-Harvard Laboratory for Air Quality and Climate (JLAQC)</a> to benefit the Asian community using GEOS-Chem and to supplement the <a href="http://acmg.seas.harvard.edu/geos/meetings/2019/index.html">International GEOS-Chem meetings (IGC)</a> held at Harvard in alternate years. See the <a href="http://acmg.seas.harvard.edu/geos/meetings/2018_GCA/index.html">Presentations and Posters from the GCA1 meeting</a> held at NUIST in May 2018.
+    	<a href="http://geos-chem.org/">GEOS-Chem</a> is a global/regional model of atmospheric composition used by <a href="https://geoschem.github.io/users.html">a large research community worldwide</a> for a very wide range of applications. GEOS-Chem Asia meetings are organized every two years by the <a href="http://acmg.seas.harvard.edu/jlaqc/index.html">Joint NUIST-Harvard Laboratory for Air Quality and Climate (JLAQC)</a> to benefit the Asian community using GEOS-Chem and to supplement the <a href="http://acmg.seas.harvard.edu/geos/meetings/2019/index.html">International GEOS-Chem meetings (IGC)</a> held at Harvard in alternate years. See the <a href="http://acmg.seas.harvard.edu/geos/meetings/2018_GCA/index.html">Presentations and Posters from the GCA1 meeting</a> held at NUIST in May 2018.
     </p>
     <p>
@@ Expand Down @@