Updated some pages with note about Bullseye OS and issues with record…

…ing, with solutions

docs/changelog.md

@@ -13,12 +13,14 @@ Below you can find a chronological overview of the changes made since the first
 
 Planned improvements and additions
 {: .label .label-yellow }
+- Guide to connect to eduroam on Raspberry Pi
 - Guide about sending messages to Twitter
 - Guide for working with the Raspberry Pi camera
 - Guide for setting up an RFID reader
 
 Overview of incorporated changes
 {: .label .label-green }
+- 02/12/2021 Updated pages with note about Bullseye OS and issues with recording, with solutions
 - 06/07/2021 Updated paper page with details of Methods in Ecology and Evolution
 - 25/05/2021 Improved titles and urls of various guides
 - 05/05/2021 Added camera positioning guide [here](electronics/camera-positioning)

docs/electronics/image-and-video-recording.md

@@ -50,7 +50,7 @@ Finally, it is also possible to connect and control a DSLR from the Raspberry Pi
 Setting-up the camera is as simple as plugging in the ribbon cable into the camera and the Camera Serial Interface on the Raspberry Pi. If you are struggling, I suggest to follow the great and easy tutorial by the Raspberry Pi Foundation [here](https://projects.raspberrypi.org/en/projects/getting-started-with-picamera){:target="_blank"}.
 
 ## Recording options with the Raspberry Pi
-There are a variety of software packages to record with the Raspberry Pi. Here I provide a short description of some of the main solutions. For further details, follow the links provided below.
+There are a variety of software packages to record with the Raspberry Pi. Here I provide a short description of some of the main solutions. For further details, follow the links provided below. Note that the latest Raspberry Pi OS (Bullseye) changed the recording modules, so using an older OS such as Buster is recommended!
 
 ### raspicam
 First, one can control the camera module directly from the command line with the native raspicam command line tools, which include `raspistill` to take still images and `raspivid` for videos. These provide a wide range of recording options, including the possibility to preview the camera stream, adjust the camera settings (e.g. contrast, brightness, saturation, iso, shutter speed), and set exposure mode and white balance.

docs/getting-started/install-operating-system.md

@@ -33,12 +33,14 @@ Download the Raspberry Pi installer from the ([raspberrypi.org/downloads/](raspb
 
 The first thing to do is to select the Operating System. In general I suggest to choose the Raspberry Pi OS, although a range of other Operating Systems are available to select. By selecting the top option, the software will download the latest image file (>1gb) from the internet.
 
-If you want to install the SD-card offline (or already have an image file on your computer), you need to select the *Use custom* option at the bottom of the list. The latest image files can be found online on the Raspberry Pi website [here](https://www.raspberrypi.org/software/operating-systems/#raspberry-pi-os-32-bit).
+*Note:* The latest Raspberry Pi OS (Bullseye) does not yet have good image and video recording support, so I would recommend to install the previous OS Buster. You can manually download it from [this page](https://downloads.raspberrypi.org/) under "raspios". Other OS can be found [here](https://www.raspberrypi.org/software/operating-systems/#raspberry-pi-os-32-bit).
 
 The good thing is that when you have already once downloaded the Raspberry Pi Image, you can use a cached version by selecting the second option in the list (*Raspberry pi OS (other)*, and then selecting your cached version.
 
 [![Raspberry Pi Imager cached](/assets/images/raspberrypi-imager-cached.jpg?style=centerimgmed)](/assets/images/raspberrypi-imager-cached.jpg)
 
+If you want to use an image file (such as to install the SD-card offline), you need to select the *Use custom* option at the bottom of the list.
+
 Next make sure your SD-card is mounted on your computer, click the *STORAGE* button, and select your SD-card. If it is not shown, try to remount it on your computer.
 
 [![Raspberry Pi Imagerstorage option](/assets/images/raspberrypi-imager-storage.jpg?style=centerimgmed)](/assets/images/raspberrypi-imager-storage.jpg)

docs/raspberry-pi-paper.md

@@ -7,19 +7,10 @@ comments: true
 ---
 
 # The Paper
-<<<<<<< HEAD
 This website accompanies the academic paper *Broad-scale Applications of the Raspberry Pi: A Review and Guide for Biologists* (Jolles, 2021), published in Methods in Ecology and Evolution, {: .label .label-green }Open Access, available [here](https://besjournals.onlinelibrary.wiley.com/doi/10.1111/2041-210X.13652){:target="_blank"}.
 {: .fs-6 .fw-300 }
 
 [![Raspberry Pi Review paper](/assets/images/raspberry-pi-paper-mee.jpg?style=centerimgmed)](https://besjournals.onlinelibrary.wiley.com/doi/10.1111/2041-210X.13652)
-=======
-This website accompanies the academic paper *Broad-scale Applications of the Raspberry Pi: A Review and Guide for Biologists* (Jolles, 2021), published in Methods in Ecology and Evolution.
-{: .fs-6 .fw-300 }
-
-[![Raspberry Pi Review paper](/assets/images/raspberry-pi-paper-mee.jpg?style=centerimgmed)](https://besjournals.onlinelibrary.wiley.com/doi/10.1111/2041-210X.13652)
-
-Download the paper Open Access [here](https://besjournals.onlinelibrary.wiley.com/doi/10.1111/2041-210X.13652){:target="_blank"}
->>>>>>> 4287623fe3ce800cd6a055ae6cbb2c575664b2c2
 
 ## The Raspberry Pi as a research tool
 The field of Biology has seen tremendous technological progress in recent years, fuelled by the exponential growth in processing power and high-level computing, and the rise of global information sharing.