Skip to content

Commit a0da507

Browse files
committed
Merge branch 'master' of https://github.com/reactjs/React.NET
2 parents a4ca99c + 64137a8 commit a0da507

File tree

7 files changed

+11
-23
lines changed

7 files changed

+11
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ReactJS.NET is a library that makes it easier to use Facebook's
66

77
Features
88
========
9-
* On-the-fly [JSX to JavaScript compilation](http://reactjs.net/getting-started/getting-started.html)
9+
* On-the-fly [JSX to JavaScript compilation](http://reactjs.net/getting-started/download.html)
1010
* JSX to JavaScript compilation via popular minification/combination
1111
libraries:
1212
* [ASP.NET Bundling and Minification](http://reactjs.net/guides/weboptimizer.html)

src/Cassette.React/Cassette.React.nutrans

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1212
xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
1313
<metadata>
1414
<title xdt:Transform="Insert">ReactJS.NET - JSX for Cassette</title>
15-
<description xdt:Transform="Insert">
16-
Allows you to compile JSX to JavaScript using Cassette
17-
</description>
15+
<description xdt:Transform="Insert">Allows you to compile JSX to JavaScript using Cassette</description>
1816
<tags xdt:Transform="Replace">asp.net mvc asp jquery javascript js react facebook reactjs cassette</tags>
1917
</metadata>
2018

src/React.Web.Mvc3/React.Web.Mvc3.nutrans

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ of patent rights can be found in the PATENTS file in the same directory.
1212
xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
1313
<metadata>
1414
<title xdt:Transform="Insert">ReactJS.NET (MVC 3)</title>
15-
<description xdt:Transform="Insert">
16-
ReactJS tools for ASP.NET MVC 3. Please refer to project site (http://reactjs.net/)
17-
for more details, usage examples and sample code.
18-
</description>
15+
<description xdt:Transform="Insert">ReactJS tools for ASP.NET MVC 3.
16+
Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.</description>
1917
</metadata>
2018
<files xdt:Transform="Insert">
2119
<file src="Content\Views\web.config.transform" target="Content\Views" />

src/React.Web.Mvc4/React.Web.Mvc4.nutrans

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ of patent rights can be found in the PATENTS file in the same directory.
1212
xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
1313
<metadata>
1414
<title xdt:Transform="Insert">ReactJS.NET (MVC 4 and 5)</title>
15-
<description xdt:Transform="Insert">
16-
ReactJS tools for ASP.NET MVC 4 and 5. Please refer to project site (http://reactjs.net/)
17-
for more details, usage examples and sample code.
18-
</description>
15+
<description xdt:Transform="Insert">ReactJS tools for ASP.NET MVC 4 and 5.
16+
Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.</description>
1917
</metadata>
2018
<files xdt:Transform="Insert">
2119
<file src="Content\Views\web.config.transform" target="Content\Views" />

src/React.Web/React.Web.nutrans

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ of patent rights can be found in the PATENTS file in the same directory.
1212
xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
1313
<metadata>
1414
<title xdt:Transform="Insert">ReactJS.NET for ASP.NET</title>
15-
<description xdt:Transform="Insert">
16-
ReactJS tools for ASP.NET. If using ASP.NET MVC, also install React.Web.Mvc4. Please refer
17-
to project site (http://reactjs.net/) for more details, usage examples and sample code.
15+
<description xdt:Transform="Insert">ReactJS tools for ASP.NET. If using ASP.NET MVC, also install React.Web.Mvc4.
16+
Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.
1817
</description>
1918
</metadata>
2019
<files xdt:Transform="Insert">

src/React/React.nutrans

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1313
<metadata>
1414
<id xdt:Transform="Replace">React.Core</id>
1515
<title xdt:Transform="Insert">ReactJS.NET Core</title>
16-
<description xdt:Transform="Insert">
17-
ReactJS tools for .NET. Important: This package does not do much on its own; you probably
18-
want an integration package (like React.Web.Mvc4) as well. Please refer to project site
19-
(http://reactjs.net/) for more details, usage examples and sample code.
20-
</description>
16+
<description xdt:Transform="Insert">ReactJS tools for .NET.
17+
Important: This package does not do much on its own; you probably want an integration package (like React.Web.Mvc4) as well. Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.</description>
2118
</metadata>
2219
</package>

src/System.Web.Optimization.React/System.Web.Optimization.React.nutrans

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1212
xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
1313
<metadata>
1414
<title xdt:Transform="Insert">ReactJS.NET - JSX for ASP.NET Web Optimization Framework</title>
15-
<description xdt:Transform="Insert">
16-
Allows you to compile JSX to JavaScript in the ASP.NET Web Optimization Framework.
17-
</description>
15+
<description xdt:Transform="Insert">Allows you to compile JSX to JavaScript in the ASP.NET Web Optimization Framework.</description>
1816
</metadata>
1917
<files xdt:Transform="Insert">
2018
<file src="readme.txt" target="" />

0 commit comments

Comments
 (0)