Skip to content
This repository has been archived by the owner on Apr 28, 2022. It is now read-only.

Commit

Permalink
Be consistent about naming
Browse files Browse the repository at this point in the history
Try to use the name "Varnish Cache" rather than "Varnish HTTP
accelerator" and be consistent about this everywhere.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5425 d4fa192b-c00b-0410-8231-f00ffab90ce4
  • Loading branch information
Tollef Fog Heen committed Oct 13, 2010
1 parent bae1824 commit a404889
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion bin/varnishd/mgt_cli.c
Expand Up @@ -99,7 +99,7 @@ mcf_banner(struct cli *cli, const char *const *av, void *priv)
(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");
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/reference/varnishstat.rst
Expand Up @@ -3,7 +3,7 @@ varnishstat
===========

---------------------------
HTTP accelerator statistics
Varnish Cache statistics
---------------------------

:Author: Dag-Erling Smørgrav
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/reference/varnishtest.rst
Expand Up @@ -20,7 +20,7 @@ DESCRIPTION
===========

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
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/reference/vcl.rst
Expand Up @@ -20,8 +20,8 @@ DESCRIPTION
===========

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
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/tutorial/troubleshooting.rst
Expand Up @@ -30,7 +30,7 @@ listening on its port.::
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.
Expand Down
6 changes: 3 additions & 3 deletions redhat/varnish.initrc
@@ -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
Expand Down Expand Up @@ -45,7 +45,7 @@ start() {
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}
Expand Down Expand Up @@ -76,7 +76,7 @@ start() {
}

stop() {
echo -n "Stopping varnish HTTP accelerator: "
echo -n "Stopping Varnish Cache: "
killproc -p $pidfile $prog
retval=$?
echo
Expand Down
14 changes: 7 additions & 7 deletions redhat/varnish.spec
Expand Up @@ -28,9 +28,9 @@ Requires(preun): initscripts
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}
Expand All @@ -40,7 +40,7 @@ BuildRequires: ncurses-devel

%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
Expand All @@ -50,7 +50,7 @@ Requires: varnish-libs = %{version}-%{release}

%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
Expand All @@ -68,7 +68,7 @@ Documentation files for %name
#
#%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
Expand Down Expand Up @@ -245,7 +245,7 @@ rm -rf %{buildroot}
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
Expand Down
6 changes: 3 additions & 3 deletions redhat/varnishlog.initrc
@@ -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
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions redhat/varnishncsa.initrc
@@ -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
Expand All @@ -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.
Expand Down

0 comments on commit a404889

Please sign in to comment.