Merge branch 'master' into develop

This commit is contained in:
cedricve
2015-05-23 00:07:59 +02:00
5 changed files with 9 additions and 9 deletions

View File

@@ -28,13 +28,13 @@ First you will need to download the Kerberos image; click on the image below. Th
The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. Its a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video.
![Kerberos.io image](3_kerberos-image.png)
[![Kerberos.io image](3_kerberos-image.png)](https://mega.co.nz/#!vY4WjKJD!2sZUuhzeVDFu47hSOQ94Jh27v0BLYpf6MRTBBzGfkrc)
#### Raspberry Pi Model 2
The Raspberry Pi 2 is the successor to the Raspberry Pi. It builds upon the original model B+ upgrading to 1 GB of RAM, and replacing the aged ARMv6l single-core with an ARMv7l Cortex-A7 quad-core.
![Kerberos.io image](3_kerberos-image.png)
[![Kerberos.io image](3_kerberos-image.png)](https://mega.co.nz/#!6AAGlAwa!dJqbpGBG_k2ZA2FACtTbY4WR2azaV2Izeur-k3_4RlU)
<a name="insert-your-sd-card"></a>
### 2. Insert your SD Card
@@ -98,4 +98,4 @@ If you will be using Kerberos.io with a WIFI dongle, then check out the [F.A.Q.
<a name="install-from-source"></a>
## Install from source
This will be the procedure if you want to contribute to Kerberos or if you want to use Kerberos on your local machine. To install Kerberos from source; you will need to [compile the machinery](/1.0.0/machinery/installation) from source and [import the webinterface](/1.0.0/web/installation) into your favorite webserver.
This will be the procedure if you want to contribute to Kerberos or if you want to use Kerberos on your local machine. To install Kerberos from source; you will need to [compile the machinery](/1.0.0/machinery/installation) from source and [import the webinterface](/1.0.0/web/installation) into your favorite webserver.

View File

@@ -60,7 +60,7 @@ Enable the service to start on boot
## Reset disk and memory space
The SD card of your RPi has limited space, therefore we need some process to clean up the images taken by the machinery.
The SD card of your Raspberry Pi, has limited space, therefore we need some process to clean up the images taken by the machinery.
mkdir /home/bash
nano /home/bash/run.sh

View File

@@ -1,6 +1,6 @@
#KERBEROS.IO - documentation
This repository contains all the documentation that is displayed on the [documentation website](http://kerberos.io/docs). The documentation is written in [markdown](http://markdowntutorial.com/) The documentation includes information about: how kerberos works, how to install it and also some technical information for developers who are willing to contribute; for example how to add a new algorithm or a new output device.
This repository contains all the documentation that is displayed on the [documentation website](https://doc.kerberos.io/). The documentation is written in [markdown](http://markdowntutorial.com/) The documentation includes information about: how kerberos works, how to install it and also some technical information for developers who are willing to contribute; for example how to add a new algorithm or a new output device.
## Folder structure

View File

@@ -28,13 +28,13 @@ First you will need to download the Kerberos image; click on the image below. Th
The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. Its a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video.
![Kerberos.io image](3_kerberos-image.png)
[![Kerberos.io image](3_kerberos-image.png)](https://mega.co.nz/#!vY4WjKJD!2sZUuhzeVDFu47hSOQ94Jh27v0BLYpf6MRTBBzGfkrc)
#### Raspberry Pi Model 2
The Raspberry Pi 2 is the successor to the Raspberry Pi. It builds upon the original model B+ upgrading to 1 GB of RAM, and replacing the aged ARMv6l single-core with an ARMv7l Cortex-A7 quad-core.
![Kerberos.io image](3_kerberos-image.png)
[![Kerberos.io image](3_kerberos-image.png)](https://mega.co.nz/#!6AAGlAwa!dJqbpGBG_k2ZA2FACtTbY4WR2azaV2Izeur-k3_4RlU)
<a name="insert-your-sd-card"></a>
### 2. Insert your SD Card
@@ -98,4 +98,4 @@ If you will be using Kerberos.io with a WIFI dongle, then check out the [F.A.Q.
<a name="install-from-source"></a>
## Install from source
This will be the procedure if you want to contribute to Kerberos or if you want to use Kerberos on your local machine. To install Kerberos from source; you will need to [compile the machinery](/1.0.0/machinery/installation) from source and [import the webinterface](/1.0.0/web/installation) into your favorite webserver.
This will be the procedure if you want to contribute to Kerberos or if you want to use Kerberos on your local machine. To install Kerberos from source; you will need to [compile the machinery](/1.0.0/machinery/installation) from source and [import the webinterface](/1.0.0/web/installation) into your favorite webserver.

View File

@@ -60,7 +60,7 @@ Enable the service to start on boot
## Reset disk and memory space
The SD card of your RPi has limited space, therefore we need some process to clean up the images taken by the machinery.
The SD card of your Raspberry Pi, has limited space, therefore we need some process to clean up the images taken by the machinery.
mkdir /home/bash
nano /home/bash/run.sh