Merge pull request progit#392 from progit/fix_gitignore

jnavila · jnavila · commit 3729f63e9e38 · 2013-03-30T07:16:28.000-07:00
Fix comments in example .gitignore file
diff --git a/ar/02-git-basics/01-chapter2.markdown b/ar/02-git-basics/01-chapter2.markdown
@@ -171,11 +171,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example .gitignore file:
 
 	# a comment – this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/az/02-git-basics/01-chapter2.markdown b/az/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example `.gitignore` file:
 
 	# a comment - this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/be/02-git-basics/01-chapter2.markdown b/be/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example `.gitignore` file:
 
 	# a comment - this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/ca/02-git-basics/01-chapter2.markdown b/ca/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example .gitignore file:
 
 	# a comment - this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/cs/02-git-basics/01-chapter2.markdown b/cs/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Masky souborů jsou jako zjednodušené regulární výrazy, které používá s
 Tady je další příklad souboru `.gitignore`:
 
 	# komentář – ignoruje se
-	*.a       # žádné soubory s příponou .a
-	!lib.a    # ale sleduj soubor lib.a, přestože máš ignorovat soubory s příponou .a
-	/TODO     # ignoruj soubor TODO pouze v kořenovém adresáři, ne v podadresářích
-	build/    # ignoruj všechny soubory v adresáři build/
-	doc/*.txt # ignoruj doc/notes.txt, ale nikoli doc/server/arch.txt
+	# žádné soubory s příponou .a
+	*.a
+	# ale sleduj soubor lib.a, přestože máš ignorovat soubory s příponou .a
+	!lib.a
+	# ignoruj soubor TODO pouze v kořenovém adresáři, ne v podadresářích
+	/TODO
+	# ignoruj všechny soubory v adresáři build/
+	build/
+	# ignoruj doc/notes.txt, ale nikoli doc/server/arch.txt
+	doc/*.txt
 
 ### Zobrazení připravených a nepřipravených změn ###
 
diff --git a/de/02-git-basics/01-chapter2.markdown b/de/02-git-basics/01-chapter2.markdown
@@ -170,12 +170,18 @@ Glob Muster sind vereinfachte reguläre Ausdrücke, die von der Shell verwendet
 Hier ist ein weiteres Beispiel für eine `.gitignore` Datei:
 
 	# ein Kommentar - dieser wird ignoriert
-	*.a       # ignoriert alle Dateien, die mit .a enden
-	!lib.a    # nicht aber lib.a Dateien (obwohl obige Zeile *.a ignoriert)
-	/TODO     # ignoriert eine TODO Datei nur im Wurzelverzeichnis, nicht aber
-	          # in Unterverzeichnissen
-	build/    # ignoriert alle Dateien im build/ Verzeichnis
-	doc/*.txt # ignoriert doc/notes.txt, aber nicht doc/server/arch.txt
+	# ignoriert alle Dateien, die mit .a enden
+	*.a
+	# nicht aber lib.a Dateien (obwohl obige Zeile *.a ignoriert)
+	!lib.a
+	# ignoriert eine TODO Datei nur im Wurzelverzeichnis, nicht aber
+	/TODO
+	# in Unterverzeichnissen
+	 
+	# ignoriert alle Dateien im build/ Verzeichnis
+	build/
+	# ignoriert doc/notes.txt, aber nicht doc/server/arch.txt
+	doc/*.txt
 
 ### Die Änderungen in der Staging Area durchsehen ###
 
diff --git a/en/02-git-basics/01-chapter2.markdown b/en/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example `.gitignore` file:
 
 	# a comment - this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/es-ni/02-git-basics/01-chapter2.markdown b/es-ni/02-git-basics/01-chapter2.markdown
@@ -173,11 +173,16 @@ Los patrones globales son expresiones regulares simplificadas que pueden ser uti
 Aquí hay otro ejemplo de un archivo .gitignore:
 
 	# un comentario - es ignorado
-	*.a       # ningún archivo .a
-	!lib.a    # pero si queremos versionar el archivo lib.a, incluse aunque estemos ignorando los archivos .a más arriba
-	/TODO     # solo ignorar el archivo TODO del directorio raíz, no de los subdirectorios
-	build/    # ignorar todos los archivos dentro del directorio build/
-	doc/*.txt # ignorar el archivo doc/notes.txt, pero no doc/server/arch.txt
+	# ningún archivo .a
+	*.a
+	# pero si queremos versionar el archivo lib.a, incluse aunque estemos ignorando los archivos .a más arriba
+	!lib.a
+	# solo ignorar el archivo TODO del directorio raíz, no de los subdirectorios
+	/TODO
+	# ignorar todos los archivos dentro del directorio build/
+	build/
+	# ignorar el archivo doc/notes.txt, pero no doc/server/arch.txt
+	doc/*.txt
 
 ### Visualizando Archivos Versionados y No Versionados ###
 
diff --git a/es/02-git-basics/01-chapter2.markdown b/es/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Los patrones glob son expresiones regulares simplificadas que pueden ser usadas
 He aquí otro ejemplo de archivo .gitignore:
 
 	# a comment – this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viendo tus cambios preparados y no preparados ###
 
diff --git a/fi/02-git-basics/01-chapter2.markdown b/fi/02-git-basics/01-chapter2.markdown
@@ -172,11 +172,16 @@ Keräysmallit ovat kuin yksinkertaistettuja 'säännöllisiä ilmaisuja' (regula
 Tässä toinen esimerkki .gitignore tiedostosta:
 
 	# kommentti – tämä sivuutetaan
-	*.a       # ei .a tiedostoja
-	!lib.a    # mutta jäljitä lib.a, vaikka sivuutatkin .a tiedostot yllä
-	/TODO     # sivuttaa vain juuren TODO tiedosto, ei subdir/TODO hakemistoa
-	build/    # sivuttaa kaikki tiedostot build/ hakemistosta
-	doc/*.txt # sivuttaa doc/notes.txt, mutta ei doc/server/arch.txt
+	# ei .a tiedostoja
+	*.a
+	# mutta jäljitä lib.a, vaikka sivuutatkin .a tiedostot yllä
+	!lib.a
+	# sivuttaa vain juuren TODO tiedosto, ei subdir/TODO hakemistoa
+	/TODO
+	# sivuttaa kaikki tiedostot build/ hakemistosta
+	build/
+	# sivuttaa doc/notes.txt, mutta ei doc/server/arch.txt
+	doc/*.txt
 
 ### Lavastettujen ja lavastattomien muutosten tarkastelu ###
 
diff --git a/fr/02-git-basics/01-chapter2.markdown b/fr/02-git-basics/01-chapter2.markdown
@@ -224,11 +224,16 @@ Un astérisque (`*`) correspond à un ou plusieurs caractères ; `[abc]` corres
 Voici un autre exemple de fichier `.gitignore` :
 
 	# un commentaire, cette ligne est ignorée
-	*.a       # pas de fichier .a
-	!lib.a    # mais suivre lib.a malgré la règle précédente
-	/TODO     # ignorer uniquement le fichier TODO à la racine du projet
-	build/    # ignorer tous les fichiers dans le répertoire build
-	doc/*.txt # ignorer doc/notes.txt, mais pas doc/server/arch.txt
+	# pas de fichier .a
+	*.a
+	# mais suivre lib.a malgré la règle précédente
+	!lib.a
+	# ignorer uniquement le fichier TODO à la racine du projet
+	/TODO
+	# ignorer tous les fichiers dans le répertoire build
+	build/
+	# ignorer doc/notes.txt, mais pas doc/server/arch.txt
+	doc/*.txt
 
 ### Inspecter les modifications indexées et non indexées ###
 
diff --git a/id/02-git-basics/01-chapter2.markdown b/id/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Pola Glob adalah seperti regular expression yang disederhanakan yang biasanya di
 Berikut adalah contoh lain dari isi berkas .gitignore:
 
 	# sebuah komentar – akan diabaikan
-	*.a       # abaikan berkas .a
-	!lib.a    # tapi pantau lib.a, walaupun Anda abaikan berkas .a di atas
-	/TODO     # hanya abaikan berkas TODO yang berada di rooto, bukan di subdir/TODO
-	build/    # abaikan semua berkas di dalam direktori build/
-	doc/*.txt # abaikan doc/notes.txt, tapi bukan doc/server/arch.txt
+	# abaikan berkas .a
+	*.a
+	# tapi pantau lib.a, walaupun Anda abaikan berkas .a di atas
+	!lib.a
+	# hanya abaikan berkas TODO yang berada di rooto, bukan di subdir/TODO
+	/TODO
+	# abaikan semua berkas di dalam direktori build/
+	build/
+	# abaikan doc/notes.txt, tapi bukan doc/server/arch.txt
+	doc/*.txt
 
 ### Melihat Perubahan di Area Stage dan di luar Area Stage ###
 
diff --git a/it/02-git-basics/01-chapter2.markdown b/it/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ I glob pattern sono semplicemente espressioni regolari usate dalla shell.  Un as
 Questo è un altro esempio di file .gitignore:
 
 	# un commento - questo è ignorato
-	*.a       # no file .a
-	!lib.a    # ma traccia lib.a, mentre vengono ignorati tutti i file .a come sopra
-	/TODO     # ignora solamente il file TODO in root, non del tipo subdir/TODO
-	build/    # ignora tutti i file nella directory build/
-	doc/*.txt # ignora doc/note.txt, ma non doc/server/arch.txt
+	# no file .a
+	*.a
+	# ma traccia lib.a, mentre vengono ignorati tutti i file .a come sopra
+	!lib.a
+	# ignora solamente il file TODO in root, non del tipo subdir/TODO
+	/TODO
+	# ignora tutti i file nella directory build/
+	build/
+	# ignora doc/note.txt, ma non doc/server/arch.txt
+	doc/*.txt
 
 ### Visualizza le tue modifiche parcheggiate e non ###
 
diff --git a/ja/02-git-basics/01-chapter2.markdown b/ja/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ glob パターンとは、シェルで用いる簡易正規表現のようなも
 では、`.gitignore` ファイルの例をもうひとつ見てみましょう。
 
 	# コメント。これは無視されます
-	*.a       # .a ファイルは無視
-	!lib.a    # しかし、lib.a ファイルだけは .a であっても追跡対象とします
-	/TODO     # ルートディレクトリの TODO ファイルだけを無視し、サブディレクトリの TODO は無視しません
-	build/    # build/ ディレクトリのすべてのファイルを無視します
-	doc/*.txt # doc/notes.txt は無視しますが、doc/server/arch.txt は無視しません
+	# .a ファイルは無視
+	*.a
+	# しかし、lib.a ファイルだけは .a であっても追跡対象とします
+	!lib.a
+	# ルートディレクトリの TODO ファイルだけを無視し、サブディレクトリの TODO は無視しません
+	/TODO
+	# build/ ディレクトリのすべてのファイルを無視します
+	build/
+	# doc/notes.txt は無視しますが、doc/server/arch.txt は無視しません
+	doc/*.txt
 
 ### ステージされている変更 / されていない変更の閲覧 ###
 
diff --git a/ko/02-git-basics/01-chapter2.markdown b/ko/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob 패턴은 정규표현식을 단순하게 만든 것으로 생각하면 되
 다음은 .gitignore 파일의 예이다:
 
 	# a comment - 이 줄은 무시한다.
-	*.a       # 확장자가 .a인 파일 무시
-	!lib.a    # 윗 줄에서 확장자가 .a인 파일은 무시하게 했지만 lib.a는 무시하지 않는다.
-	/TODO     # 루트 디렉토리에 있는 TODO파일은 무시하고 subdir/TODO처럼 하위디렉토리에 있는 파일은 무시하지 않는다.
-	build/    # build/ 디렉토리에 있는 모든 파일은 무시한다.
-	doc/*.txt # `doc/notes.txt`같은 파일은 무시하고 doc/server/arch.txt같은 파일은 무시하지 않는다.
+	# 확장자가 .a인 파일 무시
+	*.a
+	# 윗 줄에서 확장자가 .a인 파일은 무시하게 했지만 lib.a는 무시하지 않는다.
+	!lib.a
+	# 루트 디렉토리에 있는 TODO파일은 무시하고 subdir/TODO처럼 하위디렉토리에 있는 파일은 무시하지 않는다.
+	/TODO
+	# build/ 디렉토리에 있는 모든 파일은 무시한다.
+	build/
+	# `doc/notes.txt`같은 파일은 무시하고 doc/server/arch.txt같은 파일은 무시하지 않는다.
+	doc/*.txt
 
 ### Staged와 Unstaged 상태의 변경 내용을 보기 ###
 
diff --git a/mk/02-git-basics/01-chapter2.markdown b/mk/02-git-basics/01-chapter2.markdown
@@ -169,11 +169,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example .gitignore file:
 
 	# a comment – this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/nl/02-git-basics/01-chapter2.markdown b/nl/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Expansie (`glob`) patronen zijn vereenvoudigde reguliere expressies die shell om
 Hier is nog een voorbeeld van een `.gitignore` bestand:
 
 	# a comment – this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Je staged en unstaged wijzigingen zien ###
 
diff --git a/no-nb/02-git-basics/01-chapter2.markdown b/no-nb/02-git-basics/01-chapter2.markdown
@@ -170,11 +170,16 @@ Glob patterns are like simplified regular expressions that shells use. An asteri
 Here is another example `.gitignore` file:
 
 	# a comment - this is ignored
-	*.a       # no .a files
-	!lib.a    # but do track lib.a, even though you're ignoring .a files above
-	/TODO     # only ignore the root TODO file, not subdir/TODO
-	build/    # ignore all files in the build/ directory
-	doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+	# no .a files
+	*.a
+	# but do track lib.a, even though you're ignoring .a files above
+	!lib.a
+	# only ignore the root TODO file, not subdir/TODO
+	/TODO
+	# ignore all files in the build/ directory
+	build/
+	# ignore doc/notes.txt, but not doc/server/arch.txt
+	doc/*.txt
 
 ### Viewing Your Staged and Unstaged Changes ###
 
diff --git a/pl/02-git-basics/02-chapter2.markdown b/pl/02-git-basics/02-chapter2.markdown
diff --git a/pt-br/02-git-basics/01-chapter2.markdown b/pt-br/02-git-basics/01-chapter2.markdown
diff --git a/ru/02-git-basics/01-chapter2.markdown b/ru/02-git-basics/01-chapter2.markdown
diff --git a/th/02-git-basics/01-chapter2.markdown b/th/02-git-basics/01-chapter2.markdown
diff --git a/tr/02-git-basics/01-chapter2.markdown b/tr/02-git-basics/01-chapter2.markdown
diff --git a/zh-tw/02-git-basics/01-chapter2.markdown b/zh-tw/02-git-basics/01-chapter2.markdown
diff --git a/zh/02-git-basics/01-chapter2.markdown b/zh/02-git-basics/01-chapter2.markdown
