diff --git a/Build.html b/Build.html index 8f4c8055..6d34ab6d 100644 --- a/Build.html +++ b/Build.html @@ -87,7 +87,7 @@ may fail to compile or provide correct IntelliSense.

FAKE

The fully automated build including unit tests, documentation and api -reference, NuGet and Zip packages is using FAKE.

+reference, NuGet and Zip packages is using FAKE.

FAKE itself is not included in the repository but it will download and bootstrap itself automatically when build.cmd is run the first time. Note that this step is not required when using Visual Studio or msbuild directly.

@@ -142,10 +142,10 @@ is not required when using Visual Studio or msbuild direct

If the build or tests fail claiming that FSharp.Core was not be found, see -fsharp.org or install the +fsharp.org or install the Visual F# 3.0 Tools directly.

Dependencies

-

We manage NuGet and other dependencies with Paket. +

We manage NuGet and other dependencies with Paket. You do not normally have to do anything with Paket as it is integrated into our FAKE build tools, unless you want to actively manage the dependencies.

You can bootstrap or update Paket by calling tools/paket/paket.bootstrapper.exe. @@ -158,8 +158,8 @@ will update all packages within the defined constraints. Have a look at the Pake website for more commands and details.

Documentation

This website and documentation is automatically generated from of a set of -CommonMark structured files in doc/content/ using -FSharp.Formatting. +CommonMark structured files in doc/content/ using +FSharp.Formatting. The final documentation can be built by calling build.sh Docs.

However, for editing and previewing the docs on your local machine it is more convenient to run build.sh DocsWatch in a separate console instead, which diff --git a/Contributing.html b/Contributing.html index ed895d43..abd5202a 100644 --- a/Contributing.html +++ b/Contributing.html @@ -90,7 +90,7 @@ We prefer a couple small pull requests over a single large one that targets mult

Code Reformatting and Refactoring:
Please avoid starting with a major refactoring or any code reformatting without talking to us first.

Breaking Compatibility:
-We try to follow semantic versioning, meaning that we cannot break compatibility until the next major version. Since Numerics intentionally permits straight access to raw algorithms, a lot of member declarations are public and thus cannot be modified. Instead of breaking compatibility, it is often possible to create a new better version side by side though and mark the original implementation as obsolete and scheduled for removal on the next major version.

+We try to follow semantic versioning, meaning that we cannot break compatibility until the next major version. Since Numerics intentionally permits straight access to raw algorithms, a lot of member declarations are public and thus cannot be modified. Instead of breaking compatibility, it is often possible to create a new better version side by side though and mark the original implementation as obsolete and scheduled for removal on the next major version.

Merges:
Please avoid merging mainline back into your pull request branch. If you need to leverage some changes recently added to mainline, consider to rebase instead. In other words, please make sure your commits sit directly on top of a recent mainline master.

diff --git a/Contributors.html b/Contributors.html index bcb794ae..ce90273b 100644 --- a/Contributors.html +++ b/Contributors.html @@ -62,14 +62,14 @@

Thanks for all the contributions!

Maintainers

Code Contributors

Essentially the output of git shortlog -sn in original order.
Feel free to add a link to your personal site/blog and/or twitter handle.