[Commotion-admin] [commotion-docs] Update Master from staging - October 27th 2014 (#288)

[Andy Gunn]

Hey @natmey - after you merge #285 , can you push to the live site? Thanks!
You can merge this Pull Request by running:

  git pull https://github.com/opentechinstitute/commotion-docs staging

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/commotion-docs/pull/288

-- Commit Summary --

  * Updated PDF print version of TFTP recovery guide.
  * Added MikroTik installation guide. No print version PDF yet.
  * Merge pull request #280 from opentechinstitute/issue-256
  * Merge pull request #283 from opentechinstitute/issue-279

-- File Changes --

    M commotionwireless.net/_includes/docs_cck_installing_menu.html (1)
    A commotionwireless.net/docs/cck/installing-configuring/install-mikrotik-router/index.md (216)
    M commotionwireless.net/docs/guides-howtos/index.md (6)
    A commotionwireless.net/docs/guides-howtos/installation-server-setup/index.md (171)
    D commotionwireless.net/files/5-Install and Recover with TFTP | Commotion.pdf (0)
    A commotionwireless.net/files/Commotion_dnsmasq.conf (22)
    A commotionwireless.net/files/Install_MikroTik-dnsmasq_install_commands_combined.png (0)
    A commotionwireless.net/files/Install_MikroTik-lighttpd_install_commands_combined.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_Commotion_banner.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_Commotion_booted.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_RouterBoot_boot_menu.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_RouterBoot_init.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_RouterBoot_loading_image.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_RouterBoot_menu.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_menu.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_running.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_save_as_default.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_serial_port_menu.png (0)
    A commotionwireless.net/files/Install_MikroTik-minicom_serial_port_select.png (0)
    A commotionwireless.net/files/Install_MikroTik-service_dnsmasq_stop.png (0)
    A commotionwireless.net/files/Install_MikroTik-update-rc_dnsmasq_remove.png (0)
    A commotionwireless.net/files/Install_MikroTik_intro_graphic.png (0)
    A commotionwireless.net/files/Install_MikroTik_prepare_hardware.png (0)
    M commotionwireless.net/files/cck/installing-configuring/CCK-Install_with_TFTP.pdf (0)

-- Patch Links --

https://github.com/opentechinstitute/commotion-docs/pull/288.patch
https://github.com/opentechinstitute/commotion-docs/pull/288.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/288
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20141027/07022f24/attachment.html>