From 8eb3dafaa2e020628848a86369edcf1db39a8535 Mon Sep 17 00:00:00 2001 From: Andrey Deryabin Date: Thu, 12 Dec 2013 20:01:41 +0400 Subject: [PATCH 1/2] fix incorrect link to documentation --- .../generators/flex/setup/templates/flex_initializer.rb.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb b/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb index 7f4ff6b..f7aa2fd 100644 --- a/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb +++ b/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb @@ -1,4 +1,4 @@ -# see the detailed Configuration documentation at http://ddnexus.github.io/flex/doc/1-Global-Doc/3-Configuration.html +# see the detailed Configuration documentation at http://ddnexus.github.io/flex/doc/1-Flex-Project/3-Configuration.html Flex::Configuration.configure do |config| @@ -27,7 +27,7 @@ Flex::Configuration.configure do |config| # config.redis = Redis.new(:host => somehost, :port: 6379, :db = 1) - # Logger variables: see http://ddnexus.github.io/flex/doc/1-Global-Doc/3-Configuration.html + # Logger variables: see http://ddnexus.github.io/flex/doc/1-Flex-Project/3-Configuration.html # config.logger.debug_variables = false # config.logger.debug_request = false # config.logger.debug_result = false From d1687022e9dec20465999045bd23897d84ded69e Mon Sep 17 00:00:00 2001 From: Andrey Deryabin Date: Thu, 12 Dec 2013 20:09:38 +0400 Subject: [PATCH 2/2] fix incorrect link to documentation in generators --- .../lib/generators/flex/setup/templates/flex_dir/es.rb.erb | 2 +- .../lib/generators/flex/setup/templates/flex_dir/es.yml.erb | 4 ++-- .../flex/setup/templates/flex_dir/es_extender.rb.erb | 2 +- .../generators/flex/setup/templates/flex_initializer.rb.erb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.rb.erb b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.rb.erb index 1ee1c94..d5126e4 100644 --- a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.rb.erb +++ b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.rb.erb @@ -3,7 +3,7 @@ # >> puts <%= @module_name %>.flex.doc # you can eventually restrict the doc to a single method by pasing its name: # >> puts <%= @module_name %>.flex.doc :search -# see the detailed doc for this feature at http://ddnexus.github.io/flex/doc/2-flex/4-Self-Documentation.html +# see the detailed doc for this feature at http://ddnexus.github.io/flex/doc/2-flex/5-Self-Documentation.html module <%= @module_name %> diff --git a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.yml.erb b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.yml.erb index 61d3256..660ea4d 100644 --- a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.yml.erb +++ b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es.yml.erb @@ -1,5 +1,5 @@ # Add here your search queries -# see the detailed Source documentation at http://ddnexus.github.io/flex/doc/2-flex/2-Templating/2-Sources.html +# see the detailed Source documentation at http://ddnexus.github.io/flex/doc/2-flex/3-Templating/2-Sources.html # ANCHORS litheral key: it will not be used as template @@ -12,7 +12,7 @@ ANCHORS: # >> puts <%= @module_name %>.flex.doc # You can eventually restrict the doc to a single method by pasing its name: # >> puts <%= @module_name %>.flex.doc :search -# see the detailed doc for this feature at http://ddnexus.github.io/flex/doc/2-flex/4-Self-Documentation.html +# see the detailed doc for this feature at http://ddnexus.github.io/flex/doc/2-flex/5-Self-Documentation.html # the :cleanable_query is a special variable that get cleaned up if contains illegal characters for the Lucene syntax search: diff --git a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es_extender.rb.erb b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es_extender.rb.erb index e3a6132..3ebce75 100644 --- a/flex-rails/lib/generators/flex/setup/templates/flex_dir/es_extender.rb.erb +++ b/flex-rails/lib/generators/flex/setup/templates/flex_dir/es_extender.rb.erb @@ -1,4 +1,4 @@ -# see the detailed Extenders documentation at http://ddnexus.github.io/flex/doc/2-flex/3-Result-Extenders.html +# see the detailed Extenders documentation at http://ddnexus.github.io/flex/doc/4-flex-models/5-Result-Extenders.html module <%= @extender_name %> diff --git a/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb b/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb index f7aa2fd..621f949 100644 --- a/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb +++ b/flex-rails/lib/generators/flex/setup/templates/flex_initializer.rb.erb @@ -12,14 +12,14 @@ Flex::Configuration.configure do |config| config.result_extenders |= [ <%= "#{@extender_name}" %> ] # Add the default variables here: - # see also the details Variables documentation at http://ddnexus.github.io/flex/doc/2-flex/2-Templating/4-Variables.html + # see also the details Variables documentation at http://ddnexus.github.io/flex/doc/2-flex/3-Templating/4-Variables.html # config.variables.deep_merge! :index => 'my_index', # :type => 'project', # :anything => 'anything # used by the live-reindex feature # if you change it you must deploy the change first, then you can live-reindex in any next deploy - # read the documentation at http://ddnexus.github.io/flex/doc/2-flex/7-Live-Reindex.html#flexconfigurationapp_id + # read the documentation at http://ddnexus.github.io/flex/doc/6-flex-admin/2-Live-Reindex.html#flexconfigurationapp_id config.app_id = '<%= Time.now.strftime('%Y%m%d%H%M%S_') + Rails.application.class.name.split('::').first.underscore %>_' + Rails.env # used by the live-reindex feature