Skip to content

Commit

Permalink
docs: spelling fixes
Browse files Browse the repository at this point in the history
* configuration
* github
* greater
* id
* ip
* iterm
* long-standing
* macos
* pausemsecs
* same ttl
* the
* this
* ttl
* winget
* with

Signed-off-by: Josh Soref <[email protected]>
  • Loading branch information
jsoref committed Jan 2, 2025
1 parent a1ea16d commit a17f06a
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ assignees: ''

**Environment Info**

- OS: <!-- e.g. Linux, Windows 11, MacOS -->
- OS: <!-- e.g. Linux, Windows 11, macOS -->
- Trippy version: <!-- the output of `trip -V` -->
- Installation method: <!-- e.g. `brew`, `winget`, `cargo` -->
- Terminal / Console: <!-- If you are not sure you can use "About" or, "Help" on the terminal window to gather the requested information. e.g. `iterm2`, `cmd.exe`, `PowerShell`, 'GNOME Terminal' -->
- Terminal / Console: <!-- If you are not sure you can use "About" or, "Help" on the terminal window to gather the requested information. e.g. `iTerm2`, `cmd.exe`, `PowerShell`, 'GNOME Terminal' -->

**Additional context**

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Fixed

- Local Ipv4 discovery fails on some platforms ([#133](https://github.com/fujiapple852/trippy/issues/133),
- Local IPv4 discovery fails on some platforms ([#133](https://github.com/fujiapple852/trippy/issues/133),
[#142](https://github.com/fujiapple852/trippy/issues/142))
- DNS resolution not filtering for `IPv4` addresses ([#148](https://github.com/fujiapple852/trippy/issues/148))
- Note: see [#35](https://github.com/fujiapple852/trippy/issues/35) for the status of `IPv6` support
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ maintainers:
- Crates.io
- Docker
- Snapcraft
- Winget
- WinGet
- Ubuntu PPA

### Prerequisites
Expand All @@ -191,7 +191,7 @@ maintainers:
Trippy is tested extensively in CI on Linux, Windows and macOS for every pull request. However, it is recommended to
test the release binaries on all platforms before release.

### Github Releases
### GitHub Releases

- Tag the release with the version number `0.xx.0` and push the tag to GitHub:

Expand Down Expand Up @@ -233,7 +233,7 @@ docker push fujiapple/trippy:latest
- Promote the first `0.xx.0` build to the `latest/stable` channel from the
Snapcraft [releases](https://snapcraft.io/trippy/releases) page

### Winget
### WinGet

- Download the latest release Windows `zip` from
the [GitHub releases page](https://github.com/fujiapple852/trippy/releases/latest)
Expand Down
6 changes: 3 additions & 3 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ The previous release of Trippy introduced a bug ([#1290](https://github.com/fuji
caused reverse DNS lookups to be enqueued multiple times when the `dns-ttl` expired, potentially leading to the hostname
being displayed as `Timeout: xxx` for a brief period.

A long standing bug ([#1398](https://github.com/fujiapple852/trippy/issues/1398)) which caused the TUI sample history
A long-standing bug ([#1398](https://github.com/fujiapple852/trippy/issues/1398)) which caused the TUI sample history
and frequency charts to ignore sub-millisecond samples has been fixed.

This release fixes a bug ([#1287](https://github.com/fujiapple852/trippy/issues/1287)) that caused the tracer to panic
Expand Down Expand Up @@ -993,7 +993,7 @@ more. Additionally, this release includes several important bug fixes along with

### Tracing Flows

#### Flow Id
#### Flow ID

A tracing flow represents the sequence of hosts traversed from the source to the target. Trippy is now able to identify
individual flows within a trace and assign each a unique flow id. Trippy calculate a flow id for each round of tracing,
Expand Down Expand Up @@ -1126,7 +1126,7 @@ The following screenshot shows ICMP extensions in hop detail mode:

#### ICMP Extensions in Reports

ICMP extension information is also included the the `json` and `stream` report modes.
ICMP extension information is also included the `json` and `stream` report modes.

Sample output for a single hop from the `json` report:

Expand Down
2 changes: 1 addition & 1 deletion crates/trippy-core/src/flows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl Flow {
/// Check if a given `Flow` matches this `Flow`.
///
/// Two flows are said to match _unless_ they contain different IP
/// addresses for the _same_ position (i.e. the `tll`).
/// addresses for the _same_ position (i.e. the same `ttl`).
///
/// This is true even for flows of differing lengths.
///
Expand Down
2 changes: 1 addition & 1 deletion crates/trippy-core/src/strategy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ mod state {
self.buffer[usize::from(resp.sequence - self.round_sequence)] =
ProbeStatus::Complete(completed);

// If this `ProbeStatus` found the target then we set the `target_tll` if not already
// If this `ProbeStatus` found the target then we set the `target_ttl` if not already
// set, being careful to account for `Probes` being received out-of-order.
//
// If this `ProbeStatus` did not find the target but has a ttl that is greater or equal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = "IPv4/ICMP wih min/max round duration 250ms and grace 50ms"
name = "IPv4/ICMP with min/max round duration 250ms and grace 50ms"
target = "10.0.0.110"
protocol = "Icmp"
icmp_identifier = 7
Expand Down
2 changes: 1 addition & 1 deletion crates/trippy-packet/src/icmp_extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ pub mod extension_splitter {
assert!(mpls_stack_member_iter.next().is_none());
}

// Real Ipv6 example with a rfc4884 length of 16 (16 * 8 = 128
// Real IPv6 example with a rfc4884 length of 16 (16 * 8 = 128
// octets for) but the total payload is only 84 octets and
// therefore this is a malformed packet.
//
Expand Down
2 changes: 1 addition & 1 deletion crates/trippy-tui/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ mod tests {
#[test_case("trip example.com -t 5", Ok(cfg().max_ttl(5).build()); "custom max ttl short")]
#[test_case("trip example.com --max-ttl 0", Err(anyhow!("max-ttl (0) must be in the range 1..254")); "invalid low max ttl")]
#[test_case("trip example.com --max-ttl 500", Err(anyhow!("error: invalid value '500' for '--max-ttl <MAX_TTL>': 500 is not in 0..=255 For more information, try '--help'.")); "invalid high max ttl")]
#[test_case("trip example.com --first-ttl 3 --max-ttl 2", Err(anyhow!("first-ttl (3) must be less than or equal to max-ttl (2)")); "first ttl higher than max ttl")]
#[test_case("trip example.com --first-ttl 3 --max-ttl 2", Err(anyhow!("first-ttl (3) must be less than or equal to max-ttl (2)")); "first ttl greater than max ttl")]
#[test_case("trip example.com --first-ttl 5 --max-ttl 5", Ok(cfg().first_ttl(5).max_ttl(5).build()); "custom first and max ttl")]
fn test_ttl(cmd: &str, expected: anyhow::Result<TrippyConfig>) {
compare(parse_config(cmd), expected);
Expand Down
8 changes: 4 additions & 4 deletions docs/src/content/docs/reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ Options:
The address family [default: Ipv4thenIpv6]
Possible values:
- ipv4: Ipv4 only
- ipv6: Ipv6 only
- ipv6-then-ipv4: Ipv6 with a fallback to Ipv4
- ipv4-then-ipv6: Ipv4 with a fallback to Ipv6
- ipv4: IPv4 only
- ipv6: IPv6 only
- ipv6-then-ipv4: IPv6 with a fallback to IPv4
- ipv4-then-ipv6: IPv4 with a fallback to IPv6
-4, --ipv4
Use IPv4 only
Expand Down
2 changes: 1 addition & 1 deletion docs/src/content/docs/reference/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sidebar:
order: 7
---

The following table lists ths versions of Trippy that are available and links to the corresponding release note and
The following table lists this versions of Trippy that are available and links to the corresponding release note and
documentation:

| Version | Release Date | Status | Release Note | Documentation |
Expand Down
6 changes: 3 additions & 3 deletions examples/traceroute/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fn main() -> anyhow::Result<()> {
let max_ttl = args.max_ttl.unwrap_or(64);
let nqueries = args.nqueries.unwrap_or(3);
let tos = args.tos.unwrap_or(0);
let pausemecs = args.pausemsecs.unwrap_or(100);
let pausemsecs = args.pausemsecs.unwrap_or(100);
let port_direction = if args.evasion {
PortDirection::new_fixed_dest(port)
} else {
Expand Down Expand Up @@ -79,8 +79,8 @@ fn main() -> anyhow::Result<()> {
.tos(tos)
.max_flows(1)
.max_rounds(Some(nqueries))
.min_round_duration(Duration::from_millis(pausemecs))
.max_round_duration(Duration::from_millis(pausemecs))
.min_round_duration(Duration::from_millis(pausemsecs))
.max_round_duration(Duration::from_millis(pausemsecs))
.build()?;
println!(
"traceroute to {} ({}), {} hops max, {} byte packets",
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ description: |
- `network`: to allow general outgoing network access
- `network-bind`: to allow binding to local ports
- `network-observe`: to allow enabling `CAP_NET_RAW` for using raw sockets
- `home`: to allow access to /home for reading the configuraton file
- `home`: to allow access to /home for reading the configuration file
contact: mailto:[email protected]
issues: https://github.com/fujiapple852/trippy/issues
license: Apache-2.0
Expand Down
8 changes: 4 additions & 4 deletions trippy-config-sample.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ protocol = "icmp"
# The address family.
#
# Allowed values are:
# ipv4 - Lookup Ipv4 only
# ipv6 - Lookup Ipv6 only
# ipv6-then-ipv4 - Lookup Ipv6 with a fallback to Ipv4
# ipv4-then-ipv6 - Lookup Ipv4 with a fallback to Ipv6 [default]
# ipv4 - Lookup IPv4 only
# ipv6 - Lookup IPv6 only
# ipv6-then-ipv4 - Lookup IPv6 with a fallback to IPv4
# ipv4-then-ipv6 - Lookup IPv4 with a fallback to IPv6 [default]
addr-family = "ipv4-then-ipv6"

# The target port (TCP & UDP only) [default: 80]
Expand Down

0 comments on commit a17f06a

Please sign in to comment.