Pārlūkot izejas kodu

Switch to using master branch for installs and upgrades

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
bd74ed4be5

+ 0
- 2
doc/EN/beaglebone.org Parādīt failu

39
 sudo apt-get install git
39
 sudo apt-get install git
40
 git clone https://github.com/bashrc/freedombone
40
 git clone https://github.com/bashrc/freedombone
41
 cd freedombone
41
 cd freedombone
42
-git checkout stockholm
43
 sudo make install
42
 sudo make install
44
 freedombone-image --setup debian
43
 freedombone-image --setup debian
45
 #+end_src
44
 #+end_src
50
 sudo pacman -S git
49
 sudo pacman -S git
51
 git clone https://github.com/bashrc/freedombone
50
 git clone https://github.com/bashrc/freedombone
52
 cd freedombone
51
 cd freedombone
53
-git checkout stockholm
54
 sudo make install
52
 sudo make install
55
 freedombone-image --setup parabola
53
 freedombone-image --setup parabola
56
 #+end_src
54
 #+end_src

+ 0
- 2
doc/EN/homeserver.org Parādīt failu

23
 sudo apt-get install git
23
 sudo apt-get install git
24
 git clone https://github.com/bashrc/freedombone
24
 git clone https://github.com/bashrc/freedombone
25
 cd freedombone
25
 cd freedombone
26
-git checkout stockholm
27
 sudo make install
26
 sudo make install
28
 freedombone-image --setup debian
27
 freedombone-image --setup debian
29
 freedombone-image -t i386 --onion yes
28
 freedombone-image -t i386 --onion yes
35
 sudo pacman -S git
34
 sudo pacman -S git
36
 git clone https://github.com/bashrc/freedombone
35
 git clone https://github.com/bashrc/freedombone
37
 cd freedombone
36
 cd freedombone
38
-git checkout stockholm
39
 sudo make install
37
 sudo make install
40
 freedombone-image --setup parabola
38
 freedombone-image --setup parabola
41
 freedombone-image -t i386 --onion yes
39
 freedombone-image -t i386 --onion yes

+ 0
- 1
doc/EN/mesh.org Parādīt failu

117
 3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
117
 3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
118
 tar -xzvf freedombone-mesh-13-09-2016.tar.gz
118
 tar -xzvf freedombone-mesh-13-09-2016.tar.gz
119
 cd freedombone
119
 cd freedombone
120
-git checkout stockholm
121
 sudo make install
120
 sudo make install
122
 freedombone-image -t i386 -v meshclient
121
 freedombone-image -t i386 -v meshclient
123
 #+end_src
122
 #+end_src

+ 1
- 1
src/freedombone-image Parādīt failu

234
             cd $USERHOME/develop/multipath-tools
234
             cd $USERHOME/develop/multipath-tools
235
             makepkg --force --noconfirm
235
             makepkg --force --noconfirm
236
             makepkg -i --force --noconfirm
236
             makepkg -i --force --noconfirm
237
-            sudo wget https://raw.githubusercontent.com/bashrc/freedombone/stockholm/image_build/debootstrap/scripts/${DEBIAN_VERSION} -O /usr/share/debootstrap/scripts/debscript
237
+            sudo wget https://raw.githubusercontent.com/bashrc/freedombone/master/image_build/debootstrap/scripts/${DEBIAN_VERSION} -O /usr/share/debootstrap/scripts/debscript
238
             sudo cp -f /usr/share/debootstrap/scripts/debscript /usr/share/debootstrap/scripts/${DEBIAN_VERSION}
238
             sudo cp -f /usr/share/debootstrap/scripts/debscript /usr/share/debootstrap/scripts/${DEBIAN_VERSION}
239
             if [ ! -f /usr/share/debootstrap/scripts/${DEBIAN_VERSION} ]; then
239
             if [ ! -f /usr/share/debootstrap/scripts/${DEBIAN_VERSION} ]; then
240
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"
240
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"

+ 0
- 1
src/freedombone-image-customise Parādīt failu

1033
 chroot "$rootdir" /bin/bash -x <<EOF
