[Commotion-admin] [commotion-docs] Merge Staging into Master (#308)

[Andy Gunn]

New content:
* Recommended Routers in Guides and Howtos
* Descriptive text on CCK index pages
* Added text and links to various pages directing folks to e-mail lists

Updated content:
* New print-version PDF for Configure Commotion
* Networking in CCK is now Wireless + Networking

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/308

-- Commit Summary --

  * Updated print version PDF of Configure Commotion.
  * Wrong filename, updated.
  * Merge pull request #303 from opentechinstitute/issue-302
  * Small menu modifications - added "Wireless +" and changed some text in Networking menus
  * Added more descriptive text to the CCK index pages. Should help folks find what they need.
  * Added links to the Dev and Discussion lists on the Contact and Report pages.
  * Added "Recommended Routers" page in guides and howtos
  * Merge pull request #304 from opentechinstitute/issue-299
  * Merge pull request #305 from opentechinstitute/issue-298
  * Merge pull request #306 from opentechinstitute/issue-300
  * Merge pull request #307 from opentechinstitute/issue-289

-- File Changes --

    M commotionwireless.net/_includes/cck/building-mounting-modules.html (3)
    M commotionwireless.net/_includes/cck/installing-configuring-modules.html (16)
    M commotionwireless.net/_includes/cck/local-applications-modules.html (3)
    M commotionwireless.net/_includes/cck/networking-modules.html (10)
    M commotionwireless.net/_includes/cck/planning-modules.html (14)
    M commotionwireless.net/_includes/docs_cck_mainmenu.html (2)
    M commotionwireless.net/_includes/menu.html (2)
    M commotionwireless.net/contact/index.md (2)
    M commotionwireless.net/docs/cck/index.md (2)
    M commotionwireless.net/docs/cck/installing-configuring/configure-commotion/index.md (2)
    M commotionwireless.net/docs/cck/installing-configuring/index.md (2)
    M commotionwireless.net/docs/cck/networking/index.md (2)
    M commotionwireless.net/docs/guides-howtos/index.md (5)
    A commotionwireless.net/docs/guides-howtos/recommended-hardware/index.md (27)
    A commotionwireless.net/files/Recommended_Hardware_Intro.png (0)
    D commotionwireless.net/files/cck/installing-configuring/2-Configure_Commotion.pdf (0)
    A commotionwireless.net/files/cck/installing-configuring/CCK-Configure_Commotion.pdf (0)
    M commotionwireless.net/report/index.md (2)

-- Patch Links --

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

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