Updated documentation

diff --git a/README.md b/README.md
index 373c31ca2adb62eab105622a30a6b1c66a075c2c..433a51c560c16cdfcb3209072860e9a1e0f733b1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -100,6 +100,18 @@ Because of our strict security settings, you cannot embed video's from Youtube (
 
 You can upload video's via [penta.fosdem.org](https://penta.fosdem.org), where everybody should have an account (if not, contact _stands\_at\_fosdem.org_). The exact process is not automated yet, so you will have to send an e-mail to _stands\_at\_fosdem.org_ and we will provide you with the upload link.
 
+We've created four video events you can upload to (1 video per event). If you need more, let us know.
+
+On the schedule tab in Pentabarf, you'll find a field called _Pre-recorded Video Upload URL_. Go to that link (you'll have to copy & paste) to upload the video.
+
+You'll have to wait a few minutes while the script transcodes the video. You can check the progress at [upload.video.fosdem.org/overview](https://upload.video.fosdem.org/overview) (select "Stand recordings" and search for your project - you'll find 4 video's - check the one you uploaded).
+
+As soon as it says "preview" on the overview, go back to Pentabarf, go to the schedule tab and check the field called _Video Review URL_. Go to that link to check your video, and if it is OK, confirm it (if it is not, you can upload a new version).
+
+Wait a few more minutes (30 or so) while it is pushed to our CDN.
+
+Go back to Pentabarf and the schedule tab, check the field _Final Video URL_. This is the URL of your video you can embed on your stand.
+
 Upload the video, it will be converted by our system. Afterwards, you review and approve the video, which will then be live.
 
 You can embed the video; the links will be of the form _https://video.fosdem.org/2021/stands/\_chatroom\_name\_\_video1.mp4_.

diff --git a/scripts/update.sh b/scripts/update.sh
index 9bef1028bfcccc3d71d052a5422ebe3b7baa58b9..1106cd49e0d6ef61cf9e81d94f07f863cb9031e1 100755 (executable)
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -17,6 +17,7 @@ for d in $(find content/stands -maxdepth 1 -type d); do
        basename=$(basename "$d")
        if [ "$basename" != "stands" ]; then
                cd "$d"
+                git stash
                git branch > /dev/null
                echo "$d"
                if [ "$?" == "0" ]; then
@@ -33,6 +34,7 @@ for d in $(find static/stands -maxdepth 1 -type d); do
         basename=$(basename "$d")
         if [ "$basename" != "stands" ]; then
                 cd "$d"
+                git stash
                 git branch > /dev/null
                 echo "$d"
                 if [ "$?" == "0" ]; then