indent install-on-netbsd and fix some minor text issues.

1 files changed, 138 insertions, 116 deletions

diff --git a/template/install-on-netbsd.html.j2 b/template/install-on-netbsd.html.j2
index 79b1372b..b36eaa22 100644
--- a/template/install-on-netbsd.html.j2
+++ b/template/install-on-netbsd.html.j2
@@ -10,16 +10,21 @@
     Welcome to the GNUnet tutorial for NetBSD!
   </p>
   <p>
-    It provides
-    concrete instructions on how to install a current
-    version of GNUnet. The goal is to support newcomers, either end users or
-    developers, who want to get in touch with GNUnet for the first time.
+    This tutorial provides concrete instructions on how to install a
+    current version of GNUnet. The goal is to support newcomers,
+    either users or developers, who want to get in touch with
+    GNUnet for the first time.
   </p>
 
   <h2>{{ _("Requirements") }}</h2>
 
   <p>
-    As a bare minimum, we recommend you install <a href="http://pkgsrc.org">pkgsrc</a>. This tutorial assumes you have the CURRENT version checked out. Additionally you might want to install <code>devel/git-base</code> and git clone <a href="http://pkgsrc.org/wip/">pkgsrc-wip</a> into the <code>wip</code> folder in your pkgsrc folder:
+    As a bare minimum, we recommend you
+    install <a href="http://pkgsrc.org">pkgsrc</a>. This tutorial
+    assumes you have the CURRENT version checked out. Additionally you
+    might want to install <code>devel/git-base</code> and git
+    clone <a href="http://pkgsrc.org/wip/">pkgsrc-wip</a> into
+    the <code>wip</code> folder in your pkgsrc folder:
   </p>
   <p>
     <code>
@@ -27,9 +32,13 @@
       $ git clone git://wip.pkgsrc.org/pkgsrc-wip.git wip
     </code>
   </p>
+
   <h2>{{ _("Installation") }}</h2>
+
   <p>
-  Note: $ stands for commands run as unprivileged user, # for commands run as root user.
+    Note: <code>$</code> stands for commands run as unprivileged
+    user, <code>#</code> for commands run as root user (this can be done
+    with security/doas, security/sudo, or just as root).
   </p>
   <p>
     GNUnet is not yet in the pkgsrc tree, it&#39;s still in the
@@ -37,26 +46,26 @@
     into <code>/usr/pksrc/wip</code>:
   </p>
   <p>
-  <code>
-    $ cd /usr/pkgsrc/wip/gnunet
-  </code>
+    <code>
+      $ cd /usr/pkgsrc/wip/gnunet
+    </code>
   </p>
   <p>
-   Before you start building, you might want to review
-   your <code>/etc/mk.conf</code>. I suggest to consider:
+    Before you start building, you might want to review
+    your <code>/etc/mk.conf</code>. I suggest to consider:
   </p>
   <ul>
-   <li>WRKOBJDIR=/usr/work
-   <li>DISTDIR=/usr/distfiles
-   <li>DEPENDS_TARGET=package
-   <li>UPDATE_TARGET=bin-install
-   <li>ACCEPTABLE_LICENSES+= gnu-agpl-v3
-   <li>MKREPRO=yes
+    <li>WRKOBJDIR=/usr/work
+    <li>DISTDIR=/usr/distfiles
+    <li>DEPENDS_TARGET=package
+    <li>UPDATE_TARGET=bin-install
+    <li>ACCEPTABLE_LICENSES+=gnu-agpl-v3
+    <li>MKREPRO=yes
   </ul>
   <p>
