From d7019afabfc01e10b5b132993399e52f1a164c10 Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Fri, 2 Oct 2015 07:37:22 -0700 Subject: [PATCH 1/5] Fixed typo --- aspnet/security/accconfirm.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aspnet/security/accconfirm.rst b/aspnet/security/accconfirm.rst index c9ea9fc2ab..b314f74815 100644 --- a/aspnet/security/accconfirm.rst +++ b/aspnet/security/accconfirm.rst @@ -10,7 +10,7 @@ In this article: - `Require SSL`_ - `Require email confirmation`_ - `Configure email provider`_ - - `Enable account confirmation and password recover`_ + - `Enable account confirmation and password recovery`_ - `Register, confirm email, and reset password`_ - `Require email confirmation before login`_ - `Combine social and local login accounts`_ @@ -141,7 +141,7 @@ This tutorial shows how to add email notification through `SendGrid Date: Thu, 8 Oct 2015 06:24:28 -0700 Subject: [PATCH 2/5] Update stub-notice.txt --- common/stub-notice.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/stub-notice.txt b/common/stub-notice.txt index b7be38d40a..8538e9dc4e 100644 --- a/common/stub-notice.txt +++ b/common/stub-notice.txt @@ -1,6 +1,8 @@ .. note:: - We are currently working on this topic. We welcome your input to help shape the scope and approach. You can track the status and provide input on this issue_ at GitHub. + We are currently working on this topic. -If you would like to review early drafts and outlines of this topic, please leave a note with your contact information in the issue_. + We welcome your input to help shape the scope and approach. You can track the status and provide input on this issue_ at GitHub. -Learn more about how you can `contribute `_ on GitHub. + If you would like to review early drafts and outlines of this topic, please leave a note with your contact information in the issue_. + + Learn more about how you can `contribute `_ on GitHub. From f5b7bfc973719ed9a51bb20dd57efe2b87bb3f60 Mon Sep 17 00:00:00 2001 From: danroth27 Date: Sat, 10 Oct 2015 11:09:35 -0700 Subject: [PATCH 3/5] Revert "Update installation instructions for beta8" This reverts commit 8974ec1af132591124a0c0abfab54ab1d6e5c0b4. --- .../getting-started/installing-on-linux.rst | 19 ++++++++++++++++--- aspnet/getting-started/installing-on-mac.rst | 11 +++-------- .../getting-started/installing-on-windows.rst | 4 ++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/aspnet/getting-started/installing-on-linux.rst b/aspnet/getting-started/installing-on-linux.rst index eec1e58515..dfbcf1d5c4 100644 --- a/aspnet/getting-started/installing-on-linux.rst +++ b/aspnet/getting-started/installing-on-linux.rst @@ -39,7 +39,7 @@ The .NET Execution Environment (DNX) is used to build and run .NET projects. Use 1. Install the DNX prerequisites:: - sudo apt-get install libunwind8 gettext libssl-dev libcurl3-dev zlib1g libicu-dev + sudo apt-get install libunwind8 gettext libssl-dev libcurl3-dev zlib1g 2. Use DNVM to install DNX for .NET Core:: @@ -105,9 +105,22 @@ Once this step is complete you should be able to run ``dnvm`` and see some help Install the .NET Execution Environment (DNX) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The .NET Execution Environment (DNX) is used to build and run .NET projects. Use DNVM to install DNX for `Mono `_ (see :doc:`choosing-the-right-dotnet`). +The .NET Execution Environment (DNX) is used to build and run .NET projects. Use DNVM to install DNX for `Mono `_ or .NET Core (see :doc:`choosing-the-right-dotnet`). -.. note:: DNX support for .NET Core is not available for CentOS, Fedora and derivative in this release, but will be enabled in a future release. +**To install DNX for .NET Core:** + +1. Install the DNX prerequisites:: + + sudo yum -y install epel-release + sudo yum -y install libunwind gettext libcurl-devel openssl-devel zlib + +.. note:: This will add the epel-release repository to your repo list. + +2. Use DNVM to install DNX for .NET Core:: + + dnvm upgrade -r coreclr + +.. note:: .NET Core on Linux is still in early preview. Please refer to the latest `Release Notes `__ for known issues and limitations. **To install DNX for Mono:** diff --git a/aspnet/getting-started/installing-on-mac.rst b/aspnet/getting-started/installing-on-mac.rst index 88005ca1c0..d419be6368 100644 --- a/aspnet/getting-started/installing-on-mac.rst +++ b/aspnet/getting-started/installing-on-mac.rst @@ -6,8 +6,8 @@ By `Steve Smith`_, `Daniel Roth`_ ASP.NET 5 runs on the .NET Execution Environment (DNX), which is available on multiple platforms, including OS X. This article describes how to install DNX, and therefore ASP.NET 5, on OS X using .NET Core and Mono. In this article: - - `Install the .NET Version Manager (DNVM)`_ - - `Install the .NET Execution Environment (DNX)`_ + - `Install the .NET Version Manager (DNVM)`_ + - `Install the .NET Execution Environment (DNX)`_ Install the .NET Version Manager (DNVM) --------------------------------------- @@ -27,12 +27,7 @@ The .NET Execution Environment (DNX) is used to build and run .NET projects. Use **To install DNX for .NET Core:** -1. Install the DNX prerequisites using `Homebrew `__:: - - brew update - brew install icu4c - -2. Use DNVM to install DNX for .NET Core:: +1. Use DNVM to install DNX for .NET Core:: dnvm upgrade -r coreclr diff --git a/aspnet/getting-started/installing-on-windows.rst b/aspnet/getting-started/installing-on-windows.rst index de6ed2879f..c9f51359c1 100644 --- a/aspnet/getting-started/installing-on-windows.rst +++ b/aspnet/getting-started/installing-on-windows.rst @@ -15,13 +15,13 @@ Install ASP.NET with Visual Studio The easiest way to get started building applications with ASP.NET 5 is to install the latest version of Visual Studio 2015 (including the freely available Community edition). Visual Studio is an Integrated Development Environment (IDE), which means it's not just an editor, but also has many of the tools you need to build applications, in this case ASP.NET 5 web applications. 1. Install `Visual Studio 2015 `__ -2. Install the latest `ASP.NET 5 preview (Beta8) `_ +2. Install the latest `ASP.NET 5 preview (Beta7) `_ When installing Visual Studio 2015, you'll want to be sure to specify that you want to install the Microsoft Web Developer Tools. .. image:: installing-on-windows/_static/web-dev-tools.png -Once Visual Studio is installed, follow the instructions on the Download Center page for installing the latest `ASP.NET 5 preview (Beta8)`_. +Once Visual Studio is installed, follow the instructions on the Download Center page for installing the latest `ASP.NET 5 preview (Beta7)`_. To enable a full command-line experience after installing Visual Studio, open a **Developer Command Prompt for VS2015** and run the following commands:: From 1375bd33d2f65accf12ba608272d53dfba00bc0c Mon Sep 17 00:00:00 2001 From: Henrik Frystyk Nielsen Date: Sat, 10 Oct 2015 16:48:29 -0700 Subject: [PATCH 4/5] Added a node for sending webhooks --- webhooks/index.rst | 2 ++ webhooks/overview.rst | 2 +- webhooks/receiving/index.rst | 4 ++-- webhooks/sending/index.rst | 10 ++++++++++ webhooks/sending/senders.rst | 5 +++++ webhooks/source.rst | 26 ++++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 webhooks/sending/index.rst create mode 100644 webhooks/sending/senders.rst create mode 100644 webhooks/source.rst diff --git a/webhooks/index.rst b/webhooks/index.rst index e93726fdf5..cd06337db5 100644 --- a/webhooks/index.rst +++ b/webhooks/index.rst @@ -14,7 +14,9 @@ ASP.NET WebHooks Documentation :titlesonly: overview + source receiving/index + sending/index diagnostics/index .. include:: /../common/contribute.txt diff --git a/webhooks/overview.rst b/webhooks/overview.rst index 522bff92da..a06dad6eb4 100644 --- a/webhooks/overview.rst +++ b/webhooks/overview.rst @@ -33,7 +33,7 @@ If you only need to receive WebHooks from other services then you can use just the receiver part; if you only want to expose WebHooks for others to consume, then you can do just that. -The code targets ASP.NET Web API 2 and ASP.NET MVC 5 and is available as `OSS on GitHub `_. +The code targets ASP.NET Web API 2 and ASP.NET MVC 5 and is available as `OSS on GitHub `_. WebHooks Overview ----------------- diff --git a/webhooks/receiving/index.rst b/webhooks/receiving/index.rst index b11809c3af..cf5dfebbac 100644 --- a/webhooks/receiving/index.rst +++ b/webhooks/receiving/index.rst @@ -1,5 +1,5 @@ -Receivers ---------- +Receiving WebHooks +------------------ .. include:: /../common/stub-overview.txt diff --git a/webhooks/sending/index.rst b/webhooks/sending/index.rst new file mode 100644 index 0000000000..b47f1386b4 --- /dev/null +++ b/webhooks/sending/index.rst @@ -0,0 +1,10 @@ +Sending WebHooks +---------------- + +.. include:: /../common/stub-overview.txt + +.. toctree:: + :titlesonly: + + senders + diff --git a/webhooks/sending/senders.rst b/webhooks/sending/senders.rst new file mode 100644 index 0000000000..7bc7fc4115 --- /dev/null +++ b/webhooks/sending/senders.rst @@ -0,0 +1,5 @@ +WebHook Senders +=============== + +Please see the blog `Sending WebHooks with ASP.NET WebHooks Preview +`_ for more details. diff --git a/webhooks/source.rst b/webhooks/source.rst new file mode 100644 index 0000000000..5cfab7f5b6 --- /dev/null +++ b/webhooks/source.rst @@ -0,0 +1,26 @@ +Source Code and Nugets +====================== + +Microsoft ASP.NET WebHooks is part of the Microsoft ASP.NET family of modules and is hosted as an +`Open Source Project on GitHub `_. This means that we accept +contributions, but please look at the `Contribution Guidelines `_ +before submitting a pull request. + +This online documentation which you are reading now is also hosted as `Open Source on GitHub `_ +and also accepts contributions. + +Nuget Packages +-------------- + +Microsoft ASP.NET WebHooks is also available as preview Nuget packages which means that you have to select the Preview +flag in Visual Studio in order to see them. + +The `Nuget packages `_ are devided into three parts: + +* `Common `_: A common package that is shared between senders and receivers. + +* `Sender `_ A set of packages supporting sending your own WebHooks to others. + The functionality for sending WebHooks is described in more detail in :doc:`sending/index`. + +* `Receivers `_ A set of packages supporting receiving WebHooks from others. + The functionality for receiving WebHooks is described in more detail in :doc:`receiving/index`. From 92d33c842489717ff215e73e29b5f58bc9ff3fa9 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 12 Oct 2015 15:32:50 -0700 Subject: [PATCH 5/5] recommend python version 3.4 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae2010e22a..7045c03233 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ The documentation is built using [Sphinx](http://sphinx-doc.org) and [reStructur Once you have cloned the Docs to your local machine, the following instructions will walk you through installing the tools necessary to build and test. -1. [Download python](https://www.python.org/downloads/) version 2.7.10 or higher. +1. [Download python](https://www.python.org/downloads/) version 2.7.10 or higher. (Version 3.4 is recommended.) 2. If you are installing on Windows, add both the Python install directory and the Python scripts directory to your `PATH` environment variable. For example, if you install Python into the c:\python34 directory, you would add `c:\python34;c:\python34\scripts` to your `PATH` environment variable.