Merge branch 'main' into fave-surf-maps

README.md

@@ -4,6 +4,14 @@ my blog
 
 ---
 
+### [20240411 Join and Coalesce in Pyspark](articles/20240411_join_and_coalesce_in_pyspark/20240411_join_and_coalesce_in_pyspark.md)
+
+> _Join two dataframes and merge their columns_
+
+### [20240403 Allow flatpak to use secondary hard drives](articles/20240403_allow_flatpak_to_use_secondary_hard_drives/20240403_allow_flatpak_to_use_secondary_hard_drives.md)
+
+> _Useful when sharing a steam installation_
+
 ### [20240310 My Favourite Surf Maps](articles/20240310_my_favourite_surf_maps/20240310_my_favourite_surf_maps.md)
 
 > _[Counter-Strike] A list of my favourite CS Surf maps_
@@ -20,6 +28,10 @@ my blog
 
 > _The configs that I use for CS2 surf, currently a WIP_
 
+### [20230919 Parsing BOMs in Python](articles/20230919_parsing_boms_in_python/20230919_parsing_boms_in_python.md)
+
+> _How to detect/read/write UTF 8/16 BOMs_
+
 ### [20230704 Jupyter Cell Wrappers](articles/20230704_jupyter_cell_wrappers/20230704_jupyter_cell_wrappers.md)
 
 > _Adding decorator-style functionality to jupyter cells_
@@ -85,3 +97,6 @@ my blog
 
 
 
+
+
+

articles/20220306_python_datetimes/20220306_python_datetimes.md

@@ -1,5 +1,16 @@
 # 20220306 Python Datetimes
 
+- [Standard Library vs. Packages](#standard-library-vs-packages)
+- [Current Datetime](#current-datetime)
+  - [Current Datetime as UTC](#current-datetime-as-utc)
+  - [But what if my timezone isn't UTC?](#but-what-if-my-timezone-isnt-utc)
+  - [Using the computer's local timezone](#using-the-computers-local-timezone)
+- [Bonus](#bonus)
+  - [Removing microseconds from the datetime](#removing-microseconds-from-the-datetime)
+
+
+## Standard Library vs. Packages
+
 Python `datetime` frequently trip me up when I use them, usually due to a combination of
 
 1. dense documentation that is hard to read