From f56842f7c351b832f7e84c03e9081d5996b47953 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 3 Dec 2015 12:26:24 +0000
Subject: [PATCH] Simplification

---
 doc/EN/installation.org      |  17 +++++++----------
 man/freedombone.1.gz         | Bin 5528 -> 5525 bytes
 website/EN/installation.html |  23 ++++++++++-------------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 2c700b6b..9a24bafd 100644
--- a/doc/EN/installation.org
+++ b/doc/EN/installation.org
@@ -72,10 +72,10 @@ freedombone menuconfig
 ** On a single board computer (SBC)
 Currently the following boards are supported:
 
-    [[http://beagleboard.org/BLACK][Beaglebone Black]]
-    [[http://linux-sunxi.org/Cubietech_Cubieboard2][Cubieboard 2]]
-    [[https://linux-sunxi.org/Cubietruck][Cubietruck (Cubieboard 3)]]
-    [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware][olinuxino Lime2]]
+ * [[http://beagleboard.org/BLACK][Beaglebone Black]]
+ * [[http://linux-sunxi.org/Cubietech_Cubieboard2][Cubieboard 2]]
+ * [[https://linux-sunxi.org/Cubietruck][Cubietruck (Cubieboard 3)]]
+ * [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware][olinuxino Lime2]]
 
 If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
 
@@ -172,8 +172,7 @@ This is the traditional security model in which you carry your full keyring on a
 
 #+BEGIN_SRC bash
 ssh myusername@mydomainname -p 2222
-su
-control
+sudo control
 #+END_SRC
 
 Select /Backup and Restore/ then /Backup GPG key to USB (master keydrive)/.
@@ -182,8 +181,7 @@ This breaks your GPG key into a number of fragments and randomly selects one to
 
 #+BEGIN_SRC bash
 ssh myusername@mydomainname -p 2222
-su
-control
+sudo control
 #+END_SRC
 
 Select /Backup and Restore/ then /Backup GPG key to USB (fragment keydrive)/.
@@ -206,8 +204,7 @@ To administer the system after installation log in via ssh, become the root user
 
 #+BEGIN_SRC bash
 ssh myusername@freedombone.local -p 2222
-sudo su
-control
+sudo control
 #+END_SRC
 
 From there you will be able to perform various tasks, such as backups, adding and removing users and so on. You can also do this via commands, which are typically installed as /usr/local/bin/freedombone* and the corresponding manpages.
diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz
index bcaaa8c6b5e49eca635636aba1ea16c5f42ff69d..9e395fe4c3edc0d0017f4d8920e083e7819913db 100644
GIT binary patch
delta 1411
zcmV-}1$_FLE0rq-ABzY8*ffy_KLYG3kw-)UkCBWg2)#E#&B~?u&#}7&2?4*e!3jYE
zAYZ}!`vBfK31os9-o8fa;H9I$N+Ji&GDJMXZ|~mz7n33kH~}BCTMUZ=0iUzy4weCb
zpF(17mxIBSV?AwEt~?p<u0*v1S~+P7T#__OGJ3ux#~&n6e+c2Pv%a9>43>H8<PdQx
zK6uKy`oU8!0D;>=NgPuh8c`H6&rdY`;r~OAmw&FpKh@x$6g>aW6+7EjA*uF5r<wNA
z0^R((a2Lyw+iu^hc&c0zUPX>IBMG#BrqR+tQ*nBiP~kqkl!qkYwNfx0s_0l!IbWW+
z98{++ZI@9;e2P;Nf)?d$X86AFp`O|o3ywtl2#D;)1JdmLP}tMU0M{^G(Z0{qsT02)
zpmW>_882h0$OX=~qC|#FF6UPQq?8@n!oA7J9RkPO8Q6Nese9zKGa5`wDx$}KtqGB&
zH$YvjIc27aEk0(g<dJh6H%WPvfwhK{!8?p=@9=}-=$4fHj;lhJ3ZJyO@b)MWRk}X&
zMlS<PE2t3fH@oyor=rlq*{*MD0Qg<G>=M6BJ9%2ew+GHOt94g>g6mP4ikudzrI%-1
zG^KlhKCh2z@$4jST~eT$(@ma#mns0=o=_buH<2tK-keOXcY<)^O98$0!b5^mOwzkL
z*VZE?HH_&%E%%bH$$oEpCU>K2aC^C*U+6!$;x8-kX-y^R$WUUx6dZKrw`#nx;HrIE
zQ6s&DO^D#4B13}2%p8-IGsA^**4Pf#Ske={9jOC7^?pTO1L~a0O#};nbOWyI4ZSqP
zMmew4q{#){36yKkPf@asqT)S)9x{h|kCAZ?Bhy=#7$m&;CeQA$tIbwr8RwZ(-qt<0
zky5NQIrG=XkPgF(Ev|FY6qH=ZZ9(#6FeU}6BV3X#gunYw?d2MtDVXLef6lp1mXyB>
z+o1|y0ZXCv(YGBT;pt0%Bl0S_hygD`z8N2c1yj8|oKC-9T%CYAUUs>ajcJNXV%8Rb
zcV(sIVUuKavKi9&qsiT%D>?)Vqxu5zu}!ClUIxhdpWF&|8DLQFc80h6Sc)fZd2%*6
zpG>dESM>Pk`qNlVf5TsAJA-SY2J|MtZEZ}aY+4jYcY=^KT{0to!tTcBPW%waS}!jW
z+YElG>0UGHpF%7)T$$zQ@2^lljL{zg!>CQav>3d2ZEAkdMvr7|1LV@~)^%bDu)0fZ
zh%be!kYe*=4@Z@c5R-|gL}TQL6bLyVKAPTcz!@g*ZNi*5lw(79(oKIH#2QIXFLK=4
z$|Y5J{p6zdt}oPo(O6xL&n~`<PY%@C_+)aZrsJzGljCt)lI@m_52j#M90ZT#k?bH|
zaZ5eQO0k%^Sk>o#bS3Rf*jSHP@kR7v$Pa4ygA^#j2QnsD5|G$)5LxJ@peg6h;dO_|
zwO8HZXMyv%JWbTDZ%|TC>vreZEn58T>YgnhK*Ge^5#@w`o`FU4Mn_6+KD2BsUzQZ%
z;|+@yRA1SQsw?tFxV<+N`;3okTN7lFCUyu4X7nmNJZ@itJY){^K+y*##Cst)0ARJA
zy{^&DwWO9w1z<=?6z`WGLWhvwiL0bH(WTVz`B_x8q2=!vRvy^$sls_g)Ty$B7xC4y
zdt3(cf+2=~GJ2iD&tcj#-}C?RCWiFx9pp#A?v>%<f7T#!Xitj!yWSM+l^`@+d>6)X
z{psRrXK-XQb!I)%;g$O5%w~V7ZDxI$yHRsH^7dZ_qpTiWe!ScRbw5z!!}ss@$FJV;
z*Q3&}=)LXS9H^tS;eP(LS*(ukz7(_i)8f?r+jZe0*2lM>O?hqW8{?*@JnE~-4tT@Z
RZ-1@9e*+j_N|?$w008l5#(4k$

delta 1414
zcmV;11$p|FE0`+=ABzY8Kr@jBKLW%kkw-)UuaS%=2(vdr&B~?u@3FfD2?77J!3jYE
zAm73K`vBfK31os9-o8fa;H9I$N+Ji&GDJMXZ|~mz50fGcH~~MiTMUZ=0bjG{4weCb
zKNQg@GS+rE7)&|j(~jlllVR^lG(4aUBu#-*l440z&$q<+gT(6(AqsXz7&M*1KyRI#
zB~HcXPsvw5hRQu4;9Ho9W5z=xiXx`_iK0LJGt_zc=bHReMgB?M^Pi>P*|sK0!yh^Y
zwNDu69e@irvmD3m_AQI2IyRwKWLz_U5=3huEjct5CwmDo?vqV<RubMW1q-73jwQ|W
zRhr8|eCpD6`E^9AI3?j}QO;(DZx0`;t9`%VNWzam%5FR$&Cbt;J-rif4U-q``>dTh
z@k;_a$DL5~G8T?pV1O%1Ysm6)eltKy*`Y1mn~c07Fut9Et+$)HCr>-0!L+1*l6u^l
z&`Np{)K#8So|>5CV@6AkImdC61V|YeZ8#a6#JKiGKPZmwOv(MYMr5fBN}CHWkpgX{
z%QSEFGH|wn%JP1*OK)~63Phay`lbe)-<8WQ4a~HYhc<kd;9Rp>ceN;ZAQi31ccEH(
zhsGsTx)tcN{HPX+m@un#NnvY$PWO6VY65hZLRGQcMCyEab27Q!3Brx<2K3f@4+&8*
zW$&t9TThnMFeV4J+)}zG`@QX%+?1}t^yRjGq5t6ezpTKgHI*bMLtz3^e$bWQs`$q8
ztM+Mqjr0~aA%csF4CxZ{bWB#x442VaV>?)5Ne}jRq$>2(YZiGMsB<cRJ`pU?eYmbS
z^zINF<t$T^CKq%=P_8{cOvyHiO8JC+$Rp}K2FN{(Oz&V~tnlWWJi^1SHd}ROoM%p1
zT=)1!3bWGW%wHQrIt=f(xavt$P^uw!2gw7%m?Ef-eo5{S{_a1#mrHpjWSVRKIcGju
zQVcI_hbnv_EM?b6UwVXp^rtV4$g<>G1}q8LXM7$OO!e|`I{kWabpj%J*=1TbCM_xn
zU0VR&6`7J}PLkuvW=P|Yrh0>}1Q9HZstv@>Hk~4R`5<S5a!1(ZgF(I9`QGkh37@#-
z$=T$5GQA#O(Nm=BPh&Ox4S${O46cbG&<g>#wK1J?Yf&8C5JJ*_bmfddyBi-r@v|Un
zy}VCs^ZBKwTh6F|3bEL5WtOAAzh3=hsQwW6Ms51_#^B6rQ}Zh~dO2$w0GM{Su9Hqc
z*InX9d{bP7yqjNuI4XyP&`hi)+9U_2z|vU;(E@h^+%ThWv*^UH9NWW_-umMp7EW?{
zrsLLDZmz<UC>ND~czvOc#_DQ(cJXC=a-hz}CzC@p9bbK!9FN;NZMSTEMFr#HSa>8a
zX9w}#TZ&XxD#*;tsy-8>dunIG#(Ff1Z>JYSer3xaq-qg9kWIm$0LY$W$wDs$R5_sz
zPd-Ghy^<Hd6`arIy`pw~yOJVXw>!t)(ZX<73~gxvvMAnvjwmPe44j%bI#O~SqGe<G
zvZO#CuU)Kw`^siia*>C_?Pa2vX?$_pnjnibu|qI1qgUZIa{D~wA%UP*i#`w{-V31u
zaI1Cjb&Yl|Ftvm#;6uu#c)$EQIz;|XTqQk}E~T)~Z>6dYEq}kT^6HjP70x4~PL(C}
zi0_--<1&zcXALo;(UTQ^Bh#Mwp8wxCF|v1$BR>LtuMFP^WDNp{_N2JK>!HD330}h$
zc_ALxpDwO;21hniXVxP}Ua5c0Z1$JhX4aRv8#T8hZ~tvD%Id-8$ICr1_yaXQeE)8L
z{OTQlJu3Z*9^uZ-fjT-H?&n{d#p>wpOEIfIEl%wve_R)CeSG`bl-IVtF>ZRwqrRH#
UfH#c&_SYKxFXm?UR^K-O0QLj30RR91

diff --git a/website/EN/installation.html b/website/EN/installation.html
index 21f75c65..82a081c7 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2015-12-03 Thu 12:19 -->
+<!-- 2015-12-03 Thu 12:26 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -319,12 +319,12 @@ freedombone menuconfig
 Currently the following boards are supported:
 </p>
 
-<p>
-<a href="http://beagleboard.org/BLACK">Beaglebone Black</a>
-<a href="http://linux-sunxi.org/Cubietech_Cubieboard2">Cubieboard 2</a>
-<a href="https://linux-sunxi.org/Cubietruck">Cubietruck (Cubieboard 3)</a>
-<a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware">olinuxino Lime2</a>
-</p>
+<ul class="org-ul">
+<li><a href="http://beagleboard.org/BLACK">Beaglebone Black</a></li>
+<li><a href="http://linux-sunxi.org/Cubietech_Cubieboard2">Cubieboard 2</a></li>
+<li><a href="https://linux-sunxi.org/Cubietruck">Cubietruck (Cubieboard 3)</a></li>
+<li><a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware">olinuxino Lime2</a></li>
+</ul>
 
 <p>
 If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
@@ -595,8 +595,7 @@ This is the traditional security model in which you carry your full keyring on a
 <div class="org-src-container">
 
 <pre class="src src-bash">ssh myusername@mydomainname -p 2222
-su
-control
+sudo control
 </pre>
 </div>
 
@@ -615,8 +614,7 @@ This breaks your GPG key into a number of fragments and randomly selects one to
 <div class="org-src-container">
 
 <pre class="src src-bash">ssh myusername@mydomainname -p 2222
-su
-control
+sudo control
 </pre>
 </div>
 
@@ -660,8 +658,7 @@ To administer the system after installation log in via ssh, become the root user
 <div class="org-src-container">
 
 <pre class="src src-bash">ssh myusername@freedombone.local -p 2222
-sudo su
-control
+sudo control
 </pre>
 </div>