Skip to content

Commit 488731d

Browse files
dlechdlech
committed
Use new tab template to consolidate networking tutorial pages.
1 parent 81f6f6b commit 488731d

26 files changed

Lines changed: 182 additions & 70 deletions

‎_includes/head.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/styles.css">
77
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/pygment_trac.css">
88
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
9+
<script src="{{ site.github.url }}/javascripts/jquery.getUrlParam.js"></script>
910
<script src="{{ site.github.url }}/javascripts/jquery.loadTemplate-1.4.4.min.js"></script>
1011
<script src="{{ site.github.url }}/javascripts/respond.js"></script>
1112
<script src="{{ site.github.url }}/javascripts/cards.js"></script>

‎_includes/tabs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ul tabs="{{ include.id }}">
2222
{% assign tabs = include.tabs | split: "|" %}
2323
{% for tab in tabs %}
24-
<li tab="{{ forloop.index0 }}">
24+
<li tab="{{ forloop.index0 }}" tab-name="{{ tab | slugify }}">
2525
{{ tab }}
2626
</li>
2727
{% endfor %}

‎docs/getting-started.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,15 @@ There are lots of choices here. Your choice depends on what type of connection
102102
you want to use and on the OS of your host computer, so pick the one that applies:
103103

104104
* Ethernet over USB (just requires the USB cable that comes with the EV3)
105-
* [Linux (NetworkManager)](../tutorials/setting-up-ethernet-over-usb-on-linux-networkmanager)
106-
* [Mac OS X](../tutorials/setting-up-ethernet-over-usb-on-mac)
107-
* [Windows](../tutorials/setting-up-ethernet-over-usb-on-windows)
105+
* [Connecting to the Internet](../tutorials/connecting-to-the-internet-via-usb) tutorial
108106
* USB Ethernet dongle (as in the kind with an RJ45 connector)
109107
* If your network has a DHCP server, this will "just work". See (non-existent) brickman
110108
docs for more info.
111109
* USB WiFi Dongle
112110
* Hopefully you can figure it out. I'm putting off writing detailed docs
113111
until brickman is a bit more stable.
114112
* Bluetooth
115-
* [Linux (NetworkManager)](../tutorials/setting-up-ethernet-over-bluetooth-on-linux-networkmanager)
116-
* [Mac OS X](../tutorials/setting-up-ethernet-over-bluetooth-on-mac)
117-
* [Windows](../tutorials/setting-up-ethernet-over-bluetooth-on-windows)
113+
* [Connecting to the Internet](../tutorials/connecting-to-the-internet-via-bluetooth) tutorial
118114

119115
## Step 4.5: Make sure the firstboot script ran correctly
120116

docs/tutorials/setting-up-ethernet-over-bluetooth-on-mac.md renamed to docs/tutorials/_tabs/setting-up-ethernet-over-bluetooth-on-mac.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
---
2-
title: Setting Up Ethernet Over Bluetooth on Mac OS X
3-
subject: Ethernet Over Bluetooth
4-
---
5-
6-
__Note:__ If you do not need to access the Internet from the EV3 brick, consider
7-
using [tethering] instead.
8-
9-
---
10-
11-
These instructions are for [brickman v0.5.0](http://www.ev3dev.org/news/2015/02/24/Package-Release/).
12-
If you are using an older version, please upgrade.
13-
141
1. On the EV3, first verify that Bluetooth is powered on. In brickman,
152
open the *Wireless and Networks* menu and select *Bluetooth*. Make sure the
163
*Powered* checkbox is checked. The Bluetooth icon next to the battery in the

docs/tutorials/setting-up-ethernet-over-bluetooth-on-linux-networkmanager.md renamed to docs/tutorials/_tabs/setting-up-ethernet-over-bluetooth-on-ubuntu-14.04.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
---
2-
title: Setting Up Ethernet Over Bluetooth on Linux with NetworkManager
3-
subject: Ethernet Over Bluetooth
4-
---
5-
61
NETWORK MANAGER IN UBUNTU 14.10 DOES NOT WORK WITH BLUETOOTH, SO THIS PAGE IS INCOMPLETE!
72
USE TETHERING VIA BLUETOOH INSTEAD.
83

‎docs/tutorials/_tabs/setting-up-ethernet-over-bluetooth-on-windows-7.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
HELP WANTED! See [issue #287](https://github.com/ev3dev/ev3dev/issues/287).

docs/tutorials/setting-up-ethernet-over-usb-on-mac.md renamed to docs/tutorials/_tabs/setting-up-ethernet-over-usb-on-mac.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
---
2-
title: Setting Up Ethernet Over USB on Mac OS X
3-
subject: Ethernet Over USB
4-
---
5-
6-
These instructions are for [brickman v0.5.0](http://www.ev3dev.org/news/2015/02/24/Package-Release/).
7-
If you are using an older version, please upgrade.
8-
91
1. On the EV3, first verify that the CDC driver is enabled. In brickman,
102
open the *Wireless and Networks* menu and select *USB*. Make sure *CDC* is
113
selected and active.

docs/tutorials/setting-up-ethernet-over-usb-on-linux-networkmanager.md renamed to docs/tutorials/_tabs/setting-up-ethernet-over-usb-on-ubuntu-14.04.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
---
2-
title: Setting Up Ethernet Over USB on Linux with NetworkManager
3-
subject: Ethernet Over USB
4-
---
5-
6-
These instructions are for [brickman v0.5.0](http://www.ev3dev.org/news/2015/02/24/Package-Release/).
7-
If you are using an older version, please upgrade.
8-
91
1. On the EV3, first verify that the CDC driver is enabled. In brickman,
102
open the *Wireless and Networks* menu and select *USB*. Make sure *CDC* is
113
selected and active.

docs/tutorials/setting-up-ethernet-over-usb-on-windows.md renamed to docs/tutorials/_tabs/setting-up-ethernet-over-usb-on-windows-7.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
---
2-
title: Setting Up Ethernet Over USB on Windows
3-
subject: Ethernet Over USB
4-
---
5-
6-
These instructions are for [brickman v0.5.0](http://www.ev3dev.org/news/2015/02/24/Package-Release/).
7-
If you are using an older version, please upgrade.
8-
91
1. On the EV3, first verify that the RNDIS driver is enabled. In brickman,
102
open the *Wireless and Networks* menu and select *USB*. Make sure *RNDIS*
113
is selected and active.

docs/tutorials/using-bluetooth-tethering-on-mac.md renamed to docs/tutorials/_tabs/using-bluetooth-tethering-on-mac.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
---
2-
title: Using Bluetooth Tethering on Mac OS X
3-
subject: Ethernet Over Bluetooth
4-
---
5-
6-
__Note:__ You will not be able to access the Internet from your EV3 using this
7-
connection. If you need to access the Internet via Bluetooth, [do this instead].
8-
9-
---
10-
11-
These instructions are for [brickman v0.5.0](http://www.ev3dev.org/news/2015/02/24/Package-Release/).
12-
If you are using an older version, please upgrade.
13-
141
1. On the EV3, first verify that Bluetooth is powered on. In brickman,
152
open the *Wireless and Networks* menu and select *Bluetooth*. Make sure the
163
*Powered* checkbox is checked. The Bluetooth icon next to the battery in the
@@ -103,5 +90,3 @@ If you are using an older version, please upgrade.
10390
Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
10491
permitted by applicable law.
10592
root@ev3dev:~#
106-
107-
[do this instead]: /docs/tutorials/setting-up-ethernet-over-bluetooth-on-mac

0 commit comments

Comments
 (0)