-    As we rely on ImageMagick somewhere down our dependency chain
-    (it is one of libextractor&#39;s dependencies), you need to set
-    the following (as of 2019-03-06) as well:
+    As we rely on ImageMagick somewhere down our dependency chain (it
+    is one of libextractor&#39;s dependencies), you need to set the
+    following (as of 2019-03-06) as well:
   </p>
   <ul>
     <li>IGNORE_URL+=https://nvd.nist.gov/vuln/detail/CVE-2018-15607
@@ -65,38 +74,38 @@
     You could however just <code>env ALLOW_VULNERABLE_PACKAGES=1</code>
   </p>
   <p>
-   The build process can involve manual installation interruptions for
-   dependencies!
+    The build process can involve manual installation interruptions for
+    dependencies!
   </p> 
   <p>
     Then start building:
+    <p>
+      <code>
+        $ make package
+      </code>
+    </p>
   <p>
-  <code>
-    $ make package
-  </code>
-  </p>
-  <p>
-    Once you are done, type as root:
+    Once you are done, type:
   </p>
   <p>
-  <code>
-    # make install
-  </code>
+    <code>
+      $ make install
+    </code>
   </p>
   <p>
     or alternatively:
+    <p>
+    <p>
+      <code>
+        # pkg_add /usr/pkgsrc/packages/All/gnunet-0.11.8.tgz
+      </code>
+    </p>
   <p>
-  <p>
-  <code>
-    # pkg_add /usr/pkgsrc/packages/All/gnunet-0.11.8.tgz
-  </code>
-  </p>
-  <p>
-  And you&#39;re done!.<br>
-  GNUnet has a number of services and features.
-  Please check <a href="https://docs.gnunet.org/">our documentation</a>
-  to learn how to use them. If you find anything odd or bugs, please
-  <a href="https://bugs.gnunet.org">let us know</a>.
+    And you&#39;re done!.<br>
+    GNUnet has a number of services and features.
+    Please check <a href="https://docs.gnunet.org/">our documentation</a>
+    to learn how to use them. If you find anything odd or bugs, please
+    <a href="https://bugs.gnunet.org">let us know</a>.
   </p>
   <p>
     Note that the rc.d file which is installed is not yet fully functional
@@ -105,82 +114,82 @@
 
   <h2>{{_("First steps")}}</h2>
   <p>
-  Congratulations! GNUnet is now installed! Before starting it you
-  may create a configuration file. By default GNUnet looks in
-  our home directory for the file `~/.config/gnunet.conf`.
-  Creating the configuation file is optional. For now just create an empty
-  file which will remind you of the location later if needed:
+    Congratulations! GNUnet is now installed! Before starting it you
+    may create a configuration file. By default GNUnet looks in
+    our home directory for the file `~/.config/gnunet.conf`.
+    Creating the configuation file is optional. For now just create an empty
+    file which will remind you of the location later if needed:
   </p>
   <p>
-  <code>
-  $ touch ~/.config/gnunet.conf
-  </code>
+    <code>
+      $ touch ~/.config/gnunet.conf
+    </code>
   </p>
- <br />   
+  <br />   
   <p>
     It&#39;s reccomended that you increase your bandwidth restrictions
     from the acutely low defaults. The example below sets the WAN
     and LAN limits to the value "unlimited".
   </p>
- <br />
+  <br />
   <code>
     $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
     $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br /> 
     $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
     $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br />
   </code>
- <br />
+  <br />
   <p>
-  GNUnet and its services are managed using the command line tool  `gnunet-arm`
-  (Automatic Restart Manager).
-  <br/>
-  To start GNUnet with its default services execute:
+    GNUnet and its services are managed using the command line tool  `gnunet-arm`
+    (Automatic Restart Manager).
+    <br/>
+    To start GNUnet with its default services execute:
   </p>
   <p>
-  <code>
-  $ gnunet-arm -s
-  </code>
+    <code>
+      $ gnunet-arm -s
+    </code>
   </p>
 
   <p>
-  To list the running services use:
+    To list the running services use:
   </p>
   <p>
-  <code>
-  $ gnunet-arm -I<br>
-  Running services:<br>
-  ats (gnunet-service-ats)<br>
-  revocation (gnunet-service-revocation)<br>
-  set (gnunet-service-set)<br>
-  nat (gnunet-service-nat)<br>
-  transport (gnunet-service-transport)<br>
-  peerstore (gnunet-service-peerstore)<br>
-  hostlist (gnunet-daemon-hostlist)<br>
-  identity (gnunet-service-identity)<br>
-  namecache (gnunet-service-namecache)<br>
-  peerinfo (gnunet-service-peerinfo)<br>
-  datastore (gnunet-service-datastore)<br>
-  zonemaster (gnunet-service-zonemaster)<br>
-  zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
-  nse (gnunet-service-nse)<br>
-  cadet (gnunet-service-cadet)<br>
-  dht (gnunet-service-dht)<br>
-  core (gnunet-service-core)<br>
-  gns (gnunet-service-gns)<br>
-  statistics (gnunet-service-statistics)<br>
-  topology (gnunet-daemon-topology)<br>
-  fs (gnunet-service-fs)<br>
-  namestore (gnunet-service-namestore)<br>
-  vpn (gnunet-service-vpn)
-  </code>
+    <code>
+      $ gnunet-arm -I<br>
+      Running services:<br>
+      ats (gnunet-service-ats)<br>
+      revocation (gnunet-service-revocation)<br>
+      set (gnunet-service-set)<br>
+      nat (gnunet-service-nat)<br>
+      transport (gnunet-service-transport)<br>
+      peerstore (gnunet-service-peerstore)<br>
+      hostlist (gnunet-daemon-hostlist)<br>
+      identity (gnunet-service-identity)<br>
+      namecache (gnunet-service-namecache)<br>
+      peerinfo (gnunet-service-peerinfo)<br>
+      datastore (gnunet-service-datastore)<br>
+      zonemaster (gnunet-service-zonemaster)<br>
+      zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
+      nse (gnunet-service-nse)<br>
+      cadet (gnunet-service-cadet)<br>
+      dht (gnunet-service-dht)<br>
+      core (gnunet-service-core)<br>
+      gns (gnunet-service-gns)<br>
+      statistics (gnunet-service-statistics)<br>
+      topology (gnunet-daemon-topology)<br>
+      fs (gnunet-service-fs)<br>
+      namestore (gnunet-service-namestore)<br>
+      vpn (gnunet-service-vpn)
+    </code>
   </p>
   <p>
-  To stop all services, use the `-e` option.
+    To stop all services, use the `-e` option.
   </p>
   <p>
-  <code>
-  $ gnunet-arm -e
-  </code>
+    <code>
+      $ gnunet-arm -e
+    </code>
   </p>
 
   <h2>{{ _("Alternative: Installation from source") }}</h2>
@@ -236,11 +245,21 @@
   <h3>{{ _("Compile and Install") }}</h3>
   <p>
     You have a choice between two options:
-    build the *production version* or *development version*. If
-    you want to start writing GNUnet applications or join the GNUnet development
-    choose the development version (it will print more debug output and contains
-    debug symbols that can be displayed with a debugger). Otherwise choose the
-    production version.
+  </p>
+  <ul>
+    <li>build the production version
+  </ul>
+  <p>
+    or
+  </p>
+  <ul>
+    <li>build the development version.
+  </ul>
+  <p>
+    If you want to start writing GNUnet applications or join the
+    GNUnet development choose the development version (it will print
+    more debug output and contains debug symbols that can be displayed
+    with a debugger). Otherwise choose the production version.
   </p>
   
   <h5>{{ _("Option 1: GNUnet for production / usage") }}</h5>
@@ -250,38 +269,41 @@
     in the instructions given below.
   </p>
   <p>
-  <code>
-  $ cd ~/src/gnunet/gnunet<br>
-  $ sh ./bootstrap<br>
-  $ LDFLAGS=-L/usr/pkg/lib ./configure --prefix=$HOME/gnunet
-  </code>
+    <code>
+      $ cd ~/src/gnunet/gnunet<br>
+      $ sh ./bootstrap<br>
+      $ LDFLAGS=-L/usr/pkg/lib ./configure --prefix=$HOME/gnunet
+    </code>
   </p>
   <p>
-  After configure passes, you need to add a 'gnunetdns' group to your system.
-  Further, you need to add a user 'gnunet' which is part of the group 'gnunet'.
-  Then:
+    After configure passes, you need to add a 'gnunetdns' group to your system.
+    Further, you need to add a user 'gnunet' which is part of the group 'gnunet'.
+    Then:
   </p>
   <p>
-  <code>
-  $ make<br>
-  # make install
-  </code>
+    <code>
+      <!-- in case the parallel builds work: -->
+      <!-- $ make -j$(sysctl -n hw.ncpu || echo -n 1)<br> -->
+      <!-- # make -j$(sysctl -n hw.ncpu || echo -n 1) install -->
+      $ make<br>
+      # make install
+    </code>
   </p>
 
   <h5>{{ _("Option 2: GNUnet experimental") }}</h5>
 
   <p>
-  Perform the same steps as for Option 1, but add the configure switch
-  <code>--enable-experimental</code>. For even more verbosity you could
-  configure gnunet like this:
+    Perform the same steps as for Option 1, but add the configure switch
+    <code>--enable-experimental</code>. For even more verbosity you could
+    configure gnunet like this:
   </p>
   <p>
-  <code>
-  $ LDFLAGS=-L/usr/pkg/lib CFLAGS="-g -O0" ./configure --prefix=$HOME/gnunet --enable-logging=verbose
-  </code>
+    <code>
+      $ LDFLAGS="-L/usr/pkg/lib -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib" CFLAGS="-g -O0" ./configure --prefix=$HOME/gnunet --enable-logging=verbose
+    </code>
   </p>
   <p>
-  This allows you to get more verbose logs when you export GNUNET_FORCE_LOG=";;;;DEBUG" before you run tests.
+    This allows you to get more verbose logs when you export GNUNET_FORCE_LOG=";;;;DEBUG" before you run tests.
   </p>
 </article>
 {% endblock body_content %}