Index: /home/matt/workspace/dev/app/views/settings/edit.rhtml
===================================================================
--- /home/matt/workspace/dev/app/views/settings/edit.rhtml      (revision 635)
+++ /home/matt/workspace/dev/app/views/settings/edit.rhtml      (working copy)
@@ -12,6 +12,12 @@
 <p><label><%= l(:setting_welcome_text) %></label>
 <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
 
+<p><label><%= l(:setting_meta_description) %></label>
+<%= text_area_tag 'settings[meta_description]', Setting.meta_description, :cols => 60, :rows => 2 %></p>
+
+<p><label><%= l(:setting_meta_keywords) %></label>
+<%= text_field_tag 'settings[meta_keywords]', Setting.meta_keywords, :size => 60 %></p>
+
 <p><label><%= l(:setting_default_language) %></label>
 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
 
@@ -75,4 +81,4 @@
 
 <%= submit_tag l(:button_save) %>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
Index: /home/matt/workspace/dev/app/views/layouts/base.rhtml
===================================================================
--- /home/matt/workspace/dev/app/views/layouts/base.rhtml       (revision 635)
+++ /home/matt/workspace/dev/app/views/layouts/base.rhtml       (working copy)
@@ -3,8 +3,8 @@
 <head>
 <title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="description" content="redMine" />
-<meta name="keywords" content="issue,bug,tracker" />
+<meta name="description" content="<%= Setting.meta_description %>" />
+<meta name="keywords" content="<%= Setting.meta_keywords %>" />
 <!--[if IE]>
     <style type="text/css">
     body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
Index: /home/matt/workspace/dev/doc/docbook/en/redmine-userdoc-en.xml
===================================================================
--- /home/matt/workspace/dev/doc/docbook/en/redmine-userdoc-en.xml      (revision 603)
+++ /home/matt/workspace/dev/doc/docbook/en/redmine-userdoc-en.xml      (working copy)
@@ -660,6 +660,20 @@
         </listitem>
 
         <listitem>
+          <para><guilabel>Meta Description</guilabel></para>
+
+          <para>Description that appears in the HTML meta tags in every 
+                     page</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Meta Keywords</guilabel></para>
+
+          <para>Keywords that appears in the HTML meta tags in every 
+                     page</para>
+        </listitem>
+
+        <listitem>
           <para><guilabel>Text formatting</guilabel></para>
 
           <para>Formatting method applied to the "description" fields of the
@@ -986,4 +1000,4 @@
       configuration.</para>
     </section>
   </chapter>
-</book>
\ No newline at end of file
+</book>
Index: /home/matt/workspace/dev/config/settings.yml
===================================================================
--- /home/matt/workspace/dev/config/settings.yml        (revision 635)
+++ /home/matt/workspace/dev/config/settings.yml        (working copy)
@@ -24,7 +24,11 @@
 app_subtitle: 
   default: Project management 
 welcome_text: 
-  default: 
+  default:
+meta_description:
+  default: redMine
+meta_keywords:
+  default: 'issue,bug,tracker'  
 login_required: 
   default: 0 
 self_registration: 
Index: /home/matt/workspace/dev/lang/zh.yml
===================================================================
--- /home/matt/workspace/dev/lang/zh.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/zh.yml        (working copy)
@@ -162,6 +162,8 @@
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
 setting_welcome_text: 欢迎文字
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: 默认语言
 setting_login_required: 要求认证
 setting_self_registration: 允许自注册
Index: /home/matt/workspace/dev/lang/en.yml
===================================================================
--- /home/matt/workspace/dev/lang/en.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/en.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
 setting_welcome_text: Welcome text
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Default language
 setting_login_required: Authent. required
 setting_self_registration: Self-registration enabled
Index: /home/matt/workspace/dev/lang/pt.yml
===================================================================
--- /home/matt/workspace/dev/lang/pt.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/pt.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Título da aplicação
 setting_app_subtitle: Sub-título da aplicação
 setting_welcome_text: Texto de boas-vindas
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Linguagem padrão
 setting_login_required: Autenticação obrigatória
 setting_self_registration: Registro permitido
