From 84091cac2664c71f13b41ff6596b69868ebd8ac1 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 18 Sep 2013 17:52:08 -0700 Subject: [PATCH] website/www: put support under the "about" link --- website/www/source/_sidebar_about.erb | 1 + website/www/source/about.html.markdown | 1 + website/www/source/layouts/layout.erb | 1 - website/www/source/stylesheets/_nav.less | 1 + website/www/source/support.html.erb | 48 +++++++++++++++++-- website/www/source/support/community.html.erb | 28 ----------- .../www/source/support/professional.html.erb | 17 ------- 7 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 website/www/source/support/community.html.erb delete mode 100644 website/www/source/support/professional.html.erb diff --git a/website/www/source/_sidebar_about.erb b/website/www/source/_sidebar_about.erb index d301ca14f..49e20344a 100644 --- a/website/www/source/_sidebar_about.erb +++ b/website/www/source/_sidebar_about.erb @@ -1,5 +1,6 @@ vagrant on github diff --git a/website/www/source/about.html.markdown b/website/www/source/about.html.markdown index 604cef69a..bd5420445 100644 --- a/website/www/source/about.html.markdown +++ b/website/www/source/about.html.markdown @@ -3,6 +3,7 @@ layout: "inner" sidebar_current: "about" sidebar_template: "about" sidebar_title: "About" +page_title: "About Vagrant" --- ## About Vagrant diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb index 22d5c12b7..59ca04a1e 100644 --- a/website/www/source/layouts/layout.erb +++ b/website/www/source/layouts/layout.erb @@ -51,7 +51,6 @@
  • VMware Integration
  • Downloads
  • Documentation
    • -
  • Support
  • About
    • diff --git a/website/www/source/stylesheets/_nav.less b/website/www/source/stylesheets/_nav.less index 4adfdbfdc..c1620bbad 100644 --- a/website/www/source/stylesheets/_nav.less +++ b/website/www/source/stylesheets/_nav.less @@ -43,6 +43,7 @@ nav { li { display: inline; margin-left: 15px; + font-size: 13px; } li.pill { diff --git a/website/www/source/support.html.erb b/website/www/source/support.html.erb index 9e116d43a..1114b4dbd 100644 --- a/website/www/source/support.html.erb +++ b/website/www/source/support.html.erb @@ -1,8 +1,9 @@ --- layout: "inner" -sidebar_current: "support" -sidebar_template: "support" -sidebar_title: "Support" +sidebar_current: "about-support" +sidebar_template: "about" +sidebar_title: "about" +page_title: "Support" ---

    Support

    @@ -13,13 +14,50 @@ available.

    -Professional support packages +Professional support packages provide you with direct access to the people creating Vagrant ready to help you with any problems or questions you may have.

    -Community support is available +Community support is available via the mailing list or IRC. Thousands of helpful Vagrant users, including the developers of Vagrant, read messages in these channels.

    + + +

    Community Support

    + +

    Vagrant has a large and active community of individuals who +are more than happy to assist newcomers and veterans alike.

    + +

    +IRC: #vagrant on Freenode. IRC +provides a real-time chat environment for getting help. Note that +the quality and availability of assistance depends largely on the +time of day and who is currently active in the channel. +

    + +

    +Mailing list: Vagrant Google Group. The mailing list has thousands of people who engage +in active discussions daily. A response can take up to a few days +here, but your inquiries will be seen by many more individuals. +

    +

    + +

    +Bug Tracker: Issue Tracker on GitHub. This is only for reporting bugs found, please do not use this as a means for support. +

    + + +

    Professional Support

    + +

    Professional support packages are on the way. If you're interested +in hearing more, please contact biz@hashicorp.com. + +

    +If you purchased the VMware Fusion provider, +you're eligible for limited basic support via email by contacting +support@hashicorp.com. Response +times are typically within 48 hours, but can be up to a week. +

    diff --git a/website/www/source/support/community.html.erb b/website/www/source/support/community.html.erb deleted file mode 100644 index c90d2a7b9..000000000 --- a/website/www/source/support/community.html.erb +++ /dev/null @@ -1,28 +0,0 @@ ---- -layout: "inner" -sidebar_current: "support-community" -sidebar_template: "support" -sidebar_title: "Support" ---- -

    Community Support

    - -

    Vagrant has a large and active community of individuals who -are more than happy to assist newcomers and veterans alike.

    - -

    -IRC: #vagrant on Freenode. IRC -provides a real-time chat environment for getting help. Note that -the quality and availability of assistance depends largely on the -time of day and who is currently active in the channel. -

    - -

    -Mailing list: Vagrant Google Group. The mailing list has thousands of people who engage -in active discussions daily. A response can take up to a few days -here, but your inquiries will be seen by many more individuals. -

    -

    - -

    -Bug Tracker: Issue Tracker on GitHub. This is only for reporting bugs found, please do not use this as a means for support. -

    diff --git a/website/www/source/support/professional.html.erb b/website/www/source/support/professional.html.erb deleted file mode 100644 index f7d7f2497..000000000 --- a/website/www/source/support/professional.html.erb +++ /dev/null @@ -1,17 +0,0 @@ ---- -layout: "inner" -sidebar_current: "support-professional" -sidebar_template: "support" -sidebar_title: "Support" ---- -

    Professional Support

    - -

    Professional support packages are on the way. If you're interested -in hearing more, please contact biz@hashicorp.com. - -

    -If you purchased the VMware Fusion provider, -you're eligible for limited basic support via email by contacting -support@hashicorp.com. Response -times are typically within 48 hours, but can be up to a week. -