summaryrefslogtreecommitdiff
path: root/include/sane/sanei.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /include/sane/sanei.h
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'include/sane/sanei.h')
-rw-r--r--include/sane/sanei.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sane/sanei.h b/include/sane/sanei.h
index 7513d22..6f83776 100644
--- a/include/sane/sanei.h
+++ b/include/sane/sanei.h
@@ -15,8 +15,8 @@
License for more details.
You should have received a copy of the GNU General Public License
- along with sane; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with sane; see the file COPYING.
+ If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -118,7 +118,7 @@ extern "C" {
* @return
* - SANE_STATUS_GOOD - on success
* - SANE_STATUS_INVAL - if the value doesn't fit inside the constraint
- * or any other error occured
+ * or any other error occurred
* @sa sanei_constrain_value()
*/
@@ -135,7 +135,7 @@ extern "C" {
* @return
* - SANE_STATUS_GOOD - on success
* - SANE_STATUS_INVAL - if the function wasn't able to fit value into the
- * constraint or any other error occured
+ * constraint or any other error occurred
* @sa sanei_check_value()
*/