From 8ba5e60252ba1fc8e3eafea831526d857341ba9b Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Mon, 14 Aug 2023 13:21:33 +0200
Subject: [PATCH] Add info about merch desk

---
 docs/tickets.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/tickets.md b/docs/tickets.md
index 47333d7..65577a9 100644
--- a/docs/tickets.md
+++ b/docs/tickets.md
@@ -1,4 +1,4 @@
-# Tickets
+# Tickets and Merch
 
 ## Getting your entry wristband
 
@@ -14,6 +14,17 @@ Currently, the cash desk is planned to be open as follows:
 
 For ticket-related questions and any changes at short notice, also keep an eye on the [ticket FAQ](https://tickets.events.ccc.de/camp2023/faq/).
 
+## Getting your merch
+
+You were able to pre-order and pre-pay merch through the [ticket shop](https://tickets.events.ccc.de/) until June 25 (see also [the announcement blog post](https://events.ccc.de/2023/06/06/camp23-merch-presale/) for details).  
+There will likely only be a small amount of merch available beyond the pre-ordered quantities.
+
+Please note: You will need to **pick up your merch by day 3** (August 17) 22:00 at the latest, otherwise your claim to your ordered merch will expire and it might be sold to other campgoers. If you cannot pick up your merch in person, we will of course try to find a solution — contact details for this will be added here shortly. In any case, we will need to hear from you **before the deadline** to be able to help.
+
+Merch desk opening hours:
+
+* The merch desk is expected to first open on day 1 (Tuesday, August 15), on a best-effort basis. (We are once again handling many different articles in many different sizes and designs, which makes set-up and distribution rather non-trivial.)
+
 ## Buying tickets
 
 Ticket and merch sales through the ticket shop have ended.
-- 
GitLab