You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2013/08/18 15:48:42 UTC

[1/2] git commit: document requirements for tstop build

Updated Branches:
  refs/heads/master 0689331ff -> 8a71671cb


document requirements for tstop build

tstop requires curses and curl to build, I'm adding those for Ubuntu
right now only, because I have no idea what their names are in the other
OSes/Distros.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ac4330f0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ac4330f0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ac4330f0

Branch: refs/heads/master
Commit: ac4330f0c1e998166a4df11b31991b167c15fecd
Parents: 0689331
Author: Igor Galić <i....@brainsware.org>
Authored: Sun Aug 18 15:47:26 2013 +0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Sun Aug 18 15:47:26 2013 +0200

----------------------------------------------------------------------
 README                           | 4 ++++
 doc/admin/getting-started.en.rst | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ac4330f0/README
----------------------------------------------------------------------
diff --git a/README b/README
index 864f232..82e955c 100644
--- a/README
+++ b/README
@@ -112,6 +112,8 @@ plugins to build large scale web applications.
     flex (optional, required for e.g. WCCP)
     libhwloc-dev (optional, highly recommended)
     liblua5.1-dev or libluajit-5.1-dev (optional)
+    libncurses5-dev (optional, required for e.g.: tstop)
+    libcurl4-openssl-dev (optional, required for e.g.: tstop)
 
   Ubuntu EC2 9.10:
     NOTE: Alternately you may use the install scripts in 'contrib' which
@@ -134,6 +136,8 @@ plugins to build large scale web applications.
     flex (optional)
     libhwloc-dev (optional, highly recommended)
     liblua-dev (optional)
+    libncurses5-dev (optional, required for e.g.: tstop)
+    libcurl3-openssl-dev (optional, required for e.g.: tstop)
 
   FreeBSD 7.2,8.0,9.0,9.1
     GCC 4.2.1 compiler suite or clang. You can install the following

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ac4330f0/doc/admin/getting-started.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/getting-started.en.rst b/doc/admin/getting-started.en.rst
index fe086b7..4e8ba78 100644
--- a/doc/admin/getting-started.en.rst
+++ b/doc/admin/getting-started.en.rst
@@ -72,11 +72,12 @@ In order to build Traffic Server from source you will need the following
 -  tcl
 -  expat
 -  pcre
--  pcre
 -  libcap
 -  flex (for TPROXY)
 -  hwloc
 -  lua
+-  curses
+-  curl (both for tstop)
 
 if you're building from a git clone, you'll also need
 


[2/2] git commit: more formatting and wording issues.

Posted by ig...@apache.org.
more formatting and wording issues.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8a71671c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8a71671c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8a71671c

Branch: refs/heads/master
Commit: 8a71671cb4dd1f6477b0fd89e5a46153ed838cce
Parents: ac4330f
Author: Igor Galić <i....@brainsware.org>
Authored: Sun Aug 18 15:48:21 2013 +0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Sun Aug 18 15:48:21 2013 +0200

----------------------------------------------------------------------
 doc/admin/getting-started.en.rst           |  6 ++++--
 doc/admin/http-proxy-caching.en.rst        | 28 ++++++++++++-------------
 doc/reference/commands/traffic_line.en.rst |  2 ++
 3 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8a71671c/doc/admin/getting-started.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/getting-started.en.rst b/doc/admin/getting-started.en.rst
index 4e8ba78..80eb151 100644
--- a/doc/admin/getting-started.en.rst
+++ b/doc/admin/getting-started.en.rst
@@ -28,6 +28,8 @@ Getting Started
 Before you start
 ================
 
+.. XXX: We'll need to adapt this when we start off with the new release process.
+
 Before you get started with Traffic Server you may have to decide which
 version you want to use. Traffic Server uses the same "semantic
 versioning" to denote "stability" as Apache
@@ -173,12 +175,12 @@ For a list of :program:`traffic_line` commands, enter::
 Please note that :program:`traffic_line`, while a fine tool for an
 administrator, is a poor choice for automation, especially that of
 monitoring. See our chapter on :ref:`monitoring-traffic`
-for how to get that righter.
+for how to do that better.
 
 Stop Traffic Server
 ===================
 
-To stop Traffic Server, always use the ``trafficserver`` command,
+To stop Traffic Server, always use the :program:`trafficserver` command,
 passing in the attribute ``stop``. This command stops all the Traffic
 Server processes (:program:`traffic_manager`, :program:`traffic_server`, and
 :program:`traffic_cop`). Do not manually stop processes, as this can lead to

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8a71671c/doc/admin/http-proxy-caching.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/http-proxy-caching.en.rst b/doc/admin/http-proxy-caching.en.rst
index d129f03..2dd86ef 100644
--- a/doc/admin/http-proxy-caching.en.rst
+++ b/doc/admin/http-proxy-caching.en.rst
@@ -5,28 +5,26 @@ HTTP Proxy Caching
 
 .. Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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
-
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
+ 
+  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.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
 
 Web proxy caching enables you to store copies of frequently-accessed web
 objects (such as documents, images, and articles) and then serve this
 information to users on demand. It improves performance and frees up
 Internet bandwidth for other tasks.
 
-This chapter discusses the following topics:
-
 .. toctree::
    :maxdepth: 2
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8a71671c/doc/reference/commands/traffic_line.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_line.en.rst b/doc/reference/commands/traffic_line.en.rst
index 579e15d..5bc0f1f 100644
--- a/doc/reference/commands/traffic_line.en.rst
+++ b/doc/reference/commands/traffic_line.en.rst
@@ -25,6 +25,8 @@ Synopsis
 
 :program:`traffic_line` [options]
 
+.. _traffic-line-commands:
+
 Description
 ===========