Index: /home/matt/workspace/dev/lang/pt-br.yml
===================================================================
--- /home/matt/workspace/dev/lang/pt-br.yml     (revision 635)
+++ /home/matt/workspace/dev/lang/pt-br.yml     (working copy)
@@ -158,7 +158,9 @@
  
 setting_app_title: Titulo da aplicacao 
 setting_app_subtitle: Sub-titulo da aplicacao 
-setting_welcome_text: Texto de boa-vinda 
+setting_welcome_text: Texto de boa-vinda
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords 
 setting_default_language: Lingua padrao 
 setting_login_required: Autenticacao obrigatoria 
 setting_self_registration: Registro de si mesmo permitido 
Index: /home/matt/workspace/dev/lang/es.yml
===================================================================
--- /home/matt/workspace/dev/lang/es.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/es.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Título del aplicación
 setting_app_subtitle: Subtítulo del aplicación
 setting_welcome_text: Texto acogida
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Lengua del defecto
 setting_login_required: Autentif. requerida
 setting_self_registration: Registro permitido
Index: /home/matt/workspace/dev/lang/fr.yml
===================================================================
--- /home/matt/workspace/dev/lang/fr.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/fr.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
 setting_welcome_text: Texte d'accueil
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Langue par défaut
 setting_login_required: Authentif. obligatoire
 setting_self_registration: Enregistrement autorisé
Index: /home/matt/workspace/dev/lang/bg.yml
===================================================================
--- /home/matt/workspace/dev/lang/bg.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/bg.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Заглавие
 setting_app_subtitle: Описание
 setting_welcome_text: Допълнителен текст
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Език по подразбиране
 setting_login_required: Изискване за вход
 setting_self_registration: Регистрация от потребители
Index: /home/matt/workspace/dev/lang/de.yml
===================================================================
--- /home/matt/workspace/dev/lang/de.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/de.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Applikation Titel
 setting_app_subtitle: Applikation Untertitel
 setting_welcome_text: Willkommenstext
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Default Sprache
 setting_login_required: Authent. erfordert
 setting_self_registration: Anmeldung ermöglicht
Index: /home/matt/workspace/dev/lang/sv.yml
===================================================================
--- /home/matt/workspace/dev/lang/sv.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/sv.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Applikationstitel
 setting_app_subtitle: Applicationsunderrubrik
 setting_welcome_text: Välkommentext
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Default språk
 setting_login_required: Authent. obligatoriskt
 setting_self_registration: Självregistrering påslaget
Index: /home/matt/workspace/dev/lang/nl.yml
===================================================================
--- /home/matt/workspace/dev/lang/nl.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/nl.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Applicatie titel
 setting_app_subtitle: Applicatie ondertitel
 setting_welcome_text: Welkomsttekst
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Default taal
 setting_login_required: Authent. nodig
 setting_self_registration: Zelf-registratie toegestaan
Index: /home/matt/workspace/dev/lang/ja.yml
===================================================================
--- /home/matt/workspace/dev/lang/ja.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/ja.yml        (working copy)
@@ -160,6 +160,8 @@
 setting_app_title: アプリケーションのタイトル
 setting_app_subtitle: アプリケーションのサブタイトル
 setting_welcome_text: ウェルカムメッセージ
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: 既定の言語
 setting_login_required: 認証が必要
 setting_self_registration: ユーザは自分で登録できる
Index: /home/matt/workspace/dev/lang/it.yml
===================================================================
--- /home/matt/workspace/dev/lang/it.yml        (revision 635)
+++ /home/matt/workspace/dev/lang/it.yml        (working copy)
@@ -159,6 +159,8 @@
 setting_app_title: Titolo applicazione
 setting_app_subtitle: Sottotitolo applicazione
 setting_welcome_text: Testo di benvenuto
+setting_meta_description: Meta Description
+setting_meta_keywords: Meta Keywords
 setting_default_language: Lingua di default
 setting_login_required: Autenticazione richiesta
 setting_self_registration: Auto-registrazione abilitata
