Skip to content

Commit 73ae3e2

Browse files
committed
Merge pull request mozilla-services#1807 from nikai3d/dev
Fix typos in docs
2 parents e99096e + b5c6715 commit 73ae3e2

18 files changed

+28
-28
lines changed

docs/source/config/common_sandbox_parameter.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Common Sandbox Parameters
44
=========================
55
These are the configuration options that are universally available to all
6-
Sandbox plugins. The are consumed by Heka when it initializes the plugin.
6+
Sandbox plugins. They are consumed by Heka when it initializes the plugin.
77

88
- script_type (string):
99
The language the sandbox is written in. Currently the only valid option is

docs/source/config/decoders/geoip.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Config:
4747
The name of the new field created by the decoder. The decoder will output
4848
a JSON object with the following elements:
4949

50-
- latitute: string,
50+
- latitude: string,
5151
- longitude: string,
5252
- location: [ float64, float64 ],
5353
- GeoJSON format intended for use as a `geo_point <http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-geo-point-type.html/>`_ for ES output.

docs/source/config/decoders/multi.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Config:
3131
failed if *none* of the sub-decoders succeed.
3232

3333
Here is a slightly contrived example where we have protocol buffer encoded
34-
messages coming in over a TCP connection, with each message containin a single
34+
messages coming in over a TCP connection, with each message containing a single
3535
nginx log line. Our MultiDecoder will run each message through two decoders,
3636
the first to deserialize the protocol buffer and the second to parse the log
3737
text:

docs/source/config/decoders/protobuf.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ with other Heka instances, so one will always be included in your Heka
1111
configuration under the name "ProtobufDecoder", whether specified or not. The
1212
ProtobufDecoder has no configuration options.
1313

14-
The hekad protocol buffers message schema in defined in the `message.proto`
14+
The hekad protocol buffers message schema is defined in the `message.proto`
1515
file in the `message` package.
1616

1717
Example:

docs/source/config/filters/stat.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Stat Filter
55

66
Plugin Name: **StatFilter**
77

8-
Filter plugin that accepts messages of a specfied form and uses extracted
8+
Filter plugin that accepts messages of a specified form and uses extracted
99
message data to feed statsd-style numerical metrics in the form of `Stat`
1010
objects to a `StatAccumulator`.
1111

docs/source/config/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Config:
102102

103103
- max_pack_idle (string):
104104
A time duration string (e.x. "2s", "2m", "2h") indicating how long a
105-
message pack can be 'idle' before its considered leaked by heka. If too
105+
message pack can be 'idle' before it is considered leaked by heka. If too
106106
many packs leak from a bug in a filter or output then heka will eventually
107107
halt. This setting indicates when that is considered to have occurred.
108108

docs/source/config/inputs/httplisten.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Config:
3939

4040
- headers (subsection, optional):
4141
It is possible to inject arbitrary HTTP headers into each outgoing response
42-
by adding a TOML subsection entitled "headers" to you HttpOutput config
42+
by adding a TOML subsection entitled "headers" to your HttpOutput config
4343
section. All entries in the subsection must be a list of string values.
4444

4545
.. versionadded:: 0.9

docs/source/config/inputs/process.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Config:
1717

1818
- command (map[uint]cmd_config):
1919
The command is a structure that contains the full path to the binary,
20-
command line arguments, optional enviroment variables and an optional
20+
command line arguments, optional environment variables and an optional
2121
working directory (see below). ProcessInput expects the commands to be
2222
indexed by integers starting with 0, where 0 is the first process in the
2323
chain.

docs/source/config/outputs/dashboard.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Config:
3636

3737
- headers (subsection, optional):
3838
It is possible to inject arbitrary HTTP headers into each outgoing response
39-
by adding a TOML subsection entitled "headers" to you HttpOutput config
39+
by adding a TOML subsection entitled "headers" to your HttpOutput config
4040
section. All entries in the subsection must be a list of string values.
4141

4242

