From ce09604b179315d86cf5d979b07a05f314e28ade Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 11 Apr 2021 12:14:26 +0200 Subject: [PATCH 1/2] Improve manifest documentation links --- docs/README.md | 2 +- docs/maintainers/control-files.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 5bce2d1631e2ba..2e48b4d733fbeb 100644 --- a/docs/README.md +++ b/docs/README.md @@ -17,7 +17,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Integration with build systems](users/integration.md) - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) -- [Manifests](users/manifests.md) +- [Manifest Mode](users/manifests.md) - [Binary Caching](users/binarycaching.md) - [Versioning](users/versioning.md) - [Usage with Android](users/android.md) diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index 4951a8888ba3a9..b4bb1c84374d00 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -1,7 +1,7 @@ # CONTROL files **CONTROL files are retained for backwards compatibility with earlier versions of vcpkg; -all new features are added only to [vcpkg.json](manifests.md), and we recommend using vcpkg.json for any newly authored port.** +all new features are added only to [vcpkg.json manifest files](manifest-files.md), and we recommend using vcpkg.json for any newly authored port.** The `CONTROL` file contains metadata about the port. The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here. From 6dec0f70310582e7435dbdebe8752e70b846b2f0 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 23 Apr 2021 10:39:06 -0700 Subject: [PATCH 2/2] Update control-files.md --- docs/maintainers/control-files.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index db3fc3fbf94e36..1ea7a9fefe708f 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -1,7 +1,7 @@ # CONTROL files **CONTROL files are retained for backwards compatibility with earlier versions of vcpkg; -all new features are added only to [vcpkg.json manifest files](manifest-files.md), and we recommend using vcpkg.json for any newly authored port.** +all new features are added only to [vcpkg.json manifest files](manifest-files.md), and we recommend using vcpkg.json for any newly authored port. Use `./vcpkg format-manifest ports//CONTROL` to convert an existing CONTROL file to a vcpkg.json file.** The `CONTROL` file contains metadata about the port. The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here.