summaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorSeth Vargo <sethvargo@gmail.com>2013-09-24 17:38:44 -0400
committerBryan McLellan <btm@opscode.com>2013-09-26 11:13:59 -0700
commit6315871ae7deeead95d84d2487c54a03c47e318f (patch)
treea2bf980c434c657aa350c0d3fc4073652cdf43cf /distro
parent61e98b94fb387353841d5b4575816a1d716cfbc9 (diff)
downloadchef-6315871ae7deeead95d84d2487c54a03c47e318f.tar.gz
Normalize whitespace on all files
Diffstat (limited to 'distro')
-rw-r--r--distro/arch/etc/rc.d/chef-client4
-rw-r--r--distro/arch/etc/rc.d/chef-server4
-rw-r--r--distro/arch/etc/rc.d/chef-server-webui4
-rw-r--r--distro/arch/etc/rc.d/chef-solr4
-rw-r--r--distro/common/markdown/man1/knife-bootstrap.mkd2
-rw-r--r--distro/common/markdown/man1/knife-configure.mkd22
-rw-r--r--distro/common/markdown/man8/chef-expander.mkd2
-rw-r--r--distro/common/markdown/man8/chef-expanderctl.mkd2
-rw-r--r--distro/redhat/etc/init.d/chef-client2
-rw-r--r--distro/redhat/etc/init.d/chef-server4
-rw-r--r--distro/redhat/etc/init.d/chef-server-webui4
-rw-r--r--distro/redhat/etc/init.d/chef-solr4
12 files changed, 29 insertions, 29 deletions
diff --git a/distro/arch/etc/rc.d/chef-client b/distro/arch/etc/rc.d/chef-client
index 36f00bad6a..6e2feb2e52 100644
--- a/distro/arch/etc/rc.d/chef-client
+++ b/distro/arch/etc/rc.d/chef-client
@@ -5,9 +5,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/distro/arch/etc/rc.d/chef-server b/distro/arch/etc/rc.d/chef-server
index 59f926c2c9..1ffbf8dce5 100644
--- a/distro/arch/etc/rc.d/chef-server
+++ b/distro/arch/etc/rc.d/chef-server
@@ -5,9 +5,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/distro/arch/etc/rc.d/chef-server-webui b/distro/arch/etc/rc.d/chef-server-webui
index 79a9b77c1c..bec185151f 100644
--- a/distro/arch/etc/rc.d/chef-server-webui
+++ b/distro/arch/etc/rc.d/chef-server-webui
@@ -5,9 +5,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/distro/arch/etc/rc.d/chef-solr b/distro/arch/etc/rc.d/chef-solr
index a3682a495a..10bd15ea08 100644
--- a/distro/arch/etc/rc.d/chef-solr
+++ b/distro/arch/etc/rc.d/chef-solr
@@ -5,9 +5,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/distro/common/markdown/man1/knife-bootstrap.mkd b/distro/common/markdown/man1/knife-bootstrap.mkd
index c466fc7f7f..5c5e456023 100644
--- a/distro/common/markdown/man1/knife-bootstrap.mkd
+++ b/distro/common/markdown/man1/knife-bootstrap.mkd
@@ -32,7 +32,7 @@ __knife__ __bootstrap__ _(options)_
* `--[no-]host-key-verify`:
Enable host key verification, which is the default behavior.
* `--hint HINT_NAME[=HINT_FILE]`:
- Provide the name of a hint (with option JSON file) to set for use by
+ Provide the name of a hint (with option JSON file) to set for use by
Ohai plugins.
## DESCRIPTION
diff --git a/distro/common/markdown/man1/knife-configure.mkd b/distro/common/markdown/man1/knife-configure.mkd
index cc7dd1d96e..507d30db4e 100644
--- a/distro/common/markdown/man1/knife-configure.mkd
+++ b/distro/common/markdown/man1/knife-configure.mkd
@@ -35,17 +35,17 @@ the specified _directory_.
field blank to accept the default value. On most systems, the
default values are acceptable.
- user@host$ knife configure -i
- Please enter the chef server URL: [http://localhost:4000]
- Please enter a clientname for the new client: [username]
- Please enter the existing admin clientname: [chef-webui]
- Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]
- Please enter the validation clientname: [chef-validator]
- Please enter the location of the validation key: [/etc/chef/validation.pem]
- Please enter the path to a chef repository (or leave blank):
- Creating initial API user...
- Created (or updated) client[username]
- Configuration file written to /home/username/.chef/knife.rb
+ user@host$ knife configure -i
+ Please enter the chef server URL: [http://localhost:4000]
+ Please enter a clientname for the new client: [username]
+ Please enter the existing admin clientname: [chef-webui]
+ Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]
+ Please enter the validation clientname: [chef-validator]
+ Please enter the location of the validation key: [/etc/chef/validation.pem]
+ Please enter the path to a chef repository (or leave blank):
+ Creating initial API user...
+ Created (or updated) client[username]
+ Configuration file written to /home/username/.chef/knife.rb
This creates a new administrator client named _username_, writes
a configuration file to _/home/username/.chef/knife.rb_, and the
diff --git a/distro/common/markdown/man8/chef-expander.mkd b/distro/common/markdown/man8/chef-expander.mkd
index d72ee1df9f..9190a9aebb 100644
--- a/distro/common/markdown/man8/chef-expander.mkd
+++ b/distro/common/markdown/man8/chef-expander.mkd
@@ -79,4 +79,4 @@ granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.
On Debian systems, the complete text of the Apache 2.0 License can be
-found in /usr/share/common-licenses/Apache-2.0. \ No newline at end of file
+found in /usr/share/common-licenses/Apache-2.0.
diff --git a/distro/common/markdown/man8/chef-expanderctl.mkd b/distro/common/markdown/man8/chef-expanderctl.mkd
index 00b34e7734..03ce6af8ac 100644
--- a/distro/common/markdown/man8/chef-expanderctl.mkd
+++ b/distro/common/markdown/man8/chef-expanderctl.mkd
@@ -55,4 +55,4 @@ granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.
On Debian systems, the complete text of the Apache 2.0 License can be
-found in /usr/share/common-licenses/Apache-2.0. \ No newline at end of file
+found in /usr/share/common-licenses/Apache-2.0.
diff --git a/distro/redhat/etc/init.d/chef-client b/distro/redhat/etc/init.d/chef-client
index fbeaa395c0..b41150e7a1 100644
--- a/distro/redhat/etc/init.d/chef-client
+++ b/distro/redhat/etc/init.d/chef-client
@@ -61,7 +61,7 @@ reload() {
killproc -p $pidfile chef-client -HUP
retval=$?
echo
- return $retval
+ return $retval
}
run() {
diff --git a/distro/redhat/etc/init.d/chef-server b/distro/redhat/etc/init.d/chef-server
index 44247178b5..f956dd4e45 100644
--- a/distro/redhat/etc/init.d/chef-server
+++ b/distro/redhat/etc/init.d/chef-server
@@ -11,7 +11,7 @@
# Required-Stop: $local_fs $network $remote_fs chef-solr chef-expander
# Should-Start: $named $time
# Should-Stop: $named $time
-# Short-Description: Startup script for chef-server
+# Short-Description: Startup script for chef-server
# Description: Server component of the Chef systems integration framework.
### END INIT INFO
@@ -50,7 +50,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
diff --git a/distro/redhat/etc/init.d/chef-server-webui b/distro/redhat/etc/init.d/chef-server-webui
index f26f9c1f9a..65498bf723 100644
--- a/distro/redhat/etc/init.d/chef-server-webui
+++ b/distro/redhat/etc/init.d/chef-server-webui
@@ -11,7 +11,7 @@
# Required-Stop: $local_fs $network $remote_fs chef-server
# Should-Start: $named $time
# Should-Stop: $named $time
-# Short-Description: Startup script for chef-server-webui
+# Short-Description: Startup script for chef-server-webui
# Description: Server WebUI component of the Chef systems integration framework.
### END INIT INFO
@@ -50,7 +50,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
diff --git a/distro/redhat/etc/init.d/chef-solr b/distro/redhat/etc/init.d/chef-solr
index b75c40f53f..9223173276 100644
--- a/distro/redhat/etc/init.d/chef-solr
+++ b/distro/redhat/etc/init.d/chef-solr
@@ -1,5 +1,5 @@
#!/bin/bash
-#
+#
# chef-solr Startup script for the SOLR search engine
#
# chkconfig: - 94 06
@@ -42,7 +42,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile