Merge branch 'main' into sync-updates

uwhackweek · Sep 5, 2024 · 48964bd · 48964bd
2 parents 6a34dde + 4c8df2c
commit 48964bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.
 

diff --git a/book/_config.yml b/book/_config.yml
@@ -63,6 +63,7 @@ bibtex_bibfiles:
 sphinx:
   config:
     bibtex_reference_style: author_year  # or label, super, \supercite
+    nb_merge_streams: true # stdout lines combined in output
     nb_custom_formats:
         .py:
             - jupytext.reads

diff --git a/book/projects/index.md b/book/projects/index.md
@@ -13,8 +13,8 @@ You can find our comprehensive guide for organizing projects before, during, and
 
 ## List of Projects
 
-Here is our current list of project for our {{dates}} {{ hackweek }} hackweek:
+Projects for the {{dates}} {{ hackweek }} will be listed here during the event. Prior to them being listed here, participants can express their interest in one or more projects on the projects spreadsheet: {{ project_spreadsheet_url }}
 
 | Project Name (with link to GitHub repo) | Short Description | Project Lead(s) |
 |:--------|:--------|:-----|
-| [Snow-Extrapolation](https://github.com/geo-smart/Snow-Extrapolation) | Goal: Improve National Snow Model (NSM) prediction performance in the Sierra Nevada mountains through domain constraints and the exploration of different ML algorithms. | Ryan Johnson |
+| [Example Project](https://github.com/uwhackweek/sample_project_repository) | Example project description. | Leader(s) |