Changeset 7a5350f in libros for maquetacion/bibliography.bib

Timestamp:

Oct 21, 2014, 5:51:21 PM (10 years ago)

Author:

José Joaquín Contreras <joaquin@…>

Branches:

master

Children:

c267779

Parents:

01c820c (diff), 73377e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of https://tibisay.cenditel.gob.ve/publicaciones/scm/git/libros

Conflicts:

maquetacion/capitulo9/capitulo9.tex

File:

• maquetacion/bibliography.bib (moved) (moved from maquetacion/bibliografia.bib) (3 diffs)

maquetacion/bibliography.bib

@@ -1074 +1074 @@
         year = {2004},
         url = {http://www.librosenred.com/},
-}
-
+        translator = {La edición no menciona el nombre del traductor}
+}
 
 @Book{ IDENTIDADDIGITAL:2014,
@@ -1099 +1099 @@
         publisher = "Debate",
         year = "2006",
-        country="Caracas, Venezuela"
+        country="Caracas, Venezuela",
+        translator = "Francisco Ramos"
 }
 
@@ -1753 +1754 @@
 }
 
+@Electronic{NSA:2009, 
+        author = {NSA},
+        title = {SIGINT Frequently Asked Questions},
+        year = {2009},
+        howpublished = {https://www.nsa.gov/sigint/faqs.shtml\#sigint1},
+}