Skip to content

Commit 612ed07

Browse files
authored
Merge branch 'main' into localden/client-security
2 parents a3769f6 + 09998fe commit 612ed07

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

MAINTAINERS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ This document lists current maintainers and working groups in the Model Context
7777
- [Tadas Antanavicius](https://github.com/tadasant) (Registry, Reference Servers)
7878
- [Shaun Smith](https://github.com/evalstate) (Reference Servers)
7979
- [Jonathan Hefner](https://github.com/jonathanhefner) (Reference Servers)
80+
- [Adam Jones](https://github.com/domdomegg) (Registry)
8081

8182
## Community Moderators
8283

docs/community/sep-guidelines.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Consider proposing a SEP if your change involves any of the following:
3131
There are three kinds of SEP:
3232

3333
1. **Standards Track** SEP describes a new feature or implementation for the Model Context Protocol. It may also describe an interoperability standard that will be supported outside the core protocol specification.
34-
2. **Informational** SEP describes a Model Context Protocol design issue, or provides general guidelines or information to the MCP community, but does not propose a new feature. Informational SEPs do not necessarily represent a MCP community consensus or recommendation.
34+
2. **Informational** SEP describes a Model Context Protocol design issue, or provides general guidelines or information to the MCP community, but does not propose a new feature. Informational SEPs do not necessarily represent an MCP community consensus or recommendation.
3535
3. **Process** SEP describes a process surrounding MCP, or proposes a change to (or an event in) a process. Process SEPs are like Standards Track SEPs but apply to areas other than the MCP protocol itself.
3636

3737
## Submitting a SEP

docs/quickstart/client.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ static (string command, string[] arguments) GetCommandAndArguments(string[] args
15371537
}
15381538
```
15391539

1540-
This creates a MCP client that will connect to a server that is provided as a command line argument. It then lists the available tools from the connected server.
1540+
This creates an MCP client that will connect to a server that is provided as a command line argument. It then lists the available tools from the connected server.
15411541

15421542
### Query processing logic
15431543

docs/quickstart/server.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ Save the file, and restart **Claude for Desktop**.
10761076

10771077
## Testing your server with Java client
10781078

1079-
### Create a MCP Client manually
1079+
### Create an MCP Client manually
10801080

10811081
Use the `McpClient` to connect to the server:
10821082

@@ -1127,7 +1127,7 @@ For more information, see the [MCP Client Boot Starters](https://docs.spring.io/
11271127

11281128
## More Java MCP Server examples
11291129

1130-
The [starter-webflux-server](https://github.com/spring-projects/spring-ai-examples/tree/main/model-context-protocol/weather/starter-webflux-server) demonstrates how to create a MCP server using SSE transport.
1130+
The [starter-webflux-server](https://github.com/spring-projects/spring-ai-examples/tree/main/model-context-protocol/weather/starter-webflux-server) demonstrates how to create an MCP server using SSE transport.
11311131
It showcases how to define and register MCP Tools, Resources, and Prompts, using the Spring Boot's auto-configuration capabilities.
11321132

11331133
</Tab>

docs/specification/2025-06-18/basic/authorization.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ registered client before forwarding to third-party authorization servers (which
354354

355355
### Access Token Privilege Restriction
356356

357-
An attacker can gain unauthorized access or otherwise compromise a MCP server if the server accepts tokens issued for other resources.
357+
An attacker can gain unauthorized access or otherwise compromise an MCP server if the server accepts tokens issued for other resources.
358358

359359
This vulnerability has two critical dimensions:
360360

docs/specification/draft/basic/authorization.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ registered client before forwarding to third-party authorization servers (which
380380

381381
### Access Token Privilege Restriction
382382

383-
An attacker can gain unauthorized access or otherwise compromise a MCP server if the server accepts tokens issued for other resources.
383+
An attacker can gain unauthorized access or otherwise compromise an MCP server if the server accepts tokens issued for other resources.
384384

385385
This vulnerability has two critical dimensions:
386386

0 commit comments

Comments
 (0)