diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-02-12 10:21:20 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2017-02-12 10:33:50 +0100 |
| commit | 771a802c374ebe7b2931ba6cf8ffa3b7bf0e92e0 (patch) | |
| tree | 4b89b229a440a71ddcd394a5a14b91980918de5e /guides/source | |
| parent | 4fed08fa787a316fa51f14baca9eae11913f5050 (diff) | |
| download | rails-771a802c374ebe7b2931ba6cf8ffa3b7bf0e92e0.tar.gz rails-771a802c374ebe7b2931ba6cf8ffa3b7bf0e92e0.tar.bz2 rails-771a802c374ebe7b2931ba6cf8ffa3b7bf0e92e0.zip | |
refactors and fixes in guides generation [ci skip]
This commit is not precisely atomic, but the changes have evolved, summary:
* The ENV-based interface has been moved upwards, the generator has now a conventional
initializer.
* RAILS_VERSION is now assumed to be a Git tag. A blank RAILS_VERSION means edge guides.
* In consequence, the EDGE env variable is gone.
* The "local" version is also gone, the current SHA1 is computed for edge guides.
* Assumes guides are generated from a repo checkout (time ago users could
generate them from gems.)
* The WARNINGS flag is gone in consequence, you cannot disable warnings.
* The `api_link` Markdown helper is fixed.
* Docs about usage have one single place: rake guides:help.
* Links in guides have been revised.
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/_welcome.html.erb | 4 | ||||
| -rw-r--r-- | guides/source/kindle/rails_guides.opf.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/_welcome.html.erb b/guides/source/_welcome.html.erb index f50bcddbe7..5bd1ea4d22 100644 --- a/guides/source/_welcome.html.erb +++ b/guides/source/_welcome.html.erb @@ -1,8 +1,8 @@ -<h2>Ruby on Rails Guides (<%= @edge ? @version[0, 7] : @version %>)</h2> +<h2>Ruby on Rails Guides (<%= @edge ? @edge[0, 7] : @version %>)</h2> <% if @edge %> <p> - These are <b>Edge Guides</b>, based on the current <a href="https://github.com/rails/rails/tree/<%= @version %>">master</a> branch. + These are <b>Edge Guides</b>, based on <a href="https://github.com/rails/rails/tree/<%= @edge %>">master@<%= @edge[0, 7] %></a>. </p> <p> If you are looking for the ones for the stable version, please check diff --git a/guides/source/kindle/rails_guides.opf.erb b/guides/source/kindle/rails_guides.opf.erb index 547abcbc19..63eeb007d7 100644 --- a/guides/source/kindle/rails_guides.opf.erb +++ b/guides/source/kindle/rails_guides.opf.erb @@ -5,7 +5,7 @@ <meta name="cover" content="cover" /> <dc-metadata xmlns:dc="http://purl.org/dc/elements/1.1/"> - <dc:title>Ruby on Rails Guides (<%= @version %>)</dc:title> + <dc:title>Ruby on Rails Guides (<%= @version || "master@#{@edge[0, 7]}" %>)</dc:title> <dc:language>en-us</dc:language> <dc:creator>Ruby on Rails</dc:creator> |