home.md

@@ -119,6 +119,9 @@ This documentation should cover the overall code structure, data structures, and
 
 ## More on Network Team
 
+> :hammer_and_wrench: :warning: These links may be outdated.  
+> —nickm, 14 August 2020.
+
 ### Task Tracking
 
  * [CI Failures](./NetworkTeam/CIFailures)
@@ -135,7 +138,8 @@ This documentation should cover the overall code structure, data structures, and
 
 ### Tor Meetings
 
- * [Team meetign at Tor Brussels Meeting 2019](https://trac.torproject.org/projects/tor/wiki/org/meetings/2019BrusselsNetworkTeam)
+
+ * [Team meeting at Tor Brussels Meeting 2019](https://trac.torproject.org/projects/tor/wiki/org/meetings/2019BrusselsNetworkTeam)
  * [Team meeting at Tor Mexico Meeting 2018](https://trac.torproject.org/projects/tor/wiki/org/meetings/2018MexicoCity)
  * [Team meeting at Tor Amsterdam Meeting 2017](./org/meetings/2017Amsterdam/Notes/NetworkTeam)
  * [Team meeting at Tor Valencia Meeting 2016](./NetworkTeam/TeamMeetingTorSummer2016Meeting)
@@ -147,36 +151,36 @@ This documentation should cover the overall code structure, data structures, and
 
 ## Processes and Policies
 
-These policies are older than our meta-policy:
+Policies:
 
+ * [Process for deciding what our team policies and processes are](./NetworkTeam/MetaPolicy).
+ * [Merge Policy](./NetworkTeam/MergePolicy).
+ * [Committer Policy](./NetworkTeam/CommitterPolicy).
  * [Security issue policy](./NetworkTeam/SecurityPolicy)
  * [Supported platforms (draft)](./NetworkTeam/SupportedPlatforms)
  * [Release Policy](./NetworkTeam/ReleasePolicy)
 
-These processes are older than our meta-policy:
-
- * [Merge Process](./NetworkTeam/MergeProcess)
- * [Backport Process](./NetworkTeam/Backports)
- * [Gitlab review Process](./NetworkTeam/GitlabReviews)
-
-Policies:
-
- * [Process for deciding what our team policies and processes are](./NetworkTeam/MetaPolicy).
-
 Provisional policies:
 
- * [Merge Policy](./NetworkTeam/MergePolicy).
- * [Committer Policy](./NetworkTeam/CommitterPolicy).
+ * (none right now)
 
 Guidelines:
 
  * [Meeting Time Guidelines](./NetworkTeam/MeetingTimeGuidelines).
+ * [Merge Process](./NetworkTeam/MergeProcess)
+ * [Backport Process](./NetworkTeam/Backports)
+ * [Gitlab review Process](./NetworkTeam/GitlabReviews)
 
 Security Releases
 
  * [NetworkTeam/TROVE](NetworkTeam/TROVE)
 
 ## Active Sponsors and Contracts
+
+> :warning: :construction: :hammer: These lists are fairly outdated.  
+> —nickm, 14 August 2020
+
+
 ### Roadmap
   The projects from sponsors/contracts that are making this work possible are:
 
@@ -227,12 +231,6 @@ Other priorities (everybody):
    * Code base movements (archive?): torflow, pytorctl, leekspin (+ dependencies), rpm-packaging
    * DirAuth and sbws to network health, TorDNSEL to metrics
 
-#### Tickets for Roadmap Q2 2020
-
-<!-- FIXME(ahf): Should we remove these? -->
-<!-- [[TicketQuery(keywords~=network-team-roadmap-2020Q2,format=progress)]] -->
-<!-- [[TicketQuery(status=!closed,keywords=~network-team-roadmap-2020Q2,order=id,format=table,col=id|summary|status|owner|priority|points|sponsor,group=sponsor)]] -->
-
 ### Other Projects
  * SBWS - TODO include roadmap here.
  * [Bandwidth Authority](./NetworkTeam/BandwidthAuthority)