From 86f8fc310718d31a4e5802f4b49d4003e9b98e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20V=C3=A1radi?= Date: Mon, 22 May 2017 17:17:44 +0200 Subject: [PATCH 1/3] Increase redis-provider version in the sample Resolves #161. --- 2.0/docs/redis/package.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.0/docs/redis/package.md b/2.0/docs/redis/package.md index ccb5cac4..88287f68 100644 --- a/2.0/docs/redis/package.md +++ b/2.0/docs/redis/package.md @@ -13,7 +13,7 @@ let package = Package( name: "Project", dependencies: [ .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2), - .Package(url: "https://github.com/vapor/redis-provider.git", majorVersion: 1) + .Package(url: "https://github.com/vapor/redis-provider.git", majorVersion: 2) ], exclude: [ ... ] ) @@ -40,4 +40,4 @@ let package = Package( ) ``` -Use `import Redis`. \ No newline at end of file +Use `import Redis`. From 7846593b720001a00b263ea0d57c9361ea97472d Mon Sep 17 00:00:00 2001 From: Tim <0xtimc@gmail.com> Date: Mon, 22 May 2017 17:25:32 +0100 Subject: [PATCH 2/3] Add markdown-provider to list of providers --- 2.0/docs/index.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/2.0/docs/index.md b/2.0/docs/index.md index 653bac5e..7828ac8c 100644 --- a/2.0/docs/index.md +++ b/2.0/docs/index.md @@ -25,7 +25,7 @@ Our small team works hard to make Vapor awesome (and free). Support the framewor Here are some other great places to find information about Vapor. -### API +### API Auto-generated API documentation is located at [api.vapor.codes](http://api.vapor.codes). @@ -45,19 +45,19 @@ To view open bug reports and feature requests, or to create one, visit the [issu ## Packages -Vapor is a modular framework built for a modular language. Code is split up into modules which are grouped to form packages. Packages can be added to your project by adding the package's Git url to your `Package.swift` file. Once a package is included, all of its modules will be available to `import`. You can read more about packages and modules in the Swift Package Manager [conceptual overview](https://swift.org/package-manager/). +Vapor is a modular framework built for a modular language. Code is split up into modules which are grouped to form packages. Packages can be added to your project by adding the package's Git url to your `Package.swift` file. Once a package is included, all of its modules will be available to `import`. You can read more about packages and modules in the Swift Package Manager [conceptual overview](https://swift.org/package-manager/). Below is a list of packages and modules that come with or can be used by Vapor projects. Packages will have a link to their respective GitHub page. ### Core -Core packages are maintained by the Vapor team. +Core packages are maintained by the Vapor team. #### Included The following packages are included with Vapor by default. -!!! tip +!!! tip These packages can also be used individually - [Vapor](https://github.com/vapor/vapor): Swift's most used web framework. @@ -124,6 +124,7 @@ These are packages maintained by community members that work great with Vapor. - [VaporForms](https://github.com/bygri/vapor-forms): Brings simple, dynamic and re-usable web form handling to Vapor. - [Jobs](https://github.com/BrettRToomey/Jobs): A minimalistic job/background-task system for Swift. - [Heimdall](https://github.com/himani93/heimdall): An easy to use HTTP request logger. +- [MarkdownProvider](https://github.com/vapor-community/markdown-provider) - Easily use Markdown from Leaf. ### Providers From 988ce558b85def329bbcd5736f3c5a20cdf018cb Mon Sep 17 00:00:00 2001 From: Tanner Date: Mon, 22 May 2017 17:48:03 +0100 Subject: [PATCH 3/3] Update package.md --- 2.0/docs/redis/package.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.0/docs/redis/package.md b/2.0/docs/redis/package.md index ccb5cac4..88287f68 100644 --- a/2.0/docs/redis/package.md +++ b/2.0/docs/redis/package.md @@ -13,7 +13,7 @@ let package = Package( name: "Project", dependencies: [ .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2), - .Package(url: "https://github.com/vapor/redis-provider.git", majorVersion: 1) + .Package(url: "https://github.com/vapor/redis-provider.git", majorVersion: 2) ], exclude: [ ... ] ) @@ -40,4 +40,4 @@ let package = Package( ) ``` -Use `import Redis`. \ No newline at end of file +Use `import Redis`.