浏览代码

Merge pull request #122 from infosiftr/hyphens

Switch template tags to use hyphens instead of underscores
yosifkit 11 年之前
父节点
当前提交
de03fa69a9
共有 4 个文件被更改,包括 13 次插入13 次删除
  1. 1 1
      README-template.md
  2. 3 3
      r-base/user-feedback.md
  3. 6 6
      update.sh
  4. 3 3
      user-feedback.md

+ 1 - 1
README-template.md

@@ -12,4 +12,4 @@ repo](https://github.com/docker-library/official-images).
 
 
 # User Feedback
 # User Feedback
 
 
-%%USER_FEEDBACK%%
+%%USER-FEEDBACK%%

+ 3 - 3
r-base/user-feedback.md

@@ -1,7 +1,7 @@
 ## Issues
 ## Issues
 
 
 If you have any problems with or questions about this image, please contact us
 If you have any problems with or questions about this image, please contact us
-%%MAILING_LIST%% through a [GitHub issue](%%GITHUB_REPO%%/issues).
+%%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues).
 
 
 You can also reach us by email via email at
 You can also reach us by email via email at
 `[email protected]`.
 `[email protected]`.
@@ -12,8 +12,8 @@ You are invited to contribute new features, fixes, or updates, large or small;
 we are always thrilled to receive pull requests, and do our best to process them
 we are always thrilled to receive pull requests, and do our best to process them
 as fast as we can.
 as fast as we can.
 
 
-Before you start to code, we recommend discussing your plans %%MAILING_LIST%%
-through a [GitHub issue](%%GITHUB_REPO%%/issues), especially for more ambitious
+Before you start to code, we recommend discussing your plans %%MAILING-LIST%%
+through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious
 contributions. This gives other contributors a chance to point you in the right
 contributions. This gives other contributors a chance to point you in the right
 direction, give you feedback on your design, and help you find out if someone
 direction, give you feedback on your design, and help you find out if someone
 else is working on the same thing.
 else is working on the same thing.

+ 6 - 6
update.sh

@@ -93,17 +93,17 @@ for repo in "${repos[@]}"; do
 		echo '  LICENSE => '"$repo"'/license.md'
 		echo '  LICENSE => '"$repo"'/license.md'
 		replace_field "$repo" 'LICENSE' "$license"
 		replace_field "$repo" 'LICENSE' "$license"
 		
 		
-		echo '  USER_FEEDBACK => '"$repo"'/user-feedback.md'
-		replace_field "$repo" 'USER_FEEDBACK' "$userFeedback"
+		echo '  USER-FEEDBACK => '"$repo"'/user-feedback.md'
+		replace_field "$repo" 'USER-FEEDBACK' "$userFeedback"
 		
 		
-		echo '  MAILING_LIST => "'"$mailingList"'"'
-		replace_field "$repo" 'MAILING_LIST' "$mailingList" '\s*'
+		echo '  MAILING-LIST => "'"$mailingList"'"'
+		replace_field "$repo" 'MAILING-LIST' "$mailingList" '\s*'
 		
 		
 		echo '  REPO => "'"$repo"'"'
 		echo '  REPO => "'"$repo"'"'
 		replace_field "$repo" 'REPO' "$repo"
 		replace_field "$repo" 'REPO' "$repo"
 		
 		
-		echo '  GITHUB_REPO => "'"$gitRepo"'"'
-		replace_field "$repo" 'GITHUB_REPO' "$gitRepo"
+		echo '  GITHUB-REPO => "'"$gitRepo"'"'
+		replace_field "$repo" 'GITHUB-REPO' "$gitRepo"
 		
 		
 		echo
 		echo
 	else
 	else

+ 3 - 3
user-feedback.md

@@ -1,7 +1,7 @@
 ## Issues
 ## Issues
 
 
 If you have any problems with or questions about this image, please contact us
 If you have any problems with or questions about this image, please contact us
-%%MAILING_LIST%% through a [GitHub issue](%%GITHUB_REPO%%/issues).
+%%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues).
 
 
 You can also reach many of the official image maintainers via the
 You can also reach many of the official image maintainers via the
 `#docker-library` IRC channel on [Freenode](https://freenode.net).
 `#docker-library` IRC channel on [Freenode](https://freenode.net).
@@ -12,8 +12,8 @@ You are invited to contribute new features, fixes, or updates, large or small;
 we are always thrilled to receive pull requests, and do our best to process them
 we are always thrilled to receive pull requests, and do our best to process them
 as fast as we can.
 as fast as we can.
 
 
-Before you start to code, we recommend discussing your plans %%MAILING_LIST%%
-through a [GitHub issue](%%GITHUB_REPO%%/issues), especially for more ambitious
+Before you start to code, we recommend discussing your plans %%MAILING-LIST%%
+through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious
 contributions. This gives other contributors a chance to point you in the right
 contributions. This gives other contributors a chance to point you in the right
 direction, give you feedback on your design, and help you find out if someone
 direction, give you feedback on your design, and help you find out if someone
 else is working on the same thing.
 else is working on the same thing.