Skip to content

Installation instructions #7858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacker merged 12 commits into from
Oct 4, 2016
Merged

Installation instructions #7858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ab9e5d2
more installation instructions
lacker Oct 4, 2016
93081df
cdn instructions
lacker Oct 4, 2016
9ebbb7d
fix wording
lacker Oct 4, 2016
4294b2f
create-react-app -> Create React App
lacker Oct 4, 2016
652dd15
new -> single page
lacker Oct 4, 2016
53b7d82
fix npm install instructions
lacker Oct 4, 2016
d6faaba
break out single html file into its own file
lacker Oct 4, 2016
a3f2de1
merge with Dan's massive docs reorg PR
lacker Oct 4, 2016
7993837
another sentence
lacker Oct 4, 2016
a46ab95
use babel standalone
lacker Oct 4, 2016
057b036
enabling es6 and jsx
lacker Oct 4, 2016
68566e6
remove old getting started
lacker Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docs/code
docs/_site
docs/.sass-cache
docs/js/*
docs/downloads
docs/downloads/*.zip
docs/vendor/bundle
examples/shared/*.js
examples/**/bundle.js
Expand Down
2 changes: 0 additions & 2 deletions docs/_data/nav_docs_old.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
title: React (Virtual) DOM Terminology
- title: Old Quick Start
items:
- id: getting-started
title: Getting Started
- id: tutorial
title: Tutorial
- id: thinking-in-react
Expand Down
6 changes: 5 additions & 1 deletion docs/_layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
</a>
<ul class="nav-site nav-site-internal">
<li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
<li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
<li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
<li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
<li>
Expand All @@ -75,8 +74,13 @@
</div>

<div class="buttons-unit">
<<<<<<< HEAD
<a href="/react/docs/getting-started.html" class="button">Get Started</a>
<a href="/react/docs/tutorial.html" class="button">Take the Tutorial</a>
Copy link
Collaborator

@gaearon gaearon Oct 4, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a nit from a non-native speaker, but this:

screen shot 2016-10-04 at 13 34 00

Reminds me of this.

I honestly wouldn’t know which to choose. If I’m new to React, should I “Get Started” or “Take the Tutorial”? Does taking a tutorial presume I already “got started”? Does “getting started” presume I already know things in the tutorial?

=======
<a href="/react/docs/installation.html" class="button">Get Started</a>
<a href="/react/downloads.html" class="button">Download React v{{site.react_version}}</a>
>>>>>>> 46983cf36c2e2b7e5eeae4f76273cd0daf299b7e
</div>
</div>
</div>
Expand Down
123 changes: 0 additions & 123 deletions docs/docs-old/getting-started.it-IT.md
View file
Open in desktop

This file was deleted.

121 changes: 0 additions & 121 deletions docs/docs-old/getting-started.ja-JP.md
View file
Open in desktop

This file was deleted.

Loading