From b4df3c427a031cd73fe3a573a427ed1a9e7363f5 Mon Sep 17 00:00:00 2001
From: Alexander Dupuy <alex.dupuy@mac.com>
Date: Tue, 5 May 2015 14:26:45 +0200
Subject: [PATCH] fix openstack fw/floating ip sidebar refs

expand firewall examples to be self-contained
---
 .../r/compute_floatingip_v2.html.markdown     |  2 +-
 .../openstack/r/fw_firewall_v1.html.markdown  | 25 +++++++++++++++++++
 .../openstack/r/fw_policy_v1.html.markdown    | 18 +++++++++++++
 .../openstack/r/fw_rule_v1.html.markdown      |  4 +--
 .../r/networking_floatingip_v2.html.markdown  |  2 +-
 5 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/website/source/docs/providers/openstack/r/compute_floatingip_v2.html.markdown b/website/source/docs/providers/openstack/r/compute_floatingip_v2.html.markdown
index 0a5f53fe2..6fa8ad274 100644
--- a/website/source/docs/providers/openstack/r/compute_floatingip_v2.html.markdown
+++ b/website/source/docs/providers/openstack/r/compute_floatingip_v2.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "openstack"
 page_title: "OpenStack: openstack_compute_floatingip_v2"
-sidebar_current: "docs-openstack-resource-compute-secgroup-2"
+sidebar_current: "docs-openstack-resource-compute-floatingip-2"
 description: |-
   Manages a V2 floating IP resource within OpenStack Nova (compute).
 ---
diff --git a/website/source/docs/providers/openstack/r/fw_firewall_v1.html.markdown b/website/source/docs/providers/openstack/r/fw_firewall_v1.html.markdown
index 3be2e56a6..36eb08466 100644
--- a/website/source/docs/providers/openstack/r/fw_firewall_v1.html.markdown
+++ b/website/source/docs/providers/openstack/r/fw_firewall_v1.html.markdown
@@ -13,6 +13,31 @@ Manages a v1 firewall resource within OpenStack.
 ## Example Usage
 
 ```
+resource "openstack_fw_rule_v1" "rule_1" {
+  name = "my-rule-1"
+  description = "drop TELNET traffic"
+  action = "deny"
+  protocol = "tcp"
+  destination_port = "23"
+  enabled = "true"
+}
+
+resource "openstack_fw_rule_v1" "rule_2" {
+  name = "my-rule-2"
+  description = "drop NTP traffic"
+  action = "deny"
+  protocol = "udp"
+  destination_port = "123"
+  enabled = "false"
+}
+
+resource "openstack_fw_policy_v1" "policy_1" {
+  region = ""
+  name = "my-policy"
+  rules = ["${openstack_fw_rule_v1.rule_1.id}",
+           "${openstack_fw_rule_v1.rule_2.id}"]
+}
+
 resource "openstack_fw_firewall_v1" "firewall_1" {
   region = ""
   name = "my-firewall"
diff --git a/website/source/docs/providers/openstack/r/fw_policy_v1.html.markdown b/website/source/docs/providers/openstack/r/fw_policy_v1.html.markdown
index f1cd35104..fc2588bef 100644
--- a/website/source/docs/providers/openstack/r/fw_policy_v1.html.markdown
+++ b/website/source/docs/providers/openstack/r/fw_policy_v1.html.markdown
@@ -13,6 +13,24 @@ Manages a v1 firewall policy resource within OpenStack.
 ## Example Usage
 
 ```
+resource "openstack_fw_rule_v1" "rule_1" {
+  name = "my-rule-1"
+  description = "drop TELNET traffic"
+  action = "deny"
+  protocol = "tcp"
+  destination_port = "23"
+  enabled = "true"
+}
+
+resource "openstack_fw_rule_v1" "rule_2" {
+  name = "my-rule-2"
+  description = "drop NTP traffic"
+  action = "deny"
+  protocol = "udp"
+  destination_port = "123"
+  enabled = "false"
+}
+
 resource "openstack_fw_policy_v1" "policy_1" {
   region = ""
   name = "my-policy"
diff --git a/website/source/docs/providers/openstack/r/fw_rule_v1.html.markdown b/website/source/docs/providers/openstack/r/fw_rule_v1.html.markdown
index a868cac67..1231c6ab1 100644
--- a/website/source/docs/providers/openstack/r/fw_rule_v1.html.markdown
+++ b/website/source/docs/providers/openstack/r/fw_rule_v1.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "openstack"
 page_title: "OpenStack: openstack_fw_rule_v1"
-sidebar_current: "docs-openstack-resource-compute-rule-1"
+sidebar_current: "docs-openstack-resource-fw-rule-1"
 description: |-
   Manages a v1 firewall rule resource within OpenStack.
 ---
@@ -19,7 +19,7 @@ resource "openstack_fw_rule_v1" "rule_1" {
   action = "deny"
   protocol = "tcp"
   destination_port = "23"
-  enabled = "false"
+  enabled = "true"
 }
 ```
 
diff --git a/website/source/docs/providers/openstack/r/networking_floatingip_v2.html.markdown b/website/source/docs/providers/openstack/r/networking_floatingip_v2.html.markdown
index 1b89d6aa5..d1893c5ef 100644
--- a/website/source/docs/providers/openstack/r/networking_floatingip_v2.html.markdown
+++ b/website/source/docs/providers/openstack/r/networking_floatingip_v2.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "openstack"
 page_title: "OpenStack: openstack_networking_floatingip_v2"
-sidebar_current: "docs-openstack-resource-compute-secgroup-2"
+sidebar_current: "docs-openstack-resource-networking-floatingip-2"
 description: |-
   Manages a V2 floating IP resource within OpenStack Neutron (networking).
 ---