Merge branch 'maint-1.0' into maint-1.2

icy17 · Mar 20, 2017 · c191ef2 · c191ef2
2 parents 5ebbefe + daf505a
commit c191ef2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Choose *1a* or *1b* depending on whether you want sources from a release tarball
 1a) Get a release tarball
 ```
 # replace ${version} with the desired version
-wget https://fedorahosted.org/releases/o/p/openscap/openscap-${version}.tar.gz
+wget https://github.com/OpenSCAP/openscap/releases/download/${version}/openscap-${version}.tar.gz
 tar -xzpf openscap-${version}.tar.gz
 cd openscap-${version}
 ```

diff --git a/utils/oscap.8 b/utils/oscap.8
@@ -1,4 +1,4 @@
-.TH OSCAP "8" "Jan 2016" "Red Hat" "System Administration Utilities"
+.TH OSCAP "8" "March 2017" "Red Hat" "System Administration Utilities"
 
 .SH NAME
 oscap \- OpenSCAP command line tool

diff --git a/utils/oscap.c b/utils/oscap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010--2016 Red Hat Inc., Durham, North Carolina.
+ * Copyright 2010--2017 Red Hat Inc., Durham, North Carolina.
  * All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -108,7 +108,7 @@ bool getopt_root(int argc, char **argv, struct oscap_action *action)
 
 static int print_versions(const struct oscap_action *action)
 {
-	printf("OpenSCAP command line tool (oscap) %s\n" "Copyright 2009--2016 Red Hat Inc., Durham, North Carolina.\n\n",
+	printf("OpenSCAP command line tool (oscap) %s\n" "Copyright 2009--2017 Red Hat Inc., Durham, North Carolina.\n\n",
 		oscap_get_version());
 
 	printf("==== Supported specifications ====\n");