Skip to content

Commit 3375b23

Browse files
bpareesbparees
committed
Merge pull request sclorg#35 from gabemontero/onlineMotivatedWordsmithing
edits consistent with UI philosophy
2 parents 3ccf971 + 0b6bfc4 commit 3375b23

File tree

2 files changed

+44
-52
lines changed

2 files changed

+44
-52
lines changed

‎openshift/templates/django-postgresql.json

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -339,85 +339,81 @@
339339
"parameters": [
340340
{
341341
"name": "MEMORY_LIMIT",
342-
"displayName": "Memory limit",
343-
"description": "Maximum amount of memory the Django container can use",
342+
"displayName": "Memory Limit",
343+
"description": "Maximum amount of memory the Django container can use.",
344344
"value": "512Mi"
345345
},
346346
{
347347
"name": "MEMORY_POSTGRESQL_LIMIT",
348-
"displayName": "Memory limit",
349-
"description": "Maximum amount of memory the PostgreSQL container can use",
348+
"displayName": "Memory Limit (PostgreSQL)",
349+
"description": "Maximum amount of memory the PostgreSQL container can use.",
350350
"value": "512Mi"
351351
},
352352
{
353353
"name": "SOURCE_REPOSITORY_URL",
354-
"displayName": "Source repository URL",
355-
"description": "The URL of the repository with your application source code",
354+
"displayName": "Git Repository URL",
355+
"description": "The URL of the repository with your application source code.",
356356
"value": "https://github.com/openshift/django-ex.git"
357357
},
358358
{
359359
"name": "SOURCE_REPOSITORY_REF",
360-
"displayName": "Source repository reference",
361-
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
360+
"displayName": "Git Reference",
361+
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch."
362362
},
363363
{
364364
"name": "CONTEXT_DIR",
365-
"displayName": "Context directory",
366-
"description": "Set this to the relative path to your project if it is not in the root of your repository"
365+
"displayName": "Context Directory",
366+
"description": "Set this to the relative path to your project if it is not in the root of your repository."
367367
},
368368
{
369369
"name": "APPLICATION_DOMAIN",
370-
"displayName": "Application hostname",
370+
"displayName": "Application Hostname",
371371
"description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
372372
"value": ""
373373
},
374374
{
375375
"name": "GITHUB_WEBHOOK_SECRET",
376-
"displayName": "GitHub webhook secret",
377-
"description": "A secret string used to configure the GitHub webhook",
376+
"displayName": "GitHub Webhook Secret",
377+
"description": "A secret string used to configure the GitHub webhook.",
378378
"generate": "expression",
379379
"from": "[a-zA-Z0-9]{40}"
380380
},
381381
{
382382
"name": "DATABASE_SERVICE_NAME",
383-
"displayName": "Database service name",
384-
"description": "Database service name",
383+
"displayName": "Database Service Name",
385384
"value": "postgresql"
386385
},
387386
{
388387
"name": "DATABASE_ENGINE",
389-
"displayName": "Database engine",
390-
"description": "Database engine: postgresql, mysql or sqlite (default)",
388+
"displayName": "Database Engine",
389+
"description": "Database engine: postgresql, mysql or sqlite (default).",
391390
"value": "postgresql"
392391
},
393392
{
394393
"name": "DATABASE_NAME",
395-
"displayName": "Database name",
396-
"description": "Database name",
394+
"displayName": "Database Name",
397395
"value": "default"
398396
},
399397
{
400398
"name": "DATABASE_USER",
401-
"displayName": "Database user name",
402-
"description": "Database user name",
399+
"displayName": "Database Username",
403400
"value": "django"
404401
},
405402
{
406403
"name": "DATABASE_PASSWORD",
407-
"displayName": "Database user password",
408-
"description": "Database user password",
404+
"displayName": "Database User Password",
409405
"generate": "expression",
410406
"from": "[a-zA-Z0-9]{16}"
411407
},
412408
{
413409
"name": "APP_CONFIG",
414-
"displayName": "Application configuration file path",
415-
"description": "Relative path to Gunicorn configuration file (optional)"
410+
"displayName": "Application Configuration File Path",
411+
"description": "Relative path to Gunicorn configuration file (optional)."
416412
},
417413
{
418414
"name": "DJANGO_SECRET_KEY",
419-
"displayName": "Djange secret key",
420-
"description": "Set this to a long random string",
415+
"displayName": "Djange Secret Key",
416+
"description": "Set this to a long random string.",
421417
"generate": "expression",
422418
"from": "[\\w]{50}"
423419
}

‎openshift/templates/django.json

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -225,73 +225,69 @@
225225
"parameters": [
226226
{
227227
"name": "MEMORY_LIMIT",
228-
"displayName": "Memory limit",
229-
"description": "Maximum amount of memory the container can use",
228+
"displayName": "Memory Limit",
229+
"description": "Maximum amount of memory the container can use.",
230230
"value": "512Mi"
231231
},
232232
{
233233
"name": "SOURCE_REPOSITORY_URL",
234-
"displayName": "Source repository URL",
235-
"description": "The URL of the repository with your application source code",
234+
"displayName": "Git Repository URL",
235+
"description": "The URL of the repository with your application source code.",
236236
"value": "https://github.com/openshift/django-ex.git"
237237
},
238238
{
239239
"name": "SOURCE_REPOSITORY_REF",
240-
"displayName": "Source repository reference",
241-
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
240+
"displayName": "Git Reference",
241+
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch."
242242
},
243243
{
244244
"name": "CONTEXT_DIR",
245-
"displayName": "Context directory",
246-
"description": "Set this to the relative path to your project if it is not in the root of your repository"
245+
"displayName": "Context Directory",
246+
"description": "Set this to the relative path to your project if it is not in the root of your repository."
247247
},
248248
{
249249
"name": "APPLICATION_DOMAIN",
250-
"displayName": "Application hostname",
250+
"displayName": "Application Hostname",
251251
"description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
252252
"value": ""
253253
},
254254
{
255255
"name": "GITHUB_WEBHOOK_SECRET",
256-
"displayName": "GitHub webhook secret",
257-
"description": "A secret string used to configure the GitHub webhook",
256+
"displayName": "GitHub Webhook Secret",
257+
"description": "A secret string used to configure the GitHub webhook.",
258258
"generate": "expression",
259259
"from": "[a-zA-Z0-9]{40}"
260260
},
261261
{
262262
"name": "DATABASE_SERVICE_NAME",
263-
"displayName": "Database service name",
264-
"description": "Database service name"
263+
"displayName": "Database Service Name"
265264
},
266265
{
267266
"name": "DATABASE_ENGINE",
268-
"displayName": "Database engine",
269-
"description": "Database engine: postgresql, mysql or sqlite (default)"
267+
"displayName": "Database Engine",
268+
"description": "Database engine: postgresql, mysql or sqlite (default)."
270269
},
271270
{
272271
"name": "DATABASE_NAME",
273-
"displayName": "Database name",
274-
"description": "Database name"
272+
"displayName": "Database Name"
275273
},
276274
{
277275
"name": "DATABASE_USER",
278-
"displayName": "Database user name",
279-
"description": "Database user name"
276+
"displayName": "Database Username"
280277
},
281278
{
282279
"name": "DATABASE_PASSWORD",
283-
"displayName": "Database user password",
284-
"description": "Database user password"
280+
"displayName": "Database User Password"
285281
},
286282
{
287283
"name": "APP_CONFIG",
288-
"displayName": "Application configuration file path",
289-
"description": "Relative path to Gunicorn configuration file (optional)"
284+
"displayName": "Application Configuration File Path",
285+
"description": "Relative path to Gunicorn configuration file (optional)."
290286
},
291287
{
292288
"name": "DJANGO_SECRET_KEY",
293-
"displayName": "Djange secret key",
294-
"description": "Set this to a long random string",
289+
"displayName": "Django Secret Key",
290+
"description": "Set this to a long random string.",
295291
"generate": "expression",
296292
"from": "[\\w]{50}"
297293
}

0 commit comments

Comments
 (0)