Merge branch 'master' into dev

README.md

@@ -1,34 +1,23 @@
-# ABP
+# ABP Framework
 
 ![build and test](https://github.com/abpframework/abp/workflows/build%20and%20test/badge.svg)
 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core)
 [![MyGet (with prereleases)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds)
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core)
 
-This project is the next generation of the [ASP.NET Boilerplate](https://aspnetboilerplate.com/) web application framework. See [the announcement](https://blog.abp.io/abp/Abp-vNext-Announcement).
+ABP is an **open source application framework** focused on ASP.NET Core based web application development, but also supports developing other type of applications.
 
-See the official [web site (abp.io)](https://abp.io/) for more information.
+## Links
 
-### Documentation
+* <a href="https://abp.io/" target="_blank">Official Web Site</a>
+  * <a href="https://abp.io/get-started" target="_blank">Get Started</a>
+  * <a href="https://abp.io/features" target="_blank">Features</a>
+  * <a href="https://docs.abp.io/" target="_blank">Documentation</a>
+  * <a href="https://docs.abp.io/en/abp/latest/Samples/Index" target="_blank">Samples</a>
+  * <a href="https://blog.abp.io/" target="_blank">Blog</a>
+* <a href="https://stackoverflow.com/questions/tagged/abp" target="_blank">Stack overflow</a>
+* <a href="https://twitter.com/abpframework" target="_blank">Twitter</a>
 
-See the <a href="https://docs.abp.io/" target="_blank">documentation</a>.
+## Contribution
-
-### Development
-
-#### Pre Requirements
-
-- Visual Studio 2019 16.4.0+
-
-#### Framework
-
-Framework solution is located under the `framework` folder. It has no external dependency.
-
-#### Modules/Templates
-
-[Modules](modules/) and [Templates](templates/) have their own solutions and have **local references** to the framework and each other.
-
-Visual Studio can not work properly with the local references out of the solution folder. When you open a module/sample solution in the Visual Studio, you may get some errors related to the dependencies. In this case, run the `dotnet restore` on the command prompt for the related solution's folder. You need to run it after you first open the solution or change a dependency.
-
-### Contribution
 
 ABP is an open source platform. Check [the contribution guide](docs/en/Contribution/Index.md) if you want to contribute to the project.

docs/en/Index.md

@@ -1,6 +1,6 @@
 # ABP Documentation
 
-ABP is an **open source application framework** focused on ASP.NET Core based web application development, but also supports developing other types of applications.
+ABP is an **open source application framework** focused on ASP.NET Core based web application development, but also supports developing other type of applications.
 
 Explore the left navigation menu to deep dive in the documentation.
 
@@ -16,6 +16,10 @@ If you want to start from scratch (with an empty project) then manually install
 * [Console Application](Getting-Started-Console-Application.md)
 * [ASP.NET Core Web Application](Getting-Started-AspNetCore-Application.md)
 
+## Packages
+
+ABP Framework is distributed as NuGet and NPM packages. See [this page](http://abp.io/packages) for the complete list of the packages.
+
 ## Source Code
 
 ABP is hosted on GitHub. See [the source code](https://github.com/abpframework/abp).