r5425 - in trunk/varnish-cache: . bin/varnishd doc/sphinx/reference doc/sphinx/tutorial redhat

tfheen at varnish-cache.org tfheen at varnish-cache.org
Wed Oct 13 09:32:43 CEST 2010


Author: tfheen
Date: 2010-10-13 09:32:42 +0200 (Wed, 13 Oct 2010)
New Revision: 5425

Modified:
   trunk/varnish-cache/README
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/doc/sphinx/reference/varnishstat.rst
   trunk/varnish-cache/doc/sphinx/reference/varnishtest.rst
   trunk/varnish-cache/doc/sphinx/reference/vcl.rst
   trunk/varnish-cache/doc/sphinx/tutorial/troubleshooting.rst
   trunk/varnish-cache/redhat/varnish.initrc
   trunk/varnish-cache/redhat/varnish.spec
   trunk/varnish-cache/redhat/varnishlog.initrc
   trunk/varnish-cache/redhat/varnishncsa.initrc
Log:
Be consistent about naming

Try to use the name "Varnish Cache" rather than "Varnish HTTP
accelerator" and be consistent about this everywhere.



Modified: trunk/varnish-cache/README
===================================================================
--- trunk/varnish-cache/README	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/README	2010-10-13 07:32:42 UTC (rev 5425)
@@ -1,4 +1,4 @@
-This is the Varnish high-performance HTTP accelerator.
+This is Varnish Cache, the high-performance HTTP accelerator.
 
 Documentation and additional information about Varnish is available on
 http://www.varnish-cache.org/

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2010-10-13 07:32:42 UTC (rev 5425)
@@ -99,7 +99,7 @@
 	(void)av;
 	(void)priv;
 	cli_out(cli, "-----------------------------\n");
-	cli_out(cli, "Varnish HTTP accelerator CLI.\n");
+	cli_out(cli, "Varnish Cache CLI.\n");
 	cli_out(cli, "-----------------------------\n");
 	cli_out(cli, "%s\n", vsb_data(vident) + 1);
 	cli_out(cli, "\n");

Modified: trunk/varnish-cache/doc/sphinx/reference/varnishstat.rst
===================================================================
--- trunk/varnish-cache/doc/sphinx/reference/varnishstat.rst	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/doc/sphinx/reference/varnishstat.rst	2010-10-13 07:32:42 UTC (rev 5425)
@@ -3,7 +3,7 @@
 ===========
 
 ---------------------------
-HTTP accelerator statistics
+Varnish Cache statistics
 ---------------------------
 
 :Author: Dag-Erling Smørgrav

Modified: trunk/varnish-cache/doc/sphinx/reference/varnishtest.rst
===================================================================
--- trunk/varnish-cache/doc/sphinx/reference/varnishtest.rst	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/doc/sphinx/reference/varnishtest.rst	2010-10-13 07:32:42 UTC (rev 5425)
@@ -20,7 +20,7 @@
 ===========
 
 The varnishtest program is a script driven program used to test the
-varnish HTTP accelerator.
+Varnish Cache.
 
 The varnishtest program, when started and given one or more script
 files, can create a number of threads representing backends, some

Modified: trunk/varnish-cache/doc/sphinx/reference/vcl.rst
===================================================================
--- trunk/varnish-cache/doc/sphinx/reference/vcl.rst	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/doc/sphinx/reference/vcl.rst	2010-10-13 07:32:42 UTC (rev 5425)
@@ -20,8 +20,8 @@
 ===========
 
 The VCL language is a small domain-specific language designed to be
-used to define request handling and document caching policies for the
-Varnish HTTP accelerator.
+used to define request handling and document caching policies for
+Varnish Cache.
 
 When a new configuration is loaded, the varnishd management process
 translates the VCL code to C and compiles it to a shared object which

Modified: trunk/varnish-cache/doc/sphinx/tutorial/troubleshooting.rst
===================================================================
--- trunk/varnish-cache/doc/sphinx/tutorial/troubleshooting.rst	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/doc/sphinx/tutorial/troubleshooting.rst	2010-10-13 07:32:42 UTC (rev 5425)
@@ -30,7 +30,7 @@
     Platform: Linux,2.6.32-21-generic,i686,-smalloc,-hcritbit
     200 193     
     -----------------------------
-    Varnish HTTP accelerator CLI.
+    Varnish Cache CLI.
     -----------------------------
     Type 'help' for command list.
     Type 'quit' to close CLI session.

