From 299a244b6bd15f8451e7d7b06a2cdfe65f5ce282 Mon Sep 17 00:00:00 2001
From: Ethan Jackson <ethan@nicira.com>
Date: Fri, 19 Nov 2010 16:23:27 -0800
Subject: [PATCH] vswitchd: Remove trailing whitespace
Removed trailing whitespace from files in the vswitchd directory.
---
vswitchd/ovs-brcompatd.8.in | 10 +++++-----
vswitchd/ovs-vswitchd.8.in | 4 ++--
vswitchd/vswitch.ovsschema | 8 ++++----
vswitchd/vswitch.xml | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/vswitchd/ovs-brcompatd.8.in b/vswitchd/ovs-brcompatd.8.in
index 33cee2411..0cce84d7a 100644
--- a/vswitchd/ovs-brcompatd.8.in
+++ b/vswitchd/ovs-brcompatd.8.in
@@ -9,10 +9,10 @@ ovs\-brcompatd \- Bridge compatibility front-end for ovs\-vswitchd
[\fIoptions\fR] \fIdatabase\fR
.
.SH DESCRIPTION
-A daemon that provides a legacy bridge front-end for \fBovs\-vswitchd\fR. It
-does this by listening for bridge ioctl commands (e.g., those generated by
-the \fBbrctl\fR program) to add or remove datapaths and the interfaces
-that attach to them.
+A daemon that provides a legacy bridge front-end for \fBovs\-vswitchd\fR. It
+does this by listening for bridge ioctl commands (e.g., those generated by
+the \fBbrctl\fR program) to add or remove datapaths and the interfaces
+that attach to them.
.PP
The mandatory \fIdatabase\fR argument specifies the
\fBovsdb\-server\fR from which \fBovs\-vswitchd\fR's configuration is
@@ -43,7 +43,7 @@ both of these streams separately.
\fB\-\-prune\-timeout=\fIsecs\fR
.
Sets the maximum time between pruning port entries to \fIsecs\fR seconds.
-Pruning ports is the process of removing port entries from \fIdatabase\fR
+Pruning ports is the process of removing port entries from \fIdatabase\fR
that no longer exist. If \fIsecs\fR is zero, then entries are never
pruned. The default prune timeout is 5 seconds.
.
diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index e59893ff4..b5c744732 100644
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -18,7 +18,7 @@ ovs\-vswitchd \- Open vSwitch daemon
\fIdatabase\fR
.
.SH DESCRIPTION
-A daemon that manages and controls any number of Open vSwitch switches
+A daemon that manages and controls any number of Open vSwitch switches
on the local machine.
.PP
The mandatory \fIdatabase\fR argument normally takes the form
@@ -37,7 +37,7 @@ configuration to match.
Upon receipt of a SIGHUP signal, \fBovs\-vswitchd\fR reopens its log
file, if one was specified on the command line.
.PP
-\fBovs\-vswitchd\fR switches may be configured with any of the following
+\fBovs\-vswitchd\fR switches may be configured with any of the following
features:
.
.IP \(bu
diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index 05a2e05c8..db8f6ebac 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -77,7 +77,7 @@
"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
"flood_vlans": {
"type": {"key": {"type": "integer",
- "minInteger": 0,
+ "minInteger": 0,
"maxInteger": 4095},
"min": 0, "max": 4096}}}},
"Port": {
@@ -161,7 +161,7 @@
"refTable": "Queue"},
"min": 0, "max": "unlimited"}},
"other_config": {
- "type": {"key": "string", "value": "string",
+ "type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}},
"external_ids": {
"type": {"key": "string", "value": "string",
@@ -169,7 +169,7 @@
"Queue": {
"columns": {
"other_config": {
- "type": {"key": "string", "value": "string",
+ "type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}},
"external_ids": {
"type": {"key": "string", "value": "string",
@@ -279,7 +279,7 @@
"minInteger": 100},
"min": 0, "max": 1}},
"controller_burst_limit": {
- "type": {"key": {"type": "integer",
+ "type": {"key": {"type": "integer",
"minInteger": 25},
"min": 0, "max": 1}},
"external_ids": {
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 7cfba180c..dd6fce7cf 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -314,7 +314,7 @@
</dl>
</p>
<p>If this value is unset, the default is implementation-specific.</p>
- <p>When more than one controller is configured,
+ <p>When more than one controller is configured,
<ref column="fail_mode"/> is considered only when none of the
configured controllers can be contacted.</p>
</column>
@@ -343,7 +343,7 @@
defined key-value pairs are:
<dl>
<dt><code>bridge-id</code></dt>
- <dd>A unique identifier of the bridge. On Citrix XenServer this
+ <dd>A unique identifier of the bridge. On Citrix XenServer this
will commonly be the same as <code>xs-network-uuids</code>.</dd>
<dt><code>xs-network-uuids</code></dt>
<dd>Semicolon-delimited set of universally unique identifier(s) for
@@ -362,7 +362,7 @@
digits to set the OpenFlow datapath ID to a specific
value. May not be all-zero.</dd>
<dt><code>disable-in-band</code></dt>
- <dd>If set to <code>true</code>, disable in-band control on
+ <dd>If set to <code>true</code>, disable in-band control on
the bridge regardless of controller and manager settings.</dd>
<dt><code>hwaddr</code></dt>
<dd>An Ethernet address in the form
@@ -492,7 +492,7 @@
<column name="qos">
Quality of Service configuration for this port.
</column>
-
+
<column name="mac">
The MAC address to use for this port for the purpose of choosing the
bridge's MAC address. This column does not necessarily reflect the
@@ -615,7 +615,7 @@
the same except one has an optional identifier and the other does
not, the more specific one is matched first. <code>in_key</code>
is considered more specific than <code>local_ip</code> if a port
- defines one and another port defines the other. The following
+ defines one and another port defines the other. The following
options may be specified in the <ref column="options"/> column:
<dl>
<dt><code>remote_ip</code></dt>
@@ -908,7 +908,7 @@
For Citrix XenServer, this is the value of the <code>MAC</code>
field in the VIF record for this interface.</dd>
<dt><code>iface-id</code></dt>
- <dd>A system-unique identifier for the interface. On XenServer,
+ <dd>A system-unique identifier for the interface. On XenServer,
this will commonly be the same as <code>xs-vif-uuid</code>.</dd>
</dl>
<p>
@@ -947,7 +947,7 @@
set.</dd>
<dt><code>ipsec_psk</code></dt>
<dd>Required key for GRE-over-IPsec interfaces. Specifies a
- pre-shared key for authentication that must be identical on
+ pre-shared key for authentication that must be identical on
both sides of the tunnel. Additionally, the
<code>ipsec_local_ip</code> key must also be set.</dd>
</dl>
@@ -1237,7 +1237,7 @@
<p>
Open vSwitch supports two kinds of OpenFlow controllers:
</p>
-
+
<dl>
<dt>Primary controllers</dt>
<dd>
@@ -1593,7 +1593,7 @@
that describes how Open vSwitch contacts this OVSDB client over the
network:
</p>
-
+
<dl>
<dt><code>in-band</code></dt>
<dd>
--
2.47.0