Skip to content

Commit c84e3da

Browse files
authored
Merge pull request raspberrypi#782 from tbroadley/fix-typos
Fix typos
2 parents 675714d + bc52ecf commit c84e3da

File tree

18 files changed

+69
-69
lines changed

18 files changed

+69
-69
lines changed

configuration/device-tree.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ $ fdtdump 1st.dtbo
273273

274274
After the verbose description of the file structure there is our fragment. But look carefully - where we wrote `&i2s` it now says `0xdeadbeef`, a clue that something strange has happened. After the fragment there is a new node, `__fixups__`. This contains a list of properties mapping the names of unresolved symbols to lists of paths to cells within the fragments that need patching with the phandle of the target node, once that target has been located. In this case, the path is to the `0xdeadbeef` value of `target`, but fragments can contain other unresolved references which would require additional fixes.
275275

276-
If you write more complicated fragments, the compiler may generate two more nodes: `__local_fixups__` and `__symbols__`. The former is required if any node in the fragments has a phandle, because the programme performing the merge will have to ensure that phandle numbers are sequential and unique. However, the latter is the key to how unresolved symbols are dealt with.
276+
If you write more complicated fragments, the compiler may generate two more nodes: `__local_fixups__` and `__symbols__`. The former is required if any node in the fragments has a phandle, because the program performing the merge will have to ensure that phandle numbers are sequential and unique. However, the latter is the key to how unresolved symbols are dealt with.
277277

278278
Back in section 1.3 it says that "the original labels do not appear in the compiled output", but this isn't true when using the `-@` switch. Instead, every label results in a property in the `__symbols__` node, mapping a label to a path, exactly like the `aliases` node. In fact, the mechanism is so similar that when resolving symbols, the Raspberry Pi loader will search the "aliases" node in the absence of a `__symbols__` node. This is useful because by providing sufficient aliases, we can allow an older `dtc` to be used to build the base DTB files.
279279

configuration/security.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ sudo ufw deny from 192.168.2.1 port 30
230230

231231
## Installing fail2ban
232232