Modified: trunk/varnish-cache/redhat/varnish.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnish.initrc	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/redhat/varnish.initrc	2010-10-13 07:32:42 UTC (rev 5425)
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# varnish Control the varnish HTTP accelerator
+# varnish Control the Varnish Cache
 #
 # chkconfig: - 90 10
 # description: Varnish is a high-perfomance HTTP accelerator
@@ -45,7 +45,7 @@
 		echo $config not found
 		exit 6
 	fi
-	echo -n "Starting varnish HTTP accelerator: "
+	echo -n "Starting Varnish Cache: "
 
 	# Open files (usually 1024, which is way too small for varnish)
 	ulimit -n ${NFILES:-131072}
@@ -76,7 +76,7 @@
 }
 
 stop() {
-	echo -n "Stopping varnish HTTP accelerator: "
+	echo -n "Stopping Varnish Cache: "
 	killproc -p $pidfile $prog
 	retval=$?
 	echo

Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/redhat/varnish.spec	2010-10-13 07:32:42 UTC (rev 5425)
@@ -28,9 +28,9 @@
 Requires: gcc
 
 %description
-This is the Varnish high-performance HTTP accelerator. Documentation
-wiki and additional information about Varnish is available on the following
-web site: http://www.varnish-cache.org/
+This is Varnish Cache, a high-performance HTTP accelerator.
+Documentation wiki and additional information about Varnish is
+available on the following web site: http://www.varnish-cache.org/
 
 %package libs
 Summary: Libraries for %{name}
@@ -40,7 +40,7 @@
 
 %description libs
 Libraries for %{name}.
-Varnish is a high-performance HTTP accelerator.
+Varnish Cache is a high-performance HTTP accelerator.
 
 %package libs-devel
 Summary: Development files for %{name}-libs
@@ -50,7 +50,7 @@
 
 %description libs-devel
 Development files for %{name}-libs
-Varnish is a high-performance HTTP accelerator
+Varnish Cache is a high-performance HTTP accelerator
 
 %package docs
 Summary: Documentation files for %name
@@ -68,7 +68,7 @@
 #
 #%description libs-static
 #Files for static linking of varnish library functions
-#Varnish is a high-performance HTTP accelerator
+#Varnish Cache is a high-performance HTTP accelerator
 
 %prep
 #%setup -q
@@ -245,7 +245,7 @@
 getent group varnish >/dev/null || groupadd -r varnish
 getent passwd varnish >/dev/null || \
 	useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
-		-c "Varnish http accelerator user" varnish
+		-c "Varnish Cache" varnish
 exit 0
 
 %post

Modified: trunk/varnish-cache/redhat/varnishlog.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnishlog.initrc	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/redhat/varnishlog.initrc	2010-10-13 07:32:42 UTC (rev 5425)
@@ -1,9 +1,9 @@
 #! /bin/sh
 #
-# varnishlog Control the varnish logging daemon
+# varnishlog Control the Varnish logging daemon
 #
 # chkconfig: - 90 10
-# description: Varnish logging daemon
+# description: Varnish Cache logging daemon
 # processname: varnishlog
 # config: 
 # pidfile: /var/run/varnish/varnishlog.pid
@@ -13,7 +13,7 @@
 # Required-Start: $network $local_fs $remote_fs
 # Required-Stop: $network $local_fs $remote_fs
 # Short-Description: start and stop varnishlog
-# Description: Varnish HTTP accelerator logging daemon
+# Description: Varnish Cache logging daemon
 ### END INIT INFO
 
 # Source function library.

Modified: trunk/varnish-cache/redhat/varnishncsa.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnishncsa.initrc	2010-10-12 10:30:07 UTC (rev 5424)
+++ trunk/varnish-cache/redhat/varnishncsa.initrc	2010-10-13 07:32:42 UTC (rev 5425)
@@ -1,9 +1,9 @@
 #! /bin/sh
 #
-# varnishncsa Control the varnish nsca logging daemon
+# varnishncsa Control the Varnish NSCA logging daemon
 #
 # chkconfig: - 90 10
-# description: Varnish logging daemon
+# description: Varnish Cache logging daemon
 # processname: varnishncsa
 # config: 
 # pidfile: /var/run/varnish/varnishncsa.pid
@@ -13,7 +13,7 @@
 # Required-Start: $network $local_fs $remote_fs
 # Required-Stop: $network $local_fs $remote_fs
 # Short-Description: start and stop varnishncsa
-# Description: Varnish HTTP accelerator logging daemon
+# Description: Varnish Cache NSCA logging daemon
 ### END INIT INFO
 
 # Source function library.




More information about the varnish-commit mailing list