Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #2827

Merged
merged 1 commit into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/releases/0_9_11.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ New Features
Graphite-web
^^^^^^^^^^^^
* Properly return an HTTP 400 on missing query parameter in metrics/search endpoint (dieterbe)
* cumulative() is now superceded by consolidateBy() which supports min/max/avg/sum (nleskiw)
* cumulative() is now superseded by consolidateBy() which supports min/max/avg/sum (nleskiw)
* Make graphlot target host configurable for easier embedding (dieterbe)
* Allow graphlot graphs to be embedded for use in dashboard apps (dieterbe)
* When wildcarding, prefer matching metric files to directories with the same name (tmm1)
Expand Down
4 changes: 2 additions & 2 deletions webapp/content/js/ext/adapter/ext/ext-base-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ Ext.urlDecode("foo=1&bar=2&bar=3&bar=4", false); // returns {foo: "1", bar: ["2"
* @param {Function} fn The function to be called for each iteration.
* The iteration will stop if the supplied function returns false, or
* all array elements / object properties have been covered. The signature
* varies depending on the type of object being interated:
* varies depending on the type of object being iterated:
* <div class="mdetail-params"><ul>
* <li>Arrays : <tt>(Object item, Number index, Array allItems)</tt>
* <div class="sub-desc">
Expand Down Expand Up @@ -971,7 +971,7 @@ btn.on('click', sayHi.createDelegate(btn, ['Fred']));
},

/**
* Calls this function after the number of millseconds specified, optionally in a specific scope. Example usage:
* Calls this function after the number of milliseconds specified, optionally in a specific scope. Example usage:
* <pre><code>
var sayHi = function(name){
alert('Hi, ' + name);
Expand Down
6 changes: 3 additions & 3 deletions webapp/content/js/ext/ext-all-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -6533,7 +6533,7 @@ btn.on('click', Ext.createDelegate(sayHi, btn, ['Fred']));
},

/**
* Calls this function after the number of millseconds specified, optionally in a specific scope. Example usage:
* Calls this function after the number of milliseconds specified, optionally in a specific scope. Example usage:
* <pre><code>
var sayHi = function(name){
alert('Hi, ' + name);
Expand Down Expand Up @@ -16385,7 +16385,7 @@ Ext.layout.boxOverflow.Scroller = Ext.extend(Ext.layout.boxOverflow.None, {
Ext.layout.boxOverflow.scroller = Ext.layout.boxOverflow.Scroller;



Ext.layout.boxOverflow.VerticalScroller = Ext.extend(Ext.layout.boxOverflow.Scroller, {
scrollIncrement: 75,
wheelIncrement : 2,
Expand Down Expand Up @@ -25424,7 +25424,7 @@ Ext.data.DataProxy.Error = Ext.extend(Ext.Error, {
Ext.apply(Ext.data.DataProxy.Error.prototype, {
lang: {
'action-undefined': "DataProxy attempted to execute an API-action but found an undefined url / function. Please review your Proxy url/api-configuration.",
'api-invalid': 'Recieved an invalid API-configuration. Please ensure your proxy API-configuration contains only the actions from Ext.data.Api.actions.'
'api-invalid': 'Received an invalid API-configuration. Please ensure your proxy API-configuration contains only the actions from Ext.data.Api.actions.'
}
});

Expand Down
2 changes: 1 addition & 1 deletion webapp/graphite/local_settings.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ DEFAULT_XFILES_FACTOR = 0
# query port is 7002 and a common scheme is to use 7102 for instance b, 7202
# for instance c, etc.
# If you're using consistent hashing, please keep an order of hosts the same as
# order of DESTINATIONS in your relay - otherways you'll get cache misses.
# order of DESTINATIONS in your relay - otherwise you'll get cache misses.
#
# You *should* use 127.0.0.1 here in most cases.
#
Expand Down
16 changes: 8 additions & 8 deletions webapp/graphite/render/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ def movingWindow(requestContext, seriesList, windowSize, func='average', xFilesF
until`` in the :doc:`Render API <render_api>` for examples of time formats), a function to apply to the points
in the window to produce the output, and an xFilesFactor value to specify how many points in the
window must be non-null for the output to be considered valid. Graphs the
output of the function for the preceeding datapoints for each point on the graph.
output of the function for the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -1460,7 +1460,7 @@ def movingMedian(requestContext, seriesList, windowSize, xFilesFactor=None):
or a quoted string with a length of time like '1hour' or '5min' (See ``from /
until`` in the :doc:`Render API <render_api>` for examples of time formats), and an xFilesFactor value to specify
how many points in the window must be non-null for the output to be considered valid. Graphs the
median of the preceeding datapoints for each point on the graph.
median of the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -1937,7 +1937,7 @@ def movingAverage(requestContext, seriesList, windowSize, xFilesFactor=None):
or a quoted string with a length of time like '1hour' or '5min' (See ``from /
until`` in the :doc:`Render API <render_api>` for examples of time formats), and an xFilesFactor value to specify
how many points in the window must be non-null for the output to be considered valid. Graphs the
average of the preceeding datapoints for each point on the graph.
average of the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -1967,7 +1967,7 @@ def movingSum(requestContext, seriesList, windowSize, xFilesFactor=None):
or a quoted string with a length of time like '1hour' or '5min' (See ``from /
until`` in the :doc:`Render API <render_api>` for examples of time formats), and an xFilesFactor value to specify
how many points in the window must be non-null for the output to be considered valid. Graphs the
sum of the preceeding datapoints for each point on the graph.
sum of the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -1997,7 +1997,7 @@ def movingMin(requestContext, seriesList, windowSize, xFilesFactor=None):
or a quoted string with a length of time like '1hour' or '5min' (See ``from /
until`` in the :doc:`Render API <render_api>` for examples of time formats), and an xFilesFactor value to specify
how many points in the window must be non-null for the output to be considered valid. Graphs the
minimum of the preceeding datapoints for each point on the graph.
minimum of the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -2027,7 +2027,7 @@ def movingMax(requestContext, seriesList, windowSize, xFilesFactor=None):
or a quoted string with a length of time like '1hour' or '5min' (See ``from /
until`` in the :doc:`Render API <render_api>` for examples of time formats), and an xFilesFactor value to specify
how many points in the window must be non-null for the output to be considered valid. Graphs the
maximum of the preceeding datapoints for each point on the graph.
maximum of the preceding datapoints for each point on the graph.

Example:

Expand Down Expand Up @@ -2333,7 +2333,7 @@ def integral(requestContext, seriesList):

def integralByInterval(requestContext, seriesList, intervalUnit):
"""
This will do the same as integral() funcion, except resetting the total to 0
This will do the same as integral() function, except resetting the total to 0
at the given time in the parameter "from"
Useful for finding totals per hour/day/week/..

Expand Down Expand Up @@ -5107,7 +5107,7 @@ def applyByNode(requestContext, seriesList, nodeNum, templateFunction, newName=N
for series in seriesList:
nodes = series.name.split('.')
if nodeNum >= len(nodes):
raise InputParameterError("{} do not contans {} nodes".format(series.name, nodeNum))
raise InputParameterError("{} do not contains {} nodes".format(series.name, nodeNum))
prefix = '.'.join(nodes[:nodeNum + 1])
prefixes.add(prefix)
results = []
Expand Down
Loading