docs/source/config/outputs/udp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Config:
2929
from the Heka message.
3030
- max_message_size (int):
3131
Maximum size of message that is allowed to be sent via UdpOutput. Messages
32-
which exceeds this limit will be dropped. Defaults to 65507 (the limit
32+
which exceed this limit will be dropped. Defaults to 65507 (the limit
3333
for UDP packets in IPv4).
3434

3535
Example:

docs/source/developing/plugin.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ output and the error.
833833
Unlike the other plugin types, encoders don't have a PluginRunner, nor do they
834834
run in their own goroutines. Outputs invoke encoders directly, by calling the
835835
Encode method exposed on the OutputRunner. This has the same signature as the
836-
Encoder interface's Encode method, to which it will will delegate. If
836+
Encoder interface's Encode method, to which it will delegate. If
837837
``use_framing`` is set to true in the output's configuration, however, the
838838
OutputRunner will prepend Heka's :ref:`stream_framing` to the generated binary
839839
data.
@@ -874,7 +874,7 @@ of these is the ``Output`` interface::
874874
}
875875

876876
The only difference between this and the :ref:`Filter <filters>` interface is
877-
that the first argument to ``Prepare`` is and ``OutputRunner`` and not a
877+
that the first argument to ``Prepare`` is an ``OutputRunner`` and not a
878878
``FilterRunner``. The two interfaces are used in the same way, with Prepare
879879
being called before message processing starts and CleanUp being called after
880880
message processing has completed.

docs/source/getting_started.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ Heka Dashboard
451451
==============
452452

453453
At this point it's useful to notice that, while the SandboxFilter gathers the
454-
data that we're interested in and packages it up an a format that's useful for
454+
data that we're interested in and packages it up in a format that's useful for
455455
graphing, it doesn't actually *do* any graphing. Instead, it periodically
456456
creates a message of type `heka.sandbox-output`, containing the current
457457
circular buffer data, and injects that message back into Heka's message
@@ -659,7 +659,7 @@ by `Logstash <http://logstash.net/>`_ (specifically intended for HTTP request da
659659
natively supported by Kibana), and the :ref:`config_espayload`, which assumes
660660
that the message payload will already contain a fully formed JSON document
661661
ready for sending to ElasticSearch, and just prepends the necessary Bulk API
662-
segement.
662+
segment.
663663

664664
In our `ESJsonEncoder` section, we're mostly adhering to the default settings.
665665
By default, this decoder inserts documents into an ElasticSearch index based
@@ -819,7 +819,7 @@ Gaussian distribution, such as cases where the set of data points is sparse.
819819

820820
The next argument tells us what column we'll be looking at. In this case we're
821821
using column 5, which is where we store the 500 range status responses, or
822-
server errors. After that is the number of intervals to use in a analysis
822+
server errors. After that is the number of intervals to use in an analysis
823823
window (15), followed by the number of analysis windows to compare (10). In
824824
this case, that means we'll be examining the last 15 seconds, and comparing
825825
what we find there with the 10 prior 15 second windows, or the 150 previous

docs/source/installing.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ From Source
2323
this task is automated by the build process. The build script will override the
2424
Go environment for the shell window it is executed in. This creates an isolated
2525
environment that is intended specifically for building and developing Heka.
26-
The build script should be be sourced every time a new shell is opened for Heka
26+
The build script should be sourced every time a new shell is opened for Heka
2727
development to ensure the correct dependencies are found and being used. To
2828
create a working `hekad` binary for your platform you'll need to install some
2929
prerequisites. Many of these are standard on modern Unix distributions and all
@@ -161,7 +161,7 @@ sub-packages to be initialized.
161161
# is checked in, the value can simply be changed to the correct tag to make it 'live'.
162162
# i.e. {heka root}/externals/heka-sns-input -> {heka root}/build/heka/src/github.com/bellycard/heka-sns-input
163163
164-
The preceeding entry clones the `heka-mozsvc-plugins` git repository into the Go
164+
The preceding entry clones the `heka-mozsvc-plugins` git repository into the Go
165165
work environment, checks out SHA 6fe574dbd32a21f5d5583608a9d2339925edd2a7, and imports the package into
166166
`hekad` when `make` is run. By adding an `init() function <http://golang.org/doc/effective_go.html#init>`_
167167
in your package you can make calls into `pipeline.RegisterPlugin` to register

docs/source/monitoring/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Monitoring Internal State
77
Heka Reports
88
------------
99

