Merge branch 'master' of git+ssh://git.fedorahosted.org/git/secure-coding

defensive-coding/.tx/config

@@ -50,12 +50,6 @@ source_file = pot/C/Language.pot
 source_lang = en
 type = PO
 
-[defensive-coding-guide.schemas]
-file_filter = <lang>/C/schemas.po
-source_file = pot/C/schemas.pot
-source_lang = en
-type = PO
-
 [defensive-coding-guide.String-Functions-snprintf]
 file_filter = <lang>/C/snippets/String-Functions-snprintf.po
 source_file = pot/C/snippets/String-Functions-snprintf.pot
@@ -98,11 +92,6 @@ source_file = pot/Python/Language.pot
 source_lang = en
 type = PO
 
-[defensive-coding-guide.schemas]
-file_filter = <lang>/Python/schemas.po
-source_file = pot/Python/schemas.pot
-source_lang = en
-type = PO
 
 [defensive-coding-guide.CXX]
 file_filter = <lang>/CXX/CXX.po
@@ -122,11 +111,6 @@ source_file = pot/CXX/Std.pot
 source_lang = en
 type = PO
 
-[defensive-coding-guide.schemas]
-file_filter = <lang>/CXX/schemas.po
-source_file = pot/CXX/schemas.pot
-source_lang = en
-type = PO
 
 [defensive-coding-guide.File_System]
 file_filter = <lang>/Tasks/File_System.po
@@ -158,18 +142,6 @@ source_file = pot/Tasks/Processes.pot
 source_lang = en
 type = PO
 
-[defensive-coding-guide.Locking]
-file_filter = <lang>/Tasks/Locking.po
-source_file = pot/Tasks/Locking.pot
-source_lang = en
-type = PO
-
-[defensive-coding-guide.schemas]
-file_filter = <lang>/Tasks/schemas.po
-source_file = pot/Tasks/schemas.pot
-source_lang = en
-type = PO
-
 [defensive-coding-guide.Temporary_Files]
 file_filter = <lang>/Tasks/Temporary_Files.po
 source_file = pot/Tasks/Temporary_Files.pot
@@ -248,12 +220,6 @@ source_file = pot/Features/TLS.pot
 source_lang = en
 type = PO
 
-[defensive-coding-guide.schemas]
-file_filter = <lang>/Features/schemas.po
-source_file = pot/Features/schemas.pot
-source_lang = en
-type = PO
-
 [defensive-coding-guide.TLS-NSS-Includes]
 file_filter = <lang>/Features/snippets/TLS-NSS-Includes.po
 source_file = pot/Features/snippets/TLS-NSS-Includes.pot

defensive-coding/en-US/Book_Info.xml

@@ -5,8 +5,7 @@
 	<title>Defensive Coding</title>
 	<subtitle>A Guide to Improving Software Security</subtitle>
 	<edition>1</edition>
-<!--	<issuenum>1.0</issuenum> -->
-	<pubsnumber></pubsnumber>
+	<pubsnumber>1</pubsnumber>
 	<productname>Fedora Security Team</productname>
 	<productnumber></productnumber>
 	<abstract>
@@ -20,7 +19,7 @@
 	<corpauthor>
 		<inlinemediaobject>
 			<imageobject>
-				<imagedata fileref="Common_Content/images/redhat-logo.svg" format="SVG" />
+				<imagedata fileref="Common_Content/images/logo.svg" format="SVG" />
 			</imageobject>
 		</inlinemediaobject>
 	</corpauthor>

defensive-coding/en-US/Revision_History.xml

@@ -7,6 +7,21 @@
 	<title>Revision History</title>
 	<simpara>
 		<revhistory>
+                        <revision>
+                                <revnumber>1.0-1</revnumber>
+                                <date>Thu May 09 2013</date>
+                                <author>
+                                        <firstname>Eric</firstname>
+                                        <surname>Christensen</surname>
+                                        <email>sparks@redhat.com</email>
+                                </author>
+                                <revdescription>
+                                        <simplelist>
+                                                <member>Added more C and C++ examples.</member>
+						<member>TLS Client NSS: Rely on NSS 3.14 cipher suite defaults.</member>
+                                        </simplelist>
+                                </revdescription>
+                        </revision>
 			<revision>
 				<revnumber>0-1</revnumber>
 				<date>Thu Mar 7 2013</date>