From cf7406d6aa80a26114fdcd2bd9b00009c99230ef Mon Sep 17 00:00:00 2001 From: nodanaonlyzuul Date: Wed, 5 Jun 2019 16:43:12 -0400 Subject: [PATCH] Replace 'http://www.elasticsearch.org' with 'https://www.elastic.co' in documentation. When Elasticsearch changed their FQDN from/www.elasticsearch.org to www.elastic.co, they preserved most of their page's paths but didn't setup granular redirect rules. For example: Going to `http://www.elasticsearch.org/contributor-agreement/` will redirect browsers to https://www.elastic.co/, but drop the path `/contributor-agreement/`. --- CONTRIBUTING.md | 2 +- README.md | 2 +- elasticsearch-model/README.md | 6 +++--- elasticsearch-model/lib/elasticsearch/model/indexing.rb | 6 +++--- elasticsearch-persistence/README.md | 2 +- elasticsearch-persistence/examples/notes/README.markdown | 2 +- elasticsearch-rails/README.md | 2 +- elasticsearch-rails/lib/rails/templates/01-basic.rb | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1bf5d2a13..161dff67d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ The process for contributing to any of the [Elasticsearch](https://github.com/el 2. Make sure your changes don't break any existing tests, and that you add tests for both bugfixes and new functionality. 3. **Sign the contributor license agreement.** -Please make sure you have signed the [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once. +Please make sure you have signed the [Contributor License Agreement](https://www.elastic.co/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once. 4. Submit a pull request. Push your local changes to your forked copy of the repository and submit a pull request. In the pull request, describe what your changes do and mention the number of the issue where discussion has taken place, eg “Closes #123″. diff --git a/README.md b/README.md index d7394ded9..752d3e141 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ See more information in the documentation for the [`elasticsearch-extensions`]( This software is licensed under the Apache 2 license, quoted below. - Copyright (c) 2014 Elasticsearch + Copyright (c) 2014 Elasticsearch Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/elasticsearch-model/README.md b/elasticsearch-model/README.md index b03ecf9a4..5986d4527 100644 --- a/elasticsearch-model/README.md +++ b/elasticsearch-model/README.md @@ -5,7 +5,7 @@ the [`elasticsearch`](https://github.com/elastic/elasticsearch-ruby) library. It aims to simplify integration of Ruby classes ("models"), commonly found e.g. in [Ruby on Rails](http://rubyonrails.org) applications, with the -[Elasticsearch](http://www.elasticsearch.org) search and analytics engine. +[Elasticsearch](https://www.elastic.co) search and analytics engine. ## Compatibility @@ -322,7 +322,7 @@ Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model #### The Elasticsearch DSL In most situations, you'll want to pass the search definition -in the Elasticsearch [domain-specific language](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html) to the client: +in the Elasticsearch [domain-specific language](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html) to the client: ```ruby response = Article.search query: { match: { title: "Fox Dogs" } }, @@ -760,7 +760,7 @@ SERVER=start TEST_CLUSTER_COMMAND=$PWD/tmp/elasticsearch-1.0.0.RC1/bin/elasticse This software is licensed under the Apache 2 license, quoted below. - Copyright (c) 2014 Elasticsearch + Copyright (c) 2014 Elasticsearch Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/elasticsearch-model/lib/elasticsearch/model/indexing.rb b/elasticsearch-model/lib/elasticsearch/model/indexing.rb index 69baf597e..05635bca0 100644 --- a/elasticsearch-model/lib/elasticsearch/model/indexing.rb +++ b/elasticsearch-model/lib/elasticsearch/model/indexing.rb @@ -30,7 +30,7 @@ module Model # module Indexing - # Wraps the [index settings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html#configuration-index-settings) + # Wraps the [index settings](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html) # class Settings attr_accessor :settings @@ -48,7 +48,7 @@ def as_json(options={}) end end - # Wraps the [index mappings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping.html) + # Wraps the [index mappings](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html) # class Mappings attr_accessor :options, :type @@ -308,7 +308,7 @@ def delete_index!(options={}) # # Article.__elasticsearch__.refresh_index! index: 'my-index' # - # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html + # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-refresh.html # def refresh_index!(options={}) target_index = options.delete(:index) || self.index_name diff --git a/elasticsearch-persistence/README.md b/elasticsearch-persistence/README.md index b58e9f026..d5cfd8acf 100644 --- a/elasticsearch-persistence/README.md +++ b/elasticsearch-persistence/README.md @@ -574,7 +574,7 @@ The ActiveRecord pattern has been deprecated as of version 6.0.0 of this gem. Pl This software is licensed under the Apache 2 license, quoted below. - Copyright (c) 2014 Elasticsearch + Copyright (c) 2014 Elasticsearch Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/elasticsearch-persistence/examples/notes/README.markdown b/elasticsearch-persistence/examples/notes/README.markdown index 2aa15ec32..0d9313d72 100644 --- a/elasticsearch-persistence/examples/notes/README.markdown +++ b/elasticsearch-persistence/examples/notes/README.markdown @@ -21,7 +21,7 @@ The application demonstrates: This software is licensed under the Apache 2 license, quoted below. - Copyright (c) 2014 Elasticsearch + Copyright (c) 2014 Elasticsearch Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/elasticsearch-rails/README.md b/elasticsearch-rails/README.md index eb0cb2782..cf389b34b 100644 --- a/elasticsearch-rails/README.md +++ b/elasticsearch-rails/README.md @@ -129,7 +129,7 @@ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elast This software is licensed under the Apache 2 license, quoted below. - Copyright (c) 2014 Elasticsearch + Copyright (c) 2014 Elasticsearch Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/elasticsearch-rails/lib/rails/templates/01-basic.rb b/elasticsearch-rails/lib/rails/templates/01-basic.rb index 6ab4ffb34..154eb1f90 100644 --- a/elasticsearch-rails/lib/rails/templates/01-basic.rb +++ b/elasticsearch-rails/lib/rails/templates/01-basic.rb @@ -108,7 +108,7 @@ create_file 'README.md', <<-README # Ruby on Rails and Elasticsearch: Example application -This application is an example of integrating the {Elasticsearch}[http://www.elasticsearch.org] +This application is an example of integrating the {Elasticsearch}[https://www.elastic.co] search engine with the {Ruby On Rails}[http://rubyonrails.org] web framework. It has been generated by application templates available at