Fix sample configuration to show keys in PEM format and correct tapdevice.

doc/sample-config/hosts/alpha

@@ -9,5 +9,7 @@ Port = 655
 # Subnet on the virtual private network that is local for this host.
 Subnet = 192.168.1.0/24
 
-# The file in which the public key for this host is stored. Required.
-PublicKeyFile = /etc/tinc/example/hosts/alpha.key
+# The public key generated by `tincd -n example -K' is stored here
+-----BEGIN RSA PUBLIC KEY-----
+...
+-----END RSA PUBLIC KEY-----

doc/sample-config/hosts/alpha.key

@@ -1 +0,0 @@
-# Generate this file with `tincd -n example -K`

doc/sample-config/hosts/beta

@@ -10,5 +10,7 @@ Port = 6500
 # Subnet on the virtual private network that is local for this host.
 Subnet = 192.168.2.0/24
 
-# The file in which the public key for this host is stored. Required.
-PublicKeyFile = /etc/tinc/example/hosts/beta.key
+# The public key generated by `tincd -n example -K' is stored here
+-----BEGIN RSA PUBLIC KEY-----
+...
+-----END RSA PUBLIC KEY-----

doc/sample-config/hosts/beta.key

@@ -1 +0,0 @@
-# This file has not been generated by this host, but by beta.

doc/sample-config/tinc-down

@@ -4,4 +4,4 @@
 # need to do anything; once tinc quits the tap device is already
 # removed by the kernel.
 
-ifconfig tap0 down
+ifconfig tap1 down

doc/sample-config/tinc-up

@@ -6,9 +6,9 @@
 # but for the universal tun/tap device use $NETNAME.
 
 # Set hardware ethernet address (required!)
-ifconfig tap0 hw ether fe:fd:0:0:0:0
+ifconfig tap1 hw ether fe:fd:0:0:0:0
 
 # Give it the right ip and netmask. Remember, the subnet of the
 # tap device must be larger than that of the individual Subnets
 # as defined in the host configuration file!
-ifconfig tap0 192.168.1.1 netmask 255.255.0.0 -arp
+ifconfig tap1 192.168.1.1 netmask 255.255.0.0 -arp