Skip to content

Commit 280d345

Browse files
committed
docs: Rephrase sentences, and improve grammar and spelling
1 parent e71cb32 commit 280d345

File tree

9 files changed

+91
-36
lines changed

9 files changed

+91
-36
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cmake -DSKIP_DEMOS=true .
3838
## Contributing to the Documentation
3939

4040
The documentation is structured in the MkDocs format and uses Material for MkDocs.
41-
To develop the site in this repository, start it in the [Dev Containers](.devcontainer/README.md)
41+
To develop the site in this repository, start it in a [Dev Container](.devcontainer/README.md)
4242
and use the following commands:
4343

4444
```shell
@@ -57,4 +57,4 @@ mkdocs build
5757
- `tc_` is used as a prefix for all exported Testcontainers functions
5858
- When possible, we try to avoid special Golang types in public API and try to expose wrapper types
5959
- `const` is important for users, and please add it to your arguments when possible.
60-
There is no Const in Golang, so some `typedef` injection is needed when importing CGo
60+
There is no `const` in Golang, so some `typedef` injection is needed when importing CGo

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
[![Stability: Experimental](https://masterminds.github.io/stability/experimental.svg)](https://masterminds.github.io/stability/experimental.html)
99
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/oleg-nenashev/testcontainers-c)](https://github.com/oleg-nenashev/testcontainers-c/releases)
1010

11-
!!! warning
12-
This is a prototype.
13-
There is a lot to do before it can be distributed and used in production, see the GitHub Issues
14-
and the [project roadmap](./ROADMAP.md)
11+
> [!WARNING]
12+
> This is a prototype. There is a lot to do before it can be distributed and used in production, see the GitHub Issues and the [project roadmap](./ROADMAP.md)
1513
1614
This is not a standalone [Testcontainers](https://testcontainers.org/) engine,
1715
but a C-style shared library adapter for native languages like C/C++, D, Lua, Swift, etc.
@@ -88,9 +86,7 @@ describes how it can be done in principle.
8886
## Credits
8987

9088
Using a complex Golang framework from C/C++ is not trivial.
91-
Neither the CMake files are.
92-
This project would not succeed without many quality articles
93-
and help from the community.
89+
Neither are the CMake files. This project would not succeed without many quality articles and help from the community.
9490

9591
Kudos to:
9692

@@ -102,7 +98,7 @@ Kudos to:
10298
[An Adventure into CGO - Calling Go code with C](https://medium.com/@ben.mcclelland/an-adventure-into-cgo-calling-go-code-with-c-b20aa6637e75)
10399
- [Insu Jang](https://github.com/insujang) for
104100
[Implementing Kubernetes C++ Client Library using Go Client Library](https://insujang.github.io/2019-11-28/implementing-kubernetes-cpp-client-library)
105-
- Infinite number of StackOverflow contributors
101+
- An infinite number of StackOverflow contributors
106102

107103
## Discuss
108104

docs/SUPPORT.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ At the moment, this is single channel for all project matters.
1313

1414
## Raising Issues and Feature Requests
1515

16-
Use [GitHub Issues](https://github.com/testcontainers/testcontainers-c/issues).
16+
Use [GitHub Issues](https://github.com/testcontainers/testcontainers-native/issues).
1717
Note that it may take some time to get a response, thanks for your patience.
1818
Contributions are always welcome, see the [Contributor Guide](../CONTRIBUTING.md).
1919

2020
## Reporting Security Issues
2121

22-
You can submit any security issue or suspected vulnerability
23-
on [GitHub Security](https://github.com/testcontainers/testcontainers-c/security/advisories).
24-
Please do NOT use public GitHub Issues for reporting vulnerabilities.
25-
26-
Read More - [Security Policy](./SECURITY.md).
22+
See the [Security Policy](./SECURITY.md).
2723

2824
## Commercial Support and Customization
2925

docs/SUPPORT.md.orig

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Support for Testcontainers Native
2+
3+
[![Slack: testcontainers-native on slack.testcontainers.org](https://img.shields.io/badge/Slack-%23testcontainers%E2%80%94native-brightgreen?style=flat&logo=slack)](http://slack.testcontainers.org/)
4+
5+
Any bug reports, feature requests and comments are welcome!
6+
The project keeps evolving,
7+
and any feedback from end users and developers will be appreciated.
8+
9+
## Community Support Channels
10+
11+
Join the `#testcontainers-native` channel on the [Testcontainers Slack](http://slack.testcontainers.org/).
12+
At the moment, this is single channel for all project matters.
13+
14+
## Raising Issues and Feature Requests
15+
16+
Use [GitHub Issues](https://github.com/testcontainers/testcontainers-c/issues).
17+
Note that it may take some time to get a response, thanks for your patience.
18+
Contributions are always welcome, see the [Contributor Guide](../CONTRIBUTING.md).
19+
20+
## Reporting Security Issues
21+
22+
<<<<<<< HEAD
23+
You can submit any security issue or suspected vulnerability
24+
on [GitHub Security](https://github.com/testcontainers/testcontainers-c/security/advisories).
25+
Please do NOT use public GitHub Issues for reporting vulnerabilities.
26+
27+
Read More - [Security Policy](./SECURITY.md).
28+
=======
29+
See the [Security Policy](./SECURITY.md).
30+
>>>>>>> 99d7a95 (docs: Rephrase sentences, and improve grammar and spelling)
31+
32+
## Commercial Support and Customization
33+
34+
The creator of this project, Oleg Nenashev,
35+
is [available for consulting projects](https://oleg-nenashev.github.io/oleg-nenashev/consulting/) in the areas of developer tools,
36+
including Testcontainers Native and adapters for C/C++.
37+
Development of this project will continue regardless of commercial contracts,
38+
but of course your support can help the project to move forward.
39+
[GitHub Sponsorships](https://github.com/sponsors/oleg-nenashev) will be appreciated too.

docs/architecture/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Architecture
22

3-
!!! note
4-
This section is coming soon.
5-
All contributions are welcome, just submit a pull request!
3+
> [!NOTE]
4+
> This section is coming soon. All contributions are welcome, just submit a pull request!
65
76
## Build Process
87

docs/c/README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
You can use the `testcontainers-c` library with common C
44
unit testing frameworks and, soon, with package managers.
55

6-
!!! note
7-
This section is coming soon.
8-
All contributions are welcome, just submit a pull request!
6+
> [!NOTE]
7+
> This section is coming soon. All contributions are welcome, just submit a pull request!
98
109
## Installing the library
1110

@@ -39,9 +38,8 @@ CPMAddPackage(
3938

4039
## Using the Library
4140

42-
!!! note
43-
More frameworks will be documented soon.
44-
All contributions are welcome, just submit a pull request!
41+
> [!NOTE]
42+
> More frameworks will be documented soon. All contributions are welcome, just submit a pull request!
4543
4644
### CMake Tests (CTest)
4745

docs/cpp/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
At the moment, there is no dedicated C++ binding library/header,
44
but it is on [our roadmap](../../ROADMAP.md).
5-
Tou can use the `testcontainers-c` library directly
5+
You can use the `testcontainers-c` library directly
66
in all C++ testing frameworks.
77

88
## Google Test
@@ -29,10 +29,10 @@ protected:
2929
tc_with_exposed_tcp_port(requestId, 8080);
3030
tc_with_wait_for_http(requestId, 8080, WIREMOCK_ADMIN_MAPPING_ENDPOINT);
3131
tc_with_file(requestId, "test_data/hello.json", "/home/wiremock/mappings/hello.json");
32-
32+
3333
struct tc_run_container_return ret = tc_run_container(requestId);
3434
containerId = ret.r0;
35-
35+
3636
EXPECT_TRUE(ret.r1) << "Failed to run the container: " << ret.r2;
3737
};
3838

@@ -51,10 +51,10 @@ Then, you can define new tests by referring to the container via `containerId`.
5151
TEST_F(WireMockTestContainer, HelloWorld) {
5252
std::cout << "Sending HTTP request to the container\n";
5353
struct tc_send_http_get_return response = tc_send_http_get(containerId, 8080, "/hello");
54-
54+
5555
ASSERT_NE(response.r0, -1) << "Failed to send HTTP request: " << response.r2;
5656
ASSERT_EQ(response.r0, 200) << "Received wrong response code: " << response.r1 << response.r2;
57-
57+
5858
std::cout << "Server Response: HTTP-" << response.r0 << '\n' << response.r1 << '\n';
5959
}
6060
```

docs/getting-started.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Getting Started with Testcontainers for C/C++
22

3-
In this section, we will build a demo C application that uses Testcontainers
4-
in a simple C application
5-
for deploying a [WireMock](https://wiremock.org/) API server,
6-
sends a simple HTTP request to this service,
3+
In this section, we will build a simple demo C application that uses Testcontainers
4+
for deploying a [WireMock](https://wiremock.org/) API server.
5+
It sends a simple HTTP request to this service,
76
and verifies the response.
8-
We will not be using any C/C++ test framework for that.
7+
We will not be using any test framework for that.
98

10-
For test framework framework examples, see the [demos](../demo/README.md).
9+
For test framework examples, see the [demos](../demo/README.md).
1110

1211
## Build the Project
1312

flake.nix

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
description = "GameBoy++";
3+
4+
inputs = {
5+
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
6+
};
7+
8+
outputs = { self, nixpkgs }: let
9+
system = "x86_64-linux";
10+
pkgs = import nixpkgs { inherit system; };
11+
in {
12+
devShells.${system}.default = pkgs.mkShell {
13+
packages = with pkgs; [
14+
go
15+
cmake
16+
ninja
17+
gcc15
18+
stdenv.cc.cc
19+
mold
20+
gdb
21+
llvmPackages_20.clang-tools
22+
python314
23+
pkg-config
24+
pre-commit
25+
];
26+
};
27+
};
28+
}

0 commit comments

Comments
 (0)