1033
 chroot "$rootdir" /bin/bash -x <<EOF
1034
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1034
 git clone $PROJECT_REPO /root/$PROJECT_NAME
1035
 cd /root/$PROJECT_NAME
1035
 cd /root/$PROJECT_NAME
1036
-git checkout origin/stockholm -b stockholm
1037
 make install
1036
 make install
1038
 EOF
1037
 EOF
1039
 
1038
 

+ 1
- 2
src/freedombone-upgrade Parādīt failu

52
 read_config_param PROJECT_REPO
52
 read_config_param PROJECT_REPO
53
 read_config_param DEVELOPMENT_BRANCH
53
 read_config_param DEVELOPMENT_BRANCH
54
 
54
 
55
-# TODO change this after release
56
-DEVELOPMENT_BRANCH=stockholm
55
+DEVELOPMENT_BRANCH=master
57
 write_config_param "DEVELOPMENT_BRANCH" "$DEVELOPMENT_BRANCH"
56
 write_config_param "DEVELOPMENT_BRANCH" "$DEVELOPMENT_BRANCH"
58
 
57
 
59
 if [ $DEVELOPMENT_BRANCH ]; then
58
 if [ $DEVELOPMENT_BRANCH ]; then

+ 1
- 3
website/EN/beaglebone.html Parādīt failu

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2016-11-24 Thu 10:26 -->
6
+<!-- 2016-11-24 Thu 10:49 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
284
 <pre class="src src-bash">sudo apt-get install git
284
 <pre class="src src-bash">sudo apt-get install git
285
 git clone https://github.com/bashrc/freedombone
285
 git clone https://github.com/bashrc/freedombone
286
 <span class="org-builtin">cd</span> freedombone
286
 <span class="org-builtin">cd</span> freedombone
287
-git checkout stockholm
288
 sudo make install
287
 sudo make install
289
 freedombone-image --setup debian
288
 freedombone-image --setup debian
290
 </pre>
289
 </pre>
298
 <pre class="src src-bash">sudo pacman -S git
297
 <pre class="src src-bash">sudo pacman -S git
299
 git clone https://github.com/bashrc/freedombone
298
 git clone https://github.com/bashrc/freedombone
300
 <span class="org-builtin">cd</span> freedombone
299
 <span class="org-builtin">cd</span> freedombone
301
-git checkout stockholm
302
 sudo make install
300
 sudo make install
303
 freedombone-image --setup parabola
301
 freedombone-image --setup parabola
304
 </pre>
302
 </pre>

+ 1
- 3
website/EN/homeserver.html Parādīt failu

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2016-11-23 Wed 23:02 -->
6
+<!-- 2016-11-24 Thu 10:49 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
258
 <pre class="src src-bash">sudo apt-get install git
258
 <pre class="src src-bash">sudo apt-get install git
259
 git clone https://github.com/bashrc/freedombone
259
 git clone https://github.com/bashrc/freedombone
260
 <span class="org-builtin">cd</span> freedombone
260
 <span class="org-builtin">cd</span> freedombone
261
-git checkout stockholm
262
 sudo make install
261
 sudo make install
263
 freedombone-image --setup debian
262
 freedombone-image --setup debian
264
 freedombone-image -t i386 --onion yes
263
 freedombone-image -t i386 --onion yes
273
 <pre class="src src-bash">sudo pacman -S git
272
 <pre class="src src-bash">sudo pacman -S git
274
 git clone https://github.com/bashrc/freedombone
273
 git clone https://github.com/bashrc/freedombone
275
 <span class="org-builtin">cd</span> freedombone
274
 <span class="org-builtin">cd</span> freedombone
276
-git checkout stockholm
277
 sudo make install
275
 sudo make install
278
 freedombone-image --setup parabola
276
 freedombone-image --setup parabola
279
 freedombone-image -t i386 --onion yes
277
 freedombone-image -t i386 --onion yes

+ 44
- 45
website/EN/mesh.html Parādīt failu

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2016-10-31 Mon 16:23 -->
6
+<!-- 2016-11-24 Thu 10:49 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
273
 </colgroup>
