summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-19 16:20:00 +0000
committerGerrit Code Review <review@openstack.org>2013-06-19 16:20:00 +0000
commit328262a9bde39f9c60bf7b1494a321023abddf61 (patch)
tree607a6a133b3ff4043fe875135c49a85acf7fda12
parent8b86b0a59a4fc18e0d29baf364d0fa9ab0266cc0 (diff)
parenta68179ec6f03f214071a4c3c4a661ac0a2473ba8 (diff)
Merge "Fixed errors in service_description" into release-0.1release-0.1
-rw-r--r--muranodashboard/templates/_create_service_wizard.html34
1 files changed, 17 insertions, 17 deletions
diff --git a/muranodashboard/templates/_create_service_wizard.html b/muranodashboard/templates/_create_service_wizard.html
index a560bd9..8159a55 100644
--- a/muranodashboard/templates/_create_service_wizard.html
+++ b/muranodashboard/templates/_create_service_wizard.html
@@ -33,17 +33,17 @@
33 {% if service_type == 'Active Directory' %} 33 {% if service_type == 'Active Directory' %}
34 <p> 34 <p>
35 <strong>{% blocktrans %} Domain Name: {% endblocktrans %}</strong> 35 <strong>{% blocktrans %} Domain Name: {% endblocktrans %}</strong>
36 {% blocktrans %} Enter a desired name for a new domain. This name should fits in standard Windows domain name requirements: should contain only A-Z, a-z, 0-9, and (-) and not end with a dash. 36 {% blocktrans %} Enter a desired name for a new domain. This name should fit in standard Windows domain name requirements: it should contain only A-Z, a-z, 0-9, and (-) and should not end with a dash.
37 DNS server will be automatically set up on each of the Domain Controller instances. {% endblocktrans %} 37 DNS server will be automatically set up on each of the Domain Controller instances. {% endblocktrans %}
38 </p> 38 </p>
39 <p> 39 <p>
40 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong> 40 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong>
41 {% blocktrans %} You can create several Active Directory instances by setting instance number larger than one. In this case will be created one primary Domain Controller and a few secondary DCs. {% endblocktrans %} 41 {% blocktrans %} You can create several Active Directory instances by setting instance number larger than one. One primary Domain Controller and a few secondary DCs will be created. {% endblocktrans %}
42 </p> 42 </p>
43 <p> 43 <p>
44 <strong>{% blocktrans %} Passwords: {% endblocktrans %} </strong> 44 <strong>{% blocktrans %} Passwords: {% endblocktrans %} </strong>
45 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, number and special character. Password length should be a minimum of 8 characters. {% endblocktrans %} 45 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, a number and a special character. Password length should be a minimum of 8 characters. {% endblocktrans %}
46 {% blocktrans %} Once you forget your password you won't be able to operate with the service until recovery password would be entered. So it's better for Recovery and Administrator password to be different. {% endblocktrans %} 46 {% blocktrans %} Once you forget your password you won't be able to operate the service until recovery password would be entered. So it's better for Recovery and Administrator password to be different. {% endblocktrans %}
47 </p> 47 </p>
48 48
49 {% elif service_type == 'ASP.NET Application' %} 49 {% elif service_type == 'ASP.NET Application' %}
@@ -54,16 +54,16 @@
54 </p> 54 </p>
55 <p> 55 <p>
56 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong> 56 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong>
57 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, number and special character. Password length should be a minimum of 8 characters. {% endblocktrans %} 57 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, a number and a special character. Password length should be a minimum of 8 characters. {% endblocktrans %}
58 {% blocktrans %} Once you forget your password you won't be able to operate with the service. {% endblocktrans %} 58 {% blocktrans %} Once you forget your password you won't be able to operate the service. {% endblocktrans %}
59 </p> 59 </p>
60 <p> 60 <p>
61 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong> 61 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong>
62 {% blocktrans %} You can create service inside the Active Directory domain. If you want to create AD domain create the AD Service first. {% endblocktrans %} 62 {% blocktrans %} Service can be joined to the Active Directory domain. If you want to create an AD domain create the AD Service first. {% endblocktrans %}
63 </p> 63 </p>
64 <p> 64 <p>
65 <strong>{% blocktrans %} Git repository {% endblocktrans %}</strong> 65 <strong>{% blocktrans %} Git repository {% endblocktrans %}</strong>
66 {% blocktrans %} Point git repository with application you want to deploy. {% endblocktrans %} 66 {% blocktrans %} URL of a git repository with the application you want to deploy. {% endblocktrans %}
67 </p> 67 </p>
68 68
69 {% elif service_type == 'ASP.NET Farm' %} 69 {% elif service_type == 'ASP.NET Farm' %}
@@ -76,8 +76,8 @@
76 </p> 76 </p>
77 <p> 77 <p>
78 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong> 78 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong>
79 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, number and special character. 79 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, a number and a special character.
80 Password length should be a minimum of 8 characters. Once you forget your password you won't be able to operate with the service. {% endblocktrans %} 80 Password length should be a minimum of 8 characters. Once you forget your password you won't be able to operate the service. {% endblocktrans %}
81 </p> 81 </p>
82 <p> 82 <p>
83 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong> 83 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong>
@@ -96,13 +96,13 @@
96 </p> 96 </p>
97 <p> 97 <p>
98 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong> 98 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong>
99 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, number and special character. 99 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, a number and a special character.
100 Password length should be a minimum of 8 characters. {% endblocktrans %} 100 Password length should be a minimum of 8 characters. {% endblocktrans %}
101 {% blocktrans %} Once you forget your password you won't be able to operate with the service. {% endblocktrans %} 101 {% blocktrans %} Once you forget your password you won't be able to operate the service. {% endblocktrans %}
102 </p> 102 </p>
103 <p> 103 <p>
104 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong> 104 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong>
105 {% blocktrans %} Service can be joined to the Active Directory domain. If you want to create AD domain create the AD Service first. {% endblocktrans %} 105 {% blocktrans %} Service can be joined to the Active Directory domain. If you want to create an AD domain create the AD Service first. {% endblocktrans %}
106 </p> 106 </p>
107 107
108 {% elif service_type == 'IIS Farm' %} 108 {% elif service_type == 'IIS Farm' %}
@@ -113,12 +113,12 @@
113 </p> 113 </p>
114 <p> 114 <p>
115 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong> 115 <strong>{% blocktrans %} Administrator Password: {% endblocktrans %} </strong>
116 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, number and special character. 116 {% blocktrans %} Windows requires strong password for service administration. Your password should have at least one letter in each register, a number and a special character.
117 Password length should be a minimum of 8 characters. Once you forget your password you won't be able to operate with the service. {% endblocktrans %} 117 Password length should be a minimum of 8 characters. Once you forget your password you won't be able to operate the service. {% endblocktrans %}
118 </p> 118 </p>
119 <p> 119 <p>
120 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong> 120 <strong>{% blocktrans %} Domain: {% endblocktrans %}</strong>
121 {% blocktrans %} Service can be joined to the Active Directory domain. If you want to create AD domain create the AD Service first. {% endblocktrans %} 121 {% blocktrans %} Service can be joined to the Active Directory domain. If you want to create an AD domain create the AD Service first. {% endblocktrans %}
122 </p> 122 </p>
123 <p> 123 <p>
124 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong> 124 <strong>{% blocktrans %} Instance Count: {% endblocktrans %} </strong>
@@ -144,7 +144,7 @@
144 <p>{% blocktrans %} <strong> The ASP.NET Application Service </strong> installs custom application onto one IIS Web Server {% endblocktrans %}</p> 144 <p>{% blocktrans %} <strong> The ASP.NET Application Service </strong> installs custom application onto one IIS Web Server {% endblocktrans %}</p>
145 <p>{% blocktrans %} <strong> The IIS Farm Service </strong> sets up a load-balanced set of IIS servers {% endblocktrans %}</p> 145 <p>{% blocktrans %} <strong> The IIS Farm Service </strong> sets up a load-balanced set of IIS servers {% endblocktrans %}</p>
146 <p>{% blocktrans %} <strong> The ASP.NET Application Service </strong> installs a custom application on a load-balanced array of IIS servers {% endblocktrans %}</p> 146 <p>{% blocktrans %} <strong> The ASP.NET Application Service </strong> installs a custom application on a load-balanced array of IIS servers {% endblocktrans %}</p>
147 <p>{% blocktrans %} If you want services work with AD you should create The Active Directory Service first {% endblocktrans %}</p> 147 <p>{% blocktrans %} If you want your services to work with AD you should create The Active Directory Service first {% endblocktrans %}</p>
148 {% endif %} 148 {% endif %}
149</div> 149</div>
150{% endblock %} 150{% endblock %}