233-
If you are using your Raspberry Pi as some sort of server, for example an ```ssh``` or webserver, your firewall will have deliberate 'holes' in it to let the server traffic through. In these cases, [Fail2ban](http://www.fail2ban.org) can be useful. Fail2ban, written in Python, is a scanner that examines the log files produced by the Raspberry Pi, and checks them for suspicious activity. It catches things like multiple brute-force atttempts to log in, and can inform any installed firewall to stop further login attempts from suspicious IP addresses. It saves you having to manually check log files for intrusion attempts and then update the firewall (via `iptables`) to prevent them.
233+
If you are using your Raspberry Pi as some sort of server, for example an ```ssh``` or webserver, your firewall will have deliberate 'holes' in it to let the server traffic through. In these cases, [Fail2ban](http://www.fail2ban.org) can be useful. Fail2ban, written in Python, is a scanner that examines the log files produced by the Raspberry Pi, and checks them for suspicious activity. It catches things like multiple brute-force attempts to log in, and can inform any installed firewall to stop further login attempts from suspicious IP addresses. It saves you having to manually check log files for intrusion attempts and then update the firewall (via `iptables`) to prevent them.
234234

235235
Install Fail2ban using the following command:
236236

hardware/computemodule/cm-emmc-flashing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ You now need to write a raw OS image (such as [Raspbian](https://www.raspberrypi
9595
sudo dd if=raw_os_image_of_your_choice.img of=/dev/sda bs=4MiB
9696
```
9797

98-
Once the image has been written, unplug and re-plug the USB; you should see two partitions appear (for Raspian) in `/dev`. In total, you should see something similar to this:
98+
Once the image has been written, unplug and re-plug the USB; you should see two partitions appear (for Raspbian) in `/dev`. In total, you should see something similar to this:
9999

100100
```bash
101101
/dev/sda <- Device

hardware/computemodule/cmio-camera.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The Compute Module IO board has a 22-way 0.5mm FFC for each camera port, with CA
4343

4444
To attach a standard Raspberry Pi Camera to the Compute Module IO board, a small adaptor board is available. It adapts the 22W FFC to the Pi 15W FFC.
4545

46-
To make the Raspberry Pi Camera Module work with a standard Raspian OS, the GPIOs and I2C interface must be wired to the CAM1 connector. This is done by bridging the correct GPIOs from the J6 GPIO connector to the CD1_SDA/SCL and CAM1_IO0/1 pins on the J5 connector using jumper wires. Additionally, a **dt-blob.bin** file needs to be provided to override default pin states (the dt-blob.bin file is a file that tells the GPU what pins to use when controlling the camera. For more information on this, see the relevant section in the guide to attaching peripherals to a Compute Module [here](cm-peri-sw-guide.md)).
46+
To make the Raspberry Pi Camera Module work with a standard Raspbian OS, the GPIOs and I2C interface must be wired to the CAM1 connector. This is done by bridging the correct GPIOs from the J6 GPIO connector to the CD1_SDA/SCL and CAM1_IO0/1 pins on the J5 connector using jumper wires. Additionally, a **dt-blob.bin** file needs to be provided to override default pin states (the dt-blob.bin file is a file that tells the GPU what pins to use when controlling the camera. For more information on this, see the relevant section in the guide to attaching peripherals to a Compute Module [here](cm-peri-sw-guide.md)).
4747

4848
**The pin numbers below are provided only as an example. LED and SHUTDOWN pins can be shared by both cameras, if required.** The SDA and SCL pins must be either GPIO0 and GPIO1 or GPIO28 and 29 and must be individual to each camera.
4949

@@ -94,7 +94,7 @@ Connect up the I2C and GPIO lines.
9494
1. Attach CAM0_IO1 (J6 pin 49) to GPIO30 (J6 pin 5).
9595
1. Attach CAM0_IO0 (J6 pin 51) to GPIO31 (J6 pin 7).
9696

97-
The Compute Module's **pin_config** secion needs the second camera's LED and power enable pins configured:
97+
The Compute Module's **pin_config** section needs the second camera's LED and power enable pins configured:
9898

9999
```
100100
pin@p30 { function = "output"; termination = "no_pulling"; };

hardware/display/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Read our troubleshooting steps, tips, and tricks here: [Raspberry Pi Display Tro
4646
- 10-point multi-touch touchscreen
4747
- PWM backlight control and power control over I2C interface
4848
- Metal-framed back with mounting points for Raspberry Pi display conversion board and Raspberry Pi
49-
- Blacklight lifetime: 20000 hours
49+
- Backlight lifetime: 20000 hours
5050
- Operating temperature: -20 to +70 degrees centigrade
5151
- Storage temperature: -30 to +80 degrees centigrade
5252
- Contrast ratio: 500

hardware/raspberrypi/bootmodes/net_tutorial_windows.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The steps above should allow the Pi to at least boot but won't have the rest of
4747
We now need add the Services for NFS role to our server. Once they are installed we can create NFS shares that the Pi can use.
4848

4949
I created a folder to contain the Pi's file system and then right-click the folder and choose properties and go to the
50-
'NFS Sharing' tab and click on the button 'Manage NFS Sharing'. I called the share 'PiRoot' and chose the 'No server authentication [Auth_Sys]', 'Enable unmapped user access', 'Allow unampped User Unix access' options.
50+
'NFS Sharing' tab and click on the button 'Manage NFS Sharing'. I called the share 'PiRoot' and chose the 'No server authentication [Auth_Sys]', 'Enable unmapped user access', 'Allow unmapped User Unix access' options.
5151
I believe these allow user permissions and ownerships to work in the best way.
5252

5353
I then booted up a normal Pi and copied the whole file system across to the newly created PiRoot share on the Windows server.

hardware/raspberrypi/dpi/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ One of the alternate functions selectable on bank 0 of the Raspberry Pi GPIO is
1212

1313
Note that there are various ways that the colour values can be presented on the DPI output pins in either 565, 666, or 24-bit modes (see the following table and the `otutput_format` part of the `dpi_output_format` parameter below):
1414

15-
![DPI Colour Ouptut](dpi-packing.png)
15+
![DPI Colour Output](dpi-packing.png)
1616

1717
## Disable other GPIO peripherals
1818

hardware/raspberrypi/gpio/README.md

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
# GPIO
2-
3-
General Purpose Input/Output pins on the Raspberry Pi
4-
5-
## Overview
6-
7-
This page expands on the technical features of the GPIO pins available on BCM2835 in general. For usage examples, see [GPIO Usage for A+ and newer](../../../usage/gpio-plus-and-raspi2/README.md) or [GPIO Usage for models A and B](../../../usage/gpio/README.md). When reading this page, reference should be made to the BCM2835 ARM Peripherals [Datasheet](../bcm2835/README.md), section 6.
8-
9-
GPIO pins can be configured as either general-purpose input, general-purpose output or as one of up to 6 special alternate settings, the functions of which are pin-dependant.
10-
11-
There are 3 GPIO banks on BCM2835.
12-
13-
Each of the 3 banks has its own VDD input pin. On Raspberry Pi, all GPIO banks are supplied from 3.3V. **Connection of a GPIO to a voltage higher than 3.3V will likely destroy the GPIO block within the SoC.**
14-
15-
A selection of pins from Bank 0 is available on the P1 header on Raspberry Pi.
16-
17-
## GPIO Pads
18-
19-
The GPIO connections on the BCM2835 package are sometimes referred to in the peripherals datasheet as "pads" - a semiconductor design term meaning "chip connection to outside world".
20-
21-
The pads are configurable CMOS push-pull output drivers/input buffers. Register-based control settings are available for
22-
23-
- Internal pull-up / pull-down enable/disable
24-
- Output [drive strength](http://www.scribd.com/doc/101830961/GPIO-Pads-Control2)
25-
- Input Schmitt-trigger filtering
26-
27-
### Power-On States
28-
29-
All GPIOs revert to general-purpose inputs on power-on reset. The default pull states are also applied, which are detailed in the alternate function table in the ARM peripherals datasheet. Most GPIOs have a default pull applied.
30-
31-
## Interrupts
32-
33-
Each GPIO pin, when configured as a general-purpose input, can be configured as an interrupt source to the ARM. Several interrupt generation sources are configurable:
34-
35-
- Level-sensitive (high/low)
36-
- Rising/falling edge
37-
- Asynchronous rising/falling edge
38-
39-
Level interrupts maintain the interrupt status until the level has been cleared by system software (e.g. by servicing the attached peripheral generating the interrupt).
40-
41-
The normal rising/falling edge detection has a small amount of synchronisation built into the detection. At the system clock frequency, the pin is sampled with the criteria for generation of an interrupt being a stable transition within a 3-cycle window, i.e. a record of "1 0 0" or "0 1 1". Asynchronous detection bypasses this synchronisation to enable the detection of very narrow events.
42-
43-
## Alternative Functions
44-
45-
Almost all of the GPIO pins have alternative functions. Peripheral blocks internal to BCM2835 can be selected to appear on one or more of a set of GPIO pins, for example the I2C busses can be configured to at least 3 separate locations. Pad control, such as drive strength or Schmitt filtering, still applies when the pin is configured as an alternate function.
46-
47-
1+
# GPIO
2+
3+
General Purpose Input/Output pins on the Raspberry Pi
4+
5+
## Overview
6+
7+
This page expands on the technical features of the GPIO pins available on BCM2835 in general. For usage examples, see [GPIO Usage for A+ and newer](../../../usage/gpio-plus-and-raspi2/README.md) or [GPIO Usage for models A and B](../../../usage/gpio/README.md). When reading this page, reference should be made to the BCM2835 ARM Peripherals [Datasheet](../bcm2835/README.md), section 6.
8+
9+
GPIO pins can be configured as either general-purpose input, general-purpose output or as one of up to 6 special alternate settings, the functions of which are pin-dependent.
10+
11+
There are 3 GPIO banks on BCM2835.
12+
13+
Each of the 3 banks has its own VDD input pin. On Raspberry Pi, all GPIO banks are supplied from 3.3V. **Connection of a GPIO to a voltage higher than 3.3V will likely destroy the GPIO block within the SoC.**
14+
15+
A selection of pins from Bank 0 is available on the P1 header on Raspberry Pi.
16+
17+
## GPIO Pads
18+
19+
The GPIO connections on the BCM2835 package are sometimes referred to in the peripherals datasheet as "pads" - a semiconductor design term meaning "chip connection to outside world".
20+
21+
The pads are configurable CMOS push-pull output drivers/input buffers. Register-based control settings are available for
22+
23+
- Internal pull-up / pull-down enable/disable
24+
- Output [drive strength](http://www.scribd.com/doc/101830961/GPIO-Pads-Control2)
25+
- Input Schmitt-trigger filtering
26+
27+
### Power-On States
28+
29+
All GPIOs revert to general-purpose inputs on power-on reset. The default pull states are also applied, which are detailed in the alternate function table in the ARM peripherals datasheet. Most GPIOs have a default pull applied.
30+
31+
## Interrupts
32+
33+
Each GPIO pin, when configured as a general-purpose input, can be configured as an interrupt source to the ARM. Several interrupt generation sources are configurable:
34+
35+
- Level-sensitive (high/low)
36+
- Rising/falling edge
37+
- Asynchronous rising/falling edge
38+
39+
Level interrupts maintain the interrupt status until the level has been cleared by system software (e.g. by servicing the attached peripheral generating the interrupt).
40+
41+
The normal rising/falling edge detection has a small amount of synchronisation built into the detection. At the system clock frequency, the pin is sampled with the criteria for generation of an interrupt being a stable transition within a 3-cycle window, i.e. a record of "1 0 0" or "0 1 1". Asynchronous detection bypasses this synchronisation to enable the detection of very narrow events.
42+
43+
## Alternative Functions
44+
45+
Almost all of the GPIO pins have alternative functions. Peripheral blocks internal to BCM2835 can be selected to appear on one or more of a set of GPIO pins, for example the I2C busses can be configured to at least 3 separate locations. Pad control, such as drive strength or Schmitt filtering, still applies when the pin is configured as an alternate function.
46+
47+

linux/usage/text-editors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Text editors
22

3-
On Linux, you have a choice of text editors. Some are easyto-use but have limited functionality; others require training to use and take a long time to master, but offer incredible functionality.
3+
On Linux, you have a choice of text editors. Some are easy-to-use but have limited functionality; others require training to use and take a long time to master, but offer incredible functionality.
44

55
## Desktop graphical editors
66

raspbian/applications/camera.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ Define whether the camera will start paused or will immediately start recording.
615615
--segment, -sg Segment the stream into multiple files
616616
```
617617
618-
Rather than creating a single file, the file is split into segments of approximately the numer of milliseconds specified. In order to provide different filenames, you should add `%04d` or similar at the point in the filename where you want a segment count number to appear e.g:
618+
Rather than creating a single file, the file is split into segments of approximately the number of milliseconds specified. In order to provide different filenames, you should add `%04d` or similar at the point in the filename where you want a segment count number to appear e.g:
619619
620620
```
621621
--segment 3000 -o video%04d.h264

remote-access/ftp.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sudo apt-get install pure-ftpd
1212

1313
## Basic Configurations
1414

15-
We need to create a new user group named `ftpgroup` and a new user named `ftpuser` for FTP users, and make sure this "user" has **no** login privilge and **no** home directory:
15+
We need to create a new user group named `ftpgroup` and a new user named `ftpuser` for FTP users, and make sure this "user" has **no** login privilege and **no** home directory:
1616

1717
```bash
1818
sudo groupadd ftpgroup
@@ -77,7 +77,7 @@ Make a file named `AnonymousCantUpload` and type `yes`;
7777

7878
Make a file named `AnonymousCanCreateDirs` and type `no`;
7979

80-
Make a file named `DisplayDotFiles` and type`no`;
80+
Make a file named `DisplayDotFiles` and type `no`;
8181

8282
Make a file named `DontResolve` and type `yes`;
8383

remote-access/ip-address.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The Fing app is a free network scanner for smartphones. It is available for [And
6363

6464
Your phone and your Raspberry Pi have to be on the same network, so connect your phone to the correct wireless network.
6565

66-
When you open the Fing app, touch the refresh button in the upper right-hand corner of the screen. After a few seconds you will get a list with all the devices connected to your network. Scroll down to the entry with the manufacturer "Raspberry Pi". You will see the IP address in the bottom left-hand corner, and the MAC adress in the bottom right-hand corner of the entry.
66+
When you open the Fing app, touch the refresh button in the upper right-hand corner of the screen. After a few seconds you will get a list with all the devices connected to your network. Scroll down to the entry with the manufacturer "Raspberry Pi". You will see the IP address in the bottom left-hand corner, and the MAC address in the bottom right-hand corner of the entry.
6767

6868
### More tools
6969

usage/camera/raspicam/timelapse.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Save and exit and you should see the message:
4040
crontab: installing new crontab
4141
```
4242

43-
Ensure your scipt does not save each picture taken with the same filename. This will overwrite the picture each time.
43+
Ensure your script does not save each picture taken with the same filename. This will overwrite the picture each time.
4444

4545
## Stitching images together
4646

@@ -55,7 +55,7 @@ ls *.jpg > stills.txt
5555
```
5656
### On the Raspberry Pi
5757

58-
Although it wil be slow (due to encoding in software rather than using the Raspberry Pi hardware acceleration), you can stitch your JPEG images together using various available tools. This documentation will use `avconv`, which needs to be installed.
58+
Although it will be slow (due to encoding in software rather than using the Raspberry Pi hardware acceleration), you can stitch your JPEG images together using various available tools. This documentation will use `avconv`, which needs to be installed.
5959
```
6060
sudo apt-get install libav-tools
6161
```

usage/gpio-plus-and-raspi2/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Ignoring the Pi for a moment, one of the simplest electrical circuits that you c
2828

2929
![Simple circuit](images/simple-circuit.png)
3030

31-
When we use a GPIO pin as an output, the Raspberry Pi replaces **both the switch and the battery** in the above diagram. Each pin can turn on or off,or go HIGH or LOW in computing terms. When the pin is HIGH it outputs 3.3 volts (3v3); when the pin is LOW it is off.
31+
When we use a GPIO pin as an output, the Raspberry Pi replaces **both the switch and the battery** in the above diagram. Each pin can turn on or off, or go HIGH or LOW in computing terms. When the pin is HIGH it outputs 3.3 volts (3v3); when the pin is LOW it is off.
3232

3333
Here's the same circuit using the Raspberry Pi. The LED is connected to a GPIO pin (which can output +3v3) and a ground pin (which is 0v and acts like the negative terminal of the battery):
3434

35-
![GPIO wth LED](images/gpio-led-pi2.png)
35+
![GPIO with LED](images/gpio-led-pi2.png)
3636

3737
The next step is to write a program to tell the pin to go HIGH or LOW. Here's an example using [Python](https://www.raspberrypi.org/learning/quick-reaction-game/) (see Step 2), and here's how to do it in [Scratch](https://www.raspberrypi.org/learning/robot-antenna/).
3838

0 commit comments

Comments
 (0)