273
 </colgroup>
274
 <tbody>
274
 <tbody>
275
 <tr>
275
 <tr>
276
-<td class="org-left"><a href="#org99ea1c9">What the system can do</a></td>
276
+<td class="org-left"><a href="#orgdb7a57b">What the system can do</a></td>
277
 <td class="org-left">-</td>
277
 <td class="org-left">-</td>
278
-<td class="org-left"><a href="#org5cc91dd">Disk Images</a></td>
278
+<td class="org-left"><a href="#orgc804016">Disk Images</a></td>
279
 <td class="org-left">-</td>
279
 <td class="org-left">-</td>
280
-<td class="org-left"><a href="#org8badd4f">Building Disk Images</a></td>
280
+<td class="org-left"><a href="#org1af89bc">Building Disk Images</a></td>
281
 <td class="org-left">-</td>
281
 <td class="org-left">-</td>
282
-<td class="org-left"><a href="#orgb35f622">How to use it</a></td>
282
+<td class="org-left"><a href="#orgf19b78f">How to use it</a></td>
283
 </tr>
283
 </tr>
284
 </tbody>
284
 </tbody>
285
 </table>
285
 </table>
288
 Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
288
 Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
289
 </p>
289
 </p>
290
 
290
 
291
-<div id="outline-container-org99ea1c9" class="outline-2">
292
-<h2 id="org99ea1c9">What the system can do</h2>
293
-<div class="outline-text-2" id="text-org99ea1c9">
291
+<div id="outline-container-orgdb7a57b" class="outline-2">
292
+<h2 id="orgdb7a57b">What the system can do</h2>
293
+<div class="outline-text-2" id="text-orgdb7a57b">
294
 <ul class="org-ul">
294
 <ul class="org-ul">
295
 <li>Discovery of other users on the network</li>
295
 <li>Discovery of other users on the network</li>
296
 <li>Text based chat, one-to-one and in groups</li>
296
 <li>Text based chat, one-to-one and in groups</li>
311
 </div>
311
 </div>
312
 </div>
312
 </div>
313
 
313
 
314
-<div id="outline-container-org5cc91dd" class="outline-2">
315
-<h2 id="org5cc91dd">Disk Images</h2>
316
-<div class="outline-text-2" id="text-org5cc91dd">
317
-</div><div id="outline-container-org3f61094" class="outline-3">
318
-<h3 id="org3f61094">Client images</h3>
319
-<div class="outline-text-3" id="text-org3f61094">
314
+<div id="outline-container-orgc804016" class="outline-2">
315
+<h2 id="orgc804016">Disk Images</h2>
316
+<div class="outline-text-2" id="text-orgc804016">
317
+</div><div id="outline-container-orgeb76f79" class="outline-3">
318
+<h3 id="orgeb76f79">Client images</h3>
319
+<div class="outline-text-3" id="text-orgeb76f79">
320
 <div class="org-center">
320
 <div class="org-center">
321
 
321
 
322
 <div class="figure">
322
 <div class="figure">
363
 </div>
363
 </div>
364
 </div>
364
 </div>
365
 
365
 
366
-<div id="outline-container-orge808539" class="outline-3">
367
-<h3 id="orge808539">Router images</h3>
368
-<div class="outline-text-3" id="text-orge808539">
366
+<div id="outline-container-org70774e2" class="outline-3">
367
+<h3 id="org70774e2">Router images</h3>
368
+<div class="outline-text-3" id="text-org70774e2">
369
 <p>
369
 <p>
370
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
370
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
371
 </p>
371
 </p>
372
 </div>
372
 </div>
373
-<div id="outline-container-org23d456f" class="outline-4">
374
-<h4 id="org23d456f">Beaglebone Black</h4>
375
-<div class="outline-text-4" id="text-org23d456f">
373
+<div id="outline-container-orge9028ca" class="outline-4">
374
+<h4 id="orge9028ca">Beaglebone Black</h4>
375
+<div class="outline-text-4" id="text-orge9028ca">
376
 <div class="org-center">