10-
Heka can emit metrics about it's internal state to either an outgoing Heka
10+
Heka can emit metrics about its internal state to either an outgoing Heka
1111
message (and, through the DashboardOutput, to a web dashboard) or to stdout.
1212
Sending SIGUSR1 to hekad on a UNIX will send a plain text report to stdout. On
1313
Windows, you will need to send signal 10 to the hekad process using Powershell.

docs/source/pluginconfig/logstreamer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This is the basic use-case where a single logfile should be read that the
4747
system may rotate/truncate at some time (hopefully not using truncation though
4848
that condition is handled). Log rotation inherently has a risk that some
4949
loglines written may be missed if the program reading the log happens to die
50-
at exactly the wrong time that the rotation is occuring.
50+
at exactly the wrong time that the rotation is occurring.
5151

5252
An example of a single rotating logfile would be the case where you
5353
want to watch /var/log/system.log for all new entries. Here's what the

docs/source/sandbox/development.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Sandbox Development
66
Decoders
77
--------
88
Since decoders cannot be dynamically loaded and they stop Heka processing on
9-
fatal errors they must be developed outside of a production enviroment. Most
9+
fatal errors they must be developed outside of a production environment. Most
1010
Lua decoders are LPeg based as it is the best way to parse and transform data
1111
within the sandbox. The other alternatives are the built-in Lua pattern
1212
matcher or the JSON parser with a manual transformation.
@@ -33,7 +33,7 @@ matcher or the JSON parser with a manual transformation.
3333
[SandboxDecoder]
3434
filename = "decoder.lua"
3535
36-
4. Configure the DasboardOutput for visibility into the decoder (performance,
36+
4. Configure the DashboardOutput for visibility into the decoder (performance,
3737
memory usage, messages processed/failed, etc.)
3838

3939
.. code-block:: ini
@@ -102,15 +102,15 @@ production with live data.
102102
usually straight forward to correct and commonly caused by a syntax
103103
error in the script or invalid assumptions about the data (e.g. `cnt =
104104
cnt + read_message("Fields[counter]")` will fail if the counter field
105-
doesn't exist or is non-numeric due to a error in the data).
105+
doesn't exist or is non-numeric due to an error in the data).
106106

107107
2. No termination report and the output does not match expectations. These
108108
are usually a little harder to debug.
109109

110-
1. Check the Heka dasboard to make sure the router is sending messages
110+
1. Check the Heka dashboard to make sure the router is sending messages
111111
to the plugin. If not, verify your message_matcher configuration.
112112

113-
2. Visually review the the plugin for errors. Are the message field
113+
2. Visually review the plugin for errors. Are the message field
114114
names correct, was the result of the cjson.decode tested, are the
115115
output variables actually being assigned to and output/injected,
116116
etc.

docs/source/sandbox/lua.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Heka specific functions that are exposed to the Lua sandbox
138138
- representation (string) only used in combination with the Fields variableName
139139
- representation tag to set
140140
- fieldIndex (unsigned) only used in combination with the Fields variableName
141-
- use to set a specfic instance of a repeated field _name_
141+
- use to set a specific instance of a repeated field _name_
142142
- arrayIndex (unsigned) only used in combination with the Fields variableName
143143
- use to set a specific element of a field containing an array
144144

docs/source/tls.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ TLS configuration settings
8181
<http://tools.ietf.org/search/rfc5077>`_. If left empty, it will be filled
8282
with random data before the first server handshake.
8383
- min_version (string, both):
84-
Specifies the mininum acceptable SSL/TLS version. Must
84+
Specifies the minimum acceptable SSL/TLS version. Must
8585
be one of the following values:
8686

8787
- SSL30
@@ -103,13 +103,13 @@ TLS configuration settings
103103
Defaults to TLS12.
104104

105105
- client_cafile (string, server):
106-
File for server to authenticate client TLS handshake. Any client certs recieved by server
106+
File for server to authenticate client TLS handshake. Any client certs received by server
107107
must be chained to a CA found in this PEM file.
108108

109109
Has no effect when NoClientCert is set.
110110

111111
- root_cafile (string, client):
112-
File for client to authenticate server TLS handshake. Any server certs recieved by client
112+
File for client to authenticate server TLS handshake. Any server certs received by client
113113
must be must be chained to a CA found in this PEM file.
114114

115115
Sample TLS configuration

0 commit comments

Comments
 (0)