376
 <div class="org-center">
377
 
377
 
378
 <div class="figure">
378
 <div class="figure">
409
 </div>
409
 </div>
410
 </div>
410
 </div>
411
 
411
 
412
-<div id="outline-container-org8badd4f" class="outline-2">
413
-<h2 id="org8badd4f">Building Disk Images</h2>
414
-<div class="outline-text-2" id="text-org8badd4f">
412
+<div id="outline-container-org1af89bc" class="outline-2">
413
+<h2 id="org1af89bc">Building Disk Images</h2>
414
+<div class="outline-text-2" id="text-org1af89bc">
415
 <p>
415
 <p>
416
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
416
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
417
 </p>
417
 </p>
433
 3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
433
 3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
434
 tar -xzvf freedombone-mesh-13-09-2016.tar.gz
434
 tar -xzvf freedombone-mesh-13-09-2016.tar.gz
435
 <span class="org-builtin">cd</span> freedombone
435
 <span class="org-builtin">cd</span> freedombone
436
-git checkout stockholm
437
 sudo make install
436
 sudo make install
438
 freedombone-image -t i386 -v meshclient
437
 freedombone-image -t i386 -v meshclient
439
 </pre>
438
 </pre>
501
 </div>
500
 </div>
502
 </div>
501
 </div>
503
 
502
 
504
-<div id="outline-container-orgcccda0f" class="outline-2">
505
-<h2 id="orgcccda0f">Customisation</h2>
506
-<div class="outline-text-2" id="text-orgcccda0f">
503
+<div id="outline-container-org5fae536" class="outline-2">
504
+<h2 id="org5fae536">Customisation</h2>
505
+<div class="outline-text-2" id="text-org5fae536">
507
 <p>
506
 <p>
508
 If you want to make your own specially branded version, such as for a particular event, then to change the default desktop backgrounds edit the images within <b>img/backgrounds</b> and to change the available avatars and desktop icons edit the images within <b>img/avatars</b>. Re-create disk images using the instructions shown previously.
507
 If you want to make your own specially branded version, such as for a particular event, then to change the default desktop backgrounds edit the images within <b>img/backgrounds</b> and to change the available avatars and desktop icons edit the images within <b>img/avatars</b>. Re-create disk images using the instructions shown previously.
509
 </p>
508
 </p>
513
 </p>
512
 </p>
514
 </div>
513
 </div>
515
 </div>
514
 </div>
516
-<div id="outline-container-orgb35f622" class="outline-2">
517
-<h2 id="orgb35f622">How to use it</h2>
518
-<div class="outline-text-2" id="text-orgb35f622">
515
+<div id="outline-container-orgf19b78f" class="outline-2">
516
+<h2 id="orgf19b78f">How to use it</h2>
517
+<div class="outline-text-2" id="text-orgf19b78f">
519
 <p>
518
 <p>
520
 When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.
519
 When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.
521
 </p>
520
 </p>
525
 </p>
524
 </p>
526
 </div>
525
 </div>
527
 
526
 
528
-<div id="outline-container-org38406d6" class="outline-3">
529
-<h3 id="org38406d6">Set the Date</h3>
530
-<div class="outline-text-3" id="text-org38406d6">
527
+<div id="outline-container-orgb323b0f" class="outline-3">
528
+<h3 id="orgb323b0f">Set the Date</h3>
529
+<div class="outline-text-3" id="text-orgb323b0f">
531
 <p>
530
 <p>
532
 On the ordinary internet the date and time of your system would be set automatically via NTP. But this is not the internet and so you will need to manually ensure that your date and time settings are correct. You might need to periodically do this if your clock drifts. It's not essential that the time on your system be highly accurate, but if it drifts too far or goes back to epoch then things could become a little confusing in regard to the order of blog posts.
531
 On the ordinary internet the date and time of your system would be set automatically via NTP. But this is not the internet and so you will need to manually ensure that your date and time settings are correct. You might need to periodically do this if your clock drifts. It's not essential that the time on your system be highly accurate, but if it drifts too far or goes back to epoch then things could become a little confusing in regard to the order of blog posts.
533
 </p>
532
 </p>
537
 </p>
536
 </p>
538
 </div>
537
 </div>
539
 </div>
538
 </div>
540
-<div id="outline-container-org42a8dc5" class="outline-3">
541
-<h3 id="org42a8dc5">Check network status</h3>
542
-<div class="outline-text-3" id="text-org42a8dc5">
539
+<div id="outline-container-org21297c6" class="outline-3">
540
+<h3 id="org21297c6">Check network status</h3>
541
+<div class="outline-text-3" id="text-org21297c6">
543
 <p>
542
 <p>
544
 Unlike with ordinary wifi, on the mesh you don't get a signal strength icon and so it's not simple to see if you have a good connection.
543
 Unlike with ordinary wifi, on the mesh you don't get a signal strength icon and so it's not simple to see if you have a good connection.
545
 </p>
544
 </p>
563
 </div>
562
 </div>
564
 </div>
563
 </div>
565
 
564
 
566
-<div id="outline-container-org6171f23" class="outline-3">
567
-<h3 id="org6171f23">Chat System</h3>
568
-<div class="outline-text-3" id="text-org6171f23">
565
+<div id="outline-container-orgddd7c4f" class="outline-3">
566
+<h3 id="orgddd7c4f">Chat System</h3>
567
+<div class="outline-text-3" id="text-orgddd7c4f">
569
 <p>
568
 <p>
570
 Ensure that you're within wifi range of at least one other mesh peer (could be a router or client) and then you should see that the <i>Chat</i> and <i>Other Users</i> icons appear. Select the users icon and you should see a list of users on the mesh. Select the <i>Chat</i> icon and once you are connected you should see the status light turn green. If after a few minutes you don't get the green status light then try closing and re-opening the Tox chat application. Select the plus button to add a friend and then copy and paste in a Tox ID from the users list.
569
 Ensure that you're within wifi range of at least one other mesh peer (could be a router or client) and then you should see that the <i>Chat</i> and <i>Other Users</i> icons appear. Select the users icon and you should see a list of users on the mesh. Select the <i>Chat</i> icon and once you are connected you should see the status light turn green. If after a few minutes you don't get the green status light then try closing and re-opening the Tox chat application. Select the plus button to add a friend and then copy and paste in a Tox ID from the users list.
571
 </p>
570
 </p>
624
 </div>
623
 </div>
625
 </div>
624
 </div>
626
 
625
 
627
-<div id="outline-container-orgc20605b" class="outline-3">
628
-<h3 id="orgc20605b">Sharing Files</h3>
629
-<div class="outline-text-3" id="text-orgc20605b">
626
+<div id="outline-container-org90d8c9e" class="outline-3">
627
+<h3 id="org90d8c9e">Sharing Files</h3>
628
+<div class="outline-text-3" id="text-org90d8c9e">
630
 <p>
629
 <p>
631
 You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user.
630
 You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user.
632
 </p>
631
 </p>
641
 </div>
640
 </div>
642
 </div>
641
 </div>
643
 
642
 
644
-<div id="outline-container-orgb5100d8" class="outline-3">
645
-<h3 id="orgb5100d8">Blogging</h3>
646
-<div class="outline-text-3" id="text-orgb5100d8">
643
+<div id="outline-container-org0a98946" class="outline-3">
644
+<h3 id="org0a98946">Blogging</h3>
645
+<div class="outline-text-3" id="text-org0a98946">
647
 <p>
646
 <p>
648
 To create a blog post select the <i>Blog</i> icon on the desktop and then use the up and down cursor keys, space bar and enter key to add a new entry. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the <b>CreateBlog/content/images</b> directory and then link to them as shown.
647
 To create a blog post select the <i>Blog</i> icon on the desktop and then use the up and down cursor keys, space bar and enter key to add a new entry. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the <b>CreateBlog/content/images</b> directory and then link to them as shown.
649
 </p>